staging: rtl8192e: Rename variable bCurBW40MHz
PATCH 1/1 staging: rtl8192e: Rename variable bCurBW40MHz
This patch renames variable bCurBW40MHz to bcur_bw_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 | 20 ++++++++++---------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 ++-- drivers/staging/rtl8192e/rtllib_tx.c | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -95,7 +95,7 @@ struct rt_hi_throughput {u8 enable_ht;u8 bCurrentHTSupport;u8 bRegBW40MHz; -u8 bCurBW40MHz; +u8 bcur_bw_40MHz;u8 bRegShortGI40MHz;u8 bCurShortGI40MHz;u8 bRegShortGI20MHz;
drivers/staging/rtl8192e/rtl819x_HTProc.c +10 -10
@@ -107,8 +107,8 @@ static u16 HTMcsToDataRate(struct rtllib_device *ieee, u8 nMcsRate) {struct rt_hi_throughput *ht_info = ieee->ht_info; -u8 is40MHz = (ht_info->bCurBW40MHz) ?1 :0 ; -u8 isShortGI = (ht_info->bCurBW40MHz) ? +u8 is40MHz = (ht_info->bcur_bw_40MHz) ?1 :0 ; +u8 isShortGI = (ht_info->bcur_bw_40MHz) ? ((ht_info->bCurShortGI40MHz) ?1 :0 ) : ((ht_info->bCurShortGI20MHz) ?1 :0 );return MCS_DATA_RATE [is40MHz][isShortGI][(nMcsRate &0x7f )];
@@ -623,7 +623,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ht_info->bCurrentHTSupport = false; - ht_info->bCurBW40MHz = false; + ht_info->bcur_bw_40MHz = false; ht_info->cur_tx_bw40mhz = false; ht_info->bCurShortGI20MHz = false;
@@ -778,7 +778,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) ht_info->bCurrentHTSupport = true; ht_info->bCurSuppCCK = ht_info->bRegSuppCCK; - ht_info->bCurBW40MHz = ht_info->bRegBW40MHz; + ht_info->bcur_bw_40MHz = ht_info->bRegBW40MHz; ht_info->bCurShortGI20MHz = ht_info->bRegShortGI20MHz; ht_info->bCurShortGI40MHz = ht_info->bRegShortGI40MHz;
@@ -821,7 +821,7 @@ static void HTSetConnectBwModeCallback(struct rtllib_device *ieee) {struct rt_hi_throughput *ht_info = ieee->ht_info; -if (ht_info->bCurBW40MHz) { +if (ht_info->bcur_bw_40MHz) {if (ht_info->CurSTAExtChnlOffset ==HT_EXTCHNL_OFFSET_UPPER ) ieee->set_chan (ieee->dev, ieee->current_network.channel +2 );
@@ -866,19 +866,19 @@ void HTSetConnectBwMode(struct rtllib_device *ieee, Offset =HT_EXTCHNL_OFFSET_NO_EXT ;if (Offset ==HT_EXTCHNL_OFFSET_UPPER || Offset ==HT_EXTCHNL_OFFSET_LOWER ) { - ht_info->bCurBW40MHz = true; + ht_info->bcur_bw_40MHz = true; ht_info->CurSTAExtChnlOffset = Offset; }else { - ht_info->bCurBW40MHz = false; + ht_info->bcur_bw_40MHz = false; ht_info->CurSTAExtChnlOffset =HT_EXTCHNL_OFFSET_NO_EXT ; } }else { - ht_info->bCurBW40MHz = false; + ht_info->bcur_bw_40MHz = false; ht_info->CurSTAExtChnlOffset =HT_EXTCHNL_OFFSET_NO_EXT ; } -netdev_dbg (ieee->dev,"%s():ht_info->bCurBW40MHz:%x\n" , __func__, - ht_info->bCurBW40MHz); +netdev_dbg (ieee->dev,"%s():ht_info->bcur_bw_40MHz:%x\n" , __func__, + ht_info->bcur_bw_40MHz); ht_info->sw_bw_in_progress = true;
drivers/staging/rtl8192e/rtllib_softmac_wx.c +2 -2
@@ -331,10 +331,10 @@ void rtllib_wx_sync_scan_wq(void *data) ieee->ScanOperationBackupHandler (ieee->dev,SCAN_OPT_BACKUP );if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht && - ieee->ht_info->bCurBW40MHz) { + ieee->ht_info->bcur_bw_40MHz) { b40M =1 ; chan_offset = ieee->ht_info->CurSTAExtChnlOffset; - bandwidth = (enum ht_channel_width )ieee->ht_info->bCurBW40MHz; + bandwidth = (enum ht_channel_width )ieee->ht_info->bcur_bw_40MHz; ieee->set_bw_mode_handler (ieee->dev,HT_CHANNEL_WIDTH_20 ,HT_EXTCHNL_OFFSET_NO_EXT ); }
drivers/staging/rtl8192e/rtllib_tx.c +5 -5
@@ -362,9 +362,9 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,return ; } -if (ht_info->bCurBW40MHz && ht_info->bCurShortGI40MHz) +if (ht_info->bcur_bw_40MHz && ht_info->bCurShortGI40MHz) tcb_desc->bUseShortGI = true; -else if (!ht_info->bCurBW40MHz && ht_info->bCurShortGI20MHz) +else if (!ht_info->bcur_bw_40MHz && ht_info->bCurShortGI20MHz) tcb_desc->bUseShortGI = true; }
@@ -383,7 +383,7 @@ static void rtllib_query_BandwidthMode(struct rtllib_device *ieee,if ((tcb_desc->data_rate &0x80 ) ==0 )return ; -if (ht_info->bCurBW40MHz && ht_info->cur_tx_bw40mhz && +if (ht_info->bcur_bw_40MHz && ht_info->cur_tx_bw40mhz && !ieee->bandwidth_auto_switch.bforced_tx20Mhz) tcb_desc->bPacketBW = true; }
@@ -441,9 +441,9 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee,if (ht_info->bCurrentHTSupport && ht_info->enable_ht) {u8 HTOpMode = ht_info->current_op_mode; -if ((ht_info->bCurBW40MHz && (HTOpMode ==2 || +if ((ht_info->bcur_bw_40MHz && (HTOpMode ==2 || HTOpMode ==3 )) || - (!ht_info->bCurBW40MHz && HTOpMode ==3 )) { + (!ht_info->bcur_bw_40MHz && HTOpMode ==3 )) { tcb_desc->rts_rate =MGN_24M ; tcb_desc->bRTSEnable = true;break ;
Signature · 1 line
2.30.2