staging: r8188eu: replace rtw_ieee80211_hdr with ieee80211_hdr
PATCH 1/63 staging: r8188eu: replace rtw_ieee80211_hdr with ieee80211_hdr
rtw_ieee80211_hdr is duplicate of ieee80211_hdr.
Signed-off-by Ivan Safonov <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 66 +++++++++++++-------------- drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 24 +++++----- drivers/staging/rtl8188eu/include/ieee80211.h | 10 ---- 4 files changed, 47 insertions(+), 57 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +33 -33
@@ -320,7 +320,7 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms)struct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;unsigned char *pframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned int rate_len;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
@@ -347,10 +347,10 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms)memset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, bc_addr,ETH_ALEN );
@@ -461,7 +461,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da)struct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;unsigned char *pframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned char *mac, *bssid;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
@@ -488,12 +488,12 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da)memset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; mac =myid (&(padapter->eeprompriv)); bssid = cur_network->MacAddress; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, da,ETH_ALEN );memcpy (pwlanhdr->addr2, mac,ETH_ALEN );
@@ -609,7 +609,7 @@ static int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssstruct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;unsigned char *pframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned char *mac;unsigned char bssrate[NumRates];
@@ -633,11 +633,11 @@ static int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssmemset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; mac =myid (&(padapter->eeprompriv)); - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;if (da) {
@@ -745,7 +745,7 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta,struct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;unsigned char *pframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned int val32;u16 val16;
@@ -769,9 +769,9 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta,memset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -889,7 +889,7 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type) {struct xmit_frame *pmgntframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;struct pkt_attrib *pattrib;unsigned char *pbuf, *pframe;unsigned short val;
@@ -916,9 +916,9 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status,memset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;memcpy ((void *)GetAddr1Ptr (pwlanhdr), pstat->hwaddr,ETH_ALEN );
@@ -1017,7 +1017,7 @@ static void issue_assocreq(struct adapter *padapter)struct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;unsigned char *pframe, *p; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned int i, j, ie_len, index =0 ;unsigned char rf_type, bssrate[NumRates], sta_bssrate[NumRates];
@@ -1040,9 +1040,9 @@ static void issue_assocreq(struct adapter *padapter)memset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, pnetwork->MacAddress,ETH_ALEN );memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN );
@@ -1212,7 +1212,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsignedstruct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;unsigned char *pframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct xmit_priv *pxmitpriv;struct mlme_ext_priv *pmlmeext;
@@ -1239,9 +1239,9 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsignedmemset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE )
@@ -1332,7 +1332,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16struct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;unsigned char *pframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned short *qc;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
@@ -1359,9 +1359,9 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16memset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE )
@@ -1457,7 +1457,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned sstruct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;unsigned char *pframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@@ -1478,9 +1478,9 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned smemset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, da,ETH_ALEN );
@@ -1573,7 +1573,7 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,struct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;u8 *pframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@@ -1596,9 +1596,9 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,memset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, raddr,ETH_ALEN );
@@ -1719,7 +1719,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)struct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;unsigned char *pframe; -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct wlan_network *pnetwork =NULL ;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
@@ -1755,9 +1755,9 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)memset (pmgntframe->buf_addr,0 ,WLANHDR_OFFSET +TXDESC_OFFSET ); pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, cur_network->MacAddress,ETH_ALEN );
drivers/staging/rtl8188eu/core/rtw_xmit.c +2 -2
@@ -765,13 +765,13 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr {u16 *qc; -struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr; +struct ieee80211_hdr *pwlanhdr = (struct ieee80211_hdr *)hdr;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct qos_priv *pqospriv = &pmlmepriv->qospriv;u8 qos_option = false;int res = _SUCCESS; -__le16 *fctrl = &pwlanhdr->frame_ctl; +__le16 *fctrl = &pwlanhdr->frame_control;struct sta_info *psta;
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +12 -12
@@ -219,7 +219,7 @@ void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt)static void ConstructBeacon (struct adapter *adapt,u8 *pframe,u32 *pLength) { -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;u32 rate_len, pktlen;struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);
@@ -227,9 +227,9 @@ static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength)struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, bc_addr,ETH_ALEN );
@@ -304,16 +304,16 @@ _ConstructBeacon:static void ConstructPSPoll (struct adapter *adapt,u8 *pframe,u32 *pLength) { -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);__le16 *fctrl;struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe;/* Frame control. */ - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;SetPwrMgt (fctrl);SetFrameSubType (pframe,WIFI_PSPOLL );
@@ -338,7 +338,7 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe, u8 bEosp, u8 bForcePowerSave) { -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;u32 pktlen;struct mlme_priv *pmlmepriv = &adapt->mlmepriv;
@@ -347,9 +347,9 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; - fctrl = &pwlanhdr->frame_ctl; + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;if (bForcePowerSave)SetPwrMgt (fctrl);
@@ -398,7 +398,7 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,static void ConstructProbeRsp (struct adapter *adapt,u8 *pframe,u32 *pLength,u8 *StaAddr,bool bHideSSID) { -struct rtw_ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;u8 *mac, *bssid;u32 pktlen;
@@ -406,12 +406,12 @@ static void ConstructProbeRsp(struct adapter *adapt, u8 *pframe, u32 *pLength, ustruct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; + pwlanhdr = (struct ieee80211_hdr *)pframe; mac =myid (&(adapt->eeprompriv)); bssid = cur_network->MacAddress; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, StaAddr,ETH_ALEN );memcpy (pwlanhdr->addr2, mac,ETH_ALEN );
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 { -__le16 frame_ctl; -__le16 duration_id; -u8 addr1[ETH_ALEN ]; -u8 addr2[ETH_ALEN ]; -u8 addr3[ETH_ALEN ]; -u16 seq_ctl; -u8 addr4[ETH_ALEN ]; -} __packed; -struct rtw_ieee80211_hdr_3addr {__le16 frame_ctl;__le16 duration_id;
Signature · 1 line
2.7.3