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

Commit 83587505 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: move bitrate_masks into wlvif 



move bitrate_masks into the per-interface data, rather than
being global.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent baf6277a

drivers/net/wireless/wl12xx/cmd.c

+8 −5
Original line number Diff line number Diff line
@@ -1111,15 +1111,16 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
	return ret;

}



int wl1271_cmd_build_probe_req(struct wl1271 *wl,

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

			       const u8 *ssid, size_t ssid_len,

			       const u8 *ie, size_t ie_len, u8 band)

{

	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);

	struct sk_buff *skb;

	int ret;

	u32 rate;



	skb = ieee80211_probereq_get(wl->hw, wl->vif, ssid, ssid_len,

	skb = ieee80211_probereq_get(wl->hw, vif, ssid, ssid_len,

				     ie, ie_len);

	if (!skb) {

		ret = -ENOMEM;
@@ -1128,7 +1129,7 @@ int wl1271_cmd_build_probe_req(struct wl1271 *wl, 


	wl1271_dump(DEBUG_SCAN, "PROBE REQ: ", skb->data, skb->len);



	rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);

	rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[band]);

	if (band == IEEE80211_BAND_2GHZ)

		ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4,

					      skb->data, skb->len, 0, rate);
@@ -1142,19 +1143,21 @@ int wl1271_cmd_build_probe_req(struct wl1271 *wl, 
}



struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl,

					      struct wl12xx_vif *wlvif,

					      struct sk_buff *skb)

{

	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);

	int ret;

	u32 rate;



	if (!skb)

		skb = ieee80211_ap_probereq_get(wl->hw, wl->vif);

		skb = ieee80211_ap_probereq_get(wl->hw, vif);

	if (!skb)

		goto out;



	wl1271_dump(DEBUG_SCAN, "AP PROBE REQ: ", skb->data, skb->len);



	rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[wl->band]);

	rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[wl->band]);

	if (wl->band == IEEE80211_BAND_2GHZ)

		ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4,

					      skb->data, skb->len, 0, rate);

drivers/net/wireless/wl12xx/cmd.h

+2 −1
Original line number Diff line number Diff line
@@ -59,10 +59,11 @@ int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id, 
int wl12xx_cmd_build_null_data(struct wl1271 *wl, struct wl12xx_vif *wlvif);

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

			     u16 aid);

int wl1271_cmd_build_probe_req(struct wl1271 *wl,

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

			       const u8 *ssid, size_t ssid_len,

			       const u8 *ie, size_t ie_len, u8 band);

struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl,

					      struct wl12xx_vif *wlvif,

					      struct sk_buff *skb);

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

			     __be32 ip_addr);

drivers/net/wireless/wl12xx/main.c

+8 −8
Original line number Diff line number Diff line
@@ -1906,7 +1906,7 @@ static u8 wl12xx_get_role_type(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	return WL12XX_INVALID_ROLE_TYPE;

}



static int wl12xx_init_vif_data(struct ieee80211_vif *vif)

static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)

{

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
@@ -1949,6 +1949,8 @@ static int wl12xx_init_vif_data(struct ieee80211_vif *vif) 
		wlvif->ap.global_hlid = WL12XX_INVALID_LINK_ID;

	}



	wlvif->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;

	wlvif->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;

	wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;

	wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;

	wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
@@ -2058,7 +2060,7 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, 
		goto out;

	}



	ret = wl12xx_init_vif_data(vif);

	ret = wl12xx_init_vif_data(wl, vif);

	if (ret < 0)

		goto out;
@@ -2178,8 +2180,6 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl, 
	wlvif->ap.global_hlid = WL12XX_INVALID_LINK_ID;



	wl12xx_tx_reset_wlvif(wl, wlvif);

	wl->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;

	wl->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;

	wl1271_free_ap_keys(wl, wlvif);

	memset(wlvif->ap.sta_hlid_map, 0, sizeof(wlvif->ap.sta_hlid_map));

	wlvif->role_id = WL12XX_INVALID_ROLE_ID;
@@ -2293,7 +2293,7 @@ static int wl1271_unjoin(struct wl1271 *wl, struct wl12xx_vif *wlvif) 


static void wl1271_set_band_rate(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	wlvif->basic_rate_set = wl->bitrate_masks[wl->band];

	wlvif->basic_rate_set = wlvif->bitrate_masks[wl->band];

	wlvif->rate_set = wlvif->basic_rate_set;

}
@@ -3578,6 +3578,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, 
			 */

			dev_kfree_skb(wlvif->probereq);

			wlvif->probereq = wl1271_cmd_build_ap_probe_req(wl,

									wlvif,

									NULL);

			ieoffset = offsetof(struct ieee80211_mgmt,

					    u.probe_req.variable);
@@ -4202,6 +4203,7 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw, 
				   struct ieee80211_vif *vif,

				   const struct cfg80211_bitrate_mask *mask)

