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=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 C3331C43463 for ; Fri, 18 Sep 2020 10:46:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D71520848 for ; Fri, 18 Sep 2020 10:46:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725955AbgIRKqC (ORCPT ); Fri, 18 Sep 2020 06:46:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725882AbgIRKqC (ORCPT ); Fri, 18 Sep 2020 06:46:02 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57758C06174A for ; Fri, 18 Sep 2020 03:46:02 -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 1kJDtw-006CeO-Hs; Fri, 18 Sep 2020 12:46:00 +0200 Message-ID: Subject: Re: [PATCH v2 11/22] cfg80211: parse S1G Operation element for BSS channel From: Johannes Berg To: Thomas Pedersen Cc: linux-wireless Date: Fri, 18 Sep 2020 12:45:59 +0200 In-Reply-To: <20200831205600.21058-12-thomas@adapt-ip.com> References: <20200831205600.21058-1-thomas@adapt-ip.com> <20200831205600.21058-12-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: > Extract the BSS primary channel from the S1G Operation > element. Out of curiosity, do you even need to? I mean ... you know what channel you received it on, surely? > @@ -1318,15 +1318,26 @@ cfg80211_get_bss_channel(struct wiphy *wiphy, const u8 *ie, size_t ielen, > tmp = cfg80211_find_ie(WLAN_EID_DS_PARAMS, ie, ielen); > if (tmp && tmp[1] == 1) { > channel_number = tmp[2]; > - } else { > - tmp = cfg80211_find_ie(WLAN_EID_HT_OPERATION, ie, ielen); > - if (tmp && tmp[1] >= sizeof(struct ieee80211_ht_operation)) { > - struct ieee80211_ht_operation *htop = (void *)(tmp + 2); > + goto found_channel; > + } > > - channel_number = htop->primary_chan; > - } > + tmp = cfg80211_find_ie(WLAN_EID_HT_OPERATION, ie, ielen); > + if (tmp && tmp[1] >= sizeof(struct ieee80211_ht_operation)) { > + struct ieee80211_ht_operation *htop = (void *)(tmp + 2); > + > + channel_number = htop->primary_chan; > + goto found_channel; > + } > + > + tmp = cfg80211_find_ie(WLAN_EID_S1G_OPERATION, ie, ielen); > + if (tmp && tmp[1] >= sizeof(struct ieee80211_s1g_oper_ie)) { > + struct ieee80211_s1g_oper_ie *s1gop = (void *)(tmp + 2); > + > + channel_number = s1gop->primary_ch; > + goto found_channel; > } I *am* a bit worried about this though - do you really want to try to parse DS elements on S1G, or S1G elements on other bands? Seems like there ought to be a band check here? johannes