Commit 9dc9653c authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: use in-kernel ieee80211 header structures 



The structures

rtw_ieee80211_hdr
rtw_ieee80211_hdr_3addr
rtw_ieee80211_hdr_3addr_qos

in drivers/staging/r8188eu/include/ieee80211.h just duplicate the
in-kernel structures from include/linux/ieee80211.h.

ieee80211_hdr
ieee80211_hdr_3addr
ieee80211_qos_hdr

Remove the rtw_ prefixed structures and use the in-kernel versions.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220418180916.11311-1-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96b6efb7

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+108 −108
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame) 
			}



			/* check the vendor of the assoc AP */

			pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pframe + sizeof(struct rtw_ieee80211_hdr_3addr), len - sizeof(struct rtw_ieee80211_hdr_3addr));

			pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pframe + sizeof(struct ieee80211_hdr_3addr), len - sizeof(struct ieee80211_hdr_3addr));



			/* update TSF Value */

			update_TSF(pmlmeext, pframe, len);
@@ -1490,7 +1490,7 @@ unsigned int on_action_spct(struct adapter *padapter, struct recv_frame *precv_f 
	struct sta_info *psta = NULL;

	struct sta_priv *pstapriv = &padapter->stapriv;

	u8 *pframe = precv_frame->rx_data;

	u8 *frame_body = (u8 *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr));

	u8 *frame_body = (u8 *)(pframe + sizeof(struct ieee80211_hdr_3addr));

	u8 category;

	u8 action;
@@ -1556,7 +1556,7 @@ unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_fr 
	if (!psta)

		return _SUCCESS;



	frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr));

	frame_body = (unsigned char *)(pframe + sizeof(struct ieee80211_hdr_3addr));



	category = frame_body[0];

	if (category == RTW_WLAN_CATEGORY_BACK) { /*  representing Block Ack */
@@ -1626,7 +1626,7 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) 
	struct 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;
@@ -1643,9 +1643,9 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *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);
@@ -1656,8 +1656,8 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ACTION);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);

	pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
@@ -1961,7 +1961,7 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame 
	struct 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;
@@ -1978,9 +1978,9 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame 
	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);
@@ -1991,8 +1991,8 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ACTION);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);

	pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
@@ -2318,7 +2318,7 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result) 
	struct 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;
@@ -2335,9 +2335,9 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result) 
	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);
@@ -2348,8 +2348,8 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result) 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ACTION);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);

	pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
@@ -2480,7 +2480,7 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr) 
	struct 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;
@@ -2497,9 +2497,9 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *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);
@@ -2510,8 +2510,8 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr) 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ACTION);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);

	pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
@@ -2726,7 +2726,7 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialo 
	struct 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;
@@ -2743,9 +2743,9 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialo 
	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);
@@ -2756,8 +2756,8 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialo 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ACTION);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);

	pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
@@ -2917,7 +2917,7 @@ void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid, u8 ussidle 
	struct 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;
@@ -2934,9 +2934,9 @@ void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid, u8 ussidle 
	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, pdev_raddr, ETH_ALEN);
@@ -2947,8 +2947,8 @@ void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid, u8 ussidle 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ACTION);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);

	pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
@@ -3016,7 +3016,7 @@ void issue_probersp_p2p(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;

	struct xmit_priv	*pxmitpriv = &padapter->xmitpriv;
@@ -3038,11 +3038,11 @@ void issue_probersp_p2p(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);



	fctrl = &pwlanhdr->frame_ctl;

	fctrl = &pwlanhdr->frame_control;

	*(fctrl) = 0;

	memcpy(pwlanhdr->addr1, da, ETH_ALEN);

	memcpy(pwlanhdr->addr2, mac, ETH_ALEN);
@@ -3054,7 +3054,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(fctrl, WIFI_PROBERSP);



	pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->hdrlen = sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = pattrib->hdrlen;

	pframe += pattrib->hdrlen;
@@ -3262,7 +3262,7 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) 
	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;

	struct xmit_priv		*pxmitpriv = &padapter->xmitpriv;
@@ -3283,11 +3283,11 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) 
	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);



	fctrl = &pwlanhdr->frame_ctl;

	fctrl = &pwlanhdr->frame_control;

	*(fctrl) = 0;



	if (da) {
@@ -3310,8 +3310,8 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_PROBEREQ);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ))

		pframe = rtw_set_ie(pframe, _SSID_IE_, pwdinfo->tx_prov_disc_info.ssid.SsidLength, pwdinfo->tx_prov_disc_info.ssid.Ssid, &pattrib->pktlen);
@@ -3585,7 +3585,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame) 
	u8	result = P2P_STATUS_SUCCESS;

	u8	empty_addr[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };



	frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr));

	frame_body = (unsigned char *)(pframe + sizeof(struct ieee80211_hdr_3addr));



	dialogToken = frame_body[7];
