aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2d86a4d5e912..d7915ab15a43 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)
126 126
127void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata) 127void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata)
128{ 128{
129 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
130
129 if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR) 131 if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)
130 return; 132 return;
131 133
132 mod_timer(&sdata->u.mgd.conn_mon_timer, 134 mod_timer(&sdata->u.mgd.conn_mon_timer,
133 round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME)); 135 round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME));
136
137 ifmgd->probe_send_count = 0;
134} 138}
135 139
136static int ecw2cw(int ecw) 140static int ecw2cw(int ecw)