Skip to content

Commit 0ae5ca4

Browse files
mistraubegregkh
authored andcommitted
staging: rtl8723bs: merge rtw_os_recv_resource_free into rtw_recv.c
Merge the functionality of rtw_os_recv_resource_free in os_dep/recv_linux.c into _rtw_free_recv_priv in core/rtw_recv.c to reduce code in the os_dep directory. Signed-off-by: Michael Straube <straube.linux@gmail.com> Reviewed-by: Hans de Goede <hansg@kernel.org> Link: https://lore.kernel.org/r/20250822135418.118115-7-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent aec7478 commit 0ae5ca4

3 files changed

Lines changed: 12 additions & 22 deletions

File tree

drivers/staging/rtl8723bs/core/rtw_recv.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,22 @@ signed int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *pada
9191

9292
void _rtw_free_recv_priv(struct recv_priv *precvpriv)
9393
{
94+
signed int i;
95+
union recv_frame *precvframe;
9496
struct adapter *padapter = precvpriv->adapter;
9597

9698
rtw_free_uc_swdec_pending_queue(padapter);
9799

98-
rtw_os_recv_resource_free(precvpriv);
100+
precvframe = (union recv_frame *)precvpriv->precv_frame_buf;
101+
102+
for (i = 0; i < NR_RECVFRAME; i++) {
103+
if (precvframe->u.hdr.pkt) {
104+
/* free skb by driver */
105+
dev_kfree_skb_any(precvframe->u.hdr.pkt);
106+
precvframe->u.hdr.pkt = NULL;
107+
}
108+
precvframe++;
109+
}
99110

100111
vfree(precvpriv->pallocated_frame_buf);
101112

drivers/staging/rtl8723bs/include/recv_osdep.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ extern void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *pretu
1818
int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);
1919
void rtw_free_recv_priv(struct recv_priv *precvpriv);
2020

21-
22-
void rtw_os_recv_resource_free(struct recv_priv *precvpriv);
23-
2421
void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf);
2522

2623
struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 *pdata);

drivers/staging/rtl8723bs/os_dep/recv_linux.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,6 @@
99
#include <net/cfg80211.h>
1010
#include <linux/unaligned.h>
1111

12-
/* free os related resource in union recv_frame */
13-
void rtw_os_recv_resource_free(struct recv_priv *precvpriv)
14-
{
15-
signed int i;
16-
union recv_frame *precvframe;
17-
18-
precvframe = (union recv_frame *) precvpriv->precv_frame_buf;
19-
20-
for (i = 0; i < NR_RECVFRAME; i++) {
21-
if (precvframe->u.hdr.pkt) {
22-
/* free skb by driver */
23-
dev_kfree_skb_any(precvframe->u.hdr.pkt);
24-
precvframe->u.hdr.pkt = NULL;
25-
}
26-
precvframe++;
27-
}
28-
}
29-
3012
/* free os related resource in struct recv_buf */
3113
void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf)
3214
{

0 commit comments

Comments
 (0)