@@ -3597,7 +3597,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame) 
	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE))

		return _SUCCESS;



	len -= sizeof(struct rtw_ieee80211_hdr_3addr);

	len -= sizeof(struct ieee80211_hdr_3addr);



	switch (frame_body[6]) { /* OUI Subtype */

	case P2P_GO_NEGO_REQ:
@@ -3838,7 +3838,7 @@ static unsigned int on_action_public_vendor(struct recv_frame *precv_frame) 
{

	unsigned int ret = _FAIL;

	u8 *pframe = precv_frame->rx_data;

	u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr);

	u8 *frame_body = pframe + sizeof(struct ieee80211_hdr_3addr);



	if (!memcmp(frame_body + 2, P2P_OUI, 4)) {

		ret = on_action_public_p2p(precv_frame);
@@ -3851,7 +3851,7 @@ static unsigned int on_action_public_default(struct recv_frame *precv_frame) 
{

	unsigned int ret = _FAIL;

	u8 *pframe = precv_frame->rx_data;

	u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr);

	u8 *frame_body = pframe + sizeof(struct ieee80211_hdr_3addr);

	u8 token;



	token = frame_body[2];
@@ -3869,7 +3869,7 @@ unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv 
{

	unsigned int ret = _FAIL;

	u8 *pframe = precv_frame->rx_data;

	u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr);

	u8 *frame_body = pframe + sizeof(struct ieee80211_hdr_3addr);

	u8 category, action;



	/* check RA matches or not */
@@ -3916,7 +3916,7 @@ unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_fra 
	if (memcmp(myid(&padapter->eeprompriv), GetAddr1Ptr(pframe), ETH_ALEN))/* for if1, sta/ap mode */

		return _SUCCESS;



	frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr));

	frame_body = (unsigned char *)(pframe + sizeof(struct ieee80211_hdr_3addr));



	category = frame_body[0];

	if (category != RTW_WLAN_CATEGORY_P2P)
@@ -3925,7 +3925,7 @@ unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_fra 
	if (be32_to_cpu(*((__be32 *)(frame_body + 1))) != P2POUI)

		return _SUCCESS;



	len -= sizeof(struct rtw_ieee80211_hdr_3addr);

	len -= sizeof(struct ieee80211_hdr_3addr);

	OUI_Subtype = frame_body[5];



	switch (OUI_Subtype) {
@@ -3952,7 +3952,7 @@ unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame) 
	unsigned char	*frame_body;

	u8 *pframe = precv_frame->rx_data;



	frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr));

	frame_body = (unsigned char *)(pframe + sizeof(struct ieee80211_hdr_3addr));



	category = frame_body[0];
@@ -4125,7 +4125,7 @@ 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;
@@ -4148,9 +4148,9 @@ 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;



	eth_broadcast_addr(pwlanhdr->addr1);
@@ -4161,8 +4161,8 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) 
	/* pmlmeext->mgnt_seq++; */

	SetFrameSubType(pframe, WIFI_BEACON);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {

		/*  for P2P : Primary Device Type & Device Name */
@@ -4245,8 +4245,8 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) 
			u8 *wps_ie;

			uint wps_ielen;

			u8 sr = 0;

			wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr + TXDESC_OFFSET + sizeof(struct rtw_ieee80211_hdr_3addr) + _BEACON_IE_OFFSET_,

				pattrib->pktlen - sizeof(struct rtw_ieee80211_hdr_3addr) - _BEACON_IE_OFFSET_, NULL, &wps_ielen);

			wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr + TXDESC_OFFSET + sizeof(struct ieee80211_hdr_3addr) + _BEACON_IE_OFFSET_,

				pattrib->pktlen - sizeof(struct ieee80211_hdr_3addr) - _BEACON_IE_OFFSET_, NULL, &wps_ielen);

			if (wps_ie && wps_ielen > 0)

				rtw_get_wps_attr_content(wps_ie,  wps_ielen, WPS_ATTR_SELECTED_REGISTRAR, (u8 *)(&sr), NULL);

			if (sr != 0)
@@ -4333,7 +4333,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p 
	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;
@@ -4357,12 +4357,12 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p 
	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);
@@ -4372,7 +4372,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(fctrl, WIFI_PROBERSP);



	pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->hdrlen = sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = pattrib->hdrlen;

	pframe += pattrib->hdrlen;
@@ -4482,7 +4482,7 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps 
	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;

	unsigned char			bssrate[NumRates];
@@ -4502,11 +4502,11 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps 
	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);



	fctrl = &pwlanhdr->frame_ctl;

	fctrl = &pwlanhdr->frame_control;

	*(fctrl) = 0;



	if (da) {
@@ -4525,8 +4525,8 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_PROBEREQ);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	if (pssid)

		pframe = rtw_set_ie(pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &pattrib->pktlen);
@@ -4600,7 +4600,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short 
	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;
