mac80211: remove requeue from work

There's no need to be requeueing the work struct
since we check for the scan after removing items
due to possible timeouts.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 0 insertions, 18 deletions

diff --git a/net/mac80211/work.c b/net/mac80211/work.c
index 0bffb6a42534..ea89ed70734d 100644
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
@@ -435,12 +435,6 @@ ieee80211_direct_probe(struct ieee80211_work *wk)
                  */
                 ieee80211_remove_auth_bss(local, wk);
 
-                /*
-                 * We might have a pending scan which had no chance to run yet
-                 * due to work needing to be done. Hence, queue the STAs work
-                 * again for that.
-                 */
-                ieee80211_queue_work(&local->hw, &local->work_work);
                 return WORK_ACT_TIMEOUT;
         }
 
@@ -478,12 +472,6 @@ ieee80211_authenticate(struct ieee80211_work *wk)
                  */
                 ieee80211_remove_auth_bss(local, wk);
 
-                /*
-                 * We might have a pending scan which had no chance to run yet
-                 * due to work needing to be done. Hence, queue the STAs work
-                 * again for that.
-                 */
-                ieee80211_queue_work(&local->hw, &local->work_work);
                 return WORK_ACT_TIMEOUT;
         }
 
@@ -519,12 +507,6 @@ ieee80211_associate(struct ieee80211_work *wk)
                 if (wk->assoc.bss)
                         cfg80211_unlink_bss(local->hw.wiphy, wk->assoc.bss);
 
-                /*
-                 * We might have a pending scan which had no chance to run yet
-                 * due to work needing to be done. Hence, queue the STAs work
-                 * again for that.
-                 */
-                ieee80211_queue_work(&local->hw, &local->work_work);
                 return WORK_ACT_TIMEOUT;
         }