staging: rtl8192e: Remove unused interrupt for IMR_BcnInt
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Fri, 24 Nov 2023 21:30:23 +0000 (22:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Nov 2023 10:27:49 +0000 (10:27 +0000)
Driver does not support AP Mode therefore no beacons need to be send.
Remove unused interrupt for IMR_BcnInt.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/64a1f672dbe2ed2c6a660fa1044bd058fe3ba91a.1700860758.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
drivers/staging/rtl8192e/rtl8192e/rtl_core.h

index 8fe4c03b19c1b20d3f847141403d335421841089..73315a236e769804c15460eacad7fcb0ef6b84da 100644 (file)
@@ -1802,7 +1802,7 @@ rtl92e_init_variables(struct net_device  *dev)
                            IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |
                            IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 |
                            IMR_RDU | IMR_RXFOVW | IMR_TXFOVW |
-                           IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
+                           IMR_TBDOK | IMR_TBDER);
 
        priv->bfirst_after_down = false;
 }
index c3466291e221d5df3c2fa9c6f7534d6a2a1a9b31..fc6e8ea039a3b737d3af117e41508af3ee189948 100644 (file)
@@ -416,38 +416,6 @@ static int _rtl92e_handle_assoc_response(struct net_device *dev,
        return 0;
 }
 
-static void _rtl92e_prepare_beacon(struct tasklet_struct *t)
-{
-       struct r8192_priv *priv = from_tasklet(priv, t,
-                                              irq_prepare_beacon_tasklet);
-       struct net_device *dev = priv->rtllib->dev;
-       struct sk_buff *pskb = NULL, *pnewskb = NULL;
-       struct cb_desc *tcb_desc = NULL;
-       struct rtl8192_tx_ring *ring = NULL;
-       struct tx_desc *pdesc = NULL;
-
-       ring = &priv->tx_ring[BEACON_QUEUE];
-       pskb = __skb_dequeue(&ring->queue);
-       kfree_skb(pskb);
-
-       pnewskb = rtllib_get_beacon(priv->rtllib);
-       if (!pnewskb)
-               return;
-
-       tcb_desc = (struct cb_desc *)(pnewskb->cb + 8);
-       tcb_desc->queue_index = BEACON_QUEUE;
-       tcb_desc->data_rate = 2;
-       tcb_desc->ratr_index = 7;
-       tcb_desc->tx_dis_rate_fallback = 1;
-       tcb_desc->tx_use_drv_assinged_rate = 1;
-       skb_push(pnewskb, priv->rtllib->tx_headroom);
-
-       pdesc = &ring->desc[0];
-       rtl92e_fill_tx_desc(dev, pdesc, tcb_desc, pnewskb);
-       __skb_queue_tail(&ring->queue, pnewskb);
-       pdesc->OWN = 1;
-}
-
 void rtl92e_config_rate(struct net_device *dev, u16 *rate_config)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
@@ -785,8 +753,6 @@ static void _rtl92e_init_priv_task(struct net_device *dev)
        INIT_DELAYED_WORK(&priv->rtllib->hw_sleep_wq, (void *)rtl92e_hw_sleep_wq);
        tasklet_setup(&priv->irq_rx_tasklet, _rtl92e_irq_rx_tasklet);
        tasklet_setup(&priv->irq_tx_tasklet, _rtl92e_irq_tx_tasklet);
-       tasklet_setup(&priv->irq_prepare_beacon_tasklet,
-                     _rtl92e_prepare_beacon);
 }
 
 static short _rtl92e_get_channel_map(struct net_device *dev)
@@ -1810,9 +1776,6 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev)
        if (inta & IMR_ROK)
                tasklet_schedule(&priv->irq_rx_tasklet);
 
-       if (inta & IMR_BcnInt)
-               tasklet_schedule(&priv->irq_prepare_beacon_tasklet);
-
        if (inta & IMR_RDU) {
                rtl92e_writel(dev, INTA_MASK,
                              rtl92e_readl(dev, INTA_MASK) & ~IMR_RDU);
index e7b331c4661c7cdc5a95e5aaa3b438d525358153..846f0f7a737ba67eb40ce14983efff31a2289b46 100644 (file)
@@ -219,7 +219,6 @@ struct r8192_priv {
 
        struct tasklet_struct           irq_rx_tasklet;
        struct tasklet_struct           irq_tx_tasklet;
-       struct tasklet_struct           irq_prepare_beacon_tasklet;
 
        struct mutex                            wx_mutex;
        struct mutex                            rf_mutex;