staging: r8188eu: replace rtw_ieee80211_hdr_3addr_qos with ieee80211_qos_hdr
PATCH 3/63 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 <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +++++----- drivers/staging/rtl8188eu/include/ieee80211.h | 10 ---------- 3 files changed, 7 insertions(+), 17 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +2 -2
@@ -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;
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +5 -5
@@ -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 );
drivers/staging/rtl8188eu/include/ieee80211.h +0 -10
@@ -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 ,
Signature · 1 line
2.7.3