diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-06-25 15:15:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-06-25 15:26:36 -0400 |
| commit | 855df36de365fb3b49eb06c352015e3d215b43fe (patch) | |
| tree | 2a76f128eb457e1bacb585260b3e03f72b03cc1e /drivers/net/wireless/ath/ath10k/mac.c | |
| parent | d6067f0e17eb1de7d9b1d792f67d17c6e894b770 (diff) | |
| parent | 97dc94f1d933c9df2c0b327066ea130c0e92083f (diff) | |
| download | talos-op-linux-855df36de365fb3b49eb06c352015e3d215b43fe.tar.gz talos-op-linux-855df36de365fb3b49eb06c352015e3d215b43fe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/mac.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/mac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index a21080028c54..b8314a534972 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3137,10 +3137,11 @@ exit: static int ath10k_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct cfg80211_scan_request *req) + struct ieee80211_scan_request *hw_req) { struct ath10k *ar = hw->priv; struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); + struct cfg80211_scan_request *req = &hw_req->req; struct wmi_start_scan_arg arg; int ret = 0; int i; |
