staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_softmac.c

Replace struct rtllib_hdr_3addr with struct ieee80211_hdr_3addr to avoid
proprietary struct.

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

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 904be0ef867f820ef613d46905053c9a40986b7d..e3b15fa0edcb2e86f4a95b9017d80d8660b04bd2 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -187,8 +187,8 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
 {
        unsigned long flags;
        short single = ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE;
-       struct rtllib_hdr_3addr  *header =
-               (struct rtllib_hdr_3addr  *)skb->data;
+       struct ieee80211_hdr_3addr  *header =
+               (struct ieee80211_hdr_3addr  *)skb->data;
 
        struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + 8);
 
@@ -197,7 +197,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
        /* called with 2nd param 0, no mgmt lock required */
        rtllib_sta_wakeup(ieee, 0);
 
-       if (ieee80211_is_beacon(header->frame_ctl))
+       if (ieee80211_is_beacon(header->frame_control))
                tcb_desc->queue_index = BEACON_QUEUE;
        else
                tcb_desc->queue_index = MGNT_QUEUE;
@@ -213,7 +213,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
                if (ieee->queue_stop) {
                        enqueue_mgmt(ieee, skb);
                } else {
-                       header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
+                       header->seq_ctrl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
 
                        if (ieee->seq_ctrl[0] == 0xFFF)
                                ieee->seq_ctrl[0] = 0;
@@ -230,7 +230,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
                spin_unlock_irqrestore(&ieee->lock, flags);
                spin_lock_irqsave(&ieee->mgmt_tx_lock, flags);
 
-               header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
+               header->seq_ctrl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
 
                if (ieee->seq_ctrl[0] == 0xFFF)
                        ieee->seq_ctrl[0] = 0;
@@ -264,12 +264,12 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb,
                     struct rtllib_device *ieee)
 {
        short single = ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE;
-       struct rtllib_hdr_3addr  *header =
-               (struct rtllib_hdr_3addr  *)skb->data;
+       struct ieee80211_hdr_3addr  *header =
+               (struct ieee80211_hdr_3addr  *)skb->data;
        u16 fc, type, stype;
        struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + 8);
 
-       fc = le16_to_cpu(header->frame_ctl);
+       fc = le16_to_cpu(header->frame_control);
        type = WLAN_FC_GET_TYPE(fc);
        stype = WLAN_FC_GET_STYPE(fc);
 
