]>
Commit | Line | Data |
---|---|---|
ad522180 GKH |
1 | From 0c699c3a75d4e8d0d2c317f83048d8fd3ffe692a Mon Sep 17 00:00:00 2001 |
2 | From: Luis R. Rodriguez <lrodriguez@atheros.com> | |
3 | Date: Thu, 16 Sep 2010 15:12:30 -0400 | |
4 | Subject: mac80211: reset probe send counter upon connection timer reset | |
5 | ||
6 | From: Luis R. Rodriguez <lrodriguez@atheros.com> | |
7 | ||
8 | commit 0c699c3a75d4e8d0d2c317f83048d8fd3ffe692a upstream. | |
9 | ||
10 | Upon beacon loss we send probe requests after 30 seconds of idle | |
11 | time and we wait for each probe response 1/2 second. We send a | |
12 | total of 3 probe requests before giving up on the AP. In the case | |
13 | that we reset the connection idle monitor we should reset the probe | |
14 | requests count to 0. Right now this won't help in any way but | |
15 | the next patch will. | |
16 | ||
17 | This patch has fixes for stable kernel [2.6.35+]. | |
18 | ||
19 | Cc: Paul Stewart <pstew@google.com> | |
20 | Cc: Amod Bodas <amod.bodas@atheros.com> | |
21 | Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> | |
22 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | |
23 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
24 | ||
25 | --- | |
26 | net/mac80211/mlme.c | 4 ++++ | |
27 | 1 file changed, 4 insertions(+) | |
28 | ||
29 | --- a/net/mac80211/mlme.c | |
30 | +++ b/net/mac80211/mlme.c | |
31 | @@ -120,11 +120,15 @@ void ieee80211_sta_reset_beacon_monitor( | |
32 | ||
33 | void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata) | |
34 | { | |
35 | + struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; | |
36 | + | |
37 | if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR) | |
38 | return; | |
39 | ||
40 | mod_timer(&sdata->u.mgd.conn_mon_timer, | |
41 | round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME)); | |
42 | + | |
43 | + ifmgd->probe_send_count = 0; | |
44 | } | |
45 | ||
46 | static int ecw2cw(int ecw) |