Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795054698; b=WFwVsmp+41zbQZlqhJvOQJNnHJ7KgyE5T1bBvZBQjCOy16cixjhjH9KpsQrgP9fxqT8g PQLgHrxYYAknAKgIgKpjgWNbSvEJ35myDI6p2h2c+NcoFfZz04Rf6/JMRwif5Lnis6Nat aNMnGh5Jb6H/N6PefH0+85Gd+maS1vvz6dIUMdGOB5F4Z25BThr9uFjKNaFoPc2e3mNYa NocZFm7vDcap6SQaSZn9KAKTjKAC+LXfAlZAit1h5WBlMrX4kwmO9EQnJRfEnxBQSiFK9 /mCiJi2QE3VYlFKJ1x86r2P6pOhyWT2Kn5JgxNRz47sh5atG6ChgXdAWqE7aBnVvkFA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795054698; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=E7WdxShQJ7BXmxvN5O/2UshnDfAza2NtEm9Zs5AGVHk=; b=fNBg+xA/nFnn0SMecC8Cb9sQ9aMXP74JcIaVPGaXPh58GVZSNHTM/xrooRXFXJ91TBed YwNT6dY0kVr4x5At+cq651QAIiwSmkIdLK7v1zoCb0QOpJO3NGBEW2s08zMujm3rQZRzl Fr0p4ClYPzCXFovKJk69GkhcQBFoapSVGfJ3VEr0pojPfiUQQifLqYUOhN/yR1CLzA+cR BJfrhL8LspDYSUN24rUt2mZwO7ushxA8jcJgx6LnJ8v7SHXf9a2L2ixPtjPGx8tt4szaR z5ptMLda7tTpwQbI2mkCAxZl1BssakgA785+o/sT2e3zpBgyCFAoIfcHzeyznXDaSAw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=lacMKLOa; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FFE7606A325; Thu, 19 Nov 2026 02:18:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=lacMKLOa Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFF591F000C4; Thu, 19 Nov 2026 02:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795054698; bh=E7WdxShQJ7BXmxvN5O/2UshnDfAza2NtEm9Zs5AGVHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lacMKLOamm41vNQJc/bZ8d3XFpZJD9G1IO308cXVn7tKl5dUkhcrv7S2Ha1PhU6iE H4Klb5WBOyh3/9/A4ROyafF4lM7jBRQ0ZJmCvLTZcO14j2GJPEfptTeUZCTekFazhc UFy364xpjQOpT9yofDPpqhpPxDNMB0VUVuzqhPQY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Straube , Hans de Goede , Sasha Levin Subject: [PATCH 5.15 1366/2214] staging: rtl8723bs: move rtw_recv_indicatepkt to rtw_recv.c Date: Wed, 18 Nov 2026 15:50:42 +0100 Message-ID: <20261118150106.091074974@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael Straube [ Upstream commit f97151eb17dcdc8d7a27e05f2ec8c55bbb16c7a9 ] 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 Reviewed-by: Hans de Goede Link: https://lore.kernel.org/r/20250822135418.118115-3-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman Stable-dep-of: baa84b1bb164 ("staging: rtl8723bs: disable SDIO function on block size failure") Signed-off-by: Sasha Levin --- drivers/staging/rtl8723bs/core/rtw_recv.c | 37 +++++++++++++++++++ .../staging/rtl8723bs/include/recv_osdep.h | 1 - drivers/staging/rtl8723bs/os_dep/recv_linux.c | 37 ------------------- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c index f6585c034a902..1b9e3da4c0b16 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1740,6 +1740,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 ea0b58aa0ba05..f31c87b21206b 100644 --- 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 ccabbb4a815b7..ca8f548ab15de 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -183,40 +183,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; -} -- 2.53.0