]>
Commit | Line | Data |
---|---|---|
384ba1c4 GKH |
1 | From 20f544eea03db4b498942558b882d463ce575c3e Mon Sep 17 00:00:00 2001 |
2 | From: Johannes Berg <johannes.berg@intel.com> | |
3 | Date: Thu, 8 Nov 2012 14:06:28 +0100 | |
4 | Subject: mac80211: don't send null data packet when not associated | |
5 | ||
6 | From: Johannes Berg <johannes.berg@intel.com> | |
7 | ||
8 | commit 20f544eea03db4b498942558b882d463ce575c3e upstream. | |
9 | ||
10 | On resume or firmware recovery, mac80211 sends a null | |
11 | data packet to see if the AP is still around and hasn't | |
12 | disconnected us. However, it always does this even if | |
13 | it wasn't even connected before, leading to a warning | |
14 | in the new channel context code. Fix this by checking | |
15 | that it's associated. | |
16 | ||
17 | Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> | |
18 | Signed-off-by: Johannes Berg <johannes.berg@intel.com> | |
19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
20 | ||
21 | --- | |
22 | net/mac80211/util.c | 2 ++ | |
23 | 1 file changed, 2 insertions(+) | |
24 | ||
25 | --- a/net/mac80211/util.c | |
26 | +++ b/net/mac80211/util.c | |
27 | @@ -1434,6 +1434,8 @@ int ieee80211_reconfig(struct ieee80211_ | |
28 | list_for_each_entry(sdata, &local->interfaces, list) { | |
29 | if (sdata->vif.type != NL80211_IFTYPE_STATION) | |
30 | continue; | |
31 | + if (!sdata->u.mgd.associated) | |
32 | + continue; | |
33 | ||
34 | ieee80211_send_nullfunc(local, sdata, 0); | |
35 | } |