diff options
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 14 |
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h index 9a5f788d97c..8501c4aced6 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h | |||
@@ -2268,7 +2268,6 @@ struct ieee80211_device { | |||
2268 | struct delayed_work associate_retry_wq; | 2268 | struct delayed_work associate_retry_wq; |
2269 | struct delayed_work start_ibss_wq; | 2269 | struct delayed_work start_ibss_wq; |
2270 | struct delayed_work hw_wakeup_wq; | 2270 | struct delayed_work hw_wakeup_wq; |
2271 | struct delayed_work hw_sleep_wq; | ||
2272 | 2271 | ||
2273 | struct work_struct wx_sync_scan_wq; | 2272 | struct work_struct wx_sync_scan_wq; |
2274 | struct workqueue_struct *wq; | 2273 | struct workqueue_struct *wq; |
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index cc20e5d7f5a..2897ac25173 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c | |||
@@ -1852,15 +1852,6 @@ static void rtl8192_hw_sleep_down(struct net_device *dev) | |||
1852 | MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS); | 1852 | MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS); |
1853 | } | 1853 | } |
1854 | 1854 | ||
1855 | static void rtl8192_hw_sleep_wq (struct work_struct *work) | ||
1856 | { | ||
1857 | struct delayed_work *dwork = container_of(work,struct delayed_work,work); | ||
1858 | struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_sleep_wq); | ||
1859 | struct net_device *dev = ieee->dev; | ||
1860 | |||
1861 | rtl8192_hw_sleep_down(dev); | ||
1862 | } | ||
1863 | |||
1864 | static void rtl8192_hw_wakeup(struct net_device* dev) | 1855 | static void rtl8192_hw_wakeup(struct net_device* dev) |
1865 | { | 1856 | { |
1866 | MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS); | 1857 | MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS); |
@@ -1909,8 +1900,7 @@ static void rtl8192_hw_to_sleep(struct net_device *dev, u32 th, u32 tl) | |||
1909 | queue_delayed_work(priv->ieee80211->wq, | 1900 | queue_delayed_work(priv->ieee80211->wq, |
1910 | &priv->ieee80211->hw_wakeup_wq,tmp); | 1901 | &priv->ieee80211->hw_wakeup_wq,tmp); |
1911 | 1902 | ||
1912 | queue_delayed_work(priv->ieee80211->wq, | 1903 | rtl8192_hw_sleep_down(dev); |
1913 | (void *)&priv->ieee80211->hw_sleep_wq,0); | ||
1914 | } | 1904 | } |
1915 | 1905 | ||
1916 | static void rtl8192_init_priv_variable(struct net_device* dev) | 1906 | static void rtl8192_init_priv_variable(struct net_device* dev) |
@@ -2063,7 +2053,6 @@ static void rtl8192_init_priv_task(struct net_device* dev) | |||
2063 | INIT_DELAYED_WORK(&priv->update_beacon_wq, rtl8192_update_beacon); | 2053 | INIT_DELAYED_WORK(&priv->update_beacon_wq, rtl8192_update_beacon); |
2064 | INIT_WORK(&priv->qos_activate, rtl8192_qos_activate); | 2054 | INIT_WORK(&priv->qos_activate, rtl8192_qos_activate); |
2065 | INIT_DELAYED_WORK(&priv->ieee80211->hw_wakeup_wq, rtl8192_hw_wakeup_wq); | 2055 | INIT_DELAYED_WORK(&priv->ieee80211->hw_wakeup_wq, rtl8192_hw_wakeup_wq); |
2066 | INIT_DELAYED_WORK(&priv->ieee80211->hw_sleep_wq, rtl8192_hw_sleep_wq); | ||
2067 | 2056 | ||
2068 | tasklet_init(&priv->irq_rx_tasklet, rtl8192_irq_rx_tasklet, | 2057 | tasklet_init(&priv->irq_rx_tasklet, rtl8192_irq_rx_tasklet, |
2069 | (unsigned long) priv); | 2058 | (unsigned long) priv); |
@@ -4802,7 +4791,6 @@ static void rtl8192_cancel_deferred_work(struct r8192_priv* priv) | |||
4802 | cancel_delayed_work(&priv->watch_dog_wq); | 4791 | cancel_delayed_work(&priv->watch_dog_wq); |
4803 | cancel_delayed_work(&priv->update_beacon_wq); | 4792 | cancel_delayed_work(&priv->update_beacon_wq); |
4804 | cancel_delayed_work(&priv->ieee80211->hw_wakeup_wq); | 4793 | cancel_delayed_work(&priv->ieee80211->hw_wakeup_wq); |
4805 | cancel_delayed_work(&priv->ieee80211->hw_sleep_wq); | ||
4806 | cancel_delayed_work(&priv->gpio_change_rf_wq); | 4794 | cancel_delayed_work(&priv->gpio_change_rf_wq); |
4807 | cancel_work_sync(&priv->reset_wq); | 4795 | cancel_work_sync(&priv->reset_wq); |
4808 | cancel_work_sync(&priv->qos_activate); | 4796 | cancel_work_sync(&priv->qos_activate); |