staging: rtl8723bs: Replace RTW_IEEE80211_FTYPE_* with IEEE80211_FTYPE_*.

This driver defines the constants RTW_IEEE80211_FTYPE_*, but all these
values are already defined in 'linux/ieee80211.h' as IEEE80211_FTYPE_*.
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 22c219e8a75fc81bb7e5985f6f269748dbea530d..e31e06fd6e9f966698baeb22f3b6b6131eaf10fd 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))
-               != (RTW_IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION)
+               != (IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION)
        ) {
                return false;
        }

diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index 746ac7cf3ccd63097aeb08f1f1918652efc3dc62..c33b9c4ccd56ef043f5fc9bfe2c21809d65a5618 100644 (file)
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -324,11 +324,6 @@ enum eap_type {
 #define MIN_FRAG_THRESHOLD     256U
 #define        MAX_FRAG_THRESHOLD     2346U
 
-#define RTW_IEEE80211_FTYPE_MGMT               0x0000
-#define RTW_IEEE80211_FTYPE_CTL                0x0004
-#define RTW_IEEE80211_FTYPE_DATA               0x0008
-#define RTW_IEEE80211_FTYPE_EXT                0x000c
-
 /* management */
 #define RTW_IEEE80211_STYPE_ASSOC_REQ  0x0000
 #define RTW_IEEE80211_STYPE_ASSOC_RESP 0x0010

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index a955b94614d0e8ae593dc51c3128185ad524b75b..4b84965ec5c5f9adc1baf2001391ddc3dce73152 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -2517,7 +2517,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
        dot11_hdr = (struct ieee80211_hdr *)skb->data;
        frame_control = le16_to_cpu(dot11_hdr->frame_control);
        /* Check if the QoS bit is set */
-       if ((frame_control & IEEE80211_FCTL_FTYPE) == RTW_IEEE80211_FTYPE_DATA) {
+       if ((frame_control & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) {
                /* Check if this ia a Wireless Distribution System (WDS) frame
                 * which has 4 MAC addresses
                 */
@@ -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))
-               == (RTW_IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION)
+               == (IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION)
        )
        {
                /* only for action frames */