From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Fri, 25 Feb 2011 13:46:02 +0000 (+0100)
Subject: mac80211: better fix for conn_mon_timer running after disassociate
X-Git-Tag: v2.6.39-rc1~468^2~158^2^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8628172f45c839376bf2b70bbd326d56e68dadc3;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed