Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp797930pxa; Wed, 5 Aug 2020 13:02:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFAFJ7BjfJ9qFaThWZ/rdP2tUSx0R7JevQ0x5pzX8LMwhXHcTkpftTuHT3sZ6x0RAdyGxy X-Received: by 2002:a05:6402:403:: with SMTP id q3mr941011edv.12.1596657775218; Wed, 05 Aug 2020 13:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596657775; cv=none; d=google.com; s=arc-20160816; b=iW0GLPvQx7+DjckFxh5m3xC6pCklnPkGfqfe/BY71ZgXfE3JGFISJnvcUUGFY8+ED7 7aSsx3IPozJ/kcEM4LHqtxHw8sX7OB0XotWnLiMk1pDWzZ/Bvxu4TsfgsIgnkoKW5jfd R/vNHFfP9q/KJbUaZtp3ulQ4sJSPVlD2GQVQQHEKILx7wPILyY9hfnNYuyPVTqyE0tYZ te2Z3lzh+Nb6X+GxOGg5TudXzckrsgFQarq9erx7yutFslKI4BIxRpNyPk91wG+FQT6a jgl7yw/okDTrRmHXWOtoMBXUOKWKhFkCx7DA/neAcj7A7UWOJBHKthpBQkO4NU6XsCTH 8FdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=LP8G9WpUCg3b1VJBIYfBtvOIqFmLyQIrxrLrSDs9Ui4=; b=hSDn6UbbnWq3Hr9O3qHU8vwz8g6qwH0P6stnvsFxjvs56f8SZmiPC4BTMX3whUOlZP Ph+oXHyHJ6eYIM3Xj0uDI/X2xkSMUUsx2P+2YygND2QB9MtbQuuHf/veSPC46n9rQPyZ RBif0W9AUWz/UIEvgSsabZhZS50j1NtzeQBWQvGdZnqkUra26jzO//0nCJXSb4fi8pSF HY3V42BUDyIl23Q7Y7w3w6+FA0ZaDCbESwp80xYR43oFZ4P5AjofZmcKBO57dDFE0Bhq 3jKRS1jStKXhju/fX8P4+pH2Emhm9Xi3QjROYx2sOLsSZTwYRSjSQ1LAGWfpV95Ys/y3 66fw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gt12si1944614ejb.302.2020.08.05.13.02.30; Wed, 05 Aug 2020 13:02:55 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727933AbgHEQmL (ORCPT + 99 others); Wed, 5 Aug 2020 12:42:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727104AbgHEQkG (ORCPT ); Wed, 5 Aug 2020 12:40:06 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E89AEC0A54DA for ; Wed, 5 Aug 2020 06:36:45 -0700 (PDT) Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94) (envelope-from ) id 1k3Jan-00GoHg-1s; Wed, 05 Aug 2020 15:36:29 +0200 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: Rajkumar Manoharan , Johannes Berg Subject: [PATCH] nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage Date: Wed, 5 Aug 2020 15:35:18 +0200 Message-Id: <20200805153516.310cef625955.I0abc04dc8abb2c7c005c88ef8fa2d0e3c9fb95c4@changeid> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg In nl80211_set_station(), we check NL80211_ATTR_HE_6GHZ_CAPABILITY and then use NL80211_ATTR_HE_CAPABILITY, which is clearly wrong. Fix this to use NL80211_ATTR_HE_6GHZ_CAPABILITY as well. Fixes: 43e64bf301fd ("cfg80211: handle 6 GHz capability of new station") Signed-off-by: Johannes Berg --- net/wireless/nl80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 19281d0c8c9d..bfda09d24146 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6008,7 +6008,7 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info) if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]) params.he_6ghz_capa = - nla_data(info->attrs[NL80211_ATTR_HE_CAPABILITY]); + nla_data(info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]); if (info->attrs[NL80211_ATTR_AIRTIME_WEIGHT]) params.airtime_weight = -- 2.26.2