From nobody Sat Oct 4 00:21:31 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 --- 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