aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-02-19 08:26:10 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-27 14:06:32 -0500
commit6b5773ebd5c9719aec30e58429db2d3b3f343d2c (patch)
tree6311f5d3ef0aaec8a3bf47ea5c259df300c98b3b /net/mac80211
parent494f1fe559748a54bb30c066057dfae02d29676e (diff)
mac80211: remove redundant monitor_work enqueueing
ieee80211_restart_sta_timer() takes care for enqueueing monitor_work if needed, so no need to do it again. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7ece99a59805..586d4fb8e130 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3048,7 +3048,6 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
3048 add_timer(&ifmgd->chswitch_timer); 3048 add_timer(&ifmgd->chswitch_timer);
3049 ieee80211_sta_reset_beacon_monitor(sdata); 3049 ieee80211_sta_reset_beacon_monitor(sdata);
3050 ieee80211_restart_sta_timer(sdata); 3050 ieee80211_restart_sta_timer(sdata);
3051 ieee80211_queue_work(&sdata->local->hw, &sdata->u.mgd.monitor_work);
3052} 3051}
3053#endif 3052#endif
3054 3053