Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9e0cdab authored by Pascal Terjan's avatar Pascal Terjan Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: Fix IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 



commit 15ea976a1f12b5fd76b1bd6ff3eb5132fd28047f upstream.

The value in shared headers was fixed 9 years ago in commit 8d661f1e
("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: default avatarPascal Terjan <pterjan@google.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200523211247.23262-1-pterjan@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 94d85208

drivers/staging/rtl8712/wifi.h

+1 −8
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe) 
/* 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
@@ -562,13 +562,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)