diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-02-18 17:03:41 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-02-18 17:03:41 -0500 |
commit | b67afe7f43afd2f5cd98798993561920c1684c12 (patch) | |
tree | e45a0e41c91a1d199fd865b011ed0d25f5497bb9 /net/mac80211/util.c | |
parent | db28569adc692d9fb8a2d2d8e7ebab7fd5481f10 (diff) | |
parent | 28bec7b845e10b68e6ba1ade5de0fc566690fc61 (diff) | |
download | talos-obmc-linux-b67afe7f43afd2f5cd98798993561920c1684c12.tar.gz talos-obmc-linux-b67afe7f43afd2f5cd98798993561920c1684c12.zip |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 26fd5d29af7f..556647a910ac 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1204,7 +1204,9 @@ int ieee80211_reconfig(struct ieee80211_local *local) switch (sdata->vif.type) { case NL80211_IFTYPE_STATION: changed |= BSS_CHANGED_ASSOC; + mutex_lock(&sdata->u.mgd.mtx); ieee80211_bss_info_change_notify(sdata, changed); + mutex_unlock(&sdata->u.mgd.mtx); break; case NL80211_IFTYPE_ADHOC: changed |= BSS_CHANGED_IBSS; |