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;
From:   Shay Bar <shay.bar@celeno.com>
To:     Johannes Berg <johannes@sipsolutions.net>
Cc:     linux-wireless@vger.kernel.org, aviad.brikman@celeno.com,
        eliav.farber@celeno.com
Subject: [PATCH] wireless: fix wrong 160/80+80 MHz setting
Date:   Wed, 26 Aug 2020 17:31:39 +0300
Message-Id: <20200826143139.25976-1-shay.bar@celeno.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (77.126.12.128) by AM3PR05CA0089.eurprd05.prod.outlook.com (2603:10a6:207:1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Wed, 26 Aug 2020 14:31:56 +0000
X-Mailer: git-send-email 2.17.1
X-Originating-IP: [77.126.12.128]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 3fff7408-0c43-4dd2-1a32-08d849ccc981
X-MS-TrafficTypeDiagnostic: VE1P192MB0733:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <VE1P192MB07336AF49E7642FD04F161EDE7540@VE1P192MB0733.EURP192.PROD.OUTLOOK.COM>
X-MS-Oob-TLC-OOBClassifiers: OLM:2512;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 0lisMMXmk9VrdZeBUn3iQSw+AzDhxWkLyNopmQmUpeosTBK1dNnLrv3wxb3RgAM+ncaELlpkm5KdhsqZC5w+kFTmVO1y9hCIGi4tp6kKfv/c8E6r6ODz4scq/bsM+KAxXnGy52tNkxX79L8wCA+xaEhJ7c1W3Csia2ibzGwu2sVXdlw/yGlilu8e67YNsOrLUTb6lEMiqgWJi9RAxDVGmdVKvMSXjqTQwYWVdQTMUjLTvZH6Fcg32NqTuZf0ZEyFunDKonM3nLvt/H3+bFd6kCvB1CihvjARwXlunsU5kTdjZgERR9HHOJlrs5kkbygko5c8tkT1gIiC2Fp9Twb8xg==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1P192MB0479.EURP192.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(136003)(39840400004)(396003)(366004)(346002)(376002)(478600001)(6512007)(6506007)(2616005)(66946007)(107886003)(956004)(26005)(6486002)(66556008)(316002)(6666004)(4326008)(66476007)(36756003)(6916009)(83380400001)(86362001)(16526019)(8676002)(52116002)(44832011)(186003)(1076003)(8936002)(2906002)(5660300002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: jEanEI3ZKUjJlckcT7YlY4AiLld2VWQs2/cgXJe/iC45Tx1yaZsN9ffc2qlDKH4/bUuv0guoLKjByYKGkYeN72FcHl7spCGjCHvqiiuQQYvaY4pFqBJBY5iGWBgKtR74Mur31BuSa6J+Ohxg4DWszUjgvbrosaIMdOpZ6sohhw+u7nfsC7ws7XXYgjEbEEt9BTLU+yX1Io0/Ku6adgaz3s9H1RiUMvWzWT1vk3sKDOjkNiUhsdBER7tGpmelxGp2JmrOP3F8b8jmZI6QSqA0Sb7X6qTyx9zc3DQWkYCfoKcqotxKa34X4B207mGucG+MAzPEJVnWZ/+iXXeSzfWiX0WUGgzYMxNzmWAoD1HoJkkYQ3yxxi9GS7AOn7wiqf4Lchvws4r01VPy6bZincV9DygwFUFi63y1EUfbwjKwulqXOmj3Erc7aB+E3Mo/PXnoSts2bgapGICIouZlaSFEYl/MV7vGFyDoPtb/FqYbXg8VZdJMCQrqBYFHlAxzuPbdXpbz8vUaARquovpABp7UUKq4V4XrJpVJMWFW/tADlV1SrLQuRuRRTVBw9NW1j22WSE7dEN7nXkBy7D9yD6pIMglpisDYuBkuzZQIK8/oTU91k36e00rsVBzCUyYngDRsyI4d/w6i5u7S4cW1BlImFA==
X-OriginatorOrg: celeno.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3fff7408-0c43-4dd2-1a32-08d849ccc981
X-MS-Exchange-CrossTenant-AuthSource: VI1P192MB0479.EURP192.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2020 14:31:58.2368
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f313103b-4c9f-4fd3-b5cf-b97f91c4afa8
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: derCDZmazIWBMNnH1H/fov9sw60OEEIvGsEV3XR2NeUBhvHb6MNAnrqX1KZDi6IPBvOJqz0TU2bq5PhK0jVtWQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1P192MB0733
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

Fix cfg80211_chandef_usable():
consider IEEE80211_VHT_CAP_EXT_NSS_BW when verifying 160/80+80 MHz.

Based on:
"Table 9-272 =E2=80=94 Setting of the Supported Channel Width Set subfield =
and Extended NSS BW
Support subfield at a STA transmitting the VHT Capabilities Information fie=
ld"
From "Draft P802.11REVmd_D3.0.pdf"

Signed-off-by: Aviad Brikman <aviad.brikman@celeno.com>
Signed-off-by: Shay Bar <shay.bar@celeno.com>
---
 net/wireless/chan.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 90f0f82cd9ca..a51d11d3be33 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -912,6 +912,7 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
        struct ieee80211_sta_vht_cap *vht_cap;
        struct ieee80211_edmg *edmg_cap;
        u32 width, control_freq, cap;
+       bool support_80_80 =3D false;

        if (WARN_ON(!cfg80211_chandef_valid(chandef)))
                return false;
@@ -979,9 +980,16 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
                        return false;
                break;
        case NL80211_CHAN_WIDTH_80P80:
-               cap =3D vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MA=
SK;
+               cap =3D vht_cap->cap;
+               support_80_80 =3D
+                       ((cap &
+                         IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ=
) ||
+                       (cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ &&
+                        cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) ||
+                       ((cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) >>
+                                   IEEE80211_VHT_CAP_EXT_NSS_BW_SHIFT > 1)=
);
                if (chandef->chan->band !=3D NL80211_BAND_6GHZ &&
-                   cap !=3D IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80=
MHZ)
+                   !support_80_80)
                        return false;
                /* fall through */
        case NL80211_CHAN_WIDTH_80:
@@ -1001,7 +1009,8 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
                        return false;
                cap =3D vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MA=
SK;
                if (cap !=3D IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ &&
-                   cap !=3D IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80=
MHZ)
+                   cap !=3D IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80=
MHZ &&
+                   !(vht_cap->cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK))
                        return false;
                break;
        default:
--
2.17.1

________________________________
The information transmitted is intended only for the person or entity to wh=
ich it is addressed and may contain confidential and/or privileged material=
. Any retransmission, dissemination, copying or other use of, or taking of =
any action in reliance upon this information is prohibited. If you received=
 this in error, please contact the sender and delete the material from any =
computer. Nothing contained herein shall be deemed as a representation, war=
ranty or a commitment by Celeno. No warranties are expressed or implied, in=
cluding, but not limited to, any implied warranties of non-infringement, me=
rchantability and fitness for a particular purpose.
________________________________