Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <b3d00d00525bbc2a31653df6c0ce72cfb4d1c8d7.camel@sipsolutions.net>
Subject: Re: [PATCH v2 5/8] cfg80211: save power spectral density(psd) of
 regulatory rule
From:   Johannes Berg <johannes@sipsolutions.net>
To:     Wen Gong <wgong@codeaurora.org>
Cc:     ath11k@lists.infradead.org, linux-wireless@vger.kernel.org
Date:   Thu, 26 Aug 2021 12:56:47 +0200
In-Reply-To: <4eca272868dae4f7a923656a12b03024@codeaurora.org>
References: <20210820122041.12157-1-wgong@codeaurora.org>
         <20210820122041.12157-6-wgong@codeaurora.org>
         <101b523a6fe06fea3e1c9642a1bf5e85a9d0e680.camel@sipsolutions.net>
         <4eca272868dae4f7a923656a12b03024@codeaurora.org>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.38.4 (3.38.4-1.fc33) 
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

On Thu, 2021-08-26 at 18:43 +0800, Wen Gong wrote:
> On 2021-08-26 16:25, Johannes Berg wrote:
> > I was going to apply this and patch 4 squashed, saying:
> > 
> > 
> >     cfg80211: regulatory: handle 6 GHz power spectral density (PSD)
> > 
> >     6 GHz regulatory domains introduce power spectral density (PSD).
> >     Allow wiphy-specific regulatory rules to specify these values.
> > 
> > but ...
> > > 
> > > +		if (chan->flags & IEEE80211_CHAN_PSD)
> > > +			chan->psd = min_t(s8, rrule1->psd, rrule1->psd);
> > > +
> > 
> > This is obviously wrong?
> Yes it should change like this:
> 
> 	if ((rrule1->flags & NL80211_RRF_PSD) && (rrule1->flags & 
> NL80211_RRF_PSD))
> 		chan->psd = min_t(s8, rrule1->psd, rrule1->psd);

One of those still should be rrule2 :)

johannes