diff options
| author | David Spinadel <david.spinadel@intel.com> | 2014-02-05 15:21:13 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-06-25 09:10:42 +0200 |
| commit | c56ef6725068c0ce499e517409c0da226ef51b08 (patch) | |
| tree | 75133e7a2b9df5b2d6a2766e6fee024ba6fd17af /drivers/net/wireless/cw1200 | |
| parent | ee10f2c779b28c1d6e87ac3e1bbb1aa8b62fa891 (diff) | |
| download | op-kernel-dev-c56ef6725068c0ce499e517409c0da226ef51b08.zip op-kernel-dev-c56ef6725068c0ce499e517409c0da226ef51b08.tar.gz | |
mac80211: support more than one band in scan request
Some drivers (such as iwlmvm) can handle multiple bands in a single
HW scan request. Add a HW flag to indicate that the driver support
this. To hold the required data, create a separate structure for
HW scan request that holds cfg scan request and data about
different parts of the scan IEs.
As this changes the mac80211 API, update all drivers using it to
use the correct new function type/argument.
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
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 9afcd4c..b2fb6c6 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 5a8296c..cc75459 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); |
