Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chad Monroe <chad.monroe@smartrg.com>
To:     Felix Fietkau <nbd@nbd.name>,
        Johannes Berg <johannes.berg@intel.com>
Cc:     Lorenzo Bianconi <lorenzo.bianconi@redhat.com>,
        Shayne Chen <shayne.chen@mediatek.com>,
        Evelyn Tsai <evelyn.tsai@mediatek.com>,
        Ryder Lee <ryder.lee@mediatek.com>,
        linux-wireless@vger.kernel.org, linux-mediatek@lists.infradead.org,
        Chad Monroe <chad.monroe@smartrg.com>
Subject: [PATCH] mt76: connac: adjust wlan_idx size from u8 to u16
Date:   Sat, 12 Feb 2022 10:04:26 -0800
Message-Id: <a0644f7da6ba09195ee247a5affa562179328207.1644688718.git.chad.monroe@smartrg.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3tHpt8d/NLUZQ0cokYRH1gwAomCZ+FPmhLPWK7qFlqNDUbSMBfexERj7OGTp?=
 =?us-ascii?Q?GwOtP7NYpNHqFa9jUY8IIWxNx/BetFPq20S5Oxr1Mzy2yt08BNrYLzFfQves?=
 =?us-ascii?Q?7DEMy/spOpjw5PjcqzJf+g9jb72EXHBPWTU+93tWZFxkGwP56De1cnTlwUdz?=
 =?us-ascii?Q?gQiWSV7CenbbLyFitoVS1bQrQprp3KszKOHatKjP70O4YYgTbPBYHMlQ+6sR?=
 =?us-ascii?Q?gZXUMgo1AlkS2FvT5RZkimMhWVDIuMs12fyuGrz75tL/Yg8cBCa/esfnHp3Y?=
 =?us-ascii?Q?AVaUdEnOzefGlONPxmTLJUFe4tzExlPcATsMlT4k3r6u2E2vSi3kJys+OuvM?=
 =?us-ascii?Q?+HqCmnfDOUafH6YJ8RF0PIJXEpJZ5YkhcCpF5I+JAFGnkQas/SeJvHDdQ89g?=
 =?us-ascii?Q?Ra67U++jNZANH4im0NC2rai5Q7vTgKestCfH7t2Jm4Zr+ltOpDeVEG2eI4Fg?=
 =?us-ascii?Q?Z5KgMFGdK+gSxDAZ8WLle5bTlMKp1gx6FDcXXnMZ3Vvhm9m5Ik1uyms8WEpH?=
 =?us-ascii?Q?/y35xs6G9YvWhDBTpBSOMmfsQLHCXArFAdKX5qulFPOoqfG0wfIn1H0W7v3c?=
 =?us-ascii?Q?+J9nENAKj0agCutf+CSfLpHppnhBT/MEzJY8FNPaUrP18x0/CL6qun5hWsHv?=
 =?us-ascii?Q?Hlps6hQZGrxbbYQofcJXuaGL48XPRRQTRICej4oFmaPfPctkmbPN/E20FKPU?=
 =?us-ascii?Q?/cK2s8DE5IYlkxOo8SU385zfww8HJcRiH3yOR8EA0WyYaaxWX4j6AUWmH75n?=
 =?us-ascii?Q?OvcGOlct1arf6NvMzi9HJcteMtXJo1jIXv4yU0uGaTxDObUQVROqftwncY17?=
 =?us-ascii?Q?u6WlLIAnC7Dl+uOtGXrtSYqKHGVjxQ/dC9SIvDrgLU1uIi8AxTkTi2qR5v4I?=
 =?us-ascii?Q?ZiTmONNp67AO2CxfXDRfOJec7KOfvoqzf09t92h2yZIA6N5L0Tg1iDb+D4DE?=
 =?us-ascii?Q?MKbZBp3drr/Y+YC7TAusQbjYcnRQv/X6KX87s9yH46P1CKVfIPuq1GFuLKqy?=
 =?us-ascii?Q?UB2YO24u2bTsYtfiAyFScYUVIQFqyuERVrbA09ia6Clq6kc5DUTriF+4PaTn?=
 =?us-ascii?Q?vyIxc1PfjkJUuhzCsf7/gGFjDzEJ20fPkw6oU4hxG102qMR3r/9fbLNJHYC/?=
 =?us-ascii?Q?uU/KYrZx0InlFwLclpyiXUwYjws4Kj/T1IPzGMnE+JEmTmdKCxeE5b2z1AqT?=
 =?us-ascii?Q?f4u6B0H+MpKpEtdOrF/e7hOcV8gl54Nk53WHi1agDGXL/jCv4ucCj6kG7b5Q?=
 =?us-ascii?Q?PfHsfruI9TGrAOqRieu0um4T6D9LIqZTePmtKUFlsbuB6h2ktoR0O7Voss80?=
 =?us-ascii?Q?+T/8xch6DGpnOXePPP9HYN2iFQc2RPOFoYllc/ul0djGL5+1tHd5pTAWu8ZP?=
 =?us-ascii?Q?a5OhdDslXxJSrHoPgDt9K3UtUhMOX0hj7KTvf0UXTay15+JpMpcfCFUEZ4rg?=
 =?us-ascii?Q?L0TDy+KHeHn3LdVgJ4zArVNZd1vIj7EmyFh7xFlTeIYIkbwHmGRhyPusn9iJ?=
 =?us-ascii?Q?m9KBLYN0ZGkoHKnm0N7NcmKSV4n+qiM2v5UADry+7r2YGgeLb/XzVKhEqoXv?=
 =?us-ascii?Q?dFJJbz4yuG+zKP5dsxrOLr8ZUTXfqRyddZkjTu50zrz5OJijMvjFrUY8CRB3?=
 =?us-ascii?Q?jDjX4d6sOdECvsLHzZjHM88=3D?=
X-OriginatorOrg: smartrg.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5f6b8644-ac5c-4de5-9f3d-08d9ee5229ac
X-MS-Exchange-CrossTenant-AuthSource: BY3PR19MB4915.namprd19.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 18:04:50.6980
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 423946e4-28c0-4deb-904c-a4a4b174fb3f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tRUNA6CG4DwYpaa/vmXiSaXYYSIN8pmoYX5iqMIpJIr8iyUV7W9I3Q5uw4OslB9T36S56gxcngvVtYuWEnJ5jQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR19MB2918
X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

Newer chips such as MT7915 require up to 16-bits for this field.

Signed-off-by: Chad Monroe <chad.monroe@smartrg.com>
---
 drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +-
 drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index cdd82a62eeb1..f3fdd755a3bb 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -2656,7 +2656,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_ext_tlv);
 int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
 				  struct ieee80211_vif *vif,
 				  struct ieee80211_sta *sta,
-				  struct mt76_phy *phy, u8 wlan_idx,
+				  struct mt76_phy *phy, u16 wlan_idx,
 				  bool enable)
 {
 	struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 7b9d82dd3f9d..384c3eab1c8a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1642,7 +1642,7 @@ void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,
 int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
 				  struct ieee80211_vif *vif,
 				  struct ieee80211_sta *sta,
-				  struct mt76_phy *phy, u8 wlan_idx,
+				  struct mt76_phy *phy, u16 wlan_idx,
 				  bool enable);
 void mt76_connac_mcu_sta_uapsd(struct sk_buff *skb, struct ieee80211_vif *vif,
 			       struct ieee80211_sta *sta);
-- 
2.32.0 (Apple Git-132)