diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-09-16 19:12:30 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-16 19:46:14 (GMT) |
| commit | 0c699c3a75d4e8d0d2c317f83048d8fd3ffe692a (patch) | |
| tree | 3b63725c7585ce6bba004b84dd22fecb93c4533f /net/mac80211 | |
| parent | be099e82e9cf6d5d65d044e9ef6fc8bee3c7a113 (diff) | |
| download | linux-0c699c3a75d4e8d0d2c317f83048d8fd3ffe692a.tar.xz | |
mac80211: reset probe send counter upon connection timer reset
Upon beacon loss we send probe requests after 30 seconds of idle
time and we wait for each probe response 1/2 second. We send a
total of 3 probe requests before giving up on the AP. In the case
that we reset the connection idle monitor we should reset the probe
requests count to 0. Right now this won't help in any way but
the next patch will.
This patch has fixes for stable kernel [2.6.35+].
Cc: stable@kernel.org
Cc: Paul Stewart <pstew@google.com>
Cc: Amod Bodas <amod.bodas@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 2d86a4d..d7915ab 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -126,11 +126,15 @@ static void mod_beacon_timer(struct ieee80211_sub_if_data *sdata) void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata) { + struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; + if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR) return; mod_timer(&sdata->u.mgd.conn_mon_timer, round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME)); + + ifmgd->probe_send_count = 0; } static int ecw2cw(int ecw) |