aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-03-23 20:45:53 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-03-27 13:37:34 -0400
commit01996eaa1b06073848b1f23eccc61e948b6941ed (patch)
tree8f632eb4eb8ca61c056bff4b2f958570f9b8e78c /drivers/net/wireless
parent6da3b6c48d79da96a36c2632053cf4f53bf48fb2 (diff)
brcmsmac: remove brcms_bss_cfg->enable
This was a read only member. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/main.c5
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/main.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 810b7e28058a..ca1c5851d634 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -5065,9 +5065,8 @@ int brcms_c_up(struct brcms_c_info *wlc)
5065 struct brcms_bss_cfg *bsscfg = wlc->bsscfg; 5065 struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
5066 mboolset(wlc->pub->radio_disabled, 5066 mboolset(wlc->pub->radio_disabled,
5067 WL_RADIO_HW_DISABLE); 5067 WL_RADIO_HW_DISABLE);
5068 if (bsscfg->enable && 5068 if (bsscfg->type == BRCMS_TYPE_STATION ||
5069 (bsscfg->type == BRCMS_TYPE_STATION || 5069 bsscfg->type == BRCMS_TYPE_ADHOC)
5070 bsscfg->type == BRCMS_TYPE_ADHOC))
5071 brcms_err(wlc->hw->d11core, 5070 brcms_err(wlc->hw->d11core,
5072 "wl%d: up: rfdisable -> " 5071 "wl%d: up: rfdisable -> "
5073 "bsscfg_disable()\n", 5072 "bsscfg_disable()\n",
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/brcm80211/brcmsmac/main.h
index 96dc2f4797cd..e2551a74fd7a 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
@@ -588,7 +588,6 @@ enum brcms_bss_type {
588 * wlc: wlc to which this bsscfg belongs to. 588 * wlc: wlc to which this bsscfg belongs to.
589 * type: interface type 589 * type: interface type
590 * up: is this configuration up operational 590 * up: is this configuration up operational
591 * enable: is this configuration enabled
592 * SSID_len: the length of SSID 591 * SSID_len: the length of SSID
593 * SSID: SSID string 592 * SSID: SSID string
594 * 593 *
@@ -606,7 +605,6 @@ struct brcms_bss_cfg {
606 struct brcms_c_info *wlc; 605 struct brcms_c_info *wlc;
607 enum brcms_bss_type type; 606 enum brcms_bss_type type;
608 bool up; 607 bool up;
609 bool enable;
610 u8 SSID_len; 608 u8 SSID_len;
611 u8 SSID[IEEE80211_MAX_SSID_LEN]; 609 u8 SSID[IEEE80211_MAX_SSID_LEN];
612 u8 BSSID[ETH_ALEN]; 610 u8 BSSID[ETH_ALEN];