diff options
| author | Eliad Peller <eliad@wizery.com> | 2012-11-19 19:05:09 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-19 19:20:37 +0400 |
| commit | 49884568628db47a1f8c1f596c6ab3b8db81b73c (patch) | |
| tree | c5fb7a7c9c5a4ea3c91b201f5f0bb692eaa8afe1 /net/mac80211/driver-ops.h | |
| parent | 3475b0946bd2057497628790d4b4fce4bfdcc304 (diff) | |
| download | linux-49884568628db47a1f8c1f596c6ab3b8db81b73c.tar.xz | |
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/driver-ops.h')
| -rw-r--r-- | net/mac80211/driver-ops.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 4dc2577886ff..284dd02385e4 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -704,6 +704,7 @@ static inline int drv_get_antenna(struct ieee80211_local *local, } static inline int drv_remain_on_channel(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, struct ieee80211_channel *chan, enum nl80211_channel_type chantype, unsigned int duration) @@ -712,9 +713,9 @@ static inline int drv_remain_on_channel(struct ieee80211_local *local, might_sleep(); - trace_drv_remain_on_channel(local, chan, chantype, duration); - ret = local->ops->remain_on_channel(&local->hw, chan, chantype, - duration); + trace_drv_remain_on_channel(local, sdata, chan, chantype, duration); + ret = local->ops->remain_on_channel(&local->hw, &sdata->vif, + chan, chantype, duration); trace_drv_return_int(local, ret); return ret; |