staging: rtl8723bs: move rtw_recv_indicatepkt to rtw_recv.c

Move the function rtw_recv_indicatepkt from os_dep/recv_linux.c to
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-3-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 8ae527b6e0d69f07be5171d4539381492ea8ff64..bc34cac8dabef34c91617998064d8a87e91e0c25 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -1725,6 +1725,43 @@ static void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 prev
 
 }
 
+static int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame)
+{
+       struct recv_priv *precvpriv;
+       struct __queue  *pfree_recv_queue;
+       struct sk_buff *skb;
+       struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
+
+       precvpriv = &(padapter->recvpriv);
+       pfree_recv_queue = &(precvpriv->free_recv_queue);
+
+       skb = precv_frame->u.hdr.pkt;
+       if (!skb)
+               goto _recv_indicatepkt_drop;
+
+       skb->data = precv_frame->u.hdr.rx_data;
+
+       skb_set_tail_pointer(skb, precv_frame->u.hdr.len);
+
+       skb->len = precv_frame->u.hdr.len;
+
+       rtw_os_recv_indicate_pkt(padapter, skb, pattrib);
+
+       /* pointers to NULL before rtw_free_recvframe() */
+       precv_frame->u.hdr.pkt = NULL;
+
+       rtw_free_recvframe(precv_frame, pfree_recv_queue);
+
+       return _SUCCESS;
+
+_recv_indicatepkt_drop:
+
+       /* enqueue back to free_recv_queue */
+       rtw_free_recvframe(precv_frame, pfree_recv_queue);
+
+       return _FAIL;
+}
+
 static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
 {
        struct list_head        *phead, *plist;

diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/staging/rtl8723bs/include/recv_osdep.h
index ea0b58aa0ba057a8595913b2602b5ef2f587e3ee..f31c87b21206bdf081650deeea65e7e669d2d72a 100644 (file)
--- a/drivers/staging/rtl8723bs/include/recv_osdep.h
+++ b/drivers/staging/rtl8723bs/include/recv_osdep.h
@@ -13,7 +13,6 @@ extern void _rtw_free_recv_priv(struct recv_priv *precvpriv);
 
 
 extern s32  rtw_recv_entry(union recv_frame *precv_frame);
-extern int rtw_recv_indicatepkt(struct adapter *adapter, union recv_frame *precv_frame);
 extern void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *preturnedpkt);
 
 extern void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup);

diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
index a507a29686bda285c88b56f42a3a3ae1f4f78ba9..ae396ccfd8305233e38124be818e5fb0e6300e47 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
@@ -179,40 +179,3 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)
        memset(&wrqu, 0x00, sizeof(wrqu));
        wrqu.data.length = sizeof(ev);
 }
-
-int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame)
-{
-       struct recv_priv *precvpriv;
-       struct __queue  *pfree_recv_queue;
-       struct sk_buff *skb;
-       struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
-
-       precvpriv = &(padapter->recvpriv);
-       pfree_recv_queue = &(precvpriv->free_recv_queue);
-
-       skb = precv_frame->u.hdr.pkt;
-       if (!skb)
-               goto _recv_indicatepkt_drop;
-
-       skb->data = precv_frame->u.hdr.rx_data;
-
-       skb_set_tail_pointer(skb, precv_frame->u.hdr.len);
-
-       skb->len = precv_frame->u.hdr.len;
-
-       rtw_os_recv_indicate_pkt(padapter, skb, pattrib);
-
-       /* pointers to NULL before rtw_free_recvframe() */
-       precv_frame->u.hdr.pkt = NULL;
-
-       rtw_free_recvframe(precv_frame, pfree_recv_queue);
-
-       return _SUCCESS;
-
-_recv_indicatepkt_drop:
-
-       /* enqueue back to free_recv_queue */
-       rtw_free_recvframe(precv_frame, pfree_recv_queue);
-
-       return _FAIL;
-}