]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mac80211: better fix for conn_mon_timer running after disassociate
authorStanislaw Gruszka <sgruszka@redhat.com>
Fri, 25 Feb 2011 13:46:02 +0000 (14:46 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 25 Feb 2011 20:33:40 +0000 (15:33 -0500)
Is still possible to schedule conn_mon_timer after disassociate from
ieee80211_sta_tx_notify() and ieee80211_offchannel_ps_disable().

Move disassociate check to ieee80211_sta_reset_conn_monitor() to cover
all these cases, and add unlikely since in most the time we call
ieee80211_sta_reset_conn_monitor() when associated.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/mlme.c

index abb0116608034c83177d207f380be9fd10ce1685..cc984bd861cfacd7d463a56928b44666e66155db 100644 (file)
@@ -145,6 +145,9 @@ void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata)
 {
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 
+       if (unlikely(!sdata->u.mgd.associated))
+               return;
+
        if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)
                return;
 
@@ -1083,12 +1086,6 @@ 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);
 }