Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp827264ybg; Tue, 9 Jun 2020 14:00:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEwe7LS4IWzW7SyGSmbR+lRZ7fJzVckTvtf56bgqPiabS4D2XSfplUSUL+ZIy6vKzak8up X-Received: by 2002:a50:f18f:: with SMTP id x15mr29161053edl.228.1591736423708; Tue, 09 Jun 2020 14:00:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591736423; cv=none; d=google.com; s=arc-20160816; b=izsZ74sDrrrMK5rNrZz+YzEZZD+HvxnDMkTAaeTub2OzY0apyGCZhfMKa3NC7sd8b8 Iysq75OC4qDukfCn7PDDAf7E0HBd4F1lxEAtiKr3IagHiem6eUJN7pwe01x2dvJvoZq5 Isv0RcSthpTX+yRl+QBIjmcumQnNuFvUyklpcYUZcnAO8g1UIs/wxRgbTuw6b8VZKGYq MT4yjMviDHK5q6/9NniSY4rLb961igVjffetsMRkfMqAwntMBuxf3py1qQQ0won+hbmU IMQ/A7M6OLo2q5YeuDQ0DP2dR5UR2t8nO6hyx0v98lHALeniVyd6CWsbl0xJ/8z6fiS3 MdXw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FzQSi0eIRjEhZNME3y2E8Ez27i+c31TUO0bSpI7tTps=; b=pAHbldySkfhKEoS2Q5s08ColEI1dTVza+G/0536xvjZZlXV2f0jkovDx2iJ0owJReo Wzctip9DmtcJihjGkRt5f23o+vL6uVxnq/8zi+1xKXTuJohA2b97TVGsDLEYvzePi4lh yuTFj9qz+hp6EkpzfGAYVihlo0znSt8yItoXcAHYYwk9rM0VngRF4ELbobWWWmU3G53T errEfdqc9pmNAxM/OXds7Ycvkdb2NyVFUc7rPalZdp3LX/8MhEsvLBI0jws9OZiptMbA uRvuDfANVdIZxDuLOs8cbIYLsmv4yXEjd+hmdXufNq3tBZdenIOTOp3BobLEAevpB9Qc 5y9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1aRaydkc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 s16si11580132edu.512.2020.06.09.14.00.00; Tue, 09 Jun 2020 14:00:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1aRaydkc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731934AbgFIRzx (ORCPT + 99 others); Tue, 9 Jun 2020 13:55:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:45796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733072AbgFIRyP (ORCPT ); Tue, 9 Jun 2020 13:54:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CA7502074B; Tue, 9 Jun 2020 17:54:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591725255; bh=miLTQdPwzuk9lQFiqP5cxP8nhx922KpR3g6Sz11QT1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1aRaydkc+B/OwLKD2bjyEGp/Zh8aopevXaE2KVz/gUQgd3dIXJK3BF4adxj5xnu2m KF2ZTodggkZuXbOcsr9Akvux8rgLDk6VxqYeiq8Pgf4MitMEMEtGVPedRhL0wHfEie NuXzr+RanUGxGI0gLnHxGU58EH3Ppw/PY3bz7/+M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pascal Terjan Subject: [PATCH 5.6 32/41] staging: rtl8712: Fix IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK Date: Tue, 9 Jun 2020 19:45:34 +0200 Message-Id: <20200609174115.150785569@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200609174112.129412236@linuxfoundation.org> References: <20200609174112.129412236@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pascal Terjan commit 15ea976a1f12b5fd76b1bd6ff3eb5132fd28047f upstream. The value in shared headers was fixed 9 years ago in commit 8d661f1e462d ("ieee80211: correct IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK macro") and while looking at using shared headers for other duplicated constants I noticed this driver uses the old value. The macros are also defined twice in this file so I am deleting the second definition. Signed-off-by: Pascal Terjan Cc: stable Link: https://lore.kernel.org/r/20200523211247.23262-1-pterjan@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8712/wifi.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) --- a/drivers/staging/rtl8712/wifi.h +++ b/drivers/staging/rtl8712/wifi.h @@ -440,7 +440,7 @@ static inline unsigned char *get_hdr_bss /* block-ack parameters */ #define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002 #define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C -#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFA0 +#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFC0 #define IEEE80211_DELBA_PARAM_TID_MASK 0xF000 #define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800 @@ -532,13 +532,6 @@ struct ieee80211_ht_addt_info { #define IEEE80211_HT_IE_NON_GF_STA_PRSNT 0x0004 #define IEEE80211_HT_IE_NON_HT_STA_PRSNT 0x0010 -/* block-ack parameters */ -#define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002 -#define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C -#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFA0 -#define IEEE80211_DELBA_PARAM_TID_MASK 0xF000 -#define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800 - /* * A-PMDU buffer sizes * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2)