diff options
-rw-r--r-- | net/mac80211/ibss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 0f1fb5db4bdb..df21e4f79df8 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) | |||
534 | int err; | 534 | int err; |
535 | u16 capability; | 535 | u16 capability; |
536 | 536 | ||
537 | sdata_lock(sdata); | 537 | sdata_assert_lock(sdata); |
538 | |||
538 | /* update cfg80211 bss information with the new channel */ | 539 | /* update cfg80211 bss information with the new channel */ |
539 | if (!is_zero_ether_addr(ifibss->bssid)) { | 540 | if (!is_zero_ether_addr(ifibss->bssid)) { |
540 | capability = WLAN_CAPABILITY_IBSS; | 541 | capability = WLAN_CAPABILITY_IBSS; |
@@ -559,7 +560,6 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata) | |||
559 | 560 | ||
560 | /* generate the beacon */ | 561 | /* generate the beacon */ |
561 | err = ieee80211_ibss_csa_beacon(sdata, NULL); | 562 | err = ieee80211_ibss_csa_beacon(sdata, NULL); |
562 | sdata_unlock(sdata); | ||
563 | if (err < 0) | 563 | if (err < 0) |
564 | return err; | 564 | return err; |
565 | 565 | ||