@@ -287,7 +287,7 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb,
        tcb_desc->tx_use_drv_assinged_rate = 1;
        if (single) {
                if (type != RTLLIB_FTYPE_CTL) {
-                       header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
+                       header->seq_ctrl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
 
                        if (ieee->seq_ctrl[0] == 0xFFF)
                                ieee->seq_ctrl[0] = 0;
@@ -300,7 +300,7 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb,
 
        } else {
                if (type != RTLLIB_FTYPE_CTL) {
-                       header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
+                       header->seq_ctrl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
 
                        if (ieee->seq_ctrl[0] == 0xFFF)
                                ieee->seq_ctrl[0] = 0;
@@ -912,21 +912,21 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,
 static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr)
 {
        struct sk_buff *skb;
-       struct rtllib_hdr_3addr *hdr;
+       struct ieee80211_hdr_3addr *hdr;
 
-       skb = dev_alloc_skb(sizeof(struct rtllib_hdr_3addr) + ieee->tx_headroom);
+       skb = dev_alloc_skb(sizeof(struct ieee80211_hdr_3addr) + ieee->tx_headroom);
        if (!skb)
                return NULL;
 
        skb_reserve(skb, ieee->tx_headroom);
 
-       hdr = skb_put(skb, sizeof(struct rtllib_hdr_3addr));
+       hdr = skb_put(skb, sizeof(struct ieee80211_hdr_3addr));
 
        ether_addr_copy(hdr->addr1, ieee->current_network.bssid);
        ether_addr_copy(hdr->addr2, ieee->dev->dev_addr);
        ether_addr_copy(hdr->addr3, ieee->current_network.bssid);
 
-       hdr->frame_ctl = cpu_to_le16(RTLLIB_FTYPE_DATA |
+       hdr->frame_control = cpu_to_le16(RTLLIB_FTYPE_DATA |
                RTLLIB_STYPE_NULLFUNC | RTLLIB_FCTL_TODS |
                (pwr ? RTLLIB_FCTL_PM : 0));
 
@@ -1311,7 +1311,7 @@ static void rtllib_auth_challenge(struct rtllib_device *ieee, u8 *challenge,
                           "Sending authentication challenge response\n");
 
                rtllib_encrypt_fragment(ieee, skb,
-                                       sizeof(struct rtllib_hdr_3addr));
+                                       sizeof(struct ieee80211_hdr_3addr));
 
                softmac_mgmt_xmit(skb, ieee);
                mod_timer(&ieee->associate_timer, jiffies + (HZ / 2));
@@ -1620,11 +1620,11 @@ static short probe_rq_parse(struct rtllib_device *ieee, struct sk_buff *skb,
        u8 *skbend;
        u8 *ssid = NULL;
        u8 ssidlen = 0;
-       struct rtllib_hdr_3addr   *header =
-               (struct rtllib_hdr_3addr   *)skb->data;
+       struct ieee80211_hdr_3addr   *header =
+               (struct ieee80211_hdr_3addr   *)skb->data;
        bool bssid_match;
 
-       if (skb->len < sizeof(struct rtllib_hdr_3addr))
+       if (skb->len < sizeof(struct ieee80211_hdr_3addr))
                return -1; /* corrupted */
 
        bssid_match =
@@ -1637,7 +1637,7 @@ static short probe_rq_parse(struct rtllib_device *ieee, struct sk_buff *skb,
 
        skbend = (u8 *)skb->data + skb->len;
 
-       tag = skb->data + sizeof(struct rtllib_hdr_3addr);
+       tag = skb->data + sizeof(struct ieee80211_hdr_3addr);
 
        while (tag + 1 < skbend) {
                if (*tag == 0) {
@@ -1953,8 +1953,8 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,
        int aid;
        u8 *ies;
        struct rtllib_assoc_response_frame *assoc_resp;
-       struct rtllib_hdr_3addr *header = (struct rtllib_hdr_3addr *)skb->data;
-       u16 frame_ctl = le16_to_cpu(header->frame_ctl);
+       struct ieee80211_hdr_3addr *header = (struct ieee80211_hdr_3addr *)skb->data;
+       u16 frame_ctl = le16_to_cpu(header->frame_control);
 
        netdev_dbg(ieee->dev, "received [RE]ASSOCIATION RESPONSE (%d)\n",
                   WLAN_FC_GET_STYPE(frame_ctl));
@@ -2092,7 +2092,7 @@ rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb,
 static inline int
 rtllib_rx_deauth(struct rtllib_device *ieee, struct sk_buff *skb)
 {
-       struct rtllib_hdr_3addr *header = (struct rtllib_hdr_3addr *)skb->data;
+       struct ieee80211_hdr_3addr *header = (struct ieee80211_hdr_3addr *)skb->data;
        u16 frame_ctl;
 
        if (memcmp(header->addr3, ieee->current_network.bssid, ETH_ALEN) != 0)
@@ -2104,7 +2104,7 @@ rtllib_rx_deauth(struct rtllib_device *ieee, struct sk_buff *skb)
        if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
            ieee->link_state == MAC80211_LINKED &&
            (ieee->iw_mode == IW_MODE_INFRA)) {
-               frame_ctl = le16_to_cpu(header->frame_ctl);
+               frame_ctl = le16_to_cpu(header->frame_control);
                netdev_info(ieee->dev,
                            "==========>received disassoc/deauth(%x) frame, reason code:%x\n",
                            WLAN_FC_GET_STYPE(frame_ctl),
@@ -2128,13 +2128,13 @@ inline int rtllib_rx_frame_softmac(struct rtllib_device *ieee,
                                   struct rtllib_rx_stats *rx_stats, u16 type,
                                   u16 stype)
 {
-       struct rtllib_hdr_3addr *header = (struct rtllib_hdr_3addr *)skb->data;
+       struct ieee80211_hdr_3addr *header = (struct ieee80211_hdr_3addr *)skb->data;
        u16 frame_ctl;
 
        if (!ieee->proto_started)
                return 0;
 
-       frame_ctl = le16_to_cpu(header->frame_ctl);
+       frame_ctl = le16_to_cpu(header->frame_control);
        switch (WLAN_FC_GET_STYPE(frame_ctl)) {
        case RTLLIB_STYPE_ASSOC_RESP:
        case RTLLIB_STYPE_REASSOC_RESP: