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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 A0FBBC433FF for ; Fri, 2 Aug 2019 13:20:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6FE8A21841 for ; Fri, 2 Aug 2019 13:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752038; bh=zkDQirxJFxpqvEs8k1jAjBm21u2uSL67RoEEcJdLsJs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dzFzcarVyyra3wzbP8viDvxGIT8W549fZQ3lTrobJZqQoJjZk60AJglj702G0ntq4 50zBx6NgA7LLC+pUrKaP3bT8KGOafGZk4jOOiDUjkRzJfJQAMqf0vWEoZyFS0aPH4S F9GGWb4LwBDHfpAJiU2Exb5WZmZGcqu1fqnUImPU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393410AbfHBNUh (ORCPT ); Fri, 2 Aug 2019 09:20:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:58984 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393392AbfHBNUd (ORCPT ); Fri, 2 Aug 2019 09:20:33 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4CC8F2173E; Fri, 2 Aug 2019 13:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752033; bh=zkDQirxJFxpqvEs8k1jAjBm21u2uSL67RoEEcJdLsJs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B7Gq2NPzSYSf7IYzzfS0ZHs5e3pl52VYPrQROMGP2oVJfMsDqZ95JXXaRrA5dujyE 1Ux+YWGQPQCPrjB3xGCWnkc+CzD3v72BnV0RZpgYeVXPDCwHxibt17Uk2ou8oDbVh9 gc2+K9WSQl1K+g/bCe4YPFL3cHSja8b2AZOwYoDs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Crispin , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 27/76] nl80211: fix NL80211_HE_MAX_CAPABILITY_LEN Date: Fri, 2 Aug 2019 09:19:01 -0400 Message-Id: <20190802131951.11600-27-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802131951.11600-1-sashal@kernel.org> References: <20190802131951.11600-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Crispin [ Upstream commit 5edaac063bbf1267260ad2a5b9bb803399343e58 ] NL80211_HE_MAX_CAPABILITY_LEN has changed between D2.0 and D4.0. It is now MAC (6) + PHY (11) + MCS (12) + PPE (25) = 54. Signed-off-by: John Crispin Link: https://lore.kernel.org/r/20190627095832.19445-1-john@phrozen.org Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- include/uapi/linux/nl80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 6f09d1500960d..70da1c6cdd073 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -2844,7 +2844,7 @@ enum nl80211_attrs { #define NL80211_HT_CAPABILITY_LEN 26 #define NL80211_VHT_CAPABILITY_LEN 12 #define NL80211_HE_MIN_CAPABILITY_LEN 16 -#define NL80211_HE_MAX_CAPABILITY_LEN 51 +#define NL80211_HE_MAX_CAPABILITY_LEN 54 #define NL80211_MAX_NR_CIPHER_SUITES 5 #define NL80211_MAX_NR_AKM_SUITES 2 -- 2.20.1