procd: fix wrap around bug in logread time handling code
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 866-brcmsmac-remove-brcms_bss_cfg-cur_etheraddr.patch
1 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
2 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
3 @@ -3766,7 +3766,7 @@ static int brcms_c_set_mac(struct brcms_
4 struct brcms_c_info *wlc = bsscfg->wlc;
5
6 /* enter the MAC addr into the RXE match registers */
7 - brcms_c_set_addrmatch(wlc, RCM_MAC_OFFSET, bsscfg->cur_etheraddr);
8 + brcms_c_set_addrmatch(wlc, RCM_MAC_OFFSET, wlc->pub->cur_etheraddr);
9
10 brcms_c_ampdu_macaddr_upd(wlc);
11
12 @@ -7359,7 +7359,7 @@ brcms_c_bcn_prb_template(struct brcms_c_
13 /* A1 filled in by MAC for prb resp, broadcast for bcn */
14 if (type == IEEE80211_STYPE_BEACON)
15 memcpy(&h->da, &ether_bcast, ETH_ALEN);
16 - memcpy(&h->sa, &cfg->cur_etheraddr, ETH_ALEN);
17 + memcpy(&h->sa, &wlc->pub->cur_etheraddr, ETH_ALEN);
18 memcpy(&h->bssid, &cfg->BSSID, ETH_ALEN);
19
20 /* SEQ filled in by MAC */
21 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
22 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
23 @@ -606,7 +606,6 @@ struct brcms_bss_cfg {
24 u8 SSID_len;
25 u8 SSID[IEEE80211_MAX_SSID_LEN];
26 u8 BSSID[ETH_ALEN];
27 - u8 cur_etheraddr[ETH_ALEN];
28 struct brcms_bss_info *current_bss;
29 };
30