generic: 6.1: fixup QCA807x upstream PHY

[openwrt/openwrt.git] / target / linux / generic / pending-6.1 / 702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch

diff --git a/target/linux/generic/pending-6.1/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch b/target/linux/generic/pending-6.1/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
index a4e3d2650333ebb1fa2270fc2aacf02c343dfb05..be28fdc803618329f83348f6a405bdfb3af72731 100644 (file)
--- a/target/linux/generic/pending-6.1/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
+++ b/target/linux/generic/pending-6.1/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
@@ -10,32 +10,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2992,8 +2992,8 @@ static irqreturn_t mtk_handle_irq_rx(int
- 
-       eth->rx_events++;
-       if (likely(napi_schedule_prep(&eth->rx_napi))) {
--              __napi_schedule(&eth->rx_napi);
-               mtk_rx_irq_disable(eth, eth->soc->txrx.rx_irq_done_mask);
-+              __napi_schedule(&eth->rx_napi);
-       }
- 
-       return IRQ_HANDLED;
-@@ -3005,8 +3005,8 @@ static irqreturn_t mtk_handle_irq_tx(int
- 
-       eth->tx_events++;
-       if (likely(napi_schedule_prep(&eth->tx_napi))) {
--              __napi_schedule(&eth->tx_napi);
-               mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
-+              __napi_schedule(&eth->tx_napi);
-       }
- 
-       return IRQ_HANDLED;
-@@ -4673,6 +4673,8 @@ static int mtk_probe(struct platform_dev
+@@ -4942,6 +4942,8 @@ static int mtk_probe(struct platform_dev
         * for NAPI to work
         */
        init_dummy_netdev(&eth->dummy_dev);
 +      eth->dummy_dev.threaded = 1;
 +      strcpy(eth->dummy_dev.name, "mtk_eth");
-       netif_napi_add(&eth->dummy_dev, &eth->tx_napi, mtk_napi_tx,
-                      NAPI_POLL_WEIGHT);
-       netif_napi_add(&eth->dummy_dev, &eth->rx_napi, mtk_napi_rx,
+       netif_napi_add(&eth->dummy_dev, &eth->tx_napi, mtk_napi_tx);
+       netif_napi_add(&eth->dummy_dev, &eth->rx_napi, mtk_napi_rx);
+