From: Juuso Oikarinen Date: Tue, 20 Apr 2010 10:15:56 +0000 (+0300) Subject: mac80211: Fix ieee80211_sta_conn_mon_timer with hw connection monitoring X-Git-Tag: v2.6.35-rc1~473^2~393^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bdfcaaff5de368a88a4f784f7283b66c17d051d;p=pandora-kernel.git mac80211: Fix ieee80211_sta_conn_mon_timer with hw connection monitoring When IEEE80211_HW_CONNECTION_MONITOR is configured by the driver, starting of ieee80211_sta_conn_mon_timer should be prevented, as it is then not needed. This is currently partially the case. As it seems, when a probe-response is received from the AP the timer is still restarted, thus restarting the host based connection keep-alive mechanism. These probe-responses happen at least when scanning while associated. Fix this by preventing starting of the ieee80211_sta_conn_mon_timer in the ieee80211_rx_mgmt_probe_resp function. Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville --- Reading git-diff-tree failed