diff options
| author | Eliad Peller <eliad@wizery.com> | 2012-11-19 17:05:09 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-19 16:20:37 +0100 |
| commit | 49884568628db47a1f8c1f596c6ab3b8db81b73c (patch) | |
| tree | c5fb7a7c9c5a4ea3c91b201f5f0bb692eaa8afe1 /net/mac80211/cfg.c | |
| parent | 3475b0946bd2057497628790d4b4fce4bfdcc304 (diff) | |
| download | linux-49884568628db47a1f8c1f596c6ab3b8db81b73c.tar.gz linux-49884568628db47a1f8c1f596c6ab3b8db81b73c.tar.bz2 linux-49884568628db47a1f8c1f596c6ab3b8db81b73c.zip | |
mac80211: make remain_on_channel() op pass vif param
Drivers (e.g. wl12xx) might need to know the vif
to roc on (mainly in order to configure the
rx filters correctly).
Add the vif to the op params, and update the current
users (iwlwifi) to use the new api.
Signed-off-by: Eliad Peller <eliad@wizery.com>
[fix hwsim]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 80e0618b25ba..18926aea480c 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2287,7 +2287,8 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local, if (!duration) duration = 10; - ret = drv_remain_on_channel(local, channel, channel_type, duration); + ret = drv_remain_on_channel(local, sdata, channel, channel_type, + duration); if (ret) { kfree(roc); return ret; @@ -2298,7 +2299,8 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local, out_check_combine: list_for_each_entry(tmp, &local->roc_list, list) { - if (tmp->chan != channel || tmp->chan_type != channel_type) + if (tmp->chan != channel || tmp->chan_type != channel_type || + tmp->sdata != sdata) continue; /* |