33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
||
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
||
|
|
@@ -5067,9 +5067,8 @@ int brcms_c_up(struct brcms_c_info *wlc)
|
||
|
|
struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
|
||
|
|
mboolset(wlc->pub->radio_disabled,
|
||
|
|
WL_RADIO_HW_DISABLE);
|
||
|
|
- if (bsscfg->enable &&
|
||
|
|
- (bsscfg->type == BRCMS_TYPE_STATION ||
|
||
|
|
- bsscfg->type == BRCMS_TYPE_ADHOC))
|
||
|
|
+ if (bsscfg->type == BRCMS_TYPE_STATION ||
|
||
|
|
+ bsscfg->type == BRCMS_TYPE_ADHOC)
|
||
|
|
brcms_err(wlc->hw->d11core,
|
||
|
|
"wl%d: up: rfdisable -> "
|
||
|
|
"bsscfg_disable()\n",
|
||
|
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
|
||
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
|
||
|
|
@@ -588,7 +588,6 @@ enum brcms_bss_type {
|
||
|
|
* wlc: wlc to which this bsscfg belongs to.
|
||
|
|
* type: interface type
|
||
|
|
* up: is this configuration up operational
|
||
|
|
- * enable: is this configuration enabled
|
||
|
|
* SSID_len: the length of SSID
|
||
|
|
* SSID: SSID string
|
||
|
|
*
|
||
|
|
@@ -606,7 +605,6 @@ struct brcms_bss_cfg {
|
||
|
|
struct brcms_c_info *wlc;
|
||
|
|
enum brcms_bss_type type;
|
||
|
|
bool up;
|
||
|
|
- bool enable;
|
||
|
|
u8 SSID_len;
|
||
|
|
u8 SSID[IEEE80211_MAX_SSID_LEN];
|
||
|
|
u8 BSSID[ETH_ALEN];
|