staging: rtl8192e: Replace control subframe types with IEEE80211_STYPE_*

Replace control and data subframe types RTLLIB_STYPE_* with
IEEE80211_STYPE_* to avoid proprietary constant names.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/970555ba76dcf3b9896c51aab8ff333a95f12225.1694792595.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 3cf171a709748f9ea1a038194f2b650c43034d2e..47156eb8f46bbc38d12b4679a89d76dc7615d6c0 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -350,21 +350,6 @@ enum rt_op_mode {
 #define RTLLIB_FTYPE_CTL               0x0004
 #define RTLLIB_FTYPE_DATA              0x0008
 
-/* control */
-#define RTLLIB_STYPE_PSPOLL            0x00A0
-#define RTLLIB_STYPE_RTS               0x00B0
-#define RTLLIB_STYPE_CTS               0x00C0
-#define RTLLIB_STYPE_ACK               0x00D0
-
-/* data */
-#define RTLLIB_STYPE_DATA              0x0000
-#define RTLLIB_STYPE_DATA_CFACK        0x0010
-#define RTLLIB_STYPE_DATA_CFPOLL       0x0020
-#define RTLLIB_STYPE_DATA_CFACKPOLL    0x0030
-#define RTLLIB_STYPE_NULLFUNC  0x0040
-#define RTLLIB_STYPE_QOS_DATA  0x0080
-#define RTLLIB_STYPE_QOS_NULL  0x00C0
-
 #define RTLLIB_SCTL_FRAG               0x000F
 #define RTLLIB_SCTL_SEQ                0xFFF0
 
@@ -375,8 +360,8 @@ enum rt_op_mode {
 #define IsDataFrame(pdu)       (((pdu[0] & 0x0C) == 0x08) ? true : false)
 #define        IsLegacyDataFrame(pdu)  (IsDataFrame(pdu) && (!(pdu[0]&FC_QOS_BIT)))
 #define IsQoSDataFrame(pframe)                 \
-       ((*(u16 *)pframe&(RTLLIB_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) ==  \
-       (RTLLIB_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA))
+       ((*(u16 *)pframe&(IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) ==       \
+       (IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA))
 #define Frame_Order(pframe)     (*(u16 *)pframe&RTLLIB_FCTL_ORDER)
 #define SN_LESS(a, b)          (((a-b)&0x800) != 0)
 #define SN_EQUAL(a, b) (a == b)
@@ -1647,8 +1632,8 @@ static inline int rtllib_get_hdrlen(u16 fc)
                break;
        case RTLLIB_FTYPE_CTL:
                switch (WLAN_FC_GET_STYPE(fc)) {
-               case RTLLIB_STYPE_CTS:
-               case RTLLIB_STYPE_ACK:
+               case IEEE80211_STYPE_CTS:
+               case IEEE80211_STYPE_ACK:
                        hdrlen = RTLLIB_1ADDR_LEN;
                        break;
                default:

diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index cf98b020194bfb34704efe6242ef31c5c873ed80..4d8c3869eb83553239df62838bdc4fc20426f9df 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -997,12 +997,12 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc,
         * hostap_handle_sta_rx() before being dropped here.
         */
        if (!ieee->intel_promiscuous_md_info.promiscuous_on) {
-               if (stype != RTLLIB_STYPE_DATA &&
-                   stype != RTLLIB_STYPE_DATA_CFACK &&
-                   stype != RTLLIB_STYPE_DATA_CFPOLL &&
-                   stype != RTLLIB_STYPE_DATA_CFACKPOLL &&
-                   stype != RTLLIB_STYPE_QOS_DATA) {
-                       if (stype != RTLLIB_STYPE_NULLFUNC)
+               if (stype != IEEE80211_STYPE_DATA &&
+                   stype != IEEE80211_STYPE_DATA_CFACK &&
+                   stype != IEEE80211_STYPE_DATA_CFPOLL &&
+                   stype != IEEE80211_STYPE_DATA_CFACKPOLL &&
+                   stype != IEEE80211_STYPE_QOS_DATA) {
+                       if (stype != IEEE80211_STYPE_NULLFUNC)
                                netdev_dbg(ieee->dev,
                                           "RX: dropped data frame with no data (type=0x%02x, subtype=0x%02x)\n",
                                           type, stype);

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 14f402308ecd9756b3c3a0656f15ba9d23d07dcd..87626c15d0d610af0297fdcd6e241cf621783c46 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -273,7 +273,7 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb,
        type = WLAN_FC_GET_TYPE(fc);
        stype = WLAN_FC_GET_STYPE(fc);
 
-       if (stype != RTLLIB_STYPE_PSPOLL)
+       if (stype != IEEE80211_STYPE_PSPOLL)
                tcb_desc->queue_index = MGNT_QUEUE;
        else
                tcb_desc->queue_index = HIGH_QUEUE;
@@ -927,7 +927,7 @@ static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr)
        ether_addr_copy(hdr->addr3, ieee->current_network.bssid);
 
        hdr->frame_control = cpu_to_le16(RTLLIB_FTYPE_DATA |
-               RTLLIB_STYPE_NULLFUNC | RTLLIB_FCTL_TODS |
+               IEEE80211_STYPE_NULLFUNC | RTLLIB_FCTL_TODS |
                (pwr ? RTLLIB_FCTL_PM : 0));
 
        return skb;
@@ -950,7 +950,7 @@ static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee)
        ether_addr_copy(hdr->ta, ieee->dev->dev_addr);
 
        hdr->aid = cpu_to_le16(ieee->assoc_id | 0xc000);
-       hdr->frame_control = cpu_to_le16(RTLLIB_FTYPE_CTL | RTLLIB_STYPE_PSPOLL |
+       hdr->frame_control = cpu_to_le16(RTLLIB_FTYPE_CTL | IEEE80211_STYPE_PSPOLL |
                         RTLLIB_FCTL_PM);
 
        return skb;

diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 4b730b2c9fef86fd217df55edcbabf9acf888ce3..8b8f4f90ea356f90bcdd5639691466cf299aa77c 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -660,9 +660,9 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
                        fc = RTLLIB_FTYPE_DATA;
 
                if (qos_activated)
-                       fc |= RTLLIB_STYPE_QOS_DATA;
+                       fc |= IEEE80211_STYPE_QOS_DATA;
                else
-                       fc |= RTLLIB_STYPE_DATA;
+                       fc |= IEEE80211_STYPE_DATA;
 
                if (ieee->iw_mode == IW_MODE_INFRA) {
                        fc |= RTLLIB_FCTL_TODS;