Commit 97919a57 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:r8188eu: use ieee80211_is_ctl instead IsFrameTypeCtrl 



IsFrameTypeCtrl() duplicate ieee80211_is_ctl().

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20210314090247.21181-5-insafonov@gmail.com


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

drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c

+5 −3
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe, 
	struct rx_pkt_attrib *pattrib = &precvframe->attrib;

	struct odm_phy_status_info *pPHYInfo  = (struct odm_phy_status_info *)(&pattrib->phy_info);

	u8 *wlanhdr;

	struct ieee80211_hdr *hdr =

		(struct ieee80211_hdr *)precvframe->pkt->data;

	struct odm_per_pkt_info	pkt_info;

	u8 *sa = NULL;

	struct sta_priv *pstapriv;
@@ -144,13 +146,13 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe, 


	wlanhdr = precvframe->pkt->data;



	pkt_info.bPacketMatchBSSID = ((!IsFrameTypeCtrl(wlanhdr)) &&

	pkt_info.bPacketMatchBSSID = (!ieee80211_is_ctl(hdr->frame_control) &&

		!pattrib->icv_err && !pattrib->crc_err &&

		!memcmp(get_hdr_bssid(wlanhdr),

		 get_bssid(&padapter->mlmepriv), ETH_ALEN));



	pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID &&

				 (!memcmp(ieee80211_get_DA((struct ieee80211_hdr *)wlanhdr),

				 (!memcmp(ieee80211_get_DA(hdr),

				  myid(&padapter->eeprompriv), ETH_ALEN));



	pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID &&
@@ -161,7 +163,7 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe, 
			sa = padapter->mlmepriv.cur_network.network.MacAddress;

		/* to do Ad-hoc */

	} else {

		sa = ieee80211_get_SA((struct ieee80211_hdr *)wlanhdr);

		sa = ieee80211_get_SA(hdr);

	}



	pstapriv = &padapter->stapriv;

drivers/staging/rtl8188eu/include/wifi.h

+0 −8
Original line number Diff line number Diff line
@@ -197,14 +197,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe) 
	return sa;

}



static inline int IsFrameTypeCtrl(unsigned char *pframe)

{

	if (GetFrameType(pframe) == WIFI_CTRL_TYPE)

		return true;

	else

		return false;

}



/*-----------------------------------------------------------------------------

			Below is for the security related definition

------------------------------------------------------------------------------*/