From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.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 E2B2349551B for ; Wed, 15 Jul 2026 12:51:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119876; cv=none; b=VGxjqUfNZBLNGbiq6ZjArvzeWaOq4W7lT+RNAjB9dgZuaFD4P/IFGJovqXF4h1fyjgyYrnOCX7+Nk8DdkKioJeq0zwXIjoK3oC7YdjPdPQgVMY6iSitFg1RmdlEC7Z1aKb2nbLWCy7/ZO2IDMiOoppNbtFW85WTc4Ywy3dwkolI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119876; c=relaxed/simple; bh=cSVtqwIAX/SFczkOeUbAhlabmVOHw/+tSx5h7+a5Czw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LVI/XPxXKALUWgC2YWP9ATUMTXAbsZHe65wPhoJPmJdcKihQoT4OTlpNSTn6ykwzjEiqWbaGnWlJ3Axae6Lc341IRoDkXCC6hPYslKWe4rAAYATCtTuTOnYYkKV+RZJBgbyUgwIKby/fqG9XMuYyO7OlNgak3VMiTh34ES6+OrI= 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=ZO9O0UZV; arc=none smtp.client-ip=209.85.167.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="ZO9O0UZV" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5aeb8c19017so7804666e87.0 for ; Wed, 15 Jul 2026 05:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119864; x=1784724664; 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:content-type; bh=P7qtNLeb3vifmZy8w97jp5BanhP4clMFWT1Ht9D7LA0=; b=ZO9O0UZVoLiv6hnMndHdbPvVcPJW4R2OMQARxewrVVXBNPzCsZBWVZLtaKs/LdBqZ0 8fvuJeL8E7Gx2zjfIgAPDs0TrcWso11zkbvQdP0FTsTKZfN8B2FhLDEhAk4sZpAWIYTV 1f8MSl240ostp0b7GMF7QfkXaJSPw6RD7MxFGcNs8ZAaGPZN65FPWKTY+1QJDt00Kj8u XYpnWItlM+2BEaJSq3WAuj3+6JwmCB+Aw6Z7RIbec3ceCvYPKKLxelSNp+3FVMmzeaOt VenhuGrySzomG8jRKHIYDJnx7UTJzIRZqWCmvQdXpqmw8du8+8DwLsgWTUXgnCbGlGu3 a5Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119864; x=1784724664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=P7qtNLeb3vifmZy8w97jp5BanhP4clMFWT1Ht9D7LA0=; b=tQFtUk4mjyDQy8SvbrVO7/aLoBfljj9yovEm8y42NjbSZ0DIz34+FM/dSL6QoNEy2N RqWVhdMQOF2jX23fQPLv80S1oNcYQmZxhuodb08JIarZGJrIB/0GoRxgtva95PS7rQ5z j+t7xKr+yVwI6orb4SC9E+Lc/IJ77XYLO4X9dU2H6xkmHxfscnMw8n4FtJHdXSeFNWbl waIzgVfQ9u31+K3aFIa2KEw3RHTklTlwg0Vc5scOhvbPLN8tWuHD2HQItYdIxcnWL0jb TE6YFVNlwbnQeDTuOJFw3+P6IbaXII5PltQr1xtCddv02msiA10/yXsmQR9VZf2Alton oS5A== X-Forwarded-Encrypted: i=1; AHgh+RoeQbYujW0F6JOmeoEh2lYTyk6WNr+NikdV8kNiIR/goM1NVAMqU6rioYPXscbTFKehgkXf0IpBr0QJLeQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9THrgsDwXLqYDDU/z7RaTTh/1cwYU4pAo+ukUJqmJIBU3St01 Mocd/Pe/0mMo+EOmaoVW041DwX122iqL9KHyIGxBxgRQxuQXijP8ETVJ X-Gm-Gg: AfdE7cnne5Ou3UY/aqTe8f/TxANf5NZf3c98Njs7qTgiUWq/L60MMlMdReJabJbr8vr e8ZUBDW/xJm1wXnWHSSnH9ZGGQCTTm5P70zDkWsSrekndZ0qj4733G7DtzxeMOTGv/aw4kGEOnn nEUmdJ5dqJFgT3aGjHh2u0gthjlNfkC8xk/nDxF17q2M8zI0Ae69fzWXt/8ujdcwIOXhDtzJuKr Sk68Sn0nTT9sqPbNR8XtZ+rmgKsDgKGsItlSKvlxENTsOt5Ue5cx6/q17xcIXc641xf6CYNlXXO ly8xc6UtpSwO6I5vQDwAZZ0aN060q70mjCupphK/O7koWdQYxY+WQbpQNu/mhkcaWKyZnNjL+b+ gNmEiUgw7crDpSdLKmJ5nFjQU24Ouj4uwzWhGaAOOZFP7YvzRd+xfgmXhzWPvFgOXk6j9M2LK/N HSSCRS7jlHe7jyvOZtd8JqhaLyJ7b0PJ+xj5rel2fLJGkvWfLIpU/JTAWSOzidJPiX7J+DEw/o2 IkH02oOqOlRWg== X-Received: by 2002:a05:6512:2524:b0:5ae:b5bd:5e72 with SMTP id 2adb3069b0e04-5b1582c61aemr1847196e87.59.1784119863753; Wed, 15 Jul 2026 05:51:03 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:51:03 -0700 (PDT) From: Arsenii Pashchenko To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, ulijg308@gmail.com Subject: [PATCH 57/61] staging: rtl8723bs: inline rtl8723bs_hal_xmit into rtw_hal_xmit Date: Wed, 15 Jul 2026 19:48:25 +0700 Message-ID: <20260715124829.90290-58-ulijg308@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260715124829.90290-1-ulijg308@gmail.com> References: <20260715124829.90290-1-ulijg308@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: 8bit Inline the transmit frame handling logic from rtl8723bs_hal_xmit directly into rtw_hal_xmit. This simplifies the driver's transmit path, cuts down on an unnecessary redirection layer, and improves code maintainability. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_intf.c | 28 ++++++++++++- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 42 ------------------- .../staging/rtl8723bs/include/rtl8723b_xmit.h | 1 - 3 files changed, 27 insertions(+), 44 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c index b11f4ab4a..9bb1fba5c 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -219,10 +219,36 @@ int rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmit s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) { - if (rtl8723bs_hal_xmit(padapter, pxmitframe)) + struct xmit_priv *pxmitpriv; + s32 err; + + pxmitframe->attrib.qsel = pxmitframe->attrib.priority; + pxmitpriv = &padapter->xmitpriv; + + if ( + (pxmitframe->frame_tag == DATA_FRAMETAG) && + (pxmitframe->attrib.ether_type != 0x0806) && + (pxmitframe->attrib.ether_type != 0x888e) && + (pxmitframe->attrib.dhcp_pkt != 1) + ) { + if (padapter->mlmepriv.link_detect_info.busy_traffic) + rtw_issue_addbareq_cmd(padapter, pxmitframe); + } + + spin_lock_bh(&pxmitpriv->lock); + err = rtw_xmitframe_enqueue(padapter, pxmitframe); + spin_unlock_bh(&pxmitpriv->lock); + if (err) { + rtw_free_xmitframe(pxmitpriv, pxmitframe); + + pxmitpriv->tx_drop++; return _FAIL; + } + + complete(&pxmitpriv->SdioXmitStart); return _SUCCESS; + } /* diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c index a4dfee1d4..2298c41df 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -453,48 +453,6 @@ s32 rtl8723bs_mgnt_xmit( return ret; } -/* - * Description: - *Handle xmitframe(packet) come from rtw_xmit() - * - * Return: - * true dump packet directly ok - * false enqueue, temporary can't transmit packets to hardware - */ -s32 rtl8723bs_hal_xmit( - struct adapter *padapter, struct xmit_frame *pxmitframe -) -{ - struct xmit_priv *pxmitpriv; - s32 err; - - pxmitframe->attrib.qsel = pxmitframe->attrib.priority; - pxmitpriv = &padapter->xmitpriv; - - if ( - (pxmitframe->frame_tag == DATA_FRAMETAG) && - (pxmitframe->attrib.ether_type != 0x0806) && - (pxmitframe->attrib.ether_type != 0x888e) && - (pxmitframe->attrib.dhcp_pkt != 1) - ) { - if (padapter->mlmepriv.link_detect_info.busy_traffic) - rtw_issue_addbareq_cmd(padapter, pxmitframe); - } - - spin_lock_bh(&pxmitpriv->lock); - err = rtw_xmitframe_enqueue(padapter, pxmitframe); - spin_unlock_bh(&pxmitpriv->lock); - if (err) { - rtw_free_xmitframe(pxmitpriv, pxmitframe); - - pxmitpriv->tx_drop++; - return true; - } - - complete(&pxmitpriv->SdioXmitStart); - - return false; -} /* * Return diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h index 8d6d6d2b7..157b2a808 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h @@ -409,7 +409,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter); u32 rtl8723bs_hal_deinit(struct adapter *padapter); s32 rtl8723bs_init_xmit_priv(struct adapter *padapter); void rtl8723bs_free_xmit_priv(struct adapter *padapter); -s32 rtl8723bs_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); s32 rtl8723bs_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter); int rtl8723bs_xmit_thread(void *context); -- 2.55.0