{

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	struct wl1271 *wl = hw->priv;

	int i;
@@ -4212,7 +4214,7 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw, 
	mutex_lock(&wl->mutex);



	for (i = 0; i < IEEE80211_NUM_BANDS; i++)

		wl->bitrate_masks[i] =

		wlvif->bitrate_masks[i] =

			wl1271_tx_enabled_rates_get(wl,

						    mask->control[i].legacy,

						    i);
@@ -4931,8 +4933,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void) 


	/* Apply default driver configuration. */

	wl1271_conf_init(wl);

	wl->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;

	wl->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;



	order = get_order(WL1271_AGGR_BUFFER_SIZE);

	wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);

drivers/net/wireless/wl12xx/scan.c

+11 −10
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void wl1271_scan_complete_work(struct work_struct *work) 


	if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) {

		/* restore hardware connection monitoring template */

		wl1271_cmd_build_ap_probe_req(wl, wlvif->probereq);

		wl1271_cmd_build_ap_probe_req(wl, wlvif, wlvif->probereq);

	}



	/* return to ROC if needed */
@@ -218,9 +218,9 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif, 


	memcpy(cmd->addr, vif->addr, ETH_ALEN);



	ret = wl1271_cmd_build_probe_req(wl, wl->scan.ssid, wl->scan.ssid_len,

					 wl->scan.req->ie, wl->scan.req->ie_len,

					 band);

	ret = wl1271_cmd_build_probe_req(wl, wlvif, wl->scan.ssid,

					 wl->scan.ssid_len, wl->scan.req->ie,

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

	if (ret < 0) {

		wl1271_error("PROBE request template failed");

		goto out;
@@ -251,6 +251,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif, 


void wl1271_scan_stm(struct wl1271 *wl, struct ieee80211_vif *vif)

{

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	int ret = 0;

	enum ieee80211_band band;

	u32 rate;
@@ -261,7 +262,7 @@ void wl1271_scan_stm(struct wl1271 *wl, struct ieee80211_vif *vif) 


	case WL1271_SCAN_STATE_2GHZ_ACTIVE:

		band = IEEE80211_BAND_2GHZ;

		rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);

		rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[band]);

		ret = wl1271_scan_send(wl, vif, band, false, rate);

		if (ret == WL1271_NOTHING_TO_SCAN) {

			wl->scan.state = WL1271_SCAN_STATE_2GHZ_PASSIVE;
@@ -272,7 +273,7 @@ void wl1271_scan_stm(struct wl1271 *wl, struct ieee80211_vif *vif) 


	case WL1271_SCAN_STATE_2GHZ_PASSIVE:

		band = IEEE80211_BAND_2GHZ;

		rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);

		rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[band]);

		ret = wl1271_scan_send(wl, vif, band, true, rate);

		if (ret == WL1271_NOTHING_TO_SCAN) {

			if (wl->enable_11a)
@@ -286,7 +287,7 @@ void wl1271_scan_stm(struct wl1271 *wl, struct ieee80211_vif *vif) 


	case WL1271_SCAN_STATE_5GHZ_ACTIVE:

		band = IEEE80211_BAND_5GHZ;

		rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);

		rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[band]);

		ret = wl1271_scan_send(wl, vif, band, false, rate);

		if (ret == WL1271_NOTHING_TO_SCAN) {

			wl->scan.state = WL1271_SCAN_STATE_5GHZ_PASSIVE;
@@ -297,7 +298,7 @@ void wl1271_scan_stm(struct wl1271 *wl, struct ieee80211_vif *vif) 


	case WL1271_SCAN_STATE_5GHZ_PASSIVE:

		band = IEEE80211_BAND_5GHZ;

		rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);

		rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[band]);

		ret = wl1271_scan_send(wl, vif, band, true, rate);

		if (ret == WL1271_NOTHING_TO_SCAN) {

			wl->scan.state = WL1271_SCAN_STATE_DONE;
@@ -642,7 +643,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl, 
	}



	if (!force_passive && cfg->active[0]) {

		ret = wl1271_cmd_build_probe_req(wl, req->ssids[0].ssid,

		ret = wl1271_cmd_build_probe_req(wl, wlvif, req->ssids[0].ssid,

						 req->ssids[0].ssid_len,

						 ies->ie[IEEE80211_BAND_2GHZ],

						 ies->len[IEEE80211_BAND_2GHZ],
@@ -654,7 +655,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl, 
	}



	if (!force_passive && cfg->active[1]) {

		ret = wl1271_cmd_build_probe_req(wl,  req->ssids[0].ssid,

		ret = wl1271_cmd_build_probe_req(wl, wlvif, req->ssids[0].ssid,

						 req->ssids[0].ssid_len,

						 ies->ie[IEEE80211_BAND_5GHZ],

						 ies->len[IEEE80211_BAND_5GHZ],

drivers/net/wireless/wl12xx/wl12xx.h

+1 −2
Original line number Diff line number Diff line
@@ -484,8 +484,6 @@ struct wl1271 { 


	bool sched_scanning;



	u32 bitrate_masks[IEEE80211_NUM_BANDS];



	/* The current band */

	enum ieee80211_band band;
@@ -600,6 +598,7 @@ struct wl12xx_vif { 
	u8 ssid[IEEE80211_MAX_SSID_LEN + 1];

	u8 ssid_len;



	u32 bitrate_masks[IEEE80211_NUM_BANDS];

	u32 basic_rate_set;



	/*