From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56421C43463 for ; Fri, 18 Sep 2020 10:40:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 177B92068E for ; Fri, 18 Sep 2020 10:40:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726009AbgIRKkx (ORCPT ); Fri, 18 Sep 2020 06:40:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725941AbgIRKkx (ORCPT ); Fri, 18 Sep 2020 06:40:53 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE187C06174A for ; Fri, 18 Sep 2020 03:40:52 -0700 (PDT) Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94) (envelope-from ) id 1kJDox-006CUC-59; Fri, 18 Sep 2020 12:40:51 +0200 Message-ID: <43afe1ee1067d77aa6be5765e02f3cf0549c7c8f.camel@sipsolutions.net> Subject: Re: [PATCH v2 07/22] mac80211: s1g: choose scanning width based on frequency From: Johannes Berg To: Thomas Pedersen Cc: linux-wireless Date: Fri, 18 Sep 2020 12:40:49 +0200 In-Reply-To: <20200831205600.21058-8-thomas@adapt-ip.com> References: <20200831205600.21058-1-thomas@adapt-ip.com> <20200831205600.21058-8-thomas@adapt-ip.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.5 (3.36.5-1.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Mon, 2020-08-31 at 13:55 -0700, Thomas Pedersen wrote: > An S1G BSS can beacon at either 1 or 2 MHz and the channel > width is unique to a given frequency. Ignore scan channel > width for now and use the allowed channel width. > > Signed-off-by: Thomas Pedersen > --- > net/mac80211/scan.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c > index 5ac2785cdc7b..5002791fe165 100644 > --- a/net/mac80211/scan.c > +++ b/net/mac80211/scan.c > @@ -905,6 +905,17 @@ static void ieee80211_scan_state_set_channel(struct ieee80211_local *local, > local->scan_chandef.center_freq1 = chan->center_freq; > local->scan_chandef.freq1_offset = chan->freq_offset; > local->scan_chandef.center_freq2 = 0; > + > + /* For scanning on the S1G band, ignore scan_width (which is constant > + * across all channels) for now since channel width is specific to each > + * channel. Detect the required channel width here and likely revisit > + * later. Maybe scan_width could be used to build the channel scan list? > + */ > + if (chan->band == NL80211_BAND_S1GHZ) { > + local->scan_chandef.width = ieee80211_s1g_channel_width(chan); > + goto set_channel; > + } nit: double space after 'goto' but really I came to say that this probably changes then, if you don't convince me about the stuff in the previous patch review? :) So I'm leaving this patch also for now - have applied 1-5 so far. johannes