staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_rx.c
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Fri, 15 Sep 2023 16:06:54 +0000 (18:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Sep 2023 07:47:56 +0000 (09:47 +0200)
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/4d5409433c681557f8187b13f0bbf124a662ff96.1694792595.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtllib_rx.c

index 7c16d4db67ad2ecb8c147f541133ec696db36084..dddd38bbc64845708d6e27cde215a7e17467202c 100644 (file)
@@ -210,7 +210,7 @@ rtllib_rx_frame_mgmt(struct rtllib_device *ieee, struct sk_buff *skb,
         * this is not mandatory.... but seems that the probe
         * response parser uses it
         */
-       struct rtllib_hdr_3addr *hdr = (struct rtllib_hdr_3addr *)skb->data;
+       struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *)skb->data;
 
        rx_stats->len = skb->len;
        rtllib_rx_mgt(ieee, skb, rx_stats);
@@ -753,10 +753,10 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,
                         struct rtllib_rx_stats *rx_stats,
                         struct rtllib_rxb *rxb, u8 *src, u8 *dst)
 {
-       struct rtllib_hdr_3addr  *hdr = (struct rtllib_hdr_3addr *)skb->data;
-       u16             fc = le16_to_cpu(hdr->frame_ctl);
+       struct ieee80211_hdr_3addr  *hdr = (struct ieee80211_hdr_3addr *)skb->data;
+       u16             fc = le16_to_cpu(hdr->frame_control);
 
-       u16             LLCOffset = sizeof(struct rtllib_hdr_3addr);
+       u16             LLCOffset = sizeof(struct ieee80211_hdr_3addr);
        u16             ChkLength;
        bool            bIsAggregateFrame = false;
        u16             nSubframe_Length;
@@ -764,7 +764,7 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,
        u16             SeqNum = 0;
        struct sk_buff *sub_skb;
        /* just for debug purpose */
-       SeqNum = WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctl));
+       SeqNum = WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctrl));
        if ((RTLLIB_QOS_HAS_SEQ(fc)) &&
           (((union frameqos *)(skb->data + RTLLIB_3ADDR_LEN))->field.reserved))
                bIsAggregateFrame = true;