mac80211: merge upstream legacy minstrel improvements
[openwrt.git] / package / mac80211 / patches / 864-brcmsmac-remove-brcms_bss_cfg-enable.patch
1 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
2 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
3 @@ -5067,9 +5067,8 @@ int brcms_c_up(struct brcms_c_info *wlc)
4                                 struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
5                                 mboolset(wlc->pub->radio_disabled,
6                                          WL_RADIO_HW_DISABLE);
7 -                               if (bsscfg->enable &&
8 -                                   (bsscfg->type == BRCMS_TYPE_STATION ||
9 -                                    bsscfg->type == BRCMS_TYPE_ADHOC))
10 +                               if (bsscfg->type == BRCMS_TYPE_STATION ||
11 +                                   bsscfg->type == BRCMS_TYPE_ADHOC)
12                                         brcms_err(wlc->hw->d11core,
13                                                   "wl%d: up: rfdisable -> "
14                                                   "bsscfg_disable()\n",
15 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
16 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
17 @@ -588,7 +588,6 @@ enum brcms_bss_type {
18   * wlc: wlc to which this bsscfg belongs to.
19   * type: interface type
20   * up: is this configuration up operational
21 - * enable: is this configuration enabled
22   * SSID_len: the length of SSID
23   * SSID: SSID string
24   *
25 @@ -606,7 +605,6 @@ struct brcms_bss_cfg {
26         struct brcms_c_info *wlc;
27         enum brcms_bss_type type;
28         bool up;
29 -       bool enable;
30         u8 SSID_len;
31         u8 SSID[IEEE80211_MAX_SSID_LEN];
32         u8 BSSID[ETH_ALEN];