From: Luca Coelho <luca@coelho.fi>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
Shaul Triebitz <shaul.triebitz@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 04/24] mac80211: update HE operation fields to D3.0
Date: Sat, 15 Dec 2018 11:03:05 +0200 [thread overview]
Message-ID: <20181215090325.31604-5-luca@coelho.fi> (raw)
In-Reply-To: <20181215090325.31604-1-luca@coelho.fi>
From: Shaul Triebitz <shaul.triebitz@intel.com>
HE Operation element has changed in 11ax D3.0. Update the fields
accordingly.
Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
include/linux/ieee80211.h | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index a9484b3e898d..3b04e72315e1 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1619,7 +1619,7 @@ struct ieee80211_he_mcs_nss_supp {
* struct ieee80211_he_operation - HE capabilities element
*
* This structure is the "HE operation element" fields as
- * described in P802.11ax_D2.0 section 9.4.2.238
+ * described in P802.11ax_D3.0 section 9.4.2.238
*/
struct ieee80211_he_operation {
__le32 he_oper_params;
@@ -2011,17 +2011,17 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info)
}
/* HE Operation defines */
-#define IEEE80211_HE_OPERATION_BSS_COLOR_MASK 0x0000003f
-#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK 0x000001c0
-#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_OFFSET 6
-#define IEEE80211_HE_OPERATION_TWT_REQUIRED 0x00000200
-#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK 0x000ffc00
-#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET 10
-#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR 0x00100000
-#define IEEE80211_HE_OPERATION_VHT_OPER_INFO 0x00200000
-#define IEEE80211_HE_OPERATION_MULTI_BSSID_AP 0x10000000
-#define IEEE80211_HE_OPERATION_TX_BSSID_INDICATOR 0x20000000
-#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED 0x40000000
+#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK 0x00000003
+#define IEEE80211_HE_OPERATION_TWT_REQUIRED 0x00000008
+#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK 0x00003ff0
+#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET 4
+#define IEEE80211_HE_OPERATION_VHT_OPER_INFO 0x00004000
+#define IEEE80211_HE_OPERATION_CO_LOCATED_BSS 0x00008000
+#define IEEE80211_HE_OPERATION_ER_SU_DISABLE 0x00010000
+#define IEEE80211_HE_OPERATION_BSS_COLOR_MASK 0x3f000000
+#define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET 24
+#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR 0x40000000
+#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED 0x80000000
/*
* ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size
@@ -2046,7 +2046,7 @@ ieee80211_he_oper_size(const u8 *he_oper_ie)
he_oper_params = le32_to_cpu(he_oper->he_oper_params);
if (he_oper_params & IEEE80211_HE_OPERATION_VHT_OPER_INFO)
oper_len += 3;
- if (he_oper_params & IEEE80211_HE_OPERATION_MULTI_BSSID_AP)
+ if (he_oper_params & IEEE80211_HE_OPERATION_CO_LOCATED_BSS)
oper_len++;
/* Add the first byte (extension ID) to the total length */
--
2.19.2
next prev parent reply other threads:[~2018-12-15 9:03 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-15 9:03 [PATCH 00/24] cfg80211/mac80211 patches from our internal tree 2018-12-15 Luca Coelho
2018-12-15 9:03 ` [PATCH 01/24] mac80211: suspicious RCU usage fix Luca Coelho
2018-12-15 9:03 ` [PATCH 02/24] ieee80211: add bits for TWT in Extended Capabilities IE Luca Coelho
2018-12-15 9:03 ` [PATCH 03/24] mac80211: propagate the support for TWT to the driver Luca Coelho
2018-12-15 9:03 ` Luca Coelho [this message]
2018-12-15 9:03 ` [PATCH 05/24] mac80211: free skb fraglist before freeing the skb Luca Coelho
2018-12-15 9:03 ` [PATCH 06/24] mac80211: don't build AMSDU from GSO packets Luca Coelho
2018-12-15 9:03 ` [PATCH 07/24] mac80211: document RCU requirements for ieee80211_tx_dequeue() Luca Coelho
2018-12-15 9:03 ` [PATCH 08/24] mac80211: remove superfluous NULL check Luca Coelho
2018-12-15 9:03 ` [PATCH 09/24] mac80211: fix a kernel panic when TXing after TXQ teardown Luca Coelho
2018-12-15 9:03 ` [PATCH 10/24] mac80211: never pass NULL params to ieee80211_if_add() Luca Coelho
2018-12-15 9:03 ` [PATCH 11/24] mac80211: fix radiotap vendor presence bitmap handling Luca Coelho
2018-12-15 9:03 ` [PATCH 12/24] mac80211: ignore NullFunc frames in the duplicate detection Luca Coelho
2018-12-15 17:31 ` Emmanuel Grumbach
2018-12-18 0:55 ` Coelho, Luciano
2018-12-15 9:03 ` [PATCH 13/24] cfg80211: pmsr: fix MAC address setting Luca Coelho
2018-12-18 12:17 ` Johannes Berg
2019-02-06 5:47 ` Luca Coelho
2019-02-06 5:53 ` Luca Coelho
2019-02-06 5:59 ` [PATCH v2 1/2] " Luca Coelho
2019-02-06 5:59 ` [PATCH 2/2] " Luca Coelho
2019-02-06 6:01 ` Luca Coelho
2019-02-06 6:03 ` [PATCH] cfg80211: pmsr: fix abort locking Luca Coelho
2018-12-15 9:03 ` [PATCH 14/24] mac80211: update driver when MU EDCA params change Luca Coelho
2018-12-15 9:03 ` [PATCH 15/24] cfg80211: fix ieee80211_get_vht_max_nss() Luca Coelho
2018-12-15 9:03 ` [PATCH 16/24] mac80211: Properly handle SKB with radiotap only Luca Coelho
2018-12-15 9:03 ` [PATCH 17/24] cfg80211: Include the PMK and PMKID in NL80211_CMD_EXTERNAL_AUTH Luca Coelho
2019-01-25 12:41 ` Johannes Berg
2019-02-06 8:02 ` [PATCH v2] " Luca Coelho
2019-02-22 12:41 ` Johannes Berg
2019-03-08 11:26 ` Luciano Coelho
2018-12-15 9:03 ` [PATCH 18/24] mac80211: set STA flag DISABLE_HE if HE is not supported Luca Coelho
2018-12-15 9:03 ` [PATCH 19/24] mac80211: do not advertise HE cap IE if HE disabled Luca Coelho
2018-12-15 9:03 ` [PATCH 20/24] cfg80211: add some missing fall through annotations Luca Coelho
2018-12-15 9:03 ` [PATCH 21/24] nl80211: fix memory leak if validate_pae_over_nl80211() fails Luca Coelho
2018-12-15 9:03 ` [PATCH 22/24] cfg80211: clarify LCI/civic location documentation Luca Coelho
2018-12-15 9:03 ` [PATCH 23/24] mac80211: ftm responder: remove pointless defensive coding Luca Coelho
2018-12-15 9:03 ` [PATCH 24/24] mac80211: Properly access radiotap vendor data Luca Coelho
2018-12-18 12:06 ` [PATCH 00/24] cfg80211/mac80211 patches from our internal tree 2018-12-15 Johannes Berg
2018-12-18 12:08 ` Johannes Berg
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=20181215090325.31604-5-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=shaul.triebitz@intel.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 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).