All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wen Gong <wgong@codeaurora.org>
To: ath11k@lists.infradead.org, johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, wgong@codeaurora.org
Subject: [PATCH 9/9] mac80211: save transmit power envelope element and power constraint
Date: Mon, 17 May 2021 16:19:32 -0400	[thread overview]
Message-ID: <20210517201932.8860-10-wgong@codeaurora.org> (raw)
In-Reply-To: <20210517201932.8860-1-wgong@codeaurora.org>

This patch is to save the transmit power envelope element and power
constraint in struct ieee80211_bss_conf for 6GHz.

Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
 net/mac80211/mlme.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2e33a1263518..5b02d78bd934 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -5076,6 +5076,27 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
 		else
 			he_oper = NULL;
 
+		if (is_6ghz) {
+			struct ieee802_11_elems elems;
+			struct ieee80211_bss_conf *bss_conf;
+			u8 i, n;
+
+			ieee802_11_parse_elems(ies->data, ies->len, false, &elems,
+					       NULL, NULL);
+			bss_conf = &sdata->vif.bss_conf;
+			bss_conf->pwr_reduction = 0;
+			if (elems.pwr_constr_elem)
+				bss_conf->pwr_reduction = *elems.pwr_constr_elem;
+
+			memset(bss_conf->tx_pwr_env, 0, sizeof(bss_conf->tx_pwr_env));
+			bss_conf->tx_pwr_env_num = elems.tx_pwr_env_num;
+			n = min_t(u8, elems.tx_pwr_env_num,
+				  ARRAY_SIZE(elems.tx_pwr_env));
+			for (i = 0; i < n; i++)
+				memcpy(&bss_conf->tx_pwr_env[i], elems.tx_pwr_env[i],
+				       elems.tx_pwr_env_len[i]);
+		}
+
 		if (!ieee80211_verify_sta_he_mcs_support(sband, he_oper))
 			ifmgd->flags |= IEEE80211_STA_DISABLE_HE;
 	}
-- 
2.31.1


WARNING: multiple messages have this Message-ID (diff)
From: Wen Gong <wgong@codeaurora.org>
To: ath11k@lists.infradead.org, johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, wgong@codeaurora.org
Subject: [PATCH 9/9] mac80211: save transmit power envelope element and power constraint
Date: Mon, 17 May 2021 16:19:32 -0400	[thread overview]
Message-ID: <20210517201932.8860-10-wgong@codeaurora.org> (raw)
In-Reply-To: <20210517201932.8860-1-wgong@codeaurora.org>

This patch is to save the transmit power envelope element and power
constraint in struct ieee80211_bss_conf for 6GHz.

Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
 net/mac80211/mlme.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2e33a1263518..5b02d78bd934 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -5076,6 +5076,27 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
 		else
 			he_oper = NULL;
 
+		if (is_6ghz) {
+			struct ieee802_11_elems elems;
+			struct ieee80211_bss_conf *bss_conf;
+			u8 i, n;
+
+			ieee802_11_parse_elems(ies->data, ies->len, false, &elems,
+					       NULL, NULL);
+			bss_conf = &sdata->vif.bss_conf;
+			bss_conf->pwr_reduction = 0;
+			if (elems.pwr_constr_elem)
+				bss_conf->pwr_reduction = *elems.pwr_constr_elem;
+
+			memset(bss_conf->tx_pwr_env, 0, sizeof(bss_conf->tx_pwr_env));
+			bss_conf->tx_pwr_env_num = elems.tx_pwr_env_num;
+			n = min_t(u8, elems.tx_pwr_env_num,
+				  ARRAY_SIZE(elems.tx_pwr_env));
+			for (i = 0; i < n; i++)
+				memcpy(&bss_conf->tx_pwr_env[i], elems.tx_pwr_env[i],
+				       elems.tx_pwr_env_len[i]);
+		}
+
 		if (!ieee80211_verify_sta_he_mcs_support(sband, he_oper))
 			ifmgd->flags |= IEEE80211_STA_DISABLE_HE;
 	}
-- 
2.31.1


