Commit 5877852e authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: rtw_init_hwxmits is not needed 



The _rtw_init_xmit_priv function calls rtw_alloc_hwxmits to allocate
memory for pxmitpriv->hwxmits (this is an array of struct hw_xmit). This
allocation uses kzalloc, the allocated memory is initialised with 0.

After the allocation, _rtw_init_xmit_priv calls rtw_init_hwxmits to set an
element of each hw_xmit to 0. This is not necessary, we can remove the
rtw_init_hwxmits call and the now unused function rtw_init_hwxmits.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20221230180646.91008-20-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_xmit.c

+0 −10
Original line number Diff line number Diff line
@@ -189,8 +189,6 @@ int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
	if (rtw_alloc_hwxmits(padapter))

		goto free_xmit_extbuf;



	rtw_init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);



	for (i = 0; i < 4; i++)

		pxmitpriv->wmm_para_seq[i] = i;
@@ -1570,14 +1568,6 @@ void rtw_free_hwxmits(struct adapter *padapter) 
	kfree(hwxmits);

}



void rtw_init_hwxmits(struct hw_xmit *phwxmit, int entry)

{

	int i;



	for (i = 0; i < entry; i++, phwxmit++)

		phwxmit->accnt = 0;

}



static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)

{

	struct sk_buff *skb = *pskb;

drivers/staging/r8188eu/include/rtw_xmit.h

+0 −1
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv); 
s32 rtw_txframes_pending(struct adapter *padapter);

s32 rtw_txframes_sta_ac_pending(struct adapter *padapter,

				struct pkt_attrib *pattrib);

void rtw_init_hwxmits(struct hw_xmit *phwxmit, int entry);

int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter);

void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv);

int rtw_alloc_hwxmits(struct adapter *padapter);