staging: r8188eu: use ieee80211 define for management frame type

Replace the driver-internal define for management frame type with
IEEE80211_FTYPE_MGMT.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220227164147.1168847-2-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 580d0c15b9583766dc08b58ac724e295814ca280..10d5f12229365610688a7607e27d039de3a6f898 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -3,6 +3,7 @@
 
 #define _RTW_MLME_EXT_C_
 
+#include <linux/ieee80211.h>
 #include "../include/osdep_service.h"
 #include "../include/drv_types.h"
 #include "../include/wifi.h"
@@ -414,7 +415,7 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)
        u8 *pframe = precv_frame->rx_data;
        struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(pframe));
 
-       if (GetFrameType(pframe) != WIFI_MGT_TYPE)
+       if (GetFrameType(pframe) != IEEE80211_FTYPE_MGMT)
                return;
 
        /* receive the frames that ra(a1) is my address or ra(a1) is bc address. */

diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index 6dacb2687034a4270259052d470cf0b384834428..1133239f29bc67515cec0c8e1e8626c8c9bf3c93 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -1094,7 +1094,7 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv
        /* Dump rx packets */
        GetHalDefVar8188EUsb(adapter, HAL_DEF_DBG_DUMP_RXPKT, &bDumpRxPkt);
        switch (type) {
-       case WIFI_MGT_TYPE: /* mgnt */
+       case IEEE80211_FTYPE_MGMT:
                validate_recv_mgnt_frame(adapter, precv_frame);
                retval = _FAIL; /*  only data frame return _SUCCESS */
                break;

diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h
index e7083d721daeb7072d4bfb967bed265756c9fc28..5b383c2e98805502b50f0c0a58354e909b77fe40 100644 (file)
--- a/drivers/staging/r8188eu/include/wifi.h
+++ b/drivers/staging/r8188eu/include/wifi.h
@@ -18,7 +18,6 @@
 #define WLAN_SSID_MAXLEN       32
 
 enum WIFI_FRAME_TYPE {
-       WIFI_MGT_TYPE  =        (0),
        WIFI_CTRL_TYPE =        (BIT(2)),
        WIFI_DATA_TYPE =        (BIT(3)),
        WIFI_QOS_DATA_TYPE      = (BIT(7)|BIT(3)),      /*  QoS Data */
@@ -26,18 +25,18 @@ enum WIFI_FRAME_TYPE {
 
 enum WIFI_FRAME_SUBTYPE {
        /*  below is for mgt frame */
-       WIFI_ASSOCREQ       = (0 | WIFI_MGT_TYPE),
-       WIFI_ASSOCRSP       = (BIT(4) | WIFI_MGT_TYPE),
-       WIFI_REASSOCREQ     = (BIT(5) | WIFI_MGT_TYPE),
-       WIFI_REASSOCRSP     = (BIT(5) | BIT(4) | WIFI_MGT_TYPE),
-       WIFI_PROBEREQ       = (BIT(6) | WIFI_MGT_TYPE),
-       WIFI_PROBERSP       = (BIT(6) | BIT(4) | WIFI_MGT_TYPE),
-       WIFI_BEACON         = (BIT(7) | WIFI_MGT_TYPE),
-       WIFI_ATIM           = (BIT(7) | BIT(4) | WIFI_MGT_TYPE),
-       WIFI_DISASSOC       = (BIT(7) | BIT(5) | WIFI_MGT_TYPE),
-       WIFI_AUTH           = (BIT(7) | BIT(5) | BIT(4) | WIFI_MGT_TYPE),
-       WIFI_DEAUTH         = (BIT(7) | BIT(6) | WIFI_MGT_TYPE),
-       WIFI_ACTION         = (BIT(7) | BIT(6) | BIT(4) | WIFI_MGT_TYPE),
+       WIFI_ASSOCREQ       = (0 | IEEE80211_FTYPE_MGMT),
+       WIFI_ASSOCRSP       = (BIT(4) | IEEE80211_FTYPE_MGMT),
+       WIFI_REASSOCREQ     = (BIT(5) | IEEE80211_FTYPE_MGMT),
+       WIFI_REASSOCRSP     = (BIT(5) | BIT(4) | IEEE80211_FTYPE_MGMT),
+       WIFI_PROBEREQ       = (BIT(6) | IEEE80211_FTYPE_MGMT),
+       WIFI_PROBERSP       = (BIT(6) | BIT(4) | IEEE80211_FTYPE_MGMT),
+       WIFI_BEACON         = (BIT(7) | IEEE80211_FTYPE_MGMT),
+       WIFI_ATIM           = (BIT(7) | BIT(4) | IEEE80211_FTYPE_MGMT),
+       WIFI_DISASSOC       = (BIT(7) | BIT(5) | IEEE80211_FTYPE_MGMT),
+       WIFI_AUTH           = (BIT(7) | BIT(5) | BIT(4) | IEEE80211_FTYPE_MGMT),
+       WIFI_DEAUTH         = (BIT(7) | BIT(6) | IEEE80211_FTYPE_MGMT),
+       WIFI_ACTION         = (BIT(7) | BIT(6) | BIT(4) | IEEE80211_FTYPE_MGMT),
 
        /*  below is for control frame */
        WIFI_PSPOLL         = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE),