summaryrefslogtreecommitdiff
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorClark Williams <williams@redhat.com>2012-02-03 15:10:42 -0600
committerClark Williams <williams@redhat.com>2012-02-03 15:10:42 -0600
commit77f57fb93d132875acead3581bcdc5d2fefbe7a0 (patch)
tree5db5ccf5e1754248edc790e2f37f3a2b863f0ddb /net/mac80211/ibss.c
parentd28048db190097536aef2be5ee9a736bd7bb92eb (diff)
parent69bade053d0f2ef0c8ee98af9f6699a55a8d8bb9 (diff)
Merge commit 'v3.2.3' into rt-3.2.3-rt10
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index ede9a8b341ac..3ece106d5660 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -184,7 +184,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
*pos++ = 0; /* U-APSD no in use */
}
- RCU_INIT_POINTER(ifibss->presp, skb);
+ rcu_assign_pointer(ifibss->presp, skb);
sdata->vif.bss_conf.beacon_int = beacon_int;
sdata->vif.bss_conf.basic_rates = basic_rates;