-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

  parent reply	other threads:[~2021-05-17 20:20 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17 20:19 [PATCH 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
2021-05-17 20:19 ` Wen Gong
2021-05-17 20:19 ` [PATCH 1/9] cfg80211: add power type definition for 6G Hz Wen Gong
2021-05-17 20:19   ` Wen Gong
2021-07-23  9:22   ` Johannes Berg
2021-07-23  9:22     ` Johannes Berg
2021-05-17 20:19 ` [PATCH 2/9] mac80211: add definition of regulatory info in 6G Hz operation information Wen Gong
2021-05-17 20:19   ` Wen Gong
2021-05-17 20:19 ` [PATCH 3/9] mac80211: add parse " Wen Gong
2021-05-17 20:19   ` Wen Gong
2021-07-23  9:23   ` Johannes Berg
2021-07-23  9:23     ` Johannes Berg
2021-05-17 20:19 ` [PATCH 4/9] cfg80211: add definition for 6G power spectral density(psd) Wen Gong
2021-05-17 20:19   ` Wen Gong
2021-07-23  9:24   ` Johannes Berg
2021-07-23  9:24     ` Johannes Berg
2021-07-30 10:00     ` Wen Gong
2021-07-30 10:00       ` Wen Gong
2021-05-17 20:19 ` [PATCH 5/9] cfg80211: save power spectral density(psd) of regulatory rule Wen Gong
2021-05-17 20:19   ` Wen Gong
2021-07-23  9:27   ` Johannes Berg
2021-07-23  9:27     ` Johannes Berg
2021-07-30 10:06     ` Wen Gong
2021-07-30 10:06       ` Wen Gong
2021-05-17 20:19 ` [PATCH 6/9] mac80211: add definition for transmit power envelope element Wen Gong
2021-05-17 20:19   ` Wen Gong
2021-07-23  9:29   ` Johannes Berg
2021-07-23  9:29     ` Johannes Berg
2021-07-23  9:31   ` Johannes Berg
2021-07-23  9:31     ` Johannes Berg
2021-07-30 10:27     ` Wen Gong
2021-07-30 10:27       ` Wen Gong
2021-05-17 20:19 ` [PATCH 7/9] mac80211: add parse " Wen Gong
2021-05-17 20:19   ` Wen Gong
2021-07-23  9:33   ` Johannes Berg
2021-07-23  9:33     ` Johannes Berg
2021-07-30 10:16     ` Wen Gong
2021-07-30 10:16       ` Wen Gong
2021-05-17 20:19 ` [PATCH 8/9] mac80211: add transmit power envelope element and power constraint in bss_conf Wen Gong
2021-05-17 20:19   ` Wen Gong
2021-07-23  9:33   ` Johannes Berg
2021-07-23  9:33     ` Johannes Berg
2021-05-17 20:19 ` Wen Gong [this message]
2021-05-17 20:19   ` [PATCH 9/9] mac80211: save transmit power envelope element and power constraint Wen Gong
2021-07-23  9:38   ` Johannes Berg
2021-07-23  9:38     ` Johannes Berg
2021-07-30 10:47     ` Wen Gong
2021-07-30 10:47       ` Wen Gong
2021-08-03  8:53       ` Wen Gong
2021-08-03  8:53         ` Wen Gong
2021-08-13  7:19       ` Johannes Berg
2021-08-13  7:19         ` Johannes Berg
2021-08-13  7:25         ` Johannes Berg
2021-08-13  7:25           ` Johannes Berg
2021-08-13  8:47           ` Wen Gong
2021-08-13  8:47             ` Wen Gong
2021-08-13  8:53             ` Johannes Berg
2021-08-13  8:53               ` Johannes Berg
2021-08-13  9:16               ` Wen Gong
2021-08-13  9:16                 ` Wen Gong
2021-08-13 10:11                 ` Johannes Berg
2021-08-13 10:11                   ` Johannes Berg
2021-08-13 10:29                   ` Wen Gong
2021-08-13 10:29                     ` Wen Gong
2021-08-13  8:13         ` Wen Gong
2021-08-13  8:13           ` Wen Gong
2021-05-25 10:04 ` [PATCH 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
2021-05-25 10:04   ` Wen Gong
2021-06-15  8:52   ` Wen Gong
2021-06-15  8:52     ` Wen Gong

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=20210517201932.8860-10-wgong@codeaurora.org \
    --to=wgong@codeaurora.org \
    --cc=ath11k@lists.infradead.org \
    --cc=johannes@sipsolutions.net \
    --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 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.