Skip to contentSkip to conversation

rename variable posHTCap and (4) others

PATCH In review Gary Rookard 3 participants 9 messages Dec 12, 2023 – Dec 13, 2023 Staging

lore
Share & tools
lore
#0 lore raw

cover rename variable posHTCap and (4) others

Hi,

This patch series renames (5) different variables with the checkpatch coding style issue, Avoid CamelCase.

Patch 1/5) rename variable posHTCap
Patch 2/5) rename variable IsEncrypt
Patch 3/5) rename variable bAssoc
Patch 4/5) rename variable pHT
Patch 5/5) rename variable pCapELE

Gary Rookard (5):
staging: rtl8192e: rename variable posHTCap
staging: rtl8192e: rename variable IsEncrypt
staging: rtl8192e: rename variable bAssoc
staging: rtl8192e: rename variable pHT
staging: rtl8192e: rename variable pCapELE

 drivers/staging/rtl8192e/rtl819x_HTProc.c | 90 +++++++++++------------
 1 file changed, 45 insertions(+), 45 deletions(-)
Signature · 1 line
2.41.0
#1 lore raw

PATCH 1/5 staging: rtl8192e: rename variable posHTCap

Coding style issue, checkpatch Avoid CamelCase,
rename it. posHTCap -> pos_ht_cap

---
 drivers/staging/rtl8192e/rtl819x_HTProc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192e/rtl819x_HTProc.c +6 -6
index 14e25f87c1bf..eb798a3a9052 100644
@@ -247,27 +247,27 @@ void ht_reset_iot_setting(struct rt_hi_throughput *ht_info)
 	ht_info->iot_ra_func = 0;
 }
 
-void ht_construct_capability_element(struct rtllib_device *ieee, u8 *posHTCap,
+void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 				  u8 *len, u8 IsEncrypt, bool bAssoc)
 {
 	struct rt_hi_throughput *pHT = ieee->ht_info;
 	struct ht_capab_ele *pCapELE = NULL;
 
-	if (!posHTCap || !pHT) {
+	if (!pos_ht_cap || !pHT) {
 		netdev_warn(ieee->dev,
 			    "%s(): posHTCap and ht_info are null\n", __func__);
 		return;
 	}
-	memset(posHTCap, 0, *len);
+	memset(pos_ht_cap, 0, *len);
 
 	if ((bAssoc) && (pHT->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
 		static const u8	EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
 
-		memcpy(posHTCap, EWC11NHTCap, sizeof(EWC11NHTCap));
-		pCapELE = (struct ht_capab_ele *)&posHTCap[4];
+		memcpy(pos_ht_cap, EWC11NHTCap, sizeof(EWC11NHTCap));
+		pCapELE = (struct ht_capab_ele *)&pos_ht_cap[4];
 		*len = 30 + 2;
 	} else {
-		pCapELE = (struct ht_capab_ele *)posHTCap;
+		pCapELE = (struct ht_capab_ele *)pos_ht_cap;
 		*len = 26 + 2;
 	}
 
Signature · 1 line
2.41.0
#2 lore raw

PATCH 2/5 staging: rtl8192e: rename variable IsEncrypt

In reply to Gary Rookard

Coding style issue, checkpatch Avoid CamelCase,
rename it. IsEncrypt -> is_encrypt

---
 drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl819x_HTProc.c +2 -2
index eb798a3a9052..b6e9b7e000ef 100644
@@ -248,7 +248,7 @@ void ht_reset_iot_setting(struct rt_hi_throughput *ht_info)
 }
 
 void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
-				  u8 *len, u8 IsEncrypt, bool bAssoc)
+				  u8 *len, u8 is_encrypt, bool bAssoc)
 {
 	struct rt_hi_throughput *pHT = ieee->ht_info;
 	struct ht_capab_ele *pCapELE = NULL;
@@ -294,7 +294,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 		   "TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n",
 		   pCapELE->ChlWidth, pCapELE->MaxAMSDUSize, pCapELE->DssCCk);
 
