From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC705257820 for ; Fri, 22 Aug 2025 13:55:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870914; cv=none; b=AY/JK/l58n3fOm1RKGhOWvbzp1Hf0lgSUDNCoSDzU5bqTL2LuKUVA5ARelH6yMeN/VWo+nKbfHKTl/vnyFee/VJeVbR9QkvpoBzOK1QS9NWEqgqBgP+ZdaYyKT427TOD8HuSwp9+rWAj4+Nv3dtuvlTjFMQddXNxOB86vA6kqLI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870914; c=relaxed/simple; bh=omUgS8Yqp2omTlRPv7EC7YyaMeOkk1VdjJAoSlVZVog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X9EfKp9MVZuI8VmL2lqxtePyghSpN/8iTHNKnYIF7vy/5Boop2RHH2oaBiNB76Nl/M6WzSdqoAx76YPFLZCN58UAg0F1yiHDuin1FIULzzkhraT0tFG+kOWtS8euOCFzrhYa9nUPI+zj/KEQ/eUCLCmGUmmYVJ1g6hQfW3sKzPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TISb21+n; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TISb21+n" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-afcb72d5409so324952766b.0 for ; Fri, 22 Aug 2025 06:55:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870911; x=1756475711; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+i/BZ4RMqL70daqwvgERJaIFeycaTJmwAWOLgqc2v9g=; b=TISb21+nuFrvCEzeJ0gT9OZNKFhekCtZ/4wGQlP2qltWWuJwKMELvCD5zphq9VftWN 95ebZBRu/8DIZ14oVLCZLvLKtXXIEk+s9S40oK5S23+4x+0zJb9XUnDSTnpbywHu9DSf Mt0u30EgmkHqJb1mwNBdZ/xQ8us3AwlqgmqYy/OxBflq2tqTAF/RqC5RTog+nQQ1jufP fIkdUXeR/ZJG/M0KyQuX77BbdpE5BJWwHJJgXmkGP5FabDLo8g8RWUPcVTWLOVDdTRvc CDqFzJUdXyVpPvIzvOkjzhY2nXOfbf/OcFuz0yGFZNEMlr7HrmgNlkt7j/xyKSJF8Poe KRlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870911; x=1756475711; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+i/BZ4RMqL70daqwvgERJaIFeycaTJmwAWOLgqc2v9g=; b=tBgi1pZMUVwSqNe7vNQRyp+7ToYgqOeLA8nZF7gWmHDMipWWCyXfsRcXdf44oa0bQD XrCv3x3vbRvHrCMcCKpZU4pQN76TjJF1yH6E7Dx6/VWNG0GwLr21ip1TbXi/7vY7uLl0 sjwGsjAkpU7IcVXUc8pWc6q5TIj0fb+OFMubp248SonAjubWgfFvNGRy9sxyDDJtqa2G trESFhcz7YyjkvmXGHAZqkGevDu+9cLrrhuHAL8HihL3lPnPFsYLXgCqV/fIDvx2Hh2H TNOvyQV+ASd4IysbQo1KLdOvu+RdmxceZFjwWCtZfFszPKXT+qDiOWVljYDzGZOMrrQ6 N+KQ== X-Forwarded-Encrypted: i=1; AJvYcCV8YfjBAI+iy/zhXvfAkKKWdFcYuExKphrbGdcOir2fZaQDg11L2y2x/XAzbRezO/GQqjQFCxfXZScoQd0=@vger.kernel.org X-Gm-Message-State: AOJu0YyQFn18vSSwXZR6YXcDAAyu3SqvP4NefoZipWyOSuaOL5qPGzBT KE+RLsxu9PW319w8DCcl4bUIP72XBmtYpd33F8btAJIUgLzf/e5GbLfZ X-Gm-Gg: ASbGnctSVJV2von0BYjjo9u2NKkV/3SKAeJbJ55VeljbdBkUEIXzJN6jZ3lptNN/C+6 ehY5PN+M2vh46dW0Fsl2UmC2uOk67ajHMYQz2VEnuTJjLMZUCcDvyaqeAploLkPeaw+JNHi5/am TWpQvLrOAIYssQEiFBWoCvo4bGErHS7vm5ACMXdCYlASFiDWy9KgOv85G1jmN9YSomL2iEsHtLm wW2J9IsrXT6H8IjhVeVFDcQ6WAe62y8Nb1C6PfEfD3iX87SirU/rjA06fKJSPFGJcNiCtP9Fj9r uyKbkLjJZN08kDG7pc1uf+98YBLr9+MSJOVYnMnGt4ARQ50clq2gdhkhhJQ0cGDRr7Ywv3+XS8z Uzo3ZbfCPs5fVmyzapdAfKbBrXg== X-Google-Smtp-Source: AGHT+IHjV2lpd+GIDQ3QFTXMtmjzan9Cn3jVvnnDSQyLnJNTiIo6GZsubevyigZZwWvQdae/6KDBRw== X-Received: by 2002:a17:907:94c6:b0:af9:8438:de22 with SMTP id a640c23a62f3a-afe2958a13amr298510766b.39.1755870910955; Fri, 22 Aug 2025 06:55:10 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:10 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 01/13] staging: rtl8723bs: remove wrapper rtw_init_recv_timer Date: Fri, 22 Aug 2025 15:54:06 +0200 Message-ID: <20250822135418.118115-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The function rtw_init_recv_timer in os_dep/recv_linux.c is jsut a wrapper around timer_setup. Use timer_setup directly and remove the wrapper to reduce code in the os_dep directory. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 4 +++- drivers/staging/rtl8723bs/include/recv_osdep.h | 3 --- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 7 ------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c b/drivers/staging= /rtl8723bs/core/rtw_sta_mgt.c index 4d51e6993ca2..d1f6030799cb 100644 --- a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +++ b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c @@ -247,7 +247,9 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pst= apriv, u8 *hwaddr) INIT_LIST_HEAD(&preorder_ctrl->pending_recvframe_queue.queue); spin_lock_init(&preorder_ctrl->pending_recvframe_queue.lock); =20 - rtw_init_recv_timer(preorder_ctrl); + /* init recv timer */ + timer_setup(&preorder_ctrl->reordering_ctrl_timer, + rtw_reordering_ctrl_timeout_handler, 0); } =20 /* init for DM */ diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h index 83330ea98fbf..ea0b58aa0ba0 100644 --- a/drivers/staging/rtl8723bs/include/recv_osdep.h +++ b/drivers/staging/rtl8723bs/include/recv_osdep.h @@ -34,7 +34,4 @@ void rtw_os_recvbuf_resource_free(struct adapter *padapte= r, struct recv_buf *pre struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubf= rame_Length, u8 *pdata); void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pk= t, struct rx_pkt_attrib *pattrib); =20 -void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); - - #endif /* */ diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/recv_linux.c index 98d3e4777210..a507a29686bd 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -216,10 +216,3 @@ int rtw_recv_indicatepkt(struct adapter *padapter, uni= on recv_frame *precv_frame =20 return _FAIL; } - -void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl) -{ - timer_setup(&preorder_ctrl->reordering_ctrl_timer, - rtw_reordering_ctrl_timeout_handler, 0); - -} --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4FCF303C83 for ; Fri, 22 Aug 2025 13:55:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870915; cv=none; b=K6Vp5tzOOmmWw+9Fdmuos4SmlGl7leNXvi7layKqpRPT+pwbKngpWIogPqqc+6x5mcEUxJ10EjPnFexfI/qMTN67oeyUjYawPCu0U/rC1tUA+1vlg12rTljlhIUpAf/Yg0ZvhMBxYMGBcCy1woi28fFboM1m91NL4oq6ohFtY8E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870915; c=relaxed/simple; bh=qEMTQ7BwzQKKJKm/in7cpQ+FIJlvxR9+nq5zPPYuprY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SXKdIGP/WsnfNHIOEShLWohR9JHVych/2zIjJ2/+3KRlabSXnERngRNFVMKtWgsspY2qP2fbflFul571Gr8FSctwdVnYiUP1isot6iVUShOvCwPu3jVjipVF3K0OUa0gJTgM+jdYw4yw1RzLtvrm3YrzH3jIUBtGFgkZ/HMWxfo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TMaEBAZ+; arc=none smtp.client-ip=209.85.218.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TMaEBAZ+" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-afcb79db329so307268266b.2 for ; Fri, 22 Aug 2025 06:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870912; x=1756475712; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AM2JMmm71pxr/epSkhEc3LPiDJ1HkmLM8QNr1GJ9Iyw=; b=TMaEBAZ+KwVuPSjuw+ZefCxC8PG8UbZvxIHrHr05sLazAC7QFx+sz3QuJgmDB6V/7E VseoyjzFPGfemWdzgjSw+Qc2NXZo/NNx3R2BG//pagd44WukAswysZ38gZyc88lPqweL TlIFrOWGsdshKfViufli395dKzIY0bkFadMVEFGgpresXe2BdbWGLAlHnv1JL4NuyaIK 0eaZmm47XdF2xJulsojQTNR3rh1jCiquOVbteN8mO14fNmfNOsBYdflFy6muUQm5uiRl dxAyXgEiIpouWPm0qXxBeS1nZDXhsc9u84ImW4rGl2pwb29/k+kjaHh4WkU53xfuoeZD eH9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870912; x=1756475712; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AM2JMmm71pxr/epSkhEc3LPiDJ1HkmLM8QNr1GJ9Iyw=; b=BhmrJR4jnCoeRb97jTh8nJ9qr1kuxd/zpohQbQXcnif277PZklFKKRCl1P7qraCmT6 5Ca36HzF3UXRNUyJrgDuA1xPqUqpYpk6vVNR+DQUntXOIuKaw8du2htbC/Z4saDjIHfg /59gd4OgD5SaeKd0Ze8iA/CqD2XaE5sbaTI1/Q1RKSd4oHUEErkO8WMZ37AV9RsUQvMJ Iw6knuf59fwGPEXB2+4IeJPjXaUjeRHsd14UCx0kuARkw0dyA1AaP00vRC4OaShtmFRX KST6QfgxoQLLWDFbMk54N2CwOJboSHIQnXzcgxBoZ2OBWIUd6nDL3PGZKKdpobL7q1Jq 2KnQ== X-Forwarded-Encrypted: i=1; AJvYcCVZxF6fYusTCEx3qp5DihCj5Re/fGc705mqxkTmKVeK657nKIE0FPEBenzv9kiqw/usTnyZX5wyKaEjmWw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5/YKkE2t1FOdBI7Lig9jpZ/6yFIt/2XRcBk7azREhUqSw27nE TjFoas+kSm0UiFRfAWGafOzxANWW5YXmEiCNEPEBcBvX2v9Ln15NU8CX X-Gm-Gg: ASbGnct94fy9QlVgFos6PCH+7PHrLChuTGzancGI2SdKoY9zatE+AsH0cS5Vs6X3o5N obf6m5lrUhXRO+kRS8czF7e8sxshR9QUdxBD1Hl7fbcl/QtuJbFSNiUcCyb4Ws02eqCOWwOnqBb YmNHmYj4DcEhMTCQxfVwxKyepkOy3SQ52YFFHz04DuWjGHM1InDrPckoyOhdlhjkBhPFr6Q1wo8 Skuux3Lb2bE/dgn14jKJXQk8hdx8xUD4Ocuse1+E9ex8ORJHa62Obwvszv7zqjij9A7nNKTfP7/ nPlpa3LEUhlKVP4DUr2hhjQ4syrRl9D/OsqplAnebejdUFAF+Tp7RucvFp+20x2T92ODOUA+wM4 dq6wsieV9/Sd7+tSO2O8WkQ5PdQ== X-Google-Smtp-Source: AGHT+IHgnI/TofS0DsDhvzg0AC50pj1wISl9vOYQKx4U9jJWqrdOxleAfjNAOx3JDMFkMBkO7ACRFQ== X-Received: by 2002:a17:907:7ea4:b0:ae3:74be:49ab with SMTP id a640c23a62f3a-afe28ec6bd9mr295580066b.10.1755870911644; Fri, 22 Aug 2025 06:55:11 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:11 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 02/13] staging: rtl8723bs: move rtw_recv_indicatepkt to rtw_recv.c Date: Fri, 22 Aug 2025 15:54:07 +0200 Message-ID: <20250822135418.118115-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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/rt= l8723bs/core/rtw_recv.c index 8ae527b6e0d6..bc34cac8dabe 100644 --- 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 de= bug_priv *pdbgpriv, u64 prev =20 } =20 +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 =3D &precv_frame->u.hdr.attrib; + + precvpriv =3D &(padapter->recvpriv); + pfree_recv_queue =3D &(precvpriv->free_recv_queue); + + skb =3D precv_frame->u.hdr.pkt; + if (!skb) + goto _recv_indicatepkt_drop; + + skb->data =3D precv_frame->u.hdr.rx_data; + + skb_set_tail_pointer(skb, precv_frame->u.hdr.len); + + skb->len =3D 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 =3D 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 rec= v_reorder_ctrl *preorder_ctrl, int bforced) { struct list_head *phead, *plist; diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h index ea0b58aa0ba0..f31c87b21206 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 *precvpr= iv); =20 =20 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); =20 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/stagin= g/rtl8723bs/os_dep/recv_linux.c index a507a29686bd..ae396ccfd830 100644 --- 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 =3D 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 =3D &precv_frame->u.hdr.attrib; - - precvpriv =3D &(padapter->recvpriv); - pfree_recv_queue =3D &(precvpriv->free_recv_queue); - - skb =3D precv_frame->u.hdr.pkt; - if (!skb) - goto _recv_indicatepkt_drop; - - skb->data =3D precv_frame->u.hdr.rx_data; - - skb_set_tail_pointer(skb, precv_frame->u.hdr.len); - - skb->len =3D 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 =3D 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; -} --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B8D83043B2 for ; Fri, 22 Aug 2025 13:55:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870916; cv=none; b=ZvODgqTeM3RnoIwUxdbn5h89AFDCHXCg0wBrer2h27MFNAO0JaCyFkJwdbMWzUV9Hdy61/yij0rUyfpPLeTeFW8sJ6d3XKEZu+mI3EEAD3oXzCum+UeoCKl6RSuM8eRIXsItNBpjQvThWJ6RgHGpqyHPmb2pVrZQJ20dhr6gVA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870916; c=relaxed/simple; bh=08jilncjBwuSDABEhZg6DFoFK3KpjK2lSsy5vYH0iT0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ili20+ozm+VHaTuMQSloawvguy26+R7FvpYUUqVMoETf4aFNZutLScnpaXWMTiCO6mco29yubZyAQmEiqjvMdQng1QQFYX1ieeIlx26ogDHUlh4EKOdzxw4ucKpoT2W/RZjPu/vXULdrJfGMNR3tYf6aOuT7gOjJNi7/9BrJyMc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WOxxUmgw; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WOxxUmgw" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-afcb732eee6so345558466b.0 for ; Fri, 22 Aug 2025 06:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870912; x=1756475712; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0HEg7Yk8Jwp6gPwyCxwtglLl6F3s3lO1z3ZnEHF+g/4=; b=WOxxUmgwH1qArFEGpR3KG6rNp5WULjCAlvLD4flkMPhvA9IRyOozOL9ZSXlvmwvJbp 4toSJtmDXO8BSXu4Sd7OszZluVBH63GaALTm+BSA4jZLVWSSlZBOg+yM26qJP36/yMbY eRz8j2U/mYyCExb93Q31mdrNwV2E/tYCLdm9UXQCzAeOK0YBagmuCffIhmZtMeKNxZXb 969p/oqOh1/KgYJ87ADU1aUKc/Rt2jCU8r1Li/74JW9yVUlS8so4NSmWjt0oiFapYEPP WSxP4gZRyneWMwKJb84vE1AYc4qkHdDxhKPBm8B5ued86Vnj0Qt6FivyggI5u97dSAqr GbFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870912; x=1756475712; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0HEg7Yk8Jwp6gPwyCxwtglLl6F3s3lO1z3ZnEHF+g/4=; b=lMCT9hZLBVnfGp7B/oTYU/B9ukV8XlTFEtupXRXrjyjwO2UDTBXV0wIT0IOtPQ5YEV FomixTKOVb6jikREpjC9CF+m5vjXrM6/k+zTV6cZYnI18W8l7KtRb+NIiMQeREGjGqNN wYLZCiKiT/8C2Arx2JETbzbxM4L6lx/AYCZeojRax/c2ay3HbT/R3cCmgzgqzjgwRwlE hNrDjHl8YWHMphyCjHhCCT1YYenaUIc7BT+hdA0nhjN/Gv104z+/r5Dnz1ygXBCynFl6 hjiaTFzlfpcizmUGHGEsSzlheUREcr10ekeaXvdh3gFjjE/OJrs2QZYsRrM8zwiXNOZi yhCA== X-Forwarded-Encrypted: i=1; AJvYcCUU1hJ7QFAWQX1UJC6cKVJ8wGMkP7yyCTIcOPYL+ycTugtRe+vUzswq7AOElUkwLU4PLaPdZyBpUM4sKms=@vger.kernel.org X-Gm-Message-State: AOJu0YwIS3HPQP9o7AmQUcFYQiIBinZImXg63Bl1uspNIZZXkBMfFiON MtTb3BbpJ5AI0crkVj2jwzwUJ1PIHpGKVCc7GdFSIAXJvt7vbfDnQrQW X-Gm-Gg: ASbGncsRqLsFmsGXjCZXH74yFKXukl9Mso4I7Vhn3ZYZ6F8AUW0s8ApqcXPXmap3ByY lgdVlo7OY/u2on5FL3Nr96F4aOYpicBzuToHGX7vM1WtRRtSvr7+/vWha/jsMOSdo4zqIEOthVH iNEHo9mLhhZdYWrOmkaImD/XkcVgdShJ7AuWfI37FMW9yZOQk399l1HJvPl89uVsLkLo7XWnu0W SxY0Y+pPpoINGEpNu5+qIoH4WzWem6d/+gqNkL+LQyjDFAs/zqhg6KaRCcD/0rv9jGj3JcC47+J kEswYpAg9Yt6oEVPRD/LEuW8HLD0lCYQH1h714jHQb+9UM0bcE3FZqgjgS+kl7k/MO3XQFNlTWy igU2S/j2Xbqy85OyPNFGMNdw6Nw== X-Google-Smtp-Source: AGHT+IHUWGElOIDU+pZEZTNblktP4dokgeuz+6AiYAemB3XXEE3oLp7BHuDBUphjxf5soPjrh7t/eg== X-Received: by 2002:a17:907:6094:b0:af1:8be4:768 with SMTP id a640c23a62f3a-afe29441368mr268181666b.5.1755870912272; Fri, 22 Aug 2025 06:55:12 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:11 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 03/13] staging: rtl8723bs: move rtw_handle_tkip_mic_err to rtw_recv.c Date: Fri, 22 Aug 2025 15:54:08 +0200 Message-ID: <20250822135418.118115-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the function rtw_handle_tkip_mic_err 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 --- drivers/staging/rtl8723bs/core/rtw_recv.c | 44 +++++++++++++++++++ .../staging/rtl8723bs/include/recv_osdep.h | 2 - drivers/staging/rtl8723bs/os_dep/recv_linux.c | 44 ------------------- 3 files changed, 44 insertions(+), 46 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index bc34cac8dabe..b043e3d1cd82 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -294,6 +294,50 @@ struct recv_buf *rtw_dequeue_recvbuf(struct __queue *q= ueue) =20 } =20 +static void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) +{ + enum nl80211_key_type key_type =3D 0; + union iwreq_data wrqu; + struct iw_michaelmicfailure ev; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct security_priv *psecuritypriv =3D &padapter->securitypriv; + unsigned long cur_time =3D 0; + + if (psecuritypriv->last_mic_err_time =3D=3D 0) { + psecuritypriv->last_mic_err_time =3D jiffies; + } else { + cur_time =3D jiffies; + + if (cur_time - psecuritypriv->last_mic_err_time < 60*HZ) { + psecuritypriv->btkip_countermeasure =3D true; + psecuritypriv->last_mic_err_time =3D 0; + psecuritypriv->btkip_countermeasure_time =3D cur_time; + } else { + psecuritypriv->last_mic_err_time =3D jiffies; + } + } + + if (bgroup) + key_type |=3D NL80211_KEYTYPE_GROUP; + else + key_type |=3D NL80211_KEYTYPE_PAIRWISE; + + cfg80211_michael_mic_failure(padapter->pnetdev, (u8 *)&pmlmepriv->assoc_b= ssid[0], key_type, -1, + NULL, GFP_ATOMIC); + + memset(&ev, 0x00, sizeof(ev)); + if (bgroup) + ev.flags |=3D IW_MICFAILURE_GROUP; + else + ev.flags |=3D IW_MICFAILURE_PAIRWISE; + + ev.src_addr.sa_family =3D ARPHRD_ETHER; + memcpy(ev.src_addr.sa_data, &pmlmepriv->assoc_bssid[0], ETH_ALEN); + + memset(&wrqu, 0x00, sizeof(wrqu)); + wrqu.data.length =3D sizeof(ev); +} + static signed int recvframe_chkmic(struct adapter *adapter, union recv_fr= ame *precvframe) { =20 diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h index f31c87b21206..91fb275cbcaf 100644 --- a/drivers/staging/rtl8723bs/include/recv_osdep.h +++ b/drivers/staging/rtl8723bs/include/recv_osdep.h @@ -15,8 +15,6 @@ extern void _rtw_free_recv_priv(struct recv_priv *precvpr= iv); extern s32 rtw_recv_entry(union recv_frame *precv_frame); extern void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff = *preturnedpkt); =20 -extern void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup); - int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapt= er); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/recv_linux.c index ae396ccfd830..72fd86e03b5c 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -135,47 +135,3 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter= , struct sk_buff *pkt, str rtw_netif_rx(padapter->pnetdev, pkt); } } - -void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) -{ - enum nl80211_key_type key_type =3D 0; - union iwreq_data wrqu; - struct iw_michaelmicfailure ev; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct security_priv *psecuritypriv =3D &padapter->securitypriv; - unsigned long cur_time =3D 0; - - if (psecuritypriv->last_mic_err_time =3D=3D 0) { - psecuritypriv->last_mic_err_time =3D jiffies; - } else { - cur_time =3D jiffies; - - if (cur_time - psecuritypriv->last_mic_err_time < 60*HZ) { - psecuritypriv->btkip_countermeasure =3D true; - psecuritypriv->last_mic_err_time =3D 0; - psecuritypriv->btkip_countermeasure_time =3D cur_time; - } else { - psecuritypriv->last_mic_err_time =3D jiffies; - } - } - - if (bgroup) - key_type |=3D NL80211_KEYTYPE_GROUP; - else - key_type |=3D NL80211_KEYTYPE_PAIRWISE; - - cfg80211_michael_mic_failure(padapter->pnetdev, (u8 *)&pmlmepriv->assoc_b= ssid[0], key_type, -1, - NULL, GFP_ATOMIC); - - memset(&ev, 0x00, sizeof(ev)); - if (bgroup) - ev.flags |=3D IW_MICFAILURE_GROUP; - else - ev.flags |=3D IW_MICFAILURE_PAIRWISE; - - ev.src_addr.sa_family =3D ARPHRD_ETHER; - memcpy(ev.src_addr.sa_data, &pmlmepriv->assoc_bssid[0], ETH_ALEN); - - memset(&wrqu, 0x00, sizeof(wrqu)); - wrqu.data.length =3D sizeof(ev); -} --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1A6D2FFDE1 for ; Fri, 22 Aug 2025 13:55:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870918; cv=none; b=lADLq41dTyHhLRIjbXyaQOhPOcs1nkPItNwzjbZaD/z+0r+YJrwSjNMMhACmxatwFLtW8GLrngXcImD0hN+Nii7uLzalITpZHe7evPgMPzh7eXFEc3ZW3t4EQSZQ+kWlJlXK2wikPjsEki2m7ptG52JMx+eiD+BD6h+60WFS2do= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870918; c=relaxed/simple; bh=LgyzdqVMiPain+lRHmnaeW/GX+zvtW8BC1gxXQa0LDI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T+Lz4FcRe1WK/nP/4XsC6GfowkC6gsJo0QPxyt+P0YQHQpxgJnyeuTyy7F8WVu4iDQeJxg0KvrUSyHQpJyRD+jDc61LhslMrpTK6yXJ81FAzyA8go0Ovh5HFpVHVEcjausBC+psHpqyrrD96SKSbuR4FYiqc5QR+Hj31jb62Xeg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AUXDW3gI; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AUXDW3gI" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-6188b5ad4f0so3000280a12.0 for ; Fri, 22 Aug 2025 06:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870913; x=1756475713; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=keZ3iPRec1zkTLjJm0DtrD1sLvqDfm5pAV2OYD4EfmQ=; b=AUXDW3gI9lWXp8rePAG23YP23ND29rmF4m+ZD8oPvvoyfHSxa+A7+08KSZh8TKj4CP vZ45kvLBic3w+jiOCZGRIsoXBPYcE1nQtrb7P46eWgMJKT8eae+Nbpy8SAQsrzJ7FG8Y 1vnALp+mBJPIdvEn/7IwmwRbnHAYUXkFc8W88JWVCpkY/Q51EgMJK4dKqjnBkjvYRMgM 1AGGpqXvd8VHdW2TPWVDNxTEkdcceO4RyLiTlCMUUk7ifcFO3/lJ/E0hjbUcHUsvbWON RjYiIrVk85Oc2otmOgD8XUZjIP85TrRn3pXR6tg71IvVpOJSAeC2lO6vZDipsK3vLpQ5 wLFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870913; x=1756475713; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=keZ3iPRec1zkTLjJm0DtrD1sLvqDfm5pAV2OYD4EfmQ=; b=oVf83Bs11YfCR6xEU/lHYXnb+/229U7pnBgFMbXVA8o6NK7/oGbnPNXlVjDd46+YYo xhBzVIug2uw598BIWTY5QmKBWER8RXkawLAIGjXYe3F40cDYWWOy6tv+/4Fa29X+p4d1 jUoVWSEPGsz5o1Xg96IIy9CLPePNRI138y6VDo5Gn2bwoAAEpiYtCjVniBZwqU8YL2bh PUeVO0NtVTdW2EvcefKLwWZApKP+G1zlQ/Zj8Ex3a8A+xRROqwOISwwGf8wuOQJJMehm 4ixrAk5LXPOJnuuj2Cc3T8bFKkPj2oPNhcEb445yIX0DP7VDOVpIHADxic/xO29i+Rni TZXw== X-Forwarded-Encrypted: i=1; AJvYcCW1QjgMrIFhlbeFiBp/OasRAs3XBj2G9yF/nNf4MEshsKngM9DczZitQOYp2z0yZdoNMUG97PFNo8wkAKA=@vger.kernel.org X-Gm-Message-State: AOJu0YzvVVGqZU/VQnZExWTDGlNEB6zR0V2vB4yFiGIEILoY0CFZAkLH Ix/kQZ2hpW9dOqsdX1BJvw4XeZhhyoYNQT/w6CxM5e3Gi7wVH1bJBHcB X-Gm-Gg: ASbGncu3V/Ta3Tj2fL+5qsHsaYvp/HPr9+78LbJ1EBuZ5ArsQWcY/8LkBDlpswc4miJ rcwt9n3El216SqoWdOajt4MbRNOxrLdfwud4Dxccb21kyIwNf6oJfKa/vS/WPAiE92vF34zvbuN CiYA9tLhvTI9G1ibgHSYf6jgNAxpvfsl9SQFhOduS/2+S7lLk7TWC793dAt1X1RxiXYb29evoRL tbBPk3XoF7nduwPyBFpTtdv+kLvGheYN7otVFbmuNcq/bwuVKDpW47/wAQ+c6+tCgUrD2I9UgWT gODJGmq+XELlMDw4VFaddddw3NJmx9E2RRsBPBTLOsN36TQrxIThyVf2xMy+BkG8Jy0r1aYdGKZ G4BxyMPk+7FC2H15i+L4o4fu/0RfVl4APHuz9 X-Google-Smtp-Source: AGHT+IGB2VS+d9R1FFVE/nvqPFuJR/VwUkKA+SKXnX9+VIHXQ1bWk1msBk5yankb9e4zYgiA/XxgCw== X-Received: by 2002:a17:907:c10:b0:af9:a486:412e with SMTP id a640c23a62f3a-afe29031f48mr278634166b.26.1755870912854; Fri, 22 Aug 2025 06:55:12 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:12 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 04/13] staging: rtl8723bs: merge rtw_os_free_recvframe into rtw_recv.c Date: Fri, 22 Aug 2025 15:54:09 +0200 Message-ID: <20250822135418.118115-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Merge the functionality of rtw_os_free_recvframe in os_dep/recv_linux.c into rtw_free_recvframe in core/rtw_recv.c to reduce code in the os_dep directory. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/core/rtw_recv.c | 6 ++++-- drivers/staging/rtl8723bs/include/recv_osdep.h | 4 ---- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 9 --------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index b043e3d1cd82..2b054525b3fd 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -147,8 +147,10 @@ int rtw_free_recvframe(union recv_frame *precvframe, s= truct __queue *pfree_recv_ struct adapter *padapter =3D precvframe->u.hdr.adapter; struct recv_priv *precvpriv =3D &padapter->recvpriv; =20 - rtw_os_free_recvframe(precvframe); - + if (precvframe->u.hdr.pkt) { + dev_kfree_skb_any(precvframe->u.hdr.pkt);/* free skb by driver */ + precvframe->u.hdr.pkt =3D NULL; + } =20 spin_lock_bh(&pfree_recv_queue->lock); =20 diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h index 91fb275cbcaf..51b52d6b0367 100644 --- a/drivers/staging/rtl8723bs/include/recv_osdep.h +++ b/drivers/staging/rtl8723bs/include/recv_osdep.h @@ -22,10 +22,6 @@ void rtw_free_recv_priv(struct recv_priv *precvpriv); void rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame= *precvframe); void rtw_os_recv_resource_free(struct recv_priv *precvpriv); =20 - -void rtw_os_free_recvframe(union recv_frame *precvframe); - - void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_bu= f *precvbuf); =20 struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubf= rame_Length, u8 *pdata); diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/recv_linux.c index 72fd86e03b5c..c5819c3c59d8 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -9,15 +9,6 @@ #include #include =20 -void rtw_os_free_recvframe(union recv_frame *precvframe) -{ - if (precvframe->u.hdr.pkt) { - dev_kfree_skb_any(precvframe->u.hdr.pkt);/* free skb by driver */ - - precvframe->u.hdr.pkt =3D NULL; - } -} - /* alloc os related resource in union recv_frame */ void rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame= *precvframe) { --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C6A13054EB for ; Fri, 22 Aug 2025 13:55:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870919; cv=none; b=i6TvfYqqQ3PCz8dslXZVumM+M3YwQERQ9IoWc6cSt7K+aUDkSgyEDo3wNHNMHZ5lxqlqMWmvFfK6z9nbY5E4oIFHqzyvzde/Om987DjGxyhgfms/HX9v5vdkmtcwh4lk+Ag5a1FDA2lgONZVWHPlFySbmZzdCwBu1PvNzgP4Fik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870919; c=relaxed/simple; bh=qYH1LzDiPPlAHY9+cSz4R3P+vnjLbibGIO/7xznJnX8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OOL1Tv8SryTBs+fLFvtSKV3EIwknntBoSTvenpCI0CC1rpkojy9uj+2ndhqfsC4JMnoJ7ke7U99CHYbbg807JbR3g9qKFwWhGSAf1Wt0CdLjvg3lwO3toYfN6fdburOjUZLFqaSDdFbk5d4CqZYK23rfAsGgcaFOFbdVVmwYYls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=V91sgaRl; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V91sgaRl" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-afcb7347e09so351643266b.0 for ; Fri, 22 Aug 2025 06:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870913; x=1756475713; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cDYM9GUYw13zPxd0/F3QTUJsD0b0URDjcGtSkdeqcr0=; b=V91sgaRlJPuUJqKDfTy6MbpJ7AuAyOHBndxkSvI/IMwxt4sPoWg1a8eo5GpcHNBatW 2mqdivhDRU2Irpv9satTcT3WIClKd/pj50AX38BYFvmTIM2ZWdrbDysYJQ8mp4f7OamH tsio9/OFoUJXXgOUokx0fWfSt9kXoBmVvIYLsjaWbFsEnaaPNQ1Mvwk1j3/4Ui57kl/2 YpPTMIreHh2DcLa6FlGvrmW6pa+ahFRPaB6ozDFXytE2OUPxgkjgjV4cjxEH2mvJxTlO QTVsvCQu5P26NaLOqwKrjwmeP5EdYPRlLMyKv5zhJ5GZmWg+Kfx7wybTT0pU/IUXrETU ztMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870913; x=1756475713; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cDYM9GUYw13zPxd0/F3QTUJsD0b0URDjcGtSkdeqcr0=; b=TOA+k5hgA5+CDV7+0XH3sX9OErn+aEXrEh64RDIR2xQ140G+WrnoHf81/YEosN5g9c oblzf4yroWrBEdKEh1q14Bs96cUEOXc99uCEmH52+eS8vSwS2xkxJkqUtu3sR8Bt7yAM nY6JQ/MH/1LSka8nfLzbIRWXmUHNKOCSPTQazR624vaXt/F6c7T0SvwJSpgPzCOdBMrE 62wy6CzFuRJHFTx3glwVgCrnhHMJQdAtE5P0qancEIEP9tQskW6SsOUOvrj0DTC5mtod YdoLcoAF0cAlrTmtA5KeqClal+Ps+MM/pMFclWAc9PJI385P9uXeZcN3qGDkKZPumym8 hbgA== X-Forwarded-Encrypted: i=1; AJvYcCVUWqOgBdsdENoiVtV4PK6VzAhcAUUa8fB3BNAeZ8lueqjch7Jla7/7mheSydffZ4B6Tc5QdxqQRuPztic=@vger.kernel.org X-Gm-Message-State: AOJu0Yya5W9h2zYcyjDuCKxdFQs+i9z9EMFR8E6fs9AZixX9lrCsvcyz bNtujViFgrloIegFihltx/VXUEFuNjx/S+3nRhHsNjZAFS5ErAkwhwJE X-Gm-Gg: ASbGnctn8kjocvdMm81zeL3xm7kfHtUJhW0r0EligsefRHuctLZBbCyoyiQnbKoe0Xi BsMtTKeUiUx/5wqX/mYOe3Js5g/gBoRrM/tM9Bw2vzX1h6kmZG8uMi19karOY5VHtFawR2+Htyv XluxmCOLcHGUpUiGZAaSVj1oPXjCOPxxhJ8+M7zzrjk3KXYWH8AGvrIjhdUt8KILkyXh04S/urU qB72/zFfUhnhh1s1q5Chgq4kIQWMd404tl7rnByBDmLFqfSGJxop6KBSc9vL79svElpbuXhQIV6 4Xl8lUiiSlOOloLINNSbv6zN/jGtoC1ksxSN3YyyO8uelqPwbWDeYMYUaY5XKtXUSIaGXVidndN 09qoe7SGRCUCQPnEfTNKWKAy34A== X-Google-Smtp-Source: AGHT+IEm9nwRaxSxo7IQRjlWikJKBnSRPGMUuhZHfRurgI9V8ukE1SKdkTw6q1fm8tsg5/KRVSjFZg== X-Received: by 2002:a17:907:1c84:b0:af9:4fa9:b132 with SMTP id a640c23a62f3a-afe29548f36mr284396766b.33.1755870913432; Fri, 22 Aug 2025 06:55:13 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:13 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 05/13] staging: rtl8723bs: merge rtw_os_recv_resource_alloc into rtw_recv.c Date: Fri, 22 Aug 2025 15:54:10 +0200 Message-ID: <20250822135418.118115-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Merge the functionality of rtw_os_recv_resource_alloc into _rtw_init_recv_priv to reduce code in the os_dep directory. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/core/rtw_recv.c | 3 ++- drivers/staging/rtl8723bs/include/recv_osdep.h | 1 - drivers/staging/rtl8723bs/os_dep/recv_linux.c | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index 2b054525b3fd..fcc28d4556c5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -66,7 +66,8 @@ signed int _rtw_init_recv_priv(struct recv_priv *precvpri= v, struct adapter *pada =20 list_add_tail(&(precvframe->u.list), &(precvpriv->free_recv_queue.queue)= ); =20 - rtw_os_recv_resource_alloc(padapter, precvframe); + precvframe->u.hdr.pkt_newalloc =3D NULL; + precvframe->u.hdr.pkt =3D NULL; =20 precvframe->u.hdr.len =3D 0; =20 diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h index 51b52d6b0367..763ddef4ad90 100644 --- a/drivers/staging/rtl8723bs/include/recv_osdep.h +++ b/drivers/staging/rtl8723bs/include/recv_osdep.h @@ -19,7 +19,6 @@ int rtw_init_recv_priv(struct recv_priv *precvpriv, struc= t adapter *padapter); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 =20 -void rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame= *precvframe); void rtw_os_recv_resource_free(struct recv_priv *precvpriv); =20 void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_bu= f *precvbuf); diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/recv_linux.c index c5819c3c59d8..ccd00f8bee7e 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -9,12 +9,6 @@ #include #include =20 -/* alloc os related resource in union recv_frame */ -void rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame= *precvframe) -{ - precvframe->u.hdr.pkt_newalloc =3D precvframe->u.hdr.pkt =3D NULL; -} - /* free os related resource in union recv_frame */ void rtw_os_recv_resource_free(struct recv_priv *precvpriv) { --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFA973074A7 for ; Fri, 22 Aug 2025 13:55:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870920; cv=none; b=tDTlNbLG/7gfkKPPKzP/9bPhAE54azABrOv+Y+8KkXFSAi/GXTyd4YmC+53rli9pa3rcGDIIY9ETzx8FB8xh1jglGH3NNYxcvzKqFZS5WKoCK1uswQaLfMuKsqf+pjo6y83SCqM2Oa0ZBjm1gYLaGMJC+lkyOJCwFcqcuKthmKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870920; c=relaxed/simple; bh=R3oqzf3wa2LR6puv2br3z0rq95DJFwm4VLYG9IOG05I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wjrlj/a/6Scaa6TWQmx73b2aeIdZNTKagxKM7Be8hcDaLrLUhODzsGKFkeReGFiS6+iLJdSP1NqVXsX/z9il6wwyGLMdYG8HV154xUuyTAxQAT8HGc5IIATh0gAFrozJGa3kwLFUitl07pnwlQcPq+Ik8ODrqcnWRt5jCcVkpc4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mqdvs1o9; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mqdvs1o9" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-afcb72d51dcso286624066b.0 for ; Fri, 22 Aug 2025 06:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870914; x=1756475714; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a2o0CeOSz04raE18RE0kbNDsnmsiaJEig/8+BAKswj0=; b=mqdvs1o9Yqitn09lEpWUSpmUx1IUTP7LGVlShnVjQ6yc5k9R8f3NpO1U3h7rWHzP4o w1GT4Hcz+bFlOXF4NRIFDYrK8fUz6SrJ9CCLTo5c00h3kmVVQdn/wMbhwCiFnOA2Ec6G gZf4vbXQHpaYTZKjo8ZhzNR9ka3kBJ06aK1MGEhSRLuZvX3RDc2Y36cj1pz39UJ7HW2L E+lV/kKuYQJ5a0sGKlRx5exaLtQUaYCIjq92jxdw3sYm0zHBlKy+YDudmKT38DSCchU1 51Pbjj94b4hEVD4J3VFec6LlBh6jrI1t+Ra2YP2ADAE2QHiHEoYmLtgVIt50ZmM1mmW6 pn+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870914; x=1756475714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a2o0CeOSz04raE18RE0kbNDsnmsiaJEig/8+BAKswj0=; b=GOkduzzDiZj+pWC7HmsjFBHvrIsIFn9OAhM5md67+IMLW7U5jfvUubcowpCc3ib71e qr+GMt2zLK+FwyJokZkxPZV9WnKnI/x1jYF+LIsFr/pjrrHa/DFq+CLN3JCvOtNA2v2r sdYaZPDx0JWREllH8kH0c+MK0urMk4rCc38+hfkmvR7JQxF/HLQ78dFySHcY9MbQMqie QCIyp8dOF9Xs0bSmFU+qiJPgMxGau/UHSzvqdGO+vMjlLKYo9672Rwn9tlaac6WH4urG 64GsCSVYMgqFpNGo+74qfhoJRJ1qD39CgtCHGr+AynWfDCWlW7hbrEkr63wZ3cDa9op5 v0yw== X-Forwarded-Encrypted: i=1; AJvYcCUPhObPExGSTaa8wKYs+Mc6vCHJh+oFQmhoofzUJoqvLjLH8Tm0w1iWjbuaA7uxxBoAlp5YBTF1wbmu2ck=@vger.kernel.org X-Gm-Message-State: AOJu0Yxfy7unSOThjHua+dfLA9YQHknW+mA1PuV8P4Ribelt/xfRle76 g/Q0uU49a3kjDJlok3fBK7nARKaT2/tNLGvfZCndOi7E1u+MPyJiizQG X-Gm-Gg: ASbGncuEsPnnXw55DhW6mTMlEw5jQyCIvrN/dBdXHyjMNMpRO6V0kLp9aBFSY3+teBA ki1/w0J5WrMSDwFJ8LAR4o8UAx6CNg3FgWvKXV6pcB2QPlQ+elIYwLQf29JQINyYcD0N5xeAAs9 73xo5LltVSY1oNKRBFddan7FaoAQHeZG8oFXnSJ5K4yyPsczN9tDBONKhRba2s1cjTX9sWe/b7/ C5wj17KJPWi6rxvLsxj74HOQd4/gfiShNtAfAPmRBNSP/8NrQA32NIC1QnOp4EbPVkXxEKwsL/w keRGBFTgK9qYtU/R9o/y2a58fsEiL9xqvQ9eSw18TNp/TahwZ374TavwgtxY0GyEb+l/zdYfFZt yJZjdTYDwc4AA/4JNdqojxbZmBw== X-Google-Smtp-Source: AGHT+IGM2GDwp1bQevo0lLrU58gx0NnBb1Q90saSLYzZM2EePT3AN8DcFxEix8wslUnJoAuwF6Go3A== X-Received: by 2002:a17:907:97c5:b0:ad2:425c:27ce with SMTP id a640c23a62f3a-afe28ec5d10mr257724266b.2.1755870914032; Fri, 22 Aug 2025 06:55:14 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:13 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 06/13] staging: rtl8723bs: merge rtw_os_recv_resource_free into rtw_recv.c Date: Fri, 22 Aug 2025 15:54:11 +0200 Message-ID: <20250822135418.118115-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/core/rtw_recv.c | 13 ++++++++++++- drivers/staging/rtl8723bs/include/recv_osdep.h | 3 --- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 18 ------------------ 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index fcc28d4556c5..cda51aab752d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -91,11 +91,22 @@ signed int _rtw_init_recv_priv(struct recv_priv *precvp= riv, struct adapter *pada =20 void _rtw_free_recv_priv(struct recv_priv *precvpriv) { + signed int i; + union recv_frame *precvframe; struct adapter *padapter =3D precvpriv->adapter; =20 rtw_free_uc_swdec_pending_queue(padapter); =20 - rtw_os_recv_resource_free(precvpriv); + precvframe =3D (union recv_frame *)precvpriv->precv_frame_buf; + + for (i =3D 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 =3D NULL; + } + precvframe++; + } =20 vfree(precvpriv->pallocated_frame_buf); =20 diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h index 763ddef4ad90..9b3f4e8293ee 100644 --- 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 *padapt= er); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 - -void rtw_os_recv_resource_free(struct recv_priv *precvpriv); - void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_bu= f *precvbuf); =20 struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubf= rame_Length, u8 *pdata); diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/recv_linux.c index ccd00f8bee7e..c71e0c762f4f 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -9,24 +9,6 @@ #include #include =20 -/* 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 =3D (union recv_frame *) precvpriv->precv_frame_buf; - - for (i =3D 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 =3D NULL; - } - precvframe++; - } -} - /* free os related resource in struct recv_buf */ void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_bu= f *precvbuf) { --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5A8930499D for ; Fri, 22 Aug 2025 13:55:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870919; cv=none; b=r6SP7ZU7dku/Da27OR3UKErSt/uLwuadwNfDKAG0/L8c8Jkp5rBlbjgGkbUG61kClJWtTWqSWFaNh+OdY2nfBdMVFDBVce5Gdb8RVE48PbTYRnXcee3zkQxSO/EdwCKq2hrmA5jeZT3RWgaVoWVBccu9wMWDE3QR8gIBaeLwJzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870919; c=relaxed/simple; bh=Nr3xhHihjC0qMrhqZcnzSmaV5aQGyXYcc350MW8rvbM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gya9qPQre95G+ELBzdIgxPd/5JwhwmSxmQHPmv/TyczXdAODajtCVdswQmaoyLUfKvA/iJ7pzCdHM5vkvOgioY9jmQ77bn87Ub0w4FNstFE9LIDHkG130ko0qxU5mFtzKoVIDNXMzqJOHTUdtdjPkmiF4/N5kEKGK729fjU6KCU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Uf/i0dZT; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Uf/i0dZT" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-afcb7aea37cso280323266b.3 for ; Fri, 22 Aug 2025 06:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870915; x=1756475715; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TudkP+MdAfUYxvKb4s3Kf+ZXOaz3bPOWVY9e1wwKFCY=; b=Uf/i0dZTRc+jp0ydFCFwle8u7kLiKv+gPnbvghHmTLmnQWX/9fco9t4pb1yKWUEzfq v8LBfwv6MWF3N/Czz9PVlumYX4H0JCh8HL7bbj0c1SvA1YrF/Qhb+7twOcDZj8fxtw8y h/eGcJ61UWq5daWeyVAJeDFo8BNk+AD5eQy9Y24LThv1Q+0Pq062MQiAAbXVF0Ga2zQN OvGT/9f3ra+WbWsoLhSr9zWno5HHpAmEp6cJAekYzraZmmOWgLl/3AHWvL8CpHGTpd3+ Eb3e0ZOVwhNmVNiWTy70enp+Bd5ZWuN3mTp1L9DCelhxEkyDLS8QYqA4pMKrmlgnM6nT kG9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870915; x=1756475715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TudkP+MdAfUYxvKb4s3Kf+ZXOaz3bPOWVY9e1wwKFCY=; b=Xut1xTJJdZTQhyyUnxYvxapYcNZ8nNL79+A1hpF74JpxJol/MSUoMg9Bz9JnHvI8+A UOIOvktPVLmaPidd+P198MfgvsK6iWwbu/MxVDgNWfkF0uxHIhMZQ2HUY1y04/ScKxar 96jwg3hHutanesG9ybGXy1maXHIXRveaCIPBwAzlrLR99QSv2YykJRjUMfE94Gvg1atQ AlVv1uyoMmRW0EcclumH5Wa2Zk/WbULiUQ287H6LnYetvkB/h1+d7+kUpZie8zfYSC2p yf15US+ZFX6OdaDnuabsjmzEB5IXgQoL9tp3+wIRhm1gweLAhmIOW+YBXGK01jugOcLH LKpQ== X-Forwarded-Encrypted: i=1; AJvYcCX8jAe+AND32Jsj0oi+tzjpGyFu2FrhSLUPb003Q/XWgYUu8WUK1c8fS6xhcexc5oQqnxaUT0X6cGlOUFc=@vger.kernel.org X-Gm-Message-State: AOJu0YxEx5g6/m38EJmJ4UcRHqO0X7Bj+sfGNzAORu3ij5ULdRrRxc7d PIYqIMktdWB6lLcV2Dum0XTle9j+/RcyYUzdnlKvasyM+RIQbRwNfsQDqSueAA== X-Gm-Gg: ASbGncsnB63dF54RalzGg0aPL6Myy7f5mEq5CGI4mr+HywRaj4pSh/xhFo8ie73JyX5 MMOqPG7qtBibcAPyFz8TbwTK7qJ9r7rB+c2QZ3+sLDAhwRuXLsm/zfTPf7PXsnyO77I+vlCNrJD nijqaxud3XgD8W9eyJYF2bvxdnHMCfbLvmS/TeqX80UEa5ij8bGTCGoFuVW6Hy9zmAFOrKKMjRx EXxroVZwqHhrXKuhF10vQpTbvx7sqD8DXyEPdLZfGk3UBw+QqcttwUuHw2t6RybV1AeB1Qp6HmV dzE03Cuh34fT/E6Sd2izSKeCYFK3SRa/4Fuys/SwBEY65yTImLTz5PVMoRvUFzGoLh3jPnPRvUu +y7f1j4o5tFBmpfShpk4Uh9X5WA== X-Google-Smtp-Source: AGHT+IH2J8EFlu7yKogGmtXwx99Gdp4kwTSuKSx7zkh/EHIdnOCRoomd52edYMKS13WQvMZoZg4Ozg== X-Received: by 2002:a17:907:1b08:b0:af9:6e4a:3b31 with SMTP id a640c23a62f3a-afe2963818fmr292264866b.46.1755870914622; Fri, 22 Aug 2025 06:55:14 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:14 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 07/13] staging: rtl8723bs: merge rtw_os_recvbuf_resource_free into rtl8723bs_recv.c Date: Fri, 22 Aug 2025 15:54:12 +0200 Message-ID: <20250822135418.118115-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Merge rtw_os_recvbuf_resource_free into rtl8723bs_init_recv_priv and into rtl8723bs_free_recv_priv to reduce code in the os_dep directory. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 6 ++++-- drivers/staging/rtl8723bs/include/recv_osdep.h | 2 -- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 7 ------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_recv.c index 28c914ec2604..399edfbf8ec6 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c @@ -431,7 +431,8 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter) precvpriv->free_recv_buf_queue_cnt =3D 0; for (i =3D 0; i < n ; i++) { list_del_init(&precvbuf->list); - rtw_os_recvbuf_resource_free(padapter, precvbuf); + if (precvbuf->pskb) + dev_kfree_skb_any(precvbuf->pskb); precvbuf++; } precvpriv->precv_buf =3D NULL; @@ -467,7 +468,8 @@ void rtl8723bs_free_recv_priv(struct adapter *padapter) precvpriv->free_recv_buf_queue_cnt =3D 0; for (i =3D 0; i < NR_RECVBUFF; i++) { list_del_init(&precvbuf->list); - rtw_os_recvbuf_resource_free(padapter, precvbuf); + if (precvbuf->pskb) + dev_kfree_skb_any(precvbuf->pskb); precvbuf++; } precvpriv->precv_buf =3D NULL; diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h index 9b3f4e8293ee..227e172bf1c3 100644 --- a/drivers/staging/rtl8723bs/include/recv_osdep.h +++ b/drivers/staging/rtl8723bs/include/recv_osdep.h @@ -18,8 +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 *padapt= er); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 -void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_bu= f *precvbuf); - struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubf= rame_Length, u8 *pdata); void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pk= t, struct rx_pkt_attrib *pattrib); =20 diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/recv_linux.c index c71e0c762f4f..ebe169507dc8 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -9,13 +9,6 @@ #include #include =20 -/* free os related resource in struct recv_buf */ -void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_bu= f *precvbuf) -{ - if (precvbuf->pskb) - dev_kfree_skb_any(precvbuf->pskb); -} - struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubf= rame_Length, u8 *pdata) { u16 eth_type; --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C5F7257820 for ; Fri, 22 Aug 2025 13:55:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870921; cv=none; b=EAfCHW6y0v4knNAOnjG+eMjcBbPuGJs+y3/7/nze6UQ0app4w0astRSVHME4uGiyKO1w1RSSo+YS3WZg8gKcv8JSPLHlyx9jELxgPsp5Q8Fft5Z1R4HZoFbXXLkKsOJHfqEvu89n71ekq0Bs4QwFs7q17PvSD+Ok6caiKv0My6Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870921; c=relaxed/simple; bh=utP1enymQOWYdzzMJg+XO+S1ofOs3Yc/33ydjTF2pI0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jum3mSNp2ZI9kNK45gHyjKAGFpT0+gAurkqSLAqO2ary2e0e8OrGVKRDK86rni+gn7LqS6GVssm+jDDHLTKfGKRYpHz1LD8t1GY6yvBosSuyLsPLet4PcgeeLuGrr+XkBOyz9IMlN0mtOUczG64jblxsKBxjr/bx92pp8H5te4Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B7fL1/25; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B7fL1/25" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-61a8b640e34so4491424a12.1 for ; Fri, 22 Aug 2025 06:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870915; x=1756475715; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n6A7evPtMaphzVeoghc8+RfaVdSDwr1jUwsy0Dt/40M=; b=B7fL1/25JZtcJHBoM8U9bIT2FmEWagKI6nZHtipZtKkbvoJ45VDBdZ6ODqQOraDyrV DgwRJZiAoJWIPSZQzE+6BfzaHL0d01hghmioWab+IqH62z4l1GaWyJFXpmWATs069VZL My3DC6CgZSlApvEa1dFTNvXGBoAY29dw+BHVeHYmF//kIfCm3teQ4dvANfmAmm37QOsn QdDpBrONjuJOmgNtPKxn0/oWLcKvNcB676jTdAC/uCsD6fzCEGTEpbRqXmNcs61H8OEn fxpShfJOdYHTk/RlMvn2ED2o5I7x44DmvKFC0PnQRRFR+UR32qq2/QgDIKauchffdD4V vMeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870915; x=1756475715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n6A7evPtMaphzVeoghc8+RfaVdSDwr1jUwsy0Dt/40M=; b=IG8qfpVwoOlMOPHC/GoPNju1zBjt9T/eyX17XOo8N++yDafvqWgVWmu1fdhFDJLW4j Q40TQNr3CTE3iwlhNreLHfgcp8Y5geCOZkmxcrfpnZx4XI5heiuPA0cIIDL/kZhoXz5n E8dTjrcGexlf2WPP722c83Yzfdo9npJNNa1uGtZwUGWVHnIAAf27jIORSuYq4Xagwfj/ wgo+ubvPKzk4N5xJc5V153PEyPGr7nwgUrembs3D6p0Gml4NAf425H1fWanhz2jVTc8m CqU2kPRgvxeTbqNwblzrhrR2pO7KQiGYbU0tMNvuxRQApMH/OCQPu768gnPHs/K65Oif rNYQ== X-Forwarded-Encrypted: i=1; AJvYcCWAY5QWmOFu+WTh8e696K2QOEtjgtN57BnG7sspf8EFCStPAbnz0TKjYqdvpWirX8Tw2Fioy6XrHDpsn3w=@vger.kernel.org X-Gm-Message-State: AOJu0Yya0ynR0SkwMV0c453kb0Y65ebbTTGhtZejBqYkp7tTlD+OhYMf fTSr0M/bgK31qCHBKU93ZU3JCA37bmGOr856N8B2qpRHEEmTjOd22aVq X-Gm-Gg: ASbGnctAtc+FXFL9ihssV26hSVV4ylP8hvMGHuE0pg/12SmMM/XmkhS/W+ruKbVm9SE JEYnCEiMD5cpKl0L5g64ArTMPbWFAmcv8XTfLXLMKan9R5WmAVrRSyQ8WQndZ6J+LYi7g/LUEWn 0yEIXh0fJ6RhpEZwD8ZxaMULEY1tYDSzp7mZwGEBFjEgw4x/fsaiFviKbTTqJKRPSeTbEH8cnlM ne6Lh5OBP6Ohq/SL0SMDsBruopxETwipqv4mbOuuqF2tEGt0kK+2MQXa5u+u3YjvnMJnINX8S2A QIYCIoNy5vx5Xa0XFG6Ll/HaU6MgkmeWs43Swwul+Jnp5r/O0kD7FzijW88oEMMWv5ALBy7UQ2A zPFAHhCz2Xz9uOYG0YtsRz6jkhA== X-Google-Smtp-Source: AGHT+IGU7sy/pKzJ00e6fQ5Px6JIl9af9XWJZ5whF3tCatP/hSD/bH6jHYxOj7b6rMBX1whEym4WGg== X-Received: by 2002:a17:907:d2a:b0:ae0:e065:ddfb with SMTP id a640c23a62f3a-afe29048018mr290926466b.18.1755870915375; Fri, 22 Aug 2025 06:55:15 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:15 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 08/13] staging: rtl8723bs: move rtw_os_alloc_msdu_pkt to rtw_recv.c Date: Fri, 22 Aug 2025 15:54:13 +0200 Message-ID: <20250822135418.118115-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the function rtw_os_alloc_msdu_pkt 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 --- drivers/staging/rtl8723bs/core/rtw_recv.c | 40 +++++++++++++++++++ .../staging/rtl8723bs/include/recv_osdep.h | 1 - drivers/staging/rtl8723bs/os_dep/recv_linux.c | 40 ------------------- 3 files changed, 40 insertions(+), 41 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index cda51aab752d..4947099d8595 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1622,6 +1622,46 @@ static signed int wlanhdr_to_ethhdr(union recv_frame= *precvframe) return _SUCCESS; } =20 +static struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u1= 6 nSubframe_Length, u8 *pdata) +{ + u16 eth_type; + struct sk_buff *sub_skb; + struct rx_pkt_attrib *pattrib; + + pattrib =3D &prframe->u.hdr.attrib; + + sub_skb =3D rtw_skb_alloc(nSubframe_Length + 12); + if (!sub_skb) + return NULL; + + skb_reserve(sub_skb, 12); + skb_put_data(sub_skb, (pdata + ETH_HLEN), nSubframe_Length); + + eth_type =3D get_unaligned_be16(&sub_skb->data[6]); + + if (sub_skb->len >=3D 8 && + ((!memcmp(sub_skb->data, rfc1042_header, SNAP_SIZE) && + eth_type !=3D ETH_P_AARP && eth_type !=3D ETH_P_IPX) || + !memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE))) { + /* + * remove RFC1042 or Bridge-Tunnel encapsulation and replace + * EtherType + */ + skb_pull(sub_skb, SNAP_SIZE); + memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, ETH_ALEN); + memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->dst, ETH_ALEN); + } else { + __be16 len; + /* Leave Ethernet header part of hdr and full payload */ + len =3D htons(sub_skb->len); + memcpy(skb_push(sub_skb, 2), &len, 2); + memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, ETH_ALEN); + memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->dst, ETH_ALEN); + } + + return sub_skb; +} + static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prfra= me) { int a_len, padding_len; diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h index 227e172bf1c3..1e332ea63207 100644 --- a/drivers/staging/rtl8723bs/include/recv_osdep.h +++ b/drivers/staging/rtl8723bs/include/recv_osdep.h @@ -18,7 +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 *padapt= er); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 -struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubf= rame_Length, u8 *pdata); void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pk= t, struct rx_pkt_attrib *pattrib); =20 #endif /* */ diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/recv_linux.c index ebe169507dc8..4d3a42f6f9ad 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -9,46 +9,6 @@ #include #include =20 -struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubf= rame_Length, u8 *pdata) -{ - u16 eth_type; - struct sk_buff *sub_skb; - struct rx_pkt_attrib *pattrib; - - pattrib =3D &prframe->u.hdr.attrib; - - sub_skb =3D rtw_skb_alloc(nSubframe_Length + 12); - if (!sub_skb) - return NULL; - - skb_reserve(sub_skb, 12); - skb_put_data(sub_skb, (pdata + ETH_HLEN), nSubframe_Length); - - eth_type =3D get_unaligned_be16(&sub_skb->data[6]); - - if (sub_skb->len >=3D 8 && - ((!memcmp(sub_skb->data, rfc1042_header, SNAP_SIZE) && - eth_type !=3D ETH_P_AARP && eth_type !=3D ETH_P_IPX) || - !memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE))) { - /* - * remove RFC1042 or Bridge-Tunnel encapsulation and replace - * EtherType - */ - skb_pull(sub_skb, SNAP_SIZE); - memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, ETH_ALEN); - memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->dst, ETH_ALEN); - } else { - __be16 len; - /* Leave Ethernet header part of hdr and full payload */ - len =3D htons(sub_skb->len); - memcpy(skb_push(sub_skb, 2), &len, 2); - memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, ETH_ALEN); - memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->dst, ETH_ALEN); - } - - return sub_skb; -} - void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pk= t, struct rx_pkt_attrib *pattrib) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDB463074A0 for ; Fri, 22 Aug 2025 13:55:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870920; cv=none; b=NqOu3TxPMYoKjXU4krAH0ZS2/e1Cl8S50pqEib8mcNSecJ+N65BXJs9nFb6XCzU5OnMuU6ZNvJwA1cxL8IolBmvz+/0D6pvDKg1fyzVrhCjiHyqDNsn7p5tUTJrtImJL3+8/mQNEFfc9rSr4GheFQfOSanjne2KMOcnfScyOZRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870920; c=relaxed/simple; bh=IpB9cvK5kSt7dw+GGmoQNb8wx+qNNv0Enrmgu4f1kkU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I/ZvmXZEzTBFq8Ebs94BR2ReXvZn4YAyoeC5VPM6JAx92fanZutZQ6JNefWdHdnLgvd00OqA7VNsfgzCYvHi4z5jcwTnCGPm91nkPeEC4foErUT7VbG8uALUFEUZkD0TbLa1FxvTxyuexgUBU7ZaRF5ZgKTT3ZdrtoSqlFUhMcc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Gh9aisck; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Gh9aisck" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-afcb6856dfbso383994366b.1 for ; Fri, 22 Aug 2025 06:55:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870916; x=1756475716; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vhtnvBKwGmstz40ZlcV+VAZTltaTKGtbvDCCJ8E5i60=; b=Gh9aisckAv6vgkP/a1tSWoBU4lRXUBWcZNfAP65/9J8kxk05XvKrAtmzhj9YZlvEN5 6yyP16UHkuhKRAz38RkuGlW+9e3qVG91M0o/lKVqPHka3HrtYSEXngHcxJe0cqwfPTlg XzGM0RO0NYW/Mnxmk1ee+J9qgkIAuMNgw7NW3d7DDVrTtIg1MrUo1fNAX8FAHu82l4B4 WXXzPYj43m3qwOQya2V4ghxHCn0Dc+Sa4CChuU7VEX+3bupkm6gdNmVLauxrgvxMe1DD sAM9ujnlF+QvF+Q5ox5h4MNczihauWgWPUvccNgnkZI4t9ztJpt4ovW1ozyUHM2jnnBY kgXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870916; x=1756475716; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vhtnvBKwGmstz40ZlcV+VAZTltaTKGtbvDCCJ8E5i60=; b=qfUJi9kxapdj67wKiq/8xiqCYWpz5+8NHh99TWCxmiJjVH3ADfNAVbfAbYQjAT8grB Nybu7rCWmdjs6GVkYpPk9TzVRyaAGAkvE1ptZPoic/QHbDGQDuNi152fwbbUEr+OO3V0 v/ru3EywneN/XO7Q2nKAkmSir3bGzS37Fw0LwoNbGNnZQGcOrPrMRgBWSAyHVeq63vIt 3yxjT2V9c4cPTJt2Rcn0c/3Y2k4NTQkGsdRUG/ExctMInDCwO3tbT344zvL+GdQzz1YO FgeDEeqX1PksCYhpH3R/lt8uew5GghttFNI/U8KyjcnZE3UYQMzcMhNMrLc04ZHxfh1Z XCSQ== X-Forwarded-Encrypted: i=1; AJvYcCXnCQcMZcEmmuL9WVvg8jwu8F9zDmDmxC3P+ot2GXnRtC4zbLra7fdRIRJHBm8yBFQB6vCUYgth3QA3wUw=@vger.kernel.org X-Gm-Message-State: AOJu0YzeuBvoNkswCt6dtJKNaQDikWazojmlARRUCM2XrCqO1T9h+RYb xJkJHNFZQiTdPtMRbvxwGG/B7QY1Vy0gWwhcrYxxy+yeNn1fSyZ7/j9b X-Gm-Gg: ASbGnctobeIxJqiev2afmf1URhYz8HXvcIGUkooyhPhVQAcIzAyqD1gYZ7p6UV/NMoI y3sHvn8FOlod35NYR/W36jlUPo/yJ0cHAFYj/cRLwqtlqc44a8EsrAQ0Af5i0YVHJB1Ml9H58xd 9JsQNIOm71vqDiljKOWprT/cMqK4e2NwVk+7T4lzI8T3YklsLBCePSWSLG3144CybEeoxP8pJic rceijFDX+7mrKshpN6ZZf9kXvTnzzHL3Oe26IFzdpw2PA30ckBEo7zOFIQtYeK/jNjiV3w2EBaA U/b7Y13pTm87bJ/hpvWCxZC7SsU4cfhFEX4AlUZPXA7b2vQRLkFh5bTt++i/Git39j2cela8yLx jvxuIvTvPw8VbOou/aLvj/cEhyw== X-Google-Smtp-Source: AGHT+IHT7+T8WawmQGKLOfrCxwkolKFWqCzlOiIQiq3BB7UaJMLgc8Dx0GdNjecGWbrJC7emLM3BWQ== X-Received: by 2002:a17:907:98a:b0:ae0:e1ed:d1a0 with SMTP id a640c23a62f3a-afe29018bbamr297028266b.8.1755870915954; Fri, 22 Aug 2025 06:55:15 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:15 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 09/13] staging: rtl8723bs: rename rtw_os_alloc_msdu_pkt Date: Fri, 22 Aug 2025 15:54:14 +0200 Message-ID: <20250822135418.118115-10-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename rtw_os_alloc_msdu_pkt to rtw_alloc_msdu_pkt as the _os_ indicates operating system dependent code which is unnecessary for in-tree linux kernel code. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/core/rtw_recv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index 4947099d8595..a8b388822719 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1622,7 +1622,7 @@ static signed int wlanhdr_to_ethhdr(union recv_frame = *precvframe) return _SUCCESS; } =20 -static struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u1= 6 nSubframe_Length, u8 *pdata) +static struct sk_buff *rtw_alloc_msdu_pkt(union recv_frame *prframe, u16 n= Subframe_Length, u8 *pdata) { u16 eth_type; struct sk_buff *sub_skb; @@ -1691,7 +1691,7 @@ static int amsdu_to_msdu(struct adapter *padapter, un= ion recv_frame *prframe) if (a_len < ETH_HLEN + nSubframe_Length) break; =20 - sub_pkt =3D rtw_os_alloc_msdu_pkt(prframe, nSubframe_Length, pdata); + sub_pkt =3D rtw_alloc_msdu_pkt(prframe, nSubframe_Length, pdata); if (!sub_pkt) break; =20 --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 11A66302CD8 for ; Fri, 22 Aug 2025 13:55:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870921; cv=none; b=o1LdNsAKza88ZXETbxE49EFt/eLwYgUwtuQZBHfbHqfiVJ52AKyY3HmklNlOwXsG4jx6h53OzhYsewq3+xX/yfpIzDSBxS/OPZNG4Le0ec5tSneC/L78FvNCZuUwBC8XQ2vMRnpTYw0Gua5BEc+IfDVI6WbJ6nYYE8zQH2E/8Uc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870921; c=relaxed/simple; bh=jbGeJDfBrQsrI6K552vuZyIVAy3M3w0dBEW/sZSdp+4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QpbJU+aA0p7CSnQTgOTBjlk3I8vxcdhyKy6ps+1cnsCU9g1gDX/jSUGqeUhTztld/pJpqdFykD7wfi1S3idklinyt55iS+kbxScKVvEYKifI1oDgKvccuJB6D34YWs0xalrD0OKy/j3KCM56V9hXNM8nLL2TzTmkL+dGclsuHvM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Z6i9FDiB; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Z6i9FDiB" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-afcb7acfde3so327108266b.3 for ; Fri, 22 Aug 2025 06:55:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870917; x=1756475717; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=io7wDwBQXXAz1NvC/Ow1c011ouqTM7JuaW9NsL/t1R4=; b=Z6i9FDiBy3sIpzp04KBE/5QLsDkPMycReLiZ3LunaxqcRqlk4DEGxmFTH99iE7OHjD JdF4KKYNwQpFUwH7lMd2k8FvXLEQeabI+EtRnx19+T674i6CqJLIOidZr9e1zsYZ3mXM 1vkKzroWBXGqViCIuFzdh6f+i3yuL5hJzMnn9MbO6eVNXCCezd6SK9zlk+t78aFUIfxA /KfuR90gRzPsLu0m4hRCzRbPbpkGzXR8l1ZkncUtVAyX1G/8zedjnIJBY1LSttbprv+2 Fzq71H7jUfEBEzcEe98g6zp1gi/GwmZhC+KzyjfpqK+TG1W4Tp76clVSaFNwQ2g7FPmc I9Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870917; x=1756475717; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=io7wDwBQXXAz1NvC/Ow1c011ouqTM7JuaW9NsL/t1R4=; b=kgvpgx8UYNZq+n8Y1pYIEoWFcNaojKTS55SXOiwkA61xCQmZJLtS1z1hSYjxD2uRoj jMKeE2SOL3uzeOPKkDNdlH4Ls02JzpKEmyedN6KGInEGcgxzT9U9TeidZf/E1fv3W5ZL BRrc+tjhl0pD8ELUjR5WlJZey/sLoUail8sR87A926EmLsx4UAeTvlhxACxQ3VQ41LrX DWOrYELR+y+dbWv1TLxRpifnyeGzmrQ7L17ELAThcLnfw3d5Z6sTs5pw6NM7gnRaH1Jf riwSMetGzrCZ7e/AQ2Pxa71eK/xXjwS6bHXtllGqDAbvNk1AxzCfYlU5nqTQ3UA/YFIz x2BA== X-Forwarded-Encrypted: i=1; AJvYcCVzvdUm6GhquF3lnnKtxktRWnbZ81TTnmEP9Dl9Cpg9bQwj9WKgF8r3VKa+jcSJFGmoQ65Od+8hg8hfQUA=@vger.kernel.org X-Gm-Message-State: AOJu0YwJswiV1Iup4kkRhsjbya/VynPHOkTNcGSZtFOchh3/RhEu9YXn 6im/x2l8cFoJdBcYvFJl+mMjim7wlkyUQMtrNLC/tZqVAsviyTMN6p68 X-Gm-Gg: ASbGnctaBsYfKfh2h4qSfK4XENwjFKc8C+7seDsMZje3EDks93KncHpYJ0Rhnu39Wni evOaUkEXl6wgV5PK4w//GBrRdIkEvJZAQUhoqysWbjamfvObJYhVad7mmbaMVmf0AkzwFirigH7 vmpb1XZe4Sg7TYLUbX9QalRgc8eUronfo+OsRtiNr75iZwi3Ej4ipWeWUf7PnOm/hTsdmnkmZAB QR5Ejw7tjXkMvyOGkB5pcwaeTTDtynimocBHagOyR4wqa95YpKqWOrDQOGmRwM8VdpYQ6UAM5XZ 8UfcaQqI6Iezp33WHyIPbbyfIxo7xxWXng+tVdC9JHj6cQBvsgR/DCw9nyMve9xO76Roorpgo7x SitibAomjC0JxgbW7WQjw3okjmQ== X-Google-Smtp-Source: AGHT+IE/FeGYUCVLqZ8N8wPz7Bukf3xdRWQw9cOc2U+3j+L9NlTp/lL6x6ME19mu4AvsOfWSEcnPuA== X-Received: by 2002:a17:907:7204:b0:afa:2775:58b6 with SMTP id a640c23a62f3a-afe28fc1a87mr296664866b.17.1755870917050; Fri, 22 Aug 2025 06:55:17 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:16 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 10/13] staging: rtl8723bs: move rtw_os_recv_indicate_pkt to rtw_recv.c Date: Fri, 22 Aug 2025 15:54:15 +0200 Message-ID: <20250822135418.118115-11-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the function rtw_os_recv_indicate_pkt 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 --- drivers/staging/rtl8723bs/core/rtw_recv.c | 47 +++++++++++++++++++ .../staging/rtl8723bs/include/recv_osdep.h | 2 - drivers/staging/rtl8723bs/os_dep/recv_linux.c | 45 ------------------ 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index a8b388822719..924a0c415a1e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1662,6 +1662,53 @@ static struct sk_buff *rtw_alloc_msdu_pkt(union recv= _frame *prframe, u16 nSubfra return sub_skb; } =20 +static void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_b= uff *pkt, struct rx_pkt_attrib *pattrib) +{ + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + + /* Indicate the packets to upper layer */ + if (pkt) { + if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) { + struct sk_buff *pskb2 =3D NULL; + struct sta_info *psta =3D NULL; + struct sta_priv *pstapriv =3D &padapter->stapriv; + int bmcast =3D is_multicast_ether_addr(pattrib->dst); + + if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)) { + if (bmcast) { + psta =3D rtw_get_bcmc_stainfo(padapter); + pskb2 =3D skb_clone(pkt, GFP_ATOMIC); + } else { + psta =3D rtw_get_stainfo(pstapriv, pattrib->dst); + } + + if (psta) { + struct net_device *pnetdev =3D (struct net_device *)padapter->pnetdev; + /* skb->ip_summed =3D CHECKSUM_NONE; */ + pkt->dev =3D pnetdev; + skb_set_queue_mapping(pkt, rtw_recv_select_queue(pkt)); + + _rtw_xmit_entry(pkt, pnetdev); + + if (bmcast && pskb2) + pkt =3D pskb2; + else + return; + } + } else { + /* to APself */ + } + } + + pkt->protocol =3D eth_type_trans(pkt, padapter->pnetdev); + pkt->dev =3D padapter->pnetdev; + + pkt->ip_summed =3D CHECKSUM_NONE; + + rtw_netif_rx(padapter->pnetdev, pkt); + } +} + static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prfra= me) { int a_len, padding_len; diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h index 1e332ea63207..20ce25132700 100644 --- a/drivers/staging/rtl8723bs/include/recv_osdep.h +++ b/drivers/staging/rtl8723bs/include/recv_osdep.h @@ -18,6 +18,4 @@ extern void rtw_recv_returnpacket(struct net_device *cnxt= , struct sk_buff *pretu int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapt= er); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 -void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pk= t, struct rx_pkt_attrib *pattrib); - #endif /* */ diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/recv_linux.c index 4d3a42f6f9ad..193725cc60bc 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -9,49 +9,4 @@ #include #include =20 -void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pk= t, struct rx_pkt_attrib *pattrib) -{ - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 - /* Indicate the packets to upper layer */ - if (pkt) { - if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) { - struct sk_buff *pskb2 =3D NULL; - struct sta_info *psta =3D NULL; - struct sta_priv *pstapriv =3D &padapter->stapriv; - int bmcast =3D is_multicast_ether_addr(pattrib->dst); - - if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)) { - if (bmcast) { - psta =3D rtw_get_bcmc_stainfo(padapter); - pskb2 =3D skb_clone(pkt, GFP_ATOMIC); - } else { - psta =3D rtw_get_stainfo(pstapriv, pattrib->dst); - } - - if (psta) { - struct net_device *pnetdev =3D (struct net_device *)padapter->pnetdev; - /* skb->ip_summed =3D CHECKSUM_NONE; */ - pkt->dev =3D pnetdev; - skb_set_queue_mapping(pkt, rtw_recv_select_queue(pkt)); - - _rtw_xmit_entry(pkt, pnetdev); - - if (bmcast && pskb2) - pkt =3D pskb2; - else - return; - } - } else { - /* to APself */ - } - } - - pkt->protocol =3D eth_type_trans(pkt, padapter->pnetdev); - pkt->dev =3D padapter->pnetdev; - - pkt->ip_summed =3D CHECKSUM_NONE; - - rtw_netif_rx(padapter->pnetdev, pkt); - } -} --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFF093054F0 for ; Fri, 22 Aug 2025 13:55:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870922; cv=none; b=hKxW78td+v/nMUimsVgE1yDrMDl50opV/+Zv5W/t69tlxKfCoorYJ7Dnu79jJ8OK2w854Xa7fiD0IJsLZSAAxvO5nJ8a8193puP7TbyLnDR0+LuhLdnI7knMa9Cwq2YR0I5K/yYvud6sN3opkFmwj2btL0nT7kWEhsOW1lMZLU8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870922; c=relaxed/simple; bh=iMxJ6lRTsZ/+ONdW6aaFlSyS67Ejco0VfoBbud1ISW8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H52Abu4knKua1jn7TfFXCk31rKmJBang0UOU5QDekeRNev//ktJPphE9LysjfBHdVy2OFUWuLYqlVxJOv63JRIsunxmvB5ysJxM7KRPPng4fazGPkhwmECkshzfedbhFIhC/W388O335oArWemkv5pukImUsc7u6IH2e9TY195s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bGsJDu2D; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bGsJDu2D" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-afcb73394b4so314271966b.0 for ; Fri, 22 Aug 2025 06:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870918; x=1756475718; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=izOus1pkUT/TrM+qzEvtIeTOKYw7pk9oz7PKskT0MOs=; b=bGsJDu2D1myy8t8+icMgZjDBFd+NSBzOg+HyExWlqfui3LQeCw1+MKAjtD2fZKIoAJ VIVicP1RhL1Pzl5dspo+eNLk6xnvaomwUoQgGshGbfGfDk5lhj9lkbrjmK1iMktBpT7/ rrJ/4oNAHSPa2Aa/kh1eEjxl3UMczRET/fqvIAqAXGaACnVDcuHOa8bGLCWZfIEfYFXk dSqPIbM0lIxoTLllpNnqXKrec7EKOEoQrsHDhmaa8PL28JfSXoAhAh3GKcZHhJ3h6AZU TRqBBSIYM67xTDNpU7I2+J2EIBhC/foMSeT92Pux44k7nLVUX5+3vR11/s6YO2ALsyub FDpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870918; x=1756475718; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=izOus1pkUT/TrM+qzEvtIeTOKYw7pk9oz7PKskT0MOs=; b=ITUV039iP1EKE8fymUzphHInOR88X1UuJMdx4miXf4VXvUuYoGOyf3Y8o/yvkXF6Hf Cn+rrUJpys0djBolpMUItYzVoDHLF28ttdnFtxU9JBw3/+i3CkDUHFRIu0gmOAQpsXsr uv8f0fq8O7zlbYQGPVhDw5PNslStoFdNJwnbCVHmcGDgaPV5HBD3jSJnTck5H91wSOuR 0gSKsfJN1dxf8zodHYyp+V68aAAJBvgaCpsDBjFGmrF9HH1ruLh0NXDFBbpBXT5FWNWL rPvirZy/4JwRkpgNpQw3avJOn/DtM0YMAIjMH8fgwUi4LaagsMc6rxq8LBnB5x7c6z51 MTLQ== X-Forwarded-Encrypted: i=1; AJvYcCX2vW7j5KZ/+R+549KJpC8v19MKtkT6Nqd3KP45SPXhJshepPUMkhORoGdo/mNVByMA5ut4EGpo8L9NEyY=@vger.kernel.org X-Gm-Message-State: AOJu0YxRsR7pZk5XuAxouEFnozvuh0NLirZFMJHe1o5H00tgme8DRaf7 SbXzF+vNamByrMIdx271BgSajUS3/M9dl+uC8n4hS5/q1I42kzFjh4jQ X-Gm-Gg: ASbGncsKs9B9xWjs/sc2JPyzZ6DDKDhHxba5e+lnCHBOshxhfXBvqzcwO1V6mgeHwjI jawJ6MqQlbEOJdsdF9psB920HEHeAQpFQQEp7gKCD98U29jxffN9IaZoKcIvoEb1q7iV0lEv48X R6smVyGf7lrhFAwL1ytiW0b18lep5Inr8p2PqjUGxrYvlkPl4gWuGxy+KVacCZkWLda5lzMXACZ Rd5bwxGrML34k3pwg+wkwAQIXcu2T9O6x73zkgDrwiPpns4qMlKQhu2HyM6RZZfr/MFChUAiTbY 6hX+ovdDN3b2jfqOVgz9xa2n7srSdqdaLqtbRRgbOdyKCOT6VB6AQxVfv9ICkRn9hG0uiE2YN8z ed0Wfg8iYOKfHEFoJwj3gfsLjj04ZOGwkC1RG X-Google-Smtp-Source: AGHT+IGzOWE/MUzoEMMp5es42MONAAnkQmOqcY/iO34lssMR7iWmGBNBPijyi/3L6YIXM2hQwObTAw== X-Received: by 2002:a17:906:d54f:b0:afc:a330:e423 with SMTP id a640c23a62f3a-afe29041e9emr249651166b.42.1755870917696; Fri, 22 Aug 2025 06:55:17 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:17 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 11/13] staging: rtl8723bs: rename rtw_os_recv_indicate_pkt Date: Fri, 22 Aug 2025 15:54:16 +0200 Message-ID: <20250822135418.118115-12-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename rtw_os_recv_indicate_pkt to rtw_recv_indicate_pkt as the _os_ indicates operating system dependent code which is unnecessary for in-tree linux kernel code. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/core/rtw_recv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index 924a0c415a1e..e893cb6fa273 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1662,7 +1662,7 @@ static struct sk_buff *rtw_alloc_msdu_pkt(union recv_= frame *prframe, u16 nSubfra return sub_skb; } =20 -static void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_b= uff *pkt, struct rx_pkt_attrib *pattrib) +static void rtw_recv_indicate_pkt(struct adapter *padapter, struct sk_buff= *pkt, struct rx_pkt_attrib *pattrib) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 @@ -1771,7 +1771,7 @@ static int amsdu_to_msdu(struct adapter *padapter, un= ion recv_frame *prframe) =20 /* Indicate the packets to upper layer */ if (sub_pkt) - rtw_os_recv_indicate_pkt(padapter, sub_pkt, &prframe->u.hdr.attrib); + rtw_recv_indicate_pkt(padapter, sub_pkt, &prframe->u.hdr.attrib); } =20 prframe->u.hdr.len =3D 0; @@ -1890,7 +1890,7 @@ static int rtw_recv_indicatepkt(struct adapter *padap= ter, union recv_frame *prec =20 skb->len =3D precv_frame->u.hdr.len; =20 - rtw_os_recv_indicate_pkt(padapter, skb, pattrib); + rtw_recv_indicate_pkt(padapter, skb, pattrib); =20 /* pointers to NULL before rtw_free_recvframe() */ precv_frame->u.hdr.pkt =3D NULL; --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30902302CC7 for ; Fri, 22 Aug 2025 13:55:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870922; cv=none; b=KnliqsCS4MuNY4j2xQDCyJdFSXidhyeKY5/C8XjSq8A4mzY5eI6/eKXQKDAhzjm4fMMF09pJi8RDfjjcEBYqlzJd7iG91qt9blogjPb4IKyC+6FKZ16OlIrcyBMQ9cHg7ejXn0pQPBl+SDzgsuwDL0lh8y9PVcVg8YS4i+GnT30= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870922; c=relaxed/simple; bh=sVdC2hU/SSPlglTMWz1ueCPAtY4Ily5J6k4KXXBlx5Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ogNwsz+K9CCrpGO+yisXKXDybUbDpHEXGXEo3Q7f/hjFvDhfoxImTEzp0s93iap3OuruP8rNIWKkswUHrsqXsowJHMAW5z0jUtBfu6Y3BvkVrMrCGLibNWIdYzX6tt9feRLYGWHYgZMqKbzWbtr1WoWgsqUx03VQupWxTh+bNdo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JNl7cqW/; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JNl7cqW/" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-afcb7aea37cso280331266b.3 for ; Fri, 22 Aug 2025 06:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870918; x=1756475718; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gv9g6cDQmujFG1oPRSFe6TPkH+3laec1tY9I5AIeBsE=; b=JNl7cqW/0LVW83rC4GYE4ilNNzDWstOKDywkrpJv49J68qUlJK3IPaFcA3v/mkXOy7 fIwiV4iovDFruxaXADloFqiOy1c0P5yJkO8i0ynWNf4S0+j2nRurEoL/ifkruqtf9oea wsF75OXChcIFc1bZZovVrYkDXpkBPCovKFQ7KWG80bBZojkVbnMQNUrAqhLp4Y3i001p G/N4ClbWWcuVW9RqjZMApn47vafHErFomYFbLdmrdA88XFrV2V99bNWcr7CMGhtEcfbU Zpsw1fT+V3m/QKrYPRyCUwsEmYqPJOZT3tbPeLuwcEwFEobggTLHWxopXJMoDeNSsrlO RnNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870918; x=1756475718; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gv9g6cDQmujFG1oPRSFe6TPkH+3laec1tY9I5AIeBsE=; b=oAFQIRPPreohIg+jeINW5hYDlB/yT8HzkAmTpDnxunMWJ+QXaWHbUpmr9J2zDqKosr ZdYEuu2fPe3R6waH8P3HK5PRHYsPmQ4E2g02NGmneXIHyW4Yyks5iAQ0Y9mn6EP+TGU5 fIvV+I/IIhXav6S7qkH1NuSjYX8S/X9Cn791oWbrY8SnZ6N6yq0NppAGuD2zjDRzqrVb 48oJ/StZh4u3dc5bPZKtmWDN5sTTwdaCFifuaCbhsQMNU43DPg110LNI3hh9MXd1L0U8 3nrHO/hvtwgDI/wqtgzroDozRXrffxV+7Y1vk/ZSLV4DfcZvtdpGOwz6AHEViOOM01UF PXOg== X-Forwarded-Encrypted: i=1; AJvYcCWgag7ona3jYCqzIlSJGfph4zPXS43+wdEzrHBFy2TdypPU3XJNTeGljiJpaeehTV4hqKUwBzKJrysxar8=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7ss86Wt2PQrFINTTjn4X6AGIZepllyN8+gTGVo+1ACWfqAnyZ jaBjWAt/bTfWibRz3GfVJg1BLaUKB6VJxGEGqxguPyWei9o1Ptplptwx X-Gm-Gg: ASbGncsJ5j6+reGIakD2es1+47FNB1dP5rnVJOt4VJbWHUJvqbYWO7JGyGTbz5wUmvj xhFFnFLyxMy+WAOdvqOlm+DoFif91sOriFwXPKUOLcQL6Gh3yEWCmVtMRqKh/N6NwUuOCZa9TV7 5cP4XY+vgSJXNG1sljhGMV+U5B1pBrNF1wpKwgVDuRWfHB73A7A50eYN7NAeA1bx8x3uL+jOJWC 93DW1wcDr5wxOanrPxU12DLhE2TIeK7ZOv8aqgUtdX22d2PxqpxMS5UX0GlNsdebzQfFSQMIukd bsUUWqsr7Yz+CojQFImIZbNRDneS3vkddK5LIBmfDQuAnsBVuVWhz/LuhfAO2dbwJVVsL2VFOj6 VuzBwbSukEpch+OfoJ8ia1hk9vekdKOtl3fGt X-Google-Smtp-Source: AGHT+IGMrws2TvXqG52SlSp4a/tgZdhmkILCp0HBmaLsjoehzHc+bZRbjj7jqXlS+zcy5swwEVRl8g== X-Received: by 2002:a17:907:7246:b0:afd:eb4f:d5d1 with SMTP id a640c23a62f3a-afe29742ad7mr246391666b.65.1755870918342; Fri, 22 Aug 2025 06:55:18 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:18 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 12/13] staging: rtl8723bs: remove os_dep/recv_linux.c Date: Fri, 22 Aug 2025 15:54:17 +0200 Message-ID: <20250822135418.118115-13-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" After previous patches the file os_dep/recv_linux.c is empty now and we can remove it. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/Makefile | 1 - drivers/staging/rtl8723bs/os_dep/recv_linux.c | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/os_dep/recv_linux.c diff --git a/drivers/staging/rtl8723bs/Makefile b/drivers/staging/rtl8723bs= /Makefile index 19c0525ec3e0..1768b8123f03 100644 --- a/drivers/staging/rtl8723bs/Makefile +++ b/drivers/staging/rtl8723bs/Makefile @@ -50,7 +50,6 @@ r8723bs-y =3D \ os_dep/ioctl_cfg80211.o \ os_dep/osdep_service.o \ os_dep/os_intfs.o \ - os_dep/recv_linux.o \ os_dep/sdio_intf.o \ os_dep/sdio_ops_linux.o \ os_dep/wifi_regd.o \ diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/recv_linux.c deleted file mode 100644 index 193725cc60bc..000000000000 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/*************************************************************************= ***** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - *************************************************************************= *****/ -#include -#include -#include -#include - - --=20 2.51.0 From nobody Fri Oct 3 23:02:08 2025 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9BB330AAB8 for ; Fri, 22 Aug 2025 13:55:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870924; cv=none; b=j7FhU6s9Nrn596prx2B3v0GsH1WXB4wuftn6RNvadvkYMRa9QH0JKg+RacET8pqGtn4H+QKGfmOJEx6N3+OWeoAMp67XVtPScz/QHUdUlCeNeedEZs2w/PQNTcvs64mnTCnQd8dF9Ee3IcgXRVkz1HXouGQqmHKt50TQ9q2GYUY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755870924; c=relaxed/simple; bh=bAWWYr7G0wEavsSSEbN4ZfueckmKJWlFmmKXRgGMffA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JO1pZggvuWuuGweiS94UHSYqn5gSZ/HG3YF0eyO0sdcLEmmSDPfnuxS32yxLi1COwMGqHdJOHg/fo+1m6K7hVi70pqCBdNHTbJpKZBIST/i2ra3CD5ZIlO/NpHgUDeshJEON5XPcWM598x5h9pqImz8t3XpeWRk5ttZRqq0pHrM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HS7+ehFT; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HS7+ehFT" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-afcb731ca8eso343040266b.0 for ; Fri, 22 Aug 2025 06:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755870919; x=1756475719; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MriLCdOSPXFFmX+bYG2sehrfu/eciyiJysfVnIX8JBY=; b=HS7+ehFTt3razrEEy1bP9xG1raGKmvEVNOt/vIM8jpM29FcYmEQmzYH/uTgkHGTvEY nQjmr8cTirZzVlK8JuZVoKdlPJmSMPBDXHp10o4+n0dYd/JgSNXy/I51KO0uZ5+PZH7B KZAqS+8kEilG4UliiA3Rs9moxuqLR5fvoeYPLj2d9nktALgV7HB7TtVs/6r0dxko4BQV WYS8sftlVBuAQVfKED9PypmVg8bu8y0m0wP/L1dIRp5uKhZ+WBIf82FtyjMuMfkngIj5 fCoQ8pVIx3oQIi5jjZLRoJEeIMbmODn0PExG4LTDJ1CEumsScRc5n5AEoJMVhI+BI62w 0Lzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755870919; x=1756475719; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MriLCdOSPXFFmX+bYG2sehrfu/eciyiJysfVnIX8JBY=; b=Wd2iX2iuv2SZz/rmYsw0buz4sS4MTQlsvwYPdXllw4RGQ2KOHRgkA6w5D+YPJ2F/y0 yYtjLITMnhGxNysUKpI9eQHwIYtpO+MIn27eKWAG4pYo16Qgxviassj4RbL67ih6GpHW DfNwSPLHilEeP+OSdjWjEqIshzYbJZ/94kE5GdP40kdAEBtJ5r50xbt7jeJiu8B47Jd3 V9q99+J2rMNaOD2bIdPPfB5KrGMrJm97bbZ4xTiztycWqWmwkTLpFTYUAf/HcDxLfZgp 1dh20r55lVPCiOzDv5EfcmG4WwLLSsiYk05jcrQQnB75gHqqoLGEF10kHpqTelrtyFR4 gUmA== X-Forwarded-Encrypted: i=1; AJvYcCVDsWFZFaBGsvOI1HD9nYul47/nvzX6F+4Cd7z8yVPTWl4Y73XB4DzLA9uDuhEnijym5MKrIVg5ypVQc6k=@vger.kernel.org X-Gm-Message-State: AOJu0YzqnM5TZooEkNWfM1v8d8mPYx+0/Qw6X5BJmSEZPSn3M/xnfPhA fYYRJC8fo8bJRzMdTmo6SNFpqqKfz7YB1xqhkjdCy5wQNSI9UA+xrc5Y X-Gm-Gg: ASbGncuBKQpWRmNgBcVu7zeO5dtyUGgsQaAUdQwdvi91CmwWQgcVIXTs5sDsEJbbqeo M5OoLhQOaFgImbwRy93WZOYNDg0XZAdUdWatSnHxgoWCrCHWxSuSIoaxqsQeCEC3D+MNCCFImV0 l67CAzpoIXugULd86mmfpqsm5IwY4xtGLNJCQ/hqpfmwPYsMLbQaI7A6F/ptiR6IT4yFRZok0jF IzfX96jUP1O/hTYzSoQ4RTFcK18qbzriYmIhmjGDZISSWOLjhZ8+ltYWZE/BsBEY9iaMRQrTpem qVzYUsz6KyoHkooFGURyhVG9IfYQRMWuH+UvYOCEy4153kKJTLak3jWvZnbXQo7miqRvGbEGYeP CP/tk4p80ngKRZWAb7pDkeqDQJA== X-Google-Smtp-Source: AGHT+IHIpHoFlT4DekRBl5w9SoEW/KPa+BrtCmGRAFzA38cXn3uIrIP9U3qCMOfb7i/PwhdId5s+yw== X-Received: by 2002:a17:907:3f07:b0:ae3:f2a0:459f with SMTP id a640c23a62f3a-afe295a456amr305665066b.54.1755870918977; Fri, 22 Aug 2025 06:55:18 -0700 (PDT) Received: from tumbleweed ([95.90.184.246]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded307138sm612353866b.45.2025.08.22.06.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 06:55:18 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 13/13] staging: rtl8723bs: remove include/recv_osdep.h Date: Fri, 22 Aug 2025 15:54:18 +0200 Message-ID: <20250822135418.118115-14-straube.linux@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250822135418.118115-1-straube.linux@gmail.com> References: <20250822135418.118115-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move still needed function prototypes defined in the recv_osdep.h header to rtw_recv.h and remove the now obsolete recv_osdep.h. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/include/drv_types.h | 1 - .../staging/rtl8723bs/include/recv_osdep.h | 21 ------------------- drivers/staging/rtl8723bs/include/rtw_recv.h | 4 ++++ 3 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/include/recv_osdep.h diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/stagin= g/rtl8723bs/include/drv_types.h index f1c16ddacc83..dd9018aa4ee5 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -33,7 +33,6 @@ #include #include =20 -#include #include #include #include diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/stagi= ng/rtl8723bs/include/recv_osdep.h deleted file mode 100644 index 20ce25132700..000000000000 --- a/drivers/staging/rtl8723bs/include/recv_osdep.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/*************************************************************************= ***** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - *************************************************************************= *****/ -#ifndef __RECV_OSDEP_H_ -#define __RECV_OSDEP_H_ - - -extern signed int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct = adapter *padapter); -extern void _rtw_free_recv_priv(struct recv_priv *precvpriv); - - -extern s32 rtw_recv_entry(union recv_frame *precv_frame); -extern void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff = *preturnedpkt); - -int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapt= er); -void rtw_free_recv_priv(struct recv_priv *precvpriv); - -#endif /* */ diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging= /rtl8723bs/include/rtw_recv.h index aa9f9d5ecd01..8e45871f07f0 100644 --- a/drivers/staging/rtl8723bs/include/rtw_recv.h +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h @@ -342,6 +342,10 @@ struct recv_buf *rtw_dequeue_recvbuf(struct __queue *q= ueue); =20 void rtw_reordering_ctrl_timeout_handler(struct timer_list *t); =20 +signed int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter= *padapter); +void _rtw_free_recv_priv(struct recv_priv *precvpriv); +s32 rtw_recv_entry(union recv_frame *precv_frame); + static inline u8 *get_rxmem(union recv_frame *precvframe) { /* always return rx_head... */ --=20 2.51.0