summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-11-19 16:05:09 +0100
committerJohannes Berg <johannes.berg@intel.com>2012-11-19 16:20:37 +0100
commit49884568628db47a1f8c1f596c6ab3b8db81b73c (patch)
treec5fb7a7c9c5a4ea3c91b201f5f0bb692eaa8afe1 /drivers/net/wireless/iwlwifi
parentcfg80211: Add TDLS event to allow drivers to request operations (diff)
downloadlinux-49884568628db47a1f8c1f596c6ab3b8db81b73c.tar.xz
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 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/mac80211.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index ff8162d4c454..e75d80341f28 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -1032,6 +1032,7 @@ done:
}
static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
struct ieee80211_channel *channel,
enum nl80211_channel_type channel_type,
int duration)