Remove function data_hard_resume as it is not defined. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx> --- 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(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index b356cde80f84..9b49a15de889 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -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. diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 65eecbc94b93..fe36a52b4c91 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -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); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index d7166d6772df..371864f0087f 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -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); -- 2.40.1