diff options
| author | Hauke Mehrtens | 2013-03-24 01:45:54 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-03-27 13:37:34 -0400 |
| commit | 7a6c0b10783a2b4abf1f44fefba8500364bc29a6 (patch) | |
| tree | d1f6c86b6e17bf06db1da843f4248effef40982c /drivers/net/wireless/brcm80211/brcmsmac | |
| parent | 01996eaa1b06073848b1f23eccc61e948b6941ed (diff) | |
brcmsmac: remove brcms_bss_cfg->up
This was a read only member, replace it with pub->up.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.c | 10 | ||||
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index ca1c5851d634..9af5851587e5 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c @@ -7373,8 +7373,8 @@ void brcms_c_update_beacon(struct brcms_c_info *wlc) { struct brcms_bss_cfg *bsscfg = wlc->bsscfg; - if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP || - bsscfg->type == BRCMS_TYPE_ADHOC)) + if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP || + bsscfg->type == BRCMS_TYPE_ADHOC)) /* Clear the soft intmask */ wlc->defmacintmask &= ~MI_BCNTPL; } @@ -7449,8 +7449,8 @@ void brcms_c_update_probe_resp(struct brcms_c_info *wlc, bool suspend) struct brcms_bss_cfg *bsscfg = wlc->bsscfg; /* update AP or IBSS probe responses */ - if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP || - bsscfg->type == BRCMS_TYPE_ADHOC)) + if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP || + bsscfg->type == BRCMS_TYPE_ADHOC)) brcms_c_bss_update_probe_resp(wlc, bsscfg, suspend); } @@ -7803,7 +7803,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx) brcms_c_set_bssid(wlc->bsscfg); /* Update tsf_cfprep if associated and up */ - if (wlc->pub->associated && wlc->bsscfg->up) { + if (wlc->pub->associated && wlc->pub->up) { u32 bi; /* get beacon period and convert to uS */ diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/brcm80211/brcmsmac/main.h index e2551a74fd7a..65818e2593d3 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.h +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h @@ -587,7 +587,6 @@ enum brcms_bss_type { * * wlc: wlc to which this bsscfg belongs to. * type: interface type - * up: is this configuration up operational * SSID_len: the length of SSID * SSID: SSID string * @@ -604,7 +603,6 @@ enum brcms_bss_type { struct brcms_bss_cfg { struct brcms_c_info *wlc; enum brcms_bss_type type; - bool up; u8 SSID_len; u8 SSID[IEEE80211_MAX_SSID_LEN]; u8 BSSID[ETH_ALEN]; |