Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a6c0b10 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: remove brcms_bss_cfg->up 



This was a read only member, replace it with pub->up.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 01996eaa

drivers/net/wireless/brcm80211/brcmsmac/main.c

+5 −5
Original line number Diff line number Diff line
@@ -7373,7 +7373,7 @@ 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 ||

	if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP ||

			     bsscfg->type == BRCMS_TYPE_ADHOC))

		/* Clear the soft intmask */

		wlc->defmacintmask &= ~MI_BCNTPL;
@@ -7449,7 +7449,7 @@ 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 ||

	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 */

drivers/net/wireless/brcm80211/brcmsmac/main.h

+0 −2
Original line number Diff line number Diff line
@@ -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];