X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fmac80211%2Fibss.c;h=e97fa7fac96e07676f632fb3aa14e78e4000662e;hb=c4de673b775e4db48cd2db6277e0c6714332ca0c;hp=2eda7b13124abb7469a8b7b86503de07c0155623;hpb=55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa;p=~andy%2Flinux

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 2eda7b13124..e97fa7fac96 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -534,7 +534,8 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata)
 	int err;
 	u16 capability;
 
-	sdata_lock(sdata);
+	sdata_assert_lock(sdata);
+
 	/* update cfg80211 bss information with the new channel */
 	if (!is_zero_ether_addr(ifibss->bssid)) {
 		capability = WLAN_CAPABILITY_IBSS;
@@ -559,7 +560,6 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata)
 
 	/* generate the beacon */
 	err = ieee80211_ibss_csa_beacon(sdata, NULL);
-	sdata_unlock(sdata);
 	if (err < 0)
 		return err;