UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Hauke Mehrtens 2013-03-24 01:45:54 +01:00 committed by John W. Linville
parent 01996eaa1b
commit 7a6c0b1078
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/brcm80211/brcmsmac/main.c
View File

@ -7373,8 +7373,8 @@ void brcms_c_update_beacon(struct brcms_c_info *wlc)
{ {
struct brcms_bss_cfg *bsscfg = wlc->bsscfg; struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP || if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP ||
bsscfg->type == BRCMS_TYPE_ADHOC)) bsscfg->type == BRCMS_TYPE_ADHOC))
/* Clear the soft intmask */ /* Clear the soft intmask */
wlc->defmacintmask &= ~MI_BCNTPL; 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; struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
/* update AP or IBSS probe responses */ /* update AP or IBSS probe responses */
if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP || if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP ||
bsscfg->type == BRCMS_TYPE_ADHOC)) bsscfg->type == BRCMS_TYPE_ADHOC))
brcms_c_bss_update_probe_resp(wlc, bsscfg, suspend); 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); brcms_c_set_bssid(wlc->bsscfg);
/* Update tsf_cfprep if associated and up */ /* Update tsf_cfprep if associated and up */
if (wlc->pub->associated && wlc->bsscfg->up) { if (wlc->pub->associated && wlc->pub->up) {
u32 bi; u32 bi;
/* get beacon period and convert to uS */ /* get beacon period and convert to uS */

2
drivers/net/wireless/brcm80211/brcmsmac/main.h
View File

@ -587,7 +587,6 @@ enum brcms_bss_type {
* *
* wlc: wlc to which this bsscfg belongs to. * wlc: wlc to which this bsscfg belongs to.
* type: interface type * type: interface type
* up: is this configuration up operational
* SSID_len: the length of SSID * SSID_len: the length of SSID
* SSID: SSID string * SSID: SSID string
* *
@ -604,7 +603,6 @@ enum brcms_bss_type {
struct brcms_bss_cfg { struct brcms_bss_cfg {
struct brcms_c_info *wlc; struct brcms_c_info *wlc;
enum brcms_bss_type type; enum brcms_bss_type type;
bool up;
u8 SSID_len; u8 SSID_len;
u8 SSID[IEEE80211_MAX_SSID_LEN]; u8 SSID[IEEE80211_MAX_SSID_LEN];
u8 BSSID[ETH_ALEN]; u8 BSSID[ETH_ALEN];