Hi,
This patch series renames 5 different variables with the checkpatch coding
style issue, Avoid CamelCase.
Patch 1/5) renamed variable bAMSDU_Support
Patch 2/5) renamed variable bAMPD?U_Enable
Patch 3/5) renamed variable AMPDU_factor
Patch 4/5) renamed variable MPDU_Density
Patch 5/5) renamed variable bTxEnableFwCalcDur
Signed-off-by: Gary Rookard <[email protected]>
Gary Rookard (5):
staging: rtl8192e: renamed variable bAMSDU_Support
staging: rtl8192e: renamed variable bAMPDUEnable
staging: rtl8192e: renamed variable AMPDU_Factor
staging: rtl8192e: renamed variable MPDU_Density
staging: rtl8192e: renamed variable bTxEnableFwCalcDur
.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++--
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtl819x_HT.h | 8 +++----
drivers/staging/rtl8192e/rtl819x_HTProc.c | 24 +++++++++----------
drivers/staging/rtl8192e/rtllib.h | 6 ++---
drivers/staging/rtl8192e/rtllib_tx.c | 10 ++++----
6 files changed, 27 insertions(+), 27 deletions(-)
--
2.41.0
Coding style issue, checkpatch Avoid CamelCase,
rename it. bAMPDUEnable -> ampdu_enable
Signed-off-by: Gary Rookard <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +-
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
drivers/staging/rtl8192e/rtllib.h | 2 +-
drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 13e3f26279aa..fe48cc6b7132 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -883,7 +883,7 @@ void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc,
pTxFwInfo->Short = _rtl92e_query_is_short(pTxFwInfo->TxHT,
pTxFwInfo->TxRate, cb_desc);
- if (cb_desc->bAMPDUEnable) {
+ if (cb_desc->ampdu_enable) {
pTxFwInfo->AllowAggregation = 1;
pTxFwInfo->RxMF = cb_desc->ampdu_factor;
pTxFwInfo->RxAMD = cb_desc->ampdu_density;
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index e02fa40262bd..7a3e36db849c 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -111,7 +111,7 @@ struct rt_hi_throughput {
u16 amsdu_max_size;
u8 bCurrent_AMSDU_Support;
u16 nCurrent_AMSDU_MaxSize;
- u8 bAMPDUEnable;
+ u8 ampdu_enable;
u8 current_ampdu_enable;
u8 AMPDU_Factor;
u8 CurrentAMPDUFactor;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index b2f2e1c0cf6b..9841af15089f 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -84,7 +84,7 @@ void ht_update_default_setting(struct rtllib_device *ieee)
ht_info->amsdu_max_size = 7935UL;
ht_info->amsdu_support = 0;
- ht_info->bAMPDUEnable = 1;
+ ht_info->ampdu_enable = 1;
ht_info->AMPDU_Factor = 2;
ht_info->MPDU_Density = 0;
@@ -498,7 +498,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
else
ht_info->nCurrent_AMSDU_MaxSize = ht_info->amsdu_max_size;
- ht_info->current_ampdu_enable = ht_info->bAMPDUEnable;
+ ht_info->current_ampdu_enable = ht_info->ampdu_enable;
if (ieee->rtllib_ap_sec_type &&
(ieee->rtllib_ap_sec_type(ieee) & (SEC_ALG_WEP | SEC_ALG_TKIP))) {
if ((ht_info->IOTPeer == HT_IOT_PEER_ATHEROS) ||
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 47da9b1a8682..6bad7d410075 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -118,7 +118,7 @@ struct cb_desc {
u8 bUseShortGI:1;
u8 bUseShortPreamble:1;
u8 bTxEnableFwCalcDur:1;
- u8 bAMPDUEnable:1;
+ u8 ampdu_enable:1;
u8 bRTSSTBC:1;
u8 RTSSC:1;
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index a79f9d8c9162..5a69f4c6d0c9 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -312,7 +312,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
goto FORCED_AGG_SETTING;
}
if (ieee->iw_mode == IW_MODE_INFRA) {
- tcb_desc->bAMPDUEnable = true;
+ tcb_desc->ampdu_enable = true;
tcb_desc->ampdu_factor = ht_info->CurrentAMPDUFactor;
tcb_desc->ampdu_density = ht_info->current_mpdu_density;
}
@@ -323,13 +323,13 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
break;
case HT_AGG_FORCE_ENABLE:
- tcb_desc->bAMPDUEnable = true;
+ tcb_desc->ampdu_enable = true;
tcb_desc->ampdu_density = ht_info->forced_mpdu_density;
tcb_desc->ampdu_factor = ht_info->forced_ampdu_factor;
break;
case HT_AGG_FORCE_DISABLE:
- tcb_desc->bAMPDUEnable = false;
+ tcb_desc->ampdu_enable = false;
tcb_desc->ampdu_density = 0;
tcb_desc->ampdu_factor = 0;
break;
@@ -454,7 +454,7 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee,
tcb_desc->bRTSEnable = true;
break;
}
- if (tcb_desc->bAMPDUEnable) {
+ if (tcb_desc->ampdu_enable) {
tcb_desc->rts_rate = MGN_24M;
tcb_desc->bRTSEnable = false;
break;
--
2.41.0
Coding style issue, checkpatch Avoid CamelCase,
rename it. AMPDU_Factor -> ampdu_factor
Signed-off-by: Gary Rookard <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 7a3e36db849c..c01ccf252924 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -113,7 +113,7 @@ struct rt_hi_throughput {
u16 nCurrent_AMSDU_MaxSize;
u8 ampdu_enable;
u8 current_ampdu_enable;
- u8 AMPDU_Factor;
+ u8 ampdu_factor;
u8 CurrentAMPDUFactor;
u8 MPDU_Density;
u8 current_mpdu_density;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 9841af15089f..0f044356e428 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -85,7 +85,7 @@ void ht_update_default_setting(struct rtllib_device *ieee)
ht_info->amsdu_support = 0;
ht_info->ampdu_enable = 1;
- ht_info->AMPDU_Factor = 2;
+ ht_info->ampdu_factor = 2;
ht_info->MPDU_Density = 0;
ht_info->self_mimo_ps = 3;
@@ -507,11 +507,11 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
}
if (!ht_info->reg_rt2rt_aggregation) {
- if (ht_info->AMPDU_Factor > pPeerHTCap->MaxRxAMPDUFactor)
+ if (ht_info->ampdu_factor > pPeerHTCap->MaxRxAMPDUFactor)
ht_info->CurrentAMPDUFactor =
pPeerHTCap->MaxRxAMPDUFactor;
else
- ht_info->CurrentAMPDUFactor = ht_info->AMPDU_Factor;
+ ht_info->CurrentAMPDUFactor = ht_info->ampdu_factor;
} else {
if (ieee->current_network.bssht.bd_rt2rt_aggregation) {
@@ -571,7 +571,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
ht_info->bCurrent_AMSDU_Support = false;
ht_info->nCurrent_AMSDU_MaxSize = ht_info->amsdu_max_size;
ht_info->current_mpdu_density = ht_info->MPDU_Density;
- ht_info->CurrentAMPDUFactor = ht_info->AMPDU_Factor;
+ ht_info->CurrentAMPDUFactor = ht_info->ampdu_factor;
memset((void *)(&ht_info->SelfHTCap), 0,
sizeof(ht_info->SelfHTCap));
--
2.41.0
Coding style issue, checkpatch Avoid CamelCase,
rename it. bAMSDU_Suppport -> amsdu_support
Signed-off-by: Gary Rookard <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 5018c3905be8..e02fa40262bd 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -107,7 +107,7 @@ struct rt_hi_throughput {
struct ht_info_ele SelfHTInfo;
u8 PeerHTCapBuf[32];
u8 PeerHTInfoBuf[32];
- u8 bAMSDU_Support;
+ u8 amsdu_support;
u16 amsdu_max_size;
u8 bCurrent_AMSDU_Support;
u16 nCurrent_AMSDU_MaxSize;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 6475832f23f6..b2f2e1c0cf6b 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -82,7 +82,7 @@ void ht_update_default_setting(struct rtllib_device *ieee)
ht_info->reg_supp_cck = true;
ht_info->amsdu_max_size = 7935UL;
- ht_info->bAMSDU_Support = 0;
+ ht_info->amsdu_support = 0;
ht_info->bAMPDUEnable = 1;
ht_info->AMPDU_Factor = 2;
@@ -489,7 +489,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
((pPeerHTCap->DssCCk == 1) ? true :
false) : false);
- ht_info->bCurrent_AMSDU_Support = ht_info->bAMSDU_Support;
+ ht_info->bCurrent_AMSDU_Support = ht_info->amsdu_support;
nMaxAMSDUSize = (pPeerHTCap->MaxAMSDUSize == 0) ? 3839 : 7935;
--
2.41.0
Coding style issue, checkpatch Avoid CamelCase,
rename it. MPDU_Density -> mpdu_density
Signed-off-by: Gary Rookard <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index c01ccf252924..98c1e5840e31 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -115,7 +115,7 @@ struct rt_hi_throughput {
u8 current_ampdu_enable;
u8 ampdu_factor;
u8 CurrentAMPDUFactor;
- u8 MPDU_Density;
+ u8 mpdu_density;
u8 current_mpdu_density;
enum ht_aggre_mode ForcedAMPDUMode;
u8 forced_ampdu_factor;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 0f044356e428..72b30d4df5f7 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -86,7 +86,7 @@ void ht_update_default_setting(struct rtllib_device *ieee)
ht_info->ampdu_enable = 1;
ht_info->ampdu_factor = 2;
- ht_info->MPDU_Density = 0;
+ ht_info->mpdu_density = 0;
ht_info->self_mimo_ps = 3;
if (ht_info->self_mimo_ps == 2)
@@ -525,7 +525,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
HT_AGG_SIZE_32K);
}
}
- ht_info->current_mpdu_density = max_t(u8, ht_info->MPDU_Density,
+ ht_info->current_mpdu_density = max_t(u8, ht_info->mpdu_density,
pPeerHTCap->MPDUDensity);
if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) {
ht_info->current_ampdu_enable = false;
@@ -570,7 +570,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
ht_info->bCurrent_AMSDU_Support = false;
ht_info->nCurrent_AMSDU_MaxSize = ht_info->amsdu_max_size;
- ht_info->current_mpdu_density = ht_info->MPDU_Density;
+ ht_info->current_mpdu_density = ht_info->mpdu_density;
ht_info->CurrentAMPDUFactor = ht_info->ampdu_factor;
memset((void *)(&ht_info->SelfHTCap), 0,
--
2.41.0
Coding style issue, checkpatch Avoid CamelCase,
rename it. bTxEnableFwCalcDur -> tx_enable_fw_calc_dur
Signed-off-by: Gary Rookard <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 4 ++--
drivers/staging/rtl8192e/rtllib_tx.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index fe48cc6b7132..39fa5f60db45 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -879,7 +879,7 @@ void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc,
memset(pTxFwInfo, 0, sizeof(struct tx_fwinfo_8190pci));
pTxFwInfo->TxHT = (cb_desc->data_rate & 0x80) ? 1 : 0;
pTxFwInfo->TxRate = _rtl92e_rate_mgn_to_hw(cb_desc->data_rate);
- pTxFwInfo->EnableCPUDur = cb_desc->bTxEnableFwCalcDur;
+ pTxFwInfo->EnableCPUDur = cb_desc->tx_enable_fw_calc_dur;
pTxFwInfo->Short = _rtl92e_query_is_short(pTxFwInfo->TxHT,
pTxFwInfo->TxRate, cb_desc);
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index bad34221d8b7..1f45b6b00d1b 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1189,7 +1189,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
tcb_desc->ratr_index = 7;
tcb_desc->tx_dis_rate_fallback = 1;
tcb_desc->tx_use_drv_assinged_rate = 1;
- tcb_desc->bTxEnableFwCalcDur = 1;
+ tcb_desc->tx_enable_fw_calc_dur = 1;
skb_push(skb, priv->rtllib->tx_headroom);
ret = _rtl92e_tx(dev, skb);
if (ret != 0)
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 72b30d4df5f7..a421c56af9e2 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -94,7 +94,7 @@ void ht_update_default_setting(struct rtllib_device *ieee)
ieee->tx_dis_rate_fallback = 0;
ieee->tx_use_drv_assinged_rate = 0;
- ieee->bTxEnableFwCalcDur = 1;
+ ieee->tx_enable_fw_calc_dur = 1;
ht_info->reg_rt2rt_aggregation = 1;
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 6bad7d410075..85b922bda7ec 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -117,7 +117,7 @@ struct cb_desc {
u8 bRTSEnable:1;
u8 bUseShortGI:1;
u8 bUseShortPreamble:1;
- u8 bTxEnableFwCalcDur:1;
+ u8 tx_enable_fw_calc_dur:1;
u8 ampdu_enable:1;
u8 bRTSSTBC:1;
u8 RTSSC:1;
@@ -1223,7 +1223,7 @@ struct rtllib_device {
u8 HTHighestOperaRate;
u8 tx_dis_rate_fallback;
u8 tx_use_drv_assinged_rate;
- u8 bTxEnableFwCalcDur;
+ u8 tx_enable_fw_calc_dur;
atomic_t atm_swbw;
struct list_head Tx_TS_Admit_List;
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 5a69f4c6d0c9..e2dd2772bbeb 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -847,7 +847,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
if (txb) {
tcb_desc = (struct cb_desc *)
(txb->fragments[0]->cb + MAX_DEV_ADDR_SIZE);
- tcb_desc->bTxEnableFwCalcDur = 1;
+ tcb_desc->tx_enable_fw_calc_dur = 1;
tcb_desc->priority = skb->priority;
if (ether_type == ETH_P_PAE) {
--
2.41.0
On 12/7/23 00:03, Gary Rookard wrote:
> Hi,
>
> This patch series renames 5 different variables with the checkpatch coding
> style issue, Avoid CamelCase.
>
> Patch 1/5) renamed variable bAMSDU_Support
> Patch 2/5) renamed variable bAMPD?U_Enable
> Patch 3/5) renamed variable AMPDU_factor
> Patch 4/5) renamed variable MPDU_Density
> Patch 5/5) renamed variable bTxEnableFwCalcDur
>
> Signed-off-by: Gary Rookard <[email protected]>
>
> Gary Rookard (5):
> staging: rtl8192e: renamed variable bAMSDU_Support
> staging: rtl8192e: renamed variable bAMPDUEnable
> staging: rtl8192e: renamed variable AMPDU_Factor
> staging: rtl8192e: renamed variable MPDU_Density
> staging: rtl8192e: renamed variable bTxEnableFwCalcDur
>
> .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++--
> drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
> drivers/staging/rtl8192e/rtl819x_HT.h | 8 +++----
> drivers/staging/rtl8192e/rtl819x_HTProc.c | 24 +++++++++----------
> drivers/staging/rtl8192e/rtllib.h | 6 ++---
> drivers/staging/rtl8192e/rtllib_tx.c | 10 ++++----
> 6 files changed, 27 insertions(+), 27 deletions(-)
>
Tested-by: Philipp Hortmann <[email protected]>