commit 9b5592a86bf9baac6721940c1a6344e7efdd447a

Author: Holger Mueller <hmueller@inovex.de>

Date:   Mon Oct 21 19:02:23 2019 +0200

    removed conflicting IEEE80211_MAX_AMPDU_BUF

    IEEE80211_MAX_AMPDU_BUF was conflicting with current kernel

    values. Also removed some other already in linux sources

    defined IEEE80211 values

diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c

index cdc3c7e..f6baf31 100644

--- a/core/rtw_mlme_ext.c

+++ b/core/rtw_mlme_ext.c

@@ -1465,7 +1465,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)

 			ptable->func = &OnAuth;

 		else

 			ptable->func = &OnAuthClient;

-	/* pass through */

+	/* pass through */

 	case WIFI_ASSOCREQ:

 	case WIFI_REASSOCREQ:

 		_mgt_dispatcher(padapter, ptable, precv_frame);

@@ -9918,8 +9918,8 @@ static int issue_action_ba(_adapter *padapter, unsigned char *raddr, unsigned ch

 			BA_para_set &= ~IEEE80211_ADDBA_PARAM_TID_MASK;

 			BA_para_set |= (tid << 2) & IEEE80211_ADDBA_PARAM_TID_MASK;

-			BA_para_set &= ~RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK;

-			BA_para_set |= (size << 6) & RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK;

+			BA_para_set &= ~IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK;

+			BA_para_set |= (size << 6) & IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK;

 			if (!padapter->registrypriv.wifi_spec) {

 				if (pregpriv->ampdu_amsdu == 0) /* disabled */

diff --git a/include/wifi.h b/include/wifi.h

index 3ff52d8..f37e86b 100644

--- a/include/wifi.h

+++ b/include/wifi.h

@@ -991,21 +991,6 @@ typedef enum _HT_CAP_AMPDU_DENSITY {

 #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 RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFC0

-#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)

- */

-#define IEEE80211_MIN_AMPDU_BUF 0x8

-#define IEEE80211_MAX_AMPDU_BUF 0x40

-

-

 /* Spatial Multiplexing Power Save Modes */

 #define WLAN_HT_CAP_SM_PS_STATIC		0

 #define WLAN_HT_CAP_SM_PS_DYNAMIC	1