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

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

mac80211: split sched scan IEs 



Split sched scan IEs to band specific and not band specific
blocks. Common IEs blocks may be sent to the FW once per command,
instead of per band.

This allows optimization of size of the command, which may be
required by some drivers (eg. iwlmvm with newer firmware version).

As this changes the mac80211 API, update all drivers to use the
new version correctly, even if they don't (yet) make use of the
split data.

Signed-off-by: default avatarDavid Spinadel <david.spinadel@intel.com>
Reviewed-by: default avatarAlexander Bondar <alexander.bondar@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c56ef672

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1828,7 +1828,7 @@ static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw, 
static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,

					struct ieee80211_vif *vif,

					struct cfg80211_sched_scan_request *req,

					struct ieee80211_sched_scan_ies *ies)

					struct ieee80211_scan_ies *ies)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	int ret;

drivers/net/wireless/iwlwifi/mvm/mvm.h

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm, 
int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,

			      struct ieee80211_vif *vif,

			      struct cfg80211_sched_scan_request *req,

			      struct ieee80211_sched_scan_ies *ies);

			      struct ieee80211_scan_ies *ies);

int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,

				       struct cfg80211_sched_scan_request *req);

int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,

drivers/net/wireless/iwlwifi/mvm/scan.c

+18 −9
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ static void iwl_mvm_scan_fill_channels(struct iwl_scan_cmd *cmd, 
 */

static u16 iwl_mvm_fill_probe_req(struct ieee80211_mgmt *frame, const u8 *ta,

				  int n_ssids, const u8 *ssid, int ssid_len,

				  const u8 *ie, int ie_len,

				  const u8 *band_ie, int band_ie_len,

				  const u8 *common_ie, int common_ie_len,

				  int left)

{

	int len = 0;
@@ -244,12 +245,19 @@ static u16 iwl_mvm_fill_probe_req(struct ieee80211_mgmt *frame, const u8 *ta, 


	len += ssid_len + 2;



	if (WARN_ON(left < ie_len))

	if (WARN_ON(left < band_ie_len + common_ie_len))

		return len;



	if (ie && ie_len) {

		memcpy(pos, ie, ie_len);

		len += ie_len;

	if (band_ie && band_ie_len) {

		memcpy(pos, band_ie, band_ie_len);

		pos += band_ie_len;

		len += band_ie_len;

	}



	if (common_ie && common_ie_len) {

		memcpy(pos, common_ie, common_ie_len);

		pos += common_ie_len;

		len += common_ie_len;

	}



	return (u16)len;
@@ -382,7 +390,7 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm, 
			    (struct ieee80211_mgmt *)cmd->data,

			    vif->addr,

			    req->n_ssids, ssid, ssid_len,

			    req->ie, req->ie_len,

			    req->ie, req->ie_len, NULL, 0,

			    mvm->fw->ucode_capa.max_probe_length));



	iwl_mvm_scan_fill_channels(cmd, req, basic_ssid, &params);
@@ -561,7 +569,7 @@ int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm, 


static void iwl_scan_offload_build_tx_cmd(struct iwl_mvm *mvm,

					  struct ieee80211_vif *vif,

					  struct ieee80211_sched_scan_ies *ies,

					  struct ieee80211_scan_ies *ies,

					  enum ieee80211_band band,

					  struct iwl_tx_cmd *cmd,

					  u8 *data)
@@ -577,7 +585,8 @@ static void iwl_scan_offload_build_tx_cmd(struct iwl_mvm *mvm, 
	cmd_len = iwl_mvm_fill_probe_req((struct ieee80211_mgmt *)data,

					 vif->addr,

					 1, NULL, 0,

					 ies->ie[band], ies->len[band],

					 ies->ies[band], ies->len[band],

					 ies->common_ies, ies->common_ie_len,

					 SCAN_OFFLOAD_PROBE_REQ_SIZE);

	cmd->len = cpu_to_le16(cmd_len);

}
@@ -735,7 +744,7 @@ static void iwl_build_channel_cfg(struct iwl_mvm *mvm, 
int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,

			      struct ieee80211_vif *vif,

			      struct cfg80211_sched_scan_request *req,

			      struct ieee80211_sched_scan_ies *ies)

			      struct ieee80211_scan_ies *ies)

{

	int band_2ghz = mvm->nvm_data->bands[IEEE80211_BAND_2GHZ].n_channels;

	int band_5ghz = mvm->nvm_data->bands[IEEE80211_BAND_5GHZ].n_channels;

drivers/net/wireless/ti/wl12xx/scan.c

+13 −7
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
					 cmd->params.role_id, band,

					 wl->scan.ssid, wl->scan.ssid_len,

					 wl->scan.req->ie,

					 wl->scan.req->ie_len, false);

					 wl->scan.req->ie_len, NULL, 0, false);

	if (ret < 0) {

		wl1271_error("PROBE request template failed");

		goto out;
@@ -317,7 +317,7 @@ static void wl12xx_adjust_channels(struct wl1271_cmd_sched_scan_config *cmd, 
int wl1271_scan_sched_scan_config(struct wl1271 *wl,

				  struct wl12xx_vif *wlvif,

				  struct cfg80211_sched_scan_request *req,

				  struct ieee80211_sched_scan_ies *ies)

				  struct ieee80211_scan_ies *ies)

{

	struct wl1271_cmd_sched_scan_config *cfg = NULL;

	struct wlcore_scan_channels *cfg_channels = NULL;
@@ -378,8 +378,11 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl, 
						 wlvif->role_id, band,

						 req->ssids[0].ssid,

						 req->ssids[0].ssid_len,

						 ies->ie[band],

						 ies->len[band], true);

						 ies->ies[band],

						 ies->len[band],

						 ies->common_ies,

						 ies->common_ie_len,

						 true);

		if (ret < 0) {

			wl1271_error("2.4GHz PROBE request template failed");

			goto out;
@@ -392,8 +395,11 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl, 
						 wlvif->role_id, band,

						 req->ssids[0].ssid,

						 req->ssids[0].ssid_len,

						 ies->ie[band],

						 ies->len[band], true);

						 ies->ies[band],

						 ies->len[band],

						 ies->common_ies,

						 ies->common_ie_len,

						 true);

		if (ret < 0) {

			wl1271_error("5GHz PROBE request template failed");

			goto out;
@@ -449,7 +455,7 @@ int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif) 


int wl12xx_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif  *wlvif,

			    struct cfg80211_sched_scan_request *req,

			    struct ieee80211_sched_scan_ies *ies)

			    struct ieee80211_scan_ies *ies)

{

	int ret;

drivers/net/wireless/ti/wl12xx/scan.h

+1 −1
Original line number Diff line number Diff line
@@ -135,6 +135,6 @@ int wl12xx_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif); 
void wl12xx_scan_completed(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl12xx_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif  *wlvif,

			    struct cfg80211_sched_scan_request *req,

			    struct ieee80211_sched_scan_ies *ies);

			    struct ieee80211_scan_ies *ies);

void wl12xx_scan_sched_scan_stop(struct wl1271 *wl,  struct wl12xx_vif *wlvif);

#endif