From mboxrd@z Thu Jan 1 00:00:00 1970 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=1795028987; b=0wihli8d391TH/BbNmpxVwr4Y+kPToM5UiKTVIhFMkVt1mbXaAIwbj3dgob1UH5hpcbh 3rnRjMiEJazxAQREfm955z+fMwGYCyk0VlG0sK+b7C6tLXV9xEP6JzJ5jc3bcPjDcQXHq jB03xpYC0NP4YmdD7GmZ3hjg9e9bTwc22WeBaiEa2T2LLQMtTBFX+xb/vXpqmzy8plo0i y3KeBV47vLw9arSYQA3r1OXH9WKKftW+U39LfIz6Jua7a7amXJW7XfM7WEbdCoKqoftEX l5D5BtmXhsuceiR3foCwzM545hFq7+yI14abUAFFyGbJC+kLZtFA13E/HcDZ5Xa8W9g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795028987; 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=8Mo75NaH+U9f4LVdQt1OLL+UmM6Ivzl0XmXxbdqrPD4=; b=tKTcKGXGBe2DHQc1ZbdWQ1CK10AqOqy1wJ5xCSPZ9UMwrAvpbvCSEcSR//ZhJ1OGmnH2 KGtaA/9CZ66Y0sRMAEY3MM85iSmQdxHxnI4TsA6jhm63H0ppfXXGlpGY0mbSL6dKlmj6Z Vq8WHWO5Hgi9qfm36os0LK9aUASos3LY6ZZn+9lsHKJd9tr38nD8MTM/WwqA3uawe6Q6+ stpwApBBzL2LcG72DOqOCzsbr276ylPBrrpWvi3Kax0zlQZTMHoBtloCnUM5gsCIWvdjM f/YsDf8xVT89alowlMIlNSmWaKabvXXQYDNR+78aSYL8pIPs7CXX/JfRzauuu1YBLzQ== 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=UmtevTMN; 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 CB6C1606A334; Wed, 18 Nov 2026 19:09:47 +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=UmtevTMN Received: by smtp.kernel.org (Postfix) with ESMTPSA id 250231F000CA; Wed, 18 Nov 2026 19:09:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795028987; bh=8Mo75NaH+U9f4LVdQt1OLL+UmM6Ivzl0XmXxbdqrPD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UmtevTMNBXpd+LLz/fTdugEzV9Ehdvrqbgd/b+MiKrucA3MeARCvNxOBOhnS4kP2u zdvTbit974ghxvewBV5KjKjeYNx0REaJ1Fbcv2A47gr/G8us1G7r/RfDYyyNrs6QDx zN7CMlx9Cmj4BByLU1DRQzcAv/v2WrD8ILPbyBGE= 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 6.12 0189/1756] staging: rtl8723bs: move rtw_recv_indicatepkt to rtw_recv.c Date: Wed, 18 Nov 2026 15:38:36 +0100 Message-ID: <20261118150015.926496005@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-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 96630315d46a7..65629f0de6243 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 f76aaff15fd01..3d79e16c4e734 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -182,40 +182,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