diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-04-20 13:15:56 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-20 11:52:40 -0400 |
| commit | 7bdfcaaff5de368a88a4f784f7283b66c17d051d (patch) | |
| tree | f871cfa0a3aeb06f184e884a084b944b0c92480f /net/mac80211/mlme.c | |
| parent | 58b5190e740241b33fcd901855436aa5d0c5e087 (diff) | |
| download | kernel_samsung_smdk4412-7bdfcaaff5de368a88a4f784f7283b66c17d051d.zip kernel_samsung_smdk4412-7bdfcaaff5de368a88a4f784f7283b66c17d051d.tar.gz kernel_samsung_smdk4412-7bdfcaaff5de368a88a4f784f7283b66c17d051d.tar.bz2 | |
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 <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index d11a54c..d811e3f 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1330,12 +1330,17 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata, mutex_lock(&sdata->local->iflist_mtx); ieee80211_recalc_ps(sdata->local, -1); mutex_unlock(&sdata->local->iflist_mtx); + + if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR) + return; + /* * We've received a probe response, but are not sure whether * we have or will be receiving any beacons or data, so let's * schedule the timers again, just in case. */ mod_beacon_timer(sdata); + mod_timer(&ifmgd->conn_mon_timer, round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME)); |