diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-11-08 14:06:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 12:14:05 -0800 |
| commit | f79b61dcf47fc54e5a4c8307bad659bc1f352a3d (patch) | |
| tree | 420ea947167e2d46951cd3cd2e53ca61339b815f /net | |
| parent | a64e7f53c0f5d061ccbd8b28fa09b51b32b7ec53 (diff) | |
mac80211: don't send null data packet when not associated
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>
Diffstat (limited to 'net')
| -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 1cfe6d56dcfa..78834496ecc1 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1434,6 +1434,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); } |