From nobody Sun Oct 5 20:15:21 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 BE08D4C62 for ; Wed, 30 Jul 2025 10:45:10 +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=1753872312; cv=none; b=TY+xDxnB1whLO4S/RSDkVnhCzgTegdebL1nj9yyI9SvrduTCeUX1tHaAzohyHRKZPbhNmFf7A1Dj9Lj/kqOaNvTqR/M+5H/Gd75J9febqlyZd1tgt43465ndhHarUl/5W3Ky40eTnmVWTQfnbJrB4F1dMy6G+B8uCrPMJpRyshs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872312; c=relaxed/simple; bh=L77oU8lZo3lzX41cIKGEPd9c8cdZbSewguoNoT1+x70=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bJvHNNx+JOisZWOh/yV15MKZ+wmvHt9/xCn2FLCFdtGIto0Sh7AXFpyCHoIWeWWWFf6XLilSBVnqZ925QpVD9YprwwvqylMcasJ2GapMgNUDXBY8NS+Id2j7dgArPDEHA7z5mIgb+rit9RkOA/bvJzrSvLStdpNr9029qmkvHf4= 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=DTuwxk5o; 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="DTuwxk5o" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-60c9d8a169bso10614380a12.1 for ; Wed, 30 Jul 2025 03:45:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753872309; x=1754477109; 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=AHtF4hBBASGxHUgQMYqKRKFf8D8GGRC79rjCKEZrjZg=; b=DTuwxk5oPre7a7Dq9/nzis5+PAWVpZcSY0NNjBqKGwa9OBLtnvWfuQHiiAR4tm1anR op61hI8oHPJjZBAT8J8AIbPj8b9wCKSRhApqeomhVheruNV+C9rhl5dQH34g/qI9HPxA DCi724wNAV+eI5IcZhfbjdwgh/gRNlHm/yo21UWJSpwalLPrt/pVbUmQkYU7zvUWR/2I P6hdyElAbE8TxPJ0hTYT6PPHz6hs8uJX9nMabCXNZOiuTwdYNwKJMWLivUMeWDhIQyM8 2DnZfEmcdKgfr6ZYJYd6CAwHGoBLEA8PmctjSJrJy7WnqQIxsCuP8l2cMiGiOLMxrRh0 LTdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753872309; x=1754477109; 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=AHtF4hBBASGxHUgQMYqKRKFf8D8GGRC79rjCKEZrjZg=; b=Uqup5GxSNy1bQQLuBOBMuG9mfdzHnLKXizaxvz8mhcvMhRP5CdeiEHK0xiH20nafLm GRP4NWmSvVJyq4vDUY3OfA72Zzn5LytYYOgTABgO32YErG73IoJ6ME50n7Vg8MP+/Rb9 yyyak4WmA1Yz4xSyQztUY2Osx7o0YDnoAEdjdNQ+KkqZlPbgadu8g779ILJG1SbaN2ib qsw0j1Pau5neFzjgXrwTQvRNgoQBof7UUEpeBSiOfU/lxBGzdNl7qFiUkrGGt0AwAjL1 6owVAqXGrBOgfNszE2eEgiYCJ605k6CB8i438lTh8UhQ4atP3Kfdd5Fhc+VjFPt5GLbf 9+wA== X-Forwarded-Encrypted: i=1; AJvYcCWb+5EUuPlKfpo4N7gAomPnkx8z7eSWzyOHBRoeof7b/2x2/ZL9CVLXAcdIxcGtjm4WJC2KrwI/QLizPpI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9rfrsnPdp+x3LEr5VfkfoARO75tDtGdbMMOgvX/ZR/pAXrFN+ TPTiekrfgsydQdFtVvH9pUEYjtRN58p2FSrZUpQxyKdpukAjaeW3Kpao X-Gm-Gg: ASbGncvqFh4HL7MFHaDg4hgHYYd3EW3JjG6pzP2R7mmG0oPqqyrmQw0MH8EIyhY8l7W 93E8A+qkNMUur71iPlu7scc/kx9W6NG3MCxo1WV7I6iSS7V+dQmKPWFImUvgrNM2WU1yoy53gr0 vpPCPQl5wESJNa0iMjifOpEP4RxUAQc8cgGVcHb0b82Xk/rkIVn21tYO+YZSyWdf/2JlUBuemsJ 1okpFeIZR/2zM1JxWZBT1BrVB+OIcW9xPS5bqJzBOP7+zZIzQd9TMCbVwcOgnlHUytZUnqZrf9f VWOsz/nXxi6c+N1zE3bE/IyC0DgWrFiHucriwYXn2JMMhPoTcpuI7Rnzk+LpuUD+3JV22G5ihXG QXnFsosSDZ/r+zFfJ3af/8aXaeq0N+5quaPO1oMYkPyf/BUC8+xqSYgizmHvqVje0UMk= X-Google-Smtp-Source: AGHT+IEtUMni+dyL/zZ5x2IMONY/kuNiW77XyB8eQcmhC0XIqdWrLXMCvMYcprCXdHoQpdcQCthApQ== X-Received: by 2002:a05:6402:520d:b0:612:cdb2:d4d7 with SMTP id 4fb4d7f45d1cf-61586f6213fmr2816821a12.15.1753872308995; Wed, 30 Jul 2025 03:45:08 -0700 (PDT) Received: from tumbleweed (ip-77-25-32-208.web.vodafone.de. [77.25.32.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6157974fde0sm1582734a12.7.2025.07.30.03.45.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 03:45:08 -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 1/8] staging: rtl8723bs: remove wrapper rtw_os_indicate_scan_done Date: Wed, 30 Jul 2025 12:44:54 +0200 Message-ID: <20250730104501.150270-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730104501.150270-1-straube.linux@gmail.com> References: <20250730104501.150270-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_os_indicate_scan_done is just a wrapper around rtw_cfg80211_indicate_scan_done. Use rtw_cfg80211_indicate_scan_done directly and remove the wrapper. Signed-off-by: Michael Straube --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/include/mlme_osdep.h | 1 - drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 692d0c2b766d..ebc4bd6ecce9 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -909,7 +909,7 @@ void rtw_indicate_disconnect(struct adapter *padapter) =20 inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) { - rtw_os_indicate_scan_done(padapter, aborted); + rtw_cfg80211_indicate_scan_done(padapter, aborted); =20 if ((!adapter_to_pwrctl(padapter)->bInSuspend) && (!check_fwstate(&padapter->mlmepriv, diff --git a/drivers/staging/rtl8723bs/include/mlme_osdep.h b/drivers/stagi= ng/rtl8723bs/include/mlme_osdep.h index f0d19637fb0f..c84c84c68286 100644 --- a/drivers/staging/rtl8723bs/include/mlme_osdep.h +++ b/drivers/staging/rtl8723bs/include/mlme_osdep.h @@ -11,7 +11,6 @@ extern void rtw_init_mlme_timer(struct adapter *padapter); extern void rtw_os_indicate_disconnect(struct adapter *adapter); extern void rtw_os_indicate_connect(struct adapter *adapter); -void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted); extern void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *se= c_ie); =20 void rtw_reset_securitypriv(struct adapter *adapter); diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/mlme_linux.c index fd4ae870a617..09bf363efa8b 100644 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c @@ -53,11 +53,6 @@ void rtw_os_indicate_connect(struct adapter *adapter) rtw_signal_process(adapter->pid[2], SIGALRM); } =20 -void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted) -{ - rtw_cfg80211_indicate_scan_done(padapter, aborted); -} - static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; void rtw_reset_securitypriv(struct adapter *adapter) { --=20 2.50.1 From nobody Sun Oct 5 20:15:21 2025 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 B044D1DE89A for ; Wed, 30 Jul 2025 10:45:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872313; cv=none; b=murkbBKp7Q2xcec+XbBrZhSrYeHZWie8sMSj0bz4aVDkF6+8A0LIT/ntU/sJSTBvn3NAlOreTlznZt4bZi7Qh6xlq8RAs7kicP1/ddKIzmQ5PugxibTBEw/nH2x/JrTXt8Et57ukQHJQ1Vh1kjD5ujZ0VJkbhnsO4jB5usruODI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872313; c=relaxed/simple; bh=lKDLjwohNLI+W0RVqk5eQdA2JB7DSrHHNZBj5lBAqxc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pn0ghYfzyiN6ObGxiBUWMMNBxq2dOJmQImbjIgNZp00VAB+S5oftWgigDnQSZeDO2ZQYQkRS3RIo3NLE8gLusLRbHOSskr499P2Lximk25k7fhIbl+bJk3uWgqLdTrVu/NFX97waN+2qmlRjBwFEmxpMNreOekbVl6MqnStR53k= 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=attlNOJR; arc=none smtp.client-ip=209.85.208.52 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="attlNOJR" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-61571192ba5so2346368a12.2 for ; Wed, 30 Jul 2025 03:45:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753872310; x=1754477110; 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=BhMrTUsGLhgSJHPnPXfJtTefZZIZgXJlXwMrdVYHlCU=; b=attlNOJRtFvJwll8rBrnEkXDctF9M2d+/AVHXtWskdgMSW1Av5dR43b2URG2m51aZm FMeIb7YwTBvjQXOl8zQvQ7LKHxmFH45YQrGR4V/s9vk2d8tdPPPlUShIBeEuEJ5i5usu jCQPNnYWLAV0acmg4K0HiXh2EfMq7l5KrwJ6w/+uGSp7T4AgxclP9nGZObfdTNtikyHa L9Z1fmkOcd4EZBJ2hKrrEInfUcXAXe4Mu313jlUJ/KTtd2Q2629aqUgHVJJYlH6iZ56t ImVct+8IH2GSwG4ZJsmn+6KRM4U3ll/NWVp+lI0MAN9jibP/UUbgHOBec+z6N2LfUhcF DotA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753872310; x=1754477110; 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=BhMrTUsGLhgSJHPnPXfJtTefZZIZgXJlXwMrdVYHlCU=; b=e6jNpfNeHeYT0JDIEQcuqQWWM9LpJJVL1IbYNCHPSbv8i0b8YSzq8TAbghZ7jjrzm6 LNrNLtr7IY2x8+PVwu4CTPmP4fuIM0dj3QR3HIo8LHwmC4peEQbAT4QL5+d7Uj975sHx jMVN3bYOq5ITTKOMlq6ebPeBqwI5YJYheCpAvk9+kb8CKsJaQw8MFHwNf0z3i8/nbGWX L8CRgYAwR+NRsRCEwcvaAmRiYfWly/HR2JSq06A28H0KsM8mNt8Kzln4/EWwnb+WR5nQ s+qMd4HH1d7cDwrTIYqx2XVdp5Bd3y8FBHiV5FmjXWRMo27dU2TVDtdHHrcgG+3BCt6q M0Rg== X-Forwarded-Encrypted: i=1; AJvYcCWObVVRPeDUjHK+02Uifupq01kNSK8h92avA7PF5gh4vc5RtcZeVl10O9DmSHW2kGIHCaSLSo/TZbaudS8=@vger.kernel.org X-Gm-Message-State: AOJu0YzGJ3/ekuV3giMhW+u0K917rQXyUQ/2SkLN+6iG1DKoaAo4xF4c iFYoIYALoxYMC0HBKC8K+QgeJpKdKh7ZrRllDMnDJ/OV2dsxQGahn+TB X-Gm-Gg: ASbGncvJAAnYr+33uJevq4fQWP/PFb//+jg896JpqRjoh4ToM718hp0x4ooIUa8FFTf TWpfq245jjldmKHtCXKIsS6SZJAodqo9p5W8Be1LSza3hLWcmyOdtzX2LQHBypGbl6Mvm3M+LZc s6vb+zOMFA3BDbAxuFII8cCjQWg0mXmYg/oozSdxAl/1NCAzQACJ8/1BBNJJsku13s0mian9cKT flUNTvnMBeIA+fXFWXuLPzBJNHWUSqkleJNuBsHJczTpEPQzADt36hCgFY1H2VT3dFQ1SXiG3pD vyg9fTFeTYs41wYB+80XfYXrrqVy6wTKT/QXbfv/egdciVWmMQokJfLCW6p2COkeuLjRhKZJ0M+ SAy+ryrcUMCbxyxHOKayQHDuHTBGHM5gwFBHmxnaGZ1qiL7kRgaOVSaCR X-Google-Smtp-Source: AGHT+IFl5bt0ZUUGxrvGIxVVDpix/kdV/nNNpynB66K5yBJja9o3i+UoUXrpiqXUsRGrAwqXDNHWRw== X-Received: by 2002:a05:6402:647:b0:612:bfb2:386 with SMTP id 4fb4d7f45d1cf-615871d4abfmr2659229a12.28.1753872309609; Wed, 30 Jul 2025 03:45:09 -0700 (PDT) Received: from tumbleweed (ip-77-25-32-208.web.vodafone.de. [77.25.32.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6157974fde0sm1582734a12.7.2025.07.30.03.45.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 03:45:09 -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 2/8] staging: rtl8723bs: move init_mlme_ext_timer to core/rtw_mlme_ext.c Date: Wed, 30 Jul 2025 12:44:55 +0200 Message-ID: <20250730104501.150270-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730104501.150270-1-straube.linux@gmail.com> References: <20250730104501.150270-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 init_mlme_ext_timer from os_dep/mlme_linux.c to core/rtw_mlme_ext.c to reduce code in the os_dep directory. Signed-off-by: Michael Straube --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 9 +++++++++ drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index bc980d21d50e..0e685c0f2f2f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -374,6 +374,15 @@ static u8 init_channel_set(struct adapter *padapter, u= 8 ChannelPlan, struct rt_c return chanset_size; } =20 +static void init_mlme_ext_timer(struct adapter *padapter) +{ + struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; + + timer_setup(&pmlmeext->survey_timer, survey_timer_hdl, 0); + timer_setup(&pmlmeext->link_timer, link_timer_hdl, 0); + timer_setup(&pmlmeext->sa_query_timer, sa_query_timer_hdl, 0); +} + void init_mlme_ext_priv(struct adapter *padapter) { struct registry_priv *pregistrypriv =3D &padapter->registrypriv; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 2080408743ef..58e2d8e159d6 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -426,7 +426,6 @@ void init_mlme_default_rate_set(struct adapter *padapte= r); void init_mlme_ext_priv(struct adapter *padapter); int init_hw_mlme_ext(struct adapter *padapter); void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext); -extern void init_mlme_ext_timer(struct adapter *padapter); extern void init_addba_retry_timer(struct adapter *padapter, struct sta_in= fo *psta); extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); =20 diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/mlme_linux.c index 09bf363efa8b..d22d6cf3cb11 100644 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c @@ -164,11 +164,3 @@ void init_addba_retry_timer(struct adapter *padapter, = struct sta_info *psta) timer_setup(&psta->addba_retry_timer, addba_timer_hdl, 0); } =20 -void init_mlme_ext_timer(struct adapter *padapter) -{ - struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; - - timer_setup(&pmlmeext->survey_timer, survey_timer_hdl, 0); - timer_setup(&pmlmeext->link_timer, link_timer_hdl, 0); - timer_setup(&pmlmeext->sa_query_timer, sa_query_timer_hdl, 0); -} --=20 2.50.1 From nobody Sun Oct 5 20:15:21 2025 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 44368265CA2 for ; Wed, 30 Jul 2025 10:45:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872315; cv=none; b=Lj4lDp8WKmE5apSLUGHTyd8/JW3mont0V2RArkxmNfUkcQ5AKVjZYIWr3ZUy+avmy8Fy1CXJQ68LmNv0GMTWjto5UlnlRd5eve95FA2hwQfT5Q0UoGKcazH2fGUdiHrEahL2Nu2IU71Ifhe3wXao5cEPaJutk6sqw1QIKOhGnfk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872315; c=relaxed/simple; bh=4WM+PaTJkQfWtbrVRkv8jeEKfAmMzADF55xsjqGy7qE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SbJBb0CW1kYabQPiPLJJWlG5792jZKH8sAL3th46l0VM/O/ANe7Ybr+YuTsxepJiuIAvL8pE4NuVtdCGjfD39W6TBdfvL3UJHszVjwFHY5A15rg5OjI0cu2OALEqryNaAEJuP9cflfvrVFz6sQuIdDczZThs5e/FtQZFpKRNVTs= 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=SvBeXTvi; arc=none smtp.client-ip=209.85.208.42 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="SvBeXTvi" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-60c5b8ee2d9so1661146a12.2 for ; Wed, 30 Jul 2025 03:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753872311; x=1754477111; 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=G3ApnJqgQPyyaOo/pksd04vUviI4gdkXDx5i9fd+KII=; b=SvBeXTviK4Pe4a4ylWzIlfJ0yf1jK6XLpopdPVTG8npderHF6m61us1nyXvOC7Z7uW toCLVUwJVBVaw6XHfZZ5j2++jvuCZkFhbLcEg8IYr2IJXsq9k5ivlAxez2nRAJDjnIsH rDOgAp4Iyx4Ek0UkaCNwKfMk3tEdjXeOv18d77lzzxAY7/66nH4/GdssQb//X8i740Od 5++N/9NUCILltyrlMKZamWncipx2/nJsFBGGEQVdTbDz4u5IudMCGFOu6C6gRuue2XyK 5AoPaw4v/wrkmzbTwlHtRN18yE8Yq/J26oz2LoF0eP1mwjPbuI902Z5xaj/Z/9q3c7Id AZNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753872311; x=1754477111; 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=G3ApnJqgQPyyaOo/pksd04vUviI4gdkXDx5i9fd+KII=; b=sou8L6Ksvn00jKVywMmN3jezPEj0FOYhwzOKVrEb7yUJax0OKM9ItiE8Nxx4hvtRkk DZLNqnOAIWzhE3qJ1xvlUVwSvjDQbd2mzamp/SmKYhgLxnSpEJc52ZHDJCaG5ZhyEnG/ BYeLm9o1Nn83JgF8O9CZ3ckoLyc/zl8gJgbK6d7vIngnW3znPtLFuJZZY0g73rTQRyrT MSF/BLOF/ZdPVWQi114wHAzgKTbe5S15PML6yp4dwuR/0xzw/LVDVCL+FEwJJ3BbwSxK vVLLTj9ejhKlBUG52AxmtqbPaNnQBVrkKDLp6Bia5LHveDJjI1uaQGV4x4FIEiVlRJ9+ E5qw== X-Forwarded-Encrypted: i=1; AJvYcCWU2cB9w75n9EMPxuDCKeiCkrB5am1Z4/A6x4mzoMMONZMshQJf6/qRKL4JnP/nXo6KsnJ/E1OUcziDab4=@vger.kernel.org X-Gm-Message-State: AOJu0YzoKh8nJFW891uAuSLKVQISMQF4lG2jChVEx678thU3jIUtXEy5 tpnFlJYJYFkWJmgG9kVbDVRkMZ5PbvgW+Y4UbNknPfAQBeNsDodtcu+Z X-Gm-Gg: ASbGncu6KI5SJCqkcrmnQKlsFT1MuE0knC6nBXvky57OX7kX7Wlj2L3kgc4bmh+gRPq OvzQRdwGWaHF8rFcIrf8UNgFYcCMGc5XzcUXoBX7AzpQGybqPoR3Yodqf8lMUF7/xG0KKmvOo9w KDkbI4iSq386w/Enitkf7ie6kTYHIYv3Z0MYCWoDhYtgGhHc/qt5KQV5JV5li2iGwx9/JuAtwrV 5Dxljrxo7fX6Mg/nXuu4XqEUeuHwjjzkV3FngtdKxYwqsp7cKUaU7M3sbrxc4l9Y9JEl3wBPgtu dXVrfAsIcOB43ZadKZfvctOihQq6vWAHkfFwHuMCXaqia0AtijjufsCs+bYFN+kMUFE6eY2nqkl cfz6Ggg9EWFpEkQEZFQ/lPKfRWUlNZP5giT8nfL0a0McyjhPhhlGWOlmo X-Google-Smtp-Source: AGHT+IFTVX6XeKgtp2r4MdAeKZJlv6B2mqWPnNL5IkVLc/0B1kD4lBQR1D9Vcurb6gmXImN8GTYAMA== X-Received: by 2002:a05:6402:2813:b0:615:539b:7acf with SMTP id 4fb4d7f45d1cf-61586ec404cmr3036405a12.2.1753872310269; Wed, 30 Jul 2025 03:45:10 -0700 (PDT) Received: from tumbleweed (ip-77-25-32-208.web.vodafone.de. [77.25.32.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6157974fde0sm1582734a12.7.2025.07.30.03.45.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 03:45:09 -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 3/8] staging: rtl8723bs: move rtw_init_mlme_timer to core/rtw_mlme.c Date: Wed, 30 Jul 2025 12:44:56 +0200 Message-ID: <20250730104501.150270-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730104501.150270-1-straube.linux@gmail.com> References: <20250730104501.150270-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_init_mlme_timer from os_dep/mlme_linux.c to core/rtw_mlme.c to reduce code in the os_dep directory. Signed-off-by: Michael Straube --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 30 +++++++++++++++++++ .../staging/rtl8723bs/include/mlme_osdep.h | 1 - drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 30 ------------------- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index ebc4bd6ecce9..bc74c7838a3b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -9,6 +9,36 @@ #include #include =20 +static void _dynamic_check_timer_handler(struct timer_list *t) +{ + struct adapter *adapter =3D + timer_container_of(adapter, t, mlmepriv.dynamic_chk_timer); + + rtw_dynamic_check_timer_handler(adapter); + + _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000); +} + +static void _rtw_set_scan_deny_timer_hdl(struct timer_list *t) +{ + struct adapter *adapter =3D + timer_container_of(adapter, t, mlmepriv.set_scan_deny_timer); + + rtw_clear_scan_deny(adapter); +} + +static void rtw_init_mlme_timer(struct adapter *padapter) +{ + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + + timer_setup(&pmlmepriv->assoc_timer, _rtw_join_timeout_handler, 0); + timer_setup(&pmlmepriv->scan_to_timer, rtw_scan_timeout_handler, 0); + timer_setup(&pmlmepriv->dynamic_chk_timer, + _dynamic_check_timer_handler, 0); + timer_setup(&pmlmepriv->set_scan_deny_timer, + _rtw_set_scan_deny_timer_hdl, 0); +} + int rtw_init_mlme_priv(struct adapter *padapter) { int i; diff --git a/drivers/staging/rtl8723bs/include/mlme_osdep.h b/drivers/stagi= ng/rtl8723bs/include/mlme_osdep.h index c84c84c68286..4bb7a01caf4a 100644 --- a/drivers/staging/rtl8723bs/include/mlme_osdep.h +++ b/drivers/staging/rtl8723bs/include/mlme_osdep.h @@ -8,7 +8,6 @@ #define __MLME_OSDEP_H_ =20 =20 -extern void rtw_init_mlme_timer(struct adapter *padapter); extern void rtw_os_indicate_disconnect(struct adapter *adapter); extern void rtw_os_indicate_connect(struct adapter *adapter); extern void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *se= c_ie); diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/mlme_linux.c index d22d6cf3cb11..5cb27ddab769 100644 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c @@ -6,36 +6,6 @@ *************************************************************************= *****/ #include =20 -static void _dynamic_check_timer_handler(struct timer_list *t) -{ - struct adapter *adapter =3D - timer_container_of(adapter, t, mlmepriv.dynamic_chk_timer); - - rtw_dynamic_check_timer_handler(adapter); - - _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000); -} - -static void _rtw_set_scan_deny_timer_hdl(struct timer_list *t) -{ - struct adapter *adapter =3D - timer_container_of(adapter, t, mlmepriv.set_scan_deny_timer); - - rtw_clear_scan_deny(adapter); -} - -void rtw_init_mlme_timer(struct adapter *padapter) -{ - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - - timer_setup(&pmlmepriv->assoc_timer, _rtw_join_timeout_handler, 0); - timer_setup(&pmlmepriv->scan_to_timer, rtw_scan_timeout_handler, 0); - timer_setup(&pmlmepriv->dynamic_chk_timer, - _dynamic_check_timer_handler, 0); - timer_setup(&pmlmepriv->set_scan_deny_timer, - _rtw_set_scan_deny_timer_hdl, 0); -} - void rtw_os_indicate_connect(struct adapter *adapter) { struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); --=20 2.50.1 From nobody Sun Oct 5 20:15:21 2025 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.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 C4EDD27EFE9 for ; Wed, 30 Jul 2025 10:45:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872314; cv=none; b=QwTl5ouftjYvq/p2gpRZCmUuDsaeH/3oz+FR2RVxmsHCJHxZKYjAnXXmvfwdgl+Xiu6v3TfgTBF6cztZz9hdvxW38iozKcBOgWDTnMj2ye37kTFTu5rZrrOP/EZQ7nqlK09qZuEmR9oGieZeLk7HclLzsKgdV4lAJAl9rzTWie4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872314; c=relaxed/simple; bh=8qVfwXrBqCmLZDZqxF4HwJyyC4wmuBrsGi+vbFP9NzA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MWbiQCPJRTC31ODW7uB9MhgmGb3D3uhWoyvBnOl5KIQ6dEFhrBzLeG0ghw9E9PV6QimPQSEe4VyN88Azp685HNJPP1YyOdrVEh/fKGay55ri9MhLwUDhfwfhKPMiJtCdsvWVWYqBicVgLwjoMfDogvtwtjW5PV12tSQcXrzBjjo= 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=KOR5xh9N; arc=none smtp.client-ip=209.85.208.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="KOR5xh9N" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-61571192ba5so2346413a12.2 for ; Wed, 30 Jul 2025 03:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753872311; x=1754477111; 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=pnv2SMLij4R2x+6MFia53n0KBrG4Etb1tcinc9nWT1k=; b=KOR5xh9Nq4nsyMQ4uK/qemB3tVBZqRgUWJNpZb92ueii2YYyzcVqr9unm9NiMXPY53 RIW9EPFdYDmvQ80rq7D2eOQ5LXNuvsZUG3D+NeOG+GsEa2bd4Ph9dDJEpg9+GmcvtqeU bA6XEtPiyEant8RNXNTwmfcfhstYmxkNpfGF87A/XKYb2gRuTy8vdr1BAhi3Wym/vIMF 31BgPp2P8vfrpYqXL3k7DAN4O5vy1pn0O10CSu8YqaSb446xxLkx8zQviopGX+Kna4WV iQsZ+IvEd83ysSzJ2AUT41jGSo2ERxyeGD2w0Cjfo99/jLt3hxOs7QoYXXgUuS0sG9kP b2/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753872311; x=1754477111; 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=pnv2SMLij4R2x+6MFia53n0KBrG4Etb1tcinc9nWT1k=; b=I0h0+1B7QM+0WrmxXgfwv1ibHs3On2cUD327JOOR6e4bnvG+nTvANCbqqxP8hbcj82 kpXo9WTRqo2feoPOpxRAoT1iXawnv7Rbz9EMtmu5eE31VrYhUmGX5OGbZ88DhfbLeaH5 QE3/2M/sBLoQNd/83FsCdK03ey3o/prHuJi7RY1fX2TWXVTvR5pG52/PmxOAAOr4T1t0 4mqi0VQdKGppL9K6VITyUegXzS672Jn4bSjNqjZJMAMV4BidDGPcbEczGFO+iha6rbVY 6ITqGiofbXiw0Fdk3kKLjw3MkGFxDld9y1uTkY7Y+fr1lzDBZflGC0EWZNpVlWtTJ67U vPJw== X-Forwarded-Encrypted: i=1; AJvYcCVcEwhQiEXaxxlAvJv4H5p9ulO+q4Wsopelh1IC8MdC/2XpeMylz1yvjdy14nnrau13Hy+AzZlyqRBO6vw=@vger.kernel.org X-Gm-Message-State: AOJu0YwN89L/J4qKjsLdHJJ0C0dbZNXxZZKK2bPves+Y524qXNvqXhGN FKgXyMNuxolQbQ7me2efXp591eVoD/TtUOwVcHNV2JrCaYg4/oKFF+1k X-Gm-Gg: ASbGncs4ojh0EOmo1BdoM451w+qS44FNQOb/Skns9OCW6LK0IcwfsRSHjZBn4NQMxYc DK694lfwhnYDC/EyteT3lw6NsMwW7yhed5lATNKhFuyoYZhPPTh5qkYrxZYHJ1dAkyoDWX3KshO Wvedj1myW03jNieCCwiprzTZm24MqWFbQML8VdGnEhhn0Q3hXPVUc2qO3CsBb3yBlZq6//eJUdr G/0VSObQecmySAyztruBApJ2jf08C5ryPkzmOON2W5Pne8g+5IQvmunKkf2XYuOiAjIFDtcbNB7 zjOY77LydrPjtwL6Rz/tBWSW8xp4yw6pFukEmsIlI7TEODiw6vpOe+jpmPJiHe4Uex9wm68cyie eLQus+cjg5xSJ02phOZ51ZxE7KWPXjDkh/vOtMVVRTkn8K1yVK1mHM67m X-Google-Smtp-Source: AGHT+IGwYX8VOf2KNXwLlB+LqJ+dsXg5j0rCI21X0ePacfGNTJrhJYQk2+N4KAF/yr+aPDRG65amfA== X-Received: by 2002:aa7:c453:0:b0:615:6138:f702 with SMTP id 4fb4d7f45d1cf-615871d33e4mr2720671a12.26.1753872310976; Wed, 30 Jul 2025 03:45:10 -0700 (PDT) Received: from tumbleweed (ip-77-25-32-208.web.vodafone.de. [77.25.32.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6157974fde0sm1582734a12.7.2025.07.30.03.45.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 03:45: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 4/8] staging: rtl8723bs: remove wrapper init_addba_retry_timer Date: Wed, 30 Jul 2025 12:44:57 +0200 Message-ID: <20250730104501.150270-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730104501.150270-1-straube.linux@gmail.com> References: <20250730104501.150270-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 init_addba_retry_timer is just a wrapper around timer_setup. Remove the wrapper and use timer_setup directly. Signed-off-by: Michael Straube --- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c b/drivers/staging= /rtl8723bs/core/rtw_sta_mgt.c index 1d2b53c76afc..4d51e6993ca2 100644 --- a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +++ b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c @@ -229,7 +229,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pst= apriv, u8 *hwaddr) for (i =3D 0; i < 16; i++) memcpy(&psta->sta_recvpriv.rxcache.tid_rxseq[i], &wRxSeqInitialValue, 2= ); =20 - init_addba_retry_timer(pstapriv->padapter, psta); + timer_setup(&psta->addba_retry_timer, addba_timer_hdl, 0); =20 /* for A-MPDU Rx reordering buffer control */ for (i =3D 0; i < 16 ; i++) { diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 58e2d8e159d6..53fac838c36a 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -426,7 +426,6 @@ void init_mlme_default_rate_set(struct adapter *padapte= r); void init_mlme_ext_priv(struct adapter *padapter); int init_hw_mlme_ext(struct adapter *padapter); void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext); -extern void init_addba_retry_timer(struct adapter *padapter, struct sta_in= fo *psta); extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); =20 /* void fill_fwpriv(struct adapter *padapter, struct fw_priv *pfwpriv); */ diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/mlme_linux.c index 5cb27ddab769..f85e17ae0e7f 100644 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c @@ -128,9 +128,3 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 auth= mode, u8 *sec_ie) kfree(buff); } } - -void init_addba_retry_timer(struct adapter *padapter, struct sta_info *pst= a) -{ - timer_setup(&psta->addba_retry_timer, addba_timer_hdl, 0); -} - --=20 2.50.1 From nobody Sun Oct 5 20:15:21 2025 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.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 9D6EE2949F2 for ; Wed, 30 Jul 2025 10:45:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872315; cv=none; b=m/e+EJCzl5qHk5gy7OEqx/8dz8+xsDa1xgaw2XYwjZQKzcOW5huS8ZRrk6iL07L3SZqvXRZ60TGQcsL8TK0TS8OCJJ4ez9QeRjEuOn1O+q5qmA5MXaSBj+s4y32BjOHEihSIYd4Z8iumP+XeUjmagJExvAu/9I6RAfVTlxOUaQU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872315; c=relaxed/simple; bh=213EVC+0UVwqwh4SAqNbTXFElUgCZw5dNB4DgvuHqj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JxDlyNFBW+nxxNDIdsF0jSjJdPwHzSszUoR92+BzS+OpodTrmaZCDgPE0fA7T94nIo8OUhJDQN7+rC6ZbD+EkROS3LWagE37jmZtzGUAjp/PuskYhBMJt+JH5CUgooWkH7GgVk5SgQ3ALrvX0SsAcaXvNLWx+eJSylFzGJojMuk= 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=CyuCR0sl; arc=none smtp.client-ip=209.85.208.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="CyuCR0sl" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-6157c81ff9eso2085920a12.3 for ; Wed, 30 Jul 2025 03:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753872312; x=1754477112; 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=Wp2PMrXLI/gbGEVH6n9WhPc+A6Nzp3ouOjOI/qshZbo=; b=CyuCR0slAWDjkWw97H4hwBUx2apFZkflfIdGNMwo6LkWJEaLVoqpK1NNRQy22UgrNk VPBoLRt/drC5VGi1pXlbLZd5E3bbWe3TFQlRYaxyMn8KJ4JzacIaTcUjJ5lPO9VG4jBE cizVvnwRpKDeLGEs8yXaRUB8yMnXOThdwL4/Z+KhjA9yySuJPkDvdz30zAIVCpVP+g2R wO/ybVvQcCx2U+i+yUVh8sUQK/hteVbjF1TmNuFqi5R7ARIaMZcPFyNBlszJbcu4RyL1 WtvHcdA9C3MpjZy0hWyKJMj6rpQLBX+Vg9yGGBcEF9oDJqY3qskkshY4K15i3kWXxwvG XpVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753872312; x=1754477112; 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=Wp2PMrXLI/gbGEVH6n9WhPc+A6Nzp3ouOjOI/qshZbo=; b=cYFBdKuj+z4TVXQrEAiezDwL8rKaa4q04WgNmW4Mzo68HKU1sqIAB+IyQNJYNTvc03 D/WeAvCvW+q4PECbeTzyJprlIe/YjqDpGhPV9RoNrWs2S7/lyjetaLbNfxTLGHEQ5fql aQkosVexYfd7puhGXc3/51e2AfxWUDJOEsIr9eD5QkHVt4kl0JSA9VooGEMILGZQSgNm dsenq6a1xfAM7/xeftoVUzR/MVmGkichCFLnzmGx6dFhEVnLxYh3TW0Xq/Iy0I8Y6PNe cWP1HIW2wMMTARh5Ee0Nc1HVnFryF7T4OK/ejWE0jCJkWd/wvCZgwgav9RGw8NaD4BZV aFvw== X-Forwarded-Encrypted: i=1; AJvYcCUQlkBT4bssNXOAbWBNpHih72RL28bJhoVq56mYR9pVfkjfBsMv0p4OgO7Ic9SvygV8q+1n4ievqA3rGoo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5MMzVf9XTrKUhWQx5HDTNQx4IR+vv52CjBUvay/7E8/SA72LD YnBH3MYUEF4O0+a+r10qlbiJEKRJtUgfmYl5xu7zP+hyuzl15yeH+s3K X-Gm-Gg: ASbGncsiwAQmE7a1KwSdgN9sPMXcHCR11Fbod8NYGhf3X8zieYKVvV1voykWNnfB2JM Grdn28SJL3DzvSH2AB8TJBCaqiT5vAsZGRYMiMoDIihNiqNkUeinj6M3ShnpgNr9uuol2K8tBTy hxYOoI6tcRFPqDCjT4WlJvQPFC++C4B1o8JREONFsY/fKcXt5Qu9D8k6/J4PP+mVulBVcZZkZe2 ghxqCrUQYNegKyzlgPwTViWJnvPEUvWkdg2NVmECncT8ikDcEteUG4NVvRYrM3/i7XXiki8Loz2 QmQk6QlfB68UmED6WoaKLQROsaSLs8CCsd3WLyVaJhqcsh8nH6HBxT0/5U9Knbg/mUxPgRxWNzc vA2IN6ur65hYQidwkFBSSRz3u7WnM5U8MpljY8jNu4jwqfcxXq/6MDQlMeMP1SIrQyeY= X-Google-Smtp-Source: AGHT+IHq3jDlrsvJ/ol1RfNeI83klIIU/EwAubIlTAI7K4FGKPInNe5pZk7IDHPVEm86DyphLjKVyw== X-Received: by 2002:a05:6402:51cd:b0:615:87a6:58a7 with SMTP id 4fb4d7f45d1cf-61587b5a205mr3216376a12.33.1753872311530; Wed, 30 Jul 2025 03:45:11 -0700 (PDT) Received: from tumbleweed (ip-77-25-32-208.web.vodafone.de. [77.25.32.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6157974fde0sm1582734a12.7.2025.07.30.03.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 03:45: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 5/8] staging: rtl8723bs: merge rtw_os_indicate_connect into rtw_indicate_connect Date: Wed, 30 Jul 2025 12:44:58 +0200 Message-ID: <20250730104501.150270-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730104501.150270-1-straube.linux@gmail.com> References: <20250730104501.150270-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 the function rtw_os_indicate_connect into the function rtw_indicate_connect to reduce code in the os_dep directory. Signed-off-by: Michael Straube --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 13 +++++++++++-- drivers/staging/rtl8723bs/include/mlme_osdep.h | 1 - drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 17 ----------------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index bc74c7838a3b..38238ea5ec99 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -901,12 +901,21 @@ void rtw_indicate_connect(struct adapter *padapter) =20 set_fwstate(pmlmepriv, _FW_LINKED); =20 - rtw_os_indicate_connect(padapter); + if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { + rtw_cfg80211_ibss_indicate_connect(padapter); + } else { + rtw_cfg80211_indicate_connect(padapter); + } + + netif_carrier_on(padapter->pnetdev); + + if (padapter->pid[2] !=3D 0) + rtw_signal_process(padapter->pid[2], SIGALRM); } =20 rtw_set_to_roam(padapter, 0); rtw_set_scan_deny(padapter, 3000); - } =20 /* diff --git a/drivers/staging/rtl8723bs/include/mlme_osdep.h b/drivers/stagi= ng/rtl8723bs/include/mlme_osdep.h index 4bb7a01caf4a..00c0a44c125a 100644 --- a/drivers/staging/rtl8723bs/include/mlme_osdep.h +++ b/drivers/staging/rtl8723bs/include/mlme_osdep.h @@ -9,7 +9,6 @@ =20 =20 extern void rtw_os_indicate_disconnect(struct adapter *adapter); -extern void rtw_os_indicate_connect(struct adapter *adapter); extern void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *se= c_ie); =20 void rtw_reset_securitypriv(struct adapter *adapter); diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/mlme_linux.c index f85e17ae0e7f..326acbd8dc84 100644 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c @@ -6,23 +6,6 @@ *************************************************************************= *****/ #include =20 -void rtw_os_indicate_connect(struct adapter *adapter) -{ - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); - - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) { - rtw_cfg80211_ibss_indicate_connect(adapter); - } else { - rtw_cfg80211_indicate_connect(adapter); - } - - netif_carrier_on(adapter->pnetdev); - - if (adapter->pid[2] !=3D 0) - rtw_signal_process(adapter->pid[2], SIGALRM); -} - static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; void rtw_reset_securitypriv(struct adapter *adapter) { --=20 2.50.1 From nobody Sun Oct 5 20:15:21 2025 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.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 0D0572949E0 for ; Wed, 30 Jul 2025 10:45:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872317; cv=none; b=GsNwZkI1Ufl8QIZunDFsZ2g7vxf+mIJ1UsjmvzJlnoaBqhNsIyr6F5/k/aMgCIV2+yyIyFU00zJzLJ0aL1OLvLkodKoos62YL3SN7KntFwyFGSoYiUtN7lc9g9SbI0o2yFKEALRXxxPUCCPiPDXZj2pJIdXUbIlPxvOELr/R5lM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872317; c=relaxed/simple; bh=fwh6BBb1oPpBjnAuFQhlbe/p9oFK7aX4uP4YTtMMkRc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eMtbWT7VxMympJGASpd86sSFTAiWeZeE90Tl4gmisXLNpaoxnXpED1Uft0Kw0XaB5XLD8p5vhg/amclMWWgANBL3OBT/u6dMhFPZXI/NGZLk608hFirkGiRpX9C72XuURSKXEdM7XJrTJjFw2DdQeBofs/MkFkhYNHDS0c20Mmc= 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=HBI25W6c; arc=none smtp.client-ip=209.85.208.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="HBI25W6c" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-61521cd7be2so4829579a12.3 for ; Wed, 30 Jul 2025 03:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753872312; x=1754477112; 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=gD7P+A/dPPOpT95JlWf4RUNkIaG+iReLqz+c8wdRhiw=; b=HBI25W6cw4RKllOMGRw4U677hJTwB6s1Rp8q8A0e1Ak5LH/CiwJAtxIM0KASgRe4rA kh0IsL8k/PBn4eiAUNLHHOGpsYIXMuf54/LmWFjSmJvZ1ivpPfjPKPtXtFuTIA7pf6y8 qTz8ERgAt79Z1WBm3ccAq+p1FVspOH4Wf4Ve36wXUCD3yOtp9zNhOPyFFW3ucftXDJuG nbaCsTKomXXmr8MyhPxzenhSGu/ivxjgEllTDKG79IRspa0/leePayQtgZJlOWOzEy8D lbI+wx/Hne2Ly7D3ZrP4YAhU7+b1cEnWjYHTXZKdDGNXaXTMxOlnbEK4CaZtO97y9LwF 6hgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753872312; x=1754477112; 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=gD7P+A/dPPOpT95JlWf4RUNkIaG+iReLqz+c8wdRhiw=; b=m40n+NBqLeFriTx6fqxLZ/7DBDbUF9Oj4hkmtD9AhLUkoWOqp9ahptfvl2reNWDGWF WrWqydDcxL5I7UGSR32e6V9LDnWZGrEO7ik624pYjASP3L50QUaJo/b1uOekGRYlRUdQ 7lbMCVdXggcwXvJkAxloPCHd6Bo40tVJfAdmbpAPMOv61xp/qUzElvlbSDrPU0n6lVv9 KQzNC/1i1/KQZH4VBSDP8+mwIOr/DEp8bvF9elQBMu+pTMBD0YA3iwKL87lAuClvzdew 29Se6KM7v3VEOBt8rk6oOqcFJeMwL+hwtwu9GCfcf6BlhdS/ZCzqe4DEvKNzsgw0qBV+ 3xdg== X-Forwarded-Encrypted: i=1; AJvYcCVeiNeLYg98svZkzu+y3pje01TSJGmBd3xU/D30aldxZ8aU9aNglBqxaVr99w8vVUEY1WCqLkXutmRcSD0=@vger.kernel.org X-Gm-Message-State: AOJu0YyIxRmr4evzEOHL7xCqC5Ls1rjdumJNSFrRlzMF2iGDFyQfi7fK mfgyLastgs6rCfDG5A3X82Ex39fQ6I9ugNqkqtb6+/Vj4DeBqaMXa6y8 X-Gm-Gg: ASbGncu7uVdwNdOFCzjFFqiCoOOZ5a9+Yi+5YqutrZAh+Vj1VoYNurtmoSh9rpoYOaT a17k8E/3HTGbsbNRPtIJ7SQ6cnv78uIuDIxEidP11LMaG8NQtnvV1NLQgW3JtzXg62zWVrIftf3 s+SIb+CfOJaw2g4N80Y50oj1z6FQDgsHbFRYEhxsgfGwtwPx88devFSw+MrbZiRHoYJhSjscwZZ iEzxvGGCgBnUadjWEc5020Hty1Bkh6X3ReFKnbQaRhf9dVPEtldXIdxV9tcfnetnL63VQMny0SU S1Zaeez0it86oC+KdCG1j+NX5XRm+Enfwqzgphf9xgPKTZbIwEKCjqgDVcI5NhkhsAlse/9jPUe 0IxLIy6+bC9sCw6kj1/hYkaynxjpQsF9X0NEclKFNy9pT9MlJDf/kLoXv X-Google-Smtp-Source: AGHT+IGpHLLmmk9Td6T7DijXaBzDDXhnBjG/5PT9Z+sbGUV25oV0DkzwZaprzzQBGuKKiMQcuzrwvw== X-Received: by 2002:a05:6402:5108:b0:615:6481:d1c with SMTP id 4fb4d7f45d1cf-61586ec9a54mr2432690a12.1.1753872312170; Wed, 30 Jul 2025 03:45:12 -0700 (PDT) Received: from tumbleweed (ip-77-25-32-208.web.vodafone.de. [77.25.32.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6157974fde0sm1582734a12.7.2025.07.30.03.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 03:45: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 6/8] staging: rtl8723bs: merge rtw_os_indicate_disconnect into rtw_indicate_disconnect Date: Wed, 30 Jul 2025 12:44:59 +0200 Message-ID: <20250730104501.150270-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730104501.150270-1-straube.linux@gmail.com> References: <20250730104501.150270-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 the function rtw_os_indicate_disconnect into the function rtw_indicate_disconnect to reduce code in the os_dep directory. Signed-off-by: Michael Straube --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 12 ++++++++---- drivers/staging/rtl8723bs/include/mlme_osdep.h | 1 - drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 12 ------------ 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 38238ea5ec99..27f775d8f9a8 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -930,10 +930,14 @@ void rtw_indicate_disconnect(struct adapter *padapter) if (rtw_to_roam(padapter) > 0) _clr_fwstate_(pmlmepriv, _FW_LINKED); =20 - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) - || (rtw_to_roam(padapter) <=3D 0) - ) { - rtw_os_indicate_disconnect(padapter); + if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || rtw_to_roam(padapte= r) <=3D 0) { + /* Do it first for tx broadcast pkt after disconnection issue! */ + netif_carrier_off(padapter->pnetdev); + + rtw_cfg80211_indicate_disconnect(padapter); + + /* modify for CONFIG_IEEE80211W, none 11w also can use the same command = */ + rtw_reset_securitypriv_cmd(padapter); =20 /* set ips_deny_time to avoid enter IPS before LPS leave */ rtw_set_ips_deny(padapter, 3000); diff --git a/drivers/staging/rtl8723bs/include/mlme_osdep.h b/drivers/stagi= ng/rtl8723bs/include/mlme_osdep.h index 00c0a44c125a..8e8b5de285dc 100644 --- a/drivers/staging/rtl8723bs/include/mlme_osdep.h +++ b/drivers/staging/rtl8723bs/include/mlme_osdep.h @@ -8,7 +8,6 @@ #define __MLME_OSDEP_H_ =20 =20 -extern void rtw_os_indicate_disconnect(struct adapter *adapter); extern void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *se= c_ie); =20 void rtw_reset_securitypriv(struct adapter *adapter); diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/mlme_linux.c index 326acbd8dc84..d2f4855e9d9d 100644 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c @@ -66,18 +66,6 @@ void rtw_reset_securitypriv(struct adapter *adapter) spin_unlock_bh(&adapter->security_key_mutex); } =20 -void rtw_os_indicate_disconnect(struct adapter *adapter) -{ - /* struct rt_pmkid_list backupPMKIDList[ NUM_PMKID_CACHE ]; */ - - netif_carrier_off(adapter->pnetdev); /* Do it first for tx broadcast pkt= after disconnection issue! */ - - rtw_cfg80211_indicate_disconnect(adapter); - - /* modify for CONFIG_IEEE80211W, none 11w also can use the same command */ - rtw_reset_securitypriv_cmd(adapter); -} - void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie) { uint len; --=20 2.50.1 From nobody Sun Oct 5 20:15:21 2025 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.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 B224B2951C8 for ; Wed, 30 Jul 2025 10:45:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872316; cv=none; b=psJtAZ76JmhkuoBDjZ4FknYq9WVWyLb/PJ7qY7obfokLQl2eBp0GrId1Fx8F8gXl6876pGIsCJsTgMeWyvxPx9S2Uf+Ub1aU70DRnXBUOhoaBXrhoKg+ulo/WITlHJKx/LtVOyJ/TjlwLnH7ZHx7zHUpHmQNQwMI9wqoFMGrdkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872316; c=relaxed/simple; bh=1k5ncuPLYLjmJSNvSn6S3vq7O1Ze6ESSHk8F+Z6n0nI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rik/mtlKI+/xS6FpzFZVfUzDvNGm3KGbnFblEJjZtZHqUrpBV75qEDrew6GRADS67xJpjjL3cIpADQLS3GiG1h8klUVfP669kJlqZPKGRdvguxa3VBjv5zNmcZSTdWBvUR9BlhYesq4e/wMvKxY8VUi8GrrJMNeD8IXC4o5Lxo8= 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=Tm62gee4; arc=none smtp.client-ip=209.85.208.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="Tm62gee4" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-6088d856c6eso1400296a12.0 for ; Wed, 30 Jul 2025 03:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753872313; x=1754477113; 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=TnAv1OGjpNdst6+omDSot3tyUGyzMvpWfnjJwpDwNOo=; b=Tm62gee4nHngNaP0oJdaeZnCTqYjeEadUsUqPnXLTkgiealqF2c9vcQRWlsV7d/BVz rYvcHs4rW6FJkY1lFodFxyUis3ZU1a7W5pqeottXwjCLuyPu2r6fkHY5xw8dDxgPKh+N tjKfE7U8wTn4998uwsrCXHQ2bz1hUP1g4IsTcXTJGS4gIrzVVlmCyvgYOG35/UQ1ve8O ZJnWLQH+8WJ5IUhF/XmDE7ytpwhVPkDZLZ9FQgOf+trUZ+W6OfPU5cKsCNAtPsd8Q+G1 2wBBhZNFa3HS+aaBBzsrY7iElFCP0SD8QmYPgv3RWCoAa/S2LZ9OIWgpS8nnG1e4NgpQ Hzdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753872313; x=1754477113; 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=TnAv1OGjpNdst6+omDSot3tyUGyzMvpWfnjJwpDwNOo=; b=lKZpiNzKe3OFi/F1FADFhdWA5MV1Rw88YJ9EOj6bTUmyhe2Odxi0gtgHe0o0VmH32g WWE1fiZbh4iT7FHOVoiS/Wp9k8ov+L2KZ1HqBeaQOkaZXsOQHf8/5aLUqhrTtCK+wxQb 69ZnKX6kVkilJI6whwSxRIg6/lM4eI1dDT/a/Nxrm8g4jPr1IwsdAyLFxkVopKRmtkgZ hEARmZ1wZBF5FvAs1CuEfZqrdih0zvZZ/FVSe9xjptzMQ12poZMOoJ/3au5HoXHshcHI FXMpc5jbp9SU/KcZU0mw+vHhvvr17XCPLB5KMEQPC4JVWKokv7LOSSLbl0f3YQ68S4Eg 6lzw== X-Forwarded-Encrypted: i=1; AJvYcCV1nVfXTzLeNDqAJ4i+WbcphThyp9yp9gKaP/A6lIomr2a5NmkGn0lQLcp7lWgvRt6Cb4mK8okrXeJVZ0E=@vger.kernel.org X-Gm-Message-State: AOJu0YwGidZCj1XeRjMdDzNM5EjvDcXfhT2k/BqO/xrHd5zASeaNq5U9 rvURSG9J5DHaXZSynLJIWMuuY1FsvXCpWpubVWoTp6JjrrY5TOTeVE2M X-Gm-Gg: ASbGnctWJZ9cvVEjiUjL1liS6GFNg5V7FZkYDGLOkfiQaTUpwf4TMGQhbwJnr59lI1k r3ufZwdwRs+S4qrYwJmaFxRBFKN51p6FVaybWvMzgbSAKv/bm/aDjVxoCisZljV97pboTaQND3c nufWBQo4xF6/PDkSYeBYBVWXvFRK15KH20iInSd57ECTk8Mh8nlKJY5iztuTgSyB2ny/RX60AD/ joR3Zi/5hTnWG3ROOWuXcEAzHpRioCIShIyV6CJF0nw/drVglqyQuH5oEgwcFALY035a3m1E4Us IPeL8zE0ajITx8Ejv7uJ5IxnrFVBefS55YUXjR2iljgV0bX53mqEPLat9E9I1k7kUfwQPcfyfC4 QrHZiGfYaW8+naWPTG5NGZBkI3CxK6ZksEdrrsxnWzc83ndRHB7U9pwV6 X-Google-Smtp-Source: AGHT+IFegvOXCvA5sF0jNFm/UnIAP1YzQ26yl3/5ZrWK+EV9rktXxZYfEire4zGPtTBYLO1vFpq5AQ== X-Received: by 2002:a05:6402:2751:b0:615:5b45:2eb9 with SMTP id 4fb4d7f45d1cf-61586ec4393mr2799100a12.5.1753872312832; Wed, 30 Jul 2025 03:45:12 -0700 (PDT) Received: from tumbleweed (ip-77-25-32-208.web.vodafone.de. [77.25.32.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6157974fde0sm1582734a12.7.2025.07.30.03.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 03:45: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 7/8] staging: rtl8723bs: move rtw_report_sec_ie to core/rtw_mlme.c Date: Wed, 30 Jul 2025 12:45:00 +0200 Message-ID: <20250730104501.150270-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730104501.150270-1-straube.linux@gmail.com> References: <20250730104501.150270-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_report_sec_ie from os_dep/mlme_linux.c to core/rtw_mlme.c to reduce code in the os_dep directory. Signed-off-by: Michael Straube --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 34 +++++++++++++++++++ .../staging/rtl8723bs/include/mlme_osdep.h | 2 -- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 34 ------------------- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 27f775d8f9a8..1c720947955e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2033,6 +2033,40 @@ static int rtw_append_pmkid(struct adapter *Adapter,= int iEntry, u8 *ie, uint ie return ie_len; } =20 +static void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *se= c_ie) +{ + uint len; + u8 *buff, *p, i; + union iwreq_data wrqu; + + buff =3D NULL; + if (authmode =3D=3D WLAN_EID_VENDOR_SPECIFIC) { + buff =3D rtw_zmalloc(IW_CUSTOM_MAX); + if (!buff) + return; + + p =3D buff; + + p +=3D scnprintf(p, IW_CUSTOM_MAX - (p - buff), "ASSOCINFO(ReqIEs =3D"); + + len =3D sec_ie[1] + 2; + len =3D (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX; + + for (i =3D 0; i < len; i++) + p +=3D scnprintf(p, IW_CUSTOM_MAX - (p - buff), "%02x", sec_ie[i]); + + p +=3D scnprintf(p, IW_CUSTOM_MAX - (p - buff), ")"); + + memset(&wrqu, 0, sizeof(wrqu)); + + wrqu.data.length =3D p - buff; + + wrqu.data.length =3D (wrqu.data.length < IW_CUSTOM_MAX) ? wrqu.data.leng= th : IW_CUSTOM_MAX; + + kfree(buff); + } +} + signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out= _ie, uint in_len) { u8 authmode =3D 0x0; diff --git a/drivers/staging/rtl8723bs/include/mlme_osdep.h b/drivers/stagi= ng/rtl8723bs/include/mlme_osdep.h index 8e8b5de285dc..3930d9e6dab7 100644 --- a/drivers/staging/rtl8723bs/include/mlme_osdep.h +++ b/drivers/staging/rtl8723bs/include/mlme_osdep.h @@ -8,8 +8,6 @@ #define __MLME_OSDEP_H_ =20 =20 -extern void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *se= c_ie); - void rtw_reset_securitypriv(struct adapter *adapter); =20 #endif /* _MLME_OSDEP_H_ */ diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/mlme_linux.c index d2f4855e9d9d..918d9496d7cc 100644 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c @@ -65,37 +65,3 @@ void rtw_reset_securitypriv(struct adapter *adapter) /* add for CONFIG_IEEE80211W, none 11w also can use */ spin_unlock_bh(&adapter->security_key_mutex); } - -void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie) -{ - uint len; - u8 *buff, *p, i; - union iwreq_data wrqu; - - buff =3D NULL; - if (authmode =3D=3D WLAN_EID_VENDOR_SPECIFIC) { - buff =3D rtw_zmalloc(IW_CUSTOM_MAX); - if (!buff) - return; - - p =3D buff; - - p +=3D scnprintf(p, IW_CUSTOM_MAX - (p - buff), "ASSOCINFO(ReqIEs =3D"); - - len =3D sec_ie[1] + 2; - len =3D (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX; - - for (i =3D 0; i < len; i++) - p +=3D scnprintf(p, IW_CUSTOM_MAX - (p - buff), "%02x", sec_ie[i]); - - p +=3D scnprintf(p, IW_CUSTOM_MAX - (p - buff), ")"); - - memset(&wrqu, 0, sizeof(wrqu)); - - wrqu.data.length =3D p - buff; - - wrqu.data.length =3D (wrqu.data.length < IW_CUSTOM_MAX) ? wrqu.data.leng= th : IW_CUSTOM_MAX; - - kfree(buff); - } -} --=20 2.50.1 From nobody Sun Oct 5 20:15:21 2025 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.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 8CE3B2980AC for ; Wed, 30 Jul 2025 10:45:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872318; cv=none; b=Rf5f32jpBl/8ka+SCR9x9VxgBso9CG8vL6iAiLYb1DPvCMqrg38BxSxXl3YXLHnCNNnSoqN0svqC+5NCMCFvgW/hHXA7VimQ0O38Ns1ILf3fjV4G229tD7R95quovBersG/s0MPEbAYWZSGgmMigAO7lZffhK6m8JNsmXgRc0Us= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872318; c=relaxed/simple; bh=zMYDgD1v9PbcRgvlt7dYWThewO6Q4BQc0fqBmXE/dmQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r02yVbLSvO1oCptShpvfl+8ENyIh8BYsf2thyZN5uSJvBguqtSIxK5SFNqhMXr6srYlKFk6noqxXt/xKmUKc9JBpAC0lDJseU8YfPbIEcNvOZjviVyqyhnnr4biP1/kzZuzTDFww+Y6RAbknhrPlVnO4mxsjFH8U1lsBz5wQHcc= 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=Ijtjfvks; arc=none smtp.client-ip=209.85.208.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="Ijtjfvks" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-615378b42ecso6107077a12.0 for ; Wed, 30 Jul 2025 03:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753872314; x=1754477114; 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=4Orl0dxFN5prrJRMhCNo44wNjAVEDhcd1qwh2pT3Fzc=; b=Ijtjfvks8xtS+5BwZm9XB/lYS0kaH0370HYACHGkwKNSWfl5i10xUgeBY5Ry4QpPYF VYONZCHTQMkpopZeIb6ZtWzfpK5qwAYql1YX1ukTmpuVZbVh9NosmDZEcOyaNnY0po+e 73TqMOQtncfb3xH+2dkVIQyRSZvaZ/fDzQ/kXdUNDNHpZwf7lW3mZxkvn7vN0t0XVcyE pzWC2jdHm9Xka/YAO6pPhV4PqLGwcqoPXcVmGO1MA0mqG2GzIZb2+EHkl8RqvmADCuZV hoUJvFP3M/NVSsaE0BFqo73msqpLwsCG/3pY+I+RhyXh4/GOU/MSpHVbTQnerSjabPyh ifFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753872314; x=1754477114; 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=4Orl0dxFN5prrJRMhCNo44wNjAVEDhcd1qwh2pT3Fzc=; b=BRY8dJtNIxFS1xcv9zaO36LrtfQ8tLtRj8QMC11gP3pcQQivoyt23bLADDQ9A0VrGR es9HrjPU7tICCulxkUZElTYVujPvObKdjsMqlALjgEMZ6EcCQDVcx1uz/o5EGql7zdgJ WJ8HkYv1P2PPim952lcXfOtfHKOlWEFsTzbObQg2Ly6fc+8+k0V2yvjHgeXmcn/KvtT1 yqIgs8l20o9bl00ifKzlRX59vCtGFobAej/YjMDh3rml2lEvbw2XyyJPMqG7XsOLczrA 4Hf9l5a0W15Lf/b1bfRtfYDByDtC26fTk/e3R0skFsW6dVsM24Lf7vAv6hh6QFxgHho+ 9m9g== X-Forwarded-Encrypted: i=1; AJvYcCWXzz9lgHS6AA1nXRl+3lhDgleb7VMrU9EstvD9DKuEarzqyQIYkvJLc+axAh+f+35+YI769ug1el2PlAk=@vger.kernel.org X-Gm-Message-State: AOJu0YxigDtFWT/0xePGN502eVE6QWESiuKpLZbUtdJpzxuv67NwBCMW fCvXJcFaBMVzOeU8mEPTDjVgUNE7hftMzsR0g9DCp/QcjhM3C5L96FLK X-Gm-Gg: ASbGncuKD1K8aNumyObd7foraGutweVs80QR59LyM0fcKPjtT776almAPcijtcHpnU+ r5r0RBHvWOcjga7LohEch1x3j+M4eug1mASU4cREmzUJuoqC+viRqX3FjOxXHh8nBLflRDY5ZbM T7KhkABj80178TsJUE/AIcmKtGd7wJxeWcAAGnghKai42n9yT4cmvV+MYXn5ttJGa9SQVpmbQdm OGImx7eqsv8dDkL48niGQdbx+y/uX2AB3/R3qfnxlb+k1F83KGmBzQGa/9+tnW7UXxEbOXv239o DyQAl8qKfVSEGlTk9Z587pPlw7EmNI33hCCNOzLO4cI+oZTB7n/zWK/O9Ot13GY+9LbQaD7pfLX mz980RMfSGdM+fC9rEp78JBWGN+pXI76gsP4HtJrNh3jZZ7AgGorV4J1b X-Google-Smtp-Source: AGHT+IHulO8SbF+m+xqs94001tnJHzK4YfZ6e4AqFOBfQddGkX20d5N5vga3aLzI/716AKlWIiQMHQ== X-Received: by 2002:a50:9fec:0:b0:609:a91:87e with SMTP id 4fb4d7f45d1cf-61586eef919mr1936150a12.1.1753872313417; Wed, 30 Jul 2025 03:45:13 -0700 (PDT) Received: from tumbleweed (ip-77-25-32-208.web.vodafone.de. [77.25.32.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6157974fde0sm1582734a12.7.2025.07.30.03.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 03:45: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 8/8] staging: rtl8723bs: move rtw_reset_securitypriv to core/rtw_mlme.c Date: Wed, 30 Jul 2025 12:45:01 +0200 Message-ID: <20250730104501.150270-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730104501.150270-1-straube.linux@gmail.com> References: <20250730104501.150270-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_reset_securitypriv from os_dep/mlme_linux.c to core/rtw_mlme.c to reduce code in the os_dep directory. The file os_dep/mlme_linux.c is finally empty now and we can remove it. Signed-off-by: Michael Straube --- drivers/staging/rtl8723bs/Makefile | 1 - drivers/staging/rtl8723bs/core/rtw_mlme.c | 60 +++++++++++++++++ drivers/staging/rtl8723bs/include/drv_types.h | 1 - .../staging/rtl8723bs/include/mlme_osdep.h | 13 ---- drivers/staging/rtl8723bs/include/rtw_mlme.h | 1 + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 67 ------------------- 6 files changed, 61 insertions(+), 82 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/include/mlme_osdep.h delete mode 100644 drivers/staging/rtl8723bs/os_dep/mlme_linux.c diff --git a/drivers/staging/rtl8723bs/Makefile b/drivers/staging/rtl8723bs= /Makefile index 8560b84a3146..19c0525ec3e0 100644 --- a/drivers/staging/rtl8723bs/Makefile +++ b/drivers/staging/rtl8723bs/Makefile @@ -48,7 +48,6 @@ r8723bs-y =3D \ hal/HalHWImg8723B_RF.o \ hal/HalPhyRf_8723B.o \ os_dep/ioctl_cfg80211.o \ - os_dep/mlme_linux.o \ os_dep/osdep_service.o \ os_dep/os_intfs.o \ os_dep/recv_linux.o \ diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 1c720947955e..69b64d605186 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1116,6 +1116,66 @@ static void rtw_joinbss_update_network(struct adapte= r *padapter, struct wlan_net rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->networ= k.ie_length, (u8) cur_network->network.configuration.ds_config); } =20 +static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; +void rtw_reset_securitypriv(struct adapter *adapter) +{ + u8 backupPMKIDIndex =3D 0; + u8 backupTKIPCountermeasure =3D 0x00; + u32 backupTKIPcountermeasure_time =3D 0; + /* add for CONFIG_IEEE80211W, none 11w also can use */ + struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; + + spin_lock_bh(&adapter->security_key_mutex); + + if (adapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X)= { + /* 802.1x */ + /* Added by Albert 2009/02/18 */ + /* We have to backup the PMK information for WiFi PMK Caching test item= . */ + /* */ + /* Backup the btkip_countermeasure information. */ + /* When the countermeasure is trigger, the driver have to disconnect wi= th AP for 60 seconds. */ + + memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(= struct rt_pmkid_list) * NUM_PMKID_CACHE); + backupPMKIDIndex =3D adapter->securitypriv.PMKIDIndex; + backupTKIPCountermeasure =3D adapter->securitypriv.btkip_countermeasure; + backupTKIPcountermeasure_time =3D adapter->securitypriv.btkip_countermea= sure_time; + + /* reset RX BIP packet number */ + pmlmeext->mgnt_80211w_IPN_rx =3D 0; + + memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct securit= y_priv)); + + /* Added by Albert 2009/02/18 */ + /* Restore the PMK information to securitypriv structure for the follow= ing connection. */ + memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(= struct rt_pmkid_list) * NUM_PMKID_CACHE); + adapter->securitypriv.PMKIDIndex =3D backupPMKIDIndex; + adapter->securitypriv.btkip_countermeasure =3D backupTKIPCountermeasure; + adapter->securitypriv.btkip_countermeasure_time =3D backupTKIPcountermea= sure_time; + + adapter->securitypriv.ndisauthtype =3D Ndis802_11AuthModeOpen; + adapter->securitypriv.ndisencryptstatus =3D Ndis802_11WEPDisabled; + + } else { + /* reset values in securitypriv */ + /* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */ + /* */ + struct security_priv *psec_priv =3D &adapter->securitypriv; + + psec_priv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; /* open system */ + psec_priv->dot11PrivacyAlgrthm =3D _NO_PRIVACY_; + psec_priv->dot11PrivacyKeyIndex =3D 0; + + psec_priv->dot118021XGrpPrivacy =3D _NO_PRIVACY_; + psec_priv->dot118021XGrpKeyid =3D 1; + + psec_priv->ndisauthtype =3D Ndis802_11AuthModeOpen; + psec_priv->ndisencryptstatus =3D Ndis802_11WEPDisabled; + /* */ + } + /* add for CONFIG_IEEE80211W, none 11w also can use */ + spin_unlock_bh(&adapter->security_key_mutex); +} + /* Notes: the function could be > passive_level (the same context as Rx ta= sklet) */ /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/stagin= g/rtl8723bs/include/drv_types.h index 080c321665c0..f1c16ddacc83 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/staging/rtl8723bs/include/mlme_osdep.h b/drivers/stagi= ng/rtl8723bs/include/mlme_osdep.h deleted file mode 100644 index 3930d9e6dab7..000000000000 --- a/drivers/staging/rtl8723bs/include/mlme_osdep.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/*************************************************************************= ***** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - *************************************************************************= *****/ -#ifndef __MLME_OSDEP_H_ -#define __MLME_OSDEP_H_ - - -void rtw_reset_securitypriv(struct adapter *adapter); - -#endif /* _MLME_OSDEP_H_ */ diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index 3cf68b85eb32..4c15d0194d4f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -395,5 +395,6 @@ u8 rtw_to_roam(struct adapter *adapter); int rtw_select_roaming_candidate(struct mlme_priv *pmlmepriv); =20 void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *ps= ta, u32 mstatus); +void rtw_reset_securitypriv(struct adapter *adapter); =20 #endif /* __RTL871X_MLME_H_ */ diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/mlme_linux.c deleted file mode 100644 index 918d9496d7cc..000000000000 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ /dev/null @@ -1,67 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/*************************************************************************= ***** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - *************************************************************************= *****/ -#include - -static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; -void rtw_reset_securitypriv(struct adapter *adapter) -{ - u8 backupPMKIDIndex =3D 0; - u8 backupTKIPCountermeasure =3D 0x00; - u32 backupTKIPcountermeasure_time =3D 0; - /* add for CONFIG_IEEE80211W, none 11w also can use */ - struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; - - spin_lock_bh(&adapter->security_key_mutex); - - if (adapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X)= { - /* 802.1x */ - /* Added by Albert 2009/02/18 */ - /* We have to backup the PMK information for WiFi PMK Caching test item= . */ - /* */ - /* Backup the btkip_countermeasure information. */ - /* When the countermeasure is trigger, the driver have to disconnect wi= th AP for 60 seconds. */ - - memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(= struct rt_pmkid_list) * NUM_PMKID_CACHE); - backupPMKIDIndex =3D adapter->securitypriv.PMKIDIndex; - backupTKIPCountermeasure =3D adapter->securitypriv.btkip_countermeasure; - backupTKIPcountermeasure_time =3D adapter->securitypriv.btkip_countermea= sure_time; - - /* reset RX BIP packet number */ - pmlmeext->mgnt_80211w_IPN_rx =3D 0; - - memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct securit= y_priv)); - - /* Added by Albert 2009/02/18 */ - /* Restore the PMK information to securitypriv structure for the follow= ing connection. */ - memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(= struct rt_pmkid_list) * NUM_PMKID_CACHE); - adapter->securitypriv.PMKIDIndex =3D backupPMKIDIndex; - adapter->securitypriv.btkip_countermeasure =3D backupTKIPCountermeasure; - adapter->securitypriv.btkip_countermeasure_time =3D backupTKIPcountermea= sure_time; - - adapter->securitypriv.ndisauthtype =3D Ndis802_11AuthModeOpen; - adapter->securitypriv.ndisencryptstatus =3D Ndis802_11WEPDisabled; - - } else { - /* reset values in securitypriv */ - /* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */ - /* */ - struct security_priv *psec_priv =3D &adapter->securitypriv; - - psec_priv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; /* open system */ - psec_priv->dot11PrivacyAlgrthm =3D _NO_PRIVACY_; - psec_priv->dot11PrivacyKeyIndex =3D 0; - - psec_priv->dot118021XGrpPrivacy =3D _NO_PRIVACY_; - psec_priv->dot118021XGrpKeyid =3D 1; - - psec_priv->ndisauthtype =3D Ndis802_11AuthModeOpen; - psec_priv->ndisencryptstatus =3D Ndis802_11WEPDisabled; - /* */ - } - /* add for CONFIG_IEEE80211W, none 11w also can use */ - spin_unlock_bh(&adapter->security_key_mutex); -} --=20 2.50.1