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

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

wl12xx: define wl12xx_vif 



Define a per-vif data struct.
This struct holds all the vif-specifc data, which is
currently being hold by the global wl struct.

Start by moving the basic_rate_set field into it.

NOTE: in order to make the patches a bit smaller, start by
using wl->vif in some functions, instead of changing all
the function prototypes at once. finally, wl->vif will be
removed altogether.

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

drivers/net/wireless/wl12xx/cmd.c

+11 −10
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ int wl12xx_cmd_role_stop_dev(struct wl1271 *wl) 
	return ret;

}



int wl12xx_cmd_role_start_sta(struct wl1271 *wl)

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

{

	struct wl12xx_cmd_role_start *cmd;

	int ret;
@@ -572,7 +572,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl) 
	if (wl->band == IEEE80211_BAND_5GHZ)

		cmd->band = WL12XX_BAND_5GHZ;

	cmd->channel = wl->channel;

	cmd->sta.basic_rate_set = cpu_to_le32(wl->basic_rate_set);

	cmd->sta.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);

	cmd->sta.beacon_interval = cpu_to_le16(wl->beacon_int);

	cmd->sta.ssid_type = WL12XX_SSID_TYPE_ANY;

	cmd->sta.ssid_len = wl->ssid_len;
@@ -592,7 +592,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl) 
	wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "

		     "basic_rate_set: 0x%x, remote_rates: 0x%x",

		     wl->role_id, cmd->sta.hlid, cmd->sta.session,

		     wl->basic_rate_set, wl->rate_set);

		     wlvif->basic_rate_set, wl->rate_set);



	ret = wl1271_cmd_send(wl, CMD_ROLE_START, cmd, sizeof(*cmd), 0);

	if (ret < 0) {
@@ -649,7 +649,7 @@ int wl12xx_cmd_role_stop_sta(struct wl1271 *wl) 
	return ret;

}



int wl12xx_cmd_role_start_ap(struct wl1271 *wl)

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

{

	struct wl12xx_cmd_role_start *cmd;

	struct ieee80211_bss_conf *bss_conf = &wl->vif->bss_conf;
@@ -683,7 +683,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl) 
	cmd->ap.bss_index = WL1271_AP_BSS_INDEX;

	cmd->ap.global_hlid = wl->ap_global_hlid;

	cmd->ap.broadcast_hlid = wl->ap_bcast_hlid;

	cmd->ap.basic_rate_set = cpu_to_le32(wl->basic_rate_set);

	cmd->ap.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);

	cmd->ap.beacon_interval = cpu_to_le16(wl->beacon_int);

	cmd->ap.dtim_interval = bss_conf->dtim_period;

	cmd->ap.beacon_expiry = WL1271_AP_DEF_BEACON_EXP;
@@ -767,7 +767,7 @@ int wl12xx_cmd_role_stop_ap(struct wl1271 *wl) 
	return ret;

}



int wl12xx_cmd_role_start_ibss(struct wl1271 *wl)

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

{

	struct wl12xx_cmd_role_start *cmd;

	struct ieee80211_bss_conf *bss_conf = &wl->vif->bss_conf;
@@ -785,7 +785,7 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl) 
	if (wl->band == IEEE80211_BAND_5GHZ)

		cmd->band = WL12XX_BAND_5GHZ;

	cmd->channel = wl->channel;

	cmd->ibss.basic_rate_set = cpu_to_le32(wl->basic_rate_set);

	cmd->ibss.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);

	cmd->ibss.beacon_interval = cpu_to_le16(wl->beacon_int);

	cmd->ibss.dtim_interval = bss_conf->dtim_period;

	cmd->ibss.ssid_type = WL12XX_SSID_TYPE_ANY;
@@ -805,7 +805,7 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl) 
	wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "

		     "basic_rate_set: 0x%x, remote_rates: 0x%x",

		     wl->role_id, cmd->sta.hlid, cmd->sta.session,

		     wl->basic_rate_set, wl->rate_set);

		     wlvif->basic_rate_set, wl->rate_set);



	wl1271_debug(DEBUG_CMD, "wl->bssid = %pM", wl->bssid);
