staging: r8188eu: replace rtw_ieee80211_hdr_3addr_qos with ieee80211_qos_hdr

rtw_ieee80211_hdr_3addr_qos is duplicate of ieee80211_qos_hdr.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index b1f254cf615663347937bae6cbe56a67957ea3f7..9544e55fc894ac5eae732ef9e68bbfbf6294f980 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -1388,8 +1388,8 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16
        pmlmeext->mgnt_seq++;
        SetFrameSubType(pframe, WIFI_QOS_DATA_NULL);
 
-       pframe += sizeof(struct rtw_ieee80211_hdr_3addr_qos);
-       pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr_qos);
+       pframe += sizeof(struct ieee80211_qos_hdr);
+       pattrib->pktlen = sizeof(struct ieee80211_qos_hdr);
 
        pattrib->last_txcmdsz = pattrib->pktlen;
 

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
index b2da4bf9704ce91c0bbd6f3a34c58b739a77f50c..40a0114c3b869ead6bd32525a35b5d0151e4e1db 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
@@ -378,15 +378,15 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,
        SetSeqNum(pwlanhdr, 0);
 
        if (bQoS) {
-               struct rtw_ieee80211_hdr_3addr_qos *pwlanqoshdr;
+               struct ieee80211_qos_hdr *pwlanqoshdr;
 
                SetFrameSubType(pframe, WIFI_QOS_DATA_NULL);
 
-               pwlanqoshdr = (struct rtw_ieee80211_hdr_3addr_qos *)pframe;
-               SetPriority(&pwlanqoshdr->qc, AC);
-               SetEOSP(&pwlanqoshdr->qc, bEosp);
+               pwlanqoshdr = (struct ieee80211_qos_hdr *)pframe;
+               SetPriority(&pwlanqoshdr->qos_ctrl, AC);
+               SetEOSP(&pwlanqoshdr->qos_ctrl, bEosp);
 
-               pktlen = sizeof(struct rtw_ieee80211_hdr_3addr_qos);
+               pktlen = sizeof(struct ieee80211_qos_hdr);
        } else {
                SetFrameSubType(pframe, WIFI_DATA_NULL);
 

diff --git a/drivers/staging/rtl8188eu/include/ieee80211.h b/drivers/staging/rtl8188eu/include/ieee80211.h
index b66fc5e8338cf447fa69d104f66f3c5c83ea4024..f84bc32386598507b4c47b6246cacab31d900b68 100644 (file)
--- a/drivers/staging/rtl8188eu/include/ieee80211.h
+++ b/drivers/staging/rtl8188eu/include/ieee80211.h
@@ -291,16 +291,6 @@ struct sta_data {
 /* this is stolen from ipw2200 driver */
 #define IEEE_IBSS_MAC_HASH_SIZE 31
 
-struct rtw_ieee80211_hdr_3addr_qos {
-       __le16 frame_ctl;
-       __le16 duration_id;
-       u8 addr1[ETH_ALEN];
-       u8 addr2[ETH_ALEN];
-       u8 addr3[ETH_ALEN];
-       u16 seq_ctl;
-       u16     qc;
-}  __packed;
-
 enum eap_type {
        EAP_PACKET = 0,
        EAPOL_START,