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/dvm | |
| 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/dvm')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index 29af7b5..afb98f4 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -1495,9 +1495,10 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw, static int iwlagn_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct cfg80211_scan_request *req) + struct ieee80211_scan_request *hw_req) { struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw); + struct cfg80211_scan_request *req = &hw_req->req; int ret; IWL_DEBUG_MAC80211(priv, "enter\n"); |
