All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hauke Mehrtens <hauke@hauke-m.de>
To: linville@tuxdriver.com
Cc: arend@broadcom.com, linux-wireless@vger.kernel.org,
	brcm80211-dev-list@broadcom.com,
	Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 04/15] brcmsmac: remove brcms_bss_cfg->associated
Date: Sun, 24 Mar 2013 01:45:52 +0100	[thread overview]
Message-ID: <1364085963-25940-5-git-send-email-hauke@hauke-m.de> (raw)
In-Reply-To: <1364085963-25940-1-git-send-email-hauke@hauke-m.de>

Replaced the usage with pub->associated.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 drivers/net/wireless/brcm80211/brcmsmac/main.c |   12 +++---------
 drivers/net/wireless/brcm80211/brcmsmac/main.h |    2 --
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 90e6c0d..810b7e2 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -3049,8 +3049,6 @@ static void brcms_b_antsel_set(struct brcms_hardware *wlc_hw, u32 antsel_avail)
  */
 static bool brcms_c_ps_allowed(struct brcms_c_info *wlc)
 {
-	struct brcms_bss_cfg *cfg = wlc->bsscfg;
-
 	/* disallow PS when one of the following global conditions meets */
 	if (!wlc->pub->associated)
 		return false;
@@ -3059,9 +3057,6 @@ static bool brcms_c_ps_allowed(struct brcms_c_info *wlc)
 	if (wlc->filter_flags & FIF_PROMISC_IN_BSS)
 		return false;
 
-	if (cfg->associated)
-		return false;
-
 	return true;
 }
 
@@ -3819,7 +3814,7 @@ static void brcms_c_set_home_chanspec(struct brcms_c_info *wlc, u16 chanspec)
 	if (wlc->home_chanspec != chanspec) {
 		wlc->home_chanspec = chanspec;
 
-		if (wlc->bsscfg->associated)
+		if (wlc->pub->associated)
 			wlc->bsscfg->current_bss->chanspec = chanspec;
 	}
 }
@@ -5433,7 +5428,7 @@ static void brcms_c_ofdm_rateset_war(struct brcms_c_info *wlc)
 	u8 r;
 	bool war = false;
 
-	if (wlc->bsscfg->associated)
+	if (wlc->pub->associated)
 		r = wlc->bsscfg->current_bss->rateset.rates[0];
 	else
 		r = wlc->default_bss->rateset.rates[0];
@@ -5527,7 +5522,7 @@ int brcms_c_set_rateset(struct brcms_c_info *wlc, struct brcm_rateset *rs)
 	/* merge rateset coming in with the current mcsset */
 	if (wlc->pub->_n_enab & SUPPORT_11N) {
 		struct brcms_bss_info *mcsset_bss;
-		if (wlc->bsscfg->associated)
+		if (wlc->pub->associated)
 			mcsset_bss = wlc->bsscfg->current_bss;
 		else
 			mcsset_bss = wlc->default_bss;
@@ -7496,7 +7491,6 @@ void brcms_c_scan_stop(struct brcms_c_info *wlc)
 void brcms_c_associate_upd(struct brcms_c_info *wlc, bool state)
 {
 	wlc->pub->associated = state;
-	wlc->bsscfg->associated = state;
 }
 
 /*
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/brcm80211/brcmsmac/main.h
index 0cfe782..96dc2f4 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
@@ -589,7 +589,6 @@ enum brcms_bss_type {
  * type: interface type
  * up: is this configuration up operational
  * enable: is this configuration enabled
- * associated: is BSS in ASSOCIATED state
  * SSID_len: the length of SSID
  * SSID: SSID string
  *
@@ -608,7 +607,6 @@ struct brcms_bss_cfg {
 	enum brcms_bss_type type;
 	bool up;
 	bool enable;
-	bool associated;
 	u8 SSID_len;
 	u8 SSID[IEEE80211_MAX_SSID_LEN];
 	u8 BSSID[ETH_ALEN];
-- 
1.7.10.4


  parent reply	other threads:[~2013-03-24  0:47 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-24  0:45 [PATCH 00/15] brcmsmac: add AP mode Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 01/15] brcmsmac: implement ieee80211_ops get_tsf and set_tsf Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 02/15] brcmsmac: add interface type to brcms_bss_cfg Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 03/15] brcmsmac: remove brcms_bss_cfg->BSS Hauke Mehrtens
2013-06-06 12:05   ` Arend van Spriel
2013-06-12 13:46     ` Hauke Mehrtens
2013-03-24  0:45 ` Hauke Mehrtens [this message]
2013-05-18 19:53   ` REGRESSION: v3.10-rc1: [PATCH 04/15] brcmsmac: remove brcms_bss_cfg->associated Arend van Spriel
2013-05-18 23:34     ` Jonas Gorski
2013-05-19  8:31       ` Arend van Spriel
2013-05-19  8:21     ` Arend van Spriel
2013-05-19 10:24       ` Hauke Mehrtens
2013-05-28 20:05         ` Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 05/15] brcmsmac: remove brcms_bss_cfg->enable Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 06/15] brcmsmac: remove brcms_bss_cfg->up Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 07/15] brcmsmac: remove brcms_bss_cfg->cur_etheraddr Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 08/15] brcmsmac: remove brcms_pub->bcmerr Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 09/15] brcmsmac: write beacon period to hardware Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 10/15] brcmsmac: add beacon template support Hauke Mehrtens
2013-03-24  0:45 ` [PATCH 11/15] brcmsmac: react on changing SSID Hauke Mehrtens
2013-03-24  0:46 ` [PATCH 12/15] brcmsmac: add support for probe response template Hauke Mehrtens
2013-03-24  0:46 ` [PATCH 13/15] brcmsmac: deactivate ucode sending probe responses Hauke Mehrtens
2013-03-24  0:46 ` [PATCH 14/15] brcmsmac: activate AP support Hauke Mehrtens
2013-03-24  0:46 ` [PATCH 15/15] brcmsmac: add support for adhoc mode Hauke Mehrtens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1364085963-25940-5-git-send-email-hauke@hauke-m.de \
    --to=hauke@hauke-m.de \
    --cc=arend@broadcom.com \
    --cc=brcm80211-dev-list@broadcom.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.