| From | Greg Kroah-Hartman <> | Subject | [ 004/171] mac80211: dont send null data packet when not associated | Date | Wed, 21 Nov 2012 16:39:10 -0800 |
| |
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <johannes.berg@intel.com>
commit 20f544eea03db4b498942558b882d463ce575c3e upstream.
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.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- net/mac80211/util.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1341,6 +1341,8 @@ int ieee80211_reconfig(struct ieee80211_ 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); }
|