@@ -1085,7 +1085,8 @@ int wl1271_cmd_build_klv_null_data(struct wl1271 *wl) 


}



int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid)

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

			     u16 aid)

{

	struct sk_buff *skb;

	int ret = 0;
@@ -1095,7 +1096,7 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid) 
		goto out;



	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, skb->data,

				      skb->len, 0, wl->basic_rate_set);

				      skb->len, 0, wlvif->basic_rate_set);



out:

	dev_kfree_skb(skb);

drivers/net/wireless/wl12xx/cmd.h

+5 −4
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type, 
int wl12xx_cmd_role_disable(struct wl1271 *wl, u8 *role_id);

int wl12xx_cmd_role_start_dev(struct wl1271 *wl);

int wl12xx_cmd_role_stop_dev(struct wl1271 *wl);

int wl12xx_cmd_role_start_sta(struct wl1271 *wl);

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

int wl12xx_cmd_role_stop_sta(struct wl1271 *wl);

int wl12xx_cmd_role_start_ap(struct wl1271 *wl);

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

int wl12xx_cmd_role_stop_ap(struct wl1271 *wl);

int wl12xx_cmd_role_start_ibss(struct wl1271 *wl);

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

int wl1271_cmd_test(struct wl1271 *wl, void *buf, size_t buf_len, u8 answer);

int wl1271_cmd_interrogate(struct wl1271 *wl, u16 id, void *buf, size_t len);

int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len);
@@ -56,7 +56,8 @@ int wl1271_cmd_read_memory(struct wl1271 *wl, u32 addr, void *answer, 
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 wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid);

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

			     u16 aid);

int wl1271_cmd_build_probe_req(struct wl1271 *wl,

			       const u8 *ssid, size_t ssid_len,

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

drivers/net/wireless/wl12xx/debugfs.c

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

	DRIVER_STATE_PRINT_INT(channel);

	DRIVER_STATE_PRINT_HEX(rate_set);

	DRIVER_STATE_PRINT_HEX(basic_rate_set);

	DRIVER_STATE_PRINT_HEX(basic_rate);

	DRIVER_STATE_PRINT_INT(band);

	DRIVER_STATE_PRINT_INT(beacon_int);

drivers/net/wireless/wl12xx/init.c

+20 −14
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ int wl1271_init_templates_config(struct wl1271 *wl) 
	return 0;

}



static int wl1271_ap_init_deauth_template(struct wl1271 *wl)

static int wl1271_ap_init_deauth_template(struct wl1271 *wl,

					  struct wl12xx_vif *wlvif)

{

	struct wl12xx_disconn_template *tmpl;

	int ret;
@@ -137,7 +138,7 @@ static int wl1271_ap_init_deauth_template(struct wl1271 *wl) 
	tmpl->header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT |

					     IEEE80211_STYPE_DEAUTH);



	rate = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);

	rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);

	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_DEAUTH_AP,

				      tmpl, sizeof(*tmpl), 0, rate);
@@ -149,6 +150,7 @@ static int wl1271_ap_init_deauth_template(struct wl1271 *wl) 
static int wl1271_ap_init_null_template(struct wl1271 *wl,

					struct ieee80211_vif *vif)

{

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	struct ieee80211_hdr_3addr *nullfunc;

	int ret;

	u32 rate;
@@ -168,7 +170,7 @@ static int wl1271_ap_init_null_template(struct wl1271 *wl, 
	memcpy(nullfunc->addr2, vif->addr, ETH_ALEN);

	memcpy(nullfunc->addr3, vif->addr, ETH_ALEN);



	rate = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);

	rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);

	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, nullfunc,

				      sizeof(*nullfunc), 0, rate);
