From patchwork Wed Mar 8 23:41:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 662120 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94BBAC678D5 for ; Wed, 8 Mar 2023 23:42:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229582AbjCHXmp (ORCPT ); Wed, 8 Mar 2023 18:42:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230271AbjCHXmY (ORCPT ); Wed, 8 Mar 2023 18:42:24 -0500 Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A9C258493 for ; Wed, 8 Mar 2023 15:42:03 -0800 (PST) X-Virus-Scanned: Proofpoint Essentials engine Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 24CBE24002E for ; Wed, 8 Mar 2023 23:42:01 +0000 (UTC) Received: from ben-dt5.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 8935713C2B0; Wed, 8 Mar 2023 15:42:00 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 8935713C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1678318920; bh=q8DM6CZkkm7yeE8ehSq5PZsu06Tjjr1zOM8RPN4zCwI=; h=From:To:Cc:Subject:Date:From; b=dXPTQJEsXwxr5q31QMGtprZ7hVYUn5HuVk23a1g5vlU4wDBoZcvDKCQ5JRqCwKGnv 75qkhDHSmKtomnizCHY1e8ZJMyZ9Zytj8qhGt6ixlGb9gfK1cOwMR31zUVeUZ8CLzM DAd2/NaFhXAsuehVpgUcPYTToMOmkSBpHTpV60Z8= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v2 1/2] wireless: mac80211: Relax flags check in bw-change logic. Date: Wed, 8 Mar 2023 15:41:57 -0800 Message-Id: <20230308234158.2732682-1-greearb@candelatech.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-MDID: 1678318921-auLbK4B54KOh X-MDID-O: us5;at1;1678318921;auLbK4B54KOh; Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear A failure was seen where AP requested change to 40Mhz, and it failed because 160Mhz and 80P80 were disabled in ifmgd->flags. Add check for this case so that it will not fail. Debugging logs from the failure: sta0001: AP 90:3c:b3:6c:41:11 changed bandwidth, new config is 5180.000 MHz, width 2 (5190.000/0 MHz) ifmgd-flags: 0x3b044 eht-oper: 0000000000000000 sta0001: AP 90:3c:b3:6c:41:11 changed caps/bw in a way we can't support (0x30000/0x3b044) - disconnect sta0001: chandef-valid: 1 bw: 2 ifmgd->flags mask: 0x33000 Signed-off-by: Ben Greear --- net/mac80211/mlme.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 85741e8b2787..0efca23be69b 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -497,6 +497,14 @@ static int ieee80211_config_bw(struct ieee80211_link_data *link, chandef.width > NL80211_CHAN_WIDTH_20) flags |= ieee80211_chandef_downgrade(&chandef); + /* Relax check for implicit disabled. */ + if (link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_160MHZ && + chandef.width != NL80211_CHAN_WIDTH_160) + flags |= IEEE80211_CONN_DISABLE_160MHZ; + if (link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_80P80MHZ && + chandef.width != NL80211_CHAN_WIDTH_80P80) + flags |= IEEE80211_CONN_DISABLE_80P80MHZ; + if (cfg80211_chandef_identical(&chandef, &link->conf->chandef)) return 0; From patchwork Wed Mar 8 23:41:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 661022 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DCACC6FD19 for ; Wed, 8 Mar 2023 23:42:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229626AbjCHXmq (ORCPT ); Wed, 8 Mar 2023 18:42:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230288AbjCHXmY (ORCPT ); Wed, 8 Mar 2023 18:42:24 -0500 Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C37CD5BD8A for ; Wed, 8 Mar 2023 15:42:03 -0800 (PST) X-Virus-Scanned: Proofpoint Essentials engine Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id EA713240077 for ; Wed, 8 Mar 2023 23:42:01 +0000 (UTC) Received: from ben-dt5.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 83A8513C2B0; Wed, 8 Mar 2023 15:42:01 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 83A8513C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1678318921; bh=Fi0MObjATFjdljXhswMZaeM1bhfWIWoMMepV7RA5uaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sRKCWfMFwoLOukrfJqUdGoUkQOsGYkVzaTDMpkNtAvxGp+VaClOVZ3t6Q2AQeHlpR e/s+uPOU+4uLuTWaibiSscxeC8ov8ixKXs6pIdzgY6dm8TGSSHUCjPUtq6PawMTTNv z5898PIFyEfSDFCEBzpIPgg40Bg9c+p+z5UdN/RQ= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v2 2/2] wireless: mac80211: fix ath10k wave-2 in 80mhz mode in config_bw logic. Date: Wed, 8 Mar 2023 15:41:58 -0800 Message-Id: <20230308234158.2732682-2-greearb@candelatech.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230308234158.2732682-1-greearb@candelatech.com> References: <20230308234158.2732682-1-greearb@candelatech.com> MIME-Version: 1.0 X-MDID: 1678318922-XiDAVATx-mBL X-MDID-O: us5;ut7;1678318922;XiDAVATx-mBL; Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear It was complaining about the 'DISABLE_HE' flag mismatch, so ensure that if ifmgd has DISABLE_HE set, then 'flags' also will have that flag set. Signed-off-by: Ben Greear --- net/mac80211/mlme.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 0efca23be69b..827d61c2dd1b 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -505,6 +505,10 @@ static int ieee80211_config_bw(struct ieee80211_link_data *link, chandef.width != NL80211_CHAN_WIDTH_80P80) flags |= IEEE80211_CONN_DISABLE_80P80MHZ; + /* if ifmgd has HE disabled, then we cannot re-enable that here. */ + if (link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_HE) + flags |= IEEE80211_CONN_DISABLE_HE; + if (cfg80211_chandef_identical(&chandef, &link->conf->chandef)) return 0;