staging: rtl8723bs: Replace RTW_IEEE80211_STYPE_* with IEEE80211_STYPE_*.

This driver defines the constants RTW_IEEE80211_STYPE_*, but all these
values are already defined in 'linux/ieee80211.h' as IEEE80211_STYPE_*.
Remove the locally defined constants, and substitute the kernel constants.

Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index e31e06fd6e9f966698baeb22f3b6b6131eaf10fd..74750dbce379ec0dd3054bb0cc099637a9169bfc 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -1381,7 +1381,7 @@ int rtw_action_frame_parse(const u8 *frame, u32 frame_len, u8 *category, u8 *act
        fc = le16_to_cpu(((struct ieee80211_hdr_3addr *)frame)->frame_control);
 
        if ((fc & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE))
-               != (IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION)
+               != (IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_ACTION)
        ) {
                return false;
        }

diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index c33b9c4ccd56ef043f5fc9bfe2c21809d65a5618..2c7597ad0470dccc4f6e940dab1e5677582c9780 100644 (file)
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -324,49 +324,6 @@ enum eap_type {
 #define MIN_FRAG_THRESHOLD     256U
 #define        MAX_FRAG_THRESHOLD     2346U
 
-/* management */
-#define RTW_IEEE80211_STYPE_ASSOC_REQ  0x0000
-#define RTW_IEEE80211_STYPE_ASSOC_RESP 0x0010
-#define RTW_IEEE80211_STYPE_REASSOC_REQ        0x0020
-#define RTW_IEEE80211_STYPE_REASSOC_RESP       0x0030
-#define RTW_IEEE80211_STYPE_PROBE_REQ  0x0040
-#define RTW_IEEE80211_STYPE_PROBE_RESP 0x0050
-#define RTW_IEEE80211_STYPE_BEACON             0x0080
-#define RTW_IEEE80211_STYPE_ATIM               0x0090
-#define RTW_IEEE80211_STYPE_DISASSOC   0x00A0
-#define RTW_IEEE80211_STYPE_AUTH               0x00B0
-#define RTW_IEEE80211_STYPE_DEAUTH             0x00C0
-#define RTW_IEEE80211_STYPE_ACTION             0x00D0
-
-/* control */
-#define RTW_IEEE80211_STYPE_CTL_EXT            0x0060
-#define RTW_IEEE80211_STYPE_BACK_REQ           0x0080
-#define RTW_IEEE80211_STYPE_BACK               0x0090
-#define RTW_IEEE80211_STYPE_PSPOLL             0x00A0
-#define RTW_IEEE80211_STYPE_RTS                0x00B0
-#define RTW_IEEE80211_STYPE_CTS                0x00C0
-#define RTW_IEEE80211_STYPE_ACK                0x00D0
-#define RTW_IEEE80211_STYPE_CFEND              0x00E0
-#define RTW_IEEE80211_STYPE_CFENDACK           0x00F0
-
-/* data */
-#define RTW_IEEE80211_STYPE_DATA               0x0000
-#define RTW_IEEE80211_STYPE_DATA_CFACK 0x0010
-#define RTW_IEEE80211_STYPE_DATA_CFPOLL        0x0020
-#define RTW_IEEE80211_STYPE_DATA_CFACKPOLL     0x0030
-#define RTW_IEEE80211_STYPE_NULLFUNC   0x0040
-#define RTW_IEEE80211_STYPE_CFACK              0x0050
-#define RTW_IEEE80211_STYPE_CFPOLL             0x0060
-#define RTW_IEEE80211_STYPE_CFACKPOLL  0x0070
-#define RTW_IEEE80211_STYPE_QOS_DATA           0x0080
-#define RTW_IEEE80211_STYPE_QOS_DATA_CFACK             0x0090
-#define RTW_IEEE80211_STYPE_QOS_DATA_CFPOLL            0x00A0
-#define RTW_IEEE80211_STYPE_QOS_DATA_CFACKPOLL 0x00B0
-#define RTW_IEEE80211_STYPE_QOS_NULLFUNC       0x00C0
-#define RTW_IEEE80211_STYPE_QOS_CFACK          0x00D0
-#define RTW_IEEE80211_STYPE_QOS_CFPOLL         0x00E0
-#define RTW_IEEE80211_STYPE_QOS_CFACKPOLL      0x00F0
-
 /* sequence control field */
 #define RTW_IEEE80211_SCTL_FRAG        0x000F
 #define RTW_IEEE80211_SCTL_SEQ 0xFFF0

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 4b84965ec5c5f9adc1baf2001391ddc3dce73152..46bc2e5125578c48154b79865f7fd4dff9301405 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -2546,7 +2546,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
 
        }
        else if ((frame_control & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE))
-               == (IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION)
+               == (IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_ACTION)
        )
        {
                /* only for action frames */