aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-11-08 14:06:28 +0100
committerJohannes Berg <johannes.berg@intel.com>2012-11-09 17:31:47 +0100
commit20f544eea03db4b498942558b882d463ce575c3e (patch)
treeef7b66466c7a7c3257251f86c389bf7b18ec3ef0 /net
parentcfff2f999d9baa561f20d999c8b83b03f078fb8f (diff)
downloadvexpress-lsk-20f544eea03db4b498942558b882d463ce575c3e.tar.gz
mac80211: don't send null data packet when not associated
On resume or firmware recovery, mac80211 sends a null data packet to see if the AP is still around and hasn't disconnected us. However, it always does this even if it wasn't even connected before, leading to a warning in the new channel context code. Fix this by checking that it's associated. Cc: stable@vger.kernel.org Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/util.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index e6e4bda0528..fa1d343faa4 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);
}