staging: rtl8192e: Remove broken function _rtl92e_if_silent_reset()
cover staging: rtl8192e: Remove broken function _rtl92e_if_silent_reset()
When the function _rtl92e_if_silent_reset() is called the variable priv->rst_progress is set to RESET_TYPE_SILENT.
Since priv->up is always true the function is left at "if (priv->up) {" without resetting. Now the function _rtl92e_if_silent_reset() is like deactivated because the equation at the very beginning is false:
"if (priv->rst_progress == RESET_TYPE_NORESET) {"
This leads to a state where the driver hangs in the reset state and cannot go forward.
In 30% of the cases the wlan is disconnected and cannot reconnect. The rest of the time it continues working but no reset is done at all. Further requests for reset are ignored. Remove broken function that has never worked.
Some related cleanups are included.
Tested with rtl8192e (WLL6130-D99) in Mode n (12.5 MB/s) Tested r8192_private_handler with:
sudo iwpriv wlan0
sudo iwpriv wlan0 forcereset 1
Tested channel switch.
Transferred this patch over wlan connection of rtl8192e.
Philipp Hortmann (11):
staging: rtl8192e: Remove ibss_maxjoin_chal
staging: rtl8192e: Remove dead code from _rtl92e_if_check_reset()
staging: rtl8192e: Remove RESET_TYPE_NORMAL
staging: rtl8192e: Remove broken function _rtl92e_if_silent_reset()
staging: rtl8192e: Remove unused variable rst_progress
staging: rtl8192e: Remove unused variable reset_in_progress
staging: rtl8192e: Remove unused parameter from _rtl92e_sta_up()
staging: rtl8192e: Remove unused parameter from _rtl92e_up()
staging: rtl8192e: Remove unused variable is_silent_reset
staging: rtl8192e: Remove unused variables priv->reset_count and
reset_cnt
staging: rtl8192e: Remove r8192_private_handler
_rtl92e_wx_force_reset()
drivers/staging/rtl8192e/dot11d.c | 3 - .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 100 ++++++------ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 147 ++---------------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 5 - drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 54 +------ drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 18 +-- drivers/staging/rtl8192e/rtllib.h | 2 - drivers/staging/rtl8192e/rtllib_softmac.c | 10 +- 8 files changed, 66 insertions(+), 273 deletions(-)
Signature · 1 line
2.42.0
PATCH 1/11 staging: rtl8192e: Remove ibss_maxjoin_chal
Remove ibss_maxjoin_chal as it is just set and never evaluated.
--- drivers/staging/rtl8192e/dot11d.c | 3 --- drivers/staging/rtl8192e/rtllib.h | 1 - 2 files changed, 4 deletions(-)
drivers/staging/rtl8192e/dot11d.c +0 -3
@@ -73,19 +73,16 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee)for (i =12 ; i <=14 ; i++)GET_DOT11D_INFO (ieee)->channel_map[i] =2 ; ieee->bss_start_channel =10 ; - ieee->ibss_maxjoin_chal =11 ;break ;case COUNTRY_CODE_WORLD_WIDE_13 :for (i =12 ; i <=13 ; i++)GET_DOT11D_INFO (ieee)->channel_map[i] =2 ; ieee->bss_start_channel =10 ; - ieee->ibss_maxjoin_chal =11 ;break ;default : ieee->bss_start_channel =1 ; - ieee->ibss_maxjoin_chal =14 ;break ; } }
drivers/staging/rtl8192e/rtllib.h +0 -1
@@ -1339,7 +1339,6 @@ struct rtllib_device {u8 active_channel_map[MAX_CHANNEL_NUMBER +1 ];u8 bss_start_channel; -u8 ibss_maxjoin_chal;int rate;/* current rate */ int basic_rate;
Signature · 1 line
2.42.0
PATCH 2/11 staging: rtl8192e: Remove dead code from _rtl92e_if_check_reset()
In reply to Philipp HortmannThe return value of _rtl92e_tx_check_stuck() and _rtl92e_rx_check_stuck() can only be RESET_TYPE_SILENT or RESET_TYPE_NORESET. This functions are only used in _rtl92e_if_check_reset(). In _rtl92e_if_check_reset() the return values are checked for RESET_TYPE_NORMAL which cannot occur.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -6
@@ -975,12 +975,7 @@ static enum reset_type _rtl92e_if_check_reset(struct net_device *dev) (priv->rtllib->link_state == MAC80211_LINKED)) RxResetType =_rtl92e_rx_check_stuck (dev); -if (TxResetType ==RESET_TYPE_NORMAL || - RxResetType ==RESET_TYPE_NORMAL ) { -netdev_info (dev,"%s(): TxResetType is %d, RxResetType is %d\n" , - __func__, TxResetType, RxResetType); -return RESET_TYPE_NORMAL ; - }else if (TxResetType ==RESET_TYPE_SILENT || +if (TxResetType ==RESET_TYPE_SILENT || RxResetType ==RESET_TYPE_SILENT ) {netdev_info (dev,"%s(): TxResetType is %d, RxResetType is %d\n" , __func__, TxResetType, RxResetType);
Signature · 1 line
2.42.0
PATCH 3/11 staging: rtl8192e: Remove RESET_TYPE_NORMAL
In reply to Philipp HortmannResetType == RESET_TYPE_NORMAL is always false. Remove dead code.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 ----- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 6 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -5
@@ -1237,11 +1237,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) }spin_unlock_irqrestore (&priv->tx_lock, flags); -if (ResetType ==RESET_TYPE_NORMAL ) { - priv->rst_progress =RESET_TYPE_NORMAL ; -return ; - } -if ((priv->force_reset || ResetType ==RESET_TYPE_SILENT ))_rtl92e_if_silent_reset (dev); priv->force_reset = false;
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
@@ -132,7 +132,6 @@ enum rt_customer_id {enum reset_type {RESET_TYPE_NORESET =0x00 , -RESET_TYPE_NORMAL =0x01 ,RESET_TYPE_SILENT =0x02 };
Signature · 1 line
2.42.0
PATCH 4/11 staging: rtl8192e: Remove broken function _rtl92e_if_silent_reset()
In reply to Philipp HortmannWhen the function _rtl92e_if_silent_reset() is called the variable priv->rst_progress is set to RESET_TYPE_SILENT.
Since priv->up is always true the function is left at "if (priv->up) {" without resetting. Now the function _rtl92e_if_silent_reset() is like deactivated because the equation at the very beginning is false:
"if (priv->rst_progress == RESET_TYPE_NORESET) {"
This leads to a state where the driver hangs in the reset state and cannot go forward.
In 30% of the cases the wlan is disconnected and cannot reconnect. The rest of the time it continues working but no reset is done at all. Further requests for reset are ignored. Remove broken function _rtl92e_if_silent_reset() and remove return value of _rtl92e_if_check_reset() to avoid compiler warnings.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 113 +------------------ 1 file changed, 3 insertions(+), 110 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +3 -110
@@ -958,7 +958,7 @@ static enum reset_type _rtl92e_rx_check_stuck(struct net_device *dev)return RESET_TYPE_NORESET ; } -static enum reset_type _rtl92e_if_check_reset (struct net_device *dev) +static void _rtl92e_if_check_reset (struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev);enum reset_type TxResetType =RESET_TYPE_NORESET ;
@@ -979,112 +979,8 @@ static enum reset_type _rtl92e_if_check_reset(struct net_device *dev) RxResetType == RESET_TYPE_SILENT) {netdev_info (dev,"%s(): TxResetType is %d, RxResetType is %d\n" , __func__, TxResetType, RxResetType); - return RESET_TYPE_SILENT; - } else { -return RESET_TYPE_NORESET ; - } -} - -static void _rtl92e_if_silent_reset (struct net_device *dev) -{ -struct r8192_priv *priv =rtllib_priv (dev); -u8 reset_times =0 ; -int reset_status =0 ; -struct rtllib_device *ieee = priv->rtllib; -unsigned long flag; - -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) { -spin_unlock_irqrestore (&priv->rf_ps_lock, flag); - goto END; - } - priv->rf_change_in_progress = true; - priv->reset_in_progress = true; -spin_unlock_irqrestore (&priv->rf_ps_lock, flag); - -RESET_START: - -mutex_lock (&priv->wx_mutex); - -if (priv->rtllib->link_state ==MAC80211_LINKED ) -rtl92e_leisure_ps_leave (dev); - -if (priv->up) { -netdev_info (dev,"%s():the driver is not up.\n" , - __func__); -mutex_unlock (&priv->wx_mutex); -return ; - } - priv->up =0 ; - -mdelay (1000 ); - -if (!netif_queue_stopped (dev)) -netif_stop_queue (dev); - -rtl92e_irq_disable (dev); -del_timer_sync (&priv->watch_dog_timer); -_rtl92e_cancel_deferred_work (priv); -rtl92e_dm_deinit (dev); -rtllib_stop_scan_syncro (ieee); - -if (ieee->link_state ==MAC80211_LINKED ) { -mutex_lock (&ieee->wx_mutex); -netdev_info (dev,"ieee->link_state is MAC80211_LINKED\n" ); -del_timer_sync (&ieee->associate_timer); -cancel_delayed_work (&ieee->associate_retry_wq); -rtllib_stop_scan (ieee); -netif_carrier_off (dev); -mutex_unlock (&ieee->wx_mutex); - }else { -netdev_info (dev,"ieee->link_state is NOT LINKED\n" ); -rtllib_softmac_stop_protocol (priv->rtllib,0 , true); - } - -rtl92e_dm_backup_state (dev); - -mutex_unlock (&priv->wx_mutex); - reset_status =_rtl92e_up (dev, true); - -if (reset_status ==-1 ) { -if (reset_times <3 ) { - reset_times++; - goto RESET_START; - }else { -netdev_warn (dev,"%s(): Reset Failed\n" , - __func__); - } - } - - ieee->is_silent_reset =1 ; - -spin_lock_irqsave (&priv->rf_ps_lock, flag); - priv->rf_change_in_progress = false; -spin_unlock_irqrestore (&priv->rf_ps_lock, flag); - -rtl92e_enable_hw_security_config (dev); - -if (ieee->link_state ==MAC80211_LINKED && ieee->iw_mode == -IW_MODE_INFRA ) { - ieee->set_chan (ieee->dev, - ieee->current_network.channel); - -schedule_work (&ieee->associate_complete_wq); - - } - -rtl92e_cam_restore (dev); -rtl92e_dm_restore_state (dev); -END: - priv->rst_progress =RESET_TYPE_NORESET ; - priv->reset_count++; - priv->reset_in_progress = false; - -rtl92e_writeb (dev,UFWP ,1 ); } +return ; } static void _rtl92e_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum,
@@ -1114,7 +1010,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) struct r8192_priv, watch_dog_wq);struct net_device *dev = priv->rtllib->dev;struct rtllib_device *ieee = priv->rtllib; -enum reset_type ResetType =RESET_TYPE_NORESET ;static u8 check_reset_cnt;unsigned long flags; struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *)
@@ -1232,13 +1127,11 @@ 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) && (!psc->bSwRfProcessing)) { - ResetType =_rtl92e_if_check_reset (dev); +_rtl92e_if_check_reset (dev); check_reset_cnt =3 ; }spin_unlock_irqrestore (&priv->tx_lock, flags); -if ((priv->force_reset || ResetType ==RESET_TYPE_SILENT )) -_rtl92e_if_silent_reset (dev); priv->force_reset = false; priv->reset_in_progress = false; }
Signature · 1 line
2.42.0
PATCH 5/11 staging: rtl8192e: Remove unused variable rst_progress
In reply to Philipp Hortmannpriv->rst_progress is set to RESET_TYPE_NORESET and never changed. All equations are true. Remove dead code.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 100 ++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 3 files changed, 47 insertions(+), 55 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +47 -53
@@ -485,10 +485,10 @@ bool rtl92e_start_adapter(struct net_device *dev) start:rtl92e_reset_desc_ring (dev); priv->rf_mode = RF_OP_By_SW_3wire; -if (priv->rst_progress ==RESET_TYPE_NORESET ) { -rtl92e_writeb (dev,ANAPAR ,0x37 ); -mdelay (500 ); - } + +rtl92e_writeb (dev,ANAPAR ,0x37 ); +mdelay (500 ); + priv->fw_info->status =FW_STATUS_0_INIT ; ulRegRead =rtl92e_readl (dev,CPU_GEN );
@@ -518,21 +518,20 @@ bool rtl92e_start_adapter(struct net_device *dev) } priv->loopback_mode =RTL819X_NO_LOOPBACK ; -if (priv->rst_progress ==RESET_TYPE_NORESET ) { - ulRegRead =rtl92e_readl (dev,CPU_GEN ); -if (priv->loopback_mode ==RTL819X_NO_LOOPBACK ) - ulRegRead = (ulRegRead &CPU_GEN_NO_LOOPBACK_MSK ) | -CPU_GEN_NO_LOOPBACK_SET ; -else if (priv->loopback_mode ==RTL819X_MAC_LOOPBACK ) - ulRegRead |=CPU_CCK_LOOPBACK ; -else -netdev_err (dev,"%s: Invalid loopback mode setting.\n" , - __func__); + ulRegRead =rtl92e_readl (dev,CPU_GEN ); +if (priv->loopback_mode ==RTL819X_NO_LOOPBACK ) + ulRegRead = (ulRegRead &CPU_GEN_NO_LOOPBACK_MSK ) | +CPU_GEN_NO_LOOPBACK_SET ; +else if (priv->loopback_mode ==RTL819X_MAC_LOOPBACK ) + ulRegRead |=CPU_CCK_LOOPBACK ; +else +netdev_err (dev,"%s: Invalid loopback mode setting.\n" , + __func__); -rtl92e_writel (dev,CPU_GEN , ulRegRead); +rtl92e_writel (dev,CPU_GEN , ulRegRead); + +udelay (500 ); -udelay (500 ); - }_rtl92e_hwconfig (dev);rtl92e_writeb (dev,CMDR ,CR_RE |CR_TE );
@@ -567,8 +566,7 @@ bool rtl92e_start_adapter(struct net_device *dev)rtl92e_writeb (dev,ACK_TIMEOUT ,0x30 ); -if (priv->rst_progress ==RESET_TYPE_NORESET ) -rtl92e_set_wireless_mode (dev, priv->rtllib->mode); +rtl92e_set_wireless_mode (dev, priv->rtllib->mode);rtl92e_cam_reset (dev); {u8 SECR_value =0x0 ;
@@ -607,12 +605,10 @@ bool rtl92e_start_adapter(struct net_device *dev) } } -if (priv->rst_progress ==RESET_TYPE_NORESET ) { - rtStatus =rtl92e_config_rf (dev); -if (!rtStatus) { -netdev_info (dev,"RF Config failed\n" ); -return rtStatus; - } + rtStatus =rtl92e_config_rf (dev); +if (!rtStatus) { +netdev_info (dev,"RF Config failed\n" ); +return rtStatus; }rtl92e_set_bb_reg (dev, rFPGA0_RFMOD, bCCKEn,0x1 );
@@ -634,39 +630,37 @@ bool rtl92e_start_adapter(struct net_device *dev)else priv->rf_mode = RF_OP_By_SW_3wire; -if (priv->rst_progress ==RESET_TYPE_NORESET ) { -rtl92e_dm_init_txpower_tracking (dev); - -if (priv->ic_cut >= IC_VersionCut_D) { - tmpRegA =rtl92e_get_bb_reg (dev, rOFDM0_XATxIQImbalance, - bMaskDWord); -rtl92e_get_bb_reg (dev, rOFDM0_XCTxIQImbalance, bMaskDWord); - -for (i =0 ; i <TX_BB_GAIN_TABLE_LEN ; i++) { -if (tmpRegA == dm_tx_bb_gain[i]) { - priv->rfa_txpowertrackingindex = i; - priv->rfa_txpowertrackingindex_real = i; - priv->rfa_txpowertracking_default = - priv->rfa_txpowertrackingindex; -break ; - } +rtl92e_dm_init_txpower_tracking (dev); + +if (priv->ic_cut >= IC_VersionCut_D) { + tmpRegA =rtl92e_get_bb_reg (dev, rOFDM0_XATxIQImbalance, + bMaskDWord); +rtl92e_get_bb_reg (dev, rOFDM0_XCTxIQImbalance, bMaskDWord); + +for (i =0 ; i <TX_BB_GAIN_TABLE_LEN ; i++) { +if (tmpRegA == dm_tx_bb_gain[i]) { + priv->rfa_txpowertrackingindex = i; + priv->rfa_txpowertrackingindex_real = i; + priv->rfa_txpowertracking_default = + priv->rfa_txpowertrackingindex; +break ; } + } - TempCCk =rtl92e_get_bb_reg (dev, rCCK0_TxFilter1, - bMaskByte2); + TempCCk =rtl92e_get_bb_reg (dev, rCCK0_TxFilter1, + bMaskByte2); -for (i =0 ; i <CCK_TX_BB_GAIN_TABLE_LEN ; i++) { -if (TempCCk == dm_cck_tx_bb_gain[i][0 ]) { - priv->cck_present_attn_20m_def = i; -break ; - } +for (i =0 ; i <CCK_TX_BB_GAIN_TABLE_LEN ; i++) { +if (TempCCk == dm_cck_tx_bb_gain[i][0 ]) { + priv->cck_present_attn_20m_def = i; +break ; } - priv->cck_present_attn_40m_def =0 ; - priv->cck_present_attn_diff =0 ; - priv->cck_present_attn = - priv->cck_present_attn_20m_def; - priv->btxpower_tracking = false; } + priv->cck_present_attn_40m_def =0 ; + priv->cck_present_attn_diff =0 ; + priv->cck_present_attn = + priv->cck_present_attn_20m_def; + priv->btxpower_tracking = false; }rtl92e_irq_enable (dev); end:
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -1
@@ -754,7 +754,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->rfa_txpowertrackingindex =0 ; priv->rfc_txpowertrackingindex =0 ; priv->cck_pwr_enl =6 ; - priv->rst_progress =RESET_TYPE_NORESET ; priv->force_reset = false;memset (priv->rtllib->swcamtable,0 ,sizeof (struct sw_cam_table ) *32 ); priv->rx_ctr =0 ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
@@ -370,7 +370,6 @@ struct r8192_priv {u8 framesync;u32 reset_count; -enum reset_type rst_progress;u16 tx_counter;u16 rx_ctr;bool reset_in_progress;
Signature · 1 line
2.42.0
PATCH 6/11 staging: rtl8192e: Remove unused variable reset_in_progress
In reply to Philipp Hortmannpriv->reset_in_progress is set to false and never changed. All equations result accordingly. Remove dead code.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 ++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +2 -4
@@ -1132,7 +1132,6 @@ static void _rtl92e_watchdog_wq_cb(void *data)spin_unlock_irqrestore (&priv->tx_lock, flags); priv->force_reset = false; - priv->reset_in_progress = false; }static void _rtl92e_watchdog_timer_cb (struct timer_list *t)
@@ -1218,8 +1217,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->rf_power_state == rf_off) || !priv->up || - priv->reset_in_progress) { +if ((priv->rtllib->rf_power_state == rf_off) || !priv->up) {kfree_skb (skb);return ; }
@@ -1252,7 +1250,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)if (queue_index !=TXCMD_QUEUE ) {if ((priv->rtllib->rf_power_state == rf_off) || - !priv->up || priv->reset_in_progress) { + !priv->up) {kfree_skb (skb);return 0 ; }
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
@@ -372,7 +372,6 @@ struct r8192_priv {u16 tx_counter;u16 rx_ctr; -bool reset_in_progress;bool force_reset;bool force_lps; };
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +0 -5
@@ -530,11 +530,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)if (Pwr_Flag ==0 ) {mdelay (1 ); -if (priv->reset_in_progress) { -rtl92e_writeb (dev, Pw_Track_Flag,0 ); -rtl92e_writeb (dev, FW_Busy_Flag,0 ); -return ; - }if (priv->rtllib->rf_power_state != rf_on) {rtl92e_writeb (dev, Pw_Track_Flag,0 );rtl92e_writeb (dev, FW_Busy_Flag,0 );
Signature · 1 line
2.42.0
PATCH 7/11 staging: rtl8192e: Remove unused parameter from _rtl92e_sta_up()
In reply to Philipp HortmannRemove unused parameter is_silent_reset from _rtl92e_sta_up().
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +2 -2
@@ -588,7 +588,7 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u8 wireless_mode)_rtl92e_refresh_support_rate (priv); } -static int _rtl92e_sta_up (struct net_device *dev,bool is_silent_reset) +static int _rtl92e_sta_up (struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev); struct rt_pwr_save_ctrl *psc = (struct rt_pwr_save_ctrl *)
@@ -1709,7 +1709,7 @@ static void _rtl92e_cancel_deferred_work(struct r8192_priv *priv)static int _rtl92e_up (struct net_device *dev,bool is_silent_reset) { -if (_rtl92e_sta_up (dev, is_silent_reset) ==-1 ) +if (_rtl92e_sta_up (dev) ==-1 )return -1 ;return 0 ; }
Signature · 1 line
2.42.0
PATCH 8/11 staging: rtl8192e: Remove unused parameter from _rtl92e_up()
In reply to Philipp HortmannRemove unused parameter is_silent_reset from _rtl92e_up().
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +4 -4
@@ -61,7 +61,7 @@ static short _rtl92e_pci_initdescring(struct net_device *dev);static void _rtl92e_irq_tx_tasklet (struct tasklet_struct *t);static void _rtl92e_irq_rx_tasklet (struct tasklet_struct *t);static void _rtl92e_cancel_deferred_work (struct r8192_priv *priv); -static int _rtl92e_up (struct net_device *dev,bool is_silent_reset); +static int _rtl92e_up (struct net_device *dev);static int _rtl92e_try_up (struct net_device *dev);static int _rtl92e_down (struct net_device *dev,bool shutdownrf);static void _rtl92e_restart (void *data);
@@ -1707,7 +1707,7 @@ static void _rtl92e_cancel_deferred_work(struct r8192_priv *priv)cancel_work_sync (&priv->qos_activate); } -static int _rtl92e_up (struct net_device *dev,bool is_silent_reset) +static int _rtl92e_up (struct net_device *dev) {if (_rtl92e_sta_up (dev) ==-1 )return -1 ;
@@ -1731,7 +1731,7 @@ static int _rtl92e_try_up(struct net_device *dev)if (priv->up ==1 )return -1 ; -return _rtl92e_up (dev, false); +return _rtl92e_up (dev); }static int _rtl92e_close (struct net_device *dev)
@@ -1770,7 +1770,7 @@ void rtl92e_commit(struct net_device *dev)rtllib_softmac_stop_protocol (priv->rtllib,0 , true);rtl92e_irq_disable (dev);rtl92e_stop_adapter (dev, true); -_rtl92e_up (dev, false); +_rtl92e_up (dev); }static void _rtl92e_restart (void *data)
Signature · 1 line
2.42.0
PATCH 9/11 staging: rtl8192e: Remove unused variable is_silent_reset
In reply to Philipp Hortmannieee->is_silent_reset is set to false and never changed. All equations result accordingly. Remove dead code.
--- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -1
@@ -1211,7 +1211,6 @@ struct rtllib_device {bool bForcedBgMode;u8 hwsec_active; -bool is_silent_reset;bool is_roaming;bool ieee_up;bool cannot_notify;
drivers/staging/rtl8192e/rtllib_softmac.c +2 -8
@@ -1298,10 +1298,8 @@ static void rtllib_associate_complete_wq(void *data)netdev_info (ieee->dev,"Associated successfully with %pM\n" , ieee->current_network.bssid); -if (!ieee->is_silent_reset) { -netdev_info (ieee->dev,"normal associate\n" ); -notify_wx_assoc_event (ieee); - } +netdev_info (ieee->dev,"normal associate\n" ); +notify_wx_assoc_event (ieee);netif_carrier_on (ieee->dev); ieee->is_roaming = false;
@@ -1334,10 +1332,6 @@ static void rtllib_associate_complete_wq(void *data) psc->LpsIdleCount =0 ; ieee->link_change (ieee->dev); -if (ieee->is_silent_reset) { -netdev_info (ieee->dev,"silent reset associate\n" ); - ieee->is_silent_reset = false; - } }static void rtllib_sta_send_associnfo (struct rtllib_device *ieee)
Signature · 1 line
2.42.0
PATCH 10/11 staging: rtl8192e: Remove unused variables priv->reset_count and reset_cnt
In reply to Philipp HortmannRemove unused variables priv->reset_count, reset_cnt and reset_cnt_highpwr as those are always 0. All equations result accordingly. Remove dead code.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 49 ++------------------ 2 files changed, 4 insertions(+), 46 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
@@ -368,7 +368,6 @@ struct r8192_priv {u32 continue_diff_count;bool bswitch_fsync;u8 framesync; -u32 reset_count;u16 tx_counter;u16 rx_ctr;
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +4 -45
153 lines not on this page · raw message
Signature · 1 line
2.42.0
PATCH 11/11 staging: rtl8192e: Remove r8192_private_handler _rtl92e_wx_force_reset()
In reply to Philipp HortmannRemove r8192_private_handler _rtl92e_wx_force_reset() as driver does not reset. Remove dead code.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 --- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 18 +----------------- 3 files changed, 1 insertion(+), 21 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -3
@@ -754,7 +754,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->rfa_txpowertrackingindex =0 ; priv->rfc_txpowertrackingindex =0 ; priv->cck_pwr_enl =6 ; - priv->force_reset = false;memset (priv->rtllib->swcamtable,0 ,sizeof (struct sw_cam_table ) *32 ); priv->rx_ctr =0 ; priv->rtllib->wx_set_enc =0 ;
@@ -1130,8 +1129,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) check_reset_cnt =3 ; }spin_unlock_irqrestore (&priv->tx_lock, flags); - - priv->force_reset = false; }static void _rtl92e_watchdog_timer_cb (struct timer_list *t)
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
@@ -371,7 +371,6 @@ struct r8192_priv {u16 tx_counter;u16 rx_ctr; -bool force_reset;bool force_lps; };
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +1 -17
@@ -141,19 +141,6 @@ static int _rtl92e_wx_set_rawtx(struct net_device *dev,return ret; } -static int _rtl92e_wx_force_reset (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) -{ -struct r8192_priv *priv =rtllib_priv (dev); - -mutex_lock (&priv->wx_mutex); - - priv->force_reset = *extra; -mutex_unlock (&priv->wx_mutex); -return 0 ; -} -static int _rtl92e_wx_adapter_power_status (struct net_device *dev,struct iw_request_info *info,union iwreq_data *wrqu,char *extra)
@@ -1060,9 +1047,6 @@ static const struct iw_priv_args r8192_private_args[] = { }, {SIOCIWFIRSTPRIV +0x2 ,IW_PRIV_TYPE_INT |IW_PRIV_SIZE_FIXED |1 ,0 ,"rawtx" - }, { -SIOCIWFIRSTPRIV +0x3 , -IW_PRIV_TYPE_INT |IW_PRIV_SIZE_FIXED |1 ,0 ,"forcereset" }, {SIOCIWFIRSTPRIV +0x6 , IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, IW_PRIV_TYPE_NONE,
@@ -1089,7 +1073,7 @@ static iw_handler r8192_private_handler[] = { (iw_handler )_rtl92e_wx_set_debug,/*SIOCIWSECONDPRIV*/ (iw_handler )_rtl92e_wx_set_scan_type, (iw_handler )_rtl92e_wx_set_rawtx, - (iw_handler )_rtl92e_wx_force_reset, + (iw_handler )NULL , (iw_handler )NULL , (iw_handler )NULL , (iw_handler)_rtl92e_wx_adapter_power_status,
Signature · 1 line
2.42.0