Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e3ddadf authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Get rid of ClearMFrag/SetMFrag 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5acab752

drivers/staging/rtl8723au/core/rtw_xmit.c

+5 −4
Original line number Diff line number Diff line
@@ -1078,6 +1078,7 @@ int rtw_xmitframe_coalesce23a(struct rtw_adapter *padapter, struct sk_buff *skb, 
	struct sta_info *psta;

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct pkt_attrib *pattrib = &pxmitframe->attrib;

	struct ieee80211_hdr *hdr;

	s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;

	u8 *pframe, *mem_start;

	u8 hw_hdr_offset;
@@ -1136,8 +1137,7 @@ int rtw_xmitframe_coalesce23a(struct rtw_adapter *padapter, struct sk_buff *skb, 
		mpdu_len = frg_len;



		pframe = mem_start;



		SetMFrag(mem_start);

		hdr = (struct ieee80211_hdr *)mem_start;



		pframe += pattrib->hdrlen;

		mpdu_len -= pattrib->hdrlen;
@@ -1220,8 +1220,8 @@ int rtw_xmitframe_coalesce23a(struct rtw_adapter *padapter, struct sk_buff *skb, 
						llc_sz : 0) +

						((pattrib->bswenc) ?

						pattrib->icv_len : 0) + mem_sz;



			ClearMFrag(mem_start);

			hdr->frame_control &=

				~cpu_to_le16(IEEE80211_FCTL_MOREFRAGS);



			break;

		} else {
@@ -1229,6 +1229,7 @@ int rtw_xmitframe_coalesce23a(struct rtw_adapter *padapter, struct sk_buff *skb, 
				 ("%s: There're still something in packet!\n",

				  __func__));

		}

		hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREFRAGS);



		mem_start = PTR_ALIGN(pframe, 4) + hw_hdr_offset;

		memcpy(mem_start, pbuf_start + hw_hdr_offset, pattrib->hdrlen);

drivers/staging/rtl8723au/include/wifi.h

+0 −6
Original line number Diff line number Diff line
@@ -87,12 +87,6 @@ enum WIFI_REG_DOMAIN { 
#define SetFrDs(pbuf)	\

	(*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_FROMDS))



#define SetMFrag(pbuf)	\

	(*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREFRAGS))



#define ClearMFrag(pbuf)	\

	(*(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)))



#define SetRetry(pbuf)	\

	(*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_RETRY))