diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-22 11:53:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-22 11:53:05 -0800 |
| commit | d3bd1b4c89cceca42211cd5bd30508b903267229 (patch) | |
| tree | ab3459496e3c9d8b1904b440b1a19c72ff23b3f0 /net/mac80211 | |
| parent | 28801f351f76231e8d1e378274d6d56a577b897e (diff) | |
| parent | 0bf719dfdecc5552155cbec78e49fa06e531e35c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 45fbb9e3374..c9ceb4d57ab 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1033,6 +1033,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); } |