Commit 358d6196 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: use ieee80211_mgmt in issue_action_BA 



Define a struct ieee80211_mgmt variable in issue_action_BA, this will make
it much simpler to populate the fields of the outoing frame.

Use the new mgmt variable to set the type and subtype of the frame.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220524090029.242584-4-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+3 −4
Original line number Diff line number Diff line
@@ -5376,13 +5376,13 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch 
	struct pkt_attrib *pattrib;

	u8 *pframe;

	struct ieee80211_hdr *pwlanhdr;

	__le16 *fctrl;

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;

	struct sta_info *psta;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct registry_priv *pregpriv = &padapter->registrypriv;

	struct ieee80211_mgmt *mgmt;



	pmgntframe = alloc_mgtxmitframe(pxmitpriv);

	if (!pmgntframe)
@@ -5396,9 +5396,9 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch 


	pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;

	pwlanhdr = (struct ieee80211_hdr *)pframe;

	mgmt = (struct ieee80211_mgmt *)pframe;



	fctrl = &pwlanhdr->frame_control;

	*(fctrl) = 0;

	mgmt->frame_control = cpu_to_le16(IEEE80211_STYPE_ACTION | IEEE80211_FTYPE_MGMT);



	/* memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); */

	memcpy(pwlanhdr->addr1, raddr, ETH_ALEN);
@@ -5407,7 +5407,6 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch 


	SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);

	pmlmeext->mgnt_seq++;

	SetFrameSubType(pframe, WIFI_ACTION);



	pframe += sizeof(struct ieee80211_hdr_3addr);

	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);