Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c56ef672 authored by David Spinadel's avatar David Spinadel Committed by Johannes Berg
Browse files

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: default avatarDavid Spinadel <david.spinadel@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ee10f2c7

drivers/net/wireless/at76c50x-usb.c

+2 −1
Original line number Diff line number Diff line
@@ -1955,8 +1955,9 @@ static void at76_dwork_hw_scan(struct work_struct *work) 


static int at76_hw_scan(struct ieee80211_hw *hw,

			struct ieee80211_vif *vif,

			struct cfg80211_scan_request *req)

			struct ieee80211_scan_request *hw_req)

{

	struct cfg80211_scan_request *req = &hw_req->req;

	struct at76_priv *priv = hw->priv;

	struct at76_req_scan scan;

	u8 *ssid = NULL;

drivers/net/wireless/ath/ath10k/mac.c

+2 −1
Original line number Diff line number Diff line
@@ -3137,10 +3137,11 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, 


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;

drivers/net/wireless/cw1200/scan.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

	};

drivers/net/wireless/cw1200/scan.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/iwlegacy/common.c

+2 −1
Original line number Diff line number Diff line
@@ -1572,8 +1572,9 @@ il_scan_initiate(struct il_priv *il, struct ieee80211_vif *vif) 


int

il_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

	       struct cfg80211_scan_request *req)

	       struct ieee80211_scan_request *hw_req)

{

	struct cfg80211_scan_request *req = &hw_req->req;

	struct il_priv *il = hw->priv;

	int ret;