@@ -4621,17 +4621,17 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short 
	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);

	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_AUTH);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	if (psta) {/*  for AP mode */

		memcpy(pwlanhdr->addr1, psta->hwaddr, ETH_ALEN);
@@ -4705,7 +4705,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short 


			SetPrivacy(fctrl);



			pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr);

			pattrib->hdrlen = sizeof(struct ieee80211_hdr_3addr);



			pattrib->encrypt = _WEP40_;
@@ -4724,7 +4724,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short 
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;
@@ -4749,9 +4749,9 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i 
	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);
@@ -4765,7 +4765,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i 
	else

		return;



	pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->hdrlen = sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen += pattrib->hdrlen;

	pframe += pattrib->hdrlen;
@@ -4855,7 +4855,7 @@ 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;

	__le16		le_tmp;

	unsigned int	i, j, ie_len, index = 0;
@@ -4881,9 +4881,9 @@ 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, get_my_bssid(&pmlmeinfo->network), ETH_ALEN);

	memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);
@@ -4893,8 +4893,8 @@ void issue_assocreq(struct adapter *padapter) 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ASSOCREQ);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	/* caps */
@@ -5155,7 +5155,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned 
	struct 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;
@@ -5180,9 +5180,9 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned 
	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;



	if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)
@@ -5201,8 +5201,8 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_DATA_NULL);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	pattrib->last_txcmdsz = pattrib->pktlen;
@@ -5257,7 +5257,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 
	struct 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;
@@ -5281,9 +5281,9 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 
	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;



	if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)
@@ -5307,8 +5307,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;
@@ -5361,7 +5361,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s 
	struct 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;
@@ -5387,9 +5387,9 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s 
	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, da, ETH_ALEN);
@@ -5400,8 +5400,8 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_DEAUTH);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	le_tmp = cpu_to_le16(reason);

	pframe = rtw_set_fixed_ie(pframe, _RSON_CODE_, (unsigned char *)&le_tmp, &pattrib->pktlen);
@@ -5462,7 +5462,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch 
	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;
@@ -5482,9 +5482,9 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch 
	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, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); */
@@ -5496,8 +5496,8 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ACTION);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	pframe = rtw_set_fixed_ie(pframe, 1, &(category), &pattrib->pktlen);

	pframe = rtw_set_fixed_ie(pframe, 1, &(action), &pattrib->pktlen);
@@ -5570,7 +5570,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;
@@ -5600,9 +5600,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, get_my_bssid(&pmlmeinfo->network), ETH_ALEN);
@@ -5613,8 +5613,8 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) 
	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ACTION);



	pframe += sizeof(struct rtw_ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);

	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);

	pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
@@ -5941,7 +5941,7 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st 
	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;

	__le32 le32_tmp;



	len = packet_len - sizeof(struct rtw_ieee80211_hdr_3addr);

	len = packet_len - sizeof(struct ieee80211_hdr_3addr);



	if (len > MAX_IE_SZ)

		return _FAIL;
@@ -5971,7 +5971,7 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st 


	/* below is to copy the information element */

	bssid->IELength = len;

	memcpy(bssid->IEs, (pframe + sizeof(struct rtw_ieee80211_hdr_3addr)), bssid->IELength);

	memcpy(bssid->IEs, (pframe + sizeof(struct ieee80211_hdr_3addr)), bssid->IELength);



	/* get the signal strength */

	bssid->Rssi = precv_frame->attrib.phy_info.recvpower; /*  in dBM.raw data */

drivers/staging/r8188eu/core/rtw_p2p.c

+23 −23

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/r8188eu/core/rtw_wlan_util.c

+3 −3
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
	if (!is_client_associated_to_ap(Adapter))

		return true;



	len = packet_len - sizeof(struct rtw_ieee80211_hdr_3addr);

	len = packet_len - sizeof(struct ieee80211_hdr_3addr);



	if (len > MAX_IE_SZ)

		return _FAIL;
@@ -913,7 +913,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 


	/* below is to copy the information element */

	bssid->IELength = len;

	memcpy(bssid->IEs, (pframe + sizeof(struct rtw_ieee80211_hdr_3addr)), bssid->IELength);

	memcpy(bssid->IEs, (pframe + sizeof(struct ieee80211_hdr_3addr)), bssid->IELength);



	/* check bw and channel offset */

	/* parsing HT_CAP_IE */
@@ -1491,7 +1491,7 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) 
	u8 *pIE;

	__le32 *pbuf;



	pIE = pframe + sizeof(struct rtw_ieee80211_hdr_3addr);

	pIE = pframe + sizeof(struct ieee80211_hdr_3addr);

	pbuf = (__le32 *)pIE;



	pmlmeext->TSFValue = le32_to_cpu(*(pbuf + 1));

drivers/staging/r8188eu/core/rtw_xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -696,13 +696,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/r8188eu/hal/rtl8188e_cmd.c

+21 −21

File changed.

Preview size limit exceeded, changes collapsed.