diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-12-23 13:15:46 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 16:55:08 -0500 |
| commit | 095d5ef608b58ece49f4131925700d27314ecdd8 (patch) | |
| tree | 7fd0b17a95aa70b8378b2bd3e042ef4c7d197530 /net | |
| parent | 1ed32e4fc8cfc9656cc1101e7f9617d485fcbe7b (diff) | |
| download | linux-3.10-095d5ef608b58ece49f4131925700d27314ecdd8.tar.gz linux-3.10-095d5ef608b58ece49f4131925700d27314ecdd8.tar.bz2 linux-3.10-095d5ef608b58ece49f4131925700d27314ecdd8.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/work.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 0bffb6a4253..ea89ed70734 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; } |