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

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

wl12xx: replace wl->mac_addr with vif->addr 



The mac address of the interface already exists in vif->addr.
Use it instead of wl->mac_addr.

It seems that due to some fw bug, we still need to set nvs->mac
to the actual mac addresss, otherwise the fw doesn't function
well (e.g. can't get dhcp address).
Thus, use wl->mac_addr for this purpose, and don't delete it yet.

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

drivers/net/wireless/wl12xx/cmd.c

+5 −4
Original line number Diff line number Diff line
@@ -358,7 +358,8 @@ static int wl1271_cmd_wait_for_event(struct wl1271 *wl, u32 mask) 
	return 0;

}



int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 role_type, u8 *role_id)

int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type,

			   u8 *role_id)

{

	struct wl12xx_cmd_role_enable *cmd;

	int ret;
@@ -381,7 +382,7 @@ int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 role_type, u8 *role_id) 
		goto out_free;

	}



	memcpy(cmd->mac_address, wl->mac_addr, ETH_ALEN);

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

	cmd->role_type = role_type;



	ret = wl1271_cmd_send(wl, CMD_ROLE_ENABLE, cmd, sizeof(*cmd), 0);
@@ -1200,14 +1201,14 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr) 
	return ret;

}



int wl1271_build_qos_null_data(struct wl1271 *wl)

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

{

	struct ieee80211_qos_hdr template;



	memset(&template, 0, sizeof(template));



	memcpy(template.addr1, wl->bssid, ETH_ALEN);

	memcpy(template.addr2, wl->mac_addr, ETH_ALEN);

	memcpy(template.addr2, vif->addr, ETH_ALEN);

	memcpy(template.addr3, wl->bssid, ETH_ALEN);



	template.frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |

drivers/net/wireless/wl12xx/cmd.h

+3 −2
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ int wl128x_cmd_general_parms(struct wl1271 *wl); 
int wl1271_cmd_radio_parms(struct wl1271 *wl);

int wl128x_cmd_radio_parms(struct wl1271 *wl);

int wl1271_cmd_ext_radio_parms(struct wl1271 *wl);

int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 role_type, u8 *role_id);

int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type,

			   u8 *role_id);

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);
@@ -62,7 +63,7 @@ int wl1271_cmd_build_probe_req(struct wl1271 *wl, 
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_build_qos_null_data(struct wl1271 *wl);

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_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,

drivers/net/wireless/wl12xx/event.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox) 
		wl1271_debug(DEBUG_EVENT, "status: 0x%x",

			     mbox->scheduled_scan_status);



		wl1271_scan_stm(wl);

		wl1271_scan_stm(wl, wl->scan_vif);

	}



	if (vector & PERIODIC_SCAN_REPORT_EVENT_ID) {

drivers/net/wireless/wl12xx/init.c

+16 −13
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ static int wl1271_ap_init_deauth_template(struct wl1271 *wl) 
	return ret;

}



static int wl1271_ap_init_null_template(struct wl1271 *wl)

static int wl1271_ap_init_null_template(struct wl1271 *wl,

					struct ieee80211_vif *vif)

{

	struct ieee80211_hdr_3addr *nullfunc;

	int ret;
@@ -141,8 +142,8 @@ static int wl1271_ap_init_null_template(struct wl1271 *wl) 


	/* nullfunc->addr1 is filled by FW */



	memcpy(nullfunc->addr2, wl->mac_addr, ETH_ALEN);

	memcpy(nullfunc->addr3, wl->mac_addr, ETH_ALEN);

	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);

	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, nullfunc,
@@ -153,7 +154,8 @@ static int wl1271_ap_init_null_template(struct wl1271 *wl) 
	return ret;

}



static int wl1271_ap_init_qos_null_template(struct wl1271 *wl)

static int wl1271_ap_init_qos_null_template(struct wl1271 *wl,

					    struct ieee80211_vif *vif)

{

	struct ieee80211_qos_hdr *qosnull;

	int ret;
@@ -171,8 +173,8 @@ static int wl1271_ap_init_qos_null_template(struct wl1271 *wl) 


	/* qosnull->addr1 is filled by FW */



	memcpy(qosnull->addr2, wl->mac_addr, ETH_ALEN);

	memcpy(qosnull->addr3, wl->mac_addr, ETH_ALEN);

	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);

	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, qosnull,
@@ -449,7 +451,7 @@ static int wl1271_ap_hw_init(struct wl1271 *wl) 
	return 0;

}



int wl1271_ap_init_templates(struct wl1271 *wl)

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

{

	int ret;
@@ -457,11 +459,11 @@ int wl1271_ap_init_templates(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	ret = wl1271_ap_init_null_template(wl);

	ret = wl1271_ap_init_null_template(wl, vif);

	if (ret < 0)

		return ret;



	ret = wl1271_ap_init_qos_null_template(wl);

	ret = wl1271_ap_init_qos_null_template(wl, vif);

	if (ret < 0)

		return ret;
@@ -476,9 +478,10 @@ int wl1271_ap_init_templates(struct wl1271 *wl) 
	return 0;

}



static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl)

static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl,

				      struct ieee80211_vif *vif)

{

	return wl1271_ap_init_templates(wl);

	return wl1271_ap_init_templates(wl, vif);

}



int wl1271_init_ap_rates(struct wl1271 *wl)
@@ -576,7 +579,7 @@ int wl1271_chip_specific_init(struct wl1271 *wl) 
}





int wl1271_hw_init(struct wl1271 *wl)

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

{

	struct conf_tx_ac_category *conf_ac;

	struct conf_tx_tid *conf_tid;
@@ -694,7 +697,7 @@ int wl1271_hw_init(struct wl1271 *wl) 


	/* Mode specific init - post mem init */

	if (is_ap)

		ret = wl1271_ap_hw_init_post_mem(wl);

		ret = wl1271_ap_hw_init_post_mem(wl, vif);

	else

		ret = wl1271_sta_hw_init_post_mem(wl);

drivers/net/wireless/wl12xx/init.h

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ int wl1271_init_phy_config(struct wl1271 *wl); 
int wl1271_init_pta(struct wl1271 *wl);

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_hw_init(struct wl1271 *wl, struct ieee80211_vif *vif);

int wl1271_init_ap_rates(struct wl1271 *wl);

int wl1271_ap_init_templates(struct wl1271 *wl);

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



#endif