This series renames 18 variables found in rtl819x_HTProc.c
Thank you in advance to reviewers.
~Tree
Tree Davies (18):
Staging: rtl8192e: Rename variable CurSTAExtChnlOffset
Staging: rtl8192e: Rename variable CurrentAMPDUFactor
Staging: rtl8192e: Rename variable OptMode
Staging: rtl8192e: Rename variable LSigTxopProtect
Staging: rtl8192e: Rename variable ChlWidth
Staging: rtl8192e: Rename variable AdvCoding
Staging: rtl8192e: Rename variable MimoPwrSave
Staging: rtl8192e: Rename variable ShortGI40Mhz
Staging: rtl8192e: Rename variable ShortGI20Mhz
Staging: rtl8192e: Rename variable GreenField
Staging: rtl8192e: Rename variable TxSTBC
Staging: rtl8192e: Rename variable RxSTBC
Staging: rtl8192e: Rename variable DelayBA
Staging: rtl8192e: Rename variable MaxAMSDUSize
Staging: rtl8192e: Rename variable MaxRxAMPDUFactor
Staging: rtl8192e: Rename variable MPDUDensity
Staging: rtl8192e: Rename variable ExtHTCapInfo
Staging: rtl8192e: Rename variable DssCCk
drivers/staging/rtl8192e/rtl819x_HT.h | 36 ++++-----
drivers/staging/rtl8192e/rtl819x_HTProc.c | 84 ++++++++++----------
drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
drivers/staging/rtl8192e/rtllib_tx.c | 2 +-
drivers/staging/rtl8192e/rtllib_wx.c | 8 +-
6 files changed, 67 insertions(+), 67 deletions(-)
--
2.30.2
Rename variable CurrentAMPDUFactor to current_ampdu_factor
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 8 ++++----
drivers/staging/rtl8192e/rtllib_tx.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index eeb5a5eb94be..b789d0f17156 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -104,7 +104,7 @@ struct rt_hi_throughput {
u8 ampdu_enable;
u8 current_ampdu_enable;
u8 ampdu_factor;
- u8 CurrentAMPDUFactor;
+ u8 current_ampdu_factor;
u8 current_mpdu_density;
u8 forced_ampdu_factor;
u8 forced_mpdu_density;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index e82e8c50c090..3982c37f208c 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -470,12 +470,12 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
if (ieee->current_network.bssht.bd_rt2rt_aggregation) {
if (ieee->pairwise_key_type != KEY_TYPE_NA)
- ht_info->CurrentAMPDUFactor =
+ ht_info->current_ampdu_factor =
pPeerHTCap->MaxRxAMPDUFactor;
else
- ht_info->CurrentAMPDUFactor = HT_AGG_SIZE_64K;
+ ht_info->current_ampdu_factor = HT_AGG_SIZE_64K;
} else {
- ht_info->CurrentAMPDUFactor = min_t(u32, pPeerHTCap->MaxRxAMPDUFactor,
+ ht_info->current_ampdu_factor = min_t(u32, pPeerHTCap->MaxRxAMPDUFactor,
HT_AGG_SIZE_32K);
}
@@ -514,7 +514,7 @@ void ht_initialize_ht_info(struct rtllib_device *ieee)
ht_info->cur_short_gi_40mhz = false;
ht_info->current_mpdu_density = 0;
- ht_info->CurrentAMPDUFactor = ht_info->ampdu_factor;
+ ht_info->current_ampdu_factor = ht_info->ampdu_factor;
memset((void *)(&ht_info->self_ht_cap), 0,
sizeof(ht_info->self_ht_cap));
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 54100dd81505..1aeb207a3fee 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -313,7 +313,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
}
if (ieee->iw_mode == IW_MODE_INFRA) {
tcb_desc->ampdu_enable = true;
- tcb_desc->ampdu_factor = ht_info->CurrentAMPDUFactor;
+ tcb_desc->ampdu_factor = ht_info->current_ampdu_factor;
tcb_desc->ampdu_density = ht_info->current_mpdu_density;
}
}
--
2.30.2
Rename variable OptMode to opt_mode
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[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 b789d0f17156..d8fb2bda91e4 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -62,7 +62,7 @@ struct ht_info_ele {
u8 PSMPAccessOnly:1;
u8 SrvIntGranularity:3;
- u8 OptMode:2;
+ u8 opt_mode:2;
u8 NonGFDevPresent:1;
u8 Revd1:5;
u8 Revd2:8;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 3982c37f208c..837911934462 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -498,7 +498,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
pMcsFilter);
ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate;
- ht_info->current_op_mode = pPeerHTInfo->OptMode;
+ ht_info->current_op_mode = pPeerHTInfo->opt_mode;
}
void ht_initialize_ht_info(struct rtllib_device *ieee)
@@ -617,7 +617,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
if (ht_info->current_ht_support) {
if (pNetwork->bssht.bd_ht_info_len != 0)
- ht_info->current_op_mode = pPeerHTInfo->OptMode;
+ ht_info->current_op_mode = pPeerHTInfo->opt_mode;
}
}
EXPORT_SYMBOL(HT_update_self_and_peer_setting);
--
2.30.2
Rename variable ShortGI20Mhz to short_gi_20mhz
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
drivers/staging/rtl8192e/rtllib_wx.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 1b08507cab87..008611e3aace 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -28,7 +28,7 @@ struct ht_capab_ele {
u8 chl_width:1;
u8 mimo_pwr_save:2;
u8 GreenField:1;
- u8 ShortGI20Mhz:1;
+ u8 short_gi_20mhz:1;
u8 short_gi_40mhz:1;
u8 TxSTBC:1;
u8 RxSTBC:2;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 6c557717d8af..3b1c6e24103e 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -259,7 +259,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->mimo_pwr_save = 3;
cap_ele->GreenField = 0;
- cap_ele->ShortGI20Mhz = 1;
+ cap_ele->short_gi_20mhz = 1;
cap_ele->short_gi_40mhz = 1;
cap_ele->TxSTBC = 1;
@@ -457,7 +457,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ?
true : false);
- ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false);
+ ht_info->cur_short_gi_20mhz = ((pPeerHTCap->short_gi_20mhz == 1) ? true : false);
ht_info->cur_short_gi_40mhz = ((pPeerHTCap->short_gi_40mhz == 1) ? true : false);
ht_info->current_ampdu_enable = ht_info->ampdu_enable;
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 71ecfd0c8ed7..fbd4ec824084 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -132,7 +132,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
is40M = (ht_cap->chl_width) ? 1 : 0;
isShortGI = (ht_cap->chl_width) ?
((ht_cap->short_gi_40mhz) ? 1 : 0) :
- ((ht_cap->ShortGI20Mhz) ? 1 : 0);
+ ((ht_cap->short_gi_20mhz) ? 1 : 0);
max_mcs = ht_get_highest_mcs_rate(ieee, ht_cap->MCS,
MCS_FILTER_ALL);
--
2.30.2
Rename variable ExtHTCapInfo to ext_ht_cap_info
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 5cea0d8ee544..c1446081956d 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -45,7 +45,7 @@ struct ht_capab_ele {
u8 MCS[16];
- u16 ExtHTCapInfo;
+ u16 ext_ht_cap_info;
u8 TxBFCap[4];
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 85f52d09304d..963d69680049 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -283,7 +283,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
}
memcpy(cap_ele->MCS, ieee->reg_dot11ht_oper_rate_set, 16);
- memset(&cap_ele->ExtHTCapInfo, 0, 2);
+ memset(&cap_ele->ext_ht_cap_info, 0, 2);
memset(cap_ele->TxBFCap, 0, 4);
cap_ele->ASCap = 0;
--
2.30.2
Rename variable MaxRxAMPDUFactor to max_rx_ampdu_factor
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index e0906e4588c2..425df93486b3 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -39,7 +39,7 @@ struct ht_capab_ele {
u8 Rsvd1:1;
u8 lsig_txop_protect:1;
- u8 MaxRxAMPDUFactor:2;
+ u8 max_rx_ampdu_factor:2;
u8 MPDUDensity:3;
u8 Rsvd2:3;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 7b08e549726b..516e48073dc7 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -276,9 +276,9 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
if (is_encrypt) {
cap_ele->MPDUDensity = 7;
- cap_ele->MaxRxAMPDUFactor = 2;
+ cap_ele->max_rx_ampdu_factor = 2;
} else {
- cap_ele->MaxRxAMPDUFactor = 3;
+ cap_ele->max_rx_ampdu_factor = 3;
cap_ele->MPDUDensity = 0;
}
@@ -471,12 +471,12 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
if (ieee->current_network.bssht.bd_rt2rt_aggregation) {
if (ieee->pairwise_key_type != KEY_TYPE_NA)
ht_info->current_ampdu_factor =
- pPeerHTCap->MaxRxAMPDUFactor;
+ pPeerHTCap->max_rx_ampdu_factor;
else
ht_info->current_ampdu_factor = HT_AGG_SIZE_64K;
} else {
- ht_info->current_ampdu_factor = min_t(u32, pPeerHTCap->MaxRxAMPDUFactor,
- HT_AGG_SIZE_32K);
+ ht_info->current_ampdu_factor = min_t(u32, pPeerHTCap->max_rx_ampdu_factor,
+ HT_AGG_SIZE_32K);
}
ht_info->current_mpdu_density = pPeerHTCap->MPDUDensity;
--
2.30.2
Rename variable ShortGI40Mhz to short_gi_40mhz
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++---
drivers/staging/rtl8192e/rtllib_wx.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 25cdfdf85991..1b08507cab87 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -29,7 +29,7 @@ struct ht_capab_ele {
u8 mimo_pwr_save:2;
u8 GreenField:1;
u8 ShortGI20Mhz:1;
- u8 ShortGI40Mhz:1;
+ u8 short_gi_40mhz:1;
u8 TxSTBC:1;
u8 RxSTBC:2;
u8 DelayBA:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 73d1e19a59ba..6c557717d8af 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -260,7 +260,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->mimo_pwr_save = 3;
cap_ele->GreenField = 0;
cap_ele->ShortGI20Mhz = 1;
- cap_ele->ShortGI40Mhz = 1;
+ cap_ele->short_gi_40mhz = 1;
cap_ele->TxSTBC = 1;
cap_ele->RxSTBC = 0;
@@ -299,7 +299,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->MCS[1] &= 0x00;
if (ht->iot_action & HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI)
- cap_ele->ShortGI40Mhz = 0;
+ cap_ele->short_gi_40mhz = 0;
if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev)) {
cap_ele->chl_width = 0;
@@ -458,7 +458,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
true : false);
ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false);
- ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false);
+ ht_info->cur_short_gi_40mhz = ((pPeerHTCap->short_gi_40mhz == 1) ? true : false);
ht_info->current_ampdu_enable = ht_info->ampdu_enable;
if (ieee->rtllib_ap_sec_type &&
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 1cfd109881ad..71ecfd0c8ed7 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -131,7 +131,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
&network->bssht.bd_ht_cap_buf[0];
is40M = (ht_cap->chl_width) ? 1 : 0;
isShortGI = (ht_cap->chl_width) ?
- ((ht_cap->ShortGI40Mhz) ? 1 : 0) :
+ ((ht_cap->short_gi_40mhz) ? 1 : 0) :
((ht_cap->ShortGI20Mhz) ? 1 : 0);
max_mcs = ht_get_highest_mcs_rate(ieee, ht_cap->MCS,
--
2.30.2
Rename variable AdvCoding to adv_coding
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 938be9c27e0b..fb3c0dba9d16 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -24,7 +24,7 @@ enum ht_extchnl_offset {
};
struct ht_capab_ele {
- u8 AdvCoding:1;
+ u8 adv_coding:1;
u8 chl_width:1;
u8 MimoPwrSave:2;
u8 GreenField:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index b79ea0b42e44..6eb708ba80ae 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -251,7 +251,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
*len = 26 + 2;
}
- cap_ele->AdvCoding = 0;
+ cap_ele->adv_coding = 0;
if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev))
cap_ele->chl_width = 0;
else
--
2.30.2
Rename variable GreenField to green_field
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 008611e3aace..b9f50d195b13 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -27,7 +27,7 @@ struct ht_capab_ele {
u8 adv_coding:1;
u8 chl_width:1;
u8 mimo_pwr_save:2;
- u8 GreenField:1;
+ u8 green_field:1;
u8 short_gi_20mhz:1;
u8 short_gi_40mhz:1;
u8 TxSTBC:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 3b1c6e24103e..cf3536fdefbd 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -258,7 +258,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->chl_width = 1;
cap_ele->mimo_pwr_save = 3;
- cap_ele->GreenField = 0;
+ cap_ele->green_field = 0;
cap_ele->short_gi_20mhz = 1;
cap_ele->short_gi_40mhz = 1;
--
2.30.2
Rename variable ChlWidth to chl_width
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 +++++-----
drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
drivers/staging/rtl8192e/rtllib_wx.c | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 7e0f64df01ea..938be9c27e0b 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -25,7 +25,7 @@ enum ht_extchnl_offset {
struct ht_capab_ele {
u8 AdvCoding:1;
- u8 ChlWidth:1;
+ u8 chl_width:1;
u8 MimoPwrSave:2;
u8 GreenField:1;
u8 ShortGI20Mhz:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 503ea1e92a7d..b79ea0b42e44 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -253,9 +253,9 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->AdvCoding = 0;
if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev))
- cap_ele->ChlWidth = 0;
+ cap_ele->chl_width = 0;
else
- cap_ele->ChlWidth = 1;
+ cap_ele->chl_width = 1;
cap_ele->MimoPwrSave = 3;
cap_ele->GreenField = 0;
@@ -272,7 +272,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
netdev_dbg(ieee->dev,
"TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n",
- cap_ele->ChlWidth, cap_ele->MaxAMSDUSize, cap_ele->DssCCk);
+ cap_ele->chl_width, cap_ele->MaxAMSDUSize, cap_ele->DssCCk);
if (is_encrypt) {
cap_ele->MPDUDensity = 7;
@@ -302,7 +302,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->ShortGI40Mhz = 0;
if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev)) {
- cap_ele->ChlWidth = 0;
+ cap_ele->chl_width = 0;
cap_ele->MCS[1] = 0;
}
}
@@ -452,7 +452,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
print_hex_dump_bytes("%s: ", __func__, DUMP_PREFIX_NONE,
pPeerHTCap, sizeof(struct ht_capab_ele));
#endif
- ht_set_connect_bw_mode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth),
+ ht_set_connect_bw_mode(ieee, (enum ht_channel_width)(pPeerHTCap->chl_width),
(enum ht_extchnl_offset)(pPeerHTInfo->ExtChlOffset));
ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ?
true : false);
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index ebf8a2fd36d3..ee469c9118b8 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1877,7 +1877,7 @@ static void rtllib_parse_mfie_ht_cap(struct rtllib_info_element *info_element,
ht->bd_bandwidth = (enum ht_channel_width)
(((struct ht_capab_ele *)
- (ht->bd_ht_cap_buf))->ChlWidth);
+ (ht->bd_ht_cap_buf))->chl_width);
} else {
ht->bd_support_ht = false;
ht->bd_ht_1r = false;
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 55a3e4222cd6..1cfd109881ad 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -129,8 +129,8 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
else
ht_cap = (struct ht_capab_ele *)
&network->bssht.bd_ht_cap_buf[0];
- is40M = (ht_cap->ChlWidth) ? 1 : 0;
- isShortGI = (ht_cap->ChlWidth) ?
+ is40M = (ht_cap->chl_width) ? 1 : 0;
+ isShortGI = (ht_cap->chl_width) ?
((ht_cap->ShortGI40Mhz) ? 1 : 0) :
((ht_cap->ShortGI20Mhz) ? 1 : 0);
--
2.30.2
Rename variable DelayBA to delay_ba
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 3f8860e91793..96973c744cd0 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -32,7 +32,7 @@ struct ht_capab_ele {
u8 short_gi_40mhz:1;
u8 tx_stbc:1;
u8 rx_stbc:2;
- u8 DelayBA:1;
+ u8 delay_ba:1;
u8 MaxAMSDUSize:1;
u8 DssCCk:1;
u8 PSMP:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 91c7415d5a2a..5c920a0089c9 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -264,7 +264,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->tx_stbc = 1;
cap_ele->rx_stbc = 0;
- cap_ele->DelayBA = 0;
+ cap_ele->delay_ba = 0;
cap_ele->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
cap_ele->DssCCk = 1;
cap_ele->PSMP = 0;
--
2.30.2
Rename variable MimoPwrSave to mimo_pwr_save
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index fb3c0dba9d16..25cdfdf85991 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -26,7 +26,7 @@ enum ht_extchnl_offset {
struct ht_capab_ele {
u8 adv_coding:1;
u8 chl_width:1;
- u8 MimoPwrSave:2;
+ u8 mimo_pwr_save:2;
u8 GreenField:1;
u8 ShortGI20Mhz:1;
u8 ShortGI40Mhz:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 6eb708ba80ae..73d1e19a59ba 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -257,7 +257,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
else
cap_ele->chl_width = 1;
- cap_ele->MimoPwrSave = 3;
+ cap_ele->mimo_pwr_save = 3;
cap_ele->GreenField = 0;
cap_ele->ShortGI20Mhz = 1;
cap_ele->ShortGI40Mhz = 1;
--
2.30.2
Rename variable RxSTBC to rx_stbc
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index bd66df620793..3f8860e91793 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -31,7 +31,7 @@ struct ht_capab_ele {
u8 short_gi_20mhz:1;
u8 short_gi_40mhz:1;
u8 tx_stbc:1;
- u8 RxSTBC:2;
+ u8 rx_stbc:2;
u8 DelayBA:1;
u8 MaxAMSDUSize:1;
u8 DssCCk:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index d51a0daa9196..91c7415d5a2a 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -263,7 +263,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->short_gi_40mhz = 1;
cap_ele->tx_stbc = 1;
- cap_ele->RxSTBC = 0;
+ cap_ele->rx_stbc = 0;
cap_ele->DelayBA = 0;
cap_ele->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
cap_ele->DssCCk = 1;
--
2.30.2
Rename variable TxSTBC to tx_stbc
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index b9f50d195b13..bd66df620793 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -30,7 +30,7 @@ struct ht_capab_ele {
u8 green_field:1;
u8 short_gi_20mhz:1;
u8 short_gi_40mhz:1;
- u8 TxSTBC:1;
+ u8 tx_stbc:1;
u8 RxSTBC:2;
u8 DelayBA:1;
u8 MaxAMSDUSize:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index cf3536fdefbd..d51a0daa9196 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -262,7 +262,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->short_gi_20mhz = 1;
cap_ele->short_gi_40mhz = 1;
- cap_ele->TxSTBC = 1;
+ cap_ele->tx_stbc = 1;
cap_ele->RxSTBC = 0;
cap_ele->DelayBA = 0;
cap_ele->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
--
2.30.2
Rename variable LSigTxopProtect to lsig_txop_protect
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index d8fb2bda91e4..7e0f64df01ea 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -37,7 +37,7 @@ struct ht_capab_ele {
u8 DssCCk:1;
u8 PSMP:1;
u8 Rsvd1:1;
- u8 LSigTxopProtect:1;
+ u8 lsig_txop_protect:1;
u8 MaxRxAMPDUFactor:2;
u8 MPDUDensity:3;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 837911934462..503ea1e92a7d 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -268,7 +268,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
cap_ele->DssCCk = 1;
cap_ele->PSMP = 0;
- cap_ele->LSigTxopProtect = 0;
+ cap_ele->lsig_txop_protect = 0;
netdev_dbg(ieee->dev,
"TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n",
--
2.30.2
Rename variable MaxAMSDUSize to max_amsdu_size
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[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 96973c744cd0..e0906e4588c2 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -33,7 +33,7 @@ struct ht_capab_ele {
u8 tx_stbc:1;
u8 rx_stbc:2;
u8 delay_ba:1;
- u8 MaxAMSDUSize:1;
+ u8 max_amsdu_size:1;
u8 DssCCk:1;
u8 PSMP:1;
u8 Rsvd1:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 5c920a0089c9..7b08e549726b 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -265,14 +265,14 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->tx_stbc = 1;
cap_ele->rx_stbc = 0;
cap_ele->delay_ba = 0;
- cap_ele->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
+ cap_ele->max_amsdu_size = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
cap_ele->DssCCk = 1;
cap_ele->PSMP = 0;
cap_ele->lsig_txop_protect = 0;
netdev_dbg(ieee->dev,
- "TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n",
- cap_ele->chl_width, cap_ele->MaxAMSDUSize, cap_ele->DssCCk);
+ "TX HT cap/info ele BW=%d max_amsdu_size:%d DssCCk:%d\n",
+ cap_ele->chl_width, cap_ele->max_amsdu_size, cap_ele->DssCCk);
if (is_encrypt) {
cap_ele->MPDUDensity = 7;
--
2.30.2
Rename variable DssCCk to dss_cck
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[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 c1446081956d..a6e0077630c7 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -34,7 +34,7 @@ struct ht_capab_ele {
u8 rx_stbc:2;
u8 delay_ba:1;
u8 max_amsdu_size:1;
- u8 DssCCk:1;
+ u8 dss_cck:1;
u8 PSMP:1;
u8 Rsvd1:1;
u8 lsig_txop_protect:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 963d69680049..9b0a981f6f22 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -266,13 +266,13 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->rx_stbc = 0;
cap_ele->delay_ba = 0;
cap_ele->max_amsdu_size = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
- cap_ele->DssCCk = 1;
+ cap_ele->dss_cck = 1;
cap_ele->PSMP = 0;
cap_ele->lsig_txop_protect = 0;
netdev_dbg(ieee->dev,
- "TX HT cap/info ele BW=%d max_amsdu_size:%d DssCCk:%d\n",
- cap_ele->chl_width, cap_ele->max_amsdu_size, cap_ele->DssCCk);
+ "TX HT cap/info ele BW=%d max_amsdu_size:%d dss_cck:%d\n",
+ cap_ele->chl_width, cap_ele->max_amsdu_size, cap_ele->dss_cck);
if (is_encrypt) {
cap_ele->mpdu_density = 7;
--
2.30.2
Rename variable MPDUDensity to mpdu_density
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[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 425df93486b3..5cea0d8ee544 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -40,7 +40,7 @@ struct ht_capab_ele {
u8 lsig_txop_protect:1;
u8 max_rx_ampdu_factor:2;
- u8 MPDUDensity:3;
+ u8 mpdu_density:3;
u8 Rsvd2:3;
u8 MCS[16];
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 516e48073dc7..85f52d09304d 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -275,11 +275,11 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->chl_width, cap_ele->max_amsdu_size, cap_ele->DssCCk);
if (is_encrypt) {
- cap_ele->MPDUDensity = 7;
+ cap_ele->mpdu_density = 7;
cap_ele->max_rx_ampdu_factor = 2;
} else {
cap_ele->max_rx_ampdu_factor = 3;
- cap_ele->MPDUDensity = 0;
+ cap_ele->mpdu_density = 0;
}
memcpy(cap_ele->MCS, ieee->reg_dot11ht_oper_rate_set, 16);
@@ -479,7 +479,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
HT_AGG_SIZE_32K);
}
- ht_info->current_mpdu_density = pPeerHTCap->MPDUDensity;
+ ht_info->current_mpdu_density = pPeerHTCap->mpdu_density;
if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K)
ht_info->current_ampdu_enable = false;
--
2.30.2
On 4/29/24 01:00, Tree Davies wrote:
> This series renames 18 variables found in rtl819x_HTProc.c
> Thank you in advance to reviewers.
> ~Tree
>
> Tree Davies (18):
> Staging: rtl8192e: Rename variable CurSTAExtChnlOffset
> Staging: rtl8192e: Rename variable CurrentAMPDUFactor
> Staging: rtl8192e: Rename variable OptMode
> Staging: rtl8192e: Rename variable LSigTxopProtect
> Staging: rtl8192e: Rename variable ChlWidth
> Staging: rtl8192e: Rename variable AdvCoding
> Staging: rtl8192e: Rename variable MimoPwrSave
> Staging: rtl8192e: Rename variable ShortGI40Mhz
> Staging: rtl8192e: Rename variable ShortGI20Mhz
> Staging: rtl8192e: Rename variable GreenField
> Staging: rtl8192e: Rename variable TxSTBC
> Staging: rtl8192e: Rename variable RxSTBC
> Staging: rtl8192e: Rename variable DelayBA
> Staging: rtl8192e: Rename variable MaxAMSDUSize
> Staging: rtl8192e: Rename variable MaxRxAMPDUFactor
> Staging: rtl8192e: Rename variable MPDUDensity
> Staging: rtl8192e: Rename variable ExtHTCapInfo
> Staging: rtl8192e: Rename variable DssCCk
>
> drivers/staging/rtl8192e/rtl819x_HT.h | 36 ++++-----
> drivers/staging/rtl8192e/rtl819x_HTProc.c | 84 ++++++++++----------
> drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
> drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
> drivers/staging/rtl8192e/rtllib_tx.c | 2 +-
> drivers/staging/rtl8192e/rtllib_wx.c | 8 +-
> 6 files changed, 67 insertions(+), 67 deletions(-)
>
Tested-by: Philipp Hortmann <[email protected]>