Staging: rtl8192e: Rename variables in rtl819x_HTProc.c
cover Staging: rtl8192e: Rename variables in rtl819x_HTProc.c
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(-)
Signature · 1 line
2.30.2
PATCH 1/18 Staging: rtl8192e: Rename variable CurSTAExtChnlOffset
Rename variable CurSTAExtChnlOffset to cur_sta_ext_chnl_offset to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 12 ++++++------ drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -109,7 +109,7 @@ struct rt_hi_throughput {u8 forced_ampdu_factor;u8 forced_mpdu_density;u8 current_op_mode; -enum ht_extchnl_offset CurSTAExtChnlOffset; +enum ht_extchnl_offset cur_sta_ext_chnl_offset;u8 cur_tx_bw40mhz;u8 sw_bw_in_progress;u8 current_rt2rt_aggregation;
drivers/staging/rtl8192e/rtl819x_HTProc.c +6 -6
@@ -638,10 +638,10 @@ static void ht_set_connect_bw_mode_callback(struct rtllib_device *ieee)struct rt_hi_throughput *ht_info = ieee->ht_info;if (ht_info->cur_bw_40mhz) { -if (ht_info->CurSTAExtChnlOffset ==HT_EXTCHNL_OFFSET_UPPER ) +if (ht_info->cur_sta_ext_chnl_offset ==HT_EXTCHNL_OFFSET_UPPER ) ieee->set_chan (ieee->dev, ieee->current_network.channel +2 ); -else if (ht_info->CurSTAExtChnlOffset == +else if (ht_info->cur_sta_ext_chnl_offset ==HT_EXTCHNL_OFFSET_LOWER ) ieee->set_chan (ieee->dev, ieee->current_network.channel -2 );
@@ -650,7 +650,7 @@ static void ht_set_connect_bw_mode_callback(struct rtllib_device *ieee) ieee->current_network.channel); ieee->set_bw_mode_handler (ieee->dev,HT_CHANNEL_WIDTH_20_40 , - ht_info->CurSTAExtChnlOffset); + ht_info->cur_sta_ext_chnl_offset); }else { ieee->set_chan (ieee->dev, ieee->current_network.channel); ieee->set_bw_mode_handler(ieee->dev, HT_CHANNEL_WIDTH_20,
@@ -680,14 +680,14 @@ void ht_set_connect_bw_mode(struct rtllib_device *ieee,if (Offset ==HT_EXTCHNL_OFFSET_UPPER || Offset ==HT_EXTCHNL_OFFSET_LOWER ) { ht_info->cur_bw_40mhz = true; - ht_info->CurSTAExtChnlOffset = Offset; + ht_info->cur_sta_ext_chnl_offset = Offset; }else { ht_info->cur_bw_40mhz = false; - ht_info->CurSTAExtChnlOffset =HT_EXTCHNL_OFFSET_NO_EXT ; + ht_info->cur_sta_ext_chnl_offset =HT_EXTCHNL_OFFSET_NO_EXT ; } }else { ht_info->cur_bw_40mhz = false; - ht_info->CurSTAExtChnlOffset =HT_EXTCHNL_OFFSET_NO_EXT ; + ht_info->cur_sta_ext_chnl_offset =HT_EXTCHNL_OFFSET_NO_EXT ; } netdev_dbg(ieee->dev, "%s():ht_info->bCurBW40MHz:%x\n", __func__,
drivers/staging/rtl8192e/rtllib_softmac_wx.c +1 -1
@@ -319,7 +319,7 @@ void rtllib_wx_sync_scan_wq(void *data)if (ieee->ht_info->current_ht_support && ieee->ht_info->enable_ht && ieee->ht_info->cur_bw_40mhz) { b40M =1 ; - chan_offset = ieee->ht_info->CurSTAExtChnlOffset; + chan_offset = ieee->ht_info->cur_sta_ext_chnl_offset; bandwidth = (enum ht_channel_width )ieee->ht_info->cur_bw_40mhz; ieee->set_bw_mode_handler (ieee->dev,HT_CHANNEL_WIDTH_20 ,HT_EXTCHNL_OFFSET_NO_EXT );
Signature · 1 line
2.30.2
PATCH 2/18 Staging: rtl8192e: Rename variable CurrentAMPDUFactor
In reply to Tree DaviesRename variable CurrentAMPDUFactor to current_ampdu_factor to fix checkpatch warning Avoid CamelCase.
--- 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(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +4 -4
@@ -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));
drivers/staging/rtl8192e/rtllib_tx.c +1 -1
@@ -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; } }
Signature · 1 line
2.30.2
PATCH 3/18 Staging: rtl8192e: Rename variable OptMode
In reply to Tree DaviesRename variable OptMode to opt_mode
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +2 -2
@@ -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);
Signature · 1 line
2.30.2
PATCH 4/18 Staging: rtl8192e: Rename variable LSigTxopProtect
In reply to Tree DaviesRename variable LSigTxopProtect to lsig_txop_protect to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -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",
Signature · 1 line
2.30.2
PATCH 5/18 Staging: rtl8192e: Rename variable ChlWidth
In reply to Tree DaviesRename variable ChlWidth to chl_width
to fix checkpatch warning Avoid CamelCase.
--- 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(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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 ;
drivers/staging/rtl8192e/rtl819x_HTProc.c +5 -5
@@ -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);
drivers/staging/rtl8192e/rtllib_rx.c +1 -1
@@ -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;
drivers/staging/rtl8192e/rtllib_wx.c +2 -2
@@ -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 );
Signature · 1 line
2.30.2
PATCH 6/18 Staging: rtl8192e: Rename variable AdvCoding
In reply to Tree DaviesRename variable AdvCoding to adv_coding
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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 ;
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -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
Signature · 1 line
2.30.2
PATCH 7/18 Staging: rtl8192e: Rename variable MimoPwrSave
In reply to Tree DaviesRename variable MimoPwrSave to mimo_pwr_save
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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 ;
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -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 ;
Signature · 1 line
2.30.2
PATCH 8/18 Staging: rtl8192e: Rename variable ShortGI40Mhz
In reply to Tree DaviesRename variable ShortGI40Mhz to short_gi_40mhz
to fix checkpatch warning Avoid CamelCase.
--- 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(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +3 -3
@@ -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 &&
drivers/staging/rtl8192e/rtllib_wx.c +1 -1
@@ -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,
Signature · 1 line
2.30.2
PATCH 9/18 Staging: rtl8192e: Rename variable ShortGI20Mhz
In reply to Tree DaviesRename variable ShortGI20Mhz to short_gi_20mhz
to fix checkpatch warning Avoid CamelCase.
--- 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(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +2 -2
@@ -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;
drivers/staging/rtl8192e/rtllib_wx.c +1 -1
@@ -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 );
Signature · 1 line
2.30.2
PATCH 10/18 Staging: rtl8192e: Rename variable GreenField
In reply to Tree DaviesRename variable GreenField to green_field
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -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 ;
Signature · 1 line
2.30.2
PATCH 11/18 Staging: rtl8192e: Rename variable TxSTBC
In reply to Tree DaviesRename variable TxSTBC to tx_stbc
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -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 ;
Signature · 1 line
2.30.2
PATCH 12/18 Staging: rtl8192e: Rename variable RxSTBC
In reply to Tree DaviesRename variable RxSTBC to rx_stbc
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -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 ;
Signature · 1 line
2.30.2
PATCH 13/18 Staging: rtl8192e: Rename variable DelayBA
In reply to Tree DaviesRename variable DelayBA to delay_ba
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -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 ;
Signature · 1 line
2.30.2
PATCH 14/18 Staging: rtl8192e: Rename variable MaxAMSDUSize
In reply to Tree DaviesRename variable MaxAMSDUSize to max_amsdu_size
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +3 -3
@@ -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 ;
Signature · 1 line
2.30.2
PATCH 15/18 Staging: rtl8192e: Rename variable MaxRxAMPDUFactor
In reply to Tree DaviesRename variable MaxRxAMPDUFactor to max_rx_ampdu_factor to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +5 -5
@@ -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;
Signature · 1 line
2.30.2
PATCH 16/18 Staging: rtl8192e: Rename variable MPDUDensity
In reply to Tree DaviesRename variable MPDUDensity to mpdu_density
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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 ];
drivers/staging/rtl8192e/rtl819x_HTProc.c +3 -3
@@ -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;
Signature · 1 line
2.30.2
PATCH 17/18 Staging: rtl8192e: Rename variable ExtHTCapInfo
In reply to Tree DaviesRename variable ExtHTCapInfo to ext_ht_cap_info
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -45,7 +45,7 @@ struct ht_capab_ele {u8 MCS [16 ]; -u16 ExtHTCapInfo; +u16 ext_ht_cap_info;u8 TxBFCap[4 ];
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -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 ;
Signature · 1 line
2.30.2
PATCH 18/18 Staging: rtl8192e: Rename variable DssCCk
In reply to Tree DaviesRename variable DssCCk to dss_cck
to fix checkpatch warning Avoid CamelCase.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -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;
drivers/staging/rtl8192e/rtl819x_HTProc.c +3 -3
@@ -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 ;
Signature · 1 line
2.30.2
Quoted 24 lines · Tree Davies
This series renames 18 variables found in
rtl819x_HTProc.cThank you in advance to reviewers.
~TreeTree 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
Quoted 8 lines
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(-)