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)
commit8628172f45c839376bf2b70bbd326d56e68dadc3
tree8e91a2cd8272701bc682e3db8869e5582c5e22bc
parent08f6c85223b71ba7bf2a5ebbdf735881475a8e3c
mac80211: better fix for conn_mon_timer running after disassociate

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