From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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/rtl8723bs/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 = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; /* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */ @@ -2162,11 +2162,11 @@ void rtw_joinbss_reset(struct adapter *adapter) mlme_priv->num_sta_no_ht = 0; - phtpriv->ampdu_enable = false;/* reset to disabled */ + ht_priv->ampdu_enable = false;/* reset to disabled */ /* TH = 1 => means that invalidate usb rx aggregation */ /* TH = 0 => means that validate usb rx aggregation, use init value. */ - if (phtpriv->ht_option) { + if (ht_priv->ht_option) { if (adapter->registrypriv.wifi_spec == 1) threshold = 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 = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; struct registry_priv *pregistrypriv = &adapter->registrypriv; bool bHwLDPCSupport = false, bHwSTBCSupport = false; bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; if (pregistrypriv->wifi_spec) - phtpriv->bss_coexist = 1; + ht_priv->bss_coexist = 1; else - phtpriv->bss_coexist = 0; + ht_priv->bss_coexist = 0; - phtpriv->sgi_40m = TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : false; - phtpriv->sgi_20m = TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : false; + ht_priv->sgi_40m = TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : false; + ht_priv->sgi_20m = TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : false; /* 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); } /* 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); } /* Beamforming setting */ rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSupportBeamformer); rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSupportBeamformee); - CLEAR_FLAGS(phtpriv->beamform_cap); + CLEAR_FLAGS(ht_priv->beamform_cap); if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(4)) && bHwSupportBeamformer) - SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); + SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(5)) && bHwSupportBeamformee) - SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); + SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); } void rtw_build_wmm_ie_ht(struct adapter *adapter, u8 *out_ie, uint *pout_len) @@ -2255,10 +2255,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i u8 cbw40_enable = 0, stbc_rx_enable = 0, operation_bw = 0; struct registry_priv *pregistrypriv = &adapter->registrypriv; struct mlme_priv *mlme_priv = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; - phtpriv->ht_option = false; + ht_priv->ht_option = false; out_len = *pout_len; @@ -2266,7 +2266,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i ht_capie.cap_info = cpu_to_le16(IEEE80211_HT_CAP_DSSSCCK40); - if (phtpriv->sgi_20m) + if (ht_priv->sgi_20m) ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_SGI_20); /* Get HT BW */ @@ -2307,17 +2307,17 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i if ((cbw40_enable == 1) && (operation_bw == CHANNEL_WIDTH_40)) { ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH); - if (phtpriv->sgi_40m) + if (ht_priv->sgi_40m) ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_SGI_40); } - 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 |= cpu_to_le16(IEEE80211_HT_CAP_TX_STBC); /* todo: disable SM power save mode */ ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_SM_PS); - if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_RX)) { + if (TEST_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX)) { if ((channel <= 14 && pregistrypriv->rx_stbc == 0x1) || /* enable for 2.4GHz */ (pregistrypriv->wifi_spec == 1)) stbc_rx_enable = 1; @@ -2356,7 +2356,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, 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); - phtpriv->ht_option = true; + ht_priv->ht_option = true; if (in_ie) { p = rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len); @@ -2366,7 +2366,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i } } - return phtpriv->ht_option; + return ht_priv->ht_option; } /* 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 = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; struct registry_priv *pregistrypriv = &adapter->registrypriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; u8 cbw40_enable = 0; - if (!phtpriv->ht_option) + if (!ht_priv->ht_option) return; if ((!pmlmeinfo->HT_info_enable) || (!pmlmeinfo->HT_caps_enable)) return; /* maybe needs check if ap supports rx ampdu. */ - if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) - phtpriv->ampdu_enable = true; + if (!(ht_priv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) + ht_priv->ampdu_enable = true; /* check Max Rx A-MPDU Size */ len = 0; @@ -2400,7 +2400,7 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *pie, uint ie_len, u8 channel max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR); max_ampdu_sz = 1 << (max_ampdu_sz + 3); /* max_ampdu_sz (kbytes); */ - phtpriv->rx_ampdu_maxlen = max_ampdu_sz; + ht_priv->rx_ampdu_maxlen = max_ampdu_sz; } len = 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 = &pxmitframe->attrib; s32 bmcst = is_multicast_ether_addr(pattrib->ra); @@ -2479,11 +2479,11 @@ void rtw_issue_addbareq_cmd(struct adapter *adapter, struct xmit_frame *pxmitfra if (!(psta->state & _FW_LINKED)) return; - phtpriv = &psta->htpriv; + ht_priv = &psta->htpriv; - if (phtpriv->ht_option && phtpriv->ampdu_enable) { - issued = (phtpriv->agg_enable_bitmap >> priority) & 0x1; - issued |= (phtpriv->candidate_tid_bitmap >> priority) & 0x1; + if (ht_priv->ht_option && ht_priv->ampdu_enable) { + issued = (ht_priv->agg_enable_bitmap >> priority) & 0x1; + issued |= (ht_priv->candidate_tid_bitmap >> priority) & 0x1; if (issued == 0) { psta->htpriv.candidate_tid_bitmap |= 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 *pout_len) { struct mlme_priv *mlme_priv = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; u8 cap_content[8] = {0}; - if (phtpriv->bss_coexist) + if (ht_priv->bss_coexist) SET_EXT_CAPABILITY_ELE_BSS_COEXIST(cap_content, 1); rtw_set_ie(out_ie + *pout_len, WLAN_EID_EXT_CAPABILITY, 8, cap_content, pout_len); -- 2.55.0