staging: rtl8188eu: remove "rtw_ieee80211_back_actioncode"

This enum is the same as "ieee80211_back_actioncode" in
"include/linux/ieee80211.h".

Update the code accordingly and remove useless comment.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/6b6d8d81e7b2115e9206d2960ce09e1b2e8b6381.1624132543.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index c6410030dcbf55912687495c3877107d293baa1d..54b08a2bbaa299599139729a96acdd00bc073ab0 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -1744,7 +1744,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;
                        }
@@ -1752,7 +1752,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);
                        }
@@ -3420,16 +3420,16 @@ static unsigned int OnAction_back(struct adapter *padapter,
                        return _SUCCESS;
                action = frame_body[1];
                switch (action) {
-               case RTW_WLAN_ACTION_ADDBA_REQ: /* ADDBA request */
+               case WLAN_ACTION_ADDBA_REQ:
                        memcpy(&pmlmeinfo->ADDBA_req, &frame_body[2], sizeof(struct ADDBA_request));
                        process_addba_req(padapter, (u8 *)&pmlmeinfo->ADDBA_req, addr);
 
                        /* 37 = reject ADDBA Req */
                        issue_action_BA(padapter, addr,
-                                       RTW_WLAN_ACTION_ADDBA_RESP,
+                                       WLAN_ACTION_ADDBA_RESP,
                                        pmlmeinfo->accept_addba_req ? 0 : 37);
                        break;
-               case RTW_WLAN_ACTION_ADDBA_RESP: /* ADDBA response */
+               case WLAN_ACTION_ADDBA_RESP:
                        status = get_unaligned_le16(&frame_body[3]);
                        tid = (frame_body[5] >> 2) & 0x7;
                        if (status == 0) {      /* successful */
@@ -3439,7 +3439,7 @@ static unsigned int OnAction_back(struct adapter *padapter,
                                psta->htpriv.agg_enable_bitmap &= ~BIT(tid);
                        }
                        break;
-               case RTW_WLAN_ACTION_DELBA: /* DELBA */
+               case WLAN_ACTION_DELBA:
                        if ((frame_body[3] & BIT(3)) == 0) {
                                psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
                                psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
@@ -5058,7 +5058,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);
                mod_timer(&psta->addba_retry_timer,
                          jiffies + msecs_to_jiffies(ADDBA_TO));
        } else {

diff --git a/drivers/staging/rtl8188eu/include/ieee80211.h b/drivers/staging/rtl8188eu/include/ieee80211.h
index cb6940d2aeab868fdc634843c986ba2e460d35d5..4becf4edaa258b262971894877ddfed4a991c627 100644 (file)
--- a/drivers/staging/rtl8188eu/include/ieee80211.h
+++ b/drivers/staging/rtl8188eu/include/ieee80211.h
@@ -546,13 +546,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,
-};
-
 /* HT features action code */
 enum rtw_ieee80211_ht_actioncode {
        RTW_WLAN_ACTION_NOTIFY_CH_WIDTH = 0,