summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-02-18 17:03:41 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-02-18 17:03:41 -0500
commitb67afe7f43afd2f5cd98798993561920c1684c12 (patch)
treee45a0e41c91a1d199fd865b011ed0d25f5497bb9 /net/mac80211/mlme.c
parentdb28569adc692d9fb8a2d2d8e7ebab7fd5481f10 (diff)
parent28bec7b845e10b68e6ba1ade5de0fc566690fc61 (diff)
downloadop-kernel-dev-b67afe7f43afd2f5cd98798993561920c1684c12.zip
op-kernel-dev-b67afe7f43afd2f5cd98798993561920c1684c12.tar.gz
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d89e878..7b3f9df 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1071,6 +1071,12 @@ void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,
if (is_multicast_ether_addr(hdr->addr1))
return;
+ /*
+ * In case we receive frames after disassociation.
+ */
+ if (!sdata->u.mgd.associated)
+ return;
+
ieee80211_sta_reset_conn_monitor(sdata);
}
OpenPOWER on IntegriCloud