From nobody Sun Oct 5 16:14:49 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 587391F4613 for ; Fri, 1 Aug 2025 08:32:38 +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=1754037160; cv=none; b=KEc6QNDdecrDvkPT8il+9J/7G8GqX9QOSXisP7DWwxx5zXHajjG32qgdFbxLJgXx7orENTqo/YmZ4e+OHr4S7vad8ReO5+q6mPX5C7Fzg6wTM45qeOxWC5J8XVyCYgYEPElrDqdCKIXUqfC/PSw7IyKWTUWeds418Qn8fX+p30w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037160; c=relaxed/simple; bh=jNw8gYyPfEc0lCn2sfYFphv3M43A+C5B83Bw6t3WYKo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eDhcnokrS3EWvtBMCljZsjPPSE1xqxGX+b04Vu3GIPDCcwXvaGYPZznszqmDu1TuC419X0VwZoD+bow7YIbHmcZY4SyE3b9qd1lfPm8nM5VKyhJRHDRGtCqJF630Wx631nUb+WW84NvXbc0rhXo0vI3+i/3Q9lqqkOwLbWudaDs= 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=MaXnarzV; 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="MaXnarzV" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-61564c06e0dso1075524a12.3 for ; Fri, 01 Aug 2025 01:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754037157; x=1754641957; 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=jFCk7W4PYpUqrlv5983kKngtATqBDHXd47fbmciqnpQ=; b=MaXnarzVGW/wnJLlGYacXiWmm2w9OydF+ggV7RwV0YdBc0EUhe/Jos57/SMdIuPJJ8 Ki6+31u81/eWZU93wBeti0hYum7DiASxrKC+zrbGL6O3XbQEh3+TAwE7ASd1ijo6d7bi EcYLNiQjenKJvtc0bLvqyz7i0xl+JXcFlXmv1GGk7ghWJUTNJYk60CIAtso5AROsV1TW GS/iYMaU6ZslHt3c19OV+QC6XVFpi+3cs5za5scEDxmvXGv2gqb1Ke5QK7oALEVpzAgK HVF8OHIzrKBAafWZHTNXX7ITeQiP+ikkkqHZre/VVQhpfO79ju/gz9B+/3a490HnTJ0U glDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754037157; x=1754641957; 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=jFCk7W4PYpUqrlv5983kKngtATqBDHXd47fbmciqnpQ=; b=dgCn1n8rhs3FX3nkYaAGS7+qg4Bx/+MW9FTj8L13Y9HvKrmb8MiCmBd9dl2OA+gkod RbRGBmBykzt6rQk9oohamgexurW1QDowVxP5VOZ3VTXCPsGRENgcF5cy3A26K9SUjfqX +M6fKip8w7Iw/v86DoRzcI9+aXo0gN2ZxQkta+HEuUQZyfHxu05wjCi5QjDUnvqQCnwg P+s8zYZA8We9+NBNynIavLvhAWmVfQ1iB4/Bpeplmmwh5CoTAM4sr6bgeOHNHuVux7ia ur8FSn9Anls0Cnirt3iJa3jTsmDGerXkBV/MoWvOm1pdi5QHzlhqAXQcLKbrDdTaImZ3 SpYw== X-Forwarded-Encrypted: i=1; AJvYcCVRDydM/P7ZQO9bxDJj4U2bem9ZggFl345nQhpFNiZiJvAoi8rhssB7MXt/DMgf0e0mKQc/hZLo0Vd07Sg=@vger.kernel.org X-Gm-Message-State: AOJu0YynSXTUtEP0XScb339MK0lKiIo8Mad9AdryO//nEO4QVr57TRMF H+7Ey945+0mXrvGxfNME2de2dGgEQMoX2wMN5wzI/GaD8soKfe7QSTS6 X-Gm-Gg: ASbGnctf3xJ1YOmY0wWsRJPTIVrgZ1+aSQ5TqyXsyDh50nwmVvrkO7P0Z3oRqp9Ucep qMPR8XMyYoXYsgW0f8f4y+14BL4PjyD/w+Xe+I8/pTOUCVJ8pu++C3fP2HVPlMnYIZxFYyaqYAa ea1DWTD8EcKllbYrjok6e/tSnK9HuydfwSIv2xtYUB9s3MIhPAZhrXKiEQGoapLT5gb42C8RdKS sIkoG+0GTBTzqQu7c4hshhaXEb2i3btaRmZ3weBAb29uvP8YJo8tJH7oULe29tQE7DKjlskerZW kTdwqMFLorxKT/tnVYYi3x3EGD3L4gdgt/cla0wcVKheSdzWK1ht944l1DKE7p9BhDF20WsFQRL vaNXY57wiV2GzPibCzCdSPJwFU2GgCJTGSvwyiUqb6Xy8/z3/g+s= X-Google-Smtp-Source: AGHT+IHySLJVS0XBT69Zdi5WfqISPJkGXDMtshkA3DCyFm3wMtzq+ZwLvezA3jCI5dEpOq7Bfd7tzQ== X-Received: by 2002:a05:6402:518d:b0:615:a023:b809 with SMTP id 4fb4d7f45d1cf-615a023c154mr7761384a12.4.1754037156305; Fri, 01 Aug 2025 01:32:36 -0700 (PDT) Received: from tumbleweed (ip-77-25-33-2.web.vodafone.de. [77.25.33.2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a911a59dsm2362735a12.62.2025.08.01.01.32.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 01:32:35 -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 v2 1/8] staging: rtl8723bs: remove wrapper rtw_os_indicate_scan_done Date: Fri, 1 Aug 2025 10:31:24 +0200 Message-ID: <20250801083131.82915-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801083131.82915-1-straube.linux@gmail.com> References: <20250801083131.82915-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 Reviewed-by: Hans de Goede Tested-by: Hans de Goede --- v1 -> v2: no changes 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 16:14:49 2025 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 10AEC1FA859 for ; Fri, 1 Aug 2025 08:32:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037163; cv=none; b=tUGaa0TGvK6wHETlBMza4pepbxUwNXIvD/EsTzD4TlFpNSpw2gfvLshXzOdcp3/ju1TR2bh5hqZz9VYH3QaX8zEDwSJG+ESdlp14ylPe23H/8A8WUtg6rIseZhNIfnR7XHLjm21aqOjF6Oc5C7KFk+aqoh4cQ4zKIsfr08H0RBc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037163; c=relaxed/simple; bh=/+vcYsI4ZQyJ++t1I38Ppuj4VT8P+XooHoXgtmskaOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ETWImjyEeAK4Q0DjPDCxMfXU3CpOwaNu8bOgzSvxhTL+hDgcRZFeGXr2WsE6SKARLjdXtCCnOszJsV54qdWgYp/KXi50bsf/IuE7bGNupMrz/hAya3nEFZIeJTgK4IUSs4c8cDQe5UzhEtSl3hVSKarYHhD6PddGiXWbvx7sjJY= 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=YhdBl5tt; arc=none smtp.client-ip=209.85.208.47 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="YhdBl5tt" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-61580eb7995so3914850a12.0 for ; Fri, 01 Aug 2025 01:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754037157; x=1754641957; 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=j6jMC12tEugVk5aruwhIYXcetQLysBmEwE741CRW/oY=; b=YhdBl5tthZHJ8Yntpdn51aUJg297VzNvKVitU2kL7TAM28tFggwX27wpfz/OGnCeO0 U715ayMdWy52+RooGmRDKVnjUAKyLuByvEzOCZtzwBLGd3q3xwQCgeFqrOd3CSRaTO9g ihjUIeejaywSI1zdB5LFuZCca1Q5yQo8g9x9o3Tvrm3AtIOG51ADAVrckl9K1pcb1iOz xFGvuG2VouwJ7gln3BlsBbRy+zPpLG0K0s+hjALQsy9fjBWLrDUXJ4EkPjw8wceVtPAp nArx5COsjHclXgy16EoNG3O8mRBrfCzMHv+Kd41IF2dZKCbgNfI4E2UeOVxIwas2ivhi U76A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754037157; x=1754641957; 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=j6jMC12tEugVk5aruwhIYXcetQLysBmEwE741CRW/oY=; b=AhwpCOkFvOxhqyxHxlTtKddBIG+vm7fmBiUMZrPCKgSeiuK27obM5PYE+qUn4XvzPi VaO1hCPEy1AHrZBPn7uPwyG5EmOImYyq1el1fgF/tC+5KsAWf5KjMFXlBAIY3BAnCrU2 BR2hx/HSbeA0edsmTFIUElCXmmFWUHbmTcKmv+xKR9cgZiWh/Z0m0//BNBX+pqJIS37S czKIvnBeQtGwYIhyRKTUSch8NpRyHpwlS+mtswxZHHscEhWPKp8Hktg8iItnu6FxWVWX 6w5f1V2FTbbJsZJkLlJ0tYrqHfNDwTHnFkQHN1oDTiW+3W5wEIx7rqo9k09fVQRvaxKF 0qow== X-Forwarded-Encrypted: i=1; AJvYcCUKqsE1H6ww7+1Qo5gwNvAlyuJB0hcBxoAt1Ol9VSALxY7cU1kuQUGbRgfU6Hgb/b7pLNGuhApWImo3FD8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6LkeMVSNixHI6ktozEkOj/QYaZhAXdnlscjhBqAc37dfxxZun VqtvbIh0oEv/tF6n2AXFL/3GR8p+eCYoJA1cgAYzShi021OSlJaV+ogPVDjmCg== X-Gm-Gg: ASbGnctWHOoR0RpyOvmFQRMLwR9dSns8Z0B6m5WxEYKwkXvoZxjIIC1NpNiF/Q4j1zP CV4qfME1N0LGnSdY4v6xppnIoDz5aOb2DTv8rWJhOBAhxWn0kFR03vKdy1zdNd/UxISHszwNTQ8 aMkbxkJqOOAKcbIY7ox5ubeC3ycsP2Wcmavv9m9HZ///yesipeXZvXUGl5XENgT/8p7sLHpXK+I MHTc4RcDVZ8QEGV0T7S0bZ+Ppirdpm6n2ir3QC3KcPNeZ0OrAdJepF4W6i3NbVWNiBoPQQTDiIN /zOX7oDwKmvJtcGalLKjtb1vV5CDMyZqkHskpQYXq5ZY2OUBXeimvFOMLLWnLr3MGpmZAH0bX/S yxrP9la70JdtWilwMW7mfGCYSpL/vZACRn/AW1RHyGYD7n7eSv5U= X-Google-Smtp-Source: AGHT+IHciq99BbuZpWhzmGyVurHmceDhuGv0VyhSlty1GL9uJXllpooZ1oSHCxPfXsLTyOQc240QsA== X-Received: by 2002:a05:6402:2809:b0:615:4c85:47a0 with SMTP id 4fb4d7f45d1cf-615ae19999dmr5006820a12.7.1754037156991; Fri, 01 Aug 2025 01:32:36 -0700 (PDT) Received: from tumbleweed (ip-77-25-33-2.web.vodafone.de. [77.25.33.2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a911a59dsm2362735a12.62.2025.08.01.01.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 01:32:36 -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 v2 2/8] staging: rtl8723bs: move init_mlme_ext_timer to core/rtw_mlme_ext.c Date: Fri, 1 Aug 2025 10:31:25 +0200 Message-ID: <20250801083131.82915-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801083131.82915-1-straube.linux@gmail.com> References: <20250801083131.82915-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 Reviewed-by: Hans de Goede Tested-by: Hans de Goede --- v1 -> v2: no changes 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 16:14:49 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 EA173217666 for ; Fri, 1 Aug 2025 08:32:39 +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=1754037161; cv=none; b=rxzOx9DxdQgaGnPyxCSzd/G3M+vMhDbebQALQwCl6USRNkD5OFkakR8M6KjM+1w3o6PVm8RQgSu3AMzhSItzieKy7+rlxGlJHyT+f8GgodN1BgKH9wKe4bCgzdM8c/UgMt8xFYu+cgooSYxS40ys3L0+cJQnlVaorZT9bXeH5IE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037161; c=relaxed/simple; bh=429Dsz1UXCl+tc4Qfhqn6rxGh5DaOcSImn2Rmb4v8WI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iTagSf+ftWWcm2CD5fyiQsHjzaBK+22jK6ibR93YNoxYtRwxfU0rRa8SROiKEbLYx5Vl+E2f4mtLW60z1idBHfG8d1S/AZgVwPE6kSmiHzqrTojXvkb0EVYGAambECNVnKgKcXsIyOOo6ZJ4JDQUD88QNikxuwqzUgT1jRoRUj4= 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=Hz5XI4Eq; 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="Hz5XI4Eq" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-60c9d8a169bso1184864a12.1 for ; Fri, 01 Aug 2025 01:32:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754037158; x=1754641958; 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=SvAoNTM7MhnTBXwN9OXdWpK9Cl2xaDI6Blg0pAmiyvk=; b=Hz5XI4Eqt9g9p6dAC9qY0KSvxEXa4bz/wABhyUQvTddmzAPbkJufXmaNJqnSy3ur9X b/IPVfycmqCZYXgzjGo8zX9DoNMOp3AXwepd9fr3TqmG4D+BGtBUhp4rxYs8V+TocX8z 5PUup0X8vrrXj7dNPcQmzQacXgqUyCPPqAJ3tO1gQP6mYYCIowe9nti822Q/RVgQ0RJQ ZoCV4RawKzqMKyzNIzqafsBGCgTxSx0Hfz5O6ZjqIY9Xs+0AJE4FDprJGeAprgC9FfRS tkMwaacpDXzkhQiOCKCWncDQp+5VkoriokP6J/gQD1IKh0WWw9fkaoO+udUmJvk/3Sat fyCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754037158; x=1754641958; 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=SvAoNTM7MhnTBXwN9OXdWpK9Cl2xaDI6Blg0pAmiyvk=; b=sFMo1yP4J8WIbXXyPOPbcDtuz35AYIvJSH027PD1VMTpomTjNehNTHluurL2pqOipz XrQhzNByto26zxg8C7AacmSgBNzC3giRjHa3cspe+YGbvqOt8ZMTrKSpGv7RCsQvY7OZ jgWj/dkYe22v5EAHsCCV5XWl3uYsDx45srvAWhlVhktN9BrK5r2DLZ8MNMAJCZ823lRe /PAXcovi/k4hUqC34CAboUO1JRETE5msFruZ/qwjWnHEI+0eNih2wWHT7lNaLH0G1r4d EQxjM0vgTa28+m6fXhcjoPy4I1X/eLv1bRl2luPN/kpr/4uOBlLlsKo1Bju230B/TUuV 6DZQ== X-Forwarded-Encrypted: i=1; AJvYcCVwFU0afT8KcH17qrOezpug6KDwfjR6rodci/7zAiwBMWH5XJ1Qg6NcfypWfm4/DtdHA+Ua5ZnVTuhpm0U=@vger.kernel.org X-Gm-Message-State: AOJu0YwPNp8iTJpGjSmAgeqUrfKiEidDJr8+SxY/9EuqKi+wm2EBSEPV GGi2TnC8yLcN4OzTrTCxg1QyLsDoCqsTnYBH4cUyUW8/blcUGcGXxqA7 X-Gm-Gg: ASbGncsSCyFghNzCkLVFRfQjpOf08Qi5cDdlbnZkWsNu8XstHWmD8WwbxYnxeiy68PL CNm6fGwzSZchU2tdMiIlH0fy8weAewpCHLLRwl8f+g6qO84ry/3133OqHDSuwg3RbYAMhhEWvUQ ui9WXV9FOiZpA3YGEyNQjB7pZ0PTkJ1w0Ne/lSCrB3bcQt9JWRRKaTvIbZv5AxqFQ/g6wKytic0 qGh7dJWjoT6oGTlYrx9ojvD6xQs9PBpu97JucXeGcpC50nozuRFVTAWFw+X0qD8Bf9mlvgbGMiO KbPj9fLrzn0ydRAOfj0otF5+8w+k29QnQxF6SzhQoHIeeP60fwDRucCPB1EB97/MEZ7vqf9ABdv eMmVxPOFXu3CTkIZRpQA0GDYK7gK+6KUBx7K2opKRsI3Ufu7uf8QD4nlGUt+xhw== X-Google-Smtp-Source: AGHT+IG9UtA818tUQyzTBxmyycijLf90jRyxH1yIxm+p2IBSQn5NV1nmQ8MpIGTh4noUUEDvN6MmGQ== X-Received: by 2002:a05:6402:210a:b0:615:b6b9:d859 with SMTP id 4fb4d7f45d1cf-615b6b9db0dmr5281972a12.3.1754037158132; Fri, 01 Aug 2025 01:32:38 -0700 (PDT) Received: from tumbleweed (ip-77-25-33-2.web.vodafone.de. [77.25.33.2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a911a59dsm2362735a12.62.2025.08.01.01.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 01:32:37 -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 v2 3/8] staging: rtl8723bs: move rtw_init_mlme_timer to core/rtw_mlme.c Date: Fri, 1 Aug 2025 10:31:26 +0200 Message-ID: <20250801083131.82915-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801083131.82915-1-straube.linux@gmail.com> References: <20250801083131.82915-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 Reviewed-by: Hans de Goede Tested-by: Hans de Goede --- v1 -> v2: add back accidently removed tabs 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..2e957f00bd75 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 16:14:49 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 1022621FF44 for ; Fri, 1 Aug 2025 08:32:40 +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=1754037162; cv=none; b=torS6o3FhUGldopEJBLo2z/5xMCO6Die/qExkfwqJJTGuiXRUpcTfUfqZJYrdvZphRbIpFXXhrUyc0juauPdTWQwEr873Vqql+itqkjZpXZ0phHlhKucuwzL8gOnnLi7QWGVT8aQxTfFiHhpQOK60uUlZF/1OrHpc0Pgy4hmq7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037162; c=relaxed/simple; bh=Ganb2QpLnyafKOMT5g+9k2Q7Ed/ovV4Up8+46CnLsUQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jWfqSeu//rxToIpUw2RCIO4Gvc+X7tc8NQgbasIpviaVPGkVflUPhQY+OYVjHu+BnRHRFNBbIYgB7uk3L/AMBrKJVKvFYUCYW4wRlpkh3vzIFgSlZKRrfJKxpD1xPLiZQooUz9AbXa/Z3MRRvcQRAwVfSlGeOourgeU2VTBrT9U= 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=TfuaTKs4; 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="TfuaTKs4" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-615c8ca53efso1748038a12.2 for ; Fri, 01 Aug 2025 01:32:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754037159; x=1754641959; 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=Hir56biQJZn+xxylTDOOLZm1B/0sdMegpTfCz+mQfxM=; b=TfuaTKs4yBvVaSSQdxz3egdrQDIJy2mCbmk8IuMhiOr/6OJkxwjFeI2+ZDABXbPxrv hwSRcl6nLKR8yZXIiidUU3l5UbXF+4htiOvS98/m3rf2oxvL8BZ8+gYlyv52HvOafexo IUkK3Zj4SkNFrLV1G1+PwQd/ZbL8KRjgDrsRfcTU4HTSffXyP/3hgJd7yrwJl22Mb9FJ 1IKEMYZ1yRfu/KMy9RtTYpSHCXDTAQHKC3NIjW0EmcUiJZE/R3xFsP7Ca31WCyjcG1le bZsfwimR34M81wi8HLgNwsXjQCxbrkZv9C5B/ShoLebPugNdegR7QqeQuHjlUDpBMfQI U5Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754037159; x=1754641959; 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=Hir56biQJZn+xxylTDOOLZm1B/0sdMegpTfCz+mQfxM=; b=CAR3D5QUjW7ZDZgipxsKMIYpu2hyWegLCkzkRgD7THN+b51fxcH1JAKRqL2QX3chtI B/wQG8yjymikh3mk/dyQkV3P3MnYL20LBzVBKP2AHi7Ux6aXS72fcATikYezaYkbGz+d vy48FE+MUNO673xZ1L5mM+mKxoVEG1wCA7iLBKyFRaBAgMLbn3zxY3yBvnC7I8ikhqEA ztBTXAFm/JbkPy0XpB2LSdPTne+iQIWhQgnx7NXzWTzRqetcaXFbXZtogmzh55NxwVXZ bWLY4VBE5N6gPLDVqRaI2JAlBAm7UQJgjTEdMWVkWsp1dAWicX4D8QJvsPMeObxy1Fg9 aNSQ== X-Forwarded-Encrypted: i=1; AJvYcCXxXv9fIRrOTKOvUN8IHswf7qHrbk6Vx+/g2IVPbjkZluM+Bn3C2Jhb2RVi2aBDR8KzPwGdfjLs8wjeG5U=@vger.kernel.org X-Gm-Message-State: AOJu0YwyhrcuEr7bE/boCJm6RynkdvDUAfFIgmwwOizTNVDeiIGfgERX 4hupo6z1ZzRspjIrLSMkfSLc1o/7o/KH3b7HMkDsN6EzEy4wYC6RIb9y X-Gm-Gg: ASbGncuZazUYpRi00Zdjltw0ZOQCN+ErLrOkup6SP/PuUnX9Gw2n6LMftUajPRB59wO Ox7GiOOYmsulAJBXxq0Av+HQo07ahxvd9Zy1NKgdq900iLyuLrBsNQqoH90MmhquTNRze5ra3B+ h2rE4B9Rnw/SScwT0LY8vlgx3QDiTvHQ9DMAlqiJsLQuNiP0Ircnt0Vc4NypOdO3wBihcT+jx/z RRw5r5F2t3ab+MczAGhxkhHgmI71Ev07cKn2LborzS4G33/WG9JeM+r/1ZALehFlD4YsgUDYSPa asxjB3B9SqthXpXAUfbd8zzIvMyzoYhff3cTH+x8VXFpyYX6sx7IHYOFyT/zBpN5Mgrsnhs7ZoL wsdwz1WCGVDXCpbf1Ip9vea1WdcSAep+fDU2VFDtbcb8OilhaI1E= X-Google-Smtp-Source: AGHT+IFAUkqpznwVuXqoJimFFmaLnFKl/kGMRyRExyxQFtkGD492C+NwhNSINhu0USmY2WxK+oqUag== X-Received: by 2002:a05:6402:5603:b0:615:d33c:5383 with SMTP id 4fb4d7f45d1cf-615d33c5759mr598535a12.16.1754037159085; Fri, 01 Aug 2025 01:32:39 -0700 (PDT) Received: from tumbleweed (ip-77-25-33-2.web.vodafone.de. [77.25.33.2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a911a59dsm2362735a12.62.2025.08.01.01.32.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 01:32:38 -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 v2 4/8] staging: rtl8723bs: remove wrapper init_addba_retry_timer Date: Fri, 1 Aug 2025 10:31:27 +0200 Message-ID: <20250801083131.82915-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801083131.82915-1-straube.linux@gmail.com> References: <20250801083131.82915-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 Reviewed-by: Hans de Goede Tested-by: Hans de Goede --- v1 -> v2: no changes 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 16:14:49 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 B6B702206B2 for ; Fri, 1 Aug 2025 08:32:41 +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=1754037163; cv=none; b=I3EmEZ/jGY2iXMdSNu6uggtdVEWfQenbRMJ8zskTaILdIcgK3oeHVNjGHQYuE7kTKbjhOkoONRAmy/7nryBljqA7i4UIioUYqA229OIobvZfPESk4OnRZa35740y34FaanNw2n8UE4iuctE5tkVuknLNJmH3bc19p+WZaYj4OOw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037163; c=relaxed/simple; bh=u4ILaCmJ1NI7frw+wzMCZE2/gYH+BzJEYUtfuQsAqfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N7cx153C2/Ky9EEyKwRJAKK6LIL5FYGpG2O/Gsn+CRwTXJ6X0q/Sse+wCDkrY3m4Fah14/deAXh9FSmjmHYE7rqGIvBObMfQWChdlqpCbTxHaKyQldUKCSBZ4TTs8JEJX/8SjGP64QkTpkQNEJyw3Tc+qhkpI89PDF+0iULmCBA= 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=cYwvI4V9; 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="cYwvI4V9" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-61571192ba5so2644677a12.2 for ; Fri, 01 Aug 2025 01:32:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754037160; x=1754641960; 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=rTHDESjkBUS6IAMRUedeGkKS6hmPI5IEjbKpB43coI8=; b=cYwvI4V9gv52KFtdipcNSGXzN5lvMxacfGGAr54lAlELBPwBmzC3bBVWiZNVLFjZBl rMcp7LuTqQQOLfISrbw60JSS8FusMXn3fr1V2uNOElNaXAqMEff24ChIGUL3YDE742iN noAjisTDTQa/gnXLHixd4x+vwDRjKRleVUuUQYNwtO8IfTGYSHyci20qV8rUTZNP8dYQ O/SxxkGEL6BlIK+R+jy0FPMFcGScHkhugolOkiKaLfYIDk1td6KYPOtvq+UcivxBubAa JIOlYC/JEa5sKSYOpOSoroTN6xV3gaXhj6Mbc+LI75KStzIC4EEZoK2RkW7PgLGaZtpa OD6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754037160; x=1754641960; 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=rTHDESjkBUS6IAMRUedeGkKS6hmPI5IEjbKpB43coI8=; b=q0AxpauLCXFlPc9nXw3HRjRfG2vLW+xqUBklXForfcqnxwitcGBG6UHM9sPXR5ek+z hCAV4T85U83MZt2/duJy4qEs4z+itHZDspRdY1NUbErJDgYBpdLGTMFQmyK1HhOOZx3j g+V/4lJ9T+0lXTAmiD4tJ2pCx4sH7Q07jXIqzXBg37Bc//gUXkTrTdbXVumu5kInwosd uivL1jAg6TY1CBJ7bqP0lH+WneICDDU6tc4eckcXhQ/n5Za41xws46AjXKH5Zac2DwUi Xw4yHRvCUAxbY4htPxGRKEwMOKQA8eSfxWjgH0wNrWbH9zjfMqCZiRIDC3LT4+rDN/+x PeSA== X-Forwarded-Encrypted: i=1; AJvYcCVkTnlyjzHebSkgm1zcbsmRWDbNCTUqUy0IKQoAv+PmlI1CMvdyjMFVfl7PJf+Hf1ya120KiHF3k0cQlk4=@vger.kernel.org X-Gm-Message-State: AOJu0YwrMhWsQVLBQ1Q3UkTouGmMOnnSy+qQm0zxWyQz/rcbPuW2C/hl 4LI6aRUGeatctCUSQw0QIV2GC6Dhc6DmSjjBaD0tiK7uMnIOwVqe29+X X-Gm-Gg: ASbGncvRoA3DbPqmxyfYc1Q/4FOH+yN2tNqcx9gLEh5tkvk3wtWWsDdtMDEtnjtnqIX b2EGBm6QdWhZKpjgI5cfilWbbbADlhBrRotfczk2BJjmwKXY1R1MngWtzFnxID660saXFUWbXlj eVjxh9ZfVdumZYsqpIptkNH2Nvhjgcsbj+FuA/Wc0BLWdr41DMQ6So9uLlPpkoid9bo//MdyZmi /vSsMOk9GDA3RHRzyX30KH5GsNPJXJrcrM5Etx4wjRcOaNAQAgGMhpAtLDIny6+KiR9vr1Qk/Tf qM4hBplLlhJTd/tzpFVd3cCgoT3/dbyQPjg9AzH17c98dVnXvLzw09otJtPQyWffLy51QeQ1hV0 ua25KxcbCZnGRqw4kwBkDdmenhEa4fjmHadDnzZJtf0R28ZybV9aNK3/Qq9+vJg== X-Google-Smtp-Source: AGHT+IHO1dD7rOATDlB/3W92rSORtlW5/aV6FE72dj4ndusMskVWj81AZO9BAxh5Wt6Hjv0zjjXEcA== X-Received: by 2002:a05:6402:4302:b0:615:a5d5:972c with SMTP id 4fb4d7f45d1cf-615a5d599e9mr6125936a12.6.1754037159717; Fri, 01 Aug 2025 01:32:39 -0700 (PDT) Received: from tumbleweed (ip-77-25-33-2.web.vodafone.de. [77.25.33.2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a911a59dsm2362735a12.62.2025.08.01.01.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 01:32:39 -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 v2 5/8] staging: rtl8723bs: merge rtw_os_indicate_connect into rtw_indicate_connect Date: Fri, 1 Aug 2025 10:31:28 +0200 Message-ID: <20250801083131.82915-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801083131.82915-1-straube.linux@gmail.com> References: <20250801083131.82915-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 Reviewed-by: Hans de Goede Tested-by: Hans de Goede --- v1 -> v2: no changes 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 2e957f00bd75..b0384244a950 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 16:14:49 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 1CAE52264D0 for ; Fri, 1 Aug 2025 08:32:46 +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=1754037167; cv=none; b=FcYIBBdD3oFM/VGVHzy9E342MCmuATeca8o5YyvyqDxNJZhuyVVQLdY+CpBVDxgLMlkzVwwQMlqj1h3PJyYZEAWPLtFDbyn0czQpi5hkJn7KYWH53FnpBLPV3NFJeaIqheRTPJrlBoIyRXtDs5etNtCAKCXgfoCdsC/vGSvPtss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037167; c=relaxed/simple; bh=Fem8ko9lSvGHfgnIOnh/NvK/frr+MZh+mvHCOWVbchY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HssmBsgwGuAlRfREf11at696rWzYI3QFdL8sZ5SkuKEVYSo8qh8SqaUggLwHb2piF0AF49Uv4nqH5zwH/qQ+F32cGs+os5hT7l6FTZUgx/8SUV7V9XeEmWYE6NJ6DoZyMYL6smBDTrcmFQaYUZpv5+/4Br1GMinFDiEsncmf8Q0= 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=cVDi3yqq; 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="cVDi3yqq" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-615622ed70fso2196046a12.3 for ; Fri, 01 Aug 2025 01:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754037164; x=1754641964; 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=2bBtvdWNzSZQGm09QORxMyO31qGjWa8u8PjxWCuc9as=; b=cVDi3yqq1ZqcaF3dL7SyswVZnvZ3MHB0ClYqhGhx4AgiIkK2RspXoeOJvf7d20FUXF QRs9Ffo/lo8TRMxJ0751zFZoSnLc+WFkKi9MBybiQVr9wnfXanK/a7Lk9MMljp0U+bqG zrHmi/jkm5akZxSZv0t3SoBlvAS0dqcpct4kDiL2LT530uhFCco70repZplpATIbysZu Ahp52wXQWil2f5zVwPivU79ya96+8pwVgz3RdPC2kO7RAXIg5luFoYgnLXM8XTedgY1E XQsnBFgK8K2VAZ1ZscpT1utRbaz/8lHH164R+47SNyP+2B8UOAB6R7sjTW+UTpDTNtHX qD0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754037164; x=1754641964; 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=2bBtvdWNzSZQGm09QORxMyO31qGjWa8u8PjxWCuc9as=; b=e+GAHU9XYYBXhj5HIpyQYovT86jD7CnN2Mgrzvp1HLax6UxQ9frQ1uqDjHXBSuzO6t vBu6ZqzcvME3wZWASjUhsW52r0NAoTwS/SvmHyU/Qe1vFWs7yy0kNsFK7sN/W0nlMMpX NTjfd6J80w+1MoSjSKvr8Sf1yhWypvyvEAF7ryVfXK221wLtm1NqU9LyY3nzRUp5MAYu xXr0jF8GwC7e/weeAW+bllzWTJ9tlBHttQJKYsblMrbGjpcZKlfCcaPM3W8PJm43uHxz O60C5o0a2MfOIEaJ35VIfWJUWE5SGQQZpbJXssrBwsmD6DfuZvFFQoWEjCtkaBtZebl5 C5sw== X-Forwarded-Encrypted: i=1; AJvYcCWFq+bl+a1tDROGWakLAGgcoepWqLAtbGhaOC3sgSNKhAXusTyX9ZxIH2TytxHysbetkD4ZxZoCx1Lz72o=@vger.kernel.org X-Gm-Message-State: AOJu0YyTQvLgTRCWGUfk4hPewdnQYA+EP40TpeMzBJs6o21kcdCfxhY9 geefAEu9xnyttyp/6uoo5Rse3An2s4WGRWGBWXPcFkD+GWYTe6QvLJos X-Gm-Gg: ASbGncsyIBSHrlURi76Vf7MHmAShdUYaOvdqM1ZcCYlQ13MhRAT1DdGTXdd4u5t3wdY WTRCVQGvKzhK0Iow0rb++3JTkSDJd1AGjEM7d+ewkjtAruVHotGWqoxiYKf3kRu8AY7tUeUUusU N3nGJncAvwa+WyIZ3IWdoUL7j7e/fCi/HqIKenbR8tt7YoNzfXrXI3IdV2ZA5c1lF5xbd1U/RFK Upv0PBRBcLRAsy3NVzTGe275rOxeK0flNDygpA8M9xevhIbq+JxV3nIKz/N2RMIfO9y2LrkM9wB UnCE+RflVIjU0DX6ygTALcofwnl6OQqh4PbqGGMsi7vx8Kmj5defPpaGSttu3N1owo+Wr/Mbg4h AK2PmJrt3iBpTgRTX/Vt3xDLKX5kIna5JKZODWUDaasdZzJYh2XpmA1iWalbYYQ== X-Google-Smtp-Source: AGHT+IGUM2Trs7GoVAhrsokBw8hYDQtQNMKPEPAcNZUU+WeRHA1SHQYaNhbpGznOVlfXrE/+PtCNbw== X-Received: by 2002:a05:6402:5cb:b0:615:4d3a:9330 with SMTP id 4fb4d7f45d1cf-615cdd06d80mr1766661a12.14.1754037160476; Fri, 01 Aug 2025 01:32:40 -0700 (PDT) Received: from tumbleweed (ip-77-25-33-2.web.vodafone.de. [77.25.33.2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a911a59dsm2362735a12.62.2025.08.01.01.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 01:32:40 -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 v2 6/8] staging: rtl8723bs: merge rtw_os_indicate_disconnect into rtw_indicate_disconnect Date: Fri, 1 Aug 2025 10:31:29 +0200 Message-ID: <20250801083131.82915-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801083131.82915-1-straube.linux@gmail.com> References: <20250801083131.82915-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 Reviewed-by: Hans de Goede Tested-by: Hans de Goede --- v1 -> v2: no changes 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 b0384244a950..839496aef933 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 16:14:49 2025 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 6D9D12222B7 for ; Fri, 1 Aug 2025 08:32:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037165; cv=none; b=qC8iNE4AcDoeDLD3j44N5N0XXUE+oJ/a5NSLWBNFFVCFjH6qskq3EOheXbveyCNOVbtn1xE6Z3Ycr75edZCwjkeEtHBAUPY+qlxfZ5sIkLpuz34/585TLYZ5RVhgOT2ZMM+nzbVosU9yDA8GShfwsWWhwRagbVhn5XGFDohKa9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037165; c=relaxed/simple; bh=6LAp/b/lldOK3zVDh6jZuxdHhcUanuF5F6aqTdw7jeU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lbomr2vGsoKdMXh0JdVydlG/NGkhOl+HQJjdebhK/rI+HVIdvYM60g0WWD77qq8J1QgadtRiuNr+OQZxYmokYTi4GQ1juRrqlUrEyGHFIfZaQzHo8CIjMo/ASShS6CFJMWu6+9LCXJv4zUW0kCh+6baMS5FpnT4hOLjc2C6V+rA= 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=AXzzf0kl; arc=none smtp.client-ip=209.85.208.47 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="AXzzf0kl" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-604bff84741so2371514a12.2 for ; Fri, 01 Aug 2025 01:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754037162; x=1754641962; 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=zQd4r+QBAQ7livBvDF2Cnl00jX0+lsRk4nu46EPRFUo=; b=AXzzf0klp5atScB639XBwbI2TVuxvcpibITFZ7zcVc4BkKQEJ7jJvObEfU/ObC8wg3 XiB0p4/27qUCZFHxA8YiInfV+sglELSahbqLuV2UsI0S0EMUMBVZ466uzQEA/Ttim5KI O7aDg/3mvQ86FTTRqIyZfJqrYgt10b3xtdyBEklAOFsCJXwO4JIxPjVSVuZLU6+TJA1p oAPp6tqCoBUd+SeDNzH8grVyAx36R1962jKgOoqfZ451J0cTNi1OL84/B7H9mj6GJX1B HcErxmYXgpS6KBrvnkmSJITLWVSio9Dmm7ioq/oWzDvNNolS+I93A/lFOKOt9JBTcf6k x7Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754037162; x=1754641962; 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=zQd4r+QBAQ7livBvDF2Cnl00jX0+lsRk4nu46EPRFUo=; b=qfvqsoRMc+6FiVpsHHs9Ct3OlqlFXcTse7RViHPD9Xa6aeJm+n4kGCzo3BRuI7KMx4 arBOkN4R5CgD9tsZv2vbtMBV+DD1vQdGc14FfX57aGID750I/8yOp0wllQQjDI5Aby1N jUVEUQBEHerdOrUz6Z+GjxYFB/TExSkYVwx2FWeOt+uxncZ9Q+BQBc3SPV1MNUgJLimM OyLoqDQlVzKXmvzJmJn677MelGJ+MmJ5j0sK0+O/+z1pE1+Lv/hnELfC62MCLwYvfZkU foE37LVn977MOIPdgqQUHI5nXw6fFRodjYtcNWeUcDd7RJ+S/gJ04aNzz85qq+gCRExe B0lA== X-Forwarded-Encrypted: i=1; AJvYcCV4GyQq6B+j/jJjQw+TGBIYBYg9+ZkQa30M0VsWCynLuaOsGqhYMrZyv54RX8UM1UgCQW+dy9AWIwc0Grs=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8BX1Cgq4LFXKfooVErd5hCjsKsVDpE9/c+AjxhbKTZJWRytJe m8tFOaZ9LK5J/eo/a0Gxm1/DWlYv0ZZFqTHqld2gtzgqhtrdin3g2aJD X-Gm-Gg: ASbGncuO23JppWuMV6NTr5QMkzU30PMYfLn6ckvyHSGOkOJTN2DSo1SsyPq7TbRgkC3 0TYM052aUQRrwjzb9ubkNZTDTHCP2sM593cL2xzc78PIEjaqjE1hHc0BzNL4KDBMuweDJsX5yCY xSEysukM16TNWClytogJGtcWwo/O0UaJFjWoF0afEYZ3MgFUYrgtjfKxEZib5hP8HGYIHJaR4gW 6n+di7MFuN5w83vgCXisUBOXig0T9N3gmqSh2YY2SSO9SxQ+kfLf4TzPZvBEyBP630TpwVGH+h/ nR6NdSlS8Uofawu3XnWaWvM2AJkrhd7tR/q9ygNulu3o3Qbb7C6snTqzkYaL85SDTQMWzrz64XT 2JZKoUyoii67PYFgEIbPyu5pbF6ae6OtEB9hgw+1YYubUdWpd504= X-Google-Smtp-Source: AGHT+IFdiZMkESDQvAHlWboTh1xfX8SBJwb5SyD9HTM8E4Akk3n6TQRRiQnVUbtrqMJEogjKUM/rrA== X-Received: by 2002:a05:6402:2802:b0:615:f76:9408 with SMTP id 4fb4d7f45d1cf-6158727399bmr11228509a12.32.1754037161545; Fri, 01 Aug 2025 01:32:41 -0700 (PDT) Received: from tumbleweed (ip-77-25-33-2.web.vodafone.de. [77.25.33.2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a911a59dsm2362735a12.62.2025.08.01.01.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 01:32:41 -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 v2 7/8] staging: rtl8723bs: move rtw_report_sec_ie to core/rtw_mlme.c Date: Fri, 1 Aug 2025 10:31:30 +0200 Message-ID: <20250801083131.82915-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801083131.82915-1-straube.linux@gmail.com> References: <20250801083131.82915-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 Reviewed-by: Hans de Goede Tested-by: Hans de Goede --- v1 -> v2: no changes 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 839496aef933..4c816fb2500b 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 16:14:49 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 43DE92236E3 for ; Fri, 1 Aug 2025 08:32:44 +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=1754037166; cv=none; b=SR3CmP3UMz7vs0IYmvG73CZNKhGNFmHQvQrxsZaKaavpmNgxevuuTWyhPr5jF+dcOyuLvNVNBpnsi4Ou9qJ0XZyzBXFJLpNu023Os5cl77X1GuS/te2KKziTlHUyfK10lRe6FtBswxuzycyr2hWD/baMWxcl2pIo8kOXGtaZlVA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754037166; c=relaxed/simple; bh=FMIUakQSKLWOnogEyddNVDBaxSVMMCzVFcBzoICkKek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OvEXyNT5szrkMocHgqNxXFzdE1ivJO9vSkA7MjSDL6xMTpkqDmJgA6aH3xVG6fwW0Fb5hDdpIhaSX5bCTsKeS3kSNFmqjiREEG0OoDQIY7fX25htrAJc49DkrJtXRsja3vH2DPESkHVCRk9LwkO6CTeD6iJJ6MxOjzssmE2ikls= 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=NB3YL2FN; 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="NB3YL2FN" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-615622ed677so2616620a12.1 for ; Fri, 01 Aug 2025 01:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754037163; x=1754641963; 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=2onPGbHFtOLNzYANYUg22nvBv6obu2eVACcu780+yPI=; b=NB3YL2FNO7k8Vep6l66HpNO4uD1Zs7+676kGpRZPumLNeultTc/FlClbNIUfqiuUAR dGGmNPkhyFDaFsAdPFyaTg53t9AufyVOiB0iXaxqCh4s6w6qGWiJvs9pom2gQNkCzALq amZaa8ogYseZw1earOo293fXJRC4dhDmAJS9+74l82FXBhW6xsphOhsHk3B2MV+Dm61r 2MSrMio56tCe/n9ZuruJsctjjsN8/Q1FnuNYoli1Bk2JbTed20o7nKU4QRGXuHF/nsrQ alXFnUFmVuragtrmY5lOg5vYPON6p3gG6Yexx21fRf9jEOAP5aCD/fTWvYui51XgyefD m+Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754037163; x=1754641963; 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=2onPGbHFtOLNzYANYUg22nvBv6obu2eVACcu780+yPI=; b=NcGHnC54LktrkeaBK0eNLRVQG6dYVkyHe7WBwjRQ98g5GbGZEbVhjzOA71JkbwKtL+ W5KAN15+nfqTh9fgh3A8pQWOSvy2wtLLlL4SIAyBRH2r+lf3KwFu/g/42IxY4DR6wvxj GDOejEFn/mR+QrHNW9T/rLhYbGre9oFbadOeyC0ZVaS09wKJSmm0aQ1Auyd1n0b8scnG TkpNKPQhkDPGT+fL/C+fkSwCNXOZFxc8bhzV38TwkfvGkUK1wiffvuCs1Z7/wYsicLn8 rkAnmE3B8JQjKzuizZOiLBG32HSbfouqgMtSXiC6vL9BHOO5BSzbRJdtgIRWWotEmyOA AjvQ== X-Forwarded-Encrypted: i=1; AJvYcCWEv2R84J3xB8p2R4tnvGH1ZN5mT84o1v4EkbLWdD4Wa1GIp+HuSqLTq53iL6XqJwRYaZ0AW4nAJXjgtl8=@vger.kernel.org X-Gm-Message-State: AOJu0Ywyglf1nRrtNOduCgS7iI5yBZ0u/J0TFkXASAMSjYrEDVmzYf1f fDQM41GMc4xtWkO2CqKL/q+oTpVq/3D8b/BkLTEfEusZkAqtF2xKLoc9 X-Gm-Gg: ASbGncuOwbBa/nK89Q7vnegznHYkFzpCmVKBC+s/uuLilvMOTDxZuXU9l4hgj9i4OEu c6iv1pusI606o6VGthzl0P3JRTXoDxgjMjuww65RUqPL0AqlqoONal+VIWjtYj0Uu5O3yHK3b/j oeJl+2ifOYDz1T2u/s83o9z7gwxImIDjpZTU7pF0xb6jnPVTKIY3S9dAQrWKv0ibeM8UayqUmmV P1fIxf/XMbzmWieP7MWM31bMTX7Zx4NUwRRNrGJtQtyCgqhieUjuqR3uXDiAvC+uOrGe7Kt3Ld7 gJE3UlEFGpkH/jt9SHaHAwJq63tJFtTB/PDdIs3auzsqcTN0iNN/0CgrapsNcShMbPbO2qjjybQ Oq1mjODgCOIzb0jVieODSClkrG1bbeaDV/ULTJiL8/Nfpz1EIPI/5lssSrMJoLA== X-Google-Smtp-Source: AGHT+IG9Hl6jL80/ej1OiTE+v72RAZtbDeDDG6cYH8dWMac1qZxeD3bRaCW0Cat7/5EFvSCZeScwyg== X-Received: by 2002:a05:6402:5cb:b0:612:b9bf:2a56 with SMTP id 4fb4d7f45d1cf-615871ba1c9mr10039662a12.21.1754037162382; Fri, 01 Aug 2025 01:32:42 -0700 (PDT) Received: from tumbleweed (ip-77-25-33-2.web.vodafone.de. [77.25.33.2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a911a59dsm2362735a12.62.2025.08.01.01.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 01:32:41 -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 v2 8/8] staging: rtl8723bs: move rtw_reset_securitypriv to core/rtw_mlme.c Date: Fri, 1 Aug 2025 10:31:31 +0200 Message-ID: <20250801083131.82915-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801083131.82915-1-straube.linux@gmail.com> References: <20250801083131.82915-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 Reviewed-by: Hans de Goede Tested-by: Hans de Goede --- v1 -> v2: no changes 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 4c816fb2500b..84984de45788 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