diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-06 11:15:30 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-06 11:15:30 +0300 |
| commit | 6e55eed8f15484bb6504c2d54bf9283681f0ed9d (patch) | |
| tree | 3d7ec45a0cdbd1547b8dba0824be42184a3907cf /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
| parent | 44621b82aa7ce90b7d4a767be097a0a43da1d1e8 (diff) | |
| parent | 15be8e89cdd999124a2307ffd6dacb895c3b802e (diff) | |
| download | op-kernel-dev-6e55eed8f15484bb6504c2d54bf9283681f0ed9d.zip op-kernel-dev-6e55eed8f15484bb6504c2d54bf9283681f0ed9d.tar.gz | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index 45cd64c..9feca4a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -1556,9 +1556,10 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw, static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct cfg80211_scan_request *req) + struct ieee80211_scan_request *hw_req) { struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw); + struct cfg80211_scan_request *req = &hw_req->req; int ret; if (req->n_channels == 0 || @@ -1847,7 +1848,7 @@ static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw, static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct cfg80211_sched_scan_request *req, - struct ieee80211_sched_scan_ies *ies) + struct ieee80211_scan_ies *ies) { struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw); int ret; |
