diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-11-16 18:59:13 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-11-16 18:59:13 +0100 |
commit | 26c6e80892d8c160dffaba85889bd4e65b1dacf6 (patch) | |
tree | 0d7751d80ac44b9407270be246f83e8354fc26ba /net/mac80211/util.c | |
parent | tilegx: request_irq with a non-null device name (diff) | |
parent | brcmfmac: fix typo in CONFIG_BRCMISCAN (diff) | |
download | linux-26c6e80892d8c160dffaba85889bd4e65b1dacf6.tar.xz linux-26c6e80892d8c160dffaba85889bd4e65b1dacf6.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 239391807ca9..0151ae33c4cd 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1491,6 +1491,8 @@ int ieee80211_reconfig(struct ieee80211_local *local) list_for_each_entry(sdata, &local->interfaces, list) { if (sdata->vif.type != NL80211_IFTYPE_STATION) continue; + if (!sdata->u.mgd.associated) + continue; ieee80211_send_nullfunc(local, sdata, 0); } |