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>

diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index fcc28d4556c53c497ccd0622d9cbed1c8d0d0850..cda51aab752dc4bc1702f0f0b7e07a98d4e484ca 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -91,11 +91,22 @@ exit:
 
 void _rtw_free_recv_priv(struct recv_priv *precvpriv)
 {
+       signed int i;
+       union recv_frame *precvframe;
        struct adapter  *padapter = precvpriv->adapter;
 
        rtw_free_uc_swdec_pending_queue(padapter);
 
-       rtw_os_recv_resource_free(precvpriv);
+       precvframe = (union recv_frame *)precvpriv->precv_frame_buf;
+
+       for (i = 0; i < NR_RECVFRAME; i++) {
+               if (precvframe->u.hdr.pkt) {
+                       /* free skb by driver */
+                       dev_kfree_skb_any(precvframe->u.hdr.pkt);
+                       precvframe->u.hdr.pkt = NULL;
+               }
+               precvframe++;
+       }
 
        vfree(precvpriv->pallocated_frame_buf);
 

diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/staging/rtl8723bs/include/recv_osdep.h
index 763ddef4ad90f76d18c074347b53eac79297be43..9b3f4e8293ee0830fafa432e4e1fa0765da26de8 100644 (file)
--- a/drivers/staging/rtl8723bs/include/recv_osdep.h
+++ b/drivers/staging/rtl8723bs/include/recv_osdep.h
@@ -18,9 +18,6 @@ extern void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *pretu
 int    rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);
 void rtw_free_recv_priv(struct recv_priv *precvpriv);
 
-
-void rtw_os_recv_resource_free(struct recv_priv *precvpriv);
-
 void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf);
 
 struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 *pdata);

diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
index ccd00f8bee7e508b1dde82da5efbe963e0b7612d..c71e0c762f4f7d2efeffa05d74d504e66418983e 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
@@ -9,24 +9,6 @@
 #include <net/cfg80211.h>
 #include <linux/unaligned.h>
 
-/* free os related resource in union recv_frame */
-void rtw_os_recv_resource_free(struct recv_priv *precvpriv)
-{
-       signed int i;
-       union recv_frame *precvframe;
-
-       precvframe = (union recv_frame *) precvpriv->precv_frame_buf;
-
-       for (i = 0; i < NR_RECVFRAME; i++) {
-               if (precvframe->u.hdr.pkt) {
-                       /* free skb by driver */
-                       dev_kfree_skb_any(precvframe->u.hdr.pkt);
-                       precvframe->u.hdr.pkt = NULL;
-               }
-               precvframe++;
-       }
-}
-
 /* free os related resource in struct recv_buf */
 void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf)
 {