staging: rtl8192e: Remove rtllib_stop_send_beacons

rtllib_start_send_beacons() is removed so no need for
rtllib_stop_send_beacons() anymore.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/17c5545102ad8f50ca320af17aafa555f8caec2d.1695387832.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 208c7bfd9bfe2d5438f0190a2597b6f48c3dc3ac..87f5441fbb10d01cfa730163c05a2c71e8d622c5 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -458,10 +458,6 @@ static void _rtl92e_prepare_beacon(struct tasklet_struct *t)
        pdesc->OWN = 1;
 }
 
-static void _rtl92e_stop_beacon(struct net_device *dev)
-{
-}
-
 void rtl92e_config_rate(struct net_device *dev, u16 *rate_config)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
@@ -700,8 +696,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev)
        priv->rtllib->set_bw_mode_handler       = rtl92e_set_bw_mode;
        priv->rf_set_chan                       = rtl92e_set_channel;
 
-       priv->rtllib->stop_send_beacons = _rtl92e_stop_beacon;
-
        priv->rtllib->sta_wake_up = rtl92e_hw_wakeup;
        priv->rtllib->enter_sleep_state = rtl92e_enter_sleep;
        priv->rtllib->ps_is_queue_empty = _rtl92e_is_tx_queue_empty;
@@ -1045,7 +1039,6 @@ RESET_START:
                if (ieee->link_state == MAC80211_LINKED) {
                        mutex_lock(&ieee->wx_mutex);
                        netdev_info(dev, "ieee->link_state is MAC80211_LINKED\n");
-                       rtllib_stop_send_beacons(priv->rtllib);
                        del_timer_sync(&ieee->associate_timer);
                        cancel_delayed_work(&ieee->associate_retry_wq);
                        rtllib_stop_scan(ieee);

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 410401869ebbad92f95ff6343f51e7471e4e382b..0597dcb759e05362df4a459f4d9419ca9995b913 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1495,14 +1495,6 @@ struct rtllib_device {
         */
        void (*link_change)(struct net_device *dev);
 
-       /* these two function indicates to the HW when to start
-        * and stop to send beacons. This is used when the
-        * IEEE_SOFTMAC_BEACONS is not set. For now the
-        * stop_send_bacons is NOT guaranteed to be called only
-        * after start_send_beacons.
-        */
-       void (*stop_send_beacons)(struct net_device *dev);
-
        /* power save mode related */
        void (*sta_wake_up)(struct net_device *dev);
        void (*enter_sleep_state)(struct net_device *dev, u64 time);
@@ -1725,7 +1717,6 @@ void rtllib_reset_queue(struct rtllib_device *ieee);
 void rtllib_wake_all_queues(struct rtllib_device *ieee);
 void rtllib_stop_all_queues(struct rtllib_device *ieee);
 struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee);
-void rtllib_stop_send_beacons(struct rtllib_device *ieee);
 
 void notify_wx_assoc_event(struct rtllib_device *ieee);
 void rtllib_ps_tx_ack(struct rtllib_device *ieee, short success);

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 4551071e9f1b83b3427d3d263ec464a2c5a22518..982578e1c0af6fc627586a805890a75d379afb0b 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -607,26 +607,6 @@ out1:
        mutex_unlock(&ieee->scan_mutex);
 }
 
-static void rtllib_beacons_stop(struct rtllib_device *ieee)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&ieee->beacon_lock, flags);
-
-       ieee->beacon_txing = 0;
-
-       spin_unlock_irqrestore(&ieee->beacon_lock, flags);
-       del_timer_sync(&ieee->beacon_timer);
-}
-
-void rtllib_stop_send_beacons(struct rtllib_device *ieee)
-{
-       ieee->stop_send_beacons(ieee->dev);
-       if (ieee->softmac_features & IEEE_SOFTMAC_BEACONS)
-               rtllib_beacons_stop(ieee);
-}
-EXPORT_SYMBOL(rtllib_stop_send_beacons);
-
 static void rtllib_softmac_stop_scan(struct rtllib_device *ieee)
 {
        mutex_lock(&ieee->scan_mutex);
@@ -2326,7 +2306,6 @@ void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown)
                ieee->rtllib_ips_leave(ieee->dev);
        }
 
-       rtllib_stop_send_beacons(ieee);
        del_timer_sync(&ieee->associate_timer);
        cancel_delayed_work_sync(&ieee->associate_retry_wq);
        cancel_delayed_work_sync(&ieee->link_change_wq);

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index 2b15251201eca17308c0032e52eaf98830a13fe6..3c7c0f07ab0bfb9c74e26c83c81b8b53c57e51dd 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -310,7 +310,6 @@ void rtllib_wx_sync_scan_wq(void *data)
        rtllib_sta_ps_send_null_frame(ieee, 1);
 
        rtllib_stop_all_queues(ieee);
-       rtllib_stop_send_beacons(ieee);
        ieee->link_state = MAC80211_LINKED_SCANNING;
        ieee->link_change(ieee->dev);
        /* wait for ps packet to be kicked out successfully */