staging: rtl8192e: Rename variables in rtl819x_HTProc.c
cover staging: rtl8192e: Rename variables in rtl819x_HTProc.c
Rename 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 bTxDisableRate.., RegMaxLPSAwa.. and
bTxUseD..
staging: rtl8192e: Rename Regdot11HTOper.., bSupportM.. and
PowerSaveCo..
staging: rtl8192e: Rename Regdot11TxHT.., dot11HTOpera.. and
RegHTSuppRa..
staging: rtl8192e: Rename pPSC
staging: rtl8192e: Rename RFInProgres.., bEnableHT and RegChannelPlan
staging: rtl8192e: Rename LinkDetectInfo
staging: rtl8192e: Rename bNetPromisc.., IntelPromiscu.. and
bPromiscu..
staging: rtl8192e: Rename bFilterSour.., CCKPresentAt.. and
ResetProg..
staging: rtl8192e: Rename InterruptLog, RxCounter and bHwRfOffAction
staging: rtl8192e: Rename pHTInfo
.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 40 +- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 40 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 168 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 12 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 72 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 42 +- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 46 +-- drivers/staging/rtl8192e/rtl819x_BAProc.c | 20 +- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 376 +++++++++--------- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 44 +- drivers/staging/rtl8192e/rtllib_module.c | 6 +- drivers/staging/rtl8192e/rtllib_rx.c | 34 +- drivers/staging/rtl8192e/rtllib_softmac.c | 170 ++++---- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 16 +- drivers/staging/rtl8192e/rtllib_tx.c | 78 ++-- 18 files changed, 585 insertions(+), 585 deletions(-)
Signature · 1 line
2.37.3
PATCH 1/10 staging: rtl8192e: Rename bTxDisableRate.., RegMaxLPSAwa.. and bTxUseD..
Rename variable bTxDisableRateFallBack to tx_dis_rate_fallback, RegMaxLPSAwakeIntvl to reg_max_lps_awake_intvl and bTxUseDriverAssingedRate to tx_use_drv_assinged_rate to avoid CamelCase which is not accepted by checkpatch.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 10 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 10 ++++---- drivers/staging/rtl8192e/rtllib_softmac.c | 14 +++++------ drivers/staging/rtl8192e/rtllib_tx.c | 24 +++++++++---------- 7 files changed, 34 insertions(+), 34 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +2 -2
@@ -1136,8 +1136,8 @@ void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc, cb_desc->priority); pdesc->TxFWInfoSize =sizeof (struct tx_fwinfo_8190pci ); - pdesc->DISFB = cb_desc->bTxDisableRateFallBack; - pdesc->USERATE = cb_desc->bTxUseDriverAssingedRate; + pdesc->DISFB = cb_desc->tx_dis_rate_fallback; + pdesc->USERATE = cb_desc->tx_use_drv_assinged_rate; pdesc->FirstSeg =1 ; pdesc->LastSeg =1 ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +5 -5
@@ -494,8 +494,8 @@ static void _rtl92e_prepare_beacon(struct tasklet_struct *t) tcb_desc->queue_index =BEACON_QUEUE ; tcb_desc->data_rate =2 ; tcb_desc->RATRIndex =7 ; - tcb_desc->bTxDisableRateFallBack =1 ; - tcb_desc->bTxUseDriverAssingedRate =1 ; + tcb_desc->tx_dis_rate_fallback =1 ; + tcb_desc->tx_use_drv_assinged_rate =1 ;skb_push (pnewskb, priv->rtllib->tx_headroom); pdesc = &ring->desc[0 ];
@@ -822,7 +822,7 @@ static void _rtl92e_init_priv_constant(struct net_device *dev)struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) &priv->rtllib->PowerSaveControl; - pPSC->RegMaxLPSAwakeIntvl =5 ; + pPSC->reg_max_lps_awake_intvl =5 ; }static void _rtl92e_init_priv_variable (struct net_device *dev)
@@ -1538,8 +1538,8 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) } tcb_desc->RATRIndex =7 ; - tcb_desc->bTxDisableRateFallBack =1 ; - tcb_desc->bTxUseDriverAssingedRate =1 ; + tcb_desc->tx_dis_rate_fallback =1 ; + tcb_desc->tx_use_drv_assinged_rate =1 ; tcb_desc->bTxEnableFwCalcDur =1 ;skb_push (skb, priv->rtllib->tx_headroom); ret =_rtl92e_tx (dev, skb);
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +1 -1
@@ -196,7 +196,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net_device *dev,netdev_info (dev,"%s(): set lps awake interval ! extra is %d\n" , __func__, *extra); - pPSC->RegMaxLPSAwakeIntvl = *extra; + pPSC->reg_max_lps_awake_intvl = *extra;mutex_unlock (&priv->wx_mutex);return 0 ; }
drivers/staging/rtl8192e/rtl819x_HTProc.c +2 -2
@@ -91,8 +91,8 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) pHTInfo->self_mimo_ps =3 ;if (pHTInfo->self_mimo_ps ==2 ) pHTInfo->self_mimo_ps =3 ; - ieee->bTxDisableRateFallBack =0 ; - ieee->bTxUseDriverAssingedRate =0 ; + ieee->tx_dis_rate_fallback =0 ; + ieee->tx_use_drv_assinged_rate =0 ; ieee->bTxEnableFwCalcDur =1 ;
drivers/staging/rtl8192e/rtllib.h +5 -5
@@ -126,8 +126,8 @@ struct cb_desc { u8 bFirstSeg:1; u8 bLastSeg:1; u8 bEncrypt:1; - u8 bTxDisableRateFallBack:1; - u8 bTxUseDriverAssingedRate:1; + u8 tx_dis_rate_fallback:1; + u8 tx_use_drv_assinged_rate:1; u8 bHwSec:1;u8 nStuckCount;
@@ -1256,7 +1256,7 @@ struct rt_pwr_save_ctrl {bool bLeisurePs;u8 LpsIdleCount; -u8 RegMaxLPSAwakeIntvl; +u8 reg_max_lps_awake_intvl;u8 LPSAwakeIntvl;u32 CurPsLevel;
@@ -1441,8 +1441,8 @@ struct rtllib_device {u8 RegHTSuppRateSet[16 ];u8 HTCurrentOperaRate;u8 HTHighestOperaRate; -u8 bTxDisableRateFallBack; -u8 bTxUseDriverAssingedRate; +u8 tx_dis_rate_fallback; +u8 tx_use_drv_assinged_rate;u8 bTxEnableFwCalcDur;atomic_t atm_swbw;
drivers/staging/rtl8192e/rtllib_softmac.c +7 -7
@@ -220,8 +220,8 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee) tcb_desc->data_rate =MgntQuery_MgntFrameTxRate (ieee); tcb_desc->RATRIndex =7 ; - tcb_desc->bTxDisableRateFallBack =1 ; - tcb_desc->bTxUseDriverAssingedRate =1 ; + tcb_desc->tx_dis_rate_fallback =1 ; + tcb_desc->tx_use_drv_assinged_rate =1 ;if (single) {if (ieee->queue_stop) {enqueue_mgmt (ieee, skb);
@@ -298,8 +298,8 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, tcb_desc->data_rate =MgntQuery_MgntFrameTxRate (ieee); tcb_desc->RATRIndex =7 ; - tcb_desc->bTxDisableRateFallBack =1 ; - tcb_desc->bTxUseDriverAssingedRate =1 ; + tcb_desc->tx_dis_rate_fallback =1 ; + tcb_desc->tx_use_drv_assinged_rate =1 ;if (single) {if (type !=RTLLIB_FTYPE_CTL ) { header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );
@@ -1996,12 +1996,12 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time)if (pPSC->LPSAwakeIntvl ==0 ) pPSC->LPSAwakeIntvl =1 ; -if (pPSC->RegMaxLPSAwakeIntvl ==0 ) +if (pPSC->reg_max_lps_awake_intvl ==0 ) MaxPeriod =1 ; -else if (pPSC->RegMaxLPSAwakeIntvl ==0xFF ) +else if (pPSC->reg_max_lps_awake_intvl ==0xFF ) MaxPeriod = ieee->current_network.dtim_period;else - MaxPeriod = pPSC->RegMaxLPSAwakeIntvl; + MaxPeriod = pPSC->reg_max_lps_awake_intvl; pPSC->LPSAwakeIntvl = (pPSC->LPSAwakeIntvl >= MaxPeriod) ? MaxPeriod : (pPSC->LPSAwakeIntvl +1 );
drivers/staging/rtl8192e/rtllib_tx.c +12 -12
@@ -477,13 +477,13 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee,static void rtllib_txrate_selectmode (struct rtllib_device *ieee,struct cb_desc *tcb_desc) { -if (ieee->bTxDisableRateFallBack) - tcb_desc->bTxDisableRateFallBack = true; +if (ieee->tx_dis_rate_fallback) + tcb_desc->tx_dis_rate_fallback = true; -if (ieee->bTxUseDriverAssingedRate) - tcb_desc->bTxUseDriverAssingedRate = true; -if (!tcb_desc->bTxDisableRateFallBack || - !tcb_desc->bTxUseDriverAssingedRate) { +if (ieee->tx_use_drv_assinged_rate) + tcb_desc->tx_use_drv_assinged_rate = true; +if (!tcb_desc->tx_dis_rate_fallback || + !tcb_desc->tx_use_drv_assinged_rate) {if (ieee->iw_mode ==IW_MODE_INFRA || ieee->iw_mode ==IW_MODE_ADHOC ) tcb_desc->RATRIndex =0 ;
@@ -886,14 +886,14 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate = MgntQuery_TxRateExcludeCCKRates(ieee); - tcb_desc->bTxDisableRateFallBack = false; + tcb_desc->tx_dis_rate_fallback = false; } else { tcb_desc->data_rate = ieee->basic_rate; - tcb_desc->bTxDisableRateFallBack =1 ; + tcb_desc->tx_dis_rate_fallback =1 ; } tcb_desc->RATRIndex =7 ; - tcb_desc->bTxUseDriverAssingedRate =1 ; + tcb_desc->tx_use_drv_assinged_rate =1 ; }else {if (is_multicast_ether_addr (header.addr1)) tcb_desc->bMulticast =1 ;
@@ -910,14 +910,14 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate = MgntQuery_TxRateExcludeCCKRates(ieee); - tcb_desc->bTxDisableRateFallBack = false; + tcb_desc->tx_dis_rate_fallback = false; } else { tcb_desc->data_rate =MGN_1M ; - tcb_desc->bTxDisableRateFallBack =1 ; + tcb_desc->tx_dis_rate_fallback =1 ; } tcb_desc->RATRIndex =7 ; - tcb_desc->bTxUseDriverAssingedRate =1 ; + tcb_desc->tx_use_drv_assinged_rate =1 ; tcb_desc->bdhcp =1 ; }
Signature · 1 line
2.37.3
PATCH 2/10 staging: rtl8192e: Rename Regdot11HTOper.., bSupportM.. and PowerSaveCo..
In reply to Philipp HortmannRename variable Regdot11HTOperationalRateSet to reg_dot11ht_oper_rate_set, bSupportMode to support_mode and PowerSaveControl to pwr_save_ctrl to avoid CamelCase which is not accepted by checkpatch. Fix unnecessary parentheses warning from checkpatch when used with this variables.
--- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 30 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 10 +++---- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 +-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 4 +-- drivers/staging/rtl8192e/rtllib_softmac.c | 10 +++---- 7 files changed, 31 insertions(+), 31 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -1304,7 +1304,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - (&(priv->rtllib->PowerSaveControl)); + (&priv->rtllib->pwr_save_ctrl);bool bResult = true;u8 i =0 , QueueID =0 ;struct rtl8192_tx_ring *ring =NULL ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +15 -15
@@ -607,13 +607,13 @@ static void _rtl92e_refresh_support_rate(struct r8192_priv *priv)if (ieee->mode ==WIRELESS_MODE_N_24G || ieee->mode ==WIRELESS_MODE_N_5G ) { -memcpy (ieee->Regdot11HTOperationalRateSet, +memcpy (ieee->reg_dot11ht_oper_rate_set, ieee->RegHTSuppRateSet,16 );memcpy (ieee->Regdot11TxHTOperationalRateSet, ieee->RegHTSuppRateSet,16 ); }else { -memset (ieee->Regdot11HTOperationalRateSet,0 ,16 ); +memset (ieee->reg_dot11ht_oper_rate_set,0 ,16 ); } }
@@ -642,19 +642,19 @@ static u8 _rtl92e_get_supported_wireless_mode(struct net_device *dev)void rtl92e_set_wireless_mode (struct net_device *dev,u8 wireless_mode) {struct r8192_priv *priv =rtllib_priv (dev); -u8 bSupportMode =_rtl92e_get_supported_wireless_mode (dev); +u8 support_mode =_rtl92e_get_supported_wireless_mode (dev);if ((wireless_mode ==WIRELESS_MODE_AUTO ) || - ((wireless_mode & bSupportMode) ==0 )) { -if (bSupportMode &WIRELESS_MODE_N_24G ) { + ((wireless_mode & support_mode) ==0 )) { +if (support_mode &WIRELESS_MODE_N_24G ) { wireless_mode =WIRELESS_MODE_N_24G ; - }else if (bSupportMode &WIRELESS_MODE_N_5G ) { + }else if (support_mode &WIRELESS_MODE_N_5G ) { wireless_mode =WIRELESS_MODE_N_5G ; - }else if ((bSupportMode &WIRELESS_MODE_A )) { + }else if ((support_mode &WIRELESS_MODE_A )) { wireless_mode =WIRELESS_MODE_A ; - }else if ((bSupportMode &WIRELESS_MODE_G )) { + }else if ((support_mode &WIRELESS_MODE_G )) { wireless_mode =WIRELESS_MODE_G ; - }else if ((bSupportMode &WIRELESS_MODE_B )) { + }else if ((support_mode &WIRELESS_MODE_B )) { wireless_mode =WIRELESS_MODE_B ; }else { netdev_info(dev,
@@ -683,7 +683,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset) {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl);bool init_status; priv->bdisable_nic = false;
@@ -820,7 +820,7 @@ static void _rtl92e_init_priv_constant(struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - &priv->rtllib->PowerSaveControl; + &priv->rtllib->pwr_save_ctrl; pPSC->reg_max_lps_awake_intvl =5 ; }
@@ -877,7 +877,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->rf_change_in_progress = false; priv->bHwRfOffAction =0 ; priv->SetRFPowerStateInProgress = false; - priv->rtllib->PowerSaveControl.bLeisurePs = true; + priv->rtllib->pwr_save_ctrl.bLeisurePs = true; priv->rtllib->LPSDelayCnt =0 ; priv->rtllib->sta_sleep =LPS_IS_WAKE ; priv->rtllib->rf_power_state = rf_on;
@@ -1272,7 +1272,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)static u8 check_reset_cnt;unsigned long flags;struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl);bool bBusyTraffic = false;bool bHigherBusyTraffic = false;bool bHigherBusyRxTraffic = false;
@@ -1295,7 +1295,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) RTLLIB_NOLINK) && (ieee->rf_power_state == rf_on) && !ieee->is_set_key && (!ieee->proto_stoppping) && !ieee->wx_set_enc) { -if ((ieee->PowerSaveControl.ReturnPoint == +if ((ieee->pwr_save_ctrl.ReturnPoint ==IPS_CALLBACK_NONE ) && (!ieee->bNetPromiscuousMode)) {rtl92e_ips_enter (dev);
@@ -2422,7 +2422,7 @@ bool rtl92e_enable_nic(struct net_device *dev)bool init_status = true;struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl);if (!priv->up) {netdev_warn (dev,"%s(): Driver is already down!\n" , __func__);
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +5 -5
@@ -101,7 +101,7 @@ static void _rtl92e_ps_update_rf_state(struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl; pPSC->bSwRfProcessing = true;rtl92e_set_rf_state (dev, pPSC->eInactivePowerState,RF_CHANGE_BY_IPS );
@@ -113,7 +113,7 @@ void rtl92e_ips_enter(struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl;enum rt_rf_power_state rt_state; rt_state = priv->rtllib->rf_power_state;
@@ -129,7 +129,7 @@ void rtl92e_ips_leave(struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl;enum rt_rf_power_state rt_state; rt_state = priv->rtllib->rf_power_state;
@@ -207,7 +207,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl;if (!((priv->rtllib->iw_mode ==IW_MODE_INFRA ) && (priv->rtllib->state == RTLLIB_LINKED))
@@ -233,7 +233,7 @@ void rtl92e_leisure_ps_leave(struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl;if (pPSC->bLeisurePs) {if (priv->rtllib->ps !=RTLLIB_PS_DISABLED ) {
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +2 -2
@@ -160,7 +160,7 @@ static int _rtl92e_wx_adapter_power_status(struct net_device *dev, {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl);struct rtllib_device *ieee = priv->rtllib;mutex_lock (&priv->wx_mutex);
@@ -189,7 +189,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net_device *dev, {struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl);mutex_lock (&priv->wx_mutex);
drivers/staging/rtl8192e/rtl819x_HTProc.c +1 -1
@@ -323,7 +323,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, pCapELE->MPDUDensity =0 ; } -memcpy (pCapELE->MCS, ieee->Regdot11HTOperationalRateSet,16 ); +memcpy (pCapELE->MCS, ieee->reg_dot11ht_oper_rate_set,16 );memset (&pCapELE->ExtHTCapInfo,0 ,2 );memset (pCapELE->TxBFCap,0 ,4 );
drivers/staging/rtl8192e/rtllib.h +2 -2
@@ -1435,7 +1435,7 @@ struct rtllib_device {struct rt_hi_throughput *pHTInfo;spinlock_t reorder_spinlock; -u8 Regdot11HTOperationalRateSet[16 ]; +u8 reg_dot11ht_oper_rate_set[16 ];u8 Regdot11TxHTOperationalRateSet[16 ];u8 dot11HTOperationalRateSet[16 ];u8 RegHTSuppRateSet[16 ];
@@ -1645,7 +1645,7 @@ struct rtllib_device {struct rt_link_detect LinkDetectInfo;bool bIsAggregateFrame; -struct rt_pwr_save_ctrl PowerSaveControl; +struct rt_pwr_save_ctrl pwr_save_ctrl;/* used if IEEE_SOFTMAC_TX_QUEUE is set */ struct tx_pending tx_pending;
drivers/staging/rtl8192e/rtllib_softmac.c +5 -5
@@ -1504,7 +1504,7 @@ static void rtllib_associate_complete_wq(void *data)container_of_work_rsl (data, struct rtllib_device, associate_complete_wq); -struct rt_pwr_save_ctrl *pPSC = &(ieee->PowerSaveControl); +struct rt_pwr_save_ctrl *pPSC = &ieee->pwr_save_ctrl;netdev_info (ieee->dev,"Associated successfully with %pM\n" , ieee->current_network.bssid);
@@ -1960,7 +1960,7 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time) {int timeout;u8 dtim; -struct rt_pwr_save_ctrl *pPSC = &(ieee->PowerSaveControl); +struct rt_pwr_save_ctrl *pPSC = &ieee->pwr_save_ctrl;if (ieee->LPSDelayCnt) { ieee->LPSDelayCnt--;
@@ -2984,9 +2984,9 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->ps =RTLLIB_PS_DISABLED ; ieee->sta_sleep =LPS_IS_WAKE ; - ieee->Regdot11HTOperationalRateSet[0 ] =0xff ; - ieee->Regdot11HTOperationalRateSet[1 ] =0xff ; - ieee->Regdot11HTOperationalRateSet[4 ] =0x01 ; + ieee->reg_dot11ht_oper_rate_set[0 ] =0xff ; + ieee->reg_dot11ht_oper_rate_set[1 ] =0xff ; + ieee->reg_dot11ht_oper_rate_set[4 ] =0x01 ; ieee->Regdot11TxHTOperationalRateSet[0 ] =0xff ; ieee->Regdot11TxHTOperationalRateSet[1 ] =0xff ;
Signature · 1 line
2.37.3
PATCH 3/10 staging: rtl8192e: Rename Regdot11TxHT.., dot11HTOpera.. and RegHTSuppRa..
In reply to Philipp HortmannRename variable Regdot11TxHTOperationalRateSet to reg_dot11tx_ht_oper_rate_set, dot11HTOperationalRateSet to dot11ht_oper_rate_set and RegHTSuppRateSet to reg_ht_supp_rate_set to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 14 +++++++------- drivers/staging/rtl8192e/rtllib.h | 6 +++--- drivers/staging/rtl8192e/rtllib_softmac.c | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +1 -1
@@ -1958,7 +1958,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev);struct rtllib_device *ieee = priv->rtllib; -u8 *pMcsRate = ieee->dot11HTOperationalRateSet; +u8 *pMcsRate = ieee->dot11ht_oper_rate_set;u32 ratr_value =0 ;u16 rate_config =0 ;u8 rate_index =0 ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +3 -3
@@ -608,9 +608,9 @@ static void _rtl92e_refresh_support_rate(struct r8192_priv *priv)if (ieee->mode ==WIRELESS_MODE_N_24G || ieee->mode ==WIRELESS_MODE_N_5G ) {memcpy (ieee->reg_dot11ht_oper_rate_set, - ieee->RegHTSuppRateSet,16 ); -memcpy (ieee->Regdot11TxHTOperationalRateSet, - ieee->RegHTSuppRateSet,16 ); + ieee->reg_ht_supp_rate_set,16 ); +memcpy (ieee->reg_dot11tx_ht_oper_rate_set, + ieee->reg_ht_supp_rate_set,16 ); }else {memset (ieee->reg_dot11ht_oper_rate_set,0 ,16 );
drivers/staging/rtl8192e/rtl819x_HTProc.c +7 -7
@@ -489,7 +489,7 @@ static u8 HTFilterMCSRate(struct rtllib_device *ieee, u8 *pSupportMCS,u8 i;for (i =0 ; i <=15 ; i++) - pOperateMCS[i] = ieee->Regdot11TxHTOperationalRateSet[i] & + pOperateMCS[i] = ieee->reg_dot11tx_ht_oper_rate_set[i] & pSupportMCS[i];HT_PickMCSRate (ieee, pOperateMCS);
@@ -604,7 +604,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)HTIOTActDetermineRaFunc (ieee, ((pPeerHTCap->MCS[1 ]) !=0 )); -HTFilterMCSRate (ieee, pPeerHTCap->MCS, ieee->dot11HTOperationalRateSet); +HTFilterMCSRate (ieee, pPeerHTCap->MCS, ieee->dot11ht_oper_rate_set); pHTInfo->peer_mimo_ps = pPeerHTCap->MimoPwrSave;if (pHTInfo->peer_mimo_ps ==MIMO_PS_STATIC )
@@ -612,7 +612,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)else pMcsFilter =MCS_FILTER_ALL ; ieee->HTHighestOperaRate =HTGetHighestMCSRate (ieee, - ieee->dot11HTOperationalRateSet, + ieee->dot11ht_oper_rate_set, pMcsFilter); ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate;
@@ -661,7 +661,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) pHTInfo->iot_ra_func =0 ; { -u8 *RegHTSuppRateSets = &ieee->RegHTSuppRateSet[0 ]; +u8 *RegHTSuppRateSets = &ieee->reg_ht_supp_rate_set[0 ]; RegHTSuppRateSets[0 ] =0xFF ; RegHTSuppRateSets[1 ] =0xFF ;
@@ -796,10 +796,10 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) pHTInfo->current_mpdu_density = pHTInfo->current_mpdu_density; -HTFilterMCSRate (ieee, ieee->Regdot11TxHTOperationalRateSet, - ieee->dot11HTOperationalRateSet); +HTFilterMCSRate (ieee, ieee->reg_dot11tx_ht_oper_rate_set, + ieee->dot11ht_oper_rate_set); ieee->HTHighestOperaRate =HTGetHighestMCSRate (ieee, - ieee->dot11HTOperationalRateSet, + ieee->dot11ht_oper_rate_set,MCS_FILTER_ALL ); ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate;
drivers/staging/rtl8192e/rtllib.h +3 -3
@@ -1436,9 +1436,9 @@ struct rtllib_device {spinlock_t reorder_spinlock;u8 reg_dot11ht_oper_rate_set[16 ]; -u8 Regdot11TxHTOperationalRateSet[16 ]; -u8 dot11HTOperationalRateSet[16 ]; -u8 RegHTSuppRateSet[16 ]; +u8 reg_dot11tx_ht_oper_rate_set[16 ]; +u8 dot11ht_oper_rate_set[16 ]; +u8 reg_ht_supp_rate_set[16 ];u8 HTCurrentOperaRate;u8 HTHighestOperaRate;u8 tx_dis_rate_fallback;
drivers/staging/rtl8192e/rtllib_softmac.c +5 -5
@@ -1532,7 +1532,7 @@ static void rtllib_associate_complete_wq(void *data)"Successfully associated, ht not enabled(%d, %d)\n" , ieee->pHTInfo->bCurrentHTSupport, ieee->pHTInfo->bEnableHT); -memset (ieee->dot11HTOperationalRateSet,0 ,16 ); +memset (ieee->dot11ht_oper_rate_set,0 ,16 ); } ieee->LinkDetectInfo.SlotNum =2 * (1 + ieee->current_network.beacon_interval /
@@ -1728,7 +1728,7 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,netdev_info (ieee->dev,"Using B rates\n" ); } -memset (ieee->dot11HTOperationalRateSet,0 ,16 ); +memset (ieee->dot11ht_oper_rate_set,0 ,16 ); ieee->state =RTLLIB_LINKED ; } }
@@ -2988,9 +2988,9 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->reg_dot11ht_oper_rate_set[1 ] =0xff ; ieee->reg_dot11ht_oper_rate_set[4 ] =0x01 ; - ieee->Regdot11TxHTOperationalRateSet[0 ] =0xff ; - ieee->Regdot11TxHTOperationalRateSet[1 ] =0xff ; - ieee->Regdot11TxHTOperationalRateSet[4 ] =0x01 ; + ieee->reg_dot11tx_ht_oper_rate_set[0 ] =0xff ; + ieee->reg_dot11tx_ht_oper_rate_set[1 ] =0xff ; + ieee->reg_dot11tx_ht_oper_rate_set[4 ] =0x01 ; ieee->FirstIe_InScan = false; ieee->actscanning = false;
Signature · 1 line
2.37.3
PATCH 4/10 staging: rtl8192e: Rename pPSC
In reply to Philipp HortmannRename variable pPSC to psc to avoid CamelCase which is not accepted by checkpatch.
--- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 14 +++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 16 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 32 ++++++++-------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 10 ++--- drivers/staging/rtl8192e/rtllib.h | 10 ++--- drivers/staging/rtl8192e/rtllib_softmac.c | 38 +++++++++---------- 6 files changed, 60 insertions(+), 60 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +7 -7
@@ -1303,7 +1303,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, 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 *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl);bool bResult = true;u8 i =0 , QueueID =0 ;
@@ -1318,7 +1318,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,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 )) { +RT_IN_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC )) {bool rtstatus;u32 InitilizeCount =3 ;
@@ -1335,7 +1335,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,return false; } -RT_CLEAR_PS_LEVEL (pPSC, +RT_CLEAR_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC ); }else {rtl92e_writeb (dev,ANAPAR ,0x37 );
@@ -1399,11 +1399,11 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,break ; } -if (pPSC->RegRfPsLevel &RT_RF_OFF_LEVL_HALT_NIC && - !RT_IN_PS_LEVEL (pPSC,RT_RF_OFF_LEVL_HALT_NIC )) { +if (psc->RegRfPsLevel &RT_RF_OFF_LEVL_HALT_NIC && + !RT_IN_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC )) {rtl92e_disable_nic (dev); -RT_SET_PS_LEVEL (pPSC,RT_RF_OFF_LEVL_HALT_NIC ); - }else if (!(pPSC->RegRfPsLevel & +RT_SET_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC ); + }else if (!(psc->RegRfPsLevel &RT_RF_OFF_LEVL_HALT_NIC )) {rtl92e_set_rf_off (dev); }
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +8 -8
@@ -682,7 +682,7 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u8 wireless_mode)static int _rtl92e_sta_up (struct net_device *dev,bool is_silent_reset) {struct r8192_priv *priv =rtllib_priv (dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl);bool init_status;
@@ -700,7 +700,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset)return -1 ; } -RT_CLEAR_PS_LEVEL (pPSC,RT_RF_OFF_LEVL_HALT_NIC ); +RT_CLEAR_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC ); priv->bfirst_init = false;if (priv->polling_timer_on ==0 )
@@ -819,10 +819,10 @@ static void _rtl92e_init_priv_handler(struct net_device *dev)static void _rtl92e_init_priv_constant (struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; - pPSC->reg_max_lps_awake_intvl =5 ; + psc->reg_max_lps_awake_intvl =5 ; }static void _rtl92e_init_priv_variable (struct net_device *dev)
@@ -1271,7 +1271,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)enum reset_type ResetType =RESET_TYPE_NORESET ;static u8 check_reset_cnt;unsigned long flags; -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl);bool bBusyTraffic = false;bool bHigherBusyTraffic = false;
@@ -1389,7 +1389,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)spin_lock_irqsave (&priv->tx_lock, flags);if ((check_reset_cnt++ >=3 ) && (!ieee->is_roaming) && - (!priv->rf_change_in_progress) && (!pPSC->bSwRfProcessing)) { + (!priv->rf_change_in_progress) && (!psc->bSwRfProcessing)) { ResetType =_rtl92e_if_check_reset (dev); check_reset_cnt =3 ; }
@@ -2421,7 +2421,7 @@ bool rtl92e_enable_nic(struct net_device *dev) {bool init_status = true;struct r8192_priv *priv =rtllib_priv (dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl);if (!priv->up) {
@@ -2437,7 +2437,7 @@ bool rtl92e_enable_nic(struct net_device *dev) priv->bdisable_nic = false;return false; } -RT_CLEAR_PS_LEVEL (pPSC,RT_RF_OFF_LEVL_HALT_NIC ); +RT_CLEAR_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC ); priv->bfirst_init = false;rtl92e_irq_enable (dev);
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +16 -16
@@ -100,27 +100,27 @@ void rtl92e_enter_sleep(struct net_device *dev, u64 time)static void _rtl92e_ps_update_rf_state (struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; - pPSC->bSwRfProcessing = true; -rtl92e_set_rf_state (dev, pPSC->eInactivePowerState,RF_CHANGE_BY_IPS ); + psc->bSwRfProcessing = true; +rtl92e_set_rf_state (dev, psc->eInactivePowerState,RF_CHANGE_BY_IPS ); - pPSC->bSwRfProcessing = false; + psc->bSwRfProcessing = false; }void rtl92e_ips_enter (struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl;enum rt_rf_power_state rt_state; rt_state = priv->rtllib->rf_power_state; -if (rt_state == rf_on && !pPSC->bSwRfProcessing && +if (rt_state == rf_on && !psc->bSwRfProcessing && (priv->rtllib->state !=RTLLIB_LINKED ) && (priv->rtllib->iw_mode !=IW_MODE_MASTER )) { - pPSC->eInactivePowerState = rf_off; + psc->eInactivePowerState = rf_off;_rtl92e_ps_update_rf_state (dev); } }
@@ -128,14 +128,14 @@ void rtl92e_ips_enter(struct net_device *dev)void rtl92e_ips_leave (struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl;enum rt_rf_power_state rt_state; rt_state = priv->rtllib->rf_power_state; -if (rt_state != rf_on && !pPSC->bSwRfProcessing && +if (rt_state != rf_on && !psc->bSwRfProcessing && priv->rtllib->rf_off_reason <=RF_CHANGE_BY_IPS ) { - pPSC->eInactivePowerState = rf_on; + psc->eInactivePowerState = rf_on;_rtl92e_ps_update_rf_state (dev); } }
@@ -206,7 +206,7 @@ static bool _rtl92e_ps_set_mode(struct net_device *dev, u8 rtPsMode)void rtl92e_leisure_ps_enter (struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; if (!((priv->rtllib->iw_mode == IW_MODE_INFRA) &&
@@ -215,8 +215,8 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) (priv->rtllib->iw_mode == IW_MODE_MASTER)) return; -if (pPSC->bLeisurePs) { -if (pPSC->LpsIdleCount >=RT_CHECK_FOR_HANG_PERIOD ) { +if (psc->bLeisurePs) { +if (psc->LpsIdleCount >=RT_CHECK_FOR_HANG_PERIOD ) {if (priv->rtllib->ps ==RTLLIB_PS_DISABLED ) {if (priv->rtllib->SetFwCmdHandler)
@@ -225,17 +225,17 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) RTLLIB_PS_UNICAST); } }else - pPSC->LpsIdleCount++; + psc->LpsIdleCount++; } }void rtl92e_leisure_ps_leave (struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; -if (pPSC->bLeisurePs) { +if (psc->bLeisurePs) {if (priv->rtllib->ps !=RTLLIB_PS_DISABLED ) {_rtl92e_ps_set_mode (dev,RTLLIB_PS_DISABLED );if (priv->rtllib->SetFwCmdHandler)
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +5 -5
@@ -159,7 +159,7 @@ static int _rtl92e_wx_adapter_power_status(struct net_device *dev, union iwreq_data *wrqu, char *extra) { struct r8192_priv *priv = rtllib_priv(dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl);struct rtllib_device *ieee = priv->rtllib;
@@ -167,13 +167,13 @@ static int _rtl92e_wx_adapter_power_status(struct net_device *dev,if (*extra || priv->force_lps) { priv->ps_force = false; - pPSC->bLeisurePs = true; + psc->bLeisurePs = true; }else {if (priv->rtllib->state ==RTLLIB_LINKED )rtl92e_leisure_ps_leave (dev); priv->ps_force = true; - pPSC->bLeisurePs = false; + psc->bLeisurePs = false; ieee->ps = *extra; }
@@ -188,7 +188,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net_device *dev, char *extra) {struct r8192_priv *priv =rtllib_priv (dev); -struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) +struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl);mutex_lock (&priv->wx_mutex);
@@ -196,7 +196,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net_device *dev,netdev_info (dev,"%s(): set lps awake interval ! extra is %d\n" , __func__, *extra); - pPSC->reg_max_lps_awake_intvl = *extra; + psc->reg_max_lps_awake_intvl = *extra;mutex_unlock (&priv->wx_mutex);return 0 ; }
drivers/staging/rtl8192e/rtllib.h +5 -5
@@ -111,11 +111,11 @@ static inline void *netdev_priv_rsl(struct net_device *dev)#define SUPPORT_CKIP_MIC 0x08#define SUPPORT_CKIP_PK 0x10#define RT_RF_OFF_LEVL_HALT_NIC BIT3 -#define RT_IN_PS_LEVEL (pPSC, _PS_FLAG) \ - ((pPSC->CurPsLevel & _PS_FLAG) ? true : false) -#define RT_CLEAR_PS_LEVEL (pPSC, _PS_FLAG) \ - (pPSC->CurPsLevel &= (~(_PS_FLAG))) -#define RT_SET_PS_LEVEL (pPSC, _PS_FLAG) (pPSC->CurPsLevel |= _PS_FLAG) +#define RT_IN_PS_LEVEL (psc, _PS_FLAG) \ + ((psc->CurPsLevel & _PS_FLAG) ? true : false) +#define RT_CLEAR_PS_LEVEL (psc, _PS_FLAG) \ + (psc->CurPsLevel &= (~(_PS_FLAG))) +#define RT_SET_PS_LEVEL (psc, _PS_FLAG) (psc->CurPsLevel |= _PS_FLAG)/* defined for skb cb field */ /* At most 28 byte */
drivers/staging/rtl8192e/rtllib_softmac.c +19 -19
@@ -1504,7 +1504,7 @@ static void rtllib_associate_complete_wq(void *data)container_of_work_rsl (data, struct rtllib_device, associate_complete_wq); -struct rt_pwr_save_ctrl *pPSC = &ieee->pwr_save_ctrl; +struct rt_pwr_save_ctrl *psc = &ieee->pwr_save_ctrl;netdev_info (ieee->dev,"Associated successfully with %pM\n" , ieee->current_network.bssid);
@@ -1542,7 +1542,7 @@ static void rtllib_associate_complete_wq(void *data) ieee->LinkDetectInfo.NumRecvBcnInPeriod =1 ; ieee->LinkDetectInfo.NumRecvDataInPeriod =1 ; } - pPSC->LpsIdleCount =0 ; + psc->LpsIdleCount =0 ; ieee->link_change (ieee->dev);if (ieee->is_silent_reset) {
@@ -1960,7 +1960,7 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time) {int timeout;u8 dtim; -struct rt_pwr_save_ctrl *pPSC = &ieee->pwr_save_ctrl; +struct rt_pwr_save_ctrl *psc = &ieee->pwr_save_ctrl;if (ieee->LPSDelayCnt) { ieee->LPSDelayCnt--;
@@ -1990,21 +1990,21 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time)if (time) {if (ieee->bAwakePktSent) { - pPSC->LPSAwakeIntvl =1 ; + psc->LPSAwakeIntvl =1 ; }else {u8 MaxPeriod =1 ; -if (pPSC->LPSAwakeIntvl ==0 ) - pPSC->LPSAwakeIntvl =1 ; -if (pPSC->reg_max_lps_awake_intvl ==0 ) +if (psc->LPSAwakeIntvl ==0 ) + psc->LPSAwakeIntvl =1 ; +if (psc->reg_max_lps_awake_intvl ==0 ) MaxPeriod =1 ; -else if (pPSC->reg_max_lps_awake_intvl ==0xFF ) +else if (psc->reg_max_lps_awake_intvl ==0xFF ) MaxPeriod = ieee->current_network.dtim_period;else - MaxPeriod = pPSC->reg_max_lps_awake_intvl; - pPSC->LPSAwakeIntvl = (pPSC->LPSAwakeIntvl >= + MaxPeriod = psc->reg_max_lps_awake_intvl; + psc->LPSAwakeIntvl = (psc->LPSAwakeIntvl >= MaxPeriod) ? MaxPeriod : - (pPSC->LPSAwakeIntvl +1 ); + (psc->LPSAwakeIntvl +1 ); } {u8 LPSAwakeIntvl_tmp =0 ;
@@ -2012,23 +2012,23 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time)u8 count = ieee->current_network.tim.tim_count;if (count ==0 ) { -if (pPSC->LPSAwakeIntvl > period) +if (psc->LPSAwakeIntvl > period) LPSAwakeIntvl_tmp = period + - (pPSC->LPSAwakeIntvl - + (psc->LPSAwakeIntvl - period) - - ((pPSC->LPSAwakeIntvl-period) % + ((psc->LPSAwakeIntvl-period) % period);else - LPSAwakeIntvl_tmp = pPSC->LPSAwakeIntvl; + LPSAwakeIntvl_tmp = psc->LPSAwakeIntvl; }else { -if (pPSC->LPSAwakeIntvl > +if (psc->LPSAwakeIntvl > ieee->current_network.tim.tim_count) LPSAwakeIntvl_tmp = count + - (pPSC->LPSAwakeIntvl - count) - - ((pPSC->LPSAwakeIntvl-count)%period); + (psc->LPSAwakeIntvl - count) - + ((psc->LPSAwakeIntvl-count)%period);else - LPSAwakeIntvl_tmp = pPSC->LPSAwakeIntvl; + LPSAwakeIntvl_tmp = psc->LPSAwakeIntvl; } *time = ieee->current_network.last_dtim_sta_time
Signature · 1 line
2.37.3
PATCH 5/10 staging: rtl8192e: Rename RFInProgres.., bEnableHT and RegChannelPlan
In reply to Philipp HortmannRename variable RFInProgressTimeOut to rf_in_progress_timeout, bEnableHT to enable_ht and RegChannelPlan to reg_chnl_plan to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 ++++++------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtllib_softmac.c | 14 +++++++------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++---- 8 files changed, 24 insertions(+), 24 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +2 -2
@@ -474,10 +474,10 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->rf_chip =RF_8256 ; -if (priv->RegChannelPlan ==0xf ) +if (priv->reg_chnl_plan ==0xf ) priv->ChannelPlan = priv->eeprom_ChannelPlan;else - priv->ChannelPlan = priv->RegChannelPlan; + priv->ChannelPlan = priv->reg_chnl_plan;if (priv->eeprom_vid ==0x1186 && priv->eeprom_did ==0x3304 ) priv->CustomerID =RT_CID_DLINK ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +6 -6
@@ -672,9 +672,9 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u8 wireless_mode)if ((wireless_mode ==WIRELESS_MODE_N_24G ) || (wireless_mode ==WIRELESS_MODE_N_5G )) { - priv->rtllib->pHTInfo->bEnableHT =1 ; + priv->rtllib->pHTInfo->enable_ht =1 ; }else { - priv->rtllib->pHTInfo->bEnableHT =0 ; + priv->rtllib->pHTInfo->enable_ht =0 ; }_rtl92e_refresh_support_rate (priv); }
@@ -723,7 +723,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf) {struct r8192_priv *priv =rtllib_priv (dev);unsigned long flags =0 ; -u8 RFInProgressTimeOut =0 ; +u8 rf_in_progress_timeout =0 ;if (priv->up ==0 )return -1 ;
@@ -755,12 +755,12 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf)spin_lock_irqsave (&priv->rf_ps_lock, flags);while (priv->rf_change_in_progress) {spin_unlock_irqrestore (&priv->rf_ps_lock, flags); -if (RFInProgressTimeOut >100 ) { +if (rf_in_progress_timeout >100 ) {spin_lock_irqsave (&priv->rf_ps_lock, flags);break ; }mdelay (1 ); - RFInProgressTimeOut++; + rf_in_progress_timeout++;spin_lock_irqsave (&priv->rf_ps_lock, flags); } priv->rf_change_in_progress = true;
@@ -845,7 +845,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->rxringcount =MAX_RX_COUNT ; priv->irq_enabled =0 ; priv->chan =1 ; - priv->RegChannelPlan =0xf ; + priv->reg_chnl_plan =0xf ; priv->rtllib->mode =WIRELESS_MODE_AUTO ; priv->rtllib->iw_mode =IW_MODE_INFRA ; priv->rtllib->bNetPromiscuousMode = false;
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +1 -1
@@ -467,7 +467,7 @@ struct r8192_priv {bool bTXPowerDataReadFromEEPORM; -u16 RegChannelPlan; +u16 reg_chnl_plan;u16 ChannelPlan;u8 bHwRfOffAction;
drivers/staging/rtl8192e/rtl819x_HT.h +1 -1
@@ -96,7 +96,7 @@ enum ht_aggre_mode {struct rt_hi_throughput { -u8 bEnableHT; +u8 enable_ht;u8 bCurrentHTSupport;u8 bRegBW40MHz;
drivers/staging/rtl8192e/rtl819x_HTProc.c +2 -2
@@ -690,7 +690,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;u8 bIOTAction =0 ; -/* unmark bEnableHT flag here is the same reason why unmarked in +/* unmark enable_ht flag here is the same reason why unmarked in * function rtllib_softmac_new_net. WB 2008.09.10 */ if (pNetwork->bssht.bd_support_ht) {
@@ -776,7 +776,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) {struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; -if (pHTInfo->bEnableHT) { +if (pHTInfo->enable_ht) { pHTInfo->bCurrentHTSupport = true; pHTInfo->bCurSuppCCK = pHTInfo->bRegSuppCCK;
drivers/staging/rtl8192e/rtllib_softmac.c +7 -7
@@ -1179,11 +1179,11 @@ rtllib_association_req(struct rtllib_network *beacon,if ((ieee->rtllib_ap_sec_type && (ieee->rtllib_ap_sec_type (ieee) &SEC_ALG_TKIP )) || ieee->bForcedBgMode) { - ieee->pHTInfo->bEnableHT =0 ; + ieee->pHTInfo->enable_ht =0 ; ieee->mode =WIRELESS_MODE_G ; } -if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) { +if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) { ht_cap_buf = (u8 *)&(ieee->pHTInfo->SelfHTCap); ht_cap_len =sizeof (ieee->pHTInfo->SelfHTCap); HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len,
@@ -1324,7 +1324,7 @@ rtllib_association_req(struct rtllib_network *beacon,memcpy (tag, osCcxVerNum.Octet, osCcxVerNum.Length); tag += osCcxVerNum.Length; } -if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) { +if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) {if (ieee->pHTInfo->ePeerHTSpecVer !=HT_SPEC_VER_EWC ) { tag =skb_put (skb, ht_cap_len); *tag++ =MFIE_TYPE_HT_CAP ;
@@ -1358,7 +1358,7 @@ rtllib_association_req(struct rtllib_network *beacon,rtllib_TURBO_Info (ieee, &tag); } -if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) { +if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) {if (ieee->pHTInfo->ePeerHTSpecVer ==HT_SPEC_VER_EWC ) { tag =skb_put (skb, ht_cap_len); *tag++ =MFIE_TYPE_GENERIC ;
@@ -1524,14 +1524,14 @@ static void rtllib_associate_complete_wq(void *data) ieee->SetWirelessMode (ieee->dev,IEEE_B );netdev_info (ieee->dev,"Using B rates:%d\n" , ieee->rate); } -if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) { +if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) {netdev_info (ieee->dev,"Successfully associated, ht enabled\n" );HTOnAssocRsp (ieee); }else {netdev_info (ieee->dev,"Successfully associated, ht not enabled(%d, %d)\n" , ieee->pHTInfo->bCurrentHTSupport, - ieee->pHTInfo->bEnableHT); + ieee->pHTInfo->enable_ht);memset (ieee->dot11ht_oper_rate_set,0 ,16 ); } ieee->LinkDetectInfo.SlotNum = 2 * (1 +
@@ -1684,7 +1684,7 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee, ieee->current_network.ssid, ieee->current_network.channel, ieee->current_network.qos_data.supported, - ieee->pHTInfo->bEnableHT, + ieee->pHTInfo->enable_ht, ieee->current_network.bssht.bd_support_ht, ieee->current_network.mode, ieee->current_network.flags);
drivers/staging/rtl8192e/rtllib_softmac_wx.c +1 -1
@@ -359,7 +359,7 @@ void rtllib_wx_sync_scan_wq(void *data)if (ieee->ScanOperationBackupHandler) ieee->ScanOperationBackupHandler (ieee->dev,SCAN_OPT_BACKUP ); -if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && +if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht && ieee->pHTInfo->bCurBW40MHz) { b40M =1 ; chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;
drivers/staging/rtl8192e/rtllib_tx.c +4 -4
@@ -273,7 +273,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,if (rtllib_act_scanning (ieee, false))return ; -if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT) +if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht)return ;if (!IsQoSDataFrame (skb->data))return ;
@@ -354,7 +354,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee, tcb_desc->bUseShortGI = false; -if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT) +if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht)return ;if (pHTInfo->forced_short_gi) {
@@ -375,7 +375,7 @@ static void rtllib_query_BandwidthMode(struct rtllib_device *ieee, tcb_desc->bPacketBW = false; -if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT) +if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht)return ;if (tcb_desc->bMulticast || tcb_desc->bBroadcast)
@@ -438,7 +438,7 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee, tcb_desc->rts_rate =MGN_24M ;break ; } -if (pHTInfo->bCurrentHTSupport && pHTInfo->bEnableHT) { +if (pHTInfo->bCurrentHTSupport && pHTInfo->enable_ht) {u8 HTOpMode = pHTInfo->current_op_mode; if ((pHTInfo->bCurBW40MHz && (HTOpMode == 2 ||
Signature · 1 line
2.37.3
PATCH 6/10 staging: rtl8192e: Rename LinkDetectInfo
In reply to Philipp HortmannRename variable LinkDetectInfo to link_detect_info to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 58 ++++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 14 ++--- drivers/staging/rtl8192e/rtllib_softmac.c | 26 ++++----- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 8 +-- 6 files changed, 55 insertions(+), 55 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +29 -29
@@ -1250,15 +1250,15 @@ static void _rtl92e_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum, *TotalRxBcnNum =0 ; *TotalRxDataNum =0 ; - SlotIndex = (priv->rtllib->LinkDetectInfo.SlotIndex++) % - (priv->rtllib->LinkDetectInfo.SlotNum); - priv->rtllib->LinkDetectInfo.RxBcnNum[SlotIndex] = - priv->rtllib->LinkDetectInfo.NumRecvBcnInPeriod; - priv->rtllib->LinkDetectInfo.RxDataNum[SlotIndex] = - priv->rtllib->LinkDetectInfo.NumRecvDataInPeriod; -for (i =0 ; i < priv->rtllib->LinkDetectInfo.SlotNum; i++) { - *TotalRxBcnNum += priv->rtllib->LinkDetectInfo.RxBcnNum[i]; - *TotalRxDataNum += priv->rtllib->LinkDetectInfo.RxDataNum[i]; + SlotIndex = (priv->rtllib->link_detect_info.SlotIndex++) % + (priv->rtllib->link_detect_info.SlotNum); + priv->rtllib->link_detect_info.RxBcnNum[SlotIndex] = + priv->rtllib->link_detect_info.NumRecvBcnInPeriod; + priv->rtllib->link_detect_info.RxDataNum[SlotIndex] = + priv->rtllib->link_detect_info.NumRecvDataInPeriod; +for (i =0 ; i < priv->rtllib->link_detect_info.SlotNum; i++) { + *TotalRxBcnNum += priv->rtllib->link_detect_info.RxBcnNum[i]; + *TotalRxDataNum += priv->rtllib->link_detect_info.RxDataNum[i]; } }
@@ -1304,22 +1304,22 @@ static void _rtl92e_watchdog_wq_cb(void *data) }if ((ieee->state ==RTLLIB_LINKED ) && (ieee->iw_mode ==IW_MODE_INFRA ) && (!ieee->bNetPromiscuousMode)) { -if (ieee->LinkDetectInfo.NumRxOkInPeriod >100 || - ieee->LinkDetectInfo.NumTxOkInPeriod >100 ) +if (ieee->link_detect_info.NumRxOkInPeriod >100 || + ieee->link_detect_info.NumTxOkInPeriod >100 ) bBusyTraffic = true; -if (ieee->LinkDetectInfo.NumRxOkInPeriod >4000 || - ieee->LinkDetectInfo.NumTxOkInPeriod >4000 ) { +if (ieee->link_detect_info.NumRxOkInPeriod >4000 || + ieee->link_detect_info.NumTxOkInPeriod >4000 ) { bHigherBusyTraffic = true; -if (ieee->LinkDetectInfo.NumRxOkInPeriod >5000 ) +if (ieee->link_detect_info.NumRxOkInPeriod >5000 ) bHigherBusyRxTraffic = true;else bHigherBusyRxTraffic = false; } -if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + - ieee->LinkDetectInfo.NumTxOkInPeriod) >8 ) || - (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod >2 )) +if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + + ieee->link_detect_info.NumTxOkInPeriod) >8 ) || + (ieee->link_detect_info.NumRxUnicastOkInPeriod >2 )) bEnterPS = false;else bEnterPS = true;
@@ -1336,13 +1336,13 @@ static void _rtl92e_watchdog_wq_cb(void *data)rtl92e_leisure_ps_leave (dev); } - ieee->LinkDetectInfo.NumRxOkInPeriod =0 ; - ieee->LinkDetectInfo.NumTxOkInPeriod =0 ; - ieee->LinkDetectInfo.NumRxUnicastOkInPeriod =0 ; - ieee->LinkDetectInfo.bBusyTraffic = bBusyTraffic; + ieee->link_detect_info.NumRxOkInPeriod =0 ; + ieee->link_detect_info.NumTxOkInPeriod =0 ; + ieee->link_detect_info.NumRxUnicastOkInPeriod =0 ; + ieee->link_detect_info.bBusyTraffic = bBusyTraffic; - ieee->LinkDetectInfo.bHigherBusyTraffic = bHigherBusyTraffic; - ieee->LinkDetectInfo.bHigherBusyRxTraffic = bHigherBusyRxTraffic; + ieee->link_detect_info.bHigherBusyTraffic = bHigherBusyTraffic; + ieee->link_detect_info.bHigherBusyRxTraffic = bHigherBusyRxTraffic;if (ieee->state ==RTLLIB_LINKED && ieee->iw_mode ==IW_MODE_INFRA ) {u32 TotalRxBcnNum =0 ;
@@ -1383,8 +1383,8 @@ static void _rtl92e_watchdog_wq_cb(void *data) priv->check_roaming_cnt =0 ; } - ieee->LinkDetectInfo.NumRecvBcnInPeriod =0 ; - ieee->LinkDetectInfo.NumRecvDataInPeriod =0 ; + ieee->link_detect_info.NumRecvBcnInPeriod =0 ; + ieee->link_detect_info.NumRecvDataInPeriod =0 ; }spin_lock_irqsave (&priv->tx_lock, flags);
@@ -2213,25 +2213,25 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev)if (inta &IMR_BKDOK ) { priv->stats.txbkokint++; - priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.NumTxOkInPeriod++;_rtl92e_tx_isr (dev,BK_QUEUE ); }if (inta &IMR_BEDOK ) { priv->stats.txbeokint++; - priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.NumTxOkInPeriod++;_rtl92e_tx_isr (dev,BE_QUEUE ); }if (inta &IMR_VIDOK ) { priv->stats.txviokint++; - priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.NumTxOkInPeriod++;_rtl92e_tx_isr (dev,VI_QUEUE ); }if (inta &IMR_VODOK ) { priv->stats.txvookint++; - priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.NumTxOkInPeriod++;_rtl92e_tx_isr (dev,VO_QUEUE ); }
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +1 -1
@@ -393,7 +393,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, rt_state = priv->rtllib->rf_power_state;if (!priv->up)return -ENETDOWN ; -if (priv->rtllib->LinkDetectInfo.bBusyTraffic == true) +if (priv->rtllib->link_detect_info.bBusyTraffic == true)return -EAGAIN ;if (wrqu->data.flags &IW_SCAN_THIS_ESSID ) {
drivers/staging/rtl8192e/rtllib.h +1 -1
@@ -1643,7 +1643,7 @@ struct rtllib_device {struct bandwidth_autoswitch bandwidth_auto_switch;bool FwRWRF; -struct rt_link_detect LinkDetectInfo; +struct rt_link_detect link_detect_info;bool bIsAggregateFrame;struct rt_pwr_save_ctrl pwr_save_ctrl;
drivers/staging/rtl8192e/rtllib_rx.c +7 -7
@@ -1211,9 +1211,9 @@ static void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast,if (unicast) {if (ieee->state ==RTLLIB_LINKED ) { -if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + - ieee->LinkDetectInfo.NumTxOkInPeriod) >8 ) || - (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod >2 )) { +if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + + ieee->link_detect_info.NumTxOkInPeriod) >8 ) || + (ieee->link_detect_info.NumRxUnicastOkInPeriod >2 )) {if (ieee->LeisurePSLeave) ieee->LeisurePSLeave (ieee->dev); }
@@ -1355,8 +1355,8 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,/* Update statstics for AP roaming */ if (!bToOtherSTA) { - ieee->LinkDetectInfo.NumRecvDataInPeriod++; - ieee->LinkDetectInfo.NumRxOkInPeriod++; + ieee->link_detect_info.NumRecvDataInPeriod++; + ieee->link_detect_info.NumRxOkInPeriod++; }/* Data frame - extract src/dst addresses */
@@ -1437,7 +1437,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,else nr_subframes =1 ;if (unicast) - ieee->LinkDetectInfo.NumRxUnicastOkInPeriod += nr_subframes; + ieee->link_detect_info.NumRxUnicastOkInPeriod += nr_subframes;rtllib_rx_check_leave_lps (ieee, unicast, nr_subframes); }
@@ -2620,7 +2620,7 @@ static inline void rtllib_process_probe_response( }if (is_beacon (frame_ctl)) {if (ieee->state >=RTLLIB_LINKED ) - ieee->LinkDetectInfo.NumRecvBcnInPeriod++; + ieee->link_detect_info.NumRecvBcnInPeriod++; } }list_for_each_entry (target, &ieee->network_list, list) {
drivers/staging/rtl8192e/rtllib_softmac.c +13 -13
@@ -1534,13 +1534,13 @@ static void rtllib_associate_complete_wq(void *data) ieee->pHTInfo->enable_ht);memset (ieee->dot11ht_oper_rate_set,0 ,16 ); } - ieee->LinkDetectInfo.SlotNum =2 * (1 + + ieee->link_detect_info.SlotNum =2 * (1 + ieee->current_network.beacon_interval /500 ); -if (ieee->LinkDetectInfo.NumRecvBcnInPeriod ==0 || - ieee->LinkDetectInfo.NumRecvDataInPeriod ==0 ) { - ieee->LinkDetectInfo.NumRecvBcnInPeriod =1 ; - ieee->LinkDetectInfo.NumRecvDataInPeriod =1 ; +if (ieee->link_detect_info.NumRecvBcnInPeriod ==0 || + ieee->link_detect_info.NumRecvDataInPeriod ==0 ) { + ieee->link_detect_info.NumRecvBcnInPeriod =1 ; + ieee->link_detect_info.NumRecvDataInPeriod =1 ; } psc->LpsIdleCount =0 ; ieee->link_change (ieee->dev);
@@ -2369,7 +2369,7 @@ rtllib_rx_deauth(struct rtllib_device *ieee, struct sk_buff *skb) ieee->state =RTLLIB_ASSOCIATING ; ieee->softmac_stats.reassoc++; ieee->is_roaming = true; - ieee->LinkDetectInfo.bBusyTraffic = false; + ieee->link_detect_info.bBusyTraffic = false;rtllib_disassociate (ieee);RemovePeerTS (ieee, header->addr2);if (ieee->LedControlHandler !=NULL )
@@ -2963,13 +2963,13 @@ int rtllib_softmac_init(struct rtllib_device *ieee)if (!ieee->dot11d_info)return -ENOMEM ; - ieee->LinkDetectInfo.SlotIndex =0 ; - ieee->LinkDetectInfo.SlotNum =2 ; - ieee->LinkDetectInfo.NumRecvBcnInPeriod =0 ; - ieee->LinkDetectInfo.NumRecvDataInPeriod =0 ; - ieee->LinkDetectInfo.NumTxOkInPeriod =0 ; - ieee->LinkDetectInfo.NumRxOkInPeriod =0 ; - ieee->LinkDetectInfo.NumRxUnicastOkInPeriod =0 ; + ieee->link_detect_info.SlotIndex =0 ; + ieee->link_detect_info.SlotNum =2 ; + ieee->link_detect_info.NumRecvBcnInPeriod =0 ; + ieee->link_detect_info.NumRecvDataInPeriod =0 ; + ieee->link_detect_info.NumTxOkInPeriod =0 ; + ieee->link_detect_info.NumRxOkInPeriod =0 ; + ieee->link_detect_info.NumRxUnicastOkInPeriod =0 ; ieee->bIsAggregateFrame = false; ieee->assoc_id =0 ; ieee->queue_stop =0 ;
drivers/staging/rtl8192e/rtllib_softmac_wx.c +4 -4
@@ -391,10 +391,10 @@ void rtllib_wx_sync_scan_wq(void *data)/* Notify AP that I wake up again */ rtllib_sta_ps_send_null_frame (ieee,0 ); -if (ieee->LinkDetectInfo.NumRecvBcnInPeriod ==0 || - ieee->LinkDetectInfo.NumRecvDataInPeriod ==0 ) { - ieee->LinkDetectInfo.NumRecvBcnInPeriod =1 ; - ieee->LinkDetectInfo.NumRecvDataInPeriod =1 ; +if (ieee->link_detect_info.NumRecvBcnInPeriod ==0 || + ieee->link_detect_info.NumRecvDataInPeriod ==0 ) { + ieee->link_detect_info.NumRecvBcnInPeriod =1 ; + ieee->link_detect_info.NumRecvDataInPeriod =1 ; }if (ieee->data_hard_resume)
Signature · 1 line
2.37.3
PATCH 7/10 staging: rtl8192e: Rename bNetPromisc.., IntelPromiscu.. and bPromiscu..
In reply to Philipp HortmannRename variable bNetPromiscuousMode to net_promiscuous_md, IntelPromiscuousModeInfo to intel_promiscuous_md_info and bPromiscuousOn to promiscuous_on to avoid CamelCase which is not accepted by checkpatch.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 20 +++++++++---------- drivers/staging/rtl8192e/rtllib.h | 6 +++--- drivers/staging/rtl8192e/rtllib_rx.c | 8 ++++---- drivers/staging/rtl8192e/rtllib_softmac.c | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +1 -1
@@ -859,7 +859,7 @@ void rtl92e_link_change(struct net_device *dev) reg =rtl92e_readl (dev,RCR );if (priv->rtllib->state ==RTLLIB_LINKED ) { -if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn) +if (ieee->intel_promiscuous_md_info.promiscuous_on) ;else priv->ReceiveConfig = reg |=RCR_CBSSID ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +5 -5
@@ -848,9 +848,9 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->reg_chnl_plan =0xf ; priv->rtllib->mode =WIRELESS_MODE_AUTO ; priv->rtllib->iw_mode =IW_MODE_INFRA ; - priv->rtllib->bNetPromiscuousMode = false; - priv->rtllib->IntelPromiscuousModeInfo.bPromiscuousOn = false; - priv->rtllib->IntelPromiscuousModeInfo.bFilterSourceStationFrame = + priv->rtllib->net_promiscuous_md = false; + priv->rtllib->intel_promiscuous_md_info.promiscuous_on = false; + priv->rtllib->intel_promiscuous_md_info.bFilterSourceStationFrame = false; priv->rtllib->ieee_up =0 ; priv->retry_rts =DEFAULT_RETRY_RTS ;
@@ -1297,13 +1297,13 @@ static void _rtl92e_watchdog_wq_cb(void *data) (!ieee->proto_stoppping) && !ieee->wx_set_enc) {if ((ieee->pwr_save_ctrl.ReturnPoint ==IPS_CALLBACK_NONE ) && - (!ieee->bNetPromiscuousMode)) { + (!ieee->net_promiscuous_md)) {rtl92e_ips_enter (dev); } } }if ((ieee->state ==RTLLIB_LINKED ) && (ieee->iw_mode == -IW_MODE_INFRA ) && (!ieee->bNetPromiscuousMode)) { +IW_MODE_INFRA ) && (!ieee->net_promiscuous_md)) {if (ieee->link_detect_info.NumRxOkInPeriod >100 || ieee->link_detect_info.NumTxOkInPeriod >100 ) bBusyTraffic = true;
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +10 -10
@@ -251,7 +251,7 @@ static int _rtl92e_wx_set_mode(struct net_device *dev, 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) { + ieee->net_promiscuous_md) {if (rt_state == rf_off) {if (priv->rtllib->rf_off_reason >RF_CHANGE_BY_IPS ) {
@@ -1014,28 +1014,28 @@ static int _rtl92e_wx_set_promisc_mode(struct net_device *dev,u32 info_buf[3 ];u32 oid; -u32 bPromiscuousOn; +u32 promiscuous_on;u32 bFilterSourceStationFrame;if (copy_from_user (info_buf, wrqu->data.pointer,sizeof (info_buf)))return -EFAULT ; oid = info_buf[0 ]; - bPromiscuousOn = info_buf[1 ]; + promiscuous_on = info_buf[1 ]; bFilterSourceStationFrame = info_buf[2 ];if (oid ==OID_RT_INTEL_PROMISCUOUS_MODE ) { - ieee->IntelPromiscuousModeInfo.bPromiscuousOn = - (bPromiscuousOn) ? (true) : (false); - ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame = + ieee->intel_promiscuous_md_info.promiscuous_on = + (promiscuous_on) ? (true) : (false); + ieee->intel_promiscuous_md_info.bFilterSourceStationFrame = (bFilterSourceStationFrame) ? (true) : (false); - (bPromiscuousOn) ? + (promiscuous_on) ? (rtllib_EnableIntelPromiscuousMode (dev, false)) : (rtllib_DisableIntelPromiscuousMode (dev, false));netdev_info (dev,"=======>%s(), on = %d, filter src sta = %d\n" , - __func__, bPromiscuousOn, + __func__, promiscuous_on, bFilterSourceStationFrame); }else {return -1 ;
@@ -1054,8 +1054,8 @@ static int _rtl92e_wx_get_promisc_mode(struct net_device *dev,mutex_lock (&priv->wx_mutex);snprintf (extra,45 ,"PromiscuousMode:%d, FilterSrcSTAFrame:%d" , - ieee->IntelPromiscuousModeInfo.bPromiscuousOn, - ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame); + ieee->intel_promiscuous_md_info.promiscuous_on, + ieee->intel_promiscuous_md_info.bFilterSourceStationFrame); wrqu->data.length =strlen (extra) +1 ;mutex_unlock (&priv->wx_mutex);
drivers/staging/rtl8192e/rtllib.h +3 -3
@@ -1384,7 +1384,7 @@ struct rt_pmkid_list { };struct rt_intel_promisc_mode { -bool bPromiscuousOn; +bool promiscuous_on;bool bFilterSourceStationFrame; };
@@ -1470,8 +1470,8 @@ struct rtllib_device {int scan_age;int iw_mode;/* operating mode (IW_MODE_*) */ -bool bNetPromiscuousMode; -struct rt_intel_promisc_mode IntelPromiscuousModeInfo; +bool net_promiscuous_md; +struct rt_intel_promisc_mode intel_promiscuous_md_info;spinlock_t lock;spinlock_t wpax_suitlist_lock;
drivers/staging/rtl8192e/rtllib_rx.c +4 -4
@@ -999,8 +999,8 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, }/* Filter packets sent by an STA that will be forwarded by AP */ -if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn && - ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame) { +if (ieee->intel_promiscuous_md_info.promiscuous_on && + ieee->intel_promiscuous_md_info.bFilterSourceStationFrame) {if ((fc &RTLLIB_FCTL_TODS ) && !(fc &RTLLIB_FCTL_FROMDS ) && !ether_addr_equal (dst, ieee->current_network.bssid) &ðer_addr_equal (bssid, ieee->current_network.bssid)) {
@@ -1011,7 +1011,7 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc,/* Nullfunc frames may have PS-bit set, so they must be passed to * hostap_handle_sta_rx() before being dropped here. */ -if (!ieee->IntelPromiscuousModeInfo.bPromiscuousOn) { +if (!ieee->intel_promiscuous_md_info.promiscuous_on) { if (stype != RTLLIB_STYPE_DATA && stype != RTLLIB_STYPE_DATA_CFACK && stype != RTLLIB_STYPE_DATA_CFPOLL &&
@@ -1317,7 +1317,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, multicast =is_multicast_ether_addr (hdr->addr1); unicast = !multicast;if (unicast && !ether_addr_equal (dev->dev_addr, hdr->addr1)) { -if (ieee->bNetPromiscuousMode) +if (ieee->net_promiscuous_md) bToOtherSTA = true;else goto rx_dropped;
drivers/staging/rtl8192e/rtllib_softmac.c +2 -2
@@ -445,7 +445,7 @@ void rtllib_EnableIntelPromiscuousMode(struct net_device *dev, ieee->SetHwRegHandler (dev,HW_VAR_CECHK_BSSID , (u8 *)&bFilterOutNonAssociatedBSSID); - ieee->bNetPromiscuousMode = true; + ieee->net_promiscuous_md = true; }EXPORT_SYMBOL (rtllib_EnableIntelPromiscuousMode);
@@ -466,7 +466,7 @@ void rtllib_DisableIntelPromiscuousMode(struct net_device *dev, ieee->SetHwRegHandler (dev,HW_VAR_CECHK_BSSID , (u8 *)&bFilterOutNonAssociatedBSSID); - ieee->bNetPromiscuousMode = false; + ieee->net_promiscuous_md = false; }EXPORT_SYMBOL (rtllib_DisableIntelPromiscuousMode);
Signature · 1 line
2.37.3
PATCH 8/10 staging: rtl8192e: Rename bFilterSour.., CCKPresentAt.. and ResetProg..
In reply to Philipp HortmannRename variable bFilterSourceStationFrame to fltr_src_sta_frame, CCKPresentAttentuation to cck_present_attn and ResetProgress to rst_progress to avoid CamelCase which is not accepted by checkpatch.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 12 +++++------ .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 20 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 14 ++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 20 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 12 +++++------ drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- 8 files changed, 43 insertions(+), 43 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +6 -6
@@ -617,7 +617,7 @@ bool rtl92e_start_adapter(struct net_device *dev) start:rtl92e_reset_desc_ring (dev); priv->Rf_Mode = RF_OP_By_SW_3wire; -if (priv->ResetProgress ==RESET_TYPE_NORESET ) { +if (priv->rst_progress ==RESET_TYPE_NORESET ) {rtl92e_writeb (dev,ANAPAR ,0x37 );mdelay (500 ); }
@@ -650,7 +650,7 @@ bool rtl92e_start_adapter(struct net_device *dev) } priv->LoopbackMode =RTL819X_NO_LOOPBACK ; -if (priv->ResetProgress ==RESET_TYPE_NORESET ) { +if (priv->rst_progress ==RESET_TYPE_NORESET ) { ulRegRead =rtl92e_readl (dev,CPU_GEN );if (priv->LoopbackMode ==RTL819X_NO_LOOPBACK ) ulRegRead = (ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) |
@@ -699,7 +699,7 @@ bool rtl92e_start_adapter(struct net_device *dev)rtl92e_writeb (dev,ACK_TIMEOUT ,0x30 ); -if (priv->ResetProgress ==RESET_TYPE_NORESET ) +if (priv->rst_progress ==RESET_TYPE_NORESET )rtl92e_set_wireless_mode (dev, priv->rtllib->mode);rtl92e_cam_reset (dev); {
@@ -739,7 +739,7 @@ bool rtl92e_start_adapter(struct net_device *dev) } } -if (priv->ResetProgress ==RESET_TYPE_NORESET ) { +if (priv->rst_progress ==RESET_TYPE_NORESET ) { rtStatus =rtl92e_config_phy (dev);if (!rtStatus) {netdev_info (dev,"RF Config failed\n" );
@@ -766,7 +766,7 @@ bool rtl92e_start_adapter(struct net_device *dev)else priv->Rf_Mode = RF_OP_By_SW_3wire; -if (priv->ResetProgress ==RESET_TYPE_NORESET ) { +if (priv->rst_progress ==RESET_TYPE_NORESET ) {rtl92e_dm_init_txpower_tracking (dev);if (priv->IC_Cut >= IC_VersionCut_D) {
@@ -795,7 +795,7 @@ bool rtl92e_start_adapter(struct net_device *dev) } priv->CCKPresentAttentuation_40Mdefault =0 ; priv->CCKPresentAttentuation_difference =0 ; - priv->CCKPresentAttentuation = + priv->cck_present_attn = priv->CCKPresentAttentuation_20Mdefault; priv->btxpower_tracking = false; }
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +10 -10
@@ -1008,16 +1008,16 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *dev)switch (priv->CurrentChannelBW) {case HT_CHANNEL_WIDTH_20 : - priv->CCKPresentAttentuation = + priv->cck_present_attn = priv->CCKPresentAttentuation_20Mdefault + priv->CCKPresentAttentuation_difference; -if (priv->CCKPresentAttentuation > +if (priv->cck_present_attn > (CCKTxBBGainTableLength-1 )) - priv->CCKPresentAttentuation = + priv->cck_present_attn = CCKTxBBGainTableLength-1 ; -if (priv->CCKPresentAttentuation <0 ) - priv->CCKPresentAttentuation =0 ; +if (priv->cck_present_attn <0 ) + priv->cck_present_attn =0 ;if (priv->rtllib->current_network.channel ==14 && !priv->bcck_in_ch14) {
@@ -1033,16 +1033,16 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *dev)break ;case HT_CHANNEL_WIDTH_20_40 : - priv->CCKPresentAttentuation = + priv->cck_present_attn = priv->CCKPresentAttentuation_40Mdefault + priv->CCKPresentAttentuation_difference; -if (priv->CCKPresentAttentuation > +if (priv->cck_present_attn > (CCKTxBBGainTableLength -1 )) - priv->CCKPresentAttentuation = + priv->cck_present_attn = CCKTxBBGainTableLength-1 ; -if (priv->CCKPresentAttentuation <0 ) - priv->CCKPresentAttentuation =0 ; +if (priv->cck_present_attn <0 ) + priv->cck_present_attn =0 ;if (priv->rtllib->current_network.channel ==14 && !priv->bcck_in_ch14) {
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +7 -7
@@ -850,7 +850,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->rtllib->iw_mode =IW_MODE_INFRA ; priv->rtllib->net_promiscuous_md = false; priv->rtllib->intel_promiscuous_md_info.promiscuous_on = false; - priv->rtllib->intel_promiscuous_md_info.bFilterSourceStationFrame = + priv->rtllib->intel_promiscuous_md_info.fltr_src_sta_frame = false; priv->rtllib->ieee_up =0 ; priv->retry_rts =DEFAULT_RETRY_RTS ;
@@ -861,11 +861,11 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->promisc = (dev->flags &IFF_PROMISC ) ?1 :0 ; priv->bcck_in_ch14 = false; priv->bfsync_processing = false; - priv->CCKPresentAttentuation =0 ; + priv->cck_present_attn =0 ; priv->rfa_txpowertrackingindex =0 ; priv->rfc_txpowertrackingindex =0 ; priv->CckPwEnl =6 ; - priv->ResetProgress =RESET_TYPE_NORESET ; + priv->rst_progress =RESET_TYPE_NORESET ; priv->force_reset = false;memset (priv->rtllib->swcamtable,0 ,sizeof (struct sw_cam_table ) *32 );
@@ -1135,8 +1135,8 @@ static void _rtl92e_if_silent_reset(struct net_device *dev)struct rtllib_device *ieee = priv->rtllib;unsigned long flag; -if (priv->ResetProgress ==RESET_TYPE_NORESET ) { - priv->ResetProgress =RESET_TYPE_SILENT ; +if (priv->rst_progress ==RESET_TYPE_NORESET ) { + priv->rst_progress =RESET_TYPE_SILENT ;spin_lock_irqsave (&priv->rf_ps_lock, flag);if (priv->rf_change_in_progress) {
@@ -1233,7 +1233,7 @@ static void _rtl92e_if_silent_reset(struct net_device *dev)rtl92e_cam_restore (dev);rtl92e_dm_restore_state (dev); END: - priv->ResetProgress =RESET_TYPE_NORESET ; + priv->rst_progress =RESET_TYPE_NORESET ; priv->reset_count++; priv->bResetInProgress = false;
@@ -1396,7 +1396,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)spin_unlock_irqrestore (&priv->tx_lock, flags);if (ResetType ==RESET_TYPE_NORMAL ) { - priv->ResetProgress =RESET_TYPE_NORMAL ; + priv->rst_progress =RESET_TYPE_NORMAL ;return ; }
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +2 -2
@@ -483,7 +483,7 @@ struct r8192_priv {u8 CCKPresentAttentuation_20Mdefault;u8 CCKPresentAttentuation_40Mdefault;s8 CCKPresentAttentuation_difference; -s8 CCKPresentAttentuation; +s8 cck_present_attn;long undecorated_smoothed_pwdb;u32 MCSTxPowerLevelOriginalOffset[6 ];
@@ -536,7 +536,7 @@ struct r8192_priv {u32 reset_count; -enum reset_type ResetProgress; +enum reset_type rst_progress;u16 TxCounter;u16 RxCounter;bool bResetInProgress;
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +10 -10
@@ -267,7 +267,7 @@ static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev)"PATH=/usr/bin:/bin" , NULL}; -if (priv->ResetProgress ==RESET_TYPE_SILENT ) +if (priv->rst_progress ==RESET_TYPE_SILENT )return ;if (priv->rtllib->state !=RTLLIB_LINKED )return ;
@@ -716,21 +716,21 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev) }if (priv->CurrentChannelBW ==HT_CHANNEL_WIDTH_20 ) - priv->CCKPresentAttentuation = + priv->cck_present_attn = priv->CCKPresentAttentuation_20Mdefault + priv->CCKPresentAttentuation_difference;else - priv->CCKPresentAttentuation = + priv->cck_present_attn = priv->CCKPresentAttentuation_40Mdefault + priv->CCKPresentAttentuation_difference; -if (priv->CCKPresentAttentuation > (CCKTxBBGainTableLength-1 )) - priv->CCKPresentAttentuation = CCKTxBBGainTableLength-1 ; -if (priv->CCKPresentAttentuation <0 ) - priv->CCKPresentAttentuation =0 ; +if (priv->cck_present_attn > (CCKTxBBGainTableLength-1 )) + priv->cck_present_attn = CCKTxBBGainTableLength-1 ; +if (priv->cck_present_attn <0 ) + priv->cck_present_attn =0 ; -if (priv->CCKPresentAttentuation >-1 && - priv->CCKPresentAttentuation < CCKTxBBGainTableLength) { +if (priv->cck_present_attn >-1 && + priv->cck_present_attn < CCKTxBBGainTableLength) {if (priv->rtllib->current_network.channel ==14 && !priv->bcck_in_ch14) { priv->bcck_in_ch14 = true;
@@ -963,7 +963,7 @@ static void _rtl92e_dm_cck_tx_power_adjust_tssi(struct net_device *dev, {u32 TempVal;struct r8192_priv *priv =rtllib_priv (dev); -u8 attenuation = priv->CCKPresentAttentuation; +u8 attenuation = priv->cck_present_attn; TempVal =0 ;if (!bInCH14) {
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +6 -6
@@ -1015,20 +1015,20 @@ static int _rtl92e_wx_set_promisc_mode(struct net_device *dev,u32 oid;u32 promiscuous_on; -u32 bFilterSourceStationFrame; +u32 fltr_src_sta_frame;if (copy_from_user (info_buf, wrqu->data.pointer,sizeof (info_buf)))return -EFAULT ; oid = info_buf[0 ]; promiscuous_on = info_buf[1 ]; - bFilterSourceStationFrame = info_buf[2 ]; + fltr_src_sta_frame = info_buf[2 ];if (oid ==OID_RT_INTEL_PROMISCUOUS_MODE ) { ieee->intel_promiscuous_md_info.promiscuous_on = (promiscuous_on) ? (true) : (false); - ieee->intel_promiscuous_md_info.bFilterSourceStationFrame = - (bFilterSourceStationFrame) ? (true) : (false); + ieee->intel_promiscuous_md_info.fltr_src_sta_frame = + (fltr_src_sta_frame) ? (true) : (false); (promiscuous_on) ? (rtllib_EnableIntelPromiscuousMode (dev, false)) : (rtllib_DisableIntelPromiscuousMode (dev, false));
@@ -1036,7 +1036,7 @@ static int _rtl92e_wx_set_promisc_mode(struct net_device *dev,netdev_info (dev,"=======>%s(), on = %d, filter src sta = %d\n" , __func__, promiscuous_on, - bFilterSourceStationFrame); + fltr_src_sta_frame); }else {return -1 ; }
@@ -1055,7 +1055,7 @@ static int _rtl92e_wx_get_promisc_mode(struct net_device *dev,snprintf (extra,45 ,"PromiscuousMode:%d, FilterSrcSTAFrame:%d" , ieee->intel_promiscuous_md_info.promiscuous_on, - ieee->intel_promiscuous_md_info.bFilterSourceStationFrame); + ieee->intel_promiscuous_md_info.fltr_src_sta_frame); wrqu->data.length =strlen (extra) +1 ;mutex_unlock (&priv->wx_mutex);
drivers/staging/rtl8192e/rtllib.h +1 -1
@@ -1385,7 +1385,7 @@ struct rt_pmkid_list {struct rt_intel_promisc_mode {bool promiscuous_on; -bool bFilterSourceStationFrame; +bool fltr_src_sta_frame; };
drivers/staging/rtl8192e/rtllib_rx.c +1 -1
@@ -1000,7 +1000,7 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc,/* Filter packets sent by an STA that will be forwarded by AP */ if (ieee->intel_promiscuous_md_info.promiscuous_on && - ieee->intel_promiscuous_md_info.bFilterSourceStationFrame) { + ieee->intel_promiscuous_md_info.fltr_src_sta_frame) {if ((fc &RTLLIB_FCTL_TODS ) && !(fc &RTLLIB_FCTL_FROMDS ) && !ether_addr_equal (dst, ieee->current_network.bssid) &ðer_addr_equal (bssid, ieee->current_network.bssid)) {
Signature · 1 line
2.37.3
PATCH 9/10 staging: rtl8192e: Rename InterruptLog, RxCounter and bHwRfOffAction
In reply to Philipp HortmannRename variable InterruptLog to int_log, RxCounter to rx_ctr and bHwRfOffAction to hw_rf_off_action to avoid CamelCase which is not accepted by checkpatch.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +3 -3
@@ -1928,7 +1928,7 @@ void rtl92e_stop_adapter(struct net_device *dev, bool reset)if (!reset) {mdelay (150 ); - priv->bHwRfOffAction =2 ; + priv->hw_rf_off_action =2 ;if (!priv->rtllib->bSupportRemoteWakeUp) {rtl92e_set_rf_off (dev);
@@ -2129,7 +2129,7 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) SlotIndex = (priv->SilentResetRxSlotIndex++)%SilentResetRxSoltNum; -if (priv->RxCounter == RegRxCounter) { +if (priv->rx_ctr == RegRxCounter) { priv->SilentResetRxStuckEvent[SlotIndex] =1 ;for (i =0 ; i < SilentResetRxSoltNum; i++)
@@ -2147,7 +2147,7 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) priv->SilentResetRxStuckEvent[SlotIndex] =0 ; } - priv->RxCounter = RegRxCounter; + priv->rx_ctr = RegRxCounter;return bStuck; }
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +2 -2
@@ -1342,7 +1342,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,mdelay (1 );rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter1,0x4 ,0x1 ); - priv->bHwRfOffAction =0 ; + priv->hw_rf_off_action =0 ;rtl92e_set_bb_reg (dev, rFPGA0_XA_RFInterfaceOE,BIT4 ,0x1 );
@@ -1450,7 +1450,7 @@ bool rtl92e_set_rf_power_state(struct net_device *dev,bool bResult = false;if (rf_power_state == priv->rtllib->rf_power_state && - priv->bHwRfOffAction ==0 ) { + priv->hw_rf_off_action ==0 ) {return bResult; }
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +4 -4
@@ -869,13 +869,13 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->force_reset = false;memset (priv->rtllib->swcamtable,0 ,sizeof (struct sw_cam_table ) *32 ); -memset (&priv->InterruptLog,0 ,sizeof (struct log_int_8190 )); - priv->RxCounter =0 ; +memset (&priv->int_log,0 ,sizeof (struct log_int_8190 )); + priv->rx_ctr =0 ; priv->rtllib->wx_set_enc =0 ; priv->hw_radio_off = false; priv->rtllib->rf_off_reason =0 ; priv->rf_change_in_progress = false; - priv->bHwRfOffAction =0 ; + priv->hw_rf_off_action =0 ; priv->SetRFPowerStateInProgress = false; priv->rtllib->pwr_save_ctrl.bLeisurePs = true; priv->rtllib->LPSDelayCnt =0 ;
@@ -2189,7 +2189,7 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev)if (inta &IMR_ROK ) { priv->stats.rxint++; - priv->InterruptLog.nIMR_ROK++; + priv->int_log.nIMR_ROK++;tasklet_schedule (&priv->irq_rx_tasklet); }
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +3 -3
@@ -330,7 +330,7 @@ struct r8192_priv {struct work_struct reset_wq; -struct log_int_8190 InterruptLog; +struct log_int_8190 int_log;enum rt_customer_id CustomerID;
@@ -469,7 +469,7 @@ struct r8192_priv {u16 reg_chnl_plan;u16 ChannelPlan; -u8 bHwRfOffAction; +u8 hw_rf_off_action;bool rf_change_in_progress;bool SetRFPowerStateInProgress;
@@ -538,7 +538,7 @@ struct r8192_priv {enum reset_type rst_progress;u16 TxCounter; -u16 RxCounter; +u16 rx_ctr;bool bResetInProgress;bool force_reset;bool force_lps;
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +1 -1
@@ -1693,7 +1693,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)if (bActuallySet) {mdelay (1000 ); - priv->bHwRfOffAction =1 ; + priv->hw_rf_off_action =1 ;rtl92e_set_rf_state (dev, rf_power_state_to_set,RF_CHANGE_BY_HW );if (priv->hw_radio_off) argv[1 ] ="RFOFF" ;
Signature · 1 line
2.37.3
PATCH 10/10 staging: rtl8192e: Rename pHTInfo
In reply to Philipp HortmannRename variable pHTInfo to ht_info to avoid CamelCase which is not accepted by checkpatch.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 50 +-- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- drivers/staging/rtl8192e/rtl819x_BAProc.c | 20 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 354 +++++++++--------- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 4 +- drivers/staging/rtl8192e/rtllib_module.c | 6 +- drivers/staging/rtl8192e/rtllib_rx.c | 12 +- drivers/staging/rtl8192e/rtllib_softmac.c | 78 ++-- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 8 +- drivers/staging/rtl8192e/rtllib_tx.c | 54 +-- 14 files changed, 307 insertions(+), 307 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +5 -5
@@ -1978,7 +1978,7 @@ void rtl92e_update_ratr_table(struct net_device *dev)break ;case IEEE_N_24G :case IEEE_N_5G : -if (ieee->pHTInfo->peer_mimo_ps ==0 ) { +if (ieee->ht_info->peer_mimo_ps ==0 ) { ratr_value &=0x0007F007 ; }else {if (priv->rf_type ==RF_1T2R )
@@ -1991,11 +1991,11 @@ void rtl92e_update_ratr_table(struct net_device *dev)break ; } ratr_value &=0x0FFFFFFF ; -if (ieee->pHTInfo->cur_tx_bw40mhz && - ieee->pHTInfo->bCurShortGI40MHz) +if (ieee->ht_info->cur_tx_bw40mhz && + ieee->ht_info->bCurShortGI40MHz) ratr_value |=0x80000000 ; -else if (!ieee->pHTInfo->cur_tx_bw40mhz && - ieee->pHTInfo->bCurShortGI20MHz) +else if (!ieee->ht_info->cur_tx_bw40mhz && + ieee->ht_info->bCurShortGI20MHz) ratr_value |=0x80000000 ;rtl92e_writel (dev,RATR0 +rate_index*4 , ratr_value);rtl92e_writeb (dev,UFWP ,1 );
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +1 -1
@@ -41,7 +41,7 @@ void rtl92e_enable_hw_security_config(struct net_device *dev) } ieee->hwsec_active =1 ; -if ((ieee->pHTInfo->iot_action &HT_IOT_ACT_PURE_N_MODE ) || !hwwep) { +if ((ieee->ht_info->iot_action &HT_IOT_ACT_PURE_N_MODE ) || !hwwep) { ieee->hwsec_active =0 ; SECR_value &= ~SCR_RxDecEnable; }
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +6 -6
@@ -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->current_rt2rt_long_slot_time)) { + (!priv->rtllib->ht_info->current_rt2rt_long_slot_time)) {if (cur_slot_time !=SHORT_SLOT_TIME ) { slot_time_val =SHORT_SLOT_TIME ; priv->rtllib->SetHwRegHandler(dev,
@@ -339,10 +339,10 @@ static void _rtl92e_update_beacon(void *data)struct rtllib_device *ieee = priv->rtllib;struct rtllib_network *net = &ieee->current_network; -if (ieee->pHTInfo->bCurrentHTSupport) +if (ieee->ht_info->bCurrentHTSupport)HT_update_self_and_peer_setting (ieee, net); - ieee->pHTInfo->current_rt2rt_long_slot_time = net->bssht.bd_rt2rt_long_slot_time; - ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.rt2rt_ht_mode; + ieee->ht_info->current_rt2rt_long_slot_time = net->bssht.bd_rt2rt_long_slot_time; + ieee->ht_info->RT2RT_HT_Mode = net->bssht.rt2rt_ht_mode;_rtl92e_update_cap (dev, net->capability); }
@@ -672,9 +672,9 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u8 wireless_mode)if ((wireless_mode ==WIRELESS_MODE_N_24G ) || (wireless_mode ==WIRELESS_MODE_N_5G )) { - priv->rtllib->pHTInfo->enable_ht =1 ; + priv->rtllib->ht_info->enable_ht =1 ; }else { - priv->rtllib->pHTInfo->enable_ht =0 ; + priv->rtllib->ht_info->enable_ht =0 ; }_rtl92e_refresh_support_rate (priv); }
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +25 -25
148 lines not on this page · raw message
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +1 -1
@@ -915,7 +915,7 @@ static int _rtl92e_wx_set_encode_ext(struct net_device *dev, key, 0); }else {if ((ieee->pairwise_key_type ==KEY_TYPE_CCMP ) && - ieee->pHTInfo->bCurrentHTSupport) + ieee->ht_info->bCurrentHTSupport)rtl92e_writeb (dev,0x173 ,1 );rtl92e_set_key (dev,4 , idx, alg, (u8 *)ieee->ap_mac_addr,0 , key);
drivers/staging/rtl8192e/rtl819x_BAProc.c +10 -10
@@ -244,13 +244,13 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) pBaStartSeqCtrl = (union sequence_control *)(req +7 );if (!ieee->current_network.qos_data.active || - !ieee->pHTInfo->bCurrentHTSupport || - (ieee->pHTInfo->iot_action &HT_IOT_ACT_REJECT_ADDBA_REQ )) { + !ieee->ht_info->bCurrentHTSupport || + (ieee->ht_info->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" , ieee->current_network.qos_data.active, - ieee->pHTInfo->bCurrentHTSupport); + ieee->ht_info->bCurrentHTSupport); goto OnADDBAReq_Fail; } if (!GetTs(ieee, (struct ts_common_info **)&pTS, dst,
@@ -277,7 +277,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->iot_action &HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT )) + (ieee->ht_info->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 ;
@@ -326,13 +326,13 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) pBaTimeoutVal = (u16 *)(tag +7 );if (!ieee->current_network.qos_data.active || - !ieee->pHTInfo->bCurrentHTSupport || - !ieee->pHTInfo->bCurrentAMPDUEnable) { + !ieee->ht_info->bCurrentHTSupport || + !ieee->ht_info->bCurrentAMPDUEnable) {netdev_warn (ieee->dev,"reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n" , ieee->current_network.qos_data.active, - ieee->pHTInfo->bCurrentHTSupport, - ieee->pHTInfo->bCurrentAMPDUEnable); + ieee->ht_info->bCurrentHTSupport, + ieee->ht_info->bCurrentAMPDUEnable); ReasonCode =DELBA_REASON_UNKNOWN_BA ; goto OnADDBARsp_Reject; }
@@ -413,11 +413,11 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) }if (!ieee->current_network.qos_data.active || - !ieee->pHTInfo->bCurrentHTSupport) { + !ieee->ht_info->bCurrentHTSupport) {netdev_warn (ieee->dev,"received DELBA while QOS or HT is not supported(%d, %d)\n" , ieee->current_network. qos_data.active, - ieee->pHTInfo->bCurrentHTSupport); + ieee->ht_info->bCurrentHTSupport);return -1 ; }
drivers/staging/rtl8192e/rtl819x_HTProc.c +177 -177
663 lines not on this page · raw message
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->rx_reorder_pending_time) +msecs_to_jiffies (ieee->ht_info->rx_reorder_pending_time) ); }spin_unlock_irqrestore (&(ieee->reorder_spinlock), flags);
drivers/staging/rtl8192e/rtllib.h +2 -2
@@ -1432,7 +1432,7 @@ struct rtllib_device {RT_RF_CHANGE_SOURCE rf_off_reason;bool is_set_key;bool wx_set_enc; -struct rt_hi_throughput *pHTInfo; +struct rt_hi_throughput *ht_info;spinlock_t reorder_spinlock;u8 reg_dot11ht_oper_rate_set[16 ];
@@ -2089,7 +2089,7 @@ u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet,extern u8 MCS_FILTER_ALL [];extern u16 MCS_DATA_RATE [2 ][2 ][77 ];u8 HTCCheck (struct rtllib_device *ieee,u8 *pFrame); -void HTResetIOTSetting (struct rt_hi_throughput *pHTInfo); +void HTResetIOTSetting (struct rt_hi_throughput *ht_info);bool IsHTHalfNmodeAPs (struct rtllib_device *ieee);u16 TxCountToDataRate (struct rtllib_device *ieee,u8 nDataRate);int rtllib_rx_ADDBAReq (struct rtllib_device *ieee,struct sk_buff *skb);
drivers/staging/rtl8192e/rtllib_module.c +3 -3
@@ -125,8 +125,8 @@ struct net_device *alloc_rtllib(int sizeof_priv)if (err) goto free_crypt_info; - ieee->pHTInfo =kzalloc (sizeof (struct rt_hi_throughput ),GFP_KERNEL ); -if (!ieee->pHTInfo) + ieee->ht_info =kzalloc (sizeof (struct rt_hi_throughput ),GFP_KERNEL ); +if (!ieee->ht_info) goto free_softmac;HTUpdateDefaultSetting (ieee);
@@ -160,7 +160,7 @@ void free_rtllib(struct net_device *dev)struct rtllib_device *ieee = (struct rtllib_device *)netdev_priv_rsl (dev); -kfree (ieee->pHTInfo); +kfree (ieee->ht_info);rtllib_softmac_free (ieee);lib80211_crypt_info_free (&ieee->crypt_info);
drivers/staging/rtl8192e/rtllib_rx.c +6 -6
@@ -567,9 +567,9 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,struct rtllib_rxb *prxb, struct rx_ts_record *pTS, u16 SeqNum) { - struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; + struct rt_hi_throughput *ht_info = ieee->ht_info;struct rx_reorder_entry *pReorderEntry =NULL ; -u8 WinSize = pHTInfo->rx_reorder_win_size; +u8 WinSize = ht_info->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->rx_reorder_drop_counter++; + ht_info->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->rx_reorder_pending_time)); +msecs_to_jiffies (ht_info->rx_reorder_pending_time)); }spin_unlock_irqrestore (&(ieee->reorder_spinlock), flags); }
@@ -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->cur_rx_reorder_enable || +if (!ieee->ht_info->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->cur_rx_reorder_enable || pTS ==NULL || bToOtherSTA) +if (!ieee->ht_info->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 +39 -39
219 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_softmac_wx.c +4 -4
@@ -359,11 +359,11 @@ void rtllib_wx_sync_scan_wq(void *data)if (ieee->ScanOperationBackupHandler) ieee->ScanOperationBackupHandler (ieee->dev,SCAN_OPT_BACKUP ); -if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht && - ieee->pHTInfo->bCurBW40MHz) { +if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht && + ieee->ht_info->bCurBW40MHz) { b40M =1 ; - chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset; - bandwidth = (enum ht_channel_width )ieee->pHTInfo->bCurBW40MHz; + chan_offset = ieee->ht_info->CurSTAExtChnlOffset; + bandwidth = (enum ht_channel_width )ieee->ht_info->bCurBW40MHz; ieee->SetBWModeHandler (ieee->dev,HT_CHANNEL_WIDTH_20 ,HT_EXTCHNL_OFFSET_NO_EXT ); }
drivers/staging/rtl8192e/rtllib_tx.c +27 -27
159 lines not on this page · raw message
Signature · 1 line
2.37.3