staging: rtl8192e: Remove struct rtllib_pspoll_hdr

Replace struct rtllib_pspoll_hdr with struct ieee80211_pspoll to avoid
proprietary code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/a4bd004fcbba81f96fd09f5adec5f029e2de3d6d.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 24060c9722e6a62c0668fb6951be7261d4360e5a..ef6e2187f847a2aa30fd07344256f200bd79eaab 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -672,13 +672,6 @@ enum rtllib_mfie {
  * information to determine what type of underlying data type is actually
  * stored in the data.
  */
-struct rtllib_pspoll_hdr {
-       __le16 frame_ctl;
-       __le16 aid;
-       u8 bssid[ETH_ALEN];
-       u8 ta[ETH_ALEN];
-} __packed;
-
 struct rtllib_info_element {
        u8 id;
        u8 len;

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 3c61b6f4f69f42e012781ecc5747dc06ce7e3d72..e51bdfd847d2163706fe9682a92fb91532773b9b 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -936,21 +936,21 @@ static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr)
 static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee)
 {
        struct sk_buff *skb;
-       struct rtllib_pspoll_hdr *hdr;
+       struct ieee80211_pspoll *hdr;
 
-       skb = dev_alloc_skb(sizeof(struct rtllib_pspoll_hdr) + ieee->tx_headroom);
+       skb = dev_alloc_skb(sizeof(struct ieee80211_pspoll) + ieee->tx_headroom);
        if (!skb)
                return NULL;
 
        skb_reserve(skb, ieee->tx_headroom);
 
-       hdr = skb_put(skb, sizeof(struct rtllib_pspoll_hdr));
+       hdr = skb_put(skb, sizeof(struct ieee80211_pspoll));
 
        ether_addr_copy(hdr->bssid, ieee->current_network.bssid);
        ether_addr_copy(hdr->ta, ieee->dev->dev_addr);
 
        hdr->aid = cpu_to_le16(ieee->assoc_id | 0xc000);
-       hdr->frame_ctl = cpu_to_le16(RTLLIB_FTYPE_CTL | RTLLIB_STYPE_PSPOLL |
+       hdr->frame_control = cpu_to_le16(RTLLIB_FTYPE_CTL | RTLLIB_STYPE_PSPOLL |
                         RTLLIB_FCTL_PM);
 
        return skb;