| From ec58f1d188b07b28afbea8aa12a86c6711e16199 Mon Sep 17 00:00:00 2001 |
| From: Pascal Terjan <pterjan@google.com> |
| Date: Sat, 23 May 2020 22:12:47 +0100 |
| Subject: [PATCH] staging: rtl8712: Fix IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK |
| |
| 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 <pterjan@google.com> |
| Cc: stable <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20200523211247.23262-1-pterjan@google.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wifi.h |
| index 77346debea03..2c35a3828c79 100644 |
| --- a/drivers/staging/rtl8712/wifi.h |
| +++ b/drivers/staging/rtl8712/wifi.h |
| @@ -456,7 +456,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 |
| |
| @@ -550,13 +550,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) |
| -- |
| 2.27.0 |
| |
