Commit 73ff2850 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: remove brcms_bss_cfg->cur_etheraddr 



use brcms_pub->cur_etheraddr instead

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7a6c0b10

drivers/net/wireless/brcm80211/brcmsmac/main.c

+2 −2
Original line number Diff line number Diff line
@@ -3764,7 +3764,7 @@ static int brcms_c_set_mac(struct brcms_bss_cfg *bsscfg) 
	struct brcms_c_info *wlc = bsscfg->wlc;



	/* enter the MAC addr into the RXE match registers */

	brcms_c_set_addrmatch(wlc, RCM_MAC_OFFSET, bsscfg->cur_etheraddr);

	brcms_c_set_addrmatch(wlc, RCM_MAC_OFFSET, wlc->pub->cur_etheraddr);



	brcms_c_ampdu_macaddr_upd(wlc);
@@ -7355,7 +7355,7 @@ brcms_c_bcn_prb_template(struct brcms_c_info *wlc, u16 type, 
	/* A1 filled in by MAC for prb resp, broadcast for bcn */

	if (type == IEEE80211_STYPE_BEACON)

		memcpy(&h->da, &ether_bcast, ETH_ALEN);

	memcpy(&h->sa, &cfg->cur_etheraddr, ETH_ALEN);

	memcpy(&h->sa, &wlc->pub->cur_etheraddr, ETH_ALEN);

	memcpy(&h->bssid, &cfg->BSSID, ETH_ALEN);



	/* SEQ filled in by MAC */

drivers/net/wireless/brcm80211/brcmsmac/main.h

+0 −1
Original line number Diff line number Diff line
@@ -606,7 +606,6 @@ struct brcms_bss_cfg { 
	u8 SSID_len;

	u8 SSID[IEEE80211_MAX_SSID_LEN];

	u8 BSSID[ETH_ALEN];

	u8 cur_etheraddr[ETH_ALEN];

	struct brcms_bss_info *current_bss;

};