mac80211: update to 2013-02-22 from trunk + backports

[12.09/openwrt.git] / package / mac80211 / patches / 866-brcmsmac-remove-brcms_bss_cfg-cur_etheraddr.patch

diff --git a/package/mac80211/patches/866-brcmsmac-remove-brcms_bss_cfg-cur_etheraddr.patch b/package/mac80211/patches/866-brcmsmac-remove-brcms_bss_cfg-cur_etheraddr.patch
new file mode 100644 (file)
index 0000000..0571932
--- /dev/null
+++ b/package/mac80211/patches/866-brcmsmac-remove-brcms_bss_cfg-cur_etheraddr.patch
@@ -0,0 +1,30 @@
+--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
+@@ -3766,7 +3766,7 @@ static int brcms_c_set_mac(struct brcms_
+       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);
+ 
+@@ -7359,7 +7359,7 @@ brcms_c_bcn_prb_template(struct brcms_c_
+       /* 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 */
+--- 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;
+ };
+