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 5/9] cfg80211: save power spectral density(psd) of regulatory rule
Date: Mon, 17 May 2021 16:19:28 -0400	[thread overview]
Message-ID: <20210517201932.8860-6-wgong@codeaurora.org> (raw)
In-Reply-To: <20210517201932.8860-1-wgong@codeaurora.org>

The power spectral density(psd) of regulatory rule should be take
effect to the channels. This patch is to save the values to the
channel which has psd value.

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

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 21536c48deec..270be66a8d3f 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1583,6 +1583,8 @@ static u32 map_regdom_flags(u32 rd_flags)
 		channel_flags |= IEEE80211_CHAN_NO_160MHZ;
 	if (rd_flags & NL80211_RRF_NO_HE)
 		channel_flags |= IEEE80211_CHAN_NO_HE;
+	if (rd_flags & NL80211_RRF_PSD)
+		channel_flags |= IEEE80211_CHAN_PSD;
 	return channel_flags;
 }
 
@@ -1787,6 +1789,9 @@ static void handle_channel_single_rule(struct wiphy *wiphy,
 				chan->dfs_cac_ms = reg_rule->dfs_cac_ms;
 		}
 
+		if (chan->flags & IEEE80211_CHAN_PSD)
+			chan->psd = reg_rule->psd;
+
 		return;
 	}
 
@@ -1807,6 +1812,9 @@ static void handle_channel_single_rule(struct wiphy *wiphy,
 			chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS;
 	}
 
+	if (chan->flags & IEEE80211_CHAN_PSD)
+		chan->psd = reg_rule->psd;
+
 	if (chan->orig_mpwr) {
 		/*
 		 * Devices that use REGULATORY_COUNTRY_IE_FOLLOW_POWER
@@ -1876,6 +1884,9 @@ static void handle_channel_adjacent_rules(struct wiphy *wiphy,
 							 rrule2->dfs_cac_ms);
 		}
 
+		if (chan->flags & IEEE80211_CHAN_PSD)
+			chan->psd = min_t(s8, rrule1->psd, rrule1->psd);
+
 		return;
 	}
 
@@ -2533,6 +2544,9 @@ static void handle_channel_custom(struct wiphy *wiphy,
 			chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS;
 	}
 
+	if (chan->flags & IEEE80211_CHAN_PSD)
+		chan->psd = reg_rule->psd;
+
 	chan->max_power = chan->max_reg_power;
 }
 
-- 
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 5/9] cfg80211: save power spectral density(psd) of regulatory rule
Date: Mon, 17 May 2021 16:19:28 -0400	[thread overview]
Message-ID: <20210517201932.8860-6-wgong@codeaurora.org> (raw)
In-Reply-To: <20210517201932.8860-1-wgong@codeaurora.org>

The power spectral density(psd) of regulatory rule should be take
effect to the channels. This patch is to save the values to the
channel which has psd value.

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

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 21536c48deec..270be66a8d3f 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1583,6 +1583,8 @@ static u32 map_regdom_flags(u32 rd_flags)
 		channel_flags |= IEEE80211_CHAN_NO_160MHZ;
 	if (rd_flags & NL80211_RRF_NO_HE)
 		channel_flags |= IEEE80211_CHAN_NO_HE;
+	if (rd_flags & NL80211_RRF_PSD)
+		channel_flags |= IEEE80211_CHAN_PSD;
 	return channel_flags;
 }
 
@@ -1787,6 +1789,9 @@ static void handle_channel_single_rule(struct wiphy *wiphy,
 				chan->dfs_cac_ms = reg_rule->dfs_cac_ms;
 		}
 
+		if (chan->flags & IEEE80211_CHAN_PSD)
+			chan->psd = reg_rule->psd;
+
 		return;
 	}
 
@@ -1807,6 +1812,9 @@ static void handle_channel_single_rule(struct wiphy *wiphy,
 			chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS;
 	}
 
+	if (chan->flags & IEEE80211_CHAN_PSD)
+		chan->psd = reg_rule->psd;
+
 	if (chan->orig_mpwr) {
 		/*
 		 * Devices that use REGULATORY_COUNTRY_IE_FOLLOW_POWER
@@ -1876,6 +1884,9 @@ static void handle_channel_adjacent_rules(struct wiphy *wiphy,
 							 rrule2->dfs_cac_ms);
 		}
 
+		if (chan->flags & IEEE80211_CHAN_PSD)
+			chan->psd = min_t(s8, rrule1->psd, rrule1->psd);
+
 		return;
 	}
 
@@ -2533,6 +2544,9 @@ static void handle_channel_custom(struct wiphy *wiphy,
 			chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS;
 	}
 
+	if (chan->flags & IEEE80211_CHAN_PSD)
+		chan->psd = reg_rule->psd;
+
 	chan->max_power = chan->max_reg_power;
 }
 
-- 
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 ` Wen Gong [this message]
2021-05-17 20:19   ` [PATCH 5/9] cfg80211: save power spectral density(psd) of regulatory rule 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 ` [PATCH 9/9] mac80211: save transmit power envelope element and power constraint Wen Gong
2021-05-17 20:19   ` 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-6-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.