Commit 0ffa2a3a authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: use ieee80211 defines for back action codes 



Replace the driver-specific defines for back action codes with the defines
from ieee80211.h.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Tested-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Link: https://lore.kernel.org/r/20220602194807.281115-2-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+3 −3
Original line number Diff line number Diff line
@@ -5623,7 +5623,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr) 
	if (initiator == 0) { /*  recipient */

		for (tid = 0; tid < MAXTID; tid++) {

			if (psta->recvreorder_ctrl[tid].enable) {

				issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid << 1) | initiator) & 0x1F));

				issue_action_BA(padapter, addr, WLAN_ACTION_DELBA, (((tid << 1) | initiator) & 0x1F));

				psta->recvreorder_ctrl[tid].enable = false;

				psta->recvreorder_ctrl[tid].indicate_seq = 0xffff;

			}
@@ -5631,7 +5631,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr) 
	} else if (initiator == 1) { /*  originator */

		for (tid = 0; tid < MAXTID; tid++) {

			if (psta->htpriv.agg_enable_bitmap & BIT(tid)) {

				issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid << 1) | initiator) & 0x1F));

				issue_action_BA(padapter, addr, WLAN_ACTION_DELBA, (((tid << 1) | initiator) & 0x1F));

				psta->htpriv.agg_enable_bitmap &= ~BIT(tid);

				psta->htpriv.candidate_tid_bitmap &= ~BIT(tid);

			}
@@ -7475,7 +7475,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf) 


	if (((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && (pmlmeinfo->HT_enable)) ||

	    ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)) {

		issue_action_BA(padapter, pparm->addr, RTW_WLAN_ACTION_ADDBA_REQ, (u16)pparm->tid);

		issue_action_BA(padapter, pparm->addr, WLAN_ACTION_ADDBA_REQ, (u16)pparm->tid);

		_set_timer(&psta->addba_retry_timer, ADDBA_TO);

	} else {

		psta->htpriv.candidate_tid_bitmap &= ~BIT(pparm->tid);

drivers/staging/r8188eu/include/ieee80211.h

+0 −7
Original line number Diff line number Diff line
@@ -624,13 +624,6 @@ enum _PUBLIC_ACTION { 
	ACT_PUBLIC_MAX

};



/* BACK action code */

enum rtw_ieee80211_back_actioncode {

	RTW_WLAN_ACTION_ADDBA_REQ = 0,

	RTW_WLAN_ACTION_ADDBA_RESP = 1,

	RTW_WLAN_ACTION_DELBA = 2,

};



#define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)

				* 00:50:F2 */

#define WME_OUI_TYPE 2