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

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

wl12xx: move basic_rate into wlvif 



move basic_rate 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 30d0c8fd

drivers/net/wireless/wl12xx/acx.c

+4 −4
Original line number Diff line number Diff line
@@ -755,11 +755,11 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	}



	wl1271_debug(DEBUG_ACX, "basic_rate: 0x%x, full_rate: 0x%x",

		wl->basic_rate, wlvif->rate_set);

		wlvif->basic_rate, wlvif->rate_set);



	/* configure one basic rate class */

	acx->rate_policy_idx = cpu_to_le32(ACX_TX_BASIC_RATE);

	acx->rate_policy.enabled_rates = cpu_to_le32(wl->basic_rate);

	acx->rate_policy.enabled_rates = cpu_to_le32(wlvif->basic_rate);

	acx->rate_policy.short_retry_limit = c->short_retry_limit;

	acx->rate_policy.long_retry_limit = c->long_retry_limit;

	acx->rate_policy.aflags = c->aflags;
@@ -1567,7 +1567,7 @@ int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_config_ps(struct wl1271 *wl)

int wl12xx_acx_config_ps(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	struct wl1271_acx_config_ps *config_ps;

	int ret;
@@ -1582,7 +1582,7 @@ int wl1271_acx_config_ps(struct wl1271 *wl) 


	config_ps->exit_retries = wl->conf.conn.psm_exit_retries;

	config_ps->enter_retries = wl->conf.conn.psm_entry_retries;

	config_ps->null_data_rate = cpu_to_le32(wl->basic_rate);

	config_ps->null_data_rate = cpu_to_le32(wlvif->basic_rate);



	ret = wl1271_cmd_configure(wl, ACX_CONFIG_PS, config_ps,

				   sizeof(*config_ps));

drivers/net/wireless/wl12xx/acx.h

+1 −1
Original line number Diff line number Diff line
@@ -1295,7 +1295,7 @@ int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, 
int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime);

int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable);

int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl);

int wl1271_acx_config_ps(struct wl1271 *wl);

int wl12xx_acx_config_ps(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl1271_acx_set_inconnection_sta(struct wl1271 *wl, u8 *addr);

int wl1271_acx_fm_coex(struct wl1271 *wl);

int wl12xx_acx_set_rate_mgmt_params(struct wl1271 *wl);

drivers/net/wireless/wl12xx/cmd.c

+14 −9
Original line number Diff line number Diff line
@@ -1031,7 +1031,7 @@ int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id, 
	return ret;

}



int wl1271_cmd_build_null_data(struct wl1271 *wl)

int wl12xx_cmd_build_null_data(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	struct sk_buff *skb = NULL;

	int size;
@@ -1043,7 +1043,8 @@ int wl1271_cmd_build_null_data(struct wl1271 *wl) 
		size = sizeof(struct wl12xx_null_data_template);

		ptr = NULL;

	} else {

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

		skb = ieee80211_nullfunc_get(wl->hw,

					     wl12xx_wlvif_to_vif(wlvif));

		if (!skb)

			goto out;

		size = skb->len;
@@ -1051,7 +1052,7 @@ int wl1271_cmd_build_null_data(struct wl1271 *wl) 
	}



	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, ptr, size, 0,

				      wl->basic_rate);

				      wlvif->basic_rate);



out:

	dev_kfree_skb(skb);
@@ -1062,19 +1063,21 @@ int wl1271_cmd_build_null_data(struct wl1271 *wl) 


}



int wl1271_cmd_build_klv_null_data(struct wl1271 *wl)

int wl12xx_cmd_build_klv_null_data(struct wl1271 *wl,

				   struct wl12xx_vif *wlvif)

{

	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);

	struct sk_buff *skb = NULL;

	int ret = -ENOMEM;



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

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

	if (!skb)

		goto out;



	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_KLV,

				      skb->data, skb->len,

				      CMD_TEMPL_KLV_IDX_NULL_DATA,

				      wl->basic_rate);

				      wlvif->basic_rate);



out:

	dev_kfree_skb(skb);
@@ -1161,7 +1164,8 @@ struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl, 
	return skb;

}



int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr)

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

			     __be32 ip_addr)

{

	int ret;

	struct wl12xx_arp_rsp_template tmpl;
@@ -1197,13 +1201,14 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr) 


	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_ARP_RSP,

				      &tmpl, sizeof(tmpl), 0,

				      wl->basic_rate);

				      wlvif->basic_rate);



	return ret;

}



int wl1271_build_qos_null_data(struct wl1271 *wl, struct ieee80211_vif *vif)

{

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	struct ieee80211_qos_hdr template;



	memset(&template, 0, sizeof(template));
@@ -1221,7 +1226,7 @@ int wl1271_build_qos_null_data(struct wl1271 *wl, struct ieee80211_vif *vif) 


	return wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, &template,

				       sizeof(template), 0,

				       wl->basic_rate);

				       wlvif->basic_rate);

}



int wl12xx_cmd_set_default_wep_key(struct wl1271 *wl, u8 id, u8 hlid)

drivers/net/wireless/wl12xx/cmd.h

+5 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int wl1271_cmd_read_memory(struct wl1271 *wl, u32 addr, void *answer, 
			   size_t len);

int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,

			    void *buf, size_t buf_len, int index, u32 rates);

int wl1271_cmd_build_null_data(struct wl1271 *wl);

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,
@@ -63,9 +63,11 @@ int wl1271_cmd_build_probe_req(struct wl1271 *wl, 
			       const u8 *ie, size_t ie_len, u8 band);

struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl,

					      struct sk_buff *skb);

int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr);

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

			     __be32 ip_addr);

int wl1271_build_qos_null_data(struct wl1271 *wl, struct ieee80211_vif *vif);

int wl1271_cmd_build_klv_null_data(struct wl1271 *wl);

int wl12xx_cmd_build_klv_null_data(struct wl1271 *wl,

				   struct wl12xx_vif *wlvif);

int wl12xx_cmd_set_default_wep_key(struct wl1271 *wl, u8 id, u8 hlid);

int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,

			   u8 key_size, const u8 *key, const u8 *addr,

drivers/net/wireless/wl12xx/debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -352,7 +352,6 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf, 
	DRIVER_STATE_PRINT_INT(state);

	DRIVER_STATE_PRINT_INT(bss_type);

	DRIVER_STATE_PRINT_INT(channel);

	DRIVER_STATE_PRINT_HEX(basic_rate);

	DRIVER_STATE_PRINT_INT(band);

	DRIVER_STATE_PRINT_INT(beacon_int);

	DRIVER_STATE_PRINT_INT(psm_entry_retry);