Re: [PATCH] staging: vt6655: fix camelcase in wCurrentRate
On Sat, Nov 13, 2021 at 06:09:42PM +0100, Alberto Merciai wrote: > Signed-off-by: Alberto Merciai > --- > drivers/staging/vt6655/device.h | 2 +- > drivers/staging/vt6655/device_main.c | 12 +-- > drivers/staging/vt6655/rxtx.c| 134 +-- > 3 files changed, 74 insertions(+), 74 deletions(-) > > diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h > index 29f354ced563..f5dee7ad99cd 100644 > --- a/drivers/staging/vt6655/device.h > +++ b/drivers/staging/vt6655/device.h > @@ -208,7 +208,7 @@ struct vnt_private { > unsigned char byPreambleType; > unsigned char byShortPreamble; > > - unsigned short wCurrentRate; > + unsigned short current_rate; > unsigned char byShortRetryLimit; > unsigned char byLongRetryLimit; > enum nl80211_iftype op_mode; > diff --git a/drivers/staging/vt6655/device_main.c > b/drivers/staging/vt6655/device_main.c > index 41cbec4134b0..2c5398b128df 100644 > --- a/drivers/staging/vt6655/device_main.c > +++ b/drivers/staging/vt6655/device_main.c > @@ -213,7 +213,7 @@ static void device_init_registers(struct vnt_private > *priv) > > priv->bNonERPPresent = false; > priv->bBarkerPreambleMd = false; > - priv->wCurrentRate = RATE_1M; > + priv->current_rate = RATE_1M; > priv->byTopOFDMBasicRate = RATE_24M; > priv->byTopCCKBasicRate = RATE_1M; > > @@ -369,7 +369,7 @@ static void device_init_registers(struct vnt_private > *priv) > > /* Set BB and packet type at the same time. */ > /* Set Short Slot Time, xIFS, and RSPINF. */ > - priv->wCurrentRate = RATE_54M; > + priv->current_rate = RATE_54M; > > priv->bRadioOff = false; > > @@ -1382,11 +1382,11 @@ static int vnt_config(struct ieee80211_hw *hw, u32 > changed) > > if (changed & IEEE80211_CONF_CHANGE_POWER) { > if (priv->byBBType == BB_TYPE_11B) > - priv->wCurrentRate = RATE_1M; > + priv->current_rate = RATE_1M; > else > - priv->wCurrentRate = RATE_54M; > + priv->current_rate = RATE_54M; > > - RFbSetPower(priv, priv->wCurrentRate, > + RFbSetPower(priv, priv->current_rate, > conf->chandef.chan->hw_value); > } > > @@ -1448,7 +1448,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw > *hw, > } > > if (changed & BSS_CHANGED_TXPOWER) > - RFbSetPower(priv, priv->wCurrentRate, > + RFbSetPower(priv, priv->current_rate, > conf->chandef.chan->hw_value); > > if (changed & BSS_CHANGED_BEACON_ENABLED) { > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c > index cfab64d2b312..17795ebcdfbc 100644 > --- a/drivers/staging/vt6655/rxtx.c > +++ b/drivers/staging/vt6655/rxtx.c > @@ -97,7 +97,7 @@ s_vFillRTSHead( > bool bNeedAck, > bool bDisCRC, > struct ieee80211_hdr *hdr, > - unsigned short wCurrentRate, > + unsigned short current_rate, > unsigned char byFBOption > ); > > @@ -114,7 +114,7 @@ s_vGenerateTxParameter( > bool bNeedACK, > unsigned intuDMAIdx, > void *psEthHeader, > - unsigned short wCurrentRate > + unsigned short current_rate > ); > > static unsigned int > @@ -136,7 +136,7 @@ s_uFillDataHead( > unsigned int cbLastFragmentSize, > unsigned int uMACfragNum, > unsigned char byFBOption, > - unsigned short wCurrentRate, > + unsigned short current_rate, > bool is_pspoll > ); > > @@ -197,7 +197,7 @@ s_uGetRTSCTSRsvTime( > unsigned char byRTSRsvType, > unsigned char byPktType, > unsigned int cbFrameLength, > - unsigned short wCurrentRate > + unsigned short current_rate > ) > { > unsigned int uRrvTime = 0; > @@ -206,7 +206,7 @@ s_uGetRTSCTSRsvTime( > unsigned int uAckTime = 0; > unsigned int uDataTime = 0; > > - uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, > cbFrameLength, wCurrentRate); > + uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, > cbFrameLength, current_rate); > if (byRTSRsvType == 0) { /* RTSTxRrvTime_bb */ > uRTSTime = bb_get_frame_time(pDevice->byPreambleType, > byPktType, 20, pDevice->byTopCCKBasicRate); > uAckTime = bb_get_frame_time(pDevice->byPreambleType, > byPktType, 14, pDevice->byTopCCKBasicRate); > @@ -440,7 +440,7 @@ s_uFillDataHead( > unsigned int cbLastFragmentSize, > unsigned int uMACfragNum, > unsigned char byFBOption, > - unsigned short wCurrentRate, > + unsigned short current_rate, > bool is_pspoll > ) > { > @@ -451,7 +451,7 @@ s_uFillDataHead( > if (byFBOption == AUTO_FB_NONE) { > struct vnt_tx_datahead_g *buf = pTxDataHead; > /* Get SignalField, ServiceField &
[PATCH] staging: vt6655: fix camelcase in wCurrentRate
Signed-off-by: Alberto Merciai --- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 12 +-- drivers/staging/vt6655/rxtx.c| 134 +-- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 29f354ced563..f5dee7ad99cd 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -208,7 +208,7 @@ struct vnt_private { unsigned char byPreambleType; unsigned char byShortPreamble; - unsigned short wCurrentRate; + unsigned short current_rate; unsigned char byShortRetryLimit; unsigned char byLongRetryLimit; enum nl80211_iftype op_mode; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 41cbec4134b0..2c5398b128df 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -213,7 +213,7 @@ static void device_init_registers(struct vnt_private *priv) priv->bNonERPPresent = false; priv->bBarkerPreambleMd = false; - priv->wCurrentRate = RATE_1M; + priv->current_rate = RATE_1M; priv->byTopOFDMBasicRate = RATE_24M; priv->byTopCCKBasicRate = RATE_1M; @@ -369,7 +369,7 @@ static void device_init_registers(struct vnt_private *priv) /* Set BB and packet type at the same time. */ /* Set Short Slot Time, xIFS, and RSPINF. */ - priv->wCurrentRate = RATE_54M; + priv->current_rate = RATE_54M; priv->bRadioOff = false; @@ -1382,11 +1382,11 @@ static int vnt_config(struct ieee80211_hw *hw, u32 changed) if (changed & IEEE80211_CONF_CHANGE_POWER) { if (priv->byBBType == BB_TYPE_11B) - priv->wCurrentRate = RATE_1M; + priv->current_rate = RATE_1M; else - priv->wCurrentRate = RATE_54M; + priv->current_rate = RATE_54M; - RFbSetPower(priv, priv->wCurrentRate, + RFbSetPower(priv, priv->current_rate, conf->chandef.chan->hw_value); } @@ -1448,7 +1448,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, } if (changed & BSS_CHANGED_TXPOWER) - RFbSetPower(priv, priv->wCurrentRate, + RFbSetPower(priv, priv->current_rate, conf->chandef.chan->hw_value); if (changed & BSS_CHANGED_BEACON_ENABLED) { diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index cfab64d2b312..17795ebcdfbc 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -97,7 +97,7 @@ s_vFillRTSHead( bool bNeedAck, bool bDisCRC, struct ieee80211_hdr *hdr, - unsigned short wCurrentRate, + unsigned short current_rate, unsigned char byFBOption ); @@ -114,7 +114,7 @@ s_vGenerateTxParameter( bool bNeedACK, unsigned intuDMAIdx, void *psEthHeader, - unsigned short wCurrentRate + unsigned short current_rate ); static unsigned int @@ -136,7 +136,7 @@ s_uFillDataHead( unsigned int cbLastFragmentSize, unsigned int uMACfragNum, unsigned char byFBOption, - unsigned short wCurrentRate, + unsigned short current_rate, bool is_pspoll ); @@ -197,7 +197,7 @@ s_uGetRTSCTSRsvTime( unsigned char byRTSRsvType, unsigned char byPktType, unsigned int cbFrameLength, - unsigned short wCurrentRate + unsigned short current_rate ) { unsigned int uRrvTime = 0; @@ -206,7 +206,7 @@ s_uGetRTSCTSRsvTime( unsigned int uAckTime = 0; unsigned int uDataTime = 0; - uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, cbFrameLength, wCurrentRate); + uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, cbFrameLength, current_rate); if (byRTSRsvType == 0) { /* RTSTxRrvTime_bb */ uRTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 20, pDevice->byTopCCKBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); @@ -440,7 +440,7 @@ s_uFillDataHead( unsigned int cbLastFragmentSize, unsigned int uMACfragNum, unsigned char byFBOption, - unsigned short wCurrentRate, + unsigned short current_rate, bool is_pspoll ) { @@ -451,7 +451,7 @@ s_uFillDataHead( if (byFBOption == AUTO_FB_NONE) { struct vnt_tx_datahead_g *buf = pTxDataHead; /* Get SignalField, ServiceField & Length */ - vnt_get_phy_field(pDevice, cbFrameLength, wCurrentRate, + vnt_get_phy_field(pDevice, cbFrameLength, current_rate,