staging: rtl8192e: Remove undefined functions like data_hard_stop
cover staging: rtl8192e: Remove undefined functions like data_hard_stop
Remove functions that are declared but not defined.
Tested with rtl8192e (WLL6130-D99)
Transferred this patch over wlan connection of rtl8192e
Philipp Hortmann (9):
staging: rtl8192e: Remove undefined function data_hard_stop
staging: rtl8192e: Remove undefined function data_hard_resume
staging: rtl8192e: Remove functions rtllib_start_hw_scan and stop
staging: rtl8192e: Remove undefined function reset_port
staging: rtl8192e: Remove undefined function hard_start_xmit
staging: rtl8192e: Remove undefined function set_security
staging: rtl8192e: Remove undefined function SetFwCmdHandler
staging: rtl8192e: Remove undefined function
UpdateBeaconInterruptHandler
staging: rtl8192e: Remove undefined function LedControlHandler
.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 29 --------- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 13 +--- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 -- drivers/staging/rtl8192e/rtllib.h | 29 --------- drivers/staging/rtl8192e/rtllib_softmac.c | 60 ++----------------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 13 +--- drivers/staging/rtl8192e/rtllib_tx.c | 8 +-- drivers/staging/rtl8192e/rtllib_wx.c | 25 -------- 9 files changed, 9 insertions(+), 176 deletions(-)
Signature · 1 line
2.40.1
PATCH 1/9 staging: rtl8192e: Remove undefined function data_hard_stop
Remove function data_hard_stop as it is not defined.
--- drivers/staging/rtl8192e/rtllib.h | 6 ------ drivers/staging/rtl8192e/rtllib_softmac.c | 5 ----- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 3 --- 3 files changed, 14 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -6
@@ -1682,12 +1682,6 @@ struct rtllib_device {void (*softmac_data_hard_start_xmit)(struct sk_buff *skb,struct net_device *dev,int rate); -/* stops the HW queue for DATA frames. Useful to avoid -* waste time to TX data frame when we are reassociating -* This function can sleep. -*/ -void (*data_hard_stop)(struct net_device *dev); -/* OK this is complementing to data_poll_hard_stop */ void (*data_hard_resume)(struct net_device *dev);
drivers/staging/rtl8192e/rtllib_softmac.c +0 -5
@@ -1575,9 +1575,6 @@ static void rtllib_associate_procedure_wq(void *data) ieee->rtllib_ips_leave (ieee->dev);mutex_lock (&ieee->wx_mutex); -if (ieee->data_hard_stop) - ieee->data_hard_stop (ieee->dev); -rtllib_stop_scan (ieee);HTSetConnectBwMode (ieee,HT_CHANNEL_WIDTH_20 ,HT_EXTCHNL_OFFSET_NO_EXT );if (ieee->rf_power_state == rf_off) {
@@ -2734,8 +2731,6 @@ void rtllib_disassociate(struct rtllib_device *ieee)if (ieee->softmac_features &IEEE_SOFTMAC_TX_QUEUE )rtllib_reset_queue (ieee); -if (ieee->data_hard_stop) - ieee->data_hard_stop (ieee->dev);if (IS_DOT11D_ENABLE (ieee))dot11d_reset (ieee); ieee->state =RTLLIB_NOLINK ;
drivers/staging/rtl8192e/rtllib_softmac_wx.c +0 -3
@@ -345,9 +345,6 @@ void rtllib_wx_sync_scan_wq(void *data)rtllib_sta_ps_send_null_frame (ieee,1 );rtllib_stop_all_queues (ieee); - -if (ieee->data_hard_stop) - ieee->data_hard_stop (ieee->dev);rtllib_stop_send_beacons (ieee); ieee->state =RTLLIB_LINKED_SCANNING ; ieee->link_change (ieee->dev);
Signature · 1 line
2.40.1
PATCH 2/9 staging: rtl8192e: Remove undefined function data_hard_resume
In reply to Philipp HortmannRemove function data_hard_resume as it is not defined.
--- drivers/staging/rtl8192e/rtllib.h | 3 --- drivers/staging/rtl8192e/rtllib_softmac.c | 18 +----------------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 10 +--------- 3 files changed, 2 insertions(+), 29 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -3
@@ -1682,9 +1682,6 @@ struct rtllib_device {void (*softmac_data_hard_start_xmit)(struct sk_buff *skb,struct net_device *dev,int rate); -/* OK this is complementing to data_poll_hard_stop */ -void (*data_hard_resume)(struct net_device *dev); -/* ask to the driver to retune the radio. * This function can sleep. the driver should ensure * the radio has been switched before return.
drivers/staging/rtl8192e/rtllib_softmac.c +1 -17
@@ -1546,10 +1546,6 @@ static void rtllib_associate_complete_wq(void *data)netdev_info (ieee->dev,"silent reset associate\n" ); ieee->is_silent_reset = false; } - -if (ieee->data_hard_resume) - ieee->data_hard_resume (ieee->dev); - }static void rtllib_sta_send_associnfo (struct rtllib_device *ieee)
@@ -2534,22 +2530,14 @@ static void rtllib_start_master_bss(struct rtllib_device *ieee) ieee->state =RTLLIB_LINKED ; ieee->link_change (ieee->dev);notify_wx_assoc_event (ieee); - -if (ieee->data_hard_resume) - ieee->data_hard_resume (ieee->dev); -netif_carrier_on (ieee->dev); }static void rtllib_start_monitor_mode (struct rtllib_device *ieee) {/* reset hardware status */ -if (ieee->raw_tx) { -if (ieee->data_hard_resume) - ieee->data_hard_resume (ieee->dev); - +if (ieee->raw_tx)netif_carrier_on (ieee->dev); - } }static void rtllib_start_ibss_wq (void *data)
@@ -2674,10 +2662,6 @@ static void rtllib_start_ibss_wq(void *data)rtllib_start_send_beacons (ieee);notify_wx_assoc_event (ieee); - -if (ieee->data_hard_resume) - ieee->data_hard_resume (ieee->dev); -netif_carrier_on (ieee->dev);mutex_unlock (&ieee->wx_mutex);
drivers/staging/rtl8192e/rtllib_softmac_wx.c +1 -9
@@ -389,10 +389,6 @@ void rtllib_wx_sync_scan_wq(void *data) ieee->link_detect_info.NumRecvBcnInPeriod =1 ; ieee->link_detect_info.NumRecvDataInPeriod =1 ; } - -if (ieee->data_hard_resume) - ieee->data_hard_resume (ieee->dev); -if (ieee->iw_mode ==IW_MODE_ADHOC || ieee->iw_mode ==IW_MODE_MASTER )rtllib_start_send_beacons (ieee);
@@ -505,12 +501,8 @@ int rtllib_wx_set_rawtx(struct rtllib_device *ieee, ieee->raw_tx ? "enabled" : "disabled");if (ieee->iw_mode ==IW_MODE_MONITOR ) { -if (prev ==0 && ieee->raw_tx) { -if (ieee->data_hard_resume) - ieee->data_hard_resume (ieee->dev); - +if (prev ==0 && ieee->raw_tx)netif_carrier_on (ieee->dev); - }if (prev && ieee->raw_tx ==1 )netif_carrier_off (ieee->dev);
Signature · 1 line
2.40.1
PATCH 3/9 staging: rtl8192e: Remove functions rtllib_start_hw_scan and stop
In reply to Philipp HortmannRemove functions rtllib_start_hw_scan and rtllib_stop_hw_scan as they are not defined.
--- drivers/staging/rtl8192e/rtllib.h | 3 --- drivers/staging/rtl8192e/rtllib_softmac.c | 21 +++------------------ 2 files changed, 3 insertions(+), 21 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -3
@@ -1688,9 +1688,6 @@ struct rtllib_device {*/ void (*set_chan)(struct net_device *dev,short ch); -void (*rtllib_start_hw_scan)(struct net_device *dev); -void (*rtllib_stop_hw_scan)(struct net_device *dev); -/* indicate the driver that the link state is changed * for example it may indicate the card is associated now. * Driver might be interested in this to apply RX filter
drivers/staging/rtl8192e/rtllib_softmac.c +3 -18
@@ -691,23 +691,15 @@ static void rtllib_softmac_stop_scan(struct rtllib_device *ieee)void rtllib_stop_scan (struct rtllib_device *ieee) { -if (ieee->softmac_features &IEEE_SOFTMAC_SCAN ) { +if (ieee->softmac_features &IEEE_SOFTMAC_SCAN )rtllib_softmac_stop_scan (ieee); - }else { -if (ieee->rtllib_stop_hw_scan) - ieee->rtllib_stop_hw_scan (ieee->dev); - } }EXPORT_SYMBOL (rtllib_stop_scan);void rtllib_stop_scan_syncro (struct rtllib_device *ieee) { -if (ieee->softmac_features &IEEE_SOFTMAC_SCAN ) { +if (ieee->softmac_features &IEEE_SOFTMAC_SCAN ) ieee->sync_scan_hurryup =1 ; - }else { -if (ieee->rtllib_stop_hw_scan) - ieee->rtllib_stop_hw_scan (ieee->dev); - } }EXPORT_SYMBOL (rtllib_stop_scan_syncro);
@@ -739,9 +731,6 @@ static void rtllib_start_scan(struct rtllib_device *ieee) ieee->scanning_continue =1 ;schedule_delayed_work (&ieee->softmac_scan_wq,0 ); } - }else { -if (ieee->rtllib_start_hw_scan) - ieee->rtllib_start_hw_scan (ieee->dev); } }
@@ -753,12 +742,8 @@ void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)RESET_CIE_WATCHDOG (ieee); } ieee->sync_scan_hurryup =0 ; -if (ieee->softmac_features &IEEE_SOFTMAC_SCAN ) { +if (ieee->softmac_features &IEEE_SOFTMAC_SCAN )rtllib_softmac_scan_syncro (ieee, is_mesh); - }else { -if (ieee->rtllib_start_hw_scan) - ieee->rtllib_start_hw_scan (ieee->dev); - } }EXPORT_SYMBOL (rtllib_start_scan_syncro);
Signature · 1 line
2.40.1
PATCH 4/9 staging: rtl8192e: Remove undefined function reset_port
In reply to Philipp HortmannRemove function reset_port as it is not defined.
--- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_wx.c | 19 ------------------- 2 files changed, 21 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -1661,8 +1661,6 @@ struct rtllib_device {int (*hard_start_xmit)(struct rtllib_txb *txb,struct net_device *dev); -int (*reset_port)(struct net_device *dev); -/* Softmac-generated frames (management) are TXed via this * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is * not set. As some cards may have different HW queues that
drivers/staging/rtl8192e/rtllib_wx.c +0 -19
@@ -420,18 +420,6 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,if (ieee->set_security) ieee->set_security (dev, &sec); -/* Do not reset port if card is in Managed mode since resetting will -* generate new IEEE 802.11 authentication which may end up in looping -* with IEEE 802.1X. If your hardware requires a reset after WEP -* configuration (for example... Prism2), implement the reset_port in -* the callbacks structures used to initialize the 802.11 stack. -*/ -if (ieee->reset_on_keychange && - ieee->iw_mode !=IW_MODE_INFRA && - ieee->reset_port && ieee->reset_port (dev)) { -netdev_dbg (dev,"%s: reset_port failed\n" , dev->name); -return -EINVAL ; - }return 0 ; }EXPORT_SYMBOL (rtllib_wx_set_encode);
@@ -625,13 +613,6 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, done:if (ieee->set_security) ieee->set_security (ieee->dev, &sec); - -if (ieee->reset_on_keychange && - ieee->iw_mode !=IW_MODE_INFRA && - ieee->reset_port && ieee->reset_port (dev)) { -netdev_dbg (ieee->dev,"Port reset failed\n" ); -return -EINVAL ; - }return ret; }EXPORT_SYMBOL (rtllib_wx_set_encode_ext);
Signature · 1 line
2.40.1
PATCH 5/9 staging: rtl8192e: Remove undefined function hard_start_xmit
In reply to Philipp HortmannRemove function hard_start_xmit as it is not defined. Equation !ieee->hard_start_xmit always evaluates to true. When (*ieee->hard_start_xmit)(txb, dev) == 0 is called the my computer is freezing.
--- drivers/staging/rtl8192e/rtllib.h | 7 ------- drivers/staging/rtl8192e/rtllib_tx.c | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -7
@@ -1654,13 +1654,6 @@ struct rtllib_device {void (*set_security)(struct net_device *dev,struct rtllib_security *sec); -/* Used to TX data frame by using txb structs. -* this is not used if in the softmac_features -* is set the flag IEEE_SOFTMAC_TX_QUEUE -*/ -int (*hard_start_xmit)(struct rtllib_txb *txb, -struct net_device *dev); -/* Softmac-generated frames (management) are TXed via this * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is * not set. As some cards may have different HW queues that
drivers/staging/rtl8192e/rtllib_tx.c +1 -7
@@ -572,8 +572,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)/* If there is no driver handler to take the TXB, don't bother * creating it... */ -if ((!ieee->hard_start_xmit && !(ieee->softmac_features & -IEEE_SOFTMAC_TX_QUEUE )) || +if (!(ieee->softmac_features &IEEE_SOFTMAC_TX_QUEUE ) || ((!ieee->softmac_data_hard_start_xmit && (ieee->softmac_features &IEEE_SOFTMAC_TX_QUEUE )))) {netdev_warn (ieee->dev,"No xmit handler.\n" );
@@ -938,11 +937,6 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_bytes +=le16_to_cpu (txb->payload_size);rtllib_softmac_xmit (txb, ieee); }else { -if ((*ieee->hard_start_xmit)(txb, dev) ==0 ) { - stats->tx_packets++; - stats->tx_bytes +=le16_to_cpu (txb->payload_size); -return 0 ; - }rtllib_txb_free (txb); } }
Signature · 1 line
2.40.1
PATCH 6/9 staging: rtl8192e: Remove undefined function set_security
In reply to Philipp HortmannRemove function set_security as it is not defined.
--- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_wx.c | 6 ------ 2 files changed, 8 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -1651,8 +1651,6 @@ struct rtllib_device { };/* Callback functions */ -void (*set_security)(struct net_device *dev, -struct rtllib_security *sec);/* Softmac-generated frames (management) are TXed via this * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is
drivers/staging/rtl8192e/rtllib_wx.c +0 -6
@@ -416,10 +416,6 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,*/ sec.flags |=SEC_LEVEL ; sec.level =SEC_LEVEL_1 ;/* 40 and 104 bit WEP */ - -if (ieee->set_security) - ieee->set_security (dev, &sec); -return 0 ; }EXPORT_SYMBOL (rtllib_wx_set_encode);
@@ -611,8 +607,6 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, sec.flags &= ~SEC_LEVEL ; } done: -if (ieee->set_security) - ieee->set_security (ieee->dev, &sec);return ret; }EXPORT_SYMBOL (rtllib_wx_set_encode_ext);
Signature · 1 line
2.40.1
PATCH 7/9 staging: rtl8192e: Remove undefined function SetFwCmdHandler
In reply to Philipp HortmannRemove function SetFwCmdHandler as it is not defined.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 13 +++---------- drivers/staging/rtl8192e/rtllib.h | 2 -- 3 files changed, 3 insertions(+), 13 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -1
@@ -734,7 +734,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) priv->rtllib->SetHwRegHandler = rtl92e_set_reg; priv->rtllib->AllowAllDestAddrHandler = rtl92e_set_monitor_mode; - priv->rtllib->SetFwCmdHandler =NULL ; priv->rtllib->InitialGainHandler = rtl92e_init_gain; priv->rtllib->rtllib_ips_leave_wq = rtl92e_rtllib_ips_leave_wq; priv->rtllib->rtllib_ips_leave = rtl92e_rtllib_ips_leave;
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +3 -10
@@ -217,12 +217,8 @@ void rtl92e_leisure_ps_enter(struct net_device *dev)if (psc->bLeisurePs) {if (psc->LpsIdleCount >=RT_CHECK_FOR_HANG_PERIOD ) { -if (priv->rtllib->ps ==RTLLIB_PS_DISABLED ) { -if (priv->rtllib->SetFwCmdHandler) - priv->rtllib->SetFwCmdHandler (dev,FW_CMD_LPS_ENTER ); -_rtl92e_ps_set_mode (dev,RTLLIB_PS_MBCAST | -RTLLIB_PS_UNICAST ); - } +if (priv->rtllib->ps ==RTLLIB_PS_DISABLED ) +_rtl92e_ps_set_mode (dev,RTLLIB_PS_MBCAST |RTLLIB_PS_UNICAST ); }else psc->LpsIdleCount++; }
@@ -235,10 +231,7 @@ void rtl92e_leisure_ps_leave(struct net_device *dev) &priv->rtllib->pwr_save_ctrl;if (psc->bLeisurePs) { -if (priv->rtllib->ps !=RTLLIB_PS_DISABLED ) { +if (priv->rtllib->ps !=RTLLIB_PS_DISABLED )_rtl92e_ps_set_mode (dev,RTLLIB_PS_DISABLED ); -if (priv->rtllib->SetFwCmdHandler) - priv->rtllib->SetFwCmdHandler (dev,FW_CMD_LPS_LEAVE ); - } } }
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -1714,8 +1714,6 @@ struct rtllib_device {bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device *dev);u8 (*rtllib_ap_sec_type)(struct rtllib_device *ieee);void (*InitialGainHandler)(struct net_device *dev,u8 Operation); -bool (*SetFwCmdHandler)(struct net_device *dev, -enum fw_cmd_io_type FwCmdIO);void (*UpdateBeaconInterruptHandler)(struct net_device *dev,bool start); void (*ScanOperationBackupHandler)(struct net_device *dev,
Signature · 1 line
2.40.1
PATCH 8/9 staging: rtl8192e: Remove undefined function UpdateBeaconInterruptHandler
In reply to Philipp HortmannRemove function UpdateBeaconInterruptHandler as it is not defined.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 -- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ------ 3 files changed, 10 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -2
@@ -739,8 +739,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) priv->rtllib->rtllib_ips_leave = rtl92e_rtllib_ips_leave; priv->rtllib->LedControlHandler =NULL ; - priv->rtllib->UpdateBeaconInterruptHandler =NULL ; - priv->rtllib->ScanOperationBackupHandler = rtl92e_scan_op_backup; }
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -1714,8 +1714,6 @@ struct rtllib_device {bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device *dev);u8 (*rtllib_ap_sec_type)(struct rtllib_device *ieee);void (*InitialGainHandler)(struct net_device *dev,u8 Operation); -void (*UpdateBeaconInterruptHandler)(struct net_device *dev, -bool start);void (*ScanOperationBackupHandler)(struct net_device *dev,u8 Operation); void (*LedControlHandler)(struct net_device *dev,
drivers/staging/rtl8192e/rtllib_softmac.c +0 -6
@@ -2882,9 +2882,6 @@ void rtllib_start_protocol(struct rtllib_device *ieee) ieee->last_packet_time[i] =0 ; } -if (ieee->UpdateBeaconInterruptHandler) - ieee->UpdateBeaconInterruptHandler (ieee->dev, false); - ieee->wmm_acm =0 ;/* if the user set the MAC of the ad-hoc cell and then * switch to managed mode, shall we make sure that association
@@ -2894,9 +2891,6 @@ void rtllib_start_protocol(struct rtllib_device *ieee)if (ieee->iw_mode ==IW_MODE_INFRA ) {rtllib_start_bss (ieee); }else if (ieee->iw_mode ==IW_MODE_ADHOC ) { -if (ieee->UpdateBeaconInterruptHandler) - ieee->UpdateBeaconInterruptHandler (ieee->dev, true); -rtllib_start_ibss (ieee); }else if (ieee->iw_mode ==IW_MODE_MASTER ) {
Signature · 1 line
2.40.1
PATCH 9/9 staging: rtl8192e: Remove undefined function LedControlHandler
In reply to Philipp HortmannRemove function LedControlHandler as it is not defined. Remove resulting unused local variables bLedBlinking, type, fc and LedAction.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 26 ------------------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 --- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac.c | 10 ------- 5 files changed, 46 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +0 -4
@@ -46,7 +46,6 @@ static void _rtl92e_update_msr(struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev);u8 msr; -enum led_ctl_mode LedAction =LED_CTL_NO_LINK ; msr =rtl92e_readb (dev,MSR ); msr &= ~MSR_LINK_MASK ;
@@ -55,7 +54,6 @@ static void _rtl92e_update_msr(struct net_device *dev)case IW_MODE_INFRA :if (priv->rtllib->state ==RTLLIB_LINKED ) msr |=MSR_LINK_MANAGED ; - LedAction =LED_CTL_LINK ;break ;case IW_MODE_ADHOC :if (priv->rtllib->state ==RTLLIB_LINKED )
@@ -70,8 +68,6 @@ static void _rtl92e_update_msr(struct net_device *dev) }rtl92e_writeb (dev,MSR , msr); -if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler (dev, LedAction); }void rtl92e_set_reg (struct net_device *dev,u8 variable,u8 *val)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -26
@@ -737,8 +737,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) priv->rtllib->InitialGainHandler = rtl92e_init_gain; priv->rtllib->rtllib_ips_leave_wq = rtl92e_rtllib_ips_leave_wq; priv->rtllib->rtllib_ips_leave = rtl92e_rtllib_ips_leave; - - priv->rtllib->LedControlHandler =NULL ; priv->rtllib->ScanOperationBackupHandler = rtl92e_scan_op_backup; }
@@ -1272,10 +1270,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) ieee->is_roaming = true; ieee->is_set_key = false; ieee->link_change (dev); -if (ieee->LedControlHandler) - ieee->LedControlHandler (ieee->dev, -LED_CTL_START_TO_LINK ); -notify_wx_assoc_event (ieee); if (!(ieee->rtllib_ap_sec_type(ieee) &
@@ -1506,7 +1500,6 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb) MAX_DEV_ADDR_SIZE);struct tx_desc *pdesc =NULL ;struct rtllib_hdr_1addr *header =NULL ; -u16 fc =0 , type =0 ;u8 *pda_addr =NULL ;int idx;u32 fwinfo_size =0 ;
@@ -1522,8 +1515,6 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb) fwinfo_size =sizeof (struct tx_fwinfo_8190pci ); header = (struct rtllib_hdr_1addr *)(((u8 *)skb->data) + fwinfo_size); - fc =le16_to_cpu (header->frame_ctl); - type =WLAN_FC_GET_TYPE (fc); pda_addr = header->addr1;if (!is_broadcast_ether_addr (pda_addr) && !is_multicast_ether_addr (pda_addr))
@@ -1545,11 +1536,6 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)spin_unlock_irqrestore (&priv->irq_th_lock, flags);return skb->len; } - -if (type ==RTLLIB_FTYPE_DATA ) { -if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler (dev,LED_CTL_TX ); - }rtl92e_fill_tx_desc (dev, pdesc, tcb_desc, skb);__skb_queue_tail (&ring->queue, skb); pdesc->OWN =1 ;
@@ -1776,8 +1762,6 @@ static void _rtl92e_rx_normal(struct net_device *dev)struct r8192_priv *priv =rtllib_priv (dev);struct rtllib_hdr_1addr *rtllib_hdr =NULL ;bool unicast_packet = false; -bool bLedBlinking = true; -u16 fc =0 , type =0 ;u32 skb_len =0 ;int rx_queue_idx =RX_MPDU_QUEUE ;
@@ -1821,16 +1805,6 @@ static void _rtl92e_rx_normal(struct net_device *dev)/* unicast packet */ unicast_packet = true; } - fc =le16_to_cpu (rtllib_hdr->frame_ctl); - type =WLAN_FC_GET_TYPE (fc); -if (type ==RTLLIB_FTYPE_MGMT ) - bLedBlinking = false; - -if (bLedBlinking) -if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler (dev, -LED_CTL_RX ); - skb_len = skb->len;if (!rtllib_rx (priv->rtllib, skb, &stats)) {
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +0 -4
@@ -421,10 +421,6 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,mutex_unlock (&priv->rtllib->ips_mutex); }rtllib_stop_scan (priv->rtllib); -if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler (dev, -LED_CTL_SITE_SURVEY ); -if (priv->rtllib->rf_power_state != rf_off) { priv->rtllib->actscanning = true;
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -1716,8 +1716,6 @@ struct rtllib_device {void (*InitialGainHandler)(struct net_device *dev,u8 Operation);void (*ScanOperationBackupHandler)(struct net_device *dev,u8 Operation); -void (*LedControlHandler)(struct net_device *dev, -enum led_ctl_mode LedAction);void (*SetHwRegHandler)(struct net_device *dev,u8 variable,u8 *val); void (*AllowAllDestAddrHandler)(struct net_device *dev,
drivers/staging/rtl8192e/rtllib_softmac.c +0 -10
@@ -1680,9 +1680,6 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee, false; ieee->state =RTLLIB_ASSOCIATING ; -if (ieee->LedControlHandler !=NULL ) - ieee->LedControlHandler (ieee->dev, -LED_CTL_START_TO_LINK );schedule_delayed_work ( &ieee->associate_procedure_wq,0 ); }else {
@@ -2343,10 +2340,6 @@ rtllib_rx_deauth(struct rtllib_device *ieee, struct sk_buff *skb) ieee->link_detect_info.bBusyTraffic = false;rtllib_disassociate (ieee);RemovePeerTS (ieee, header->addr2); -if (ieee->LedControlHandler !=NULL ) - ieee->LedControlHandler (ieee->dev, -LED_CTL_START_TO_LINK ); -if (!(ieee->rtllib_ap_sec_type (ieee) & (SEC_ALG_CCMP |SEC_ALG_TKIP ))) schedule_delayed_work(
@@ -2641,9 +2634,6 @@ static void rtllib_start_ibss_wq(void *data) ieee->link_change (ieee->dev);HTSetConnectBwMode (ieee,HT_CHANNEL_WIDTH_20 ,HT_EXTCHNL_OFFSET_NO_EXT ); -if (ieee->LedControlHandler !=NULL ) - ieee->LedControlHandler (ieee->dev,LED_CTL_LINK ); -rtllib_start_send_beacons (ieee);notify_wx_assoc_event (ieee);
Signature · 1 line
2.40.1
staging: rtl8192e: Replace drivers rtllib_crypt_ccmp_... with lib80211_crypt_...
Hi,
it is possible to remove three modules from the staging area by replacing:rtllib_crypt_ccmp with lib80211_crypt_ccmprtllib_crypt_tkip with lib80211_crypt_tkiprtllib_crypt_wep with lib80211_crypt_wep
The following issues arise:
- rtl8192e needs to be switched to software encryption or lib80211_crypt_... needs to be extended with hardware encryption.
- Performance is dropping on my computer from 12,5MB/s to 1,5MB/s when switching to software encryption.(it does not really change if I use rtllib_crypt_ccmp or lib80211_crypt_ccmp)
- Fix: rtllib_rx_decrypt: decrypt frame error that occure sometimes on lib80211_crypt_ccmp
Below the changes on the driver that made use of lib80211_crypt_... possible.
So the questions are:
Is it worth the effort or is this going in the wrong direction? Does it help the kernel community or is it just creating more effort? Why does LIB80211 not support hardware encryption? Or does it?
Thanks for your support.
Bye Philipp
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -1
@@ -22,7 +22,7 @@#include "rtl_pm.h" -int hwwep =1 ; +int hwwep =0 ;static char *ifname ="wlan%d" ;static struct pci_device_id rtl8192_pci_id_tbl[] = {
drivers/staging/rtl8192e/rtllib_wx.c +6 -6
@@ -522,16 +522,16 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, sec.enabled =1 ;switch (ext->alg) {case IW_ENCODE_ALG_WEP : - alg ="R-WEP" ; - module ="rtllib_crypt_wep" ; + alg ="WEP" ; + module ="lib80211_crypt_wep" ;break ;case IW_ENCODE_ALG_TKIP : - alg ="R-TKIP" ; - module ="rtllib_crypt_tkip" ; + alg ="TKIP" ; + module ="lib80211_crypt_tkip" ;break ;case IW_ENCODE_ALG_CCMP : - alg ="R-CCMP" ; - module ="rtllib_crypt_ccmp" ; + alg ="CCMP" ; + module ="lib80211_crypt_ccmp" ;break ;default :netdev_dbg (ieee->dev,"Unknown crypto alg %d\n" , ext->alg);
Re: staging: rtl8192e: Replace drivers rtllib_crypt_ccmp_... with lib80211_crypt_...
Quoted 16 lines · Philipp Hortmann
Hi,
it is possible to remove three modules from the staging area by replacing:
rtllib_crypt_ccmpwithlib80211_crypt_ccmprtllib_crypt_tkipwithlib80211_crypt_tkiprtllib_crypt_wepwithlib80211_crypt_wepThe following issues arise:
- rtl8192e needs to be switched to software encryption orlib80211_crypt_... needs to be extended with hardware encryption.
- Performance is dropping on my computer from 12,5MB/s to 1,5MB/s when switching to software encryption.(it does not really change if I usertllib_crypt_ccmporlib80211_crypt_ccmp)
- Fix:rtllib_rx_decrypt: decrypt frame error that occure sometimes onlib80211_crypt_ccmp
Quoted 6 lines
Below the changes on the driver that made use of
lib80211_crypt_... possible.So the questions are:
Is it worth the effort or is this going in the wrong direction? Does it help the kernel community or is it just creating more effort? Why does LIB80211 not support hardware encryption? Or does it?
I do not know why LIB80211 does not support hardware encryption, but the performance hit you report is not acceptable!
Larry