@@ -180,6 +182,7 @@ static int wl1271_ap_init_null_template(struct wl1271 *wl, 
static int wl1271_ap_init_qos_null_template(struct wl1271 *wl,

					    struct ieee80211_vif *vif)

{

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	struct ieee80211_qos_hdr *qosnull;

	int ret;

	u32 rate;
@@ -199,7 +202,7 @@ static int wl1271_ap_init_qos_null_template(struct wl1271 *wl, 
	memcpy(qosnull->addr2, vif->addr, ETH_ALEN);

	memcpy(qosnull->addr3, vif->addr, ETH_ALEN);



	rate = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);

	rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);

	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, qosnull,

				      sizeof(*qosnull), 0, rate);
@@ -370,7 +373,7 @@ static int wl1271_sta_hw_init_post_mem(struct wl1271 *wl) 
}



/* generic ap initialization (non vif-specific) */

static int wl1271_ap_hw_init(struct wl1271 *wl)

static int wl1271_ap_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	int ret;
@@ -379,7 +382,7 @@ static int wl1271_ap_hw_init(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	ret = wl1271_init_ap_rates(wl);

	ret = wl1271_init_ap_rates(wl, wlvif);

	if (ret < 0)

		return ret;
@@ -388,9 +391,10 @@ static int wl1271_ap_hw_init(struct wl1271 *wl) 


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

{

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	int ret;



	ret = wl1271_ap_init_deauth_template(wl);

	ret = wl1271_ap_init_deauth_template(wl, wlvif);

	if (ret < 0)

		return ret;
@@ -419,18 +423,19 @@ static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl, 
	return wl1271_ap_init_templates(wl, vif);

}



int wl1271_init_ap_rates(struct wl1271 *wl)

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

{

	int i, ret;

	struct conf_tx_rate_class rc;

	u32 supported_rates;



	wl1271_debug(DEBUG_AP, "AP basic rate set: 0x%x", wl->basic_rate_set);

	wl1271_debug(DEBUG_AP, "AP basic rate set: 0x%x",

		     wlvif->basic_rate_set);



	if (wl->basic_rate_set == 0)

	if (wlvif->basic_rate_set == 0)

		return -EINVAL;



	rc.enabled_rates = wl->basic_rate_set;

	rc.enabled_rates = wlvif->basic_rate_set;

	rc.long_retry_limit = 10;

	rc.short_retry_limit = 10;

	rc.aflags = 0;
@@ -439,7 +444,7 @@ int wl1271_init_ap_rates(struct wl1271 *wl) 
		return ret;



	/* use the min basic rate for AP broadcast/multicast */

	rc.enabled_rates = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);

	rc.enabled_rates = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);

	rc.short_retry_limit = 10;

	rc.long_retry_limit = 10;

	rc.aflags = 0;
@@ -451,7 +456,7 @@ int wl1271_init_ap_rates(struct wl1271 *wl) 
	 * If the basic rates contain OFDM rates, use OFDM only

	 * rates for unicast TX as well. Else use all supported rates.

	 */

	if ((wl->basic_rate_set & CONF_TX_OFDM_RATES))

	if ((wlvif->basic_rate_set & CONF_TX_OFDM_RATES))

		supported_rates = CONF_TX_OFDM_RATES;

	else

		supported_rates = CONF_TX_AP_ENABLED_RATES;
@@ -564,6 +569,7 @@ static int wl12xx_init_ap_role(struct wl1271 *wl, struct ieee80211_vif *vif) 


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

{

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	struct conf_tx_ac_category *conf_ac;

	struct conf_tx_tid *conf_tid;

	bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
@@ -572,7 +578,7 @@ int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif) 


	/* Mode specific init */

	if (is_ap) {

		ret = wl1271_ap_hw_init(wl);

		ret = wl1271_ap_hw_init(wl, wlvif);

		if (ret < 0)

			return ret;

drivers/net/wireless/wl12xx/init.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int wl1271_init_energy_detection(struct wl1271 *wl); 
int wl1271_chip_specific_init(struct wl1271 *wl);

int wl1271_hw_init(struct wl1271 *wl);

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

int wl1271_init_ap_rates(struct wl1271 *wl);

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

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



#endif