From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 D856848A2B4 for ; Wed, 15 Jul 2026 12:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119850; cv=none; b=mFbuO1uCaBh1aLsxmLHohlZyMY5sMvTJHOoBPAGr51P83OH8Ov9tHL1uI3QvAmltuQEvOaiRaFyfBl/4qCArcPbRO7Xe9f9GUYXRqfdg4IwhkrqnLXjyL2skAyFRNdah7WsLcfUm1LfRdjxtirw/0q9jFxxsaL0MMH4u4Qd+wbc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119850; c=relaxed/simple; bh=MLDCAjhau4+N8EDZSJMo7maYPptWbIlQKd6yEnP5wYU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E7GoxaiTxY6Mb+H/q3m9HRtXKcmkPkS32hxYJuoUUuok40SnXsf6vladAKEt4iJW3vholqIubiUOR+8IKh83mIBN2tFL2qJsV9uV/QYHur/DmzZbHqM9SUJq1laLawpXXhGWX1qQGKEEhP7pYxWnEVUhcMQBGb+qPIaMSRxVQgU= 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=OCpcSxAq; arc=none smtp.client-ip=209.85.167.43 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="OCpcSxAq" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5aeb2bc82ccso2685743e87.2 for ; Wed, 15 Jul 2026 05:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119843; x=1784724643; 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=DshzI76EE/QJT7xJTIgm81rXA61uLEsU1/ph4m1+q0M=; b=OCpcSxAq4hM31/KHyQ8m+MbCVy83sbT3uzFbwUOMGxtmY7Z5zaa8SYEPFIPof3+pje KZ3D4Ij62orJsZXN9G+5U6nAlIt4P9yFukHis92eU9nO2vZY4sfv0f5GYr+41g/TP5/n oVzu2vOHanfcVi8zIdTYj3T1DJTWgN8K+QCnGwK2MIVR5YhseBubfar3rQWPmTESkeNp 7d+3ie55JCzU7SnxcrQZSh5cfie3mZpsAzY2TRs2PdfVjKUqZ5oyhA5rgx0gi5xtWKxa 2T37mnx+sFJoUMOkhz1+Xt4RK/TS60l9ZG7EKw+F6KV8sYfCwqIygT9Fhom4CkVlve0r BT2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119843; x=1784724643; 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=DshzI76EE/QJT7xJTIgm81rXA61uLEsU1/ph4m1+q0M=; b=p0+tUsqlLvqxnt6zGgaMrSXAz2PahnvKZa2LCWjvYOM7LTapM2pioik6bYPu53oc7N komMGASRB0fLR/6/YgmvkDerEmdcZPrAItCFud96so7v+CplQ9weepNdRzFY2lIYNT8O iEV6PxOL7vvGNCcS9ghiEa6GQ0nEYPAYv7aci53kX2qw26U4qLUvcxqTGIiVFnlWdf1R OlqM/j9B40g9Tp94YzMTTBL1MJaLrtQUXFBp966+wHNplmSUXheE8tossaNvznDHBwpe sOPYr+vXrB6iMPRy3B2OgmJuq+wakI7o+VYz9rgToV6SHemP/CRY6T4NgZ4UA/6XX3rt bhgA== X-Forwarded-Encrypted: i=1; AHgh+RowAZujYiCosJEXJqGdlUXsXN+64VDEPHgjJT5/HPEAUR441MzxBv93KFeXSAWo/svMEUTVUAi1TO7yG9U=@vger.kernel.org X-Gm-Message-State: AOJu0YwrBH4D2oJ3du+VyfOEkxqWcUVRq6zgsXDHyI5MLrgjAC8rorph hhSfge7Te+b9ldHGlaGvDl4XIsZviEErZBC07B0zQzYiHrxTYtmVzOboTCnZjIyM2GA= X-Gm-Gg: AfdE7cmyPv3I4Feyp/vs6S8eoC20QU0nDdWaWQXyoplqzGpmsdAn66W9/bylq6yZ2ug cAJA+37kptM3QC3Y4zggMcyvuR6lEg5UPmaVnxqiZrJ0IzZ3qkbp3TwXgXoisMiaGvhJZxAeBZM NCYKvP1OmkOH8zU0zaBPAZeeDhqfNEBJ+ML5Oh7x+9q8mwOV/vxIlDjiQ9Vc5HVfVwBPz4yrtyq SWY6NQwT6EDKRwNjfVwsgyHrVA5Hha9LaNdKZ7zom5Z93Lmmy5A2u47m0ow8bZdYERZ3wDEMKIo UL/19Has3G85duLeFdUb9eoS693TF3sSiV5e0+8Zx4MZwNlOiKdC9dpdPX/MLKZoSwhXdNhLKGa M1pNeXnt9XbcS6F8RtaVNbGfElpvRNbY3w4bV65U3+BrsXiveWQ0nORqBNKCzr+eRUoyiP1qaiW QEELVr4YyGofrlecjF8F6dBKHg8NJXjDpwlZKs0ASz8WR0lUzI8VhKqCz5cZNmFPthmsxME4PpK Wy5avbLXafKFA== X-Received: by 2002:ac2:5686:0:b0:5b0:161f:8fc6 with SMTP id 2adb3069b0e04-5b02369d941mr3891332e87.40.1784119843154; Wed, 15 Jul 2026 05:50:43 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:42 -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 35/61] staging: rtl8723bs: inline _rtw_free_network_nolock into wrapper Date: Wed, 15 Jul 2026 19:48:03 +0700 Message-ID: <20260715124829.90290-36-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 Collapse the internal _rtw_free_network_nolock() helper function into its only external caller, rtw_free_network_nolock(). The separation between these two functions served no architectural purpose and only created unnecessary call overhead by extracting and passing the mlmepriv pointer. Inlining the logic simplifies the BSS network freeing path. Clean up the internal function definition, remove its prototype from the header file, and keep only the unified rtw_free_network_nolock() function. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 26 +++++++++----------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 0ec599383..1450589aa 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -198,20 +198,6 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor spin_unlock_bh(&free_queue->lock); } -void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork) -{ - struct __queue *free_queue = &pmlmepriv->free_bss_pool; - - if (!pnetwork) - return; - - if (pnetwork->fixed) - return; - - list_del_init(&pnetwork->list); - - list_add_tail(&pnetwork->list, get_list_head(free_queue)); -} /* * return the wlan_network with the matching addr @@ -300,7 +286,17 @@ u16 rtw_get_capability(struct wlan_bssid_ex *bss) void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork) { - _rtw_free_network_nolock(&padapter->mlmepriv, pnetwork); + struct __queue *free_queue = &padapter->mlmepriv.free_bss_pool; + + if (!pnetwork) + return; + + if (pnetwork->fixed) + return; + + list_del_init(&pnetwork->list); + + list_add_tail(&pnetwork->list, get_list_head(free_queue)); rtw_cfg80211_unlink_bss(padapter, pnetwork); } diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index 23c46df90..f15dfcac0 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -360,7 +360,6 @@ extern struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall); -extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork); extern struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr); @@ -395,4 +394,5 @@ int rtw_select_roaming_candidate(struct mlme_priv *pmlmepriv); void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta, u32 mstatus); void rtw_reset_securitypriv(struct adapter *adapter); +void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork); #endif /* __RTL871X_MLME_H_ */ -- 2.55.0