diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-12-23 07:15:42 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 16:55:03 -0500 |
commit | b8bc4b0aa9bfba755c64b11b8f60e6cfab25dc9d (patch) | |
tree | 7f95b0c7d4f847e3c624b67899c7a62f6b73ce26 /net/mac80211/mlme.c | |
parent | 9588bbd5529461a3dacd435bf239c84c3508f569 (diff) |
mac80211: support remain-on-channel command
This implements the new remain-on-channel cfg80211
command in mac80211, extending the work interface.
Also change the work purge code to be able to clean
up events properly (pretending they timed out.)
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index e44f1ed0b0da..32d6e6614f9f 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -857,6 +857,9 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata, | |||
857 | if (sdata->local->scanning) | 857 | if (sdata->local->scanning) |
858 | return; | 858 | return; |
859 | 859 | ||
860 | if (sdata->local->tmp_channel) | ||
861 | return; | ||
862 | |||
860 | mutex_lock(&ifmgd->mtx); | 863 | mutex_lock(&ifmgd->mtx); |
861 | 864 | ||
862 | if (!ifmgd->associated) | 865 | if (!ifmgd->associated) |