Skip to content

Commit 10bcaf9

Browse files
mistraubegregkh
authored andcommitted
staging: rtl8723bs: merge rtw_os_recvbuf_resource_free into rtl8723bs_recv.c
Merge rtw_os_recvbuf_resource_free into rtl8723bs_init_recv_priv and into rtl8723bs_free_recv_priv 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-8-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0ae5ca4 commit 10bcaf9

3 files changed

Lines changed: 4 additions & 11 deletions

File tree

drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,8 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)
431431
precvpriv->free_recv_buf_queue_cnt = 0;
432432
for (i = 0; i < n ; i++) {
433433
list_del_init(&precvbuf->list);
434-
rtw_os_recvbuf_resource_free(padapter, precvbuf);
434+
if (precvbuf->pskb)
435+
dev_kfree_skb_any(precvbuf->pskb);
435436
precvbuf++;
436437
}
437438
precvpriv->precv_buf = NULL;
@@ -467,7 +468,8 @@ void rtl8723bs_free_recv_priv(struct adapter *padapter)
467468
precvpriv->free_recv_buf_queue_cnt = 0;
468469
for (i = 0; i < NR_RECVBUFF; i++) {
469470
list_del_init(&precvbuf->list);
470-
rtw_os_recvbuf_resource_free(padapter, precvbuf);
471+
if (precvbuf->pskb)
472+
dev_kfree_skb_any(precvbuf->pskb);
471473
precvbuf++;
472474
}
473475
precvpriv->precv_buf = NULL;

drivers/staging/rtl8723bs/include/recv_osdep.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +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-
void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf);
22-
2321
struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 *pdata);
2422
void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pkt, struct rx_pkt_attrib *pattrib);
2523

drivers/staging/rtl8723bs/os_dep/recv_linux.c

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

12-
/* free os related resource in struct recv_buf */
13-
void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf)
14-
{
15-
if (precvbuf->pskb)
16-
dev_kfree_skb_any(precvbuf->pskb);
17-
}
18-
1912
struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 *pdata)
2013
{
2114
u16 eth_type;

0 commit comments

Comments
 (0)