diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-06-25 21:15:14 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-06-25 21:26:36 +0200 |
| commit | 855df36de365fb3b49eb06c352015e3d215b43fe (patch) | |
| tree | 2a76f128eb457e1bacb585260b3e03f72b03cc1e /drivers/net/wireless/cw1200 | |
| parent | ath9k: Fix build error in ath_reset_internal (diff) | |
| parent | cfg80211: remove channel_switch combination check (diff) | |
| download | linux-855df36de365fb3b49eb06c352015e3d215b43fe.tar.xz linux-855df36de365fb3b49eb06c352015e3d215b43fe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/cw1200')
| -rw-r--r-- | drivers/net/wireless/cw1200/scan.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/cw1200/scan.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/cw1200/scan.c b/drivers/net/wireless/cw1200/scan.c index 9afcd4ce3368..b2fb6c632092 100644 --- a/drivers/net/wireless/cw1200/scan.c +++ b/drivers/net/wireless/cw1200/scan.c @@ -53,9 +53,10 @@ static int cw1200_scan_start(struct cw1200_common *priv, struct wsm_scan *scan) int cw1200_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct cfg80211_scan_request *req) + struct ieee80211_scan_request *hw_req) { struct cw1200_common *priv = hw->priv; + struct cfg80211_scan_request *req = &hw_req->req; struct wsm_template_frame frame = { .frame_type = WSM_FRAME_TYPE_PROBE_REQUEST, }; diff --git a/drivers/net/wireless/cw1200/scan.h b/drivers/net/wireless/cw1200/scan.h index 5a8296ccfa82..cc75459e5784 100644 --- a/drivers/net/wireless/cw1200/scan.h +++ b/drivers/net/wireless/cw1200/scan.h @@ -41,7 +41,7 @@ struct cw1200_scan { int cw1200_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct cfg80211_scan_request *req); + struct ieee80211_scan_request *hw_req); void cw1200_scan_work(struct work_struct *work); void cw1200_scan_timeout(struct work_struct *work); void cw1200_clear_recent_scan_work(struct work_struct *work); |