From: John Crispin <john@phrozen.org>
To: Johannes Berg <johannes@sipsolutions.net>,
Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org,
John Crispin <john@phrozen.org>
Subject: [PATCH 5/7] mac80211: drop now unused bss_color element
Date: Fri, 6 Dec 2019 15:33:59 +0100 [thread overview]
Message-ID: <20191206143401.4080-5-john@phrozen.org> (raw)
In-Reply-To: <20191206143401.4080-1-john@phrozen.org>
With all users of bss_color converted we can drop the old element. Driver
code should now use the new he_bss_color struct.
Signed-off-by: John Crispin <john@phrozen.org>
---
include/net/mac80211.h | 2 --
net/mac80211/mlme.c | 1 -
2 files changed, 3 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 994686443553..9a67fd2cfe4b 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -496,7 +496,6 @@ struct ieee80211_ftm_responder_params {
* This structure keeps information about a BSS (and an association
* to that BSS) that can change during the lifetime of the BSS.
*
- * @bss_color: 6-bit value to mark inter-BSS frame, if BSS supports HE
* @htc_trig_based_pkt_ext: default PE in 4us units, if BSS supports HE
* @multi_sta_back_32bit: supports BA bitmap of 32-bits in Multi-STA BACK
* @uora_exists: is the UORA element advertised by AP
@@ -610,7 +609,6 @@ struct ieee80211_ftm_responder_params {
*/
struct ieee80211_bss_conf {
const u8 *bssid;
- u8 bss_color;
u8 htc_trig_based_pkt_ext;
bool multi_sta_back_32bit;
bool uora_exists;
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 319d43f4082b..bc602d460b73 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3371,7 +3371,6 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
}
if (bss_conf->he_support) {
- bss_conf->bss_color =
bss_conf->he_bss_color.color =
le32_get_bits(elems.he_operation->he_oper_params,
IEEE80211_HE_OPERATION_BSS_COLOR_MASK);
--
2.20.1
next prev parent reply other threads:[~2019-12-06 14:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-06 14:33 [PATCH 1/7] mac80211: add a struct for holding BSS color settings John Crispin
2019-12-06 14:33 ` [PATCH 2/7] nl80211: add handling for BSS color John Crispin
2019-12-06 19:13 ` John Crispin
2019-12-06 14:33 ` [PATCH 3/7] mac80211: " John Crispin
2019-12-06 14:33 ` [PATCH 4/7] iwlwifi: use new bss_color struct John Crispin
2019-12-06 14:33 ` John Crispin [this message]
2019-12-06 14:34 ` [PATCH 6/7] ath11k: add WMI calls required for handling BSS color John Crispin
2019-12-09 4:33 ` vthiagar
2019-12-06 14:34 ` [PATCH 7/7] ath11k: add handling for " John Crispin
2019-12-09 4:35 ` vthiagar
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=20191206143401.4080-5-john@phrozen.org \
--to=john@phrozen.org \
--cc=ath11k@lists.infradead.org \
--cc=johannes@sipsolutions.net \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).