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

Commit bd86e98c authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Remove get_recvframe_data() 



This inline function checks that the pointer is not NULL and then returns
the rx_data member. Unfortunately, all 3 callers of this function have
dereferenced that pointer before this routine is called. As the check for
NULL is useless, eliminate the routine.

Reported-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c24e0ba3

drivers/staging/rtl8188eu/core/rtw_recv.c

+2 −4
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static struct recv_frame *portctrl(struct adapter *adapter, 


	auth_alg = adapter->securitypriv.dot11AuthAlgrthm;



	ptr = get_recvframe_data(precv_frame);

	ptr = precv_frame->rx_data;

	pfhdr = precv_frame;

	pattrib = &pfhdr->attrib;

	psta_addr = pattrib->ta;
@@ -1440,11 +1440,9 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe) 
	int ret = _SUCCESS;

	struct adapter		*adapter = precvframe->adapter;

	struct mlme_priv	*pmlmepriv = &adapter->mlmepriv;



	u8	*ptr = get_recvframe_data(precvframe); /*  point to frame_ctrl field */

	u8 *ptr = precvframe->rx_data;

	struct rx_pkt_attrib *pattrib = &precvframe->attrib;





	if (pattrib->encrypt)

		recvframe_pull_tail(precvframe, pattrib->icv_len);

drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe, 
	pkt_info.bPacketToSelf = false;

	pkt_info.bPacketBeacon = false;



	wlanhdr = get_recvframe_data(precvframe);

	wlanhdr = precvframe->rx_data;



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

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

drivers/staging/rtl8188eu/include/rtw_recv.h

+0 −9
Original line number Diff line number Diff line
@@ -321,15 +321,6 @@ static inline u8 *get_rx_status(struct recv_frame *precvframe) 
	return get_rxmem(precvframe);

}



static inline u8 *get_recvframe_data(struct recv_frame *precvframe)

{

	/* always return rx_data */

	if (precvframe == NULL)

		return NULL;



	return precvframe->rx_data;

}



static inline u8 *recvframe_push(struct recv_frame *precvframe, int sz)

{

	/*  append data before rx_data */