Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3448164pxk; Mon, 5 Oct 2020 09:53:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykbGAQGVI6wkyL9i5U6daNat02c7C5fo6hWZM2MjbWHmJctEnmwYd6DRfDaajbKPmWc1q0 X-Received: by 2002:a17:906:ad94:: with SMTP id la20mr628538ejb.522.1601916790065; Mon, 05 Oct 2020 09:53:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601916790; cv=none; d=google.com; s=arc-20160816; b=hDQbAwHTAzlzZA+CqkRwLBBWjYUBXUI9NNeA0xtluVgeQzL1VFbyyIFU+iWMEiVA4m p+RRKe8Euwh4VjyA/kKvR8GC6xFx8UBDyYh44nc4D/mKhbGNMP6f1HGRAPxJEWcUJ1KK zryaP3VoEtBJlNYOztRQCYsZ6Wqc3Z88QBgOO2afh2+QSlIlsaApxMQbidXbtO2VC4iY 27Hd+bN0epCikZEUy7lSd8BI1D5A4916qkUlsuLX/zNi1fN1qyKPlat5QI41x/h+n1Pz CZr70M6xdPzQFJecsde1LJfa6a7/+lg3fa6yMAgoIuMQMaXmZfo++9+khcRFiVX3yMiJ 3z8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wSvYAVV7Pc2jg6dXcCWqhLaliEcNOf6SvQt1E+TpKvY=; b=hsM+XQCeIA5E4P3de0Rr0PDDWGQagH6McSkglgBNGJZFMlHuuT054S/HzpfBXPlijP GDjcFkUjaJ4EiwoAd6n82Fg6ZZi079ARUuLIQKtZ1T7E8oo4fQvbSu7rn35kyPtgU4fI KBs9tK+ZD1Tf265CbPsvnaGdF/3ryxhSFp1xxC0J3lNvLhuC4hPiKRABvO1tR3QYGIxS 4+hRaTxWl4nu9hcaSTb9mxJsbwQ6LIpqw2EGxKyHykpllC2jHfmhv7EZ0LGgpKBkdy4l UHjeALdbDrDrYcBFaMwYrj9vVHuWZUm6hCfXYIkDQs2tv4sxzr+m6UswWLYqiX5Aj8/4 v7Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gc9Yk7mr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t13si120714ejr.92.2020.10.05.09.52.47; Mon, 05 Oct 2020 09:53:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gc9Yk7mr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727566AbgJEP3Q (ORCPT + 99 others); Mon, 5 Oct 2020 11:29:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:54960 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727560AbgJEP3P (ORCPT ); Mon, 5 Oct 2020 11:29:15 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 90C5F217BA; Mon, 5 Oct 2020 15:29:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911755; bh=E1UUb+UT5H5jKz1MdfScJ8hMsgsDOOU4qDs/5khlm5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gc9Yk7mr97zyvcBVUFIDxzSlzGCxVHOLJfEDhbGAgD8VlLqeZRHdaz7ra9xdG0Xe3 pChGKqrYEXAe4av31tF8EeWdDNk83SJI+0kkEUc2IRlvbdlsclmnzJXRqObrvouFrj qpN4QKPCkym9vShZt/3OYed8Ey1udI0FwGtcYGck= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aloka Dixit , Johannes Berg , Sasha Levin Subject: [PATCH 5.4 26/57] mac80211: Fix radiotap header channel flag for 6GHz band Date: Mon, 5 Oct 2020 17:26:38 +0200 Message-Id: <20201005142111.061768136@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142109.796046410@linuxfoundation.org> References: <20201005142109.796046410@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aloka Dixit [ Upstream commit 412a84b5714af56f3eb648bba155107b5edddfdf ] Radiotap header field 'Channel flags' has '2 GHz spectrum' set to 'true' for 6GHz packet. Change it to 5GHz as there isn't a separate option available for 6GHz. Signed-off-by: Aloka Dixit Link: https://lore.kernel.org/r/010101747ab7b703-1d7c9851-1594-43bf-81f7-f79ce7a67cc6-000000@us-west-2.amazonses.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index e5fb9002d3147..3ab85e1e38d82 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -419,7 +419,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, else if (status->bw == RATE_INFO_BW_5) channel_flags |= IEEE80211_CHAN_QUARTER; - if (status->band == NL80211_BAND_5GHZ) + if (status->band == NL80211_BAND_5GHZ || + status->band == NL80211_BAND_6GHZ) channel_flags |= IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ; else if (status->encoding != RX_ENC_LEGACY) channel_flags |= IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; -- 2.25.1