diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-03-24 01:45:55 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-27 13:37:35 -0400 |
| commit | 73ff28504597dd6955e3600d02ecf5e1d7d628db (patch) | |
| tree | d0950c92666e09f68ac8fcf6045dbe1472f21577 | |
| parent | 7a6c0b10783a2b4abf1f44fefba8500364bc29a6 (diff) | |
| download | bluetooth-next-73ff28504597dd6955e3600d02ecf5e1d7d628db.tar.gz | |
brcmsmac: remove brcms_bss_cfg->cur_etheraddr
use brcms_pub->cur_etheraddr instead
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index 9af5851587e504..056ca2cf2936ab 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c @@ -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, ðer_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 */ diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/brcm80211/brcmsmac/main.h index 65818e2593d36e..397cff3cea579a 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.h +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h @@ -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; }; |