From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 AA42A411FA5 for ; Fri, 31 Jul 2026 10:43:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494635; cv=none; b=fkx7dwBYLlCLQCMoc75hRvxfHJ6c8sUCs0j/mnHNn1uMxiIFVpuXGynA8F6ZfWFWtwBRp7cFagGK6d09/p8X1e3QFQG1BZesUh750q/YNklVH3TYrG+U0cljIMv76IaSDJX7Ed7AFrI2WCmyygxKG9xVjy33ij3B8vWN2iUhljw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494635; c=relaxed/simple; bh=+iHyocbHvJ04pGuwpLc88raS6ANjg0uiE0VmWKmm1BE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dZnXQVtJnF5XlZsljqmnOX491bWqSpIIxnyurpJ6GShzOigUJikUJzGxM3WGN8SmG6rwTwMK4PVfskyQ81uVAlUfpQt/xbjSbPSYXgUT63p3Y336WcdODa7cmsv6Ot88WHxklEp+WV4qaovLRT0UGfVVwNfEewPuk6APoax64YM= 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=SWNoc6zA; arc=none smtp.client-ip=209.85.221.51 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="SWNoc6zA" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-47f9ab7ee38so487559f8f.2 for ; Fri, 31 Jul 2026 03:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494620; x=1786099420; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Xttgst+kRW0syMNUBMN7N+TvXtTCsyLFTka/W5fwwn8=; b=SWNoc6zAQuXHgpkbsM9GuAE6i2jmBQKHaXcrC+BJnfIc/GR73KDwylAfvumqbSOlkL u4qn4cD/NvXG7wRrQca/gUTlSLLRp0AXDHOh7xC0YpJb7t4bCR8SukLZ8nG+f1AGaKvk LMwf4GPRHLAKJFRxIU0aszNbyTNxq7OGE0090bJ3eFfJu/shXknx/hFu9EM3xRDqxFYL aCukzeEWsx+ssIbi/Nw4ClIcNZz5dYH9rwlUz63Ypw/51OIC2AgJi4S8bwB1rO4yw3DJ nFhgL6GOA3yhWssSaPHGNg59oEv4Atx72mO2m+WJRzkELrEZFjIwn7jxZMKnw9K2B5gu VMXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494620; x=1786099420; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Xttgst+kRW0syMNUBMN7N+TvXtTCsyLFTka/W5fwwn8=; b=WFtKFsRlaz63n7j2gu3PeJpVc/UeqMKsO7wq/wbxMhoIuoyap1Gn+oz0HV7Vo/UVO9 MBlzRXVN4hgmmhneUUBIt82ClqD0+jRxssOfOW8vZiVSBr0QItlDY2TeGpIheBOXOdG0 F7SzUjgQG+GOOLc31D5vJZYeAnCCbuRlRVac+HlN/Tq5sfglCwlebdnEJF2to+BlmHox 4tjPnAvn42gA9YSRqsgzezlw6JrThNZjVBNROTaW3i/RienehYBfA2xgs/qyuAUj76g2 SYDnpokI0oid9FjLJ9U91FPgDNLhCQDBKcm1dic517f4lU6Hkg0+w5dlV2V6D/uYWvap L9ag== X-Gm-Message-State: AOJu0YyknTB3CauMZvDSpd8PH2ky9tNvmFV/lyUfE3UWFWd8+rEmA8g9 s6mvB0RebWfXjfU76IFH26oVnEtdEcYz1Hgkjj3zhTq3dwXkPFbn7wcx X-Gm-Gg: AR+sD12jwPUjOa/e8rPVp0CrOCkJ86SZD5deGZRFhM0e044hwI7nsQR5rtKBYDCK1ow h2A8H+3lyO6IOfpE6gdT+3EkQinejnX8uGmtOK6CXGLUEr2Le52tNgVe4FVvtRuHO0DMUA4zGUl 4ULNGMmJwPlGIDMbUNVIYTyiidBa6EQ+nYW5F3VOdt0R3qgodRNOpAVThKEpUrLYMcukJqhjOnV xI7A90LZmmI4/jennXPRoLHzOA3765vf3nR75AI76IhDvMuP1qb+UQX/sybNTP1BDkGZf1grF74 +4lc7vOuUrw9EjoojJ3ds+o6bL3uWQ8WQAMDbbmr2BviNjBOYcmhDVU5578J/a1cc9v4RloAPRS C6Q06cY++ApQY5UWZmKDoI9JZi15+i5B6NONuTesfMs9JxrtHTXGGbGnCs6RRY1v+5X3IZ4LStQ 1eLdlvCdODCccREb62sD2vibq9YXFuVQZZ5GFyjSbQ1H70d/vAvN751KsdpxLMe6tZyNPyTRfIe GrMKhaLEBjaVYGGVRzYyePyLKPlQl/0lI92M3lS+pAMbLoJxKpq X-Received: by 2002:a05:6000:470e:b0:475:f0f0:9efe with SMTP id ffacd0b85a97d-47fd2b5d8c3mr3421875f8f.53.1785494619727; Fri, 31 Jul 2026 03:43:39 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:39 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 01/11] staging: rtl8723bs: renaming variable pbuf in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:24 +0000 Message-ID: <20260731104134.12754-2-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of pbuf to buf since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 42 +++++++++++------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index fc46b33b836a..7f43f8f27186 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -42,7 +42,7 @@ static void rtw_init_mlme_timer(struct adapter *padapter) int rtw_init_mlme_priv(struct adapter *padapter) { int i; - u8 *pbuf; + u8 *buf; struct wlan_network *pnetwork; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; int res =3D _SUCCESS; @@ -62,15 +62,15 @@ int rtw_init_mlme_priv(struct adapter *padapter) =20 memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid)); =20 - pbuf =3D vzalloc(array_size(MAX_BSS_CNT, sizeof(struct wlan_network))); + buf =3D vzalloc(array_size(MAX_BSS_CNT, sizeof(struct wlan_network))); =20 - if (!pbuf) { + if (!buf) { res =3D _FAIL; goto exit; } - pmlmepriv->free_bss_buf =3D pbuf; + pmlmepriv->free_bss_buf =3D buf; =20 - pnetwork =3D (struct wlan_network *)pbuf; + pnetwork =3D (struct wlan_network *)buf; =20 for (i =3D 0; i < MAX_BSS_CNT; i++) { INIT_LIST_HEAD(&pnetwork->list); @@ -632,13 +632,13 @@ static bool rtw_is_desired_network(struct adapter *ad= apter, struct wlan_network return bselected; } =20 -void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_survey_event_callback(struct adapter *adapter, u8 *buf) { u32 len; struct wlan_bssid_ex *pnetwork; struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; =20 - pnetwork =3D (struct wlan_bssid_ex *)pbuf; + pnetwork =3D (struct wlan_bssid_ex *)buf; =20 len =3D get_wlan_bssid_ex_sz(pnetwork); if (len > (sizeof(struct wlan_bssid_ex))) @@ -675,7 +675,7 @@ void rtw_survey_event_callback(struct adapter *adapter,= u8 *pbuf) spin_unlock_bh(&pmlmepriv->lock); } =20 -void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) { struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; =20 @@ -777,11 +777,11 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *pbuf) rtw_indicate_scan_done(adapter, false); } =20 -void rtw_dummy_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_dummy_event_callback(struct adapter *adapter, u8 *buf) { } =20 -void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *buf) { } =20 @@ -1143,12 +1143,12 @@ void rtw_reset_securitypriv(struct adapter *adapter) /* if join_res > 0, for (fw_state =3D=3DWIFI_ADHOC_STATE), we only check i= f "ptarget_wlan" exist. */ /* if join_res > 0, update "cur_network->network" from "pnetwork->network"= if (ptarget_wlan !=3D NULL). */ /* */ -void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) +void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *buf) { struct sta_info *ptarget_sta =3D NULL, *pcur_sta =3D NULL; struct sta_priv *pstapriv =3D &adapter->stapriv; struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; - struct wlan_network *pnetwork =3D (struct wlan_network *)pbuf; + struct wlan_network *pnetwork =3D (struct wlan_network *)buf; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; struct wlan_network *pcur_wlan =3D NULL, *ptarget_wlan =3D NULL; unsigned int the_same_macaddr =3D false; @@ -1251,9 +1251,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) timer_delete_sync(&pmlmepriv->assoc_timer); } =20 -void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_joinbss_event_callback(struct adapter *adapter, u8 *buf) { - struct wlan_network *pnetwork =3D (struct wlan_network *)pbuf; + struct wlan_network *pnetwork =3D (struct wlan_network *)buf; =20 mlmeext_joinbss_event_callback(adapter, pnetwork->join_res); =20 @@ -1272,11 +1272,11 @@ void rtw_sta_media_status_rpt(struct adapter *adapt= er, struct sta_info *psta, u3 rtw_hal_set_hwreg(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_stat= us_rpt); } =20 -void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_stassoc_event_callback(struct adapter *adapter, u8 *buf) { struct sta_info *psta; struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; - struct stassoc_event *pstassoc =3D (struct stassoc_event *)pbuf; + struct stassoc_event *pstassoc =3D (struct stassoc_event *)buf; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; struct wlan_network *ptarget_wlan =3D NULL; =20 @@ -1363,7 +1363,7 @@ void rtw_stassoc_event_callback(struct adapter *adapt= er, u8 *pbuf) mlmeext_sta_add_event_callback(adapter, psta); } =20 -void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) { int mac_id =3D (-1); struct sta_info *psta; @@ -1371,7 +1371,7 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *pbuf) struct wlan_bssid_ex *pdev_network =3D NULL; u8 *pibss =3D NULL; struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; - struct stadel_event *pstadel =3D (struct stadel_event *)pbuf; + struct stadel_event *pstadel =3D (struct stadel_event *)buf; struct wlan_network *tgt_network =3D &pmlmepriv->cur_network; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; @@ -1480,16 +1480,16 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) spin_unlock_bh(&pmlmepriv->lock); } =20 -void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf) +void rtw_cpwm_event_callback(struct adapter *padapter, u8 *buf) { struct reportpwrstate_parm *preportpwrstate; =20 - preportpwrstate =3D (struct reportpwrstate_parm *)pbuf; + preportpwrstate =3D (struct reportpwrstate_parm *)buf; preportpwrstate->state |=3D (u8)(adapter_to_pwrctl(padapter)->cpwm_tog + = 0x80); cpwm_int_hdl(padapter, preportpwrstate); } =20 -void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf) +void rtw_wmm_event_callback(struct adapter *padapter, u8 *buf) { WMMOnAssocRsp(padapter); } --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 97A73419314 for ; Fri, 31 Jul 2026 10:43:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494637; cv=none; b=BF6OhPWfB5TOXBy8mr2YKeTcLB8grpZ0ArelnBiD38vaP9LJSyVRdG9DclH8GHFR54z0xZ67qhFjktnHqHVZxY9v/+nJVHAKZ6AqSxPyg9SxZMANkilX17sycUMZp2XsLgwzFP8PMbvabhcBMBikXkvfySDHFP3YieWbUFP9UiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494637; c=relaxed/simple; bh=bcChaHKviVKabZd5Nuts/U3Bc37AX5xhFT3Yg/qlJdQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f0n/7axluP+a95dQyNsQ0/PoOOByyn5U5J6Q6M/OxY2OtQQw2063tq3Xz8gLeFLOI4xnYVKg3eey1LAb2NSJWbuzEHQKr5OehCG45QKKtc+UEWPK0jJhwsqWz45C4WUjMeRzT0+sn6lE0TqTLvegRBTZXadvBeFikEk46QVhDvY= 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=K1uyYgSR; arc=none smtp.client-ip=209.85.221.51 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="K1uyYgSR" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-47df43bfb07so317328f8f.1 for ; Fri, 31 Jul 2026 03:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494621; x=1786099421; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=FN3m4V2OjqHsywQEie8ykzImWS2QcSM59uQeZjIXfdc=; b=K1uyYgSRujALCv4Xugt5AhX/VU3OH3nevdk83uYb74+vefJOuwk67AYF7zA4thrvwR xIku6+X86qBZ+h3Mo5EKclACnQ5wQxH8by63I27/nmkhpfolKRIS7HMrUJO5mZ6M4mqw LSmd2j5ZOGLW96CQTblRGCMLwiTM45oB4veF/rDHxqNSzSZ+vcT11XSOUVobLUvXSn/G cuxUWW6JEqP6WQQMfLgJxTso/DdO4h9KBRSqoZx/frlIQf2hX1Avg2KZnlUFJPgnuVU3 llFzMS/boWGeEYRqJDJYgc36B2FedP8gwn5XyNcS9oxx1QOM3dMiQK9B7Dyy39cLz/dM Gq+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494621; x=1786099421; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=FN3m4V2OjqHsywQEie8ykzImWS2QcSM59uQeZjIXfdc=; b=CmOsISWVDoxwKIp23wy/0t1on+/X40CU7+WtACjd7B/iyNEBMVXeuMpuUZbLh/DvmI xRZXXEU+N4QsXkBf1SRydX69KlFA2qWWB+er5NrfX1a7i7x6TSDFK3M5NaN+fHFh5j5W LpfTmtqYYiQskolNwRvjFpivt46p7gj5kUzLbTws6jWLThTdgw2Qj95bW5dRgf9ako3s EJlOdIIJAhIiGT6JarVju0wI/K+alO20erM0tYNdRcoTO3KGpWUJxEbh8duy+CshhI7y cy7d8YMj4mStjfm79iaadjiXCTCEXUGjHssLUpPdOjigWdZeEKcXFN2a0gF4N8WNwN8O lKhw== X-Gm-Message-State: AOJu0YzIglYa9Dc+aKikBoRMBc0u5ERQikYYiiEOydQYV6GtlZEs8b7G B3dNAFjkHBIiYSSx7qZusHS4DUy6SSKnxl6KtI36z4t2tDorQhs4TgzH X-Gm-Gg: AR+sD13b2B7Ae/V7lFI2FbLSlGQiLKGZI1ftxcXpNE1lewoNS02/+/uKFGUgmolgyCj P7A0FcAA4IhB0M6+wgArq2ZO/9rB6QFPcAH9PA2MfcXrzVYcencszftgDFyuTfon5PUNCjf/YeN CMioIIChZOXXUT7gKKpr+FvLa++Itb0qf5M2C349Nlgokozb9oSCMGAYVyhCTKa2lp0KRCc+Njm WwBlivllQFnb+GNgFgULMdihB5lzgfXwMln7Bmzv6nFM28egvSYQKJREhh5+0Bt/0MfbMZNp4nL XEfsj6s4eckTccefEtaZ1FuH+sIuAZZHuXqW9su/PRWwIvyuSyagD5MMCXgS2tge99cLRKhgC3r PIy82cbxKOZjje9JnsnNd3LyUlcLkaF3dYY/tLEiVJOLg86ue7XdYpzQZHt4AnyOuK+YTXHYH93 xrfYX/uqOBpEH5d8xjgLA4Nztkf+HjqxD0cOVqsRad2nMlHw5Et/NrQ4pnDDyU03Dh2WJX528mn hP2GxXIpea3pCy95xg3fEjyHXaSf3bQBgOSdComO9CWudYPZ2kq X-Received: by 2002:a05:6000:420c:b0:474:3b3b:5e5f with SMTP id ffacd0b85a97d-47fd2ac9875mr3679684f8f.16.1785494620591; Fri, 31 Jul 2026 03:43:40 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:40 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 02/11] staging: rtl8723bs: renaming variable pmlmepriv in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:25 +0000 Message-ID: <20260731104134.12754-3-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of pmlmepriv to mlme_priv since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 520 +++++++++++----------- 1 file changed, 260 insertions(+), 260 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 7f43f8f27186..276bf83fa024 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -29,13 +29,13 @@ static void _rtw_set_scan_deny_timer_hdl(struct timer_l= ist *t) =20 static void rtw_init_mlme_timer(struct adapter *padapter) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; =20 - 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, + timer_setup(&mlme_priv->assoc_timer, _rtw_join_timeout_handler, 0); + timer_setup(&mlme_priv->scan_to_timer, rtw_scan_timeout_handler, 0); + timer_setup(&mlme_priv->dynamic_chk_timer, _dynamic_check_timer_handler, 0); - timer_setup(&pmlmepriv->set_scan_deny_timer, + timer_setup(&mlme_priv->set_scan_deny_timer, _rtw_set_scan_deny_timer_hdl, 0); } =20 @@ -44,23 +44,23 @@ int rtw_init_mlme_priv(struct adapter *padapter) int i; u8 *buf; struct wlan_network *pnetwork; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; int res =3D _SUCCESS; =20 - pmlmepriv->nic_hdl =3D (u8 *)padapter; + mlme_priv->nic_hdl =3D (u8 *)padapter; =20 - pmlmepriv->pscanned =3D NULL; - pmlmepriv->fw_state =3D WIFI_STATION_STATE; /* Must sync with rtw_wdev_a= lloc() */ - pmlmepriv->cur_network.network.infrastructure_mode =3D NL80211_IFTYPE_UNS= PECIFIED; - pmlmepriv->scan_mode =3D SCAN_ACTIVE;/* 1: active, 0: passive. Maybe som= eday we should rename this variable to "active_mode" (Jeff) */ + mlme_priv->pscanned =3D NULL; + mlme_priv->fw_state =3D WIFI_STATION_STATE; /* Must sync with rtw_wdev_a= lloc() */ + mlme_priv->cur_network.network.infrastructure_mode =3D NL80211_IFTYPE_UNS= PECIFIED; + mlme_priv->scan_mode =3D SCAN_ACTIVE;/* 1: active, 0: passive. Maybe som= eday we should rename this variable to "active_mode" (Jeff) */ =20 - spin_lock_init(&pmlmepriv->lock); - INIT_LIST_HEAD(&pmlmepriv->free_bss_pool.queue); - spin_lock_init(&pmlmepriv->free_bss_pool.lock); - INIT_LIST_HEAD(&pmlmepriv->scanned_queue.queue); - spin_lock_init(&pmlmepriv->scanned_queue.lock); + spin_lock_init(&mlme_priv->lock); + INIT_LIST_HEAD(&mlme_priv->free_bss_pool.queue); + spin_lock_init(&mlme_priv->free_bss_pool.lock); + INIT_LIST_HEAD(&mlme_priv->scanned_queue.queue); + spin_lock_init(&mlme_priv->scanned_queue.lock); =20 - memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid)); + memset(&mlme_priv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid)); =20 buf =3D vzalloc(array_size(MAX_BSS_CNT, sizeof(struct wlan_network))); =20 @@ -68,14 +68,14 @@ int rtw_init_mlme_priv(struct adapter *padapter) res =3D _FAIL; goto exit; } - pmlmepriv->free_bss_buf =3D buf; + mlme_priv->free_bss_buf =3D buf; =20 pnetwork =3D (struct wlan_network *)buf; =20 for (i =3D 0; i < MAX_BSS_CNT; i++) { INIT_LIST_HEAD(&pnetwork->list); =20 - list_add_tail(&pnetwork->list, &pmlmepriv->free_bss_pool.queue); + list_add_tail(&pnetwork->list, &mlme_priv->free_bss_pool.queue); =20 pnetwork++; } @@ -88,14 +88,14 @@ int rtw_init_mlme_priv(struct adapter *padapter) #define RTW_ROAM_RSSI_DIFF_TH 10 #define RTW_ROAM_SCAN_INTERVAL_MS 10000 =20 - pmlmepriv->roam_flags =3D 0 + mlme_priv->roam_flags =3D 0 | RTW_ROAM_ON_EXPIRED | RTW_ROAM_ON_RESUME ; =20 - pmlmepriv->roam_scanr_exp_ms =3D RTW_ROAM_SCAN_RESULT_EXP_MS; - pmlmepriv->roam_rssi_diff_th =3D RTW_ROAM_RSSI_DIFF_TH; - pmlmepriv->roam_scan_int_ms =3D RTW_ROAM_SCAN_INTERVAL_MS; + mlme_priv->roam_scanr_exp_ms =3D RTW_ROAM_SCAN_RESULT_EXP_MS; + mlme_priv->roam_rssi_diff_th =3D RTW_ROAM_RSSI_DIFF_TH; + mlme_priv->roam_scan_int_ms =3D RTW_ROAM_SCAN_INTERVAL_MS; =20 rtw_init_mlme_timer(padapter); =20 @@ -113,34 +113,34 @@ static void rtw_free_mlme_ie_data(u8 **ppie, u32 *ple= n) } } =20 -void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv) +void rtw_free_mlme_priv_ie_data(struct mlme_priv *mlme_priv) { - rtw_buf_free(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len); - rtw_buf_free(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len); - rtw_free_mlme_ie_data(&pmlmepriv->wps_beacon_ie, &pmlmepriv->wps_beacon_i= e_len); - rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_req_ie, &pmlmepriv->wps_probe= _req_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_resp_ie, &pmlmepriv->wps_prob= e_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->wps_assoc_resp_ie, &pmlmepriv->wps_asso= c_resp_ie_len); + rtw_buf_free(&mlme_priv->assoc_req, &mlme_priv->assoc_req_len); + rtw_buf_free(&mlme_priv->assoc_rsp, &mlme_priv->assoc_rsp_len); + rtw_free_mlme_ie_data(&mlme_priv->wps_beacon_ie, &mlme_priv->wps_beacon_i= e_len); + rtw_free_mlme_ie_data(&mlme_priv->wps_probe_req_ie, &mlme_priv->wps_probe= _req_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->wps_probe_resp_ie, &mlme_priv->wps_prob= e_resp_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->wps_assoc_resp_ie, &mlme_priv->wps_asso= c_resp_ie_len); =20 - rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_i= e_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe= _req_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_prob= e_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_g= o_probe_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc= _req_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_beacon_ie, &mlme_priv->p2p_beacon_i= e_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_probe_req_ie, &mlme_priv->p2p_probe= _req_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_probe_resp_ie, &mlme_priv->p2p_prob= e_resp_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_go_probe_resp_ie, &mlme_priv->p2p_g= o_probe_resp_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_assoc_req_ie, &mlme_priv->p2p_assoc= _req_ie_len); } =20 -void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) +void _rtw_free_mlme_priv(struct mlme_priv *mlme_priv) { - if (pmlmepriv) { - rtw_free_mlme_priv_ie_data(pmlmepriv); - vfree(pmlmepriv->free_bss_buf); + if (mlme_priv) { + rtw_free_mlme_priv_ie_data(mlme_priv); + vfree(mlme_priv->free_bss_buf); } } =20 -struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) +struct wlan_network *rtw_alloc_network(struct mlme_priv *mlme_priv) { struct wlan_network *pnetwork; - struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; + struct __queue *free_queue =3D &mlme_priv->free_bss_pool; struct list_head *plist =3D NULL; =20 spin_lock_bh(&free_queue->lock); @@ -167,11 +167,11 @@ struct wlan_network *rtw_alloc_network(struct mlme_pr= iv *pmlmepriv) return pnetwork; } =20 -void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *p= network, u8 isfreeall) +void _rtw_free_network(struct mlme_priv *mlme_priv, struct wlan_network *p= network, u8 isfreeall) { unsigned int delta_time; u32 lifetime =3D SCANQUEUE_LIFETIME; - struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; + struct __queue *free_queue =3D &mlme_priv->free_bss_pool; =20 if (!pnetwork) return; @@ -179,8 +179,8 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, str= uct wlan_network *pnetwor if (pnetwork->fixed) return; =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) lifetime =3D 1; =20 if (!isfreeall) { @@ -198,9 +198,9 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, str= uct wlan_network *pnetwor spin_unlock_bh(&free_queue->lock); } =20 -void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_net= work *pnetwork) +void _rtw_free_network_nolock(struct mlme_priv *mlme_priv, struct wlan_net= work *pnetwork) { - struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; + struct __queue *free_queue =3D &mlme_priv->free_bss_pool; =20 if (!pnetwork) return; @@ -247,8 +247,8 @@ void rtw_free_network_queue(struct adapter *padapter, u= 8 isfreeall) { struct list_head *phead, *plist, *tmp; struct wlan_network *pnetwork; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct __queue *scanned_queue =3D &pmlmepriv->scanned_queue; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct __queue *scanned_queue =3D &mlme_priv->scanned_queue; =20 spin_lock_bh(&scanned_queue->lock); =20 @@ -256,7 +256,7 @@ void rtw_free_network_queue(struct adapter *padapter, u= 8 isfreeall) list_for_each_safe(plist, tmp, phead) { pnetwork =3D list_entry(plist, struct wlan_network, list); =20 - _rtw_free_network(pmlmepriv, pnetwork, isfreeall); + _rtw_free_network(mlme_priv, pnetwork, isfreeall); } =20 spin_unlock_bh(&scanned_queue->lock); @@ -302,9 +302,9 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) return ie + 8; } =20 -void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) +void rtw_free_mlme_priv(struct mlme_priv *mlme_priv) { - _rtw_free_mlme_priv(pmlmepriv); + _rtw_free_mlme_priv(mlme_priv); } =20 void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork); @@ -452,25 +452,25 @@ void update_network(struct wlan_bssid_ex *dst, struct= wlan_bssid_ex *src, =20 static void update_current_network(struct adapter *adapter, struct wlan_bs= sid_ex *pnetwork) { - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 - if (check_fwstate(pmlmepriv, _FW_LINKED) && (is_same_network(&pmlmepriv->= cur_network.network, pnetwork, 0))) { - update_network(&pmlmepriv->cur_network.network, pnetwork, adapter, true); - if (pmlmepriv->cur_network.network.ie_length < sizeof(struct ndis_802_11= _fix_ie)) + if (check_fwstate(mlme_priv, _FW_LINKED) && (is_same_network(&mlme_priv->= cur_network.network, pnetwork, 0))) { + update_network(&mlme_priv->cur_network.network, pnetwork, adapter, true); + if (mlme_priv->cur_network.network.ie_length < sizeof(struct ndis_802_11= _fix_ie)) return; =20 - rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + si= zeof(struct ndis_802_11_fix_ie), - pmlmepriv->cur_network.network.ie_length - sizeof(struct ndis_802_= 11_fix_ie)); + rtw_update_protection(adapter, (mlme_priv->cur_network.network.ies) + si= zeof(struct ndis_802_11_fix_ie), + mlme_priv->cur_network.network.ie_length - sizeof(struct ndis_802_= 11_fix_ie)); } } =20 -/* Caller must hold pmlmepriv->lock first. */ +/* Caller must hold mlme_priv->lock first. */ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid= _ex *target) { struct list_head *plist, *phead; u32 bssid_ex_sz; - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; - struct __queue *queue =3D &pmlmepriv->scanned_queue; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; + struct __queue *queue =3D &mlme_priv->scanned_queue; struct wlan_network *pnetwork =3D NULL; struct wlan_network *oldest =3D NULL; int target_find =3D 0; @@ -499,7 +499,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t * with this beacon's information */ if (!target_find) { - if (list_empty(&pmlmepriv->free_bss_pool.queue)) { + if (list_empty(&mlme_priv->free_bss_pool.queue)) { /* If there are no more slots, expire the oldest */ /* list_del_init(&oldest->list); */ pnetwork =3D oldest; @@ -521,7 +521,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t } else { /* Otherwise just pull from the free list */ =20 - pnetwork =3D rtw_alloc_network(pmlmepriv); /* will update scan_time */ + pnetwork =3D rtw_alloc_network(mlme_priv); /* will update scan_time */ =20 if (!pnetwork) goto exit; @@ -583,7 +583,7 @@ static void rtw_add_network(struct adapter *adapter, st= ruct wlan_bssid_ex *pnetw static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_ne= twork *pnetwork) { struct security_priv *psecuritypriv =3D &adapter->securitypriv; - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; u32 desired_encmode; u32 privacy; uint wps_ielen; @@ -592,7 +592,7 @@ static bool rtw_is_desired_network(struct adapter *adap= ter, struct wlan_network desired_encmode =3D psecuritypriv->ndisencryptstatus; privacy =3D pnetwork->network.privacy; =20 - if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { + if (check_fwstate(mlme_priv, WIFI_UNDER_WPS)) { if (pnetwork->network.ie_length < _FIXED_IE_LENGTH_) return false; if (rtw_get_wps_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, pnetwork->= network.ie_length - _FIXED_IE_LENGTH_, NULL, &wps_ielen)) @@ -624,8 +624,8 @@ static bool rtw_is_desired_network(struct adapter *adap= ter, struct wlan_network if ((desired_encmode !=3D Ndis802_11EncryptionDisabled) && (privacy =3D= =3D 0)) bselected =3D false; =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - if (pnetwork->network.infrastructure_mode !=3D pmlmepriv->cur_network.ne= twork.infrastructure_mode) + if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { + if (pnetwork->network.infrastructure_mode !=3D mlme_priv->cur_network.ne= twork.infrastructure_mode) bselected =3D false; } =20 @@ -636,7 +636,7 @@ void rtw_survey_event_callback(struct adapter *adapter,= u8 *buf) { u32 len; struct wlan_bssid_ex *pnetwork; - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 pnetwork =3D (struct wlan_bssid_ex *)buf; =20 @@ -644,27 +644,27 @@ void rtw_survey_event_callback(struct adapter *adapte= r, u8 *buf) if (len > (sizeof(struct wlan_bssid_ex))) return; =20 - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); =20 /* update IBSS_network 's timestamp */ - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { - if (!memcmp(&pmlmepriv->cur_network.network.mac_address, pnetwork->mac_a= ddress, ETH_ALEN)) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE)) { + if (!memcmp(&mlme_priv->cur_network.network.mac_address, pnetwork->mac_a= ddress, ETH_ALEN)) { struct wlan_network *ibss_wlan =3D NULL; =20 - memcpy(pmlmepriv->cur_network.network.ies, pnetwork->ies, 8); - spin_lock_bh(&pmlmepriv->scanned_queue.lock); - ibss_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->ma= c_address); + memcpy(mlme_priv->cur_network.network.ies, pnetwork->ies, 8); + spin_lock_bh(&mlme_priv->scanned_queue.lock); + ibss_wlan =3D rtw_find_network(&mlme_priv->scanned_queue, pnetwork->ma= c_address); if (ibss_wlan) { memcpy(ibss_wlan->network.ies, pnetwork->ies, 8); - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); goto exit; } - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); } } =20 - /* lock pmlmepriv->lock when you accessing network_q */ - if (!check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) { + /* lock mlme_priv->lock when you accessing network_q */ + if (!check_fwstate(mlme_priv, _FW_UNDER_LINKING)) { if (pnetwork->ssid.ssid[0] =3D=3D 0) pnetwork->ssid.ssid_length =3D 0; rtw_add_network(adapter, pnetwork); @@ -672,36 +672,36 @@ void rtw_survey_event_callback(struct adapter *adapte= r, u8 *buf) =20 exit: =20 - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); } =20 void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) { - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 - spin_lock_bh(&pmlmepriv->lock); - if (pmlmepriv->wps_probe_req_ie) { - pmlmepriv->wps_probe_req_ie_len =3D 0; - kfree(pmlmepriv->wps_probe_req_ie); - pmlmepriv->wps_probe_req_ie =3D NULL; + spin_lock_bh(&mlme_priv->lock); + if (mlme_priv->wps_probe_req_ie) { + mlme_priv->wps_probe_req_ie_len =3D 0; + kfree(mlme_priv->wps_probe_req_ie); + mlme_priv->wps_probe_req_ie =3D NULL; } =20 - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) { - spin_unlock_bh(&pmlmepriv->lock); - timer_delete_sync(&pmlmepriv->scan_to_timer); - spin_lock_bh(&pmlmepriv->lock); - _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); + if (check_fwstate(mlme_priv, _FW_UNDER_SURVEY)) { + spin_unlock_bh(&mlme_priv->lock); + timer_delete_sync(&mlme_priv->scan_to_timer); + spin_lock_bh(&mlme_priv->lock); + _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); } =20 rtw_set_signal_stat_timer(&adapter->recvpriv); =20 - if (pmlmepriv->to_join) { - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - if (!check_fwstate(pmlmepriv, _FW_LINKED)) { - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); + if (mlme_priv->to_join) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { + if (!check_fwstate(mlme_priv, _FW_LINKED)) { + set_fwstate(mlme_priv, _FW_UNDER_LINKING); =20 - if (rtw_select_and_join_from_scanned_queue(pmlmepriv) =3D=3D _SUCCESS)= { - _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); + if (rtw_select_and_join_from_scanned_queue(mlme_priv) =3D=3D _SUCCESS)= { + _set_timer(&mlme_priv->assoc_timer, MAX_JOIN_TIMEOUT); } else { u8 ret =3D _SUCCESS; struct wlan_bssid_ex *pdev_network =3D @@ -709,18 +709,18 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *buf) =20 u8 *pibss =3D adapter->registrypriv.dev_network.mac_address; =20 - /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY;because don't set assoc_= timer */ - _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); + /* mlme_priv->fw_state ^=3D _FW_UNDER_SURVEY;because don't set assoc_= timer */ + _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); =20 - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, + memcpy(&pdev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); rtw_generate_random_ibss(pibss); =20 - pmlmepriv->fw_state =3D WIFI_ADHOC_MASTER_STATE; + mlme_priv->fw_state =3D WIFI_ADHOC_MASTER_STATE; =20 - pmlmepriv->to_join =3D false; + mlme_priv->to_join =3D false; =20 ret =3D rtw_createbss_cmd(adapter); if (ret !=3D _SUCCESS) @@ -730,37 +730,37 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *buf) } else { int s_ret; =20 - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); - pmlmepriv->to_join =3D false; - s_ret =3D rtw_select_and_join_from_scanned_queue(pmlmepriv); + set_fwstate(mlme_priv, _FW_UNDER_LINKING); + mlme_priv->to_join =3D false; + s_ret =3D rtw_select_and_join_from_scanned_queue(mlme_priv); if (s_ret =3D=3D _SUCCESS) { - _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); + _set_timer(&mlme_priv->assoc_timer, MAX_JOIN_TIMEOUT); } else if (s_ret =3D=3D 2) {/* there is no need to wait for join */ - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING); rtw_indicate_connect(adapter); } else { if (rtw_to_roam(adapter) !=3D 0) { if (rtw_dec_to_roam(adapter) =3D=3D 0 || - rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, + rtw_sitesurvey_cmd(adapter, &mlme_priv->assoc_ssid, 1, NULL, 0) !=3D _SUCCESS) { rtw_set_to_roam(adapter, 0); rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); } else { - pmlmepriv->to_join =3D true; + mlme_priv->to_join =3D true; } } else { rtw_indicate_disconnect(adapter); } - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING); } } } else { if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && - check_fwstate(pmlmepriv, _FW_LINKED)) { - if (rtw_select_roaming_candidate(pmlmepriv) =3D=3D _SUCCESS) { - receive_disconnect(adapter, pmlmepriv->cur_network.network.mac_address + if (check_fwstate(mlme_priv, WIFI_STATION_STATE) && + check_fwstate(mlme_priv, _FW_LINKED)) { + if (rtw_select_roaming_candidate(mlme_priv) =3D=3D _SUCCESS) { + receive_disconnect(adapter, mlme_priv->cur_network.network.mac_address , WLAN_REASON_ACTIVE_ROAM); } } @@ -768,7 +768,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *buf) } =20 unlock: - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); =20 rtw_os_xmit_schedule(adapter); =20 @@ -785,10 +785,10 @@ void rtw_fwdbg_event_callback(struct adapter *adapter= , u8 *buf) { } =20 -static void free_scanqueue(struct mlme_priv *pmlmepriv) +static void free_scanqueue(struct mlme_priv *mlme_priv) { - struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; - struct __queue *scan_queue =3D &pmlmepriv->scanned_queue; + struct __queue *free_queue =3D &mlme_priv->free_bss_pool; + struct __queue *scan_queue =3D &mlme_priv->scanned_queue; struct list_head *plist, *phead, *ptemp; =20 spin_lock_bh(&scan_queue->lock); @@ -811,34 +811,34 @@ static void free_scanqueue(struct mlme_priv *pmlmepri= v) static void find_network(struct adapter *adapter) { struct wlan_network *pwlan =3D NULL; - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; - struct wlan_network *tgt_network =3D &pmlmepriv->cur_network; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; + struct wlan_network *tgt_network =3D &mlme_priv->cur_network; =20 - pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->networ= k.mac_address); + pwlan =3D rtw_find_network(&mlme_priv->scanned_queue, tgt_network->networ= k.mac_address); if (!pwlan) return; =20 pwlan->fixed =3D false; =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) && + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) && (adapter->stapriv.asoc_sta_count =3D=3D 1)) rtw_free_network_nolock(adapter, pwlan); } =20 -/* rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock */ +/* rtw_free_assoc_resources: the caller has to lock mlme_priv->lock */ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_qu= eue) { - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; - struct wlan_network *tgt_network =3D &pmlmepriv->cur_network; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; + struct wlan_network *tgt_network =3D &mlme_priv->cur_network; =20 - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_AP_STATE)) { + if (check_fwstate(mlme_priv, WIFI_STATION_STATE | WIFI_AP_STATE)) { struct sta_info *psta; =20 psta =3D rtw_get_stainfo(&adapter->stapriv, tgt_network->network.mac_add= ress); rtw_free_stainfo(adapter, psta); } =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE |= WIFI_AP_STATE)) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE |= WIFI_AP_STATE)) { struct sta_info *psta; =20 rtw_free_all_stainfo(adapter); @@ -855,18 +855,18 @@ void rtw_free_assoc_resources(struct adapter *adapter= , int lock_scanned_queue) adapter->securitypriv.key_mask =3D 0; } =20 -/* rtw_indicate_connect: the caller has to lock pmlmepriv->lock */ +/* rtw_indicate_connect: the caller has to lock mlme_priv->lock */ void rtw_indicate_connect(struct adapter *padapter) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; =20 - pmlmepriv->to_join =3D false; + mlme_priv->to_join =3D false; =20 if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { - set_fwstate(pmlmepriv, _FW_LINKED); + set_fwstate(mlme_priv, _FW_LINKED); =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) rtw_cfg80211_ibss_indicate_connect(padapter); else rtw_cfg80211_indicate_connect(padapter); @@ -881,15 +881,15 @@ void rtw_indicate_connect(struct adapter *padapter) rtw_set_scan_deny(padapter, 3000); } =20 -/* rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock */ +/* rtw_indicate_disconnect: the caller has to lock mlme_priv->lock */ void rtw_indicate_disconnect(struct adapter *padapter) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; =20 - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); =20 if (rtw_to_roam(padapter) > 0) - _clr_fwstate_(pmlmepriv, _FW_LINKED); + _clr_fwstate_(mlme_priv, _FW_LINKED); =20 if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || rtw_to_roam(padapte= r) <=3D 0) { /* Do it first for tx broadcast pkt after disconnection issue! */ @@ -902,7 +902,7 @@ void rtw_indicate_disconnect(struct adapter *padapter) /* set ips_deny_time to avoid enter IPS before LPS leave */ rtw_set_ips_deny(padapter, 3000); =20 - _clr_fwstate_(pmlmepriv, _FW_LINKED); + _clr_fwstate_(mlme_priv, _FW_LINKED); =20 rtw_clear_scan_deny(padapter); } @@ -925,12 +925,12 @@ inline void rtw_indicate_scan_done(struct adapter *pa= dapter, bool aborted) void rtw_scan_abort(struct adapter *adapter) { unsigned long start; - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; =20 start =3D jiffies; pmlmeext->scan_abort =3D true; - while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) + while (check_fwstate(mlme_priv, _FW_UNDER_SURVEY) && jiffies_to_msecs(start) <=3D 200) { if (adapter->driver_stopped || adapter->bSurpriseRemoved) break; @@ -938,7 +938,7 @@ void rtw_scan_abort(struct adapter *adapter) msleep(20); } =20 - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) + if (check_fwstate(mlme_priv, _FW_UNDER_SURVEY)) rtw_indicate_scan_done(adapter, true); =20 pmlmeext->scan_abort =3D false; @@ -1031,8 +1031,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str static void rtw_joinbss_update_network(struct adapter *padapter, struct wl= an_network *ptarget_wlan, struct wlan_network *pnetwork) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct wlan_network *cur_network =3D &pmlmepriv->cur_network; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct wlan_network *cur_network =3D &mlme_priv->cur_network; =20 /* why not use ptarget_wlan?? */ memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.lengt= h); @@ -1055,17 +1055,17 @@ static void rtw_joinbss_update_network(struct adapt= er *padapter, struct wlan_net switch (pnetwork->network.infrastructure_mode) { case NL80211_IFTYPE_STATION: =20 - if (pmlmepriv->fw_state & WIFI_UNDER_WPS) - pmlmepriv->fw_state =3D WIFI_STATION_STATE | WIFI_UNDER_WPS; + if (mlme_priv->fw_state & WIFI_UNDER_WPS) + mlme_priv->fw_state =3D WIFI_STATION_STATE | WIFI_UNDER_WPS; else - pmlmepriv->fw_state =3D WIFI_STATION_STATE; + mlme_priv->fw_state =3D WIFI_STATION_STATE; =20 break; case NL80211_IFTYPE_ADHOC: - pmlmepriv->fw_state =3D WIFI_ADHOC_STATE; + mlme_priv->fw_state =3D WIFI_ADHOC_STATE; break; default: - pmlmepriv->fw_state =3D WIFI_NULL_STATE; + mlme_priv->fw_state =3D WIFI_NULL_STATE; break; } =20 @@ -1147,9 +1147,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *buf) { struct sta_info *ptarget_sta =3D NULL, *pcur_sta =3D NULL; struct sta_priv *pstapriv =3D &adapter->stapriv; - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct wlan_network *pnetwork =3D (struct wlan_network *)buf; - struct wlan_network *cur_network =3D &pmlmepriv->cur_network; + struct wlan_network *cur_network =3D &mlme_priv->cur_network; struct wlan_network *pcur_wlan =3D NULL, *ptarget_wlan =3D NULL; unsigned int the_same_macaddr =3D false; =20 @@ -1159,43 +1159,43 @@ void rtw_joinbss_event_prehandle(struct adapter *ad= apter, u8 *buf) if (pnetwork->network.length > sizeof(struct wlan_bssid_ex)) return; =20 - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); =20 - pmlmepriv->link_detect_info.traffic_transition_count =3D 0; - pmlmepriv->link_detect_info.low_power_transition_count =3D 0; + mlme_priv->link_detect_info.traffic_transition_count =3D 0; + mlme_priv->link_detect_info.low_power_transition_count =3D 0; =20 if (pnetwork->join_res =3D=3D -4) { rtw_reset_securitypriv(adapter); - _set_timer(&pmlmepriv->assoc_timer, 1); + _set_timer(&mlme_priv->assoc_timer, 1); =20 - if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); + if (check_fwstate(mlme_priv, _FW_UNDER_LINKING)) + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING); =20 - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); return; } =20 if (pnetwork->join_res <=3D 0) { /* if join_res < 0 (join fails), then tr= y again */ - _set_timer(&pmlmepriv->assoc_timer, 1); - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); - spin_unlock_bh(&pmlmepriv->lock); + _set_timer(&mlme_priv->assoc_timer, 1); + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING); + spin_unlock_bh(&mlme_priv->lock); return; } =20 - spin_lock_bh(&pmlmepriv->scanned_queue.lock); + spin_lock_bh(&mlme_priv->scanned_queue.lock); =20 - if (!check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) { - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); - spin_unlock_bh(&pmlmepriv->lock); + if (!check_fwstate(mlme_priv, _FW_UNDER_LINKING)) { + spin_unlock_bh(&mlme_priv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->lock); return; } =20 /* s1. find ptarget_wlan */ - if (check_fwstate(pmlmepriv, _FW_LINKED)) { + if (check_fwstate(mlme_priv, _FW_LINKED)) { if (the_same_macaddr) { - ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_networ= k->network.mac_address); + ptarget_wlan =3D rtw_find_network(&mlme_priv->scanned_queue, cur_networ= k->network.mac_address); } else { - pcur_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_network->= network.mac_address); + pcur_wlan =3D rtw_find_network(&mlme_priv->scanned_queue, cur_network->= network.mac_address); if (pcur_wlan) pcur_wlan->fixed =3D false; =20 @@ -1203,15 +1203,15 @@ void rtw_joinbss_event_prehandle(struct adapter *ad= apter, u8 *buf) if (pcur_sta) rtw_free_stainfo(adapter, pcur_sta); =20 - ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->= network.mac_address); - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + ptarget_wlan =3D rtw_find_network(&mlme_priv->scanned_queue, pnetwork->= network.mac_address); + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { if (ptarget_wlan) ptarget_wlan->fixed =3D true; } } } else { - ptarget_wlan =3D _rtw_find_same_network(&pmlmepriv->scanned_queue, pnetw= ork); - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + ptarget_wlan =3D _rtw_find_same_network(&mlme_priv->scanned_queue, pnetw= ork); + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { if (ptarget_wlan) ptarget_wlan->fixed =3D true; } @@ -1221,34 +1221,34 @@ void rtw_joinbss_event_prehandle(struct adapter *ad= apter, u8 *buf) if (!ptarget_wlan) { netdev_dbg(adapter->pnetdev, "Can't find ptarget_wlan when joinbss_event callback\n"); - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->lock); return; } =20 rtw_joinbss_update_network(adapter, ptarget_wlan, pnetwork); =20 /* s3. find ptarget_sta & update ptarget_sta after update cur_network onl= y for station mode */ - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { ptarget_sta =3D rtw_joinbss_update_stainfo(adapter, pnetwork); if (!ptarget_sta) { - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->lock); return; } } =20 /* s4. indicate connect */ - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { - pmlmepriv->cur_network_scanned =3D ptarget_wlan; + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { + mlme_priv->cur_network_scanned =3D ptarget_wlan; rtw_indicate_connect(adapter); } =20 - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); =20 - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); /* s5. Cancel assoc_timer */ - timer_delete_sync(&pmlmepriv->assoc_timer); + timer_delete_sync(&mlme_priv->assoc_timer); } =20 void rtw_joinbss_event_callback(struct adapter *adapter, u8 *buf) @@ -1275,15 +1275,15 @@ void rtw_sta_media_status_rpt(struct adapter *adapt= er, struct sta_info *psta, u3 void rtw_stassoc_event_callback(struct adapter *adapter, u8 *buf) { struct sta_info *psta; - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct stassoc_event *pstassoc =3D (struct stassoc_event *)buf; - struct wlan_network *cur_network =3D &pmlmepriv->cur_network; + struct wlan_network *cur_network =3D &mlme_priv->cur_network; struct wlan_network *ptarget_wlan =3D NULL; =20 if (!rtw_access_ctrl(adapter, pstassoc->macaddr)) return; =20 - if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { + if (check_fwstate(mlme_priv, WIFI_AP_STATE)) { psta =3D rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr); if (psta) { u8 *passoc_req =3D NULL; @@ -1342,23 +1342,23 @@ void rtw_stassoc_event_callback(struct adapter *ada= pter, u8 *buf) =20 psta->ieee8021x_blocked =3D false; =20 - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { if (adapter->stapriv.asoc_sta_count =3D=3D 2) { - spin_lock_bh(&pmlmepriv->scanned_queue.lock); - ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_networ= k->network.mac_address); - pmlmepriv->cur_network_scanned =3D ptarget_wlan; + spin_lock_bh(&mlme_priv->scanned_queue.lock); + ptarget_wlan =3D rtw_find_network(&mlme_priv->scanned_queue, cur_networ= k->network.mac_address); + mlme_priv->cur_network_scanned =3D ptarget_wlan; if (ptarget_wlan) ptarget_wlan->fixed =3D true; - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); /* a sta + bc/mc_stainfo (not Ibss_stainfo) */ rtw_indicate_connect(adapter); } } =20 - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); =20 mlmeext_sta_add_event_callback(adapter, psta); } @@ -1370,9 +1370,9 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *buf) struct wlan_network *pwlan =3D NULL; struct wlan_bssid_ex *pdev_network =3D NULL; u8 *pibss =3D NULL; - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct stadel_event *pstadel =3D (struct stadel_event *)buf; - struct wlan_network *tgt_network =3D &pmlmepriv->cur_network; + struct wlan_network *tgt_network =3D &mlme_priv->cur_network; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 @@ -1390,15 +1390,15 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *buf) rtw_hal_set_hwreg(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_sta= tus); } =20 - /* if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) */ + /* if (check_fwstate(mlme_priv, WIFI_AP_STATE)) */ if ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_AP_STATE) return; =20 mlmeext_sta_del_event_callback(adapter); =20 - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); =20 - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { u16 reason =3D *((unsigned short *)(pstadel->rsvd)); bool roam =3D false; struct wlan_network *roam_target =3D NULL; @@ -1409,7 +1409,7 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *buf) roam =3D true; } else if (reason =3D=3D WLAN_REASON_ACTIVE_ROAM && rtw_chk_roam_flags(a= dapter, RTW_ROAM_ACTIVE)) { roam =3D true; - roam_target =3D pmlmepriv->roam_network; + roam_target =3D mlme_priv->roam_network; } =20 if (roam) { @@ -1426,48 +1426,48 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *buf) rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); =20 - spin_lock_bh(&pmlmepriv->scanned_queue.lock); + spin_lock_bh(&mlme_priv->scanned_queue.lock); /* remove the network entry in scanned_queue */ - pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->netwo= rk.mac_address); + pwlan =3D rtw_find_network(&mlme_priv->scanned_queue, tgt_network->netwo= rk.mac_address); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); } - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); =20 _rtw_roaming(adapter, roam_target); } =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { rtw_free_stainfo(adapter, psta); =20 if (adapter->stapriv.asoc_sta_count =3D=3D 1) {/* a sta + bc/mc_stainfo = (not Ibss_stainfo) */ u8 ret =3D _SUCCESS; =20 - spin_lock_bh(&pmlmepriv->scanned_queue.lock); + spin_lock_bh(&mlme_priv->scanned_queue.lock); /* free old ibss network */ - pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->netw= ork.mac_address); + pwlan =3D rtw_find_network(&mlme_priv->scanned_queue, tgt_network->netw= ork.mac_address); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); } - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); /* re-create ibss */ pdev_network =3D &adapter->registrypriv.dev_network; pibss =3D adapter->registrypriv.dev_network.mac_address; =20 memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_n= etwork->network)); =20 - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_= 802_11_ssid)); + memcpy(&pdev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_= 802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); =20 rtw_generate_random_ibss(pibss); =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - set_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE); - _clr_fwstate_(pmlmepriv, WIFI_ADHOC_STATE); + if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { + set_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE); + _clr_fwstate_(mlme_priv, WIFI_ADHOC_STATE); } =20 ret =3D rtw_createbss_cmd(adapter); @@ -1477,7 +1477,7 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *buf) } =20 unlock: - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); } =20 void rtw_cpwm_event_callback(struct adapter *padapter, u8 *buf) @@ -1502,12 +1502,12 @@ void _rtw_join_timeout_handler(struct timer_list *t) { struct adapter *adapter =3D timer_container_of(adapter, t, mlmepriv.assoc_timer); - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 if (adapter->driver_stopped || adapter->bSurpriseRemoved) return; =20 - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); =20 if (rtw_to_roam(adapter) > 0) { /* join timeout caused by roaming */ while (1) { @@ -1528,13 +1528,13 @@ void _rtw_join_timeout_handler(struct timer_list *t) =20 } else { rtw_indicate_disconnect(adapter); - free_scanqueue(pmlmepriv);/* */ + free_scanqueue(mlme_priv);/* */ =20 /* indicate disconnect for the case that join_timeout and check_fwstate = !=3D FW_LINKED */ rtw_cfg80211_indicate_disconnect(adapter); } =20 - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); } =20 /* @@ -1545,13 +1545,13 @@ void rtw_scan_timeout_handler(struct timer_list *t) { struct adapter *adapter =3D timer_container_of(adapter, t, mlmepriv.scan_to_timer); - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); =20 - _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); + _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); =20 - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); =20 rtw_indicate_scan_done(adapter, true); } @@ -1577,17 +1577,17 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *a= dapter) =20 static void rtw_auto_scan_handler(struct adapter *padapter) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; =20 rtw_mlme_reset_auto_scan_int(padapter); =20 - if (pmlmepriv->auto_scan_int_ms !=3D 0 && - jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->a= uto_scan_int_ms) { + if (mlme_priv->auto_scan_int_ms !=3D 0 && + jiffies_to_msecs(jiffies - mlme_priv->scan_start_time) > mlme_priv->a= uto_scan_int_ms) { if (!padapter->registrypriv.wifi_spec) { - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) + if (check_fwstate(mlme_priv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit; =20 - if (pmlmepriv->link_detect_info.busy_traffic) + if (mlme_priv->link_detect_info.busy_traffic) goto exit; } =20 @@ -1786,34 +1786,34 @@ static int rtw_check_join_candidate(struct mlme_pri= v *mlme * Calling context: * The caller of the sub-routine will be in critical section... * The caller must hold the following spinlock - * pmlmepriv->lock + * mlme_priv->lock */ =20 -int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) +int rtw_select_and_join_from_scanned_queue(struct mlme_priv *mlme_priv) { int ret; struct list_head *phead; struct adapter *adapter; - struct __queue *queue =3D &pmlmepriv->scanned_queue; + struct __queue *queue =3D &mlme_priv->scanned_queue; struct wlan_network *pnetwork =3D NULL; struct wlan_network *candidate =3D NULL; =20 - adapter =3D (struct adapter *)pmlmepriv->nic_hdl; + adapter =3D (struct adapter *)mlme_priv->nic_hdl; =20 - spin_lock_bh(&pmlmepriv->scanned_queue.lock); + spin_lock_bh(&mlme_priv->scanned_queue.lock); =20 - if (pmlmepriv->roam_network) { - candidate =3D pmlmepriv->roam_network; - pmlmepriv->roam_network =3D NULL; + if (mlme_priv->roam_network) { + candidate =3D mlme_priv->roam_network; + mlme_priv->roam_network =3D NULL; goto candidate_exist; } =20 phead =3D get_list_head(queue); - list_for_each(pmlmepriv->pscanned, phead) { - pnetwork =3D list_entry(pmlmepriv->pscanned, + list_for_each(mlme_priv->pscanned, phead) { + pnetwork =3D list_entry(mlme_priv->pscanned, struct wlan_network, list); =20 - rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork); + rtw_check_join_candidate(mlme_priv, &candidate, pnetwork); } =20 if (!candidate) { @@ -1826,17 +1826,17 @@ int rtw_select_and_join_from_scanned_queue(struct m= lme_priv *pmlmepriv) candidate_exist: =20 /* check for situation of _FW_LINKED */ - if (check_fwstate(pmlmepriv, _FW_LINKED)) { + if (check_fwstate(mlme_priv, _FW_LINKED)) { rtw_disassoc_cmd(adapter, 0, true); rtw_indicate_disconnect(adapter); rtw_free_assoc_resources(adapter, 0); } =20 - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); + set_fwstate(mlme_priv, _FW_UNDER_LINKING); ret =3D rtw_joinbss_cmd(adapter, candidate); =20 exit: - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); return ret; } =20 @@ -2067,7 +2067,7 @@ signed int rtw_restruct_sec_ie(struct adapter *adapte= r, u8 *in_ie, u8 *out_ie, u uint ielength; int iEntry; =20 - struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct security_priv *psecuritypriv =3D &adapter->securitypriv; uint ndisauthmode =3D psecuritypriv->ndisauthtype; =20 @@ -2079,7 +2079,7 @@ signed int rtw_restruct_sec_ie(struct adapter *adapte= r, u8 *in_ie, u8 *out_ie, u if ((ndisauthmode =3D=3D Ndis802_11AuthModeWPA2) || (ndisauthmode =3D=3D = Ndis802_11AuthModeWPA2PSK)) authmode =3D WLAN_EID_RSN; =20 - if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { + if (check_fwstate(mlme_priv, WIFI_UNDER_WPS)) { memcpy(out_ie + ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_l= en); =20 ielength +=3D psecuritypriv->wps_ie_len; @@ -2090,7 +2090,7 @@ signed int rtw_restruct_sec_ie(struct adapter *adapte= r, u8 *in_ie, u8 *out_ie, u rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); } =20 - iEntry =3D SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid); + iEntry =3D SecIsInPMKIDList(adapter, mlme_priv->assoc_bssid); if (iEntry < 0) return ielength; =20 @@ -2152,15 +2152,15 @@ void rtw_update_registrypriv_dev_network(struct ada= pter *adapter) void rtw_joinbss_reset(struct adapter *padapter) { u8 threshold; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; =20 - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct ht_priv *phtpriv =3D &mlme_priv->htpriv; =20 /* todo: if you want to do something io/reg/hw setting before join_bss, p= lease add code here */ =20 - pmlmepriv->num_FortyMHzIntolerant =3D 0; + mlme_priv->num_FortyMHzIntolerant =3D 0; =20 - pmlmepriv->num_sta_no_ht =3D 0; + mlme_priv->num_sta_no_ht =3D 0; =20 phtpriv->ampdu_enable =3D false;/* reset to disabled */ =20 @@ -2180,8 +2180,8 @@ void rtw_joinbss_reset(struct adapter *padapter) =20 void rtw_ht_use_default_setting(struct adapter *padapter) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct ht_priv *phtpriv =3D &mlme_priv->htpriv; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; bool bHwLDPCSupport =3D false, bHwSTBCSupport =3D false; bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; @@ -2254,8 +2254,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ struct ieee80211_ht_cap ht_capie; u8 cbw40_enable =3D 0, stbc_rx_enable =3D 0, operation_bw =3D 0; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct ht_priv *phtpriv =3D &mlme_priv->htpriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; =20 phtpriv->ht_option =3D false; @@ -2272,7 +2272,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ /* Get HT BW */ if (!in_ie) { /* TDLS: TODO 20/40 issue */ - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { operation_bw =3D padapter->mlmeextpriv.cur_bwmode; if (operation_bw > CHANNEL_WIDTH_40) operation_bw =3D CHANNEL_WIDTH_40; @@ -2375,8 +2375,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe u8 *p, max_ampdu_sz; int len; struct ieee80211_ht_cap *pht_capie; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct ht_priv *phtpriv =3D &mlme_priv->htpriv; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; @@ -2494,8 +2494,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter,= struct xmit_frame *pxmitfr =20 void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *po= ut_len) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct ht_priv *phtpriv =3D &mlme_priv->htpriv; u8 cap_content[8] =3D {0}; =20 if (phtpriv->bss_coexist) @@ -2524,22 +2524,22 @@ inline u8 rtw_to_roam(struct adapter *adapter) =20 void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_networ= k) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; =20 - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); _rtw_roaming(padapter, tgt_network); - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); } =20 void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_netwo= rk) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct wlan_network *cur_network =3D &pmlmepriv->cur_network; + struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct wlan_network *cur_network =3D &mlme_priv->cur_network; =20 if (rtw_to_roam(padapter) > 0) { - memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.ssid, sizeof(struct= ndis_802_11_ssid)); + memcpy(&mlme_priv->assoc_ssid, &cur_network->network.ssid, sizeof(struct= ndis_802_11_ssid)); =20 - pmlmepriv->assoc_by_bssid =3D false; + mlme_priv->assoc_by_bssid =3D false; =20 while (rtw_do_join(padapter) !=3D _SUCCESS) { rtw_dec_to_roam(padapter); --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 CBE44416857 for ; Fri, 31 Jul 2026 10:43:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494637; cv=none; b=SSMmnM9SkYhDvb62IZOq32+Iy2Y7cmYFDN1/JgN7hc/0PzNN8n8AEJOKeiDwCI9Dsl35Qiblg2oJr8b5Lq+NN0sIQyZURckyVSqC4Vh6kxOabUuiuPz4T6u/rWR/pyOEDf1dSI9khuEWVb0NCbjJDUckE/WNQiQljQSr5+b7WAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494637; c=relaxed/simple; bh=CA2d/wf/q2wXDSlSwfQ/52bJgc7WgYltsh4UaFFb9A8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GDCpI6yYkeXzsrCvlPQWYPFe9WPw7mNBsP7jxc1AkUK3pm1VfnjVW//QrTKZb0TmMH1/NoEEd7UPmt1nyP9cJhWrPn/dWkDnJhRVy/xEp/S4ADcNgqEu0H/N+9I+ClIMrEYS8MFbkac8eNMz6MUOqvNpsj3ddOOYx+ysLbzoHOw= 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=c/jozN2K; arc=none smtp.client-ip=209.85.221.48 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="c/jozN2K" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-4758bd3731bso815747f8f.0 for ; Fri, 31 Jul 2026 03:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494621; x=1786099421; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Pjpnk/e8XGdrC/Ir+XpXavatQU9AB2mubA2qXyMAAgs=; b=c/jozN2KFaCQ16C5EAHCfqjkVfKHn2BXfuOjq/AlLS+u3/Taj13gRV4Pv7PRPHcJf0 XJLY3N1JsjmCQhjFUwZjIuIy3jccVdGfMUxVe3YdJcTVmRvTvr1+HcFAE0+NXEYoGl3i Z96qRusK/uQ71JtfmWTTPVG/2faKj6GkzxevLJTTnZHzhKY1P2CCfzxO7wJQjsOg5r06 7pVxtsFhdcLnFVkdsX2DdsqxInkAaKNEeF2CAnl+7KdMJZojdh5Ys4CDp34oVxqL9q3S vivfQ/RAcicXiqn3DTrcOvI5kEkOTy3kt6eORV/KeVZeo2U0dxHfqCe7+DeZ8fcxkZN8 x/ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494621; x=1786099421; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Pjpnk/e8XGdrC/Ir+XpXavatQU9AB2mubA2qXyMAAgs=; b=tEJM711wF3meJyff2fGvq/ALHF/mDnCxGLAxEc2Ekl0dIoTMSEJ7liYbgixL57W9Np L1lf3LB1avYw13r4Gw/1iDD4wH54A6g3z8y0oSmpN/uZaxowDLOQvsd57iI8VKQpj2Ea o6kfJE+PhnfIFi244go2yGM1QMdKvFy883pkrbdA7RZBJC/99HWEEQ1Srb9AvURGiNzQ soMgQCtQpNklfrs8bZkYb0SiPeJlJRLI0bpFKNi0exBGksLU5QVoOVPik+dr/VPh9Yc8 /Qn0bzuiLP6M4Z19T3bg17GkooPMuFpd7VOJ+O+UASDO/N2HCPgSrBvOqsCd4kp9rmwe gD3Q== X-Gm-Message-State: AOJu0YxQsoP5lRBVdX7hIRxb8PPTgMkwIlYwPiF4rdpwXR1nIQi4qjLC uk3SrWTcW5bcyMTbvEmbV1cG5IyBTuGmunDqnW/QWgxy8JsKiJdgmT1VajVzndEw X-Gm-Gg: AR+sD10TNLgiCnY0F7E6KI2cRaAcm87x9CHZvN0z4pyyqgC8DOvzMrG6l/SYAPA+89M pCxntz8BUMves++WnwHiID3TPhEggGyj9kn4ADDlnywgRZ/uZ1jYz0CyfousKo5561x5VKOw6PV 3T8iybQtM4ikrFHpquDzWsFeo02Y5I++Zx2x86050V07z8WvTKo7WzZxgKu0lSEA83mvnP4UqDv MSHsTgb4kRx1NdqjBFxXtFBUyjLYy9Qk18EIbfbYOuLnaNqnmk8BK5uDK3zlbz4M1OvmAtnPpJP svxfaEsPGMUDe8an5ODz8SmzPf2svcJfAiUKmecylW05O4fnU1JsBFWCjBNQGZRpSGi128Kx0yB 7zjl0eKS0FkOroL5EBdV56WvUy8Ih+wet083YeE1LOPH1ZLWTxVp0WX1KStnR1S9DZpgplaOJqb lpYVcl8KGtdlZFf2J8nlax6uQxAzDYTNVbJxwHyDquGcx6BKVOdvblk1swYfI7zl5RaEVxkeQ8y sVk8JeoJkRDXhAeQF+RBC7mPGU4OEATZ43gdcojM7O4rOsWFV8d X-Received: by 2002:a05:6000:18a5:b0:47f:6e8b:699c with SMTP id ffacd0b85a97d-47fd339536dmr2965960f8f.14.1785494621247; Fri, 31 Jul 2026 03:43:41 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:40 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 03/11] staging: rtl8723bs: renaming variable pdev_network in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:26 +0000 Message-ID: <20260731104134.12754-4-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of pdev_network to dev_network since the prefix p is an old. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 42 +++++++++++------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 276bf83fa024..37640ea9edc8 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -704,7 +704,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *buf) _set_timer(&mlme_priv->assoc_timer, MAX_JOIN_TIMEOUT); } else { u8 ret =3D _SUCCESS; - struct wlan_bssid_ex *pdev_network =3D + struct wlan_bssid_ex *dev_network =3D &adapter->registrypriv.dev_network; =20 u8 *pibss =3D adapter->registrypriv.dev_network.mac_address; @@ -712,7 +712,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *buf) /* mlme_priv->fw_state ^=3D _FW_UNDER_SURVEY;because don't set assoc_= timer */ _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); =20 - memcpy(&pdev_network->ssid, &mlme_priv->assoc_ssid, + memcpy(&dev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); @@ -1368,7 +1368,7 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *buf) int mac_id =3D (-1); struct sta_info *psta; struct wlan_network *pwlan =3D NULL; - struct wlan_bssid_ex *pdev_network =3D NULL; + struct wlan_bssid_ex *dev_network =3D NULL; u8 *pibss =3D NULL; struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct stadel_event *pstadel =3D (struct stadel_event *)buf; @@ -1454,12 +1454,12 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *buf) } spin_unlock_bh(&mlme_priv->scanned_queue.lock); /* re-create ibss */ - pdev_network =3D &adapter->registrypriv.dev_network; + dev_network =3D &adapter->registrypriv.dev_network; pibss =3D adapter->registrypriv.dev_network.mac_address; =20 - memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_n= etwork->network)); + memcpy(dev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_ne= twork->network)); =20 - memcpy(&pdev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_= 802_11_ssid)); + memcpy(&dev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_8= 02_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); =20 @@ -2104,48 +2104,48 @@ void rtw_init_registrypriv_dev_network(struct adapt= er *adapter) { struct registry_priv *pregistrypriv =3D &adapter->registrypriv; struct eeprom_priv *peepriv =3D &adapter->eeprompriv; - struct wlan_bssid_ex *pdev_network =3D &pregistrypriv->dev_network; + struct wlan_bssid_ex *dev_network =3D &pregistrypriv->dev_network; u8 *myhwaddr =3D myid(peepriv); =20 - memcpy(pdev_network->mac_address, myhwaddr, ETH_ALEN); + memcpy(dev_network->mac_address, myhwaddr, ETH_ALEN); =20 - memcpy(&pdev_network->ssid, &pregistrypriv->ssid, sizeof(struct ndis_802_= 11_ssid)); + memcpy(&dev_network->ssid, &pregistrypriv->ssid, sizeof(struct ndis_802_1= 1_ssid)); =20 - pdev_network->configuration.length =3D sizeof(struct ndis_802_11_conf); - pdev_network->configuration.beacon_period =3D 100; + dev_network->configuration.length =3D sizeof(struct ndis_802_11_conf); + dev_network->configuration.beacon_period =3D 100; } =20 void rtw_update_registrypriv_dev_network(struct adapter *adapter) { int sz =3D 0; struct registry_priv *pregistrypriv =3D &adapter->registrypriv; - struct wlan_bssid_ex *pdev_network =3D &pregistrypriv->dev_network; + struct wlan_bssid_ex *dev_network =3D &pregistrypriv->dev_network; struct security_priv *psecuritypriv =3D &adapter->securitypriv; struct wlan_network *cur_network =3D &adapter->mlmepriv.cur_network; =20 - pdev_network->privacy =3D (psecuritypriv->dot11_privacy_algrthm > 0 ? 1 := 0) ; /* adhoc no 802.1x */ + dev_network->privacy =3D (psecuritypriv->dot11_privacy_algrthm > 0 ? 1 : = 0) ; /* adhoc no 802.1x */ =20 - pdev_network->rssi =3D 0; + dev_network->rssi =3D 0; =20 - pdev_network->configuration.ds_config =3D (pregistrypriv->channel); + dev_network->configuration.ds_config =3D (pregistrypriv->channel); =20 if (cur_network->network.infrastructure_mode =3D=3D NL80211_IFTYPE_ADHOC) - pdev_network->configuration.atim_window =3D (0); + dev_network->configuration.atim_window =3D (0); =20 - pdev_network->infrastructure_mode =3D (cur_network->network.infrastructur= e_mode); + dev_network->infrastructure_mode =3D (cur_network->network.infrastructure= _mode); =20 /* 1. Supported rates */ /* 2. IE */ =20 - /* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->w= ireless_mode) ; will be called in rtw_generate_ie */ + /* rtw_set_supported_rate(dev_network->supported_rates, pregistrypriv->wi= reless_mode) ; will be called in rtw_generate_ie */ sz =3D rtw_generate_ie(pregistrypriv); =20 - pdev_network->ie_length =3D sz; + dev_network->ie_length =3D sz; =20 - pdev_network->length =3D get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pde= v_network); + dev_network->length =3D get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)dev_= network); =20 /* notes: translate ie_length & length after assign the length to cmdsz i= n createbss_cmd(); */ - /* pdev_network->ie_length =3D cpu_to_le32(sz); */ + /* dev_network->ie_length =3D cpu_to_le32(sz); */ } =20 /* the function is at passive_level */ --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.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 46F573E7BAA for ; Fri, 31 Jul 2026 10:43:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494632; cv=none; b=EoLgaQ3pqCF4eHcfBOH4rxwgfTfRMj770Pf7Y0g4uMzuTAplePzofUZIpwyDeoOEwK2Bg3yl9KBajmha7KfZJbuDKbinAEHnwJYLTdKkseSIA1btljMumVffqvMyyWX8Hd8Nu0ZEW09+FQBS0wCmM2tQf8Uxkl4C6aeseBe961c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494632; c=relaxed/simple; bh=Z+zgxtmIQndficnjRwz1PVF+bTlc7EWti7Zn0qC/GJY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YWIJCT3OAJSar/MDrjIWPFdSlkaJr5QrKucL4sMeoO5ZR7bmkGxFhGzqXzzCies+WTMW7MzwmqSOPcN4KDtKwnweCubPNfNkLlokXIM26hZNtk1AOZbtbRF0kwhK8Kv0zqTJM4ikKXoF8p+3EbMYhM1pDtmW/G83i+L/UhgtyTI= 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=fQKbqh9W; arc=none smtp.client-ip=209.85.221.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="fQKbqh9W" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-4758bd3731bso815756f8f.0 for ; Fri, 31 Jul 2026 03:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494622; x=1786099422; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=cQg1Q5CjP6rI4wR1ohgm86WL+dcEyP9rVnOpPx/M1TQ=; b=fQKbqh9Wo37Y/tnpDrVqyTGpQkgyN47b4SefdkFK/cxY9UNue9LLV+oxMv97+E+xG6 KUKXK3PhL4n5yCs7uDEwnA0WULJ3+mbiw5N5dme71cMDv88McjmMeB+gSeyMGH5w6+Hk IA2ZG+wFtifxv90fDq/t7TJJeD20vUlUa/l8LEuAt9qdexPJp1gjarlXLTuOMiPEvC51 CabitZPNWalFUKM+9NJxxlbMEgA9nW0QsYwDFszpZx0rQWENJxLbKbtfg91JwLV+xyVc GTBPNCOknJ7MjFavJH2IXUbopRNBgvo3k9fFdjC2zmxC93mdbwW9kS/4swU1X83BBL6c wgSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494622; x=1786099422; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=cQg1Q5CjP6rI4wR1ohgm86WL+dcEyP9rVnOpPx/M1TQ=; b=V0XD5jz5RyLWBGpkgAVFNk+yWLinTYcQrZL6AddkgFJsj9+NEDtBHpZU+L29xPFL4O e4Gca1OBgTfvllgL96a+z0+z+H9qNWoLSXX0/IWFYH33+52bRE65vk6LetghlDd5looG MPxBC0wlf0W+7V1jDBV0iXRcDqkbuuDyp4rSRbFXQ3cqIYqRZyoqHwYL+D24ujJWI0gG Y4CcmA7LPRDiHh5upaE82QznQpQbwKI3o8DapX9q/fa4uG/brKUDxj3FczH4jX+5eiwt i4WZPFnLzlayD+BhsiYDirLCG5CxEdEZhYiyDA755dPUvnxdgKJJ1yQ2wjZebxBUImsY lBXQ== X-Gm-Message-State: AOJu0YyXsbe73uPl6puSIwZGP+VCVaSRSMzVvNInNxhCnjELysmBsnEc bayj+rInEa97JwXizy4kzJ8IgIX8ODI7WEAYrawlvqCNtEPkTEeoRvOg9Y2OGkxD X-Gm-Gg: AR+sD130GqNx0/zLcC/lysljymCXQKnOsbVIf2ZL8u+U8aB7UA0b1x2Oj/YtK8NRdDd ztlmThNIKMq6RC0iSOJ5sgq9OsuvuuLVmziIMqq82JizlONqIQnL58EMzT/A1V8Si4emDZ0Gq5C 7vdZVvOQEJJoq7KyiqmYff86hujC+AovXRAvJcbJRFbCHw5nfQtW14c6xbltMFMakn8rszktNL9 t62XVEJyqUbxP44bAF23kwu53R6ouPTmH9r07LrXpL3E405mqEi3woYy9ow6Lzzzgt1LeU/Ba2r 1v7bKUvsBHk2SXa4yYKCfo4MrqWl9XTZhM7YnLUVeY4F/PyQbbxRzD7ZmG8g5IEaEjqYYHybNru dTVmxPBEZD7BtAMtMqIe9gdww657fDMgReVpON0EP6yrijcnqeC5QSzv1f2LWYv2X9xqohudm6D wAHc/4Ex9fPktgHpdQ5hGcKNOhyVKMl9Ml+UsAZYNfN5Vic5mnS0gXuvkRHfaHSSuCaa8mRhdNM dt92UlAvqYjc2aI/8KVduJX0nV6Qewag1zUftu3DnmkuluLwoTs X-Received: by 2002:a05:6000:1788:b0:47f:8fda:1af0 with SMTP id ffacd0b85a97d-47fd32b1992mr3062100f8f.4.1785494621857; Fri, 31 Jul 2026 03:43:41 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:41 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 04/11] staging: rtl8723bs: renaming variable pibss in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:27 +0000 Message-ID: <20260731104134.12754-5-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of pibss to ibss since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 37640ea9edc8..761cbff86bbb 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -271,16 +271,16 @@ bool rtw_if_up(struct adapter *padapter) return true; } =20 -void rtw_generate_random_ibss(u8 *pibss) +void rtw_generate_random_ibss(u8 *ibss) { unsigned long curtime =3D jiffies; =20 - pibss[0] =3D 0x02; /* in ad-hoc mode bit1 must set to 1 */ - pibss[1] =3D 0x11; - pibss[2] =3D 0x87; - pibss[3] =3D (u8)(curtime & 0xff) ;/* p[0]; */ - pibss[4] =3D (u8)((curtime >> 8) & 0xff) ;/* p[1]; */ - pibss[5] =3D (u8)((curtime >> 16) & 0xff) ;/* p[2]; */ + ibss[0] =3D 0x02; /* in ad-hoc mode bit1 must set to 1 */ + ibss[1] =3D 0x11; + ibss[2] =3D 0x87; + ibss[3] =3D (u8)(curtime & 0xff) ;/* p[0]; */ + ibss[4] =3D (u8)((curtime >> 8) & 0xff) ;/* p[1]; */ + ibss[5] =3D (u8)((curtime >> 16) & 0xff) ;/* p[2]; */ } =20 u8 *rtw_get_capability_from_ie(u8 *ie) @@ -707,7 +707,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *buf) struct wlan_bssid_ex *dev_network =3D &adapter->registrypriv.dev_network; =20 - u8 *pibss =3D adapter->registrypriv.dev_network.mac_address; + u8 *ibss =3D adapter->registrypriv.dev_network.mac_address; =20 /* mlme_priv->fw_state ^=3D _FW_UNDER_SURVEY;because don't set assoc_= timer */ _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); @@ -716,7 +716,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *buf) sizeof(struct ndis_802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); - rtw_generate_random_ibss(pibss); + rtw_generate_random_ibss(ibss); =20 mlme_priv->fw_state =3D WIFI_ADHOC_MASTER_STATE; =20 @@ -1369,7 +1369,7 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *buf) struct sta_info *psta; struct wlan_network *pwlan =3D NULL; struct wlan_bssid_ex *dev_network =3D NULL; - u8 *pibss =3D NULL; + u8 *ibss =3D NULL; struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct stadel_event *pstadel =3D (struct stadel_event *)buf; struct wlan_network *tgt_network =3D &mlme_priv->cur_network; @@ -1455,7 +1455,7 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *buf) spin_unlock_bh(&mlme_priv->scanned_queue.lock); /* re-create ibss */ dev_network =3D &adapter->registrypriv.dev_network; - pibss =3D adapter->registrypriv.dev_network.mac_address; + ibss =3D adapter->registrypriv.dev_network.mac_address; =20 memcpy(dev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_ne= twork->network)); =20 @@ -1463,7 +1463,7 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *buf) =20 rtw_update_registrypriv_dev_network(adapter); =20 - rtw_generate_random_ibss(pibss); + rtw_generate_random_ibss(ibss); =20 if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { set_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE); --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.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 6DDC13CB567 for ; Fri, 31 Jul 2026 10:43:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494643; cv=none; b=ndyWwidRz89RPAaCOdp8RgZTvacaGZp2NjkNQxpqc1H6pOcRw9zFKab1a/KJnKaazQPqEUziZgeFeNu8slHASD/Wb7vGmZ/6/iLlJxl0nb5QUCnnMe8h+na1xTrq4IMHjc/n+a2SEpetWeD+P9EltxfT4KGMDPcaOqkAefWwQKY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494643; c=relaxed/simple; bh=8NYAjLgJIEhHKmTFcmIL6Hcii1yiTG1TFc24NNBIVME=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XN/k64wOtTgPCVjbW0UpO7ubO7EkFZ/R7Uk/8/Lo9N8RpMd49DKiXrtKDfdeU36iGxvOCfGADOdyW0CQh6GWTUJ1S8nRIqUUV5q4D2dyYkZ46ZHgS6WtOx+rzDzyi5J+HLlePtrX74VSs7NMGiYZ0UtDizuCAoHUUwVbv2KAxOs= 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=SLk5LjJ2; arc=none smtp.client-ip=209.85.221.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="SLk5LjJ2" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-47f93b2fe4cso514623f8f.0 for ; Fri, 31 Jul 2026 03:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494623; x=1786099423; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=USqDcpKYDPbvIaJCKxv2oi3H9relOD9ZBbNL1tR7fVk=; b=SLk5LjJ2hTFrhJARo6+rsTq9ILyxQx5r8R8Lr5Eigrh6VTb35Kcijk5w+4h2VOVxBw gE9FNdHT+fdAb+jvgP+MxxXpwDAI4RaQL6HtiCVuzU6E5X9kKNLkqb5Fw3RGLDgZFjgk rtNX9SwJObfci6oNjbeHLOXPeYZsNDBdkjzlVtequSXAqxG97C4ANlDSlbI+3lzSSfqP LrhbNp7L8FzM7SP+ZznQXYwUwZoLhB3wrtecOI2q7gm01ru3XLE70emKVVvxvQ46NEBz UeNFBNcTZOB/oGXjWgmw70D3bJHa0RCPH4dJaMMtkZOSi5GF+EF1ssw0XtrEJBCAVbfv MnmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494623; x=1786099423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=USqDcpKYDPbvIaJCKxv2oi3H9relOD9ZBbNL1tR7fVk=; b=TbtZkHjNF2jyk8x8HQQ3BWW7x0V9GQvYcpx9oImySPwTG/vPn9izfWM+abA09FT16Y eztlilRdu799j2T68mgmRbQqxUQsIe5j42xcPbho0PuVqlsaZHIcjAx5OtSBq5Q6k8DZ CKG6SRhw5/J8Si1dFzUsvyI7RcAYvAMOo8gW7Z86bAZcqsltYTIIzfEaHFCheqa8UBFF QI6mrYLH7ewFoUF7XAoQqTtXwKkKm5oLwXQ9nrdEh2kWboiKX5s1Ha+jO5ZETXjuBvu0 taeRXfS8qbkPhcL3JWBaU40YHR7AXudzCw32E3YxK9+tcL0WQ8nwwgnE6+QuxJ6DHO4e ZmaA== X-Gm-Message-State: AOJu0Yyo2+EG4ajoSuTYzPmgvBtyfPoncWNfuy2YtwcoS9/qu/y6/MZ/ AuMa4HloY5zbK20mV3qaDuc0ItzqzSHO4c1nxWA8fTVRAgz8fs9UU4+9IyDigDz4 X-Gm-Gg: AR+sD13FWr1aoE1E2C7p0wW/wtPPhqlY4Kz8LKyU1RiNoSVIdD8CZj3Kg3rd+nzcz+i uobdPwvfW138SgOo/6nkbNQGD6ysTTjMot63Nq5Q0R2PBJIxQJGPYinOV147fkSYP9rWI1JtgAk 0tz22ZsCcgmcx2yCNMKkA0TnD2iZn3Ta3MwMlJsqU94cog9rUDtQUORYyyEzSIvHqP/W5m/DVAX J6E+zBBgpSn03te6eQbbCLmNrP7TvRefniX0qrSGAEVvaB0anvAkOeRfjRumSuvxCrwPo4TKQnL YaigAletfzUkzKVwHaXYA0ZH/AE9W6Bp+vjXnW0fMamj1dztbnJYudbmGdgYMeKCSBToRrL/A2i J8+xkdtDqSa9F7qOZvnRxHfjGOP4AzfebwFLAf4Hw/FABu61J10hiPUBtwjCROAOf/QkX59iYZF TSrMh58Fnh+TdWwGFJHM3/cqMPa2M2kWdF9tXe+SZ9LjwUYlSxJG/pt4ne5Ekp/wJEpWJlKcJ/o /UjLwK/LzIOskNyrAtAgln5qkH3+DNA3NrpCN6/jXYMMyLTmulI X-Received: by 2002:a05:6000:25f2:b0:47f:97e9:fe4a with SMTP id ffacd0b85a97d-47fd2b56517mr3499363f8f.43.1785494622560; Fri, 31 Jul 2026 03:43:42 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:42 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 05/11] staging: rtl8723bs: renaming variable padapter in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:28 +0000 Message-ID: <20260731104134.12754-6-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of padapter to adapter since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 268 +++++++++++----------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 761cbff86bbb..e46e137a1adf 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -27,9 +27,9 @@ static void _rtw_set_scan_deny_timer_hdl(struct timer_lis= t *t) rtw_clear_scan_deny(adapter); } =20 -static void rtw_init_mlme_timer(struct adapter *padapter) +static void rtw_init_mlme_timer(struct adapter *adapter) { - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 timer_setup(&mlme_priv->assoc_timer, _rtw_join_timeout_handler, 0); timer_setup(&mlme_priv->scan_to_timer, rtw_scan_timeout_handler, 0); @@ -39,15 +39,15 @@ static void rtw_init_mlme_timer(struct adapter *padapte= r) _rtw_set_scan_deny_timer_hdl, 0); } =20 -int rtw_init_mlme_priv(struct adapter *padapter) +int rtw_init_mlme_priv(struct adapter *adapter) { int i; u8 *buf; struct wlan_network *pnetwork; - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; int res =3D _SUCCESS; =20 - mlme_priv->nic_hdl =3D (u8 *)padapter; + mlme_priv->nic_hdl =3D (u8 *)adapter; =20 mlme_priv->pscanned =3D NULL; mlme_priv->fw_state =3D WIFI_STATION_STATE; /* Must sync with rtw_wdev_a= lloc() */ @@ -82,7 +82,7 @@ int rtw_init_mlme_priv(struct adapter *padapter) =20 /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ =20 - rtw_clear_scan_deny(padapter); + rtw_clear_scan_deny(adapter); =20 #define RTW_ROAM_SCAN_RESULT_EXP_MS 5000 #define RTW_ROAM_RSSI_DIFF_TH 10 @@ -97,7 +97,7 @@ int rtw_init_mlme_priv(struct adapter *padapter) mlme_priv->roam_rssi_diff_th =3D RTW_ROAM_RSSI_DIFF_TH; mlme_priv->roam_scan_int_ms =3D RTW_ROAM_SCAN_INTERVAL_MS; =20 - rtw_init_mlme_timer(padapter); + rtw_init_mlme_timer(adapter); =20 exit: =20 @@ -243,11 +243,11 @@ struct wlan_network *_rtw_find_network(struct __queue= *scanned_queue, u8 *addr) return pnetwork; } =20 -void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) +void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall) { struct list_head *phead, *plist, *tmp; struct wlan_network *pnetwork; - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct __queue *scanned_queue =3D &mlme_priv->scanned_queue; =20 spin_lock_bh(&scanned_queue->lock); @@ -262,10 +262,10 @@ void rtw_free_network_queue(struct adapter *padapter,= u8 isfreeall) spin_unlock_bh(&scanned_queue->lock); } =20 -bool rtw_if_up(struct adapter *padapter) +bool rtw_if_up(struct adapter *adapter) { - if (padapter->driver_stopped || padapter->bSurpriseRemoved || - !check_fwstate(&padapter->mlmepriv, _FW_LINKED)) + if (adapter->driver_stopped || adapter->bSurpriseRemoved || + !check_fwstate(&adapter->mlmepriv, _FW_LINKED)) return false; =20 return true; @@ -307,11 +307,11 @@ void rtw_free_mlme_priv(struct mlme_priv *mlme_priv) _rtw_free_mlme_priv(mlme_priv); } =20 -void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork); -void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork) +void rtw_free_network_nolock(struct adapter *adapter, struct wlan_network = *pnetwork); +void rtw_free_network_nolock(struct adapter *adapter, struct wlan_network = *pnetwork) { - _rtw_free_network_nolock(&padapter->mlmepriv, pnetwork); - rtw_cfg80211_unlink_bss(padapter, pnetwork); + _rtw_free_network_nolock(&adapter->mlmepriv, pnetwork); + rtw_cfg80211_unlink_bss(adapter, pnetwork); } =20 /* @@ -406,7 +406,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct= __queue *scanned_queue) } =20 void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, - struct adapter *padapter, bool update_ie) + struct adapter *adapter, bool update_ie) { long rssi_ori =3D dst->rssi; =20 @@ -417,10 +417,10 @@ void update_network(struct wlan_bssid_ex *dst, struct= wlan_bssid_ex *src, long rssi_final; =20 /* The rule below is 1/5 for sample value, 4/5 for history value */ - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&pa= dapter->mlmepriv.cur_network.network, src, 0)) { + if (check_fwstate(&adapter->mlmepriv, _FW_LINKED) && is_same_network(&ada= pter->mlmepriv.cur_network.network, src, 0)) { /* Take the recvpriv's value for the connected AP*/ - ss_final =3D padapter->recvpriv.signal_strength; - sq_final =3D padapter->recvpriv.signal_qual; + ss_final =3D adapter->recvpriv.signal_strength; + sq_final =3D adapter->recvpriv.signal_qual; /* the rssi value here is undecorated, and will be used for antenna dive= rsity */ if (sq_smp !=3D 101) /* from the right channel */ rssi_final =3D (src->rssi + dst->rssi * 4) / 5; @@ -856,69 +856,69 @@ void rtw_free_assoc_resources(struct adapter *adapter= , int lock_scanned_queue) } =20 /* rtw_indicate_connect: the caller has to lock mlme_priv->lock */ -void rtw_indicate_connect(struct adapter *padapter) +void rtw_indicate_connect(struct adapter *adapter) { - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 mlme_priv->to_join =3D false; =20 - if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { + if (!check_fwstate(&adapter->mlmepriv, _FW_LINKED)) { set_fwstate(mlme_priv, _FW_LINKED); =20 if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) - rtw_cfg80211_ibss_indicate_connect(padapter); + rtw_cfg80211_ibss_indicate_connect(adapter); else - rtw_cfg80211_indicate_connect(padapter); + rtw_cfg80211_indicate_connect(adapter); =20 - netif_carrier_on(padapter->pnetdev); + netif_carrier_on(adapter->pnetdev); =20 - if (padapter->pid[2] !=3D 0) - rtw_signal_process(padapter->pid[2], SIGALRM); + if (adapter->pid[2] !=3D 0) + rtw_signal_process(adapter->pid[2], SIGALRM); } =20 - rtw_set_to_roam(padapter, 0); - rtw_set_scan_deny(padapter, 3000); + rtw_set_to_roam(adapter, 0); + rtw_set_scan_deny(adapter, 3000); } =20 /* rtw_indicate_disconnect: the caller has to lock mlme_priv->lock */ -void rtw_indicate_disconnect(struct adapter *padapter) +void rtw_indicate_disconnect(struct adapter *adapter) { - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); =20 - if (rtw_to_roam(padapter) > 0) + if (rtw_to_roam(adapter) > 0) _clr_fwstate_(mlme_priv, _FW_LINKED); =20 - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || rtw_to_roam(padapte= r) <=3D 0) { + if (check_fwstate(&adapter->mlmepriv, _FW_LINKED) || rtw_to_roam(adapter)= <=3D 0) { /* Do it first for tx broadcast pkt after disconnection issue! */ - netif_carrier_off(padapter->pnetdev); + netif_carrier_off(adapter->pnetdev); =20 - rtw_cfg80211_indicate_disconnect(padapter); + rtw_cfg80211_indicate_disconnect(adapter); =20 - rtw_reset_securitypriv_cmd(padapter); + rtw_reset_securitypriv_cmd(adapter); =20 /* set ips_deny_time to avoid enter IPS before LPS leave */ - rtw_set_ips_deny(padapter, 3000); + rtw_set_ips_deny(adapter, 3000); =20 _clr_fwstate_(mlme_priv, _FW_LINKED); =20 - rtw_clear_scan_deny(padapter); + rtw_clear_scan_deny(adapter); } =20 - rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1); + rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_DISCONNECT, 1); } =20 -inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) +inline void rtw_indicate_scan_done(struct adapter *adapter, bool aborted) { - rtw_cfg80211_indicate_scan_done(padapter, aborted); + rtw_cfg80211_indicate_scan_done(adapter, aborted); =20 - if ((!adapter_to_pwrctl(padapter)->bInSuspend) && - (!check_fwstate(&padapter->mlmepriv, + if ((!adapter_to_pwrctl(adapter)->bInSuspend) && + (!check_fwstate(&adapter->mlmepriv, WIFI_ASOC_STATE | WIFI_UNDER_LINKING))) { - rtw_set_ips_deny(padapter, 0); - _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 1); + rtw_set_ips_deny(adapter, 0); + _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 1); } } =20 @@ -944,13 +944,13 @@ void rtw_scan_abort(struct adapter *adapter) pmlmeext->scan_abort =3D false; } =20 -static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapte= r, struct wlan_network *pnetwork) +static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *adapter= , struct wlan_network *pnetwork) { int i; struct sta_info *bmc_sta, *psta =3D NULL; struct recv_reorder_ctrl *preorder_ctrl; - struct sta_priv *pstapriv =3D &padapter->stapriv; - struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; + struct sta_priv *pstapriv =3D &adapter->stapriv; + struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; =20 psta =3D rtw_get_stainfo(pstapriv, pnetwork->network.mac_address); if (!psta) @@ -960,27 +960,27 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str =20 psta->aid =3D pnetwork->join_res; =20 - update_sta_info(padapter, psta); + update_sta_info(adapter, psta); =20 /* update station supportRate */ psta->bssratelen =3D rtw_get_rateset_len(pnetwork->network.supported_rat= es); memcpy(psta->bssrateset, pnetwork->network.supported_rates, psta->bssrat= elen); - rtw_hal_update_sta_rate_mask(padapter, psta); + rtw_hal_update_sta_rate_mask(adapter, psta); =20 psta->wireless_mode =3D pmlmeext->cur_wireless_mode; - psta->raid =3D networktype_to_raid_ex(padapter, psta); + psta->raid =3D networktype_to_raid_ex(adapter, psta); =20 /* sta mode */ - rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true); + rtw_hal_set_odm_var(adapter, HAL_ODM_STA_INFO, psta, true); =20 /* security related */ - if (padapter->securitypriv.dot11_auth_algrthm =3D=3D dot11_auth_algrthm_= 8021x) { - padapter->securitypriv.binstallGrpkey =3D false; - padapter->securitypriv.busetkipkey =3D false; - padapter->securitypriv.bgrpkey_handshake =3D false; + if (adapter->securitypriv.dot11_auth_algrthm =3D=3D dot11_auth_algrthm_8= 021x) { + adapter->securitypriv.binstallGrpkey =3D false; + adapter->securitypriv.busetkipkey =3D false; + adapter->securitypriv.bgrpkey_handshake =3D false; =20 psta->ieee8021x_blocked =3D true; - psta->dot118021XPrivacy =3D padapter->securitypriv.dot11_privacy_algrth= m; + psta->dot118021XPrivacy =3D adapter->securitypriv.dot11_privacy_algrthm; =20 memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof(union Keytype)); =20 @@ -995,9 +995,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(stru= ct adapter *padapter, str =20 /* When doing the WPS, the wps_ie_len won't equal to 0 */ /* And the Wi-Fi driver shouldn't allow the data packet to be transmitte= d. */ - if (padapter->securitypriv.wps_ie_len !=3D 0) { + if (adapter->securitypriv.wps_ie_len !=3D 0) { psta->ieee8021x_blocked =3D true; - padapter->securitypriv.wps_ie_len =3D 0; + adapter->securitypriv.wps_ie_len =3D 0; } =20 /* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */ @@ -1011,7 +1011,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str preorder_ctrl->wsize_b =3D 64;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b= =3D32 */ } =20 - bmc_sta =3D rtw_get_bcmc_stainfo(padapter); + bmc_sta =3D rtw_get_bcmc_stainfo(adapter); if (bmc_sta) { for (i =3D 0; i < 16 ; i++) { preorder_ctrl =3D &bmc_sta->recvreorder_ctrl[i]; @@ -1028,10 +1028,10 @@ static struct sta_info *rtw_joinbss_update_stainfo(= struct adapter *padapter, str =20 /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -static void rtw_joinbss_update_network(struct adapter *padapter, struct wl= an_network *ptarget_wlan, +static void rtw_joinbss_update_network(struct adapter *adapter, struct wla= n_network *ptarget_wlan, struct wlan_network *pnetwork) { - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct wlan_network *cur_network =3D &mlme_priv->cur_network; =20 /* why not use ptarget_wlan?? */ @@ -1042,14 +1042,14 @@ static void rtw_joinbss_update_network(struct adapt= er *padapter, struct wlan_net =20 cur_network->aid =3D pnetwork->join_res; =20 - rtw_set_signal_stat_timer(&padapter->recvpriv); + rtw_set_signal_stat_timer(&adapter->recvpriv); =20 - padapter->recvpriv.signal_strength =3D ptarget_wlan->network.phy_info.sig= nal_strength; - padapter->recvpriv.signal_qual =3D ptarget_wlan->network.phy_info.signal_= quality; + adapter->recvpriv.signal_strength =3D ptarget_wlan->network.phy_info.sign= al_strength; + adapter->recvpriv.signal_qual =3D ptarget_wlan->network.phy_info.signal_q= uality; /* the ptarget_wlan->network.rssi is raw data, we use ptarget_wlan->netwo= rk.phy_info.signal_strength instead (has scaled) */ - padapter->recvpriv.rssi =3D translate_percentage_to_dbm(ptarget_wlan->net= work.phy_info.signal_strength); + adapter->recvpriv.rssi =3D translate_percentage_to_dbm(ptarget_wlan->netw= ork.phy_info.signal_strength); =20 - rtw_set_signal_stat_timer(&padapter->recvpriv); + rtw_set_signal_stat_timer(&adapter->recvpriv); =20 /* update fw_state will clr _FW_UNDER_LINKING here indirectly */ switch (pnetwork->network.infrastructure_mode) { @@ -1072,10 +1072,10 @@ static void rtw_joinbss_update_network(struct adapt= er *padapter, struct wlan_net if (cur_network->network.ie_length < sizeof(struct ndis_802_11_fix_ie)) return; =20 - rtw_update_protection(padapter, (cur_network->network.ies) + sizeof(struc= t ndis_802_11_fix_ie), + rtw_update_protection(adapter, (cur_network->network.ies) + sizeof(struct= ndis_802_11_fix_ie), (cur_network->network.ie_length - sizeof(struct ndis_802_11_fix_i= e))); =20 - rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->networ= k.ie_length, (u8) cur_network->network.configuration.ds_config); + rtw_update_ht_cap(adapter, cur_network->network.ies, cur_network->network= .ie_length, (u8) cur_network->network.configuration.ds_config); } =20 static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; @@ -1480,18 +1480,18 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *buf) spin_unlock_bh(&mlme_priv->lock); } =20 -void rtw_cpwm_event_callback(struct adapter *padapter, u8 *buf) +void rtw_cpwm_event_callback(struct adapter *adapter, u8 *buf) { struct reportpwrstate_parm *preportpwrstate; =20 preportpwrstate =3D (struct reportpwrstate_parm *)buf; - preportpwrstate->state |=3D (u8)(adapter_to_pwrctl(padapter)->cpwm_tog + = 0x80); - cpwm_int_hdl(padapter, preportpwrstate); + preportpwrstate->state |=3D (u8)(adapter_to_pwrctl(adapter)->cpwm_tog + 0= x80); + cpwm_int_hdl(adapter, preportpwrstate); } =20 -void rtw_wmm_event_callback(struct adapter *padapter, u8 *buf) +void rtw_wmm_event_callback(struct adapter *adapter, u8 *buf) { - WMMOnAssocRsp(padapter); + WMMOnAssocRsp(adapter); } =20 /* @@ -1575,15 +1575,15 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *a= dapter) } } =20 -static void rtw_auto_scan_handler(struct adapter *padapter) +static void rtw_auto_scan_handler(struct adapter *adapter) { - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 - rtw_mlme_reset_auto_scan_int(padapter); + rtw_mlme_reset_auto_scan_int(adapter); =20 if (mlme_priv->auto_scan_int_ms !=3D 0 && jiffies_to_msecs(jiffies - mlme_priv->scan_start_time) > mlme_priv->a= uto_scan_int_ms) { - if (!padapter->registrypriv.wifi_spec) { + if (!adapter->registrypriv.wifi_spec) { if (check_fwstate(mlme_priv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit; =20 @@ -1591,7 +1591,7 @@ static void rtw_auto_scan_handler(struct adapter *pad= apter) goto exit; } =20 - rtw_set_802_11_bssid_list_scan(padapter, NULL, 0); + rtw_set_802_11_bssid_list_scan(adapter, NULL, 0); } =20 exit: @@ -1624,7 +1624,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *= adapter) /* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps(adapter); } else { - /* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) in traffic_sta= tus_watchdog() */ + /* call rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_LEAVE, 1) in traffic_stat= us_watchdog() */ } =20 } else { @@ -2149,10 +2149,10 @@ void rtw_update_registrypriv_dev_network(struct ada= pter *adapter) } =20 /* the function is at passive_level */ -void rtw_joinbss_reset(struct adapter *padapter) +void rtw_joinbss_reset(struct adapter *adapter) { u8 threshold; - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 struct ht_priv *phtpriv =3D &mlme_priv->htpriv; =20 @@ -2167,22 +2167,22 @@ void rtw_joinbss_reset(struct adapter *padapter) /* TH =3D 1 =3D> means that invalidate usb rx aggregation */ /* TH =3D 0 =3D> means that validate usb rx aggregation, use init value.= */ if (phtpriv->ht_option) { - if (padapter->registrypriv.wifi_spec =3D=3D 1) + if (adapter->registrypriv.wifi_spec =3D=3D 1) threshold =3D 1; else threshold =3D 0; - rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); + rtw_hal_set_hwreg(adapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); } else { threshold =3D 1; - rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); + rtw_hal_set_hwreg(adapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); } } =20 -void rtw_ht_use_default_setting(struct adapter *padapter) +void rtw_ht_use_default_setting(struct adapter *adapter) { - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct ht_priv *phtpriv =3D &mlme_priv->htpriv; - struct registry_priv *pregistrypriv =3D &padapter->registrypriv; + struct registry_priv *pregistrypriv =3D &adapter->registrypriv; bool bHwLDPCSupport =3D false, bHwSTBCSupport =3D false; bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; =20 @@ -2195,34 +2195,34 @@ void rtw_ht_use_default_setting(struct adapter *pad= apter) phtpriv->sgi_20m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : = false; =20 /* LDPC support */ - rtw_hal_get_def_var(padapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); CLEAR_FLAGS(phtpriv->ldpc_cap); if (bHwLDPCSupport) { if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(4))) SET_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_RX); } - rtw_hal_get_def_var(padapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); if (bHwLDPCSupport) { if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(5))) SET_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_TX); } =20 /* STBC */ - rtw_hal_get_def_var(padapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); CLEAR_FLAGS(phtpriv->stbc_cap); if (bHwSTBCSupport) { if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(5))) SET_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX); } - rtw_hal_get_def_var(padapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); if (bHwSTBCSupport) { if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(4))) SET_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_RX); } =20 /* Beamforming setting */ - rtw_hal_get_def_var(padapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSupp= ortBeamformer); - rtw_hal_get_def_var(padapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSupp= ortBeamformee); + rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSuppo= rtBeamformer); + rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSuppo= rtBeamformee); CLEAR_FLAGS(phtpriv->beamform_cap); if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(4)) && bHwSupportBeamforme= r) SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); @@ -2231,32 +2231,32 @@ void rtw_ht_use_default_setting(struct adapter *pad= apter) SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); } =20 -void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_= len) +void rtw_build_wmm_ie_ht(struct adapter *adapter, u8 *out_ie, uint *pout_l= en) { unsigned char WMM_IE[] =3D {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00}; int out_len; =20 - if (padapter->mlmepriv.qospriv.qos_option =3D=3D 0) { + if (adapter->mlmepriv.qospriv.qos_option =3D=3D 0) { out_len =3D *pout_len; rtw_set_ie(out_ie + out_len, WLAN_EID_VENDOR_SPECIFIC, _WMM_IE_Length_, WMM_IE, pout_len); =20 - padapter->mlmepriv.qospriv.qos_option =3D 1; + adapter->mlmepriv.qospriv.qos_option =3D 1; } } =20 /* the function is >=3D passive_level */ -unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8= *out_ie, uint in_len, uint *pout_len, u8 channel) +unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 = *out_ie, uint in_len, uint *pout_len, u8 channel) { u32 ielen, out_len; enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor; unsigned char *p; struct ieee80211_ht_cap ht_capie; u8 cbw40_enable =3D 0, stbc_rx_enable =3D 0, operation_bw =3D 0; - struct registry_priv *pregistrypriv =3D &padapter->registrypriv; - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct registry_priv *pregistrypriv =3D &adapter->registrypriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct ht_priv *phtpriv =3D &mlme_priv->htpriv; - struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; + struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; =20 phtpriv->ht_option =3D false; =20 @@ -2273,7 +2273,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ if (!in_ie) { /* TDLS: TODO 20/40 issue */ if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { - operation_bw =3D padapter->mlmeextpriv.cur_bwmode; + operation_bw =3D adapter->mlmeextpriv.cur_bwmode; if (operation_bw > CHANNEL_WIDTH_40) operation_bw =3D CHANNEL_WIDTH_40; } else { @@ -2335,20 +2335,20 @@ unsigned int rtw_restructure_ht_ie(struct adapter *= padapter, u8 *in_ie, u8 *out_ { u32 rx_packet_offset, max_recvbuf_sz; =20 - rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offse= t); - rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); + rtw_hal_get_def_var(adapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset= ); + rtw_hal_get_def_var(adapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); } =20 - if (padapter->driver_rx_ampdu_factor !=3D 0xFF) + if (adapter->driver_rx_ampdu_factor !=3D 0xFF) max_rx_ampdu_factor =3D - (enum ieee80211_max_ampdu_length_exp)padapter->driver_rx_ampdu_factor; + (enum ieee80211_max_ampdu_length_exp)adapter->driver_rx_ampdu_factor; else - rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, + rtw_hal_get_def_var(adapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor); =20 ht_capie.ampdu_params_info =3D (max_rx_ampdu_factor & 0x03); =20 - if (padapter->securitypriv.dot11_privacy_algrthm =3D=3D _AES_) + if (adapter->securitypriv.dot11_privacy_algrthm =3D=3D _AES_) ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 = << 2)); else ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY & 0x00); @@ -2370,15 +2370,15 @@ unsigned int rtw_restructure_ht_ie(struct adapter *= padapter, u8 *in_ie, u8 *out_ } =20 /* the function is > passive_level (in critical_section) */ -void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 = channel) +void rtw_update_ht_cap(struct adapter *adapter, u8 *pie, uint ie_len, u8 c= hannel) { u8 *p, max_ampdu_sz; int len; struct ieee80211_ht_cap *pht_capie; - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct ht_priv *phtpriv =3D &mlme_priv->htpriv; - struct registry_priv *pregistrypriv =3D &padapter->registrypriv; - struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; + struct registry_priv *pregistrypriv =3D &adapter->registrypriv; + struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; u8 cbw40_enable =3D 0; =20 @@ -2455,7 +2455,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe pmlmeinfo->HT_protection =3D pmlmeinfo->HT_info.infos[1] & 0x3; } =20 -void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *p= xmitframe) +void rtw_issue_addbareq_cmd(struct adapter *adapter, struct xmit_frame *px= mitframe) { u8 issued; int priority; @@ -2464,12 +2464,12 @@ void rtw_issue_addbareq_cmd(struct adapter *padapte= r, struct xmit_frame *pxmitfr struct pkt_attrib *pattrib =3D &pxmitframe->attrib; s32 bmcst =3D is_multicast_ether_addr(pattrib->ra); =20 - if (bmcst || (padapter->mlmepriv.link_detect_info.num_tx_ok_in_period < 1= 00)) + if (bmcst || (adapter->mlmepriv.link_detect_info.num_tx_ok_in_period < 10= 0)) return; =20 priority =3D pattrib->priority; =20 - psta =3D rtw_get_stainfo(&padapter->stapriv, pattrib->ra); + psta =3D rtw_get_stainfo(&adapter->stapriv, pattrib->ra); if (pattrib->psta !=3D psta) return; =20 @@ -2487,14 +2487,14 @@ void rtw_issue_addbareq_cmd(struct adapter *padapte= r, struct xmit_frame *pxmitfr =20 if (issued =3D=3D 0) { psta->htpriv.candidate_tid_bitmap |=3D BIT((u8)priority); - rtw_addbareq_cmd(padapter, (u8) priority, pattrib->ra); + rtw_addbareq_cmd(adapter, (u8) priority, pattrib->ra); } } } =20 -void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *po= ut_len) +void rtw_append_exented_cap(struct adapter *adapter, u8 *out_ie, uint *pou= t_len) { - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct ht_priv *phtpriv =3D &mlme_priv->htpriv; u8 cap_content[8] =3D {0}; =20 @@ -2522,43 +2522,43 @@ inline u8 rtw_to_roam(struct adapter *adapter) return adapter->mlmepriv.to_roam; } =20 -void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_networ= k) +void rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network) { - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 spin_lock_bh(&mlme_priv->lock); - _rtw_roaming(padapter, tgt_network); + _rtw_roaming(adapter, tgt_network); spin_unlock_bh(&mlme_priv->lock); } =20 -void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_netwo= rk) +void _rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_networ= k) { - struct mlme_priv *mlme_priv =3D &padapter->mlmepriv; + struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct wlan_network *cur_network =3D &mlme_priv->cur_network; =20 - if (rtw_to_roam(padapter) > 0) { + if (rtw_to_roam(adapter) > 0) { memcpy(&mlme_priv->assoc_ssid, &cur_network->network.ssid, sizeof(struct= ndis_802_11_ssid)); =20 mlme_priv->assoc_by_bssid =3D false; =20 - while (rtw_do_join(padapter) !=3D _SUCCESS) { - rtw_dec_to_roam(padapter); - if (rtw_to_roam(padapter) <=3D 0) { - rtw_indicate_disconnect(padapter); + while (rtw_do_join(adapter) !=3D _SUCCESS) { + rtw_dec_to_roam(adapter); + if (rtw_to_roam(adapter) <=3D 0) { + rtw_indicate_disconnect(adapter); break; } } } } =20 -bool rtw_linked_check(struct adapter *padapter) +bool rtw_linked_check(struct adapter *adapter) { - if (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) || - check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MAST= ER_STATE)) { - if (padapter->stapriv.asoc_sta_count > 2) + if (check_fwstate(&adapter->mlmepriv, WIFI_AP_STATE) || + check_fwstate(&adapter->mlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTE= R_STATE)) { + if (adapter->stapriv.asoc_sta_count > 2) return true; } else { /* Station mode */ - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED)) + if (check_fwstate(&adapter->mlmepriv, _FW_LINKED)) return true; } return false; --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 A6EA5415F08 for ; Fri, 31 Jul 2026 10:43:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494642; cv=none; b=h6eJ7HnFavGuW+0bvRIVS8r4feOc5rrB0mnovOSsbc/45ATuu6DbqoGABpLCepwzO/kgKD8YpuQEZDyrjGodpklAe3kkSoc7e0EIuwyl1CvNOWXWYK9lZC0sPM7r/66E47ZLQxTjc0Jvti/bsJj8UZqiTCig5eqJKuCOFujXJ10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494642; c=relaxed/simple; bh=k9DXMZejTdyJ7RcE+SCt7jzXZ6JmG0z8IjpolHiFCzI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AXNnURMBquHf4aUlG7lciI63UbE5SJT9wmjGMe/Z+QsCxkVtpdGtffdRZWpfLsKvReDeBhyOBdsy025cTvru5fQAo9IZ3l9OqaOpL9Tr/Eq3KiVO35VBlk9GEdIdZ57b0x1D5L6hJ9/s6vyA+47ig3vu4Z7cBuhadjWMmbYIzig= 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=PCcK7jpD; arc=none smtp.client-ip=209.85.221.51 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="PCcK7jpD" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-47640541585so608198f8f.1 for ; Fri, 31 Jul 2026 03:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494623; x=1786099423; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=xCRzzaqpndFinfR000FaVA8jGy2wj2bMul+CSVVldBY=; b=PCcK7jpD3HPC2qFfaTWeHcFwXs/Hq1iHH5Mqv3mW4yPY+kkORRnWVkLMZ7oOosgYC6 us8Q/6IhXDIKxPUEVVj2sEiTBfqHUQn5vrDLaEFV/Hiu80NBeGa6K0Su0EBMDwZbhmRH d1I9BnQB4lulJODQiVDfIkjEBbL//TDm/iEQzgx2/cvsxZ2YVk4Vh1mDGPaPisj3IIJ4 LuwtNHPjAzYd2l+ZUmXDSSgfrGBB2qSkUQupwKhKastgu67o5eB/SgCTmXVV6HkTj5Sx ++/vUqaD8yE6eP/TF9yvXuwEA0BebkaTHKqCxTztFKSiYlBw8ZW88K83HnSGJbmHGXXr 6RLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494623; x=1786099423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=xCRzzaqpndFinfR000FaVA8jGy2wj2bMul+CSVVldBY=; b=jqGzHzcYoCjoDAq4otb8NWJPwLMKeUJVz6WpdXmqyb4WNKgU0cC348Q9SpeV5kvQxK 0rJX7uZ2c2aM8Dx1Pa335WgRLYawpHlCB4cQimg1rh9w6wCgCAPUl1hwBK8AAMCiiQxr wR41qib+vrgtZTRVRQxmrQXjiLOhSR0S/XHdwKJkpddTjivDe3VIgPDHfA5si0p2A52Z BweitR2ao+DJmhxRjtrt9c4tPC8F6DPMWO9Io4P0Mn/QEZw4n32RzU/5QDGEtM/xbASP p1ct/viMR84jx/V3chS/JVfKR53gmMba4kQBOgoYLVY0zJpXXqBZkyYyRdHD71paeZKu xQ1A== X-Gm-Message-State: AOJu0YxsE3SljWzPP00ien4bNZqKAfYOgDABgE5jTRcfYRGQYeAHi8WK 5MAevZQ/8RMBlvAm+Q0eIdlieP5Urz2+NfM6/Ax6V+bNQY3zJesK9wQO X-Gm-Gg: AR+sD10i6YeqyGZWK15rjweRrl0iTOjyC3RiUM54TK0FsVS0tjw/h0z96GojRJzEdBI eV0hhjteAZgOgB0YY+lD2lIFw/KteTSU3GgtE1Gon6ipuDTTzehxvR60YAhjiCJ3o6ZNBHhSRvI iDx3ZYhfownx+hcRLJxpEPtl3lWKLzsRbn/hiMowfNbFmAQ2GMxJ0pVpLV9bPSjHlEJyYma7PRJ RBH1RmOnS6oSGF4GMS6x4BlqU2RlcOV+8YULJelqqQWR9ZftzXsgICNqnAjh2hbY32ylwRKqlTf wTMcviX8C7WYsD+iQR/VWx3ZlN0BTklnKvl0Ba+VFtOkGuiV8MDIdnTupMNvbapCNuey3cMz6cm MGGV4koyjdyUs3EUdz5mvfzSJfzDIzH0B6hPOF374uKUTtUonN6ZA4I71oslypRodEeue+liNHj 0GKOyjjyfVm3LBGLghY1I1iEjQvhgGxKhh7vFaXZI5051R+JYBL4aIb1S60S6mMITH0zKUsPgNu 8WAW1tad/ZSXr8mU2XkTf34vQC0OeIqVhHxo8Rnl2liqJCuwkDAVX8CQwABU4s= X-Received: by 2002:a05:6000:2582:b0:47f:8ce7:8684 with SMTP id ffacd0b85a97d-47fd2ab8b0bmr3474575f8f.6.1785494623197; Fri, 31 Jul 2026 03:43:43 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:42 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 06/11] staging: rtl8723bs: renaming variable phtpriv in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:29 +0000 Message-ID: <20260731104134.12754-7-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of phtpriv to ht_priv since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 74 +++++++++++------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index e46e137a1adf..7245f671075e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2154,7 +2154,7 @@ void rtw_joinbss_reset(struct adapter *adapter) u8 threshold; struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; =20 - struct ht_priv *phtpriv =3D &mlme_priv->htpriv; + struct ht_priv *ht_priv =3D &mlme_priv->htpriv; =20 /* todo: if you want to do something io/reg/hw setting before join_bss, p= lease add code here */ =20 @@ -2162,11 +2162,11 @@ void rtw_joinbss_reset(struct adapter *adapter) =20 mlme_priv->num_sta_no_ht =3D 0; =20 - phtpriv->ampdu_enable =3D false;/* reset to disabled */ + ht_priv->ampdu_enable =3D false;/* reset to disabled */ =20 /* TH =3D 1 =3D> means that invalidate usb rx aggregation */ /* TH =3D 0 =3D> means that validate usb rx aggregation, use init value.= */ - if (phtpriv->ht_option) { + if (ht_priv->ht_option) { if (adapter->registrypriv.wifi_spec =3D=3D 1) threshold =3D 1; else @@ -2181,54 +2181,54 @@ void rtw_joinbss_reset(struct adapter *adapter) void rtw_ht_use_default_setting(struct adapter *adapter) { struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; - struct ht_priv *phtpriv =3D &mlme_priv->htpriv; + struct ht_priv *ht_priv =3D &mlme_priv->htpriv; struct registry_priv *pregistrypriv =3D &adapter->registrypriv; bool bHwLDPCSupport =3D false, bHwSTBCSupport =3D false; bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; =20 if (pregistrypriv->wifi_spec) - phtpriv->bss_coexist =3D 1; + ht_priv->bss_coexist =3D 1; else - phtpriv->bss_coexist =3D 0; + ht_priv->bss_coexist =3D 0; =20 - phtpriv->sgi_40m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : = false; - phtpriv->sgi_20m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : = false; + ht_priv->sgi_40m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : = false; + ht_priv->sgi_20m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : = false; =20 /* LDPC support */ rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); - CLEAR_FLAGS(phtpriv->ldpc_cap); + CLEAR_FLAGS(ht_priv->ldpc_cap); if (bHwLDPCSupport) { if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(4))) - SET_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_RX); + SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_RX); } rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); if (bHwLDPCSupport) { if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(5))) - SET_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_TX); + SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_TX); } =20 /* STBC */ rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); - CLEAR_FLAGS(phtpriv->stbc_cap); + CLEAR_FLAGS(ht_priv->stbc_cap); if (bHwSTBCSupport) { if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(5))) - SET_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX); + SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_TX); } rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); if (bHwSTBCSupport) { if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(4))) - SET_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_RX); + SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX); } =20 /* Beamforming setting */ rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSuppo= rtBeamformer); rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSuppo= rtBeamformee); - CLEAR_FLAGS(phtpriv->beamform_cap); + CLEAR_FLAGS(ht_priv->beamform_cap); if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(4)) && bHwSupportBeamforme= r) - SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); + SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); =20 if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(5)) && bHwSupportBeamforme= e) - SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); + SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); } =20 void rtw_build_wmm_ie_ht(struct adapter *adapter, u8 *out_ie, uint *pout_l= en) @@ -2255,10 +2255,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *= adapter, u8 *in_ie, u8 *out_i u8 cbw40_enable =3D 0, stbc_rx_enable =3D 0, operation_bw =3D 0; struct registry_priv *pregistrypriv =3D &adapter->registrypriv; struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; - struct ht_priv *phtpriv =3D &mlme_priv->htpriv; + struct ht_priv *ht_priv =3D &mlme_priv->htpriv; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; =20 - phtpriv->ht_option =3D false; + ht_priv->ht_option =3D false; =20 out_len =3D *pout_len; =20 @@ -2266,7 +2266,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *ad= apter, u8 *in_ie, u8 *out_i =20 ht_capie.cap_info =3D cpu_to_le16(IEEE80211_HT_CAP_DSSSCCK40); =20 - if (phtpriv->sgi_20m) + if (ht_priv->sgi_20m) ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_SGI_20); =20 /* Get HT BW */ @@ -2307,17 +2307,17 @@ unsigned int rtw_restructure_ht_ie(struct adapter *= adapter, u8 *in_ie, u8 *out_i =20 if ((cbw40_enable =3D=3D 1) && (operation_bw =3D=3D CHANNEL_WIDTH_40)) { ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH); - if (phtpriv->sgi_40m) + if (ht_priv->sgi_40m) ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_SGI_40); } =20 - if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX)) + if (TEST_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_TX)) ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_TX_STBC); =20 /* todo: disable SM power save mode */ ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_SM_PS); =20 - if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_RX)) { + if (TEST_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX)) { if ((channel <=3D 14 && pregistrypriv->rx_stbc =3D=3D 0x1) || /* enable = for 2.4GHz */ (pregistrypriv->wifi_spec =3D=3D 1)) stbc_rx_enable =3D 1; @@ -2356,7 +2356,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *ad= apter, u8 *in_ie, u8 *out_i rtw_set_ie(out_ie + out_len, WLAN_EID_HT_CAPABILITY, sizeof(struct ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len= ); =20 - phtpriv->ht_option =3D true; + ht_priv->ht_option =3D true; =20 if (in_ie) { p =3D rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len); @@ -2366,7 +2366,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *ad= apter, u8 *in_ie, u8 *out_i } } =20 - return phtpriv->ht_option; + return ht_priv->ht_option; } =20 /* the function is > passive_level (in critical_section) */ @@ -2376,21 +2376,21 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 = *pie, uint ie_len, u8 channel int len; struct ieee80211_ht_cap *pht_capie; struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; - struct ht_priv *phtpriv =3D &mlme_priv->htpriv; + struct ht_priv *ht_priv =3D &mlme_priv->htpriv; struct registry_priv *pregistrypriv =3D &adapter->registrypriv; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; u8 cbw40_enable =3D 0; =20 - if (!phtpriv->ht_option) + if (!ht_priv->ht_option) return; =20 if ((!pmlmeinfo->HT_info_enable) || (!pmlmeinfo->HT_caps_enable)) return; =20 /* maybe needs check if ap supports rx ampdu. */ - if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable =3D=3D 1) - phtpriv->ampdu_enable =3D true; + if (!(ht_priv->ampdu_enable) && pregistrypriv->ampdu_enable =3D=3D 1) + ht_priv->ampdu_enable =3D true; =20 /* check Max Rx A-MPDU Size */ len =3D 0; @@ -2400,7 +2400,7 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *p= ie, uint ie_len, u8 channel max_ampdu_sz =3D (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_= FACTOR); max_ampdu_sz =3D 1 << (max_ampdu_sz + 3); /* max_ampdu_sz (kbytes); */ =20 - phtpriv->rx_ampdu_maxlen =3D max_ampdu_sz; + ht_priv->rx_ampdu_maxlen =3D max_ampdu_sz; } =20 len =3D 0; @@ -2460,7 +2460,7 @@ void rtw_issue_addbareq_cmd(struct adapter *adapter, = struct xmit_frame *pxmitfra u8 issued; int priority; struct sta_info *psta; - struct ht_priv *phtpriv; + struct ht_priv *ht_priv; struct pkt_attrib *pattrib =3D &pxmitframe->attrib; s32 bmcst =3D is_multicast_ether_addr(pattrib->ra); =20 @@ -2479,11 +2479,11 @@ void rtw_issue_addbareq_cmd(struct adapter *adapter= , struct xmit_frame *pxmitfra if (!(psta->state & _FW_LINKED)) return; =20 - phtpriv =3D &psta->htpriv; + ht_priv =3D &psta->htpriv; =20 - if (phtpriv->ht_option && phtpriv->ampdu_enable) { - issued =3D (phtpriv->agg_enable_bitmap >> priority) & 0x1; - issued |=3D (phtpriv->candidate_tid_bitmap >> priority) & 0x1; + if (ht_priv->ht_option && ht_priv->ampdu_enable) { + issued =3D (ht_priv->agg_enable_bitmap >> priority) & 0x1; + issued |=3D (ht_priv->candidate_tid_bitmap >> priority) & 0x1; =20 if (issued =3D=3D 0) { psta->htpriv.candidate_tid_bitmap |=3D BIT((u8)priority); @@ -2495,10 +2495,10 @@ void rtw_issue_addbareq_cmd(struct adapter *adapter= , struct xmit_frame *pxmitfra void rtw_append_exented_cap(struct adapter *adapter, u8 *out_ie, uint *pou= t_len) { struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; - struct ht_priv *phtpriv =3D &mlme_priv->htpriv; + struct ht_priv *ht_priv =3D &mlme_priv->htpriv; u8 cap_content[8] =3D {0}; =20 - if (phtpriv->bss_coexist) + if (ht_priv->bss_coexist) SET_EXT_CAPABILITY_ELE_BSS_COEXIST(cap_content, 1); =20 rtw_set_ie(out_ie + *pout_len, WLAN_EID_EXT_CAPABILITY, 8, cap_content, p= out_len); --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 78A524052AA for ; Fri, 31 Jul 2026 10:43:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494637; cv=none; b=KrZaXCesPndxDvSp63WWCR/M23KRJ4VeUjuUeUc2j+feGUlMT92CvMDdbhUJBCiKH1NozaRibFGaq7GDvgCzQTYmKtat+to0XD44sMrHrFU/DWVK9l3VHC231zk6j/qhaJkYhgAs+jLLW+UV7pwXhEhNY16gl4saZnOdofqGI3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494637; c=relaxed/simple; bh=iaVUpV/d+U2iLTKuHJHE3/DnccaoZGxveCcdeVs7kqo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P80hviwGj2oF46Xadx/kILgYwueiF5AY2wIVULwFc5AJJBqecOrs7JUiUNPk2n6MD//eTEdfYAiXh9VJm48zHx0cW03NTDtYlzm4wHXMkvGg9ef6RQqO7n3vYeMm34lP2mDZNTVzrnboHZcRuCb5wMVhX0yrnETohsSJZz2iXdI= 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=ix5XOveA; arc=none smtp.client-ip=209.85.221.50 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="ix5XOveA" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-47f707e5d75so602735f8f.1 for ; Fri, 31 Jul 2026 03:43:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494624; x=1786099424; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kbMMxVWI1HxBa2UGVYvHtHHQFtntrXS6D3AyyDSHIP4=; b=ix5XOveAsqgm/f2EjRQ7ueNTZJc3d9KjQHgWn/KFf9c83/hRieYgRN0nX3mHAy2RUE BcVeSu0N5zlXwc0x1QcYGs0isuEd7qXxwGXnvJ5oWX+XnS9Mh9B8KRPIX3j4vbxQUdcr tfOTSnGahcD7B+Hnd7+InjCjm86ZPz0oxWFLXnuPXDRXI9G/2+mCWsZjqJ7xel78MJHM XZ+Elhyy4OopxOnTFRwlAOjff7vR5l/+eA3UvIQ2qTSP0m0xWrZXBZ58wyDjdzTyeOvr t/2anZYZ6OiEWUqFTWU7PmJUaLD0jHTSpFT+EPgSPigANOdaTXLe7eDuDLLDYXp6cYYw Ckqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494624; x=1786099424; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=kbMMxVWI1HxBa2UGVYvHtHHQFtntrXS6D3AyyDSHIP4=; b=gl0r9Q1SOv2aBbTAkJ/RM9vBzYlTS4fApbzhwXKdR9d9QG2fWYhJwNu3LR/2KwclSL mFOkUwrBG6NLYwKf6LgKMyYcaHvKsgcp0ZitWyZMd9y8oUAa2lND4vIHCLYfhDqbVQAV K04iinmZCA7kKy7Lz3jbla86nVH0EL4BVKdiZYwd8OT2ddPnjsZEL0HpjEQbIFe9Ayty GlMeFMS54j1lZvmbsQPy8y3TYGFGXR65KWSlODiW6T66jNcz3z9fPla6pdjH8fOFYMP5 HQUM8BaNsnluERzMpGPBdS/SetbSYUaOzqp9Z49E2+z/1UfmQzUMjItNj3lrFUYdpP+c aFSQ== X-Gm-Message-State: AOJu0YxrOdHygmSQkI0Kmjo+ftwfmbIWKGgfzz02P9eNUJPM9575kUZ/ bih0rFKI5dp9JXsGn549vHwGVoNvenUIq9T1H1KS+obqLJxa0SdGJPvP9SgA2I5u X-Gm-Gg: AR+sD13Ww+a2Xan2iBknOVICOPYE5RIsUKFSAUk23DYWDl7Duq+NS3/Z5D/SXVsf9/W MreZfk1LM9LYQQNym4RAifdtg42bf5Y+PB4AA41jf77nHqvUTwHJVUJQD0C0ei9389H1bY/ZXUl aHW3LovChfV1kd5Li/0h5YbBPSleLvsFY0ylF1WltqMY3IaVmYiHf/TzOjNJq2kVUKR+LLmhJDp sd7iVrdd1fp2n7II5GgqYD3MAcQW+KbwTKFGgpRUFNgjoCmmN6SFWusj29kj3vIwufP5tSCn2DU 0LvC/5RuziZ+EZf33TlxcfWgUs2yTwZz9hErkG8674jLuuJV1Ob8jSQv0USSof6iVWs0yFefk4o 5ck9HUfqCzEDG6JHBoHulYHMPlomxOcEzDEb29wVtw9mj6dIPZWd5X40FP/1H5fhmiUZ+I5/iTa Ry3rQHE5kjEc2pEGNjH6fgmhA9T585+DdzuXuJ4shZcu8z5lKNYhKmU8MSlVF7O6TK0DSxYTxru PJ8LQliJKHdtmRmQbh+j3Z4/RhC7k+dABbfKYxXxJYT763cwSlx X-Received: by 2002:a05:6000:41f2:b0:47f:81fe:12f8 with SMTP id ffacd0b85a97d-47fd2ababd7mr3595905f8f.1.1785494623811; Fri, 31 Jul 2026 03:43:43 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:43 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 07/11] staging: rtl8723bs: renaming variable pregistrypriv in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:30 +0000 Message-ID: <20260731104134.12754-8-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of pregistrypriv to registry_priv since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 50 +++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 7245f671075e..0da5515a6be5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2102,14 +2102,14 @@ signed int rtw_restruct_sec_ie(struct adapter *adap= ter, u8 *in_ie, u8 *out_ie, u =20 void rtw_init_registrypriv_dev_network(struct adapter *adapter) { - struct registry_priv *pregistrypriv =3D &adapter->registrypriv; + struct registry_priv *registry_priv =3D &adapter->registrypriv; struct eeprom_priv *peepriv =3D &adapter->eeprompriv; - struct wlan_bssid_ex *dev_network =3D &pregistrypriv->dev_network; + struct wlan_bssid_ex *dev_network =3D ®istry_priv->dev_network; u8 *myhwaddr =3D myid(peepriv); =20 memcpy(dev_network->mac_address, myhwaddr, ETH_ALEN); =20 - memcpy(&dev_network->ssid, &pregistrypriv->ssid, sizeof(struct ndis_802_1= 1_ssid)); + memcpy(&dev_network->ssid, ®istry_priv->ssid, sizeof(struct ndis_802_1= 1_ssid)); =20 dev_network->configuration.length =3D sizeof(struct ndis_802_11_conf); dev_network->configuration.beacon_period =3D 100; @@ -2118,8 +2118,8 @@ void rtw_init_registrypriv_dev_network(struct adapter= *adapter) void rtw_update_registrypriv_dev_network(struct adapter *adapter) { int sz =3D 0; - struct registry_priv *pregistrypriv =3D &adapter->registrypriv; - struct wlan_bssid_ex *dev_network =3D &pregistrypriv->dev_network; + struct registry_priv *registry_priv =3D &adapter->registrypriv; + struct wlan_bssid_ex *dev_network =3D ®istry_priv->dev_network; struct security_priv *psecuritypriv =3D &adapter->securitypriv; struct wlan_network *cur_network =3D &adapter->mlmepriv.cur_network; =20 @@ -2127,7 +2127,7 @@ void rtw_update_registrypriv_dev_network(struct adapt= er *adapter) =20 dev_network->rssi =3D 0; =20 - dev_network->configuration.ds_config =3D (pregistrypriv->channel); + dev_network->configuration.ds_config =3D (registry_priv->channel); =20 if (cur_network->network.infrastructure_mode =3D=3D NL80211_IFTYPE_ADHOC) dev_network->configuration.atim_window =3D (0); @@ -2137,8 +2137,8 @@ void rtw_update_registrypriv_dev_network(struct adapt= er *adapter) /* 1. Supported rates */ /* 2. IE */ =20 - /* rtw_set_supported_rate(dev_network->supported_rates, pregistrypriv->wi= reless_mode) ; will be called in rtw_generate_ie */ - sz =3D rtw_generate_ie(pregistrypriv); + /* rtw_set_supported_rate(dev_network->supported_rates, registry_priv->wi= reless_mode) ; will be called in rtw_generate_ie */ + sz =3D rtw_generate_ie(registry_priv); =20 dev_network->ie_length =3D sz; =20 @@ -2182,28 +2182,28 @@ void rtw_ht_use_default_setting(struct adapter *ada= pter) { struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct ht_priv *ht_priv =3D &mlme_priv->htpriv; - struct registry_priv *pregistrypriv =3D &adapter->registrypriv; + struct registry_priv *registry_priv =3D &adapter->registrypriv; bool bHwLDPCSupport =3D false, bHwSTBCSupport =3D false; bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; =20 - if (pregistrypriv->wifi_spec) + if (registry_priv->wifi_spec) ht_priv->bss_coexist =3D 1; else ht_priv->bss_coexist =3D 0; =20 - ht_priv->sgi_40m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : = false; - ht_priv->sgi_20m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : = false; + ht_priv->sgi_40m =3D TEST_FLAG(registry_priv->short_gi, BIT(1)) ? true : = false; + ht_priv->sgi_20m =3D TEST_FLAG(registry_priv->short_gi, BIT(0)) ? true : = false; =20 /* LDPC support */ rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); CLEAR_FLAGS(ht_priv->ldpc_cap); if (bHwLDPCSupport) { - if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(4))) + if (TEST_FLAG(registry_priv->ldpc_cap, BIT(4))) SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_RX); } rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); if (bHwLDPCSupport) { - if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(5))) + if (TEST_FLAG(registry_priv->ldpc_cap, BIT(5))) SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_TX); } =20 @@ -2211,12 +2211,12 @@ void rtw_ht_use_default_setting(struct adapter *ada= pter) rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); CLEAR_FLAGS(ht_priv->stbc_cap); if (bHwSTBCSupport) { - if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(5))) + if (TEST_FLAG(registry_priv->stbc_cap, BIT(5))) SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_TX); } rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); if (bHwSTBCSupport) { - if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(4))) + if (TEST_FLAG(registry_priv->stbc_cap, BIT(4))) SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX); } =20 @@ -2224,10 +2224,10 @@ void rtw_ht_use_default_setting(struct adapter *ada= pter) rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSuppo= rtBeamformer); rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSuppo= rtBeamformee); CLEAR_FLAGS(ht_priv->beamform_cap); - if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(4)) && bHwSupportBeamforme= r) + if (TEST_FLAG(registry_priv->beamform_cap, BIT(4)) && bHwSupportBeamforme= r) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); =20 - if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(5)) && bHwSupportBeamforme= e) + if (TEST_FLAG(registry_priv->beamform_cap, BIT(5)) && bHwSupportBeamforme= e) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); } =20 @@ -2253,7 +2253,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *ad= apter, u8 *in_ie, u8 *out_i unsigned char *p; struct ieee80211_ht_cap ht_capie; u8 cbw40_enable =3D 0, stbc_rx_enable =3D 0, operation_bw =3D 0; - struct registry_priv *pregistrypriv =3D &adapter->registrypriv; + struct registry_priv *registry_priv =3D &adapter->registrypriv; struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct ht_priv *ht_priv =3D &mlme_priv->htpriv; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; @@ -2302,7 +2302,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *ad= apter, u8 *in_ie, u8 *out_i } =20 /* to disable 40M Hz support while gd_bw_40MHz_en =3D 0 */ - if ((pregistrypriv->bw_mode & 0x0f) > 0) + if ((registry_priv->bw_mode & 0x0f) > 0) cbw40_enable =3D 1; =20 if ((cbw40_enable =3D=3D 1) && (operation_bw =3D=3D CHANNEL_WIDTH_40)) { @@ -2318,8 +2318,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *ad= apter, u8 *in_ie, u8 *out_i ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_SM_PS); =20 if (TEST_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX)) { - if ((channel <=3D 14 && pregistrypriv->rx_stbc =3D=3D 0x1) || /* enable = for 2.4GHz */ - (pregistrypriv->wifi_spec =3D=3D 1)) + if ((channel <=3D 14 && registry_priv->rx_stbc =3D=3D 0x1) || /* enable = for 2.4GHz */ + (registry_priv->wifi_spec =3D=3D 1)) stbc_rx_enable =3D 1; } =20 @@ -2377,7 +2377,7 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *p= ie, uint ie_len, u8 channel struct ieee80211_ht_cap *pht_capie; struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct ht_priv *ht_priv =3D &mlme_priv->htpriv; - struct registry_priv *pregistrypriv =3D &adapter->registrypriv; + struct registry_priv *registry_priv =3D &adapter->registrypriv; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; u8 cbw40_enable =3D 0; @@ -2389,7 +2389,7 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *p= ie, uint ie_len, u8 channel return; =20 /* maybe needs check if ap supports rx ampdu. */ - if (!(ht_priv->ampdu_enable) && pregistrypriv->ampdu_enable =3D=3D 1) + if (!(ht_priv->ampdu_enable) && registry_priv->ampdu_enable =3D=3D 1) ht_priv->ampdu_enable =3D true; =20 /* check Max Rx A-MPDU Size */ @@ -2409,7 +2409,7 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *p= ie, uint ie_len, u8 channel /* todo: */ } =20 - if ((pregistrypriv->bw_mode & 0x0f) > 0) + if ((registry_priv->bw_mode & 0x0f) > 0) cbw40_enable =3D 1; =20 /* update cur_bwmode & cur_ch_offset */ --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.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 9082B41685A for ; Fri, 31 Jul 2026 10:43:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494641; cv=none; b=pMQiRPaKkiNqe0fGXwNed4mzoSyGzrN9eihVgE7AE4UJXOHT4VcKWrfq2e1GrXHDmmD+iTYMzGQiR24IAwb18Ij8QELW8FfCNKVdbcFkD7MIzQxA2D4aK/lt9XgMihzyRgxYP8epsGIdN12kDkxZnGZK485Gc4qwRV7vXdhROt0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494641; c=relaxed/simple; bh=pW6vyIzERmBXqn1/A1MdW/DxaRNuYIsxm7FIZhJRgMw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MNDEuoojGjyM2loIlN1KpbFu73VEzCRkhnxft1Ik0ONFMskz5f+d9wS2AAXIYUb+Un52W+SiySS2vCyOSvi13yE77z6k7Jib5hRtkc7x0BWyHpkc0qnHvxcYXYEjVKVPBPWkZokZ/23HpkiKZ4Hf6AyHuQf8aNzxvahk/8KWrgc= 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=UMw5Ie/X; arc=none smtp.client-ip=209.85.221.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="UMw5Ie/X" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-47ddf7b09e5so1011529f8f.1 for ; Fri, 31 Jul 2026 03:43:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494625; x=1786099425; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=IbKaSw+MRwNj4WVeJIQ63LYq7o1fQU+CkE5QYBwX4fE=; b=UMw5Ie/XKTRSd8AnWGwuStuVhSJPbEBPqsTlgotERShhstK5d+oDbmtrZQhSugMyCw VXGgGkBGpxK7Gug4ZklmeNDqmpuy0i1wLWu6Rd1aMh7tEZi7BB63pLOAnh1KAjpmsDrC Bu785e5CfI7RoODABY1etrRUbymDCa1IbtHXIQzdRWY9xIl34/Cfg5gc2Lmcz0dIHDFU ggqrOtrOHWR1JnScZxdqo5dxDi9d7477s/52dVTMCk9eAF9MCoJwXsM1ft2tAakGVbI/ RuwTGOWkJZ0GLLlNkXJgNBNx3F8VUTaugIy2CTYQKfW2wy63MiE7MmP9diI/N7VEDR17 EZ1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494625; x=1786099425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=IbKaSw+MRwNj4WVeJIQ63LYq7o1fQU+CkE5QYBwX4fE=; b=AN1u01JcrkJluBJi1UXzalH2kjFREI2k+ulvQlfuiVJRT13uoHW4c0OGSjSMoznzSm FPUll1WU2/LLSsGWOx7obxC4khL/GaoEiKgJHILFnbZWJCM1o7CO35x9aJIanterKp61 SY2snCfP1iO7dVNgD/7T0xKvt3t7g+EnGtUbGJz+Rf1Yw4Y+NCjAPI60MNDRZUdCOkMP /+g7ozp6CLriiH52F/DxGlPUZ7NZDLEGXlQ50SvdntD4rRvbIcEDyiwBAGR1bLdaxtsq mTm5mvKs7ePG2YLiA7Lh8t6LkNzkcmcQkfvPg+ON8T2nOpVc3r5aZalPNwu4+46I+Mi2 /ETw== X-Gm-Message-State: AOJu0Yx6nt01UAqmrK3omESIObb0TWzs+XgXKu6izK/SF9ayLvVf0SyT MTjRjZl6krJAiVRMl1qBXJLNZDYUXUkKGasg6WpQ31XMloOPU+h4lWsr X-Gm-Gg: AR+sD12eZ9C/r/pzAyM4kFDN4XGBhjN+CQyVtXq0meqLfTt6y2D2X8Ij4AuiD6UlcDe gXeDJ34Yw6JX4A+XL1vnScRJLS3RQKYKGDjbo1UDNa0zRJ8zTtvc7PobvwvtphtcOHmMzqnL7sb cpgZOfm+Y34kRxO2aMIYvtBzlsl7T1ibkVRfU6lWk0FBf7pAoRVa9sHWFAUR7rBAd4KcMjYL6V8 ev5nHkJei2m5xJo61zxUzFYeD4GKAgsDzGDwT7twhJiiLMfZS/3+KVOwMtpAYsGt9v+njeyMBYT O0JLLwRWoOuC2rYI6MEKQR05IWHpPvEJ+orVk7zhP2qpxI17iefjDxjsQtOYVgBMdTLUdQk873F kBq7FWK1hizvP2s25CaYOtXY4/1bYgEnWwSUgKgDrzMIfFAKxv7Vb8LzHMoFy/toqA9A9Rdt4OF YIa1gDDyWs6/LHbv03j/PNk1qIo6Qahc4Y0lzp7jVwaU9rov3rxTOOVWPtm6eeaXdq7fkIqtzX8 0gyXg7eFd+T/mAb3kI4pBH2wYwPrvSxi3fNXzCzHdvZvGdhFpQuJeFUbhv1URE= X-Received: by 2002:a05:6000:18a6:b0:47f:773f:2d68 with SMTP id ffacd0b85a97d-47fd2ac9f8dmr3724016f8f.16.1785494624402; Fri, 31 Jul 2026 03:43:44 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:44 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 08/11] staging: rtl8723bs: renaming variable bHwLDPCSupport in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:31 +0000 Message-ID: <20260731104134.12754-9-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of bHwLDPCSupport to hw_ldpc_support since the prefix b is an old naming convention to indicate a boolean variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 0da5515a6be5..6a7b86532d81 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2183,7 +2183,7 @@ void rtw_ht_use_default_setting(struct adapter *adapt= er) struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct ht_priv *ht_priv =3D &mlme_priv->htpriv; struct registry_priv *registry_priv =3D &adapter->registrypriv; - bool bHwLDPCSupport =3D false, bHwSTBCSupport =3D false; + bool hw_ldpc_support =3D false, bHwSTBCSupport =3D false; bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; =20 if (registry_priv->wifi_spec) @@ -2195,14 +2195,14 @@ void rtw_ht_use_default_setting(struct adapter *ada= pter) ht_priv->sgi_20m =3D TEST_FLAG(registry_priv->short_gi, BIT(0)) ? true : = false; =20 /* LDPC support */ - rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&hw_ldpc_support); CLEAR_FLAGS(ht_priv->ldpc_cap); - if (bHwLDPCSupport) { + if (hw_ldpc_support) { if (TEST_FLAG(registry_priv->ldpc_cap, BIT(4))) SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_RX); } - rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); - if (bHwLDPCSupport) { + rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&hw_ldpc_support); + if (hw_ldpc_support) { if (TEST_FLAG(registry_priv->ldpc_cap, BIT(5))) SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_TX); } --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.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 25973416862 for ; Fri, 31 Jul 2026 10:43:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494641; cv=none; b=rD3DLTkJtVCrW+59Gnk6gF3yCN9uG/8HYuSHqvlwXGVth/zuR6zg9ue/rMkfbdAM/AeMPMfnsLWrH78RyRimp8b1ADPdijYjCsx475K7q3Ph8EN4C/3Jk4aDZEaLmw8Hb3UxeJ4ctQE9okf9Fszaeq11JeRDujFZlhKaQoWhwAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494641; c=relaxed/simple; bh=ouIlssAAeAqaLcpdONgOP1ImahiDwteS4YgtJ8/8V2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A/rLWIIBMQKaC8GfAXpEtvgD/Vr3ok6ONmMJuju8tq8i2pw6b3kcv3LU7gh6U22/fcEO3rJU/H/BhhSyC2XEbe2TZmEwo/Wp6x01vJRtJWiXM1R6S8zA781OvLWhOClIgUtfMspgpCXorpaCNN28SMWyGsZMPoXvERahffZcFhs= 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=aPVNiMz+; arc=none smtp.client-ip=209.85.221.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="aPVNiMz+" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-47f9ab7ee38so487604f8f.2 for ; Fri, 31 Jul 2026 03:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494625; x=1786099425; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vZdj+iwMOPrhBLbfruaWKbmMuhQ7LhmhxM/YV7ZMr2Y=; b=aPVNiMz+hdXYLRGxSc4T8MdLc9KkJIdQWScKtP9YTgVmLXI2cdzDS3IW7TECWWuEiG GLSdcHa9B5iZo7VJtIweFSkyvZvSJJAEc2s1QW7bPgKUTQHsKoTEVyvDOAvpnyPhkBxy EOQhwcFdQ4gYbRRUf67+Xs9ltKrmiFpfcMqlunoEf/o80tPlUIGBRnNLqoQfZOE+U5z8 TIcSHyFoIdNUKmQrjk4te0DEuD9+ZQLmsmJhPVeKSZLdiJeUVuYn2tYo4neE8ZClMlLO tCU5MyVBL9/bujP0R/GgIspUwIfaO7N49cxYxHxDgLOUX/JoJ0qho/p0UACFs+wugOEf kdsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494625; x=1786099425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=vZdj+iwMOPrhBLbfruaWKbmMuhQ7LhmhxM/YV7ZMr2Y=; b=dQbiKozXGO8MTDhAlV3gSCTjZ8phJvzJvHo+B8dWZGd7/2ln5P6tupnQyfXbgNxz6s Koide118ppujbsNn5lvWpj/wgRi8v5J8dtGg4r+igW/AzJOiLUn/ouTPk0DinMKIRmqg TXbndabCr+ja29Ys66tzJxsyVZGKArnch22aCnz/i58YgUeeMrNAYJR9w8C0BdDoOqeh g0zKydL762BOzLKH247x1x8szRFO56DqxgvYnrIunD8t8WAawN9wQejUT+/dJDUX5wgz Qvv6mfXApivHpPqp2AxtDstIAhgVHXysudw5jv3ahPvuwOnpl7z+4AyVPr/0+HFrqBQt l7Ow== X-Gm-Message-State: AOJu0YwhH+EQomzmyfPOxt4TUAZwuM1xIfxy4/tywZxGlkMFGVgL2pz1 SuRFyWz6upeGp+pkNhg3+kKA4x6jfh50Uly0Oa3yELA5gHTIN4GmVcAsII+/7vm4 X-Gm-Gg: AR+sD13GZeuFqkMMlw4OSUv2zKwxzkOaAN9cKYo4x5SdepGCY8Eko6sPCz+JyiO+d/d VQdo6uiuKIDMIvh4nUfVEl7OUxrP9CGYViyKw70cDhUtg1L7NiJ7hvTMJDmDStQ7I2olGJFrQSL 8SRCGKZRQ1sg8AAn20/54RmVcfIYSVtsYLPAjcd2QAscBoV2lv8x8L9zJpVSkQ9GlRQj8zQwWqW DruXahKdZkRwD7ncS8f3BGU+e1dJ/H2oHczpnGPRracRpM2iR8O/cewLNHNMl5xtIiU0hQUxkpJ /y77r75L1B4xEgQHXefj4wqCoD5aCNJ8c/SzE3y1TVDJLK4cvudbckwsjCS6V0vVpryMusXcyTi ivOXp0k2fcLfu4xr/pkOxBTBbgxcnNTuEd6JO+h4UuEf9CEi7xYg2FW7kbghHVJRmunkHYAjEqB 0DrDK99J6QNIOycDAag6GetpzTLIekiIzNb+6TvOLJWoJbx5AfXBvGEY+5Y5k61sW6i+s9l4ElM oFK3t2JuGHUNT2Q0ADlzfiLJLs3UOqFJnuSyv4GS0A8+XKFtu9p X-Received: by 2002:a05:6000:2505:b0:47f:48cb:ea5b with SMTP id ffacd0b85a97d-47fd2b4dd99mr3181344f8f.43.1785494625359; Fri, 31 Jul 2026 03:43:45 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:45 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 09/11] staging: rtl8723bs: renaming variable bHwSTBCSupport in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:32 +0000 Message-ID: <20260731104134.12754-10-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of bHwSTBCSupport to hw_stbc_support since the prefix b is an old naming convention to indicate a boolean variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 6a7b86532d81..caf8c7623a73 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2183,7 +2183,7 @@ void rtw_ht_use_default_setting(struct adapter *adapt= er) struct mlme_priv *mlme_priv =3D &adapter->mlmepriv; struct ht_priv *ht_priv =3D &mlme_priv->htpriv; struct registry_priv *registry_priv =3D &adapter->registrypriv; - bool hw_ldpc_support =3D false, bHwSTBCSupport =3D false; + bool hw_ldpc_support =3D false, hw_stbc_support =3D false; bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; =20 if (registry_priv->wifi_spec) @@ -2208,14 +2208,14 @@ void rtw_ht_use_default_setting(struct adapter *ada= pter) } =20 /* STBC */ - rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&hw_stbc_support); CLEAR_FLAGS(ht_priv->stbc_cap); - if (bHwSTBCSupport) { + if (hw_stbc_support) { if (TEST_FLAG(registry_priv->stbc_cap, BIT(5))) SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_TX); } - rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); - if (bHwSTBCSupport) { + rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&hw_stbc_support); + if (hw_stbc_support) { if (TEST_FLAG(registry_priv->stbc_cap, BIT(4))) SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX); } --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.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 C282B3E5ED5 for ; Fri, 31 Jul 2026 10:43:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494641; cv=none; b=n6WVUjWmtru2P+t6CeOejX+uK0dXoEiPh/GuBKAhXWFrER0+eG2dtynF3oZxXXh8aajX45DWOhBhmlrvNCbNRrxE52A1UJByzzpIRu6LgASfXWdCPneitnLW6VBiD5IyJHZcu6w2q/w/7X+WB1/Rvpe7NuG4Q1VhKDXSMBsCkjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494641; c=relaxed/simple; bh=K+vJbAC8Id1W3KleLtg9zUbUBVEVfAcnrfTeLUgnt5o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MR0M4Of0iZrMeICADY8p5LOsXPAl9c+oUy+IV/NYULn8ZqHDGQRXd2rgmqCzGKmtqkdYldemKXA/qpTj84NwESZGPDdvR++wIodbCyVj5Z0wcE6s5+T98qxtG8BbxssvCgmRqScCJ9f9IG8sDQSxYIGs4+Zp5A729AwGzDLNShg= 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=kthy3PtX; arc=none smtp.client-ip=209.85.221.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="kthy3PtX" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-47f904e80eeso745825f8f.1 for ; Fri, 31 Jul 2026 03:43:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494626; x=1786099426; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=m6zJBjR+mvcaIlTy8xSgJ5FSu18xQ+6e4Aiu2C8CT08=; b=kthy3PtX8ORoFnejRR/I6r+wM0dM5hFbGBVqCy8YlCn6MDL+gedZRNdpH2u5x/y8xN 4xmL2nC8UUrgEe9A5q0nKmpJYgiU7lsd/eBoqXfcXs+vItdNmmUzRcT+e77no2CN+5fg XYAluH0o2IVNNUep3AZN3/guZ1MFRtSEDTt3yGylzsmiycEiwXPvSh6f3Fhr1MS7d/01 qUX3mdcBEgSLgRjOh/w35l6m/V40HuK54wyOCPc4mSDyg2kWp6223TAwYPeIJJJtBKJA 2NEa1JV/yG808xqvkgUscg8xR4ZdNmUyxtepXtdrUJ14Swhu5fNsp543qjs8NkGcsRK4 j3xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494626; x=1786099426; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=m6zJBjR+mvcaIlTy8xSgJ5FSu18xQ+6e4Aiu2C8CT08=; b=nGybPA2ov3BAAKAngRMUwGS2qpYsgBl347fT9bOeRNmhrF4paC1EHVaKVKtWxuWwjX r+DQ87qI7+O5C/E0WvlCA1BlqTgqwrSVf8AZLtFHz2mrr22rykR3AFBIBhB6RNLfwGmY a/zrFkZCoXJzFI8BIQVNvUgvLVDOO5Pdoy7JDaOUoQMyUsKifmrefkvpDNMOYwlAMKay dFlPfjv15wTi9giUejwLcRwW95ss0OqAJ8xVGS307SgkaQpuNXfvIDSb0HbFVPUrvcIS SlPmXbfnJ/2l94XakUZ1qeQ1TM6Lk6twBjkRHrd9ZGepNrmZwc3bKwHTkN1J79jl+zBH RAAQ== X-Gm-Message-State: AOJu0Yzsw4Z9e0bZcYeRJ4G6Q3gHXc1+Gbz6CuYalKQzZxt6hxhQNVeC 53F9tvUKQhy04WZVbacBgomYwrIVqVfN/ukUs0lDti/A3/FbPaFhADXL X-Gm-Gg: AR+sD113Hrks4zZHqJuGJbiNSt6AUdJ9/8CtEZjcK3Gzye86COisM0cn4p99iRsOprq 4f6IyVYNfKZfhAehnKeVZK+gT1LtW/vbV9FfLGWHvreVEzfA22Oa1bSH2hm3W+IqoZAzxwIM8fq 5UFP11yDuBOAcKUAdj1Pz44Jb8OEWe0JCE1gwIrGiRHcL7ib/mkQyzaQnTUi8ViC9jUyd/pHdoo 2Y6XJMVnZ7NlGQMKm7DfzwW+0743OZXxJvZZ0fHDpzCbBLO6F6Vetnj+Rm9OxYdeQlBzT7bi7NP aoEM2Fn1rxU/MtYoMUVI/hg9fAwY1tl43A3JYF+fTWpbdtFLc8f49J425HhudrCIe3zFfZd6+bh 57pOO2Rgs/8AyeqOjkopuLOeoNZ22kUb0BOB9I0XIzBLggZiOTca/CwuOv36tqVxECR5dGJV1+R cMpkcXenmF/rdWYj9A8puQdQ/PKKswRK5+qi2UWcZQAIjPjUzp2VDO8B4UgdOmD4mp6DabWjlof KdrAcANCEk0bahvySUn9oBeOsDB16bg1vq7PnwXDZfgqo7V7RvD X-Received: by 2002:a05:6000:268a:b0:47f:7b85:b883 with SMTP id ffacd0b85a97d-47fd2b6983fmr3363564f8f.47.1785494625931; Fri, 31 Jul 2026 03:43:45 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:45 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 10/11] staging: rtl8723bs: renaming variable bHwSupportBeamformer in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:33 +0000 Message-ID: <20260731104134.12754-11-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of bHwSupportBeamformer to hw_support_beamformer since the prefix b is an old naming convention to indicate a boolean variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index caf8c7623a73..e0dbf420ac62 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2184,7 +2184,7 @@ void rtw_ht_use_default_setting(struct adapter *adapt= er) struct ht_priv *ht_priv =3D &mlme_priv->htpriv; struct registry_priv *registry_priv =3D &adapter->registrypriv; bool hw_ldpc_support =3D false, hw_stbc_support =3D false; - bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; + bool hw_support_beamformer =3D false, bHwSupportBeamformee =3D false; =20 if (registry_priv->wifi_spec) ht_priv->bss_coexist =3D 1; @@ -2221,10 +2221,10 @@ void rtw_ht_use_default_setting(struct adapter *ada= pter) } =20 /* Beamforming setting */ - rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSuppo= rtBeamformer); + rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&hw_suppo= rt_beamformer); rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSuppo= rtBeamformee); CLEAR_FLAGS(ht_priv->beamform_cap); - if (TEST_FLAG(registry_priv->beamform_cap, BIT(4)) && bHwSupportBeamforme= r) + if (TEST_FLAG(registry_priv->beamform_cap, BIT(4)) && hw_support_beamform= er) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); =20 if (TEST_FLAG(registry_priv->beamform_cap, BIT(5)) && bHwSupportBeamforme= e) --=20 2.55.0 From nobody Fri Oct 2 13:03:18 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.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 288FB40F730 for ; Fri, 31 Jul 2026 10:43:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494641; cv=none; b=CQ/Y5SJ2Ljg5Tb0gs+Byiv8Zb8VXdS/uS+sOvbFk9N0Z70wxvp90kXSaI+3RG4IAOTjn370/3iUK5Adym1eENQLwhzZtbJ25kLbzlCVf8Cx9MrfIOK1g5GEttRLGNEk9BLp9xiGLD/FZ/mWiydBSpzioHiOlmJoMXm6mzJOghNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785494641; c=relaxed/simple; bh=s/yVx3Bk37E/nahtSUsrtVl5eSvqKTX2TkHdsfmUFlQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f91G735QcPUpe2wK2jVgTBYq/wT1MbbKid+FP/7okoi6zrkloUlnCqWVn0ou06PcsH/LGiklRtFB9WDnEv8QhzZcKdNc0PYfvD4vV0odHCJZs4M/oIcp7bVfDi6bpqA8cqxOEAmrTCfpdKe2zJZYagxhmIPYvxbUOyxggp1i6qg= 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=A4nrORi4; arc=none smtp.client-ip=209.85.221.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="A4nrORi4" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-47de0093c42so126675f8f.3 for ; Fri, 31 Jul 2026 03:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785494626; x=1786099426; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=odtmlCilIn2KnYYEHaGoFCa82TzTOfkbBRrqOu7Bui0=; b=A4nrORi4PhQClJ6jnwggCGWw2n82WhKGE6Xvqc7UqXhT29a7HqhUwKzbWwvIw/xNVt pk3tEEEZMMN5dOgkNsyGDQnl5A3Axx0FSl0gXLay9UxxfP1lOJeKGvkdWRYX0taQCgNs 3DuClDGq/vp7Bg4fRNeDZxnZKsMAhK8ZyOOmCvCPV3KPHM7ojFVfQfPMFRHPn1vg/76Z 0Meq60Uk85Pm3+p26gj6ytuaUV5LdEA7UE0U6OFxG7NgF7wWhHEkaoW83/8/uM1mYK0X CIeqZP5i4wRc0vKXi3hnnt3qREWieWVrkDnPVUGlxW/EqABOyuIsf+kS92cumZerNMui KObg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785494626; x=1786099426; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=odtmlCilIn2KnYYEHaGoFCa82TzTOfkbBRrqOu7Bui0=; b=iMxy2IghRxfsuOR5i/F22T68kXWgNhDo5RVv37qmFdikjJaboy5mS2zGPPDUGHOz1h PY6kIgUg5x1tkpez26hH4Pvcp4pqIiTfgnLm+d21nlNEweHLZwaWmlJw9Pr2PaJXlzXz yba5tmleLsocXIo21cLcbFZs7h6BBDEuIz9XBHbt12ySqu78yNUtQsICiQB4pIhEkWph iRq3HnokQKNUxeRAfMFUQpqo0uzP5LGtyz6M6zplSJFHm9ULduQ41tvGELqk79CkFR2g TKCDtHARKk4bCfOahLLTJpf3blxbRqaISbvz+xU8Rh50EmIAwoB8RVgdnk6+U4U5Lkk9 J4GA== X-Gm-Message-State: AOJu0YyocNtzYP1B9Q+lpsvCApi4AC/OSvl/8OCwN4acwJJ90KymH106 CCL/ZG3n/XYaxKSlh87YOmBeraqZXwZuAO2u2Yzpeq0P0y45NOF4R427QIkzSL5X X-Gm-Gg: AR+sD13Yb4Cbyxy1moAIBk9O1hBp9yhov74sdbe7MBB2/DTVC0b1K31U6QQopM0NztK FsqqDbDFx6Zr7ZQ1M0rlAyb7y4Qd6Pb3ffW6fErFZ3kO+ePQ56fuGnEmQocyxfe27zmNRepxXVo 7oBBzg5/mhwhyBv8pinNHyZrl31Qa7HQoXmLDks4RnDdNl4loKaldO2NKO5/TSViHmtVgxaCvf6 PYZEMBhUhtkyScHDlUM0ECvyKAyfUsEVBVGoW367n1lFsIQN7/xh2Eea9c5IvdIl708JHW4asaq m9JHHGWXRgdLnLdlksuh6ZfyQJTnDqGEVntdsRq/x96w0LRkmQ/bSGuZK5ZaivqZXRQPR+iaaci +n4ZtVlTvrsAl5xr0sp+C6OBJILLxCkQb3YeuF5deoROF2a7FOsk17IIbi+fuPZdsladW4/A3c1 7nI86p3wPJEDAKOhRrkqoM/25VOavsXan6w7xQi6g0UDWtZ46BGcJfDorVr9Oc3JkxNQ3IY9W32 GfISzfchlQPNeuV1wcpBjbTlE15wohnQiOzupUlHXK/Y28iLb0Z4TMfBH3ATM7A X-Received: by 2002:a05:6000:4201:b0:47f:93e1:e7d0 with SMTP id ffacd0b85a97d-47fd2b3fa67mr3648406f8f.36.1785494626551; Fri, 31 Jul 2026 03:43:46 -0700 (PDT) Received: from koolguy.fritz.box (dslb-088-074-233-039.088.074.pools.vodafone-ip.de. [88.74.233.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd456a6d7sm3423134f8f.19.2026.07.31.03.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 03:43:46 -0700 (PDT) From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Dalvin-Ehinoma Noah Aiguobas Subject: [PATCH 11/11] staging: rtl8723bs: renaming variable bHwSupportBeamformee in rtw_mlme.c Date: Fri, 31 Jul 2026 10:41:34 +0000 Message-ID: <20260731104134.12754-12-fliegbert2@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731104134.12754-1-fliegbert2@gmail.com> References: <20260731104134.12754-1-fliegbert2@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" Renaming occurrences of bHwSupportBeamformee to hw_support_beamformee since the prefix b is an old naming convention to indicate a boolean variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index e0dbf420ac62..84e479886ffc 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2184,7 +2184,7 @@ void rtw_ht_use_default_setting(struct adapter *adapt= er) struct ht_priv *ht_priv =3D &mlme_priv->htpriv; struct registry_priv *registry_priv =3D &adapter->registrypriv; bool hw_ldpc_support =3D false, hw_stbc_support =3D false; - bool hw_support_beamformer =3D false, bHwSupportBeamformee =3D false; + bool hw_support_beamformer =3D false, hw_support_beamformee =3D false; =20 if (registry_priv->wifi_spec) ht_priv->bss_coexist =3D 1; @@ -2222,12 +2222,12 @@ void rtw_ht_use_default_setting(struct adapter *ada= pter) =20 /* Beamforming setting */ rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&hw_suppo= rt_beamformer); - rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSuppo= rtBeamformee); + rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&hw_suppo= rt_beamformee); CLEAR_FLAGS(ht_priv->beamform_cap); if (TEST_FLAG(registry_priv->beamform_cap, BIT(4)) && hw_support_beamform= er) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); =20 - if (TEST_FLAG(registry_priv->beamform_cap, BIT(5)) && bHwSupportBeamforme= e) + if (TEST_FLAG(registry_priv->beamform_cap, BIT(5)) && hw_support_beamform= ee) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); } =20 --=20 2.55.0