Skip to content

Commit f97151e

Browse files
mistraubegregkh
authored andcommitted
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>
1 parent 0149f27 commit f97151e

3 files changed

Lines changed: 37 additions & 38 deletions

File tree

drivers/staging/rtl8723bs/core/rtw_recv.c

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,6 +1725,43 @@ static void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 prev
17251725

17261726
}
17271727

1728+
static int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame)
1729+
{
1730+
struct recv_priv *precvpriv;
1731+
struct __queue *pfree_recv_queue;
1732+
struct sk_buff *skb;
1733+
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
1734+
1735+
precvpriv = &(padapter->recvpriv);
1736+
pfree_recv_queue = &(precvpriv->free_recv_queue);
1737+
1738+
skb = precv_frame->u.hdr.pkt;
1739+
if (!skb)
1740+
goto _recv_indicatepkt_drop;
1741+
1742+
skb->data = precv_frame->u.hdr.rx_data;
1743+
1744+
skb_set_tail_pointer(skb, precv_frame->u.hdr.len);
1745+
1746+
skb->len = precv_frame->u.hdr.len;
1747+
1748+
rtw_os_recv_indicate_pkt(padapter, skb, pattrib);
1749+
1750+
/* pointers to NULL before rtw_free_recvframe() */
1751+
precv_frame->u.hdr.pkt = NULL;
1752+
1753+
rtw_free_recvframe(precv_frame, pfree_recv_queue);
1754+
1755+
return _SUCCESS;
1756+
1757+
_recv_indicatepkt_drop:
1758+
1759+
/* enqueue back to free_recv_queue */
1760+
rtw_free_recvframe(precv_frame, pfree_recv_queue);
1761+
1762+
return _FAIL;
1763+
}
1764+
17281765
static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
17291766
{
17301767
struct list_head *phead, *plist;

drivers/staging/rtl8723bs/include/recv_osdep.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ extern void _rtw_free_recv_priv(struct recv_priv *precvpriv);
1313

1414

1515
extern s32 rtw_recv_entry(union recv_frame *precv_frame);
16-
extern int rtw_recv_indicatepkt(struct adapter *adapter, union recv_frame *precv_frame);
1716
extern void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *preturnedpkt);
1817

1918
extern void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup);

drivers/staging/rtl8723bs/os_dep/recv_linux.c

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -179,40 +179,3 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)
179179
memset(&wrqu, 0x00, sizeof(wrqu));
180180
wrqu.data.length = sizeof(ev);
181181
}
182-
183-
int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame)
184-
{
185-
struct recv_priv *precvpriv;
186-
struct __queue *pfree_recv_queue;
187-
struct sk_buff *skb;
188-
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
189-
190-
precvpriv = &(padapter->recvpriv);
191-
pfree_recv_queue = &(precvpriv->free_recv_queue);
192-
193-
skb = precv_frame->u.hdr.pkt;
194-
if (!skb)
195-
goto _recv_indicatepkt_drop;
196-
197-
skb->data = precv_frame->u.hdr.rx_data;
198-
199-
skb_set_tail_pointer(skb, precv_frame->u.hdr.len);
200-
201-
skb->len = precv_frame->u.hdr.len;
202-
203-
rtw_os_recv_indicate_pkt(padapter, skb, pattrib);
204-
205-
/* pointers to NULL before rtw_free_recvframe() */
206-
precv_frame->u.hdr.pkt = NULL;
207-
208-
rtw_free_recvframe(precv_frame, pfree_recv_queue);
209-
210-
return _SUCCESS;
211-
212-
_recv_indicatepkt_drop:
213-
214-
/* enqueue back to free_recv_queue */
215-
rtw_free_recvframe(precv_frame, pfree_recv_queue);
216-
217-
return _FAIL;
218-
}

0 commit comments

Comments
 (0)