diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-02-14 12:51:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-14 12:51:42 -0800 |
| commit | 8bc26a008f61eac5631701cbd65f88c015a63280 (patch) | |
| tree | c85eb9e5a14b406a4dd6625c57029ec266e7dc80 /net/mac80211 | |
| parent | net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING (diff) | |
| parent | mac80211: add missing locking in ieee80211_reconfig (diff) | |
| download | linux-dev-8bc26a008f61eac5631701cbd65f88c015a63280.tar.xz linux-dev-8bc26a008f61eac5631701cbd65f88c015a63280.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211')
| -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 cf68700abffa..d036597aabbe 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1210,7 +1210,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; |