projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 494f1fe)
mac80211: remove redundant monitor_work enqueueing
authorEliad Peller <eliad@wizery.com>
Sun, 19 Feb 2012 13:26:10 +0000 (15:26 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Feb 2012 19:06:32 +0000 (14:06 -0500)
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>
net/mac80211/mlme.c patch | blob | blame | history

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7ece99a59805f9c2741d7c58209f06d9b99e3a40..586d4fb8e130215e0dbfd4b8b83657abac780b7c 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3048,7 +3048,6 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
                add_timer(&ifmgd->chswitch_timer);
        ieee80211_sta_reset_beacon_monitor(sdata);
        ieee80211_restart_sta_timer(sdata);
-       ieee80211_queue_work(&sdata->local->hw, &sdata->u.mgd.monitor_work);
 }
 #endif