-	if (IsEncrypt) {
+	if (is_encrypt) {
 		pCapELE->MPDUDensity	= 7;
 		pCapELE->MaxRxAMPDUFactor	= 2;
 	} else {
Signature · 1 line
2.41.0
#3 lore raw

PATCH 3/5 staging: rtl8192e: rename variable bAssoc

In reply to Gary Rookard

Coding style issue, checkpatch Avoid CamelCase,
rename it. bAssoc -> assoc

---
 drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl819x_HTProc.c +3 -3
index b6e9b7e000ef..ac85151a6069 100644
@@ -248,7 +248,7 @@ void ht_reset_iot_setting(struct rt_hi_throughput *ht_info)
 }
 
 void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
-				  u8 *len, u8 is_encrypt, bool bAssoc)
+				  u8 *len, u8 is_encrypt, bool assoc)
 {
 	struct rt_hi_throughput *pHT = ieee->ht_info;
 	struct ht_capab_ele *pCapELE = NULL;
@@ -260,7 +260,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 	}
 	memset(pos_ht_cap, 0, *len);
 
-	if ((bAssoc) && (pHT->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
+	if ((assoc) && (pHT->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
 		static const u8	EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
 
 		memcpy(pos_ht_cap, EWC11NHTCap, sizeof(EWC11NHTCap));
@@ -308,7 +308,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 
 	pCapELE->ASCap = 0;
 
-	if (bAssoc) {
+	if (assoc) {
 		if (pHT->iot_action & HT_IOT_ACT_DISABLE_MCS15)
 			pCapELE->MCS[1] &= 0x7f;
 
Signature · 1 line
2.41.0
#4 lore raw

PATCH 4/5 staging: rtl8192e: rename variable pHT

In reply to Gary Rookard

Coding style issue, Avoid CamelCase
rename it. pHT -> ht

---
 drivers/staging/rtl8192e/rtl819x_HTProc.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8192e/rtl819x_HTProc.c +10 -10
index ac85151a6069..add8f58b5b1e 100644
@@ -250,17 +250,17 @@ void ht_reset_iot_setting(struct rt_hi_throughput *ht_info)
 void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 				  u8 *len, u8 is_encrypt, bool assoc)
 {
-	struct rt_hi_throughput *pHT = ieee->ht_info;
+	struct rt_hi_throughput *ht = ieee->ht_info;
 	struct ht_capab_ele *pCapELE = NULL;
 
-	if (!pos_ht_cap || !pHT) {
+	if (!pos_ht_cap || !ht) {
 		netdev_warn(ieee->dev,
 			    "%s(): posHTCap and ht_info are null\n", __func__);
 		return;
 	}
 	memset(pos_ht_cap, 0, *len);
 
-	if ((assoc) && (pHT->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
+	if ((assoc) && (ht->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
 		static const u8	EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
 
 		memcpy(pos_ht_cap, EWC11NHTCap, sizeof(EWC11NHTCap));
@@ -275,9 +275,9 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 	if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))
 		pCapELE->ChlWidth = 0;
 	else
-		pCapELE->ChlWidth = (pHT->reg_bw_40mhz ? 1 : 0);
+		pCapELE->ChlWidth = (ht->reg_bw_40mhz ? 1 : 0);
 
-	pCapELE->MimoPwrSave		= pHT->self_mimo_ps;
+	pCapELE->MimoPwrSave		= ht->self_mimo_ps;
 	pCapELE->GreenField		= 0;
 	pCapELE->ShortGI20Mhz		= 1;
 	pCapELE->ShortGI40Mhz		= 1;
@@ -286,7 +286,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 	pCapELE->RxSTBC			= 0;
 	pCapELE->DelayBA		= 0;
 	pCapELE->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
-	pCapELE->DssCCk = ((pHT->reg_bw_40mhz) ? (pHT->reg_supp_cck ? 1 : 0) : 0);
+	pCapELE->DssCCk = ((ht->reg_bw_40mhz) ? (ht->reg_supp_cck ? 1 : 0) : 0);
 	pCapELE->PSMP = 0;
 	pCapELE->LSigTxopProtect = 0;
 
@@ -309,16 +309,16 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 	pCapELE->ASCap = 0;
 
 	if (assoc) {
-		if (pHT->iot_action & HT_IOT_ACT_DISABLE_MCS15)
+		if (ht->iot_action & HT_IOT_ACT_DISABLE_MCS15)
 			pCapELE->MCS[1] &= 0x7f;
 
-		if (pHT->iot_action & HT_IOT_ACT_DISABLE_MCS14)
+		if (ht->iot_action & HT_IOT_ACT_DISABLE_MCS14)
 			pCapELE->MCS[1] &= 0xbf;
 
-		if (pHT->iot_action & HT_IOT_ACT_DISABLE_ALL_2SS)
+		if (ht->iot_action & HT_IOT_ACT_DISABLE_ALL_2SS)
 			pCapELE->MCS[1] &= 0x00;
 
-		if (pHT->iot_action & HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI)
+		if (ht->iot_action & HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI)
 			pCapELE->ShortGI40Mhz		= 0;
 
 		if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) {
Signature · 1 line
2.41.0
#5 lore raw

Re: [PATCH 4/5] staging: rtl8192e: rename variable pHT

Quoted 34 lines · Gary Rookard

oding style issue, Avoid CamelCase
rename it. pHT -> ht

---
  drivers/staging/rtl8192e/rtl819x_HTProc.c | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8192e/rtl819x_HTProc.c +3 -3
index ac85151a6069..add8f58b5b1e 100644
@@ -250,17 +250,17 @@ void ht_reset_iot_setting(struct rt_hi_throughput *ht_info)
  void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
  				  u8 *len, u8 is_encrypt, bool assoc)
  {
-	struct rt_hi_throughput *pHT = ieee->ht_info;
+	struct rt_hi_throughput *ht = ieee->ht_info;
  	struct ht_capab_ele *pCapELE = NULL;
 
-	if (!pos_ht_cap || !pHT) {
+	if (!pos_ht_cap || !ht) {
  		netdev_warn(ieee->dev,
  			    "%s(): posHTCap and ht_info are null\n", __func__);
  		return;
  	}
  	memset(pos_ht_cap, 0, *len);
 
-	if ((assoc) && (pHT->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
+	if ((assoc) && (ht->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
  		static const u8	EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
 
  		memcpy(pos_ht_cap, EWC11NHTCap, sizeof(EWC11NHTCap));

drivers/staging/rtl8192e/rtl819x_HTProc.c void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap, · line 278

Quoted 5 lines
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -275,9 +275,9 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
  	if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))
  		pCapELE->ChlWidth = 0;
  	else
-		pCapELE->ChlWidth = (pHT->reg_bw_40mhz ? 1 : 0);
+		pCapELE->ChlWidth = (ht->reg_bw_40mhz ? 1 : 0);

The last line changed with my patch:
[PATCH 02/10] staging: rtl8192e: Remove variable ht_info->reg_bw_40mhz

It is always difficult to know which patches are accepted by the maintainer but you may want to look into the following mailing list to see if there have been any patches send in for this driver.
https://lore.kernel.org/linux-staging/

You could apply the send in patches and build your ones on top. Then you do not have this issue. But when the patches you are using are not accepted you will run into the same issues.

Thanks for your support.

Bye Philipp

#6 lore raw

Re: [PATCH 4/5] staging: rtl8192e: rename variable pHT

Quoted 45 lines · Philipp Hortmann
Quoted 30 lines · Gary Rookard

oding style issue, Avoid CamelCase
rename it. pHT -> ht

---
  drivers/staging/rtl8192e/rtl819x_HTProc.c | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8192e/rtl819x_HTProc.c +3 -1
index ac85151a6069..add8f58b5b1e 100644
@@ -250,17 +250,17 @@ void ht_reset_iot_setting(struct rt_hi_throughput *ht_info)
  void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
  				  u8 *len, u8 is_encrypt, bool assoc)
  {
-	struct rt_hi_throughput *pHT = ieee->ht_info;
+	struct rt_hi_throughput *ht = ieee->ht_info;
  	struct ht_capab_ele *pCapELE = NULL;
  -	if (!pos_ht_cap || !pHT) {
+	if (!pos_ht_cap || !ht) {
  		netdev_warn(ieee->dev,
  			    "%s(): posHTCap and ht_info are null\n", __func__);
  		return;
  	}
  	memset(pos_ht_cap, 0, *len);
  -	if ((assoc) && (pHT->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
+	if ((assoc) && (ht->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
  		static const u8	EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
    		memcpy(pos_ht_cap, EWC11NHTCap, sizeof(EWC11NHTCap));

drivers/staging/rtl8192e/rtl819x_HTProc.c void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap, · line 278

Quoted 5 lines
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -275,9 +275,9 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
  	if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))
  		pCapELE->ChlWidth = 0;
  	else
-		pCapELE->ChlWidth = (pHT->reg_bw_40mhz ? 1 : 0);
+		pCapELE->ChlWidth = (ht->reg_bw_40mhz ? 1 : 0);

The last line changed with my patch:
[PATCH 02/10] staging: rtl8192e: Remove variable ht_info->reg_bw_40mhz

It is always difficult to know which patches are accepted by the maintainer but you may want to look into the following mailing list to see if there have been any patches send in for this driver.
https://lore.kernel.org/linux-staging/

Quoted 7 lines

You could apply the send in patches and build your ones on top. Then you do not have this issue. But when the patches you are using are not accepted you will run into the same issues.

Thanks for your support.

Bye Philipp

Okay, no problem.

Regards,
Gary

Signature · 1 line
Sent with my mu4e on Gentoo GNU/linux.
#7 lore raw

Re: [PATCH 4/5] staging: rtl8192e: rename variable pHT

In reply to Philipp Hortmann
Quoted 41 lines · Philipp Hortmann
Quoted 31 lines · Gary Rookard

oding style issue, Avoid CamelCase
rename it. pHT -> ht

---
  drivers/staging/rtl8192e/rtl819x_HTProc.c | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8192e/rtl819x_HTProc.c +3 -3
index ac85151a6069..add8f58b5b1e 100644
@@ -250,17 +250,17 @@ void ht_reset_iot_setting(struct rt_hi_throughput *ht_info)
  void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
  				  u8 *len, u8 is_encrypt, bool assoc)
  {
-	struct rt_hi_throughput *pHT = ieee->ht_info;
+	struct rt_hi_throughput *ht = ieee->ht_info;
  	struct ht_capab_ele *pCapELE = NULL;
-	if (!pos_ht_cap || !pHT) {
+	if (!pos_ht_cap || !ht) {
  		netdev_warn(ieee->dev,
  			    "%s(): posHTCap and ht_info are null\n", __func__);
  		return;
  	}
  	memset(pos_ht_cap, 0, *len);
-	if ((assoc) && (pHT->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
+	if ((assoc) && (ht->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
  		static const u8	EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
  		memcpy(pos_ht_cap, EWC11NHTCap, sizeof(EWC11NHTCap));

drivers/staging/rtl8192e/rtl819x_HTProc.c void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap, · line 278

Quoted 5 lines
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -275,9 +275,9 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
  	if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))
  		pCapELE->ChlWidth = 0;
  	else
-		pCapELE->ChlWidth = (pHT->reg_bw_40mhz ? 1 : 0);
+		pCapELE->ChlWidth = (ht->reg_bw_40mhz ? 1 : 0);

The last line changed with my patch:
[PATCH 02/10] staging: rtl8192e: Remove variable ht_info->reg_bw_40mhz

Quoted 8 lines

It is always difficult to know which patches are accepted by the maintainer but you may want to look into the following mailing list to see if there have been any patches send in for this driver.
https://lore.kernel.org/linux-staging/

You could apply the send in patches and build your ones on top. Then you do not have this issue. But when the patches you are using are not accepted you will run into the same issues.

Generally, it's first come, first serve. For you, your patches have a 95% chance of being merged.

regards,
dan carpenter

#8 lore raw

PATCH 5/5 staging: rtl8192e: rename variable pCapELE

In reply to Gary Rookard

Coding style issue, checkpatch Avoid CamelCase,
rename it. pCapELE -> cap_ele

---
 drivers/staging/rtl8192e/rtl819x_HTProc.c | 64 +++++++++++------------
 1 file changed, 32 insertions(+), 32 deletions(-)
drivers/staging/rtl8192e/rtl819x_HTProc.c +32 -32
index add8f58b5b1e..25097f1935a5 100644
@@ -251,7 +251,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 				  u8 *len, u8 is_encrypt, bool assoc)
 {
 	struct rt_hi_throughput *ht = ieee->ht_info;
-	struct ht_capab_ele *pCapELE = NULL;
+	struct ht_capab_ele *cap_ele = NULL;
 
 	if (!pos_ht_cap || !ht) {
 		netdev_warn(ieee->dev,
@@ -264,66 +264,66 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
 		static const u8	EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
 
 		memcpy(pos_ht_cap, EWC11NHTCap, sizeof(EWC11NHTCap));
-		pCapELE = (struct ht_capab_ele *)&pos_ht_cap[4];
+		cap_ele = (struct ht_capab_ele *)&pos_ht_cap[4];
 		*len = 30 + 2;
 	} else {
-		pCapELE = (struct ht_capab_ele *)pos_ht_cap;
+		cap_ele = (struct ht_capab_ele *)pos_ht_cap;
 		*len = 26 + 2;
 	}
 
-	pCapELE->AdvCoding		= 0;
+	cap_ele->AdvCoding		= 0;
 	if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))
-		pCapELE->ChlWidth = 0;
+		cap_ele->ChlWidth = 0;
 	else
-		pCapELE->ChlWidth = (ht->reg_bw_40mhz ? 1 : 0);
+		cap_ele->ChlWidth = (ht->reg_bw_40mhz ? 1 : 0);
 
-	pCapELE->MimoPwrSave		= ht->self_mimo_ps;
-	pCapELE->GreenField		= 0;
-	pCapELE->ShortGI20Mhz		= 1;
-	pCapELE->ShortGI40Mhz		= 1;
+	cap_ele->MimoPwrSave		= ht->self_mimo_ps;
+	cap_ele->GreenField		= 0;
+	cap_ele->ShortGI20Mhz		= 1;
+	cap_ele->ShortGI40Mhz		= 1;
 
-	pCapELE->TxSTBC			= 1;
-	pCapELE->RxSTBC			= 0;
-	pCapELE->DelayBA		= 0;
-	pCapELE->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
-	pCapELE->DssCCk = ((ht->reg_bw_40mhz) ? (ht->reg_supp_cck ? 1 : 0) : 0);
-	pCapELE->PSMP = 0;
-	pCapELE->LSigTxopProtect = 0;
+	cap_ele->TxSTBC			= 1;
+	cap_ele->RxSTBC			= 0;
+	cap_ele->DelayBA		= 0;
+	cap_ele->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
+	cap_ele->DssCCk = ((ht->reg_bw_40mhz) ? (ht->reg_supp_cck ? 1 : 0) : 0);
+	cap_ele->PSMP = 0;
+	cap_ele->LSigTxopProtect = 0;
 
 	netdev_dbg(ieee->dev,
 		   "TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n",
-		   pCapELE->ChlWidth, pCapELE->MaxAMSDUSize, pCapELE->DssCCk);
+		   cap_ele->ChlWidth, cap_ele->MaxAMSDUSize, cap_ele->DssCCk);
 
 	if (is_encrypt) {
-		pCapELE->MPDUDensity	= 7;
-		pCapELE->MaxRxAMPDUFactor	= 2;
+		cap_ele->MPDUDensity	= 7;
+		cap_ele->MaxRxAMPDUFactor	= 2;
 	} else {
-		pCapELE->MaxRxAMPDUFactor	= 3;
-		pCapELE->MPDUDensity	= 0;
+		cap_ele->MaxRxAMPDUFactor	= 3;
+		cap_ele->MPDUDensity	= 0;
 	}
 
-	memcpy(pCapELE->MCS, ieee->reg_dot11ht_oper_rate_set, 16);
-	memset(&pCapELE->ExtHTCapInfo, 0, 2);
-	memset(pCapELE->TxBFCap, 0, 4);
+	memcpy(cap_ele->MCS, ieee->reg_dot11ht_oper_rate_set, 16);
+	memset(&cap_ele->ExtHTCapInfo, 0, 2);
+	memset(cap_ele->TxBFCap, 0, 4);
 
-	pCapELE->ASCap = 0;
+	cap_ele->ASCap = 0;
 
 	if (assoc) {
 		if (ht->iot_action & HT_IOT_ACT_DISABLE_MCS15)
-			pCapELE->MCS[1] &= 0x7f;
+			cap_ele->MCS[1] &= 0x7f;
 
 		if (ht->iot_action & HT_IOT_ACT_DISABLE_MCS14)
-			pCapELE->MCS[1] &= 0xbf;
+			cap_ele->MCS[1] &= 0xbf;
 
 		if (ht->iot_action & HT_IOT_ACT_DISABLE_ALL_2SS)
-			pCapELE->MCS[1] &= 0x00;
+			cap_ele->MCS[1] &= 0x00;
 
 		if (ht->iot_action & HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI)
-			pCapELE->ShortGI40Mhz		= 0;
+			cap_ele->ShortGI40Mhz		= 0;
 
 		if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) {
-			pCapELE->ChlWidth = 0;
-			pCapELE->MCS[1] = 0;
+			cap_ele->ChlWidth = 0;
+			cap_ele->MCS[1] = 0;
 		}
 	}
 }
Signature · 1 line
2.41.0