staging: rtl8192e: Rename and remove variables in rtl819x_HTProc.c
cover staging: rtl8192e: Rename and remove variables in rtl819x_HTProc.c
Rename and remove variables to avoid CamelCase which is not accepted by checkpatch.
Tested with rtl8192e
Transferred this patch over wlan connection of rtl8192e
Philipp Hortmann (10):
staging: rtl8192e: Rename eRFPowerState, eRfOff and eRfOn
staging: rtl8192e: Rename eRfSleep, eRfPowerStateToSet and RfOffReason
staging: rtl8192e: Rename dot11Cur..., bCurTxBW40MHz and
bCurrentRT2...
staging: rtl8192e: Rename bSwBwInPro..., bRegRT2RTAg... and
bCurrentRT...
staging: rtl8192e: Rename szRT2RTAggBuffer, bRegRxRe... and
bCurRxReo...
staging: rtl8192e: Rename RxRe...WinSize, RxReorder... and
RxReorderDr...
staging: rtl8192e: Rename PeerMimoPs, IOTAction and IOTRaFunc
staging: rtl8192e: Rename SelfMimoPs, CurrentOpMode and bForcedShortGI
staging: rtl8192e: Rename CurrentMPDU..., ForcedAMPDU... and
ForcedMPDU...
staging: rtl8192e: Remove unused variables ForcedAMSDUMaxSize, ...
.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 24 ++-- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 28 ++-- .../staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 8 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 56 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 28 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 4 +- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 24 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 16 +-- drivers/staging/rtl8192e/rtl819x_BAProc.c | 4 +- drivers/staging/rtl8192e/rtl819x_HT.h | 53 +++----- drivers/staging/rtl8192e/rtl819x_HTProc.c | 120 +++++++++--------- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 10 +- drivers/staging/rtl8192e/rtllib_rx.c | 10 +- drivers/staging/rtl8192e/rtllib_softmac.c | 32 ++--- drivers/staging/rtl8192e/rtllib_tx.c | 22 ++-- 18 files changed, 215 insertions(+), 230 deletions(-)
Signature · 1 line
2.37.3
PATCH 1/10 staging: rtl8192e: Rename eRFPowerState, eRfOff and eRfOn
Rename variable eRFPowerState to rf_power_state, eRfOff to rf_off and eRfOn to rf_on to avoid CamelCase which is not accepted by checkpatch. Omit the upfront "e" as no RFPowerState, RfOff and RfOn exist and it makes the variables unnecessary long.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +++---- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 26 +++++++++---------- .../staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 26 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 4 +-- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 18 ++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 12 ++++----- drivers/staging/rtl8192e/rtllib.h | 6 ++--- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++--- 11 files changed, 61 insertions(+), 61 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +5 -5
@@ -625,7 +625,7 @@ bool rtl92e_start_adapter(struct net_device *dev) priv->pFirmware->status =FW_STATUS_0_INIT ;if (priv->RegRfOff) - priv->rtllib->eRFPowerState = eRfOff; + priv->rtllib->rf_power_state = rf_off; ulRegRead =rtl92e_readl (dev,CPU_GEN );if (priv->pFirmware->status ==FW_STATUS_0_INIT )
@@ -757,13 +757,13 @@ bool rtl92e_start_adapter(struct net_device *dev)rtl92e_writeb (dev,0x87 ,0x0 );if (priv->RegRfOff) { -rtl92e_set_rf_state (dev, eRfOff,RF_CHANGE_BY_SW ); +rtl92e_set_rf_state (dev, rf_off,RF_CHANGE_BY_SW ); }else if (priv->rtllib->RfOffReason >RF_CHANGE_BY_PS ) { -rtl92e_set_rf_state (dev, eRfOff, priv->rtllib->RfOffReason); +rtl92e_set_rf_state (dev, rf_off, priv->rtllib->RfOffReason); }else if (priv->rtllib->RfOffReason >=RF_CHANGE_BY_IPS ) { -rtl92e_set_rf_state (dev, eRfOff, priv->rtllib->RfOffReason); +rtl92e_set_rf_state (dev, rf_off, priv->rtllib->RfOffReason); }else { - priv->rtllib->eRFPowerState = eRfOn; + priv->rtllib->rf_power_state = rf_on; priv->rtllib->RfOffReason =0 ; }
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +13 -13
@@ -200,7 +200,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,if (!rtl92e_is_legal_rf_path (dev, eRFPath))return ; -if (priv->rtllib->eRFPowerState != eRfOn && !priv->being_init_adapter) +if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter)return ;if (priv->Rf_Mode == RF_OP_By_FW) {
@@ -237,7 +237,7 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,if (!rtl92e_is_legal_rf_path (dev, eRFPath))return 0 ; -if (priv->rtllib->eRFPowerState != eRfOn && !priv->being_init_adapter) +if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter)return 0 ;mutex_lock (&priv->rf_mutex);if (priv->Rf_Mode == RF_OP_By_FW) {
@@ -1301,7 +1301,7 @@ void rtl92e_set_rf_off(struct net_device *dev) }static bool _rtl92e_set_rf_power_state (struct net_device *dev, -enum rt_rf_power_state eRFPowerState) +enum rt_rf_power_state rf_power_state) {struct r8192_priv *priv =rtllib_priv (dev); struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
@@ -1316,9 +1316,9 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,switch (priv->rf_chip) {case RF_8256 : -switch (eRFPowerState) { -case eRfOn: -if ((priv->rtllib->eRFPowerState == eRfOff) && +switch (rf_power_state) { +case rf_on: +if ((priv->rtllib->rf_power_state == rf_off) &&RT_IN_PS_LEVEL (pPSC,RT_RF_OFF_LEVL_HALT_NIC )) {bool rtstatus;u32 InitilizeCount =3 ;
@@ -1364,7 +1364,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,break ;case eRfSleep: -if (priv->rtllib->eRFPowerState == eRfOff) +if (priv->rtllib->rf_power_state == rf_off)break ;
@@ -1386,7 +1386,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,rtl92e_set_rf_off (dev);break ; -case eRfOff: +case rf_off:for (QueueID =0 , i =0 ; QueueID <MAX_TX_QUEUE ; ) { ring = &priv->tx_ring[QueueID];
@@ -1418,7 +1418,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, bResult = false;netdev_warn (dev,"%s(): Unknown state requested: 0x%X.\n" , - __func__, eRFPowerState); + __func__, rf_power_state);break ; }
@@ -1430,7 +1430,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, }if (bResult) { - priv->rtllib->eRFPowerState = eRFPowerState; + priv->rtllib->rf_power_state = rf_power_state;switch (priv->rf_chip) {case RF_8256 :
@@ -1447,18 +1447,18 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, }bool rtl92e_set_rf_power_state (struct net_device *dev, -enum rt_rf_power_state eRFPowerState) +enum rt_rf_power_state rf_power_state) {struct r8192_priv *priv =rtllib_priv (dev);bool bResult = false; -if (eRFPowerState == priv->rtllib->eRFPowerState && +if (rf_power_state == priv->rtllib->rf_power_state && priv->bHwRfOffAction ==0 ) {return bResult; } - bResult =_rtl92e_set_rf_power_state (dev, eRFPowerState); + bResult =_rtl92e_set_rf_power_state (dev, rf_power_state);return bResult; }
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +1 -1
@@ -82,7 +82,7 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation);void rtl92e_set_rf_off (struct net_device *dev);bool rtl92e_set_rf_power_state (struct net_device *dev, -enum rt_rf_power_state eRFPowerState); +enum rt_rf_power_state rf_power_state);void rtl92e_scan_op_backup (struct net_device *dev,u8 Operation);
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +2 -2
@@ -80,9 +80,9 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv (dev);enum rt_rf_power_state rt_state; - rt_state = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->rf_power_state;if (priv->rtllib->PowerSaveControl.bInactivePs) { -if (rt_state == eRfOff) { +if (rt_state == rf_off) {if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) {netdev_warn (dev,"%s(): RF is OFF.\n" , __func__);
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +13 -13
@@ -166,10 +166,10 @@ bool rtl92e_set_rf_state(struct net_device *dev, } } - rt_state = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->rf_power_state;switch (state_to_set) { -case eRfOn: +case rf_on: priv->rtllib->RfOffReason &= (~change_source);if ((change_source ==RF_CHANGE_BY_HW ) && priv->hw_radio_off)
@@ -179,13 +179,13 @@ bool rtl92e_set_rf_state(struct net_device *dev, priv->rtllib->RfOffReason =0 ; action_allowed = true; -if (rt_state == eRfOff && +if (rt_state == rf_off && change_source >=RF_CHANGE_BY_HW ) connect_by_ssid = true; }break ; -case eRfOff: +case rf_off:if ((priv->rtllib->iw_mode ==IW_MODE_INFRA ) || (priv->rtllib->iw_mode ==IW_MODE_ADHOC )) {
@@ -216,7 +216,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,if (action_allowed) {rtl92e_set_rf_power_state (dev, state_to_set); -if (state_to_set == eRfOn) { +if (state_to_set == rf_on) {if (connect_by_ssid && priv->blinked_ingpio) {schedule_delayed_work ( &ieee->associate_procedure_wq,0 );
@@ -892,7 +892,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->rtllib->PowerSaveControl.bFwCtrlLPS = false; priv->rtllib->LPSDelayCnt =0 ; priv->rtllib->sta_sleep =LPS_IS_WAKE ; - priv->rtllib->eRFPowerState = eRfOn; + priv->rtllib->rf_power_state = rf_on; priv->rtllib->current_network.beacon_interval =DEFAULT_BEACONINTERVAL ; priv->rtllib->iw_mode =IW_MODE_INFRA ;
@@ -1114,12 +1114,12 @@ static enum reset_type _rtl92e_if_check_reset(struct net_device *dev)enum reset_type RxResetType =RESET_TYPE_NORESET ;enum rt_rf_power_state rfState; - rfState = priv->rtllib->eRFPowerState; + rfState = priv->rtllib->rf_power_state; -if (rfState == eRfOn) +if (rfState == rf_on) TxResetType =_rtl92e_tx_check_stuck (dev); -if (rfState == eRfOn && +if (rfState == rf_on && (priv->rtllib->iw_mode ==IW_MODE_INFRA ) && (priv->rtllib->state ==RTLLIB_LINKED )) RxResetType =_rtl92e_rx_check_stuck (dev);
@@ -1307,7 +1307,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)if (!rtllib_act_scanning (priv->rtllib, false)) {if ((ieee->iw_mode ==IW_MODE_INFRA ) && (ieee->state ==RTLLIB_NOLINK ) && - (ieee->eRFPowerState == eRfOn) && !ieee->is_set_key && + (ieee->rf_power_state == rf_on) && !ieee->is_set_key && (!ieee->proto_stoppping) && !ieee->wx_set_enc) { if ((ieee->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE) &&
@@ -1370,7 +1370,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) priv->check_roaming_cnt =0 ;if (priv->check_roaming_cnt >0 ) { -if (ieee->eRFPowerState == eRfOff) +if (ieee->rf_power_state == rf_off)netdev_info (dev,"%s(): RF is off\n" , __func__); netdev_info(dev,
@@ -1507,7 +1507,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, MAX_DEV_ADDR_SIZE);u8 queue_index = tcb_desc->queue_index; -if ((priv->rtllib->eRFPowerState == eRfOff) || !priv->up || +if ((priv->rtllib->rf_power_state == rf_off) || !priv->up || priv->bResetInProgress) {kfree_skb (skb);return ;
@@ -1540,7 +1540,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)u8 queue_index = tcb_desc->queue_index;if (queue_index !=TXCMD_QUEUE ) { -if ((priv->rtllib->eRFPowerState == eRfOff) || +if ((priv->rtllib->rf_power_state == rf_off) || !priv->up || priv->bResetInProgress) {kfree_skb (skb);return 0 ;
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +4 -4
@@ -648,7 +648,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)rtl92e_writeb (dev, FW_Busy_Flag,0 );return ; } -if (priv->rtllib->eRFPowerState != eRfOn) { +if (priv->rtllib->rf_power_state != rf_on) {rtl92e_writeb (dev, Pw_Track_Flag,0 );rtl92e_writeb (dev, FW_Busy_Flag,0 );return ;
@@ -1684,13 +1684,13 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) tmp1byte =rtl92e_readb (dev,GPI ); - eRfPowerStateToSet = (tmp1byte&BIT1 ) ? eRfOn : eRfOff; + eRfPowerStateToSet = (tmp1byte&BIT1 ) ? rf_on : rf_off; -if (priv->hw_radio_off && (eRfPowerStateToSet == eRfOn)) { +if (priv->hw_radio_off && (eRfPowerStateToSet == rf_on)) {netdev_info (dev,"gpiochangeRF - HW Radio ON\n" ); priv->hw_radio_off = false; bActuallySet = true; - }else if (!priv->hw_radio_off && (eRfPowerStateToSet == eRfOff)) { + }else if (!priv->hw_radio_off && (eRfPowerStateToSet == rf_off)) {netdev_info (dev,"gpiochangeRF - HW Radio OFF\n" ); priv->hw_radio_off = true; bActuallySet = true;
drivers/staging/rtl8192e/rtl8192e/rtl_pm.c +2 -2
@@ -32,7 +32,7 @@ int rtl92e_suspend(struct device *dev_d)netif_device_detach (dev);if (!priv->rtllib->bSupportRemoteWakeUp) { -rtl92e_set_rf_state (dev, eRfOff,RF_CHANGE_BY_INIT ); +rtl92e_set_rf_state (dev, rf_off,RF_CHANGE_BY_INIT ); ulRegRead =rtl92e_readl (dev,CPU_GEN ); ulRegRead |=CPU_GEN_SYSTEM_RESET ;rtl92e_writel (dev,CPU_GEN , ulRegRead);
@@ -83,7 +83,7 @@ int rtl92e_resume(struct device *dev_d) dev->netdev_ops->ndo_open (dev);if (!priv->rtllib->bSupportRemoteWakeUp) -rtl92e_set_rf_state (dev, eRfOn,RF_CHANGE_BY_INIT ); +rtl92e_set_rf_state (dev, rf_on,RF_CHANGE_BY_INIT ); out:return 0 ;
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +9 -9
@@ -51,7 +51,7 @@ void rtl92e_hw_wakeup(struct net_device *dev)return ; }spin_unlock_irqrestore (&priv->rf_ps_lock, flags); -rtl92e_set_rf_state (dev, eRfOn,RF_CHANGE_BY_PS ); +rtl92e_set_rf_state (dev, rf_on,RF_CHANGE_BY_PS ); }void rtl92e_hw_wakeup_wq (void *data)
@@ -117,11 +117,11 @@ void rtl92e_ips_enter(struct net_device *dev)enum rt_rf_power_state rt_state;if (pPSC->bInactivePs) { - rt_state = priv->rtllib->eRFPowerState; -if (rt_state == eRfOn && !pPSC->bSwRfProcessing && + rt_state = priv->rtllib->rf_power_state; +if (rt_state == rf_on && !pPSC->bSwRfProcessing && (priv->rtllib->state !=RTLLIB_LINKED ) && (priv->rtllib->iw_mode !=IW_MODE_MASTER )) { - pPSC->eInactivePowerState = eRfOff; + pPSC->eInactivePowerState = rf_off; priv->isRFOff = true; priv->bInPowerSaveMode = true;_rtl92e_ps_update_rf_state (dev);
@@ -137,10 +137,10 @@ void rtl92e_ips_leave(struct net_device *dev)enum rt_rf_power_state rt_state;if (pPSC->bInactivePs) { - rt_state = priv->rtllib->eRFPowerState; -if (rt_state != eRfOn && !pPSC->bSwRfProcessing && + rt_state = priv->rtllib->rf_power_state; +if (rt_state != rf_on && !pPSC->bSwRfProcessing && priv->rtllib->RfOffReason <=RF_CHANGE_BY_IPS ) { - pPSC->eInactivePowerState = eRfOn; + pPSC->eInactivePowerState = rf_on; priv->bInPowerSaveMode = false;_rtl92e_ps_update_rf_state (dev); }
@@ -164,10 +164,10 @@ void rtl92e_rtllib_ips_leave_wq(struct net_device *dev)struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv (dev);enum rt_rf_power_state rt_state; - rt_state = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->rf_power_state;if (priv->rtllib->PowerSaveControl.bInactivePs) { -if (rt_state == eRfOff) { +if (rt_state == rf_off) {if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) {netdev_warn (dev,"%s(): RF is OFF.\n" , __func__);
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +6 -6
@@ -248,12 +248,12 @@ static int _rtl92e_wx_set_mode(struct net_device *dev,if (priv->hw_radio_off)return 0 ; - rt_state = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->rf_power_state;mutex_lock (&priv->wx_mutex);if (wrqu->mode ==IW_MODE_ADHOC || wrqu->mode ==IW_MODE_MONITOR || ieee->bNetPromiscuousMode) {if (priv->rtllib->PowerSaveControl.bInactivePs) { -if (rt_state == eRfOff) { +if (rt_state == rf_off) {if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) { netdev_warn(dev, "%s(): RF is OFF.\n",
@@ -392,7 +392,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, __func__);return 0 ; } - rt_state = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->rf_power_state;if (!priv->up)return -ENETDOWN ;if (priv->rtllib->LinkDetectInfo.bBusyTraffic == true)
@@ -415,7 +415,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,if (priv->rtllib->state !=RTLLIB_LINKED ) {if (priv->rtllib->PowerSaveControl.bInactivePs) { -if (rt_state == eRfOff) { +if (rt_state == rf_off) {if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) { netdev_warn(dev, "%s(): RF is OFF.\n",
@@ -433,7 +433,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, priv->rtllib->LedControlHandler (dev,LED_CTL_SITE_SURVEY ); -if (priv->rtllib->eRFPowerState != eRfOff) { +if (priv->rtllib->rf_power_state != rf_off) { priv->rtllib->actscanning = true;if (ieee->ScanOperationBackupHandler)
@@ -487,7 +487,7 @@ static int _rtl92e_wx_set_essid(struct net_device *dev,if (priv->hw_radio_off) {netdev_info (dev, -"=========>%s():hw radio off,or Rf state is eRfOff, return\n" , +"=========>%s():hw radio off,or Rf state is rf_off, return\n" , __func__);return 0 ; }
drivers/staging/rtl8192e/rtllib.h +3 -3
@@ -1244,9 +1244,9 @@ enum ips_callback_function { };enum rt_rf_power_state { - eRfOn, + rf_on, eRfSleep, - eRfOff + rf_off };struct rt_pwr_save_ctrl {
@@ -1434,7 +1434,7 @@ struct rtllib_device {bool FirstIe_InScan;bool be_scan_inprogress;bool beinretry; -enum rt_rf_power_state eRFPowerState; +enum rt_rf_power_state rf_power_state;RT_RF_CHANGE_SOURCE RfOffReason;bool is_set_key;bool wx_set_enc;
drivers/staging/rtl8192e/rtllib_softmac.c +3 -3
@@ -586,9 +586,9 @@ static void rtllib_softmac_scan_wq(void *data)mutex_lock (&ieee->scan_mutex); -if (ieee->eRFPowerState == eRfOff) { +if (ieee->rf_power_state == rf_off) {netdev_info (ieee->dev, -"======>%s():rf state is eRfOff, return\n" , +"======>%s():rf state is rf_off, return\n" , __func__); goto out1; }
@@ -1585,7 +1585,7 @@ static void rtllib_associate_procedure_wq(void *data)rtllib_stop_scan (ieee);HTSetConnectBwMode (ieee,HT_CHANNEL_WIDTH_20 ,HT_EXTCHNL_OFFSET_NO_EXT ); -if (ieee->eRFPowerState == eRfOff) { +if (ieee->rf_power_state == rf_off) {if (ieee->rtllib_ips_leave_wq !=NULL ) ieee->rtllib_ips_leave_wq (ieee->dev);mutex_unlock (&ieee->wx_mutex);
Signature · 1 line
2.37.3
PATCH 2/10 staging: rtl8192e: Rename eRfSleep, eRfPowerStateToSet and RfOffReason
In reply to Philipp HortmannRename variable eRfSleep to rf_sleep, eRfPowerStateToSet to rf_power_state_to_set and RfOffReason to rf_off_reason to avoid CamelCase which is not accepted by checkpatch. Omit the upfront "e" as no RfSleep and RfPowerStateToSet exist and it makes the variables unnecessary long.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 16 ++++++++-------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 4 ++-- 8 files changed, 27 insertions(+), 27 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +5 -5
@@ -758,13 +758,13 @@ bool rtl92e_start_adapter(struct net_device *dev)if (priv->RegRfOff) {rtl92e_set_rf_state (dev, rf_off,RF_CHANGE_BY_SW ); - }else if (priv->rtllib->RfOffReason >RF_CHANGE_BY_PS ) { -rtl92e_set_rf_state (dev, rf_off, priv->rtllib->RfOffReason); - }else if (priv->rtllib->RfOffReason >=RF_CHANGE_BY_IPS ) { -rtl92e_set_rf_state (dev, rf_off, priv->rtllib->RfOffReason); + }else if (priv->rtllib->rf_off_reason >RF_CHANGE_BY_PS ) { +rtl92e_set_rf_state (dev, rf_off, priv->rtllib->rf_off_reason); + }else if (priv->rtllib->rf_off_reason >=RF_CHANGE_BY_IPS ) { +rtl92e_set_rf_state (dev, rf_off, priv->rtllib->rf_off_reason); }else { priv->rtllib->rf_power_state = rf_on; - priv->rtllib->RfOffReason =0 ; + priv->rtllib->rf_off_reason =0 ; }if (priv->rtllib->FwRWRF)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -1363,7 +1363,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,break ; -case eRfSleep: +case rf_sleep:if (priv->rtllib->rf_power_state == rf_off)break ;
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +1 -1
@@ -83,7 +83,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex, rt_state = priv->rtllib->rf_power_state;if (priv->rtllib->PowerSaveControl.bInactivePs) {if (rt_state == rf_off) { -if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) { +if (priv->rtllib->rf_off_reason >RF_CHANGE_BY_IPS ) {netdev_warn (dev,"%s(): RF is OFF.\n" , __func__);return ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +8 -8
@@ -170,13 +170,13 @@ bool rtl92e_set_rf_state(struct net_device *dev,switch (state_to_set) {case rf_on: - priv->rtllib->RfOffReason &= (~change_source); + priv->rtllib->rf_off_reason &= (~change_source);if ((change_source ==RF_CHANGE_BY_HW ) && priv->hw_radio_off) priv->hw_radio_off = false; -if (!priv->rtllib->RfOffReason) { - priv->rtllib->RfOffReason =0 ; +if (!priv->rtllib->rf_off_reason) { + priv->rtllib->rf_off_reason =0 ; action_allowed = true; if (rt_state == rf_off &&
@@ -189,7 +189,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,if ((priv->rtllib->iw_mode ==IW_MODE_INFRA ) || (priv->rtllib->iw_mode ==IW_MODE_ADHOC )) { -if ((priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) || +if ((priv->rtllib->rf_off_reason >RF_CHANGE_BY_IPS ) || (change_source >RF_CHANGE_BY_IPS )) {if (ieee->state ==RTLLIB_LINKED ) priv->blinked_ingpio = true;
@@ -201,12 +201,12 @@ bool rtl92e_set_rf_state(struct net_device *dev, }if ((change_source ==RF_CHANGE_BY_HW ) && !priv->hw_radio_off) priv->hw_radio_off = true; - priv->rtllib->RfOffReason |= change_source; + priv->rtllib->rf_off_reason |= change_source; action_allowed = true;break ; -case eRfSleep: - priv->rtllib->RfOffReason |= change_source; +case rf_sleep: + priv->rtllib->rf_off_reason |= change_source; action_allowed = true;break ;
@@ -882,7 +882,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->RegRfOff = false; priv->isRFOff = false; priv->bInPowerSaveMode = false; - priv->rtllib->RfOffReason =0 ; + priv->rtllib->rf_off_reason =0 ; priv->rf_change_in_progress = false; priv->bHwRfOffAction =0 ; priv->SetRFPowerStateInProgress = false;
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +5 -5
@@ -1665,7 +1665,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) struct r8192_priv, gpio_change_rf_wq);struct net_device *dev = priv->rtllib->dev;u8 tmp1byte; -enum rt_rf_power_state eRfPowerStateToSet; +enum rt_rf_power_state rf_power_state_to_set;bool bActuallySet = false;char *argv[3 ];static const char RadioPowerPath[] ="/etc/acpi/events/RadioPower.sh" ;
@@ -1684,13 +1684,13 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) tmp1byte =rtl92e_readb (dev,GPI ); - eRfPowerStateToSet = (tmp1byte&BIT1 ) ? rf_on : rf_off; + rf_power_state_to_set = (tmp1byte&BIT1 ) ? rf_on : rf_off; -if (priv->hw_radio_off && (eRfPowerStateToSet == rf_on)) { +if (priv->hw_radio_off && (rf_power_state_to_set == rf_on)) {netdev_info (dev,"gpiochangeRF - HW Radio ON\n" ); priv->hw_radio_off = false; bActuallySet = true; - }else if (!priv->hw_radio_off && (eRfPowerStateToSet == rf_off)) { + }else if (!priv->hw_radio_off && (rf_power_state_to_set == rf_off)) {netdev_info (dev,"gpiochangeRF - HW Radio OFF\n" ); priv->hw_radio_off = true; bActuallySet = true;
@@ -1699,7 +1699,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)if (bActuallySet) {mdelay (1000 ); priv->bHwRfOffAction =1 ; -rtl92e_set_rf_state (dev, eRfPowerStateToSet,RF_CHANGE_BY_HW ); +rtl92e_set_rf_state (dev, rf_power_state_to_set,RF_CHANGE_BY_HW );if (priv->hw_radio_off) argv[1 ] ="RFOFF" ;else
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +3 -3
@@ -26,7 +26,7 @@ static void _rtl92e_hw_sleep(struct net_device *dev)return ; }spin_unlock_irqrestore (&priv->rf_ps_lock, flags); -rtl92e_set_rf_state (dev, eRfSleep,RF_CHANGE_BY_PS ); +rtl92e_set_rf_state (dev, rf_sleep,RF_CHANGE_BY_PS ); }void rtl92e_hw_sleep_wq (void *data)
@@ -139,7 +139,7 @@ void rtl92e_ips_leave(struct net_device *dev)if (pPSC->bInactivePs) { rt_state = priv->rtllib->rf_power_state;if (rt_state != rf_on && !pPSC->bSwRfProcessing && - priv->rtllib->RfOffReason <=RF_CHANGE_BY_IPS ) { + priv->rtllib->rf_off_reason <=RF_CHANGE_BY_IPS ) { pPSC->eInactivePowerState = rf_on; priv->bInPowerSaveMode = false;_rtl92e_ps_update_rf_state (dev);
@@ -168,7 +168,7 @@ void rtl92e_rtllib_ips_leave_wq(struct net_device *dev)if (priv->rtllib->PowerSaveControl.bInactivePs) {if (rt_state == rf_off) { -if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) { +if (priv->rtllib->rf_off_reason >RF_CHANGE_BY_IPS ) {netdev_warn (dev,"%s(): RF is OFF.\n" , __func__);return ;
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +2 -2
@@ -254,7 +254,7 @@ static int _rtl92e_wx_set_mode(struct net_device *dev, ieee->bNetPromiscuousMode) {if (priv->rtllib->PowerSaveControl.bInactivePs) {if (rt_state == rf_off) { -if (priv->rtllib->RfOffReason > +if (priv->rtllib->rf_off_reason >RF_CHANGE_BY_IPS ) {netdev_warn (dev,"%s(): RF is OFF.\n" , __func__);
@@ -416,7 +416,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,if (priv->rtllib->state !=RTLLIB_LINKED ) {if (priv->rtllib->PowerSaveControl.bInactivePs) {if (rt_state == rf_off) { -if (priv->rtllib->RfOffReason > +if (priv->rtllib->rf_off_reason >RF_CHANGE_BY_IPS ) {netdev_warn (dev,"%s(): RF is OFF.\n" , __func__);
drivers/staging/rtl8192e/rtllib.h +2 -2
@@ -1245,7 +1245,7 @@ enum ips_callback_function {enum rt_rf_power_state { rf_on, - eRfSleep, + rf_sleep, rf_off };
@@ -1435,7 +1435,7 @@ struct rtllib_device {bool be_scan_inprogress;bool beinretry;enum rt_rf_power_state rf_power_state; -RT_RF_CHANGE_SOURCE RfOffReason; +RT_RF_CHANGE_SOURCE rf_off_reason;bool is_set_key;bool wx_set_enc;struct rt_hi_throughput *pHTInfo;
Signature · 1 line
2.37.3
PATCH 3/10 staging: rtl8192e: Rename dot11Cur..., bCurTxBW40MHz and bCurrentRT2...
In reply to Philipp HortmannRename variable dot11CurrentPreambleMode to dot11_current_preamble_mode, bCurTxBW40MHz to cur_tx_bw40mhz and bCurrentRT2RTLongSlotTime to current_rt2rt_long_slot_time to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 14 +++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 ++-- drivers/staging/rtl8192e/rtl819x_HT.h | 4 ++-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 12 ++++++------ drivers/staging/rtl8192e/rtllib_tx.c | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +3 -3
@@ -822,7 +822,7 @@ static void _rtl92e_net_update(struct net_device *dev) net = &priv->rtllib->current_network;rtl92e_config_rate (dev, &rate_config); - priv->dot11CurrentPreambleMode =PREAMBLE_AUTO ; + priv->dot11_current_preamble_mode =PREAMBLE_AUTO ; priv->basic_rate = rate_config &=0x15f ;rtl92e_writew (dev,BSSIDR , *(u16 *)net->bssid);rtl92e_writel (dev,BSSIDR +2 , *(u32 *)(net->bssid +2 ));
@@ -1998,10 +1998,10 @@ void rtl92e_update_ratr_table(struct net_device *dev)break ; } ratr_value &=0x0FFFFFFF ; -if (ieee->pHTInfo->bCurTxBW40MHz && +if (ieee->pHTInfo->cur_tx_bw40mhz && ieee->pHTInfo->bCurShortGI40MHz) ratr_value |=0x80000000 ; -else if (!ieee->pHTInfo->bCurTxBW40MHz && +else if (!ieee->pHTInfo->cur_tx_bw40mhz && ieee->pHTInfo->bCurShortGI20MHz) ratr_value |=0x80000000 ;rtl92e_writel (dev,RATR0 +rate_index*4 , ratr_value);
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +7 -7
@@ -287,16 +287,16 @@ static void _rtl92e_update_cap(struct net_device *dev, u16 cap)bool ShortPreamble;if (cap &WLAN_CAPABILITY_SHORT_PREAMBLE ) { -if (priv->dot11CurrentPreambleMode !=PREAMBLE_SHORT ) { +if (priv->dot11_current_preamble_mode !=PREAMBLE_SHORT ) { ShortPreamble = true; - priv->dot11CurrentPreambleMode =PREAMBLE_SHORT ; + priv->dot11_current_preamble_mode =PREAMBLE_SHORT ; priv->rtllib->SetHwRegHandler (dev,HW_VAR_ACK_PREAMBLE , (unsigned char *)&ShortPreamble); } }else { -if (priv->dot11CurrentPreambleMode !=PREAMBLE_LONG ) { +if (priv->dot11_current_preamble_mode !=PREAMBLE_LONG ) { ShortPreamble = false; - priv->dot11CurrentPreambleMode =PREAMBLE_LONG ; + priv->dot11_current_preamble_mode =PREAMBLE_LONG ; priv->rtllib->SetHwRegHandler (dev,HW_VAR_ACK_PREAMBLE , (unsigned char *)&ShortPreamble); }
@@ -307,7 +307,7 @@ static void _rtl92e_update_cap(struct net_device *dev, u16 cap)u8 cur_slot_time = priv->slot_time;if ((cap &WLAN_CAPABILITY_SHORT_SLOT_TIME ) && - (!priv->rtllib->pHTInfo->bCurrentRT2RTLongSlotTime)) { + (!priv->rtllib->pHTInfo->current_rt2rt_long_slot_time)) {if (cur_slot_time !=SHORT_SLOT_TIME ) { slot_time_val =SHORT_SLOT_TIME ; priv->rtllib->SetHwRegHandler(dev,
@@ -341,7 +341,7 @@ static void _rtl92e_update_beacon(void *data)if (ieee->pHTInfo->bCurrentHTSupport)HT_update_self_and_peer_setting (ieee, net); - ieee->pHTInfo->bCurrentRT2RTLongSlotTime = net->bssht.bd_rt2rt_long_slot_time; + ieee->pHTInfo->current_rt2rt_long_slot_time = net->bssht.bd_rt2rt_long_slot_time; ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.rt2rt_ht_mode;_rtl92e_update_cap (dev, net->capability); }
@@ -833,7 +833,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)u8 i; priv->AcmMethod = eAcmWay2_SW; - priv->dot11CurrentPreambleMode =PREAMBLE_AUTO ; + priv->dot11_current_preamble_mode =PREAMBLE_AUTO ; priv->rtllib->status =0 ; priv->polling_timer_on =0 ; priv->up_first_time =1 ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +1 -1
@@ -430,7 +430,7 @@ struct r8192_priv {u16 basic_rate;u8 short_preamble; -u8 dot11CurrentPreambleMode; +u8 dot11_current_preamble_mode;u8 slot_time;u16 SifsTime;
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +2 -2
@@ -343,9 +343,9 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)if (priv->rtllib->state ==RTLLIB_LINKED ) { - bshort_gi_enabled = (pHTInfo->bCurTxBW40MHz && + bshort_gi_enabled = (pHTInfo->cur_tx_bw40mhz && pHTInfo->bCurShortGI40MHz) || - (!pHTInfo->bCurTxBW40MHz && + (!pHTInfo->cur_tx_bw40mhz && pHTInfo->bCurShortGI20MHz); pra->upper_rssi_threshold_ratr =
drivers/staging/rtl8192e/rtl819x_HT.h +2 -2
@@ -148,7 +148,7 @@ struct rt_hi_throughput {u8 PeerMimoPs;enum ht_extchnl_offset CurSTAExtChnlOffset; -u8 bCurTxBW40MHz; +u8 cur_tx_bw40mhz;u8 PeerBandwidth;u8 bSwBwInProgress;
@@ -157,7 +157,7 @@ struct rt_hi_throughput {u8 bRegRT2RTAggregation;u8 RT2RT_HT_Mode;u8 bCurrentRT2RTAggregation; -u8 bCurrentRT2RTLongSlotTime; +u8 current_rt2rt_long_slot_time;u8 szRT2RTAggBuffer[10 ];u8 bRegRxReorderEnable;
drivers/staging/rtl8192e/rtl819x_HTProc.c +6 -6
@@ -543,7 +543,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)#endif HTSetConnectBwMode (ieee, (enum ht_channel_width )(pPeerHTCap->ChlWidth), (enum ht_extchnl_offset )(pPeerHTInfo->ExtChlOffset)); - pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth ==1 ) ? + pHTInfo->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth ==1 ) ? true : false); pHTInfo->bCurShortGI20MHz = ((pHTInfo->bRegShortGI20MHz) ?
@@ -633,7 +633,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) pHTInfo->bCurrentHTSupport = false; pHTInfo->bCurBW40MHz = false; - pHTInfo->bCurTxBW40MHz = false; + pHTInfo->cur_tx_bw40mhz = false; pHTInfo->bCurShortGI20MHz = false; pHTInfo->bCurShortGI40MHz = false;
@@ -660,7 +660,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) pHTInfo->ePeerHTSpecVer =HT_SPEC_VER_IEEE ; pHTInfo->bCurrentRT2RTAggregation = false; - pHTInfo->bCurrentRT2RTLongSlotTime = false; + pHTInfo->current_rt2rt_long_slot_time = false; pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability )0 ; pHTInfo->IOTPeer =0 ;
@@ -720,12 +720,12 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,if (pHTInfo->bRegRT2RTAggregation) { pHTInfo->bCurrentRT2RTAggregation = pNetwork->bssht.bd_rt2rt_aggregation; - pHTInfo->bCurrentRT2RTLongSlotTime = + pHTInfo->current_rt2rt_long_slot_time = pNetwork->bssht.bd_rt2rt_long_slot_time; pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.rt2rt_ht_mode; }else { pHTInfo->bCurrentRT2RTAggregation = false; - pHTInfo->bCurrentRT2RTLongSlotTime = false; + pHTInfo->current_rt2rt_long_slot_time = false; pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability )0 ; }
@@ -757,7 +757,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, }else { pHTInfo->bCurrentHTSupport = false; pHTInfo->bCurrentRT2RTAggregation = false; - pHTInfo->bCurrentRT2RTLongSlotTime = false; + pHTInfo->current_rt2rt_long_slot_time = false; pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability )0 ; pHTInfo->IOTAction =0 ;
drivers/staging/rtl8192e/rtllib_tx.c +1 -1
@@ -384,7 +384,7 @@ static void rtllib_query_BandwidthMode(struct rtllib_device *ieee,if ((tcb_desc->data_rate &0x80 ) ==0 )return ; -if (pHTInfo->bCurBW40MHz && pHTInfo->bCurTxBW40MHz && +if (pHTInfo->bCurBW40MHz && pHTInfo->cur_tx_bw40mhz && !ieee->bandwidth_auto_switch.bforced_tx20Mhz) tcb_desc->bPacketBW = true; }
Signature · 1 line
2.37.3
PATCH 4/10 staging: rtl8192e: Rename bSwBwInPro..., bRegRT2RTAg... and bCurrentRT...
In reply to Philipp HortmannRename variable bSwBwInProgress to sw_bw_in_progress, bRegRT2RTAggregation to reg_rt2rt_aggregation and bCurrentRT2RTAggregation to current_rt2rt_aggregation to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 24 +++++++++++------------ drivers/staging/rtl8192e/rtllib_softmac.c | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +3 -3
@@ -151,12 +151,12 @@ struct rt_hi_throughput {u8 cur_tx_bw40mhz;u8 PeerBandwidth; -u8 bSwBwInProgress; +u8 sw_bw_in_progress;u8 SwBwStep; -u8 bRegRT2RTAggregation; +u8 reg_rt2rt_aggregation;u8 RT2RT_HT_Mode; -u8 bCurrentRT2RTAggregation; +u8 current_rt2rt_aggregation;u8 current_rt2rt_long_slot_time;u8 szRT2RTAggBuffer[10 ];
drivers/staging/rtl8192e/rtl819x_HTProc.c +12 -12
@@ -98,7 +98,7 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) ieee->bTxEnableFwCalcDur =1 ; - pHTInfo->bRegRT2RTAggregation =1 ; + pHTInfo->reg_rt2rt_aggregation =1 ; pHTInfo->bRegRxReorderEnable =1 ; pHTInfo->RxReorderWinSize =64 ;
@@ -574,7 +574,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) pHTInfo->bCurrentAMPDUEnable = false; } -if (!pHTInfo->bRegRT2RTAggregation) { +if (!pHTInfo->reg_rt2rt_aggregation) {if (pHTInfo->AMPDU_Factor > pPeerHTCap->MaxRxAMPDUFactor) pHTInfo->CurrentAMPDUFactor = pPeerHTCap->MaxRxAMPDUFactor;
@@ -655,11 +655,11 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)memset ((void *)(&(pHTInfo->PeerHTInfoBuf)),0 ,sizeof (pHTInfo->PeerHTInfoBuf)); - pHTInfo->bSwBwInProgress = false; + pHTInfo->sw_bw_in_progress = false; pHTInfo->ePeerHTSpecVer =HT_SPEC_VER_IEEE ; - pHTInfo->bCurrentRT2RTAggregation = false; + pHTInfo->current_rt2rt_aggregation = false; pHTInfo->current_rt2rt_long_slot_time = false; pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability )0 ;
@@ -717,14 +717,14 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, pNetwork->bssht.bd_ht_info_buf, pNetwork->bssht.bd_ht_info_len); -if (pHTInfo->bRegRT2RTAggregation) { - pHTInfo->bCurrentRT2RTAggregation = +if (pHTInfo->reg_rt2rt_aggregation) { + pHTInfo->current_rt2rt_aggregation = pNetwork->bssht.bd_rt2rt_aggregation; pHTInfo->current_rt2rt_long_slot_time = pNetwork->bssht.bd_rt2rt_long_slot_time; pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.rt2rt_ht_mode; }else { - pHTInfo->bCurrentRT2RTAggregation = false; + pHTInfo->current_rt2rt_aggregation = false; pHTInfo->current_rt2rt_long_slot_time = false; pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability )0 ; }
@@ -756,7 +756,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, pHTInfo->IOTAction |=HT_IOT_ACT_CDD_FSYNC ; }else { pHTInfo->bCurrentHTSupport = false; - pHTInfo->bCurrentRT2RTAggregation = false; + pHTInfo->current_rt2rt_aggregation = false; pHTInfo->current_rt2rt_long_slot_time = false; pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability )0 ;
@@ -850,7 +850,7 @@ static void HTSetConnectBwModeCallback(struct rtllib_device *ieee) HT_EXTCHNL_OFFSET_NO_EXT); } - pHTInfo->bSwBwInProgress = false; + pHTInfo->sw_bw_in_progress = false; } void HTSetConnectBwMode(struct rtllib_device *ieee,
@@ -865,8 +865,8 @@ void HTSetConnectBwMode(struct rtllib_device *ieee,if (ieee->GetHalfNmodeSupportByAPsHandler (ieee->dev)) Bandwidth =HT_CHANNEL_WIDTH_20 ; -if (pHTInfo->bSwBwInProgress) { -pr_info ("%s: bSwBwInProgress!!\n" , __func__); +if (pHTInfo->sw_bw_in_progress) { +pr_info ("%s: sw_bw_in_progress!!\n" , __func__);return ; }if (Bandwidth ==HT_CHANNEL_WIDTH_20_40 ) {
@@ -889,7 +889,7 @@ void HTSetConnectBwMode(struct rtllib_device *ieee,netdev_dbg (ieee->dev,"%s():pHTInfo->bCurBW40MHz:%x\n" , __func__, pHTInfo->bCurBW40MHz); - pHTInfo->bSwBwInProgress = true; + pHTInfo->sw_bw_in_progress = true;HTSetConnectBwModeCallback (ieee); }
drivers/staging/rtl8192e/rtllib_softmac.c +3 -3
@@ -865,7 +865,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,HTConstructInfoElement (ieee, tmp_ht_info_buf, &tmp_ht_info_len, encrypt); -if (pHTInfo->bRegRT2RTAggregation) { +if (pHTInfo->reg_rt2rt_aggregation) { tmp_generic_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer; tmp_generic_ie_len =sizeof (ieee->pHTInfo->szRT2RTAggBuffer);
@@ -1189,7 +1189,7 @@ rtllib_association_req(struct rtllib_network *beacon, ht_cap_len =sizeof (ieee->pHTInfo->SelfHTCap);HTConstructCapabilityElement (ieee, ht_cap_buf, &ht_cap_len, encrypt, true); -if (ieee->pHTInfo->bCurrentRT2RTAggregation) { +if (ieee->pHTInfo->current_rt2rt_aggregation) { realtek_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer; realtek_ie_len =sizeof (ieee->pHTInfo->szRT2RTAggBuffer);
@@ -1368,7 +1368,7 @@ rtllib_association_req(struct rtllib_network *beacon, tag += ht_cap_len -2 ; } -if (ieee->pHTInfo->bCurrentRT2RTAggregation) { +if (ieee->pHTInfo->current_rt2rt_aggregation) { tag =skb_put (skb, realtek_ie_len); *tag++ =MFIE_TYPE_GENERIC ; *tag++ = realtek_ie_len -2 ;
Signature · 1 line
2.37.3
PATCH 5/10 staging: rtl8192e: Rename szRT2RTAggBuffer, bRegRxRe... and bCurRxReo...
In reply to Philipp HortmannRename variable szRT2RTAggBuffer to sz_rt2rt_agg_buf, bRegRxReorderEnable to reg_rx_reorder_enable and bCurRxReorderEnable to cur_rx_reorder_enable to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtllib_rx.c | 4 ++-- drivers/staging/rtl8192e/rtllib_softmac.c | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +3 -3
@@ -158,10 +158,10 @@ struct rt_hi_throughput {u8 RT2RT_HT_Mode;u8 current_rt2rt_aggregation;u8 current_rt2rt_long_slot_time; -u8 szRT2RTAggBuffer[10 ]; +u8 sz_rt2rt_agg_buf[10 ]; -u8 bRegRxReorderEnable; -u8 bCurRxReorderEnable; +u8 reg_rx_reorder_enable; +u8 cur_rx_reorder_enable;u8 RxReorderWinSize;u8 RxReorderPendingTime;u16 RxReorderDropCounter;
drivers/staging/rtl8192e/rtl819x_HTProc.c +2 -2
@@ -100,7 +100,7 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) pHTInfo->reg_rt2rt_aggregation =1 ; - pHTInfo->bRegRxReorderEnable =1 ; + pHTInfo->reg_rx_reorder_enable =1 ; pHTInfo->RxReorderWinSize =64 ; pHTInfo->RxReorderPendingTime =30 ; }
@@ -605,7 +605,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) pHTInfo->ForcedAMSDUMode =HT_AGG_FORCE_ENABLE ; pHTInfo->ForcedAMSDUMaxSize =7935 ; } - pHTInfo->bCurRxReorderEnable = pHTInfo->bRegRxReorderEnable; + pHTInfo->cur_rx_reorder_enable = pHTInfo->reg_rx_reorder_enable;if (pPeerHTCap->MCS[0 ] ==0 ) pPeerHTCap->MCS[0 ] =0xff ;
drivers/staging/rtl8192e/rtllib_rx.c +2 -2
@@ -924,7 +924,7 @@ static int rtllib_rx_check_duplicate(struct rtllib_device *ieee, sc =le16_to_cpu (hdr->seq_ctl); frag =WLAN_GET_SEQ_FRAG (sc); -if (!ieee->pHTInfo->bCurRxReorderEnable || +if (!ieee->pHTInfo->cur_rx_reorder_enable || !ieee->current_network.qos_data.active || !IsDataFrame (skb->data) ||IsLegacyDataFrame (skb->data)) {
@@ -1442,7 +1442,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, }/* Indicate packets to upper layer or Rx Reorder */ -if (!ieee->pHTInfo->bCurRxReorderEnable || pTS ==NULL || bToOtherSTA) +if (!ieee->pHTInfo->cur_rx_reorder_enable || pTS ==NULL || bToOtherSTA)rtllib_rx_indicate_pkt_legacy (ieee, rx_stats, rxb, dst, src);else RxReorderIndicatePacket (ieee, rxb, pTS, SeqNum);
drivers/staging/rtl8192e/rtllib_softmac.c +4 -4
@@ -866,9 +866,9 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, encrypt);if (pHTInfo->reg_rt2rt_aggregation) { - tmp_generic_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer; + tmp_generic_ie_buf = ieee->pHTInfo->sz_rt2rt_agg_buf; tmp_generic_ie_len = -sizeof (ieee->pHTInfo->szRT2RTAggBuffer); +sizeof (ieee->pHTInfo->sz_rt2rt_agg_buf);HTConstructRT2RTAggElement (ieee, tmp_generic_ie_buf, &tmp_generic_ie_len); }
@@ -1190,9 +1190,9 @@ rtllib_association_req(struct rtllib_network *beacon,HTConstructCapabilityElement (ieee, ht_cap_buf, &ht_cap_len, encrypt, true);if (ieee->pHTInfo->current_rt2rt_aggregation) { - realtek_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer; + realtek_ie_buf = ieee->pHTInfo->sz_rt2rt_agg_buf; realtek_ie_len = -sizeof (ieee->pHTInfo->szRT2RTAggBuffer); +sizeof (ieee->pHTInfo->sz_rt2rt_agg_buf);HTConstructRT2RTAggElement (ieee, realtek_ie_buf, &realtek_ie_len); }
Signature · 1 line
2.37.3
PATCH 6/10 staging: rtl8192e: Rename RxRe...WinSize, RxReorder... and RxReorderDr...
In reply to Philipp HortmannRename variable RxReorderWinSize to rx_reorder_win_size, RxReorderPendingTime to rx_reorder_pending_time and RxReorderDropCounter to rx_reorder_drop_counter to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +3 -3
@@ -162,9 +162,9 @@ struct rt_hi_throughput {u8 reg_rx_reorder_enable;u8 cur_rx_reorder_enable; -u8 RxReorderWinSize; -u8 RxReorderPendingTime; -u16 RxReorderDropCounter; +u8 rx_reorder_win_size; +u8 rx_reorder_pending_time; +u16 rx_reorder_drop_counter;u8 bIsPeerBcm;
drivers/staging/rtl8192e/rtl819x_HTProc.c +2 -2
@@ -101,8 +101,8 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) pHTInfo->reg_rt2rt_aggregation =1 ; pHTInfo->reg_rx_reorder_enable =1 ; - pHTInfo->RxReorderWinSize =64 ; - pHTInfo->RxReorderPendingTime =30 ; + pHTInfo->rx_reorder_win_size =64 ; + pHTInfo->rx_reorder_pending_time =30 ; }static u16 HTMcsToDataRate (struct rtllib_device *ieee,u8 nMcsRate)
drivers/staging/rtl8192e/rtl819x_TSProc.c +1 -1
@@ -83,7 +83,7 @@ static void RxPktPendingTimeout(struct timer_list *t)if (bPktInBuf && (pRxTs->rx_timeout_indicate_seq ==0xffff )) { pRxTs->rx_timeout_indicate_seq = pRxTs->rx_indicate_seq;mod_timer (&pRxTs->rx_pkt_pending_timer, jiffies + -msecs_to_jiffies (ieee->pHTInfo->RxReorderPendingTime) +msecs_to_jiffies (ieee->pHTInfo->rx_reorder_pending_time) ); }spin_unlock_irqrestore (&(ieee->reorder_spinlock), flags);
drivers/staging/rtl8192e/rtllib_rx.c +3 -3
@@ -569,7 +569,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, {struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;struct rx_reorder_entry *pReorderEntry =NULL ; -u8 WinSize = pHTInfo->RxReorderWinSize; +u8 WinSize = pHTInfo->rx_reorder_win_size;u16 WinEnd =0 ;u8 index =0 ;bool bMatchWinStart = false, bPktInBuf = false;
@@ -591,7 +591,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,netdev_dbg (ieee->dev,"Packet Drop! IndicateSeq: %d, NewSeq: %d\n" , pTS->rx_indicate_seq, SeqNum); - pHTInfo->RxReorderDropCounter++; + pHTInfo->rx_reorder_drop_counter++; {int i;
@@ -755,7 +755,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,netdev_dbg (ieee->dev,"%s(): SET rx timeout timer\n" , __func__); pTS->rx_timeout_indicate_seq = pTS->rx_indicate_seq;mod_timer (&pTS->rx_pkt_pending_timer, jiffies + -msecs_to_jiffies (pHTInfo->RxReorderPendingTime)); +msecs_to_jiffies (pHTInfo->rx_reorder_pending_time)); }spin_unlock_irqrestore (&(ieee->reorder_spinlock), flags); }
Signature · 1 line
2.37.3
PATCH 7/10 staging: rtl8192e: Rename PeerMimoPs, IOTAction and IOTRaFunc
In reply to Philipp HortmannRename variable PeerMimoPs to peer_mimo_ps, IOTAction to iot_action and IOTRaFunc to iot_ra_func to avoid CamelCase which is not accepted by checkpatch. Added spaces around '&' as proposed by checkpatch.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 12 ++--- drivers/staging/rtl8192e/rtl819x_BAProc.c | 4 +- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 48 +++++++++---------- drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++--- drivers/staging/rtl8192e/rtllib_tx.c | 10 ++-- 8 files changed, 48 insertions(+), 48 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +1 -1
@@ -1985,7 +1985,7 @@ void rtl92e_update_ratr_table(struct net_device *dev)break ;case IEEE_N_24G :case IEEE_N_5G : -if (ieee->pHTInfo->PeerMimoPs ==0 ) { +if (ieee->pHTInfo->peer_mimo_ps ==0 ) { ratr_value &=0x0007F007 ; }else {if (priv->rf_type ==RF_1T2R )
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +1 -1
@@ -42,7 +42,7 @@ void rtl92e_enable_hw_security_config(struct net_device *dev) ieee->hwsec_active =1 ; -if ((ieee->pHTInfo->IOTAction&HT_IOT_ACT_PURE_N_MODE ) || !hwwep) { +if ((ieee->pHTInfo->iot_action &HT_IOT_ACT_PURE_N_MODE ) || !hwwep) { ieee->hwsec_active =0 ; SECR_value &= ~SCR_RxDecEnable; }
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +6 -6
@@ -1548,13 +1548,13 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev) goto dm_CheckEdcaTurbo_EXIT;if (priv->rtllib->state !=RTLLIB_LINKED ) goto dm_CheckEdcaTurbo_EXIT; -if (priv->rtllib->pHTInfo->IOTAction &HT_IOT_ACT_DISABLE_EDCA_TURBO ) +if (priv->rtllib->pHTInfo->iot_action &HT_IOT_ACT_DISABLE_EDCA_TURBO ) goto dm_CheckEdcaTurbo_EXIT;if (!priv->rtllib->bis_any_nonbepkts) { curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt; curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt; -if (pHTInfo->IOTAction &HT_IOT_ACT_EDCA_BIAS_ON_RX ) { +if (pHTInfo->iot_action &HT_IOT_ACT_EDCA_BIAS_ON_RX ) {if (curTxOkCnt >4 *curRxOkCnt) {if (priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) {
@@ -1633,16 +1633,16 @@ static void _rtl92e_dm_cts_to_self(struct net_device *dev)unsigned long curRxOkCnt =0 ;if (!priv->rtllib->bCTSToSelfEnable) { - pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF ; + pHTInfo->iot_action &= ~HT_IOT_ACT_FORCED_CTS2SELF ;return ; }if (pHTInfo->IOTPeer ==HT_IOT_PEER_BROADCOM ) { curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt; curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt;if (curRxOkCnt >4 *curTxOkCnt) - pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF ; + pHTInfo->iot_action &= ~HT_IOT_ACT_FORCED_CTS2SELF ;else - pHTInfo->IOTAction |=HT_IOT_ACT_FORCED_CTS2SELF ; + pHTInfo->iot_action |=HT_IOT_ACT_FORCED_CTS2SELF ; lastTxOkCnt = priv->stats.txbytesunicast; lastRxOkCnt = priv->stats.rxbytesunicast;
@@ -1997,7 +1997,7 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t)if (priv->rtllib->state ==RTLLIB_LINKED && priv->rtllib->bfsync_enable && - (priv->rtllib->pHTInfo->IOTAction &HT_IOT_ACT_CDD_FSYNC )) { + (priv->rtllib->pHTInfo->iot_action &HT_IOT_ACT_CDD_FSYNC )) {u32 rate_bitmap;for (rate_index =0 ; rate_index <=27 ; rate_index++) {
drivers/staging/rtl8192e/rtl819x_BAProc.c +2 -2
@@ -246,7 +246,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)if (!ieee->current_network.qos_data.active || !ieee->pHTInfo->bCurrentHTSupport || - (ieee->pHTInfo->IOTAction &HT_IOT_ACT_REJECT_ADDBA_REQ )) { + (ieee->pHTInfo->iot_action &HT_IOT_ACT_REJECT_ADDBA_REQ )) { rc =ADDBA_STATUS_REFUSED ; netdev_warn(ieee->dev, "Failed to reply on ADDBA_REQ as some capability is not ready(%d, %d)\n",
@@ -278,7 +278,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) pBA->ba_start_seq_ctrl = *pBaStartSeqCtrl;if (ieee->GetHalfNmodeSupportByAPsHandler (ieee->dev) || - (ieee->pHTInfo->IOTAction &HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT )) + (ieee->pHTInfo->iot_action &HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT )) pBA->ba_param_set.field.buffer_size =1 ;else pBA->ba_param_set.field.buffer_size =32 ;
drivers/staging/rtl8192e/rtl819x_HT.h +3 -3
@@ -145,7 +145,7 @@ struct rt_hi_throughput {u8 CurrentOpMode;u8 SelfMimoPs; -u8 PeerMimoPs; +u8 peer_mimo_ps;enum ht_extchnl_offset CurSTAExtChnlOffset;u8 cur_tx_bw40mhz;
@@ -169,8 +169,8 @@ struct rt_hi_throughput {u8 bIsPeerBcm;u8 IOTPeer; -u32 IOTAction; -u8 IOTRaFunc; +u32 iot_action; +u8 iot_ra_func;u8 bWAIotBroadcom;u8 WAIotTH;
drivers/staging/rtl8192e/rtl819x_HTProc.c +24 -24
120 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_softmac.c +6 -6
@@ -180,7 +180,7 @@ static u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee)struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;u8 rate; -if (pHTInfo->IOTAction &HT_IOT_ACT_MGNT_USE_CCK_6M ) +if (pHTInfo->iot_action &HT_IOT_ACT_MGNT_USE_CCK_6M ) rate =0x0c ;else rate = ieee->basic_rate &0x7f ;
@@ -1894,7 +1894,7 @@ static inline u16 assoc_parse(struct rtllib_device *ieee, struct sk_buff *skb, ((ieee->mode ==IEEE_G ) && (ieee->current_network.mode ==IEEE_N_24G ) && (ieee->AsocRetryCount++ < (RT_ASOC_RETRY_LIMIT-1)))) { - ieee->pHTInfo->IOTAction |= HT_IOT_ACT_PURE_N_MODE; + ieee->pHTInfo->iot_action |= HT_IOT_ACT_PURE_N_MODE; } else { ieee->AsocRetryCount =0 ; }
@@ -2101,7 +2101,7 @@ static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl) {if (ieee->sta_sleep ==LPS_IS_WAKE ) {if (nl) { -if (ieee->pHTInfo->IOTAction & +if (ieee->pHTInfo->iot_action &HT_IOT_ACT_NULL_DATA_POWER_SAVING ) { ieee->ack_tx_to_ieee =1 ;rtllib_sta_ps_send_null_frame (ieee,0 );
@@ -2117,7 +2117,7 @@ static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl)if (ieee->sta_sleep ==LPS_IS_SLEEP ) ieee->sta_wake_up (ieee->dev);if (nl) { -if (ieee->pHTInfo->IOTAction & +if (ieee->pHTInfo->iot_action &HT_IOT_ACT_NULL_DATA_POWER_SAVING ) { ieee->ack_tx_to_ieee =1 ;rtllib_sta_ps_send_null_frame (ieee,0 );
@@ -2152,7 +2152,7 @@ void rtllib_ps_tx_ack(struct rtllib_device *ieee, short success)if ((ieee->sta_sleep ==LPS_IS_WAKE ) && !success) {spin_lock_irqsave (&ieee->mgmt_tx_lock, flags2); -if (ieee->pHTInfo->IOTAction & +if (ieee->pHTInfo->iot_action &HT_IOT_ACT_NULL_DATA_POWER_SAVING )rtllib_sta_ps_send_null_frame (ieee,0 );else
@@ -2296,7 +2296,7 @@ static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb)if (ieee->open_wep || !challenge) { ieee->state =RTLLIB_ASSOCIATING_AUTHENTICATED ; ieee->softmac_stats.rx_auth_rs_ok++; -if (!(ieee->pHTInfo->IOTAction &HT_IOT_ACT_PURE_N_MODE )) { +if (!(ieee->pHTInfo->iot_action &HT_IOT_ACT_PURE_N_MODE )) {if (!ieee->GetNmodeSupportBySecCfg (ieee->dev)) {if (IsHTHalfNmodeAPs (ieee)) { bSupportNmode = true;
drivers/staging/rtl8192e/rtllib_tx.c +5 -5
@@ -284,7 +284,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,if (tcb_desc->bdhcp || ieee->CntAfterLink <2 )return ; -if (pHTInfo->IOTAction &HT_IOT_ACT_TX_NO_AGGREGATION ) +if (pHTInfo->iot_action &HT_IOT_ACT_TX_NO_AGGREGATION )return ;if (!ieee->GetNmodeSupportBySecCfg (ieee->dev))
@@ -422,12 +422,12 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee, pHTInfo = ieee->pHTInfo;while (true) { -if (pHTInfo->IOTAction &HT_IOT_ACT_FORCED_CTS2SELF ) { +if (pHTInfo->iot_action &HT_IOT_ACT_FORCED_CTS2SELF ) { tcb_desc->bCTSEnable = true; tcb_desc->rts_rate =MGN_24M ; tcb_desc->bRTSEnable = true;break ; - }else if (pHTInfo->IOTAction & (HT_IOT_ACT_FORCED_RTS | + }else if (pHTInfo->iot_action & (HT_IOT_ACT_FORCED_RTS |HT_IOT_ACT_PURE_N_MODE )) { tcb_desc->bRTSEnable = true; tcb_desc->rts_rate =MGN_24M ;
@@ -885,7 +885,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) tcb_desc->priority = skb->priority;if (ether_type ==ETH_P_PAE ) { -if (ieee->pHTInfo->IOTAction & +if (ieee->pHTInfo->iot_action & HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate =MgntQuery_TxRateExcludeCCKRates (ieee);
@@ -910,7 +910,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) tcb_desc->data_rate =rtllib_current_rate (ieee);if (bdhcp) { -if (ieee->pHTInfo->IOTAction & +if (ieee->pHTInfo->iot_action & HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate =MgntQuery_TxRateExcludeCCKRates (ieee);
Signature · 1 line
2.37.3
PATCH 8/10 staging: rtl8192e: Rename SelfMimoPs, CurrentOpMode and bForcedShortGI
In reply to Philipp HortmannRename variable SelfMimoPs to self_mimo_ps, CurrentOpMode to current_op_mode and bForcedShortGI to forced_short_gi to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++-------- drivers/staging/rtl8192e/rtllib_tx.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +3 -3
@@ -140,11 +140,11 @@ struct rt_hi_throughput {enum ht_aggre_mode ForcedAMSDUMode;u16 ForcedAMSDUMaxSize; -u8 bForcedShortGI; +u8 forced_short_gi; -u8 CurrentOpMode; +u8 current_op_mode; -u8 SelfMimoPs; +u8 self_mimo_ps;u8 peer_mimo_ps;enum ht_extchnl_offset CurSTAExtChnlOffset;
drivers/staging/rtl8192e/rtl819x_HTProc.c +8 -8
@@ -90,9 +90,9 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) pHTInfo->AMPDU_Factor =2 ; pHTInfo->MPDU_Density =0 ; - pHTInfo->SelfMimoPs =3 ; -if (pHTInfo->SelfMimoPs ==2 ) - pHTInfo->SelfMimoPs =3 ; + pHTInfo->self_mimo_ps =3 ; +if (pHTInfo->self_mimo_ps ==2 ) + pHTInfo->self_mimo_ps =3 ; ieee->bTxDisableRateFallBack =0 ; ieee->bTxUseDriverAssingedRate =0 ;
@@ -300,7 +300,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap,else pCapELE->ChlWidth = (pHT->bRegBW40MHz ?1 :0 ); - pCapELE->MimoPwrSave = pHT->SelfMimoPs; + pCapELE->MimoPwrSave = pHT->self_mimo_ps; pCapELE->GreenField =0 ; pCapELE->ShortGI20Mhz =1 ; pCapELE->ShortGI40Mhz =1 ;
@@ -377,7 +377,7 @@ void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo, pHTInfoEle->RIFS =0 ; pHTInfoEle->PSMPAccessOnly =0 ; pHTInfoEle->SrvIntGranularity =0 ; - pHTInfoEle->OptMode = pHT->CurrentOpMode; + pHTInfoEle->OptMode = pHT->current_op_mode; pHTInfoEle->NonGFDevPresent =0 ; pHTInfoEle->DualBeacon =0 ; pHTInfoEle->SecondaryBeacon =0 ;
@@ -623,7 +623,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ieee->dot11HTOperationalRateSet, pMcsFilter); ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate; - pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode; + pHTInfo->current_op_mode = pPeerHTInfo->OptMode; }void HTInitializeHTInfo (struct rtllib_device *ieee)
@@ -637,7 +637,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) pHTInfo->bCurShortGI20MHz = false; pHTInfo->bCurShortGI40MHz = false; - pHTInfo->bForcedShortGI = false; + pHTInfo->forced_short_gi = false; pHTInfo->bCurSuppCCK = true;
@@ -774,7 +774,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee,if (pHTInfo->bCurrentHTSupport) {if (pNetwork->bssht.bd_ht_info_len !=0 ) - pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode; + pHTInfo->current_op_mode = pPeerHTInfo->OptMode; } }EXPORT_SYMBOL (HT_update_self_and_peer_setting);
drivers/staging/rtl8192e/rtllib_tx.c +2 -2
@@ -358,7 +358,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT)return ; -if (pHTInfo->bForcedShortGI) { +if (pHTInfo->forced_short_gi) { tcb_desc->bUseShortGI = true;return ; }
@@ -440,7 +440,7 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee,break ; }if (pHTInfo->bCurrentHTSupport && pHTInfo->bEnableHT) { -u8 HTOpMode = pHTInfo->CurrentOpMode; +u8 HTOpMode = pHTInfo->current_op_mode; if ((pHTInfo->bCurBW40MHz && (HTOpMode == 2 || HTOpMode == 3)) ||
Signature · 1 line
2.37.3
PATCH 9/10 staging: rtl8192e: Rename CurrentMPDU..., ForcedAMPDU... and ForcedMPDU...
In reply to Philipp HortmannRename variable CurrentMPDUDensity to current_mpdu_density, ForcedAMPDUFactor to forced_ampdu_factor and ForcedMPDUDensity to forced_mpdu_density to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 8 ++++---- drivers/staging/rtl8192e/rtllib_tx.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +3 -3
@@ -131,11 +131,11 @@ struct rt_hi_throughput {u8 AMPDU_Factor;u8 CurrentAMPDUFactor;u8 MPDU_Density; -u8 CurrentMPDUDensity; +u8 current_mpdu_density;enum ht_aggre_mode ForcedAMPDUMode; -u8 ForcedAMPDUFactor; -u8 ForcedMPDUDensity; +u8 forced_ampdu_factor; +u8 forced_mpdu_density;enum ht_aggre_mode ForcedAMSDUMode;u16 ForcedAMSDUMaxSize;
drivers/staging/rtl8192e/rtl819x_HTProc.c +4 -4
@@ -597,9 +597,9 @@ void HTOnAssocRsp(struct rtllib_device *ieee) } }if (pHTInfo->MPDU_Density > pPeerHTCap->MPDUDensity) - pHTInfo->CurrentMPDUDensity = pHTInfo->MPDU_Density; + pHTInfo->current_mpdu_density = pHTInfo->MPDU_Density;else - pHTInfo->CurrentMPDUDensity = pPeerHTCap->MPDUDensity; + pHTInfo->current_mpdu_density = pPeerHTCap->MPDUDensity;if (pHTInfo->iot_action &HT_IOT_ACT_TX_USE_AMSDU_8K ) { pHTInfo->bCurrentAMPDUEnable = false; pHTInfo->ForcedAMSDUMode =HT_AGG_FORCE_ENABLE ;
@@ -643,7 +643,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) pHTInfo->bCurrent_AMSDU_Support = false; pHTInfo->nCurrent_AMSDU_MaxSize = pHTInfo->nAMSDU_MaxSize; - pHTInfo->CurrentMPDUDensity = pHTInfo->MPDU_Density; + pHTInfo->current_mpdu_density = pHTInfo->MPDU_Density; pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor; memset((void *)(&(pHTInfo->SelfHTCap)), 0,
@@ -801,7 +801,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) pHTInfo->bCurrentAMPDUEnable = pHTInfo->bAMPDUEnable; pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor; - pHTInfo->CurrentMPDUDensity = pHTInfo->CurrentMPDUDensity; + pHTInfo->current_mpdu_density = pHTInfo->current_mpdu_density;HTFilterMCSRate (ieee, ieee->Regdot11TxHTOperationalRateSet, ieee->dot11HTOperationalRateSet);
drivers/staging/rtl8192e/rtllib_tx.c +3 -3
@@ -315,7 +315,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,if (ieee->iw_mode ==IW_MODE_INFRA ) { tcb_desc->bAMPDUEnable = true; tcb_desc->ampdu_factor = pHTInfo->CurrentAMPDUFactor; - tcb_desc->ampdu_density = pHTInfo->CurrentMPDUDensity; + tcb_desc->ampdu_density = pHTInfo->current_mpdu_density; } } FORCED_AGG_SETTING:
@@ -325,8 +325,8 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,case HT_AGG_FORCE_ENABLE : tcb_desc->bAMPDUEnable = true; - tcb_desc->ampdu_density = pHTInfo->ForcedMPDUDensity; - tcb_desc->ampdu_factor = pHTInfo->ForcedAMPDUFactor; + tcb_desc->ampdu_density = pHTInfo->forced_mpdu_density; + tcb_desc->ampdu_factor = pHTInfo->forced_ampdu_factor;break ;case HT_AGG_FORCE_DISABLE :
Signature · 1 line
2.37.3
PATCH 10/10 staging: rtl8192e: Remove unused variables ForcedAMSDUMaxSize, ...
In reply to Philipp HortmannRemove unused variables that are may just once written but never read ForcedAMSDUMaxSize, PeerBandwidth, SwBwStep, bIsPeerBcm and bAcceptAddbaReq to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 11 ----------- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ---- 2 files changed, 15 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +0 -11
@@ -138,8 +138,6 @@ struct rt_hi_throughput {u8 forced_mpdu_density;enum ht_aggre_mode ForcedAMSDUMode; -u16 ForcedAMSDUMaxSize; -u8 forced_short_gi;u8 current_op_mode;
@@ -149,11 +147,7 @@ struct rt_hi_throughput {enum ht_extchnl_offset CurSTAExtChnlOffset;u8 cur_tx_bw40mhz; -u8 PeerBandwidth; -u8 sw_bw_in_progress; -u8 SwBwStep; -u8 reg_rt2rt_aggregation;u8 RT2RT_HT_Mode;u8 current_rt2rt_aggregation;
@@ -165,17 +159,12 @@ struct rt_hi_throughput {u8 rx_reorder_win_size;u8 rx_reorder_pending_time;u16 rx_reorder_drop_counter; - -u8 bIsPeerBcm; -u8 IOTPeer;u32 iot_action;u8 iot_ra_func;u8 bWAIotBroadcom;u8 WAIotTH; - -u8 bAcceptAddbaReq; } __packed;struct bss_ht {
drivers/staging/rtl8192e/rtl819x_HTProc.c +0 -4
@@ -70,9 +70,6 @@ static u8 LINKSYS_MARVELL_4400N[3] = {0x00, 0x14, 0xa4};void HTUpdateDefaultSetting (struct rtllib_device *ieee) {struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; - - pHTInfo->bAcceptAddbaReq =1 ; - pHTInfo->bRegShortGI20MHz =1 ; pHTInfo->bRegShortGI40MHz =1 ;
@@ -603,7 +600,6 @@ void HTOnAssocRsp(struct rtllib_device *ieee)if (pHTInfo->iot_action &HT_IOT_ACT_TX_USE_AMSDU_8K ) { pHTInfo->bCurrentAMPDUEnable = false; pHTInfo->ForcedAMSDUMode =HT_AGG_FORCE_ENABLE ; - pHTInfo->ForcedAMSDUMaxSize =7935 ; } pHTInfo->cur_rx_reorder_enable = pHTInfo->reg_rx_reorder_enable;
Signature · 1 line
2.37.3
Quoted 6 lines · Philipp Hortmann
Rename and remove variables to avoid CamelCase which is not accepted by checkpatch.
Tested with rtl8192e
Transferred this patch over wlan connection of rtl8192e
Thanks!
regards,
dan carpenter