kernel: bump 4.14 to 4.14.86

[openwrt/openwrt.git] / target / linux / rb532 / patches-4.14 / 106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch

diff --git a/target/linux/rb532/patches-4.14/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch b/target/linux/rb532/patches-4.14/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch
index e75079b12f07811201a054874febac58bf4ffbb4..2bc2c1067e745cb5397081ab23d540b106428e06 100644 (file)
--- a/target/linux/rb532/patches-4.14/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch
+++ b/target/linux/rb532/patches-4.14/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch
@@ -9,7 +9,7 @@
  
        spinlock_t lock;        /* NIC xmit lock */
  
-@@ -890,8 +888,6 @@ static void korina_restart_task(struct w
+@@ -891,8 +889,6 @@ static void korina_restart_task(struct w
         */
        disable_irq(lp->rx_irq);
        disable_irq(lp->tx_irq);
@@ -18,7 +18,7 @@
  
        writel(readl(&lp->tx_dma_regs->dmasm) |
                                DMA_STAT_FINI | DMA_STAT_ERR,
-@@ -910,40 +906,10 @@ static void korina_restart_task(struct w
+@@ -911,40 +907,10 @@ static void korina_restart_task(struct w
        }
        korina_multicast_list(dev);
  
@@ -59,7 +59,7 @@
  static void korina_tx_timeout(struct net_device *dev)
  {
        struct korina_private *lp = netdev_priv(dev);
-@@ -951,25 +917,6 @@ static void korina_tx_timeout(struct net
+@@ -952,25 +918,6 @@ static void korina_tx_timeout(struct net
        schedule_work(&lp->restart_task);
  }
  
@@ -85,7 +85,7 @@
  #ifdef CONFIG_NET_POLL_CONTROLLER
  static void korina_poll_controller(struct net_device *dev)
  {
-@@ -992,8 +939,7 @@ static int korina_open(struct net_device
+@@ -993,8 +940,7 @@ static int korina_open(struct net_device
        }
  
        /* Install the interrupt handler
@@ -95,7 +95,7 @@
        ret = request_irq(lp->rx_irq, korina_rx_dma_interrupt,
                        0, "Korina ethernet Rx", dev);
        if (ret < 0) {
-@@ -1009,31 +955,10 @@ static int korina_open(struct net_device
+@@ -1010,31 +956,10 @@ static int korina_open(struct net_device
                goto err_free_rx_irq;
        }
  
@@ -127,7 +127,7 @@
  err_free_rx_irq:
        free_irq(lp->rx_irq, dev);
  err_release:
-@@ -1051,8 +976,6 @@ static int korina_close(struct net_devic
+@@ -1052,8 +977,6 @@ static int korina_close(struct net_devic
        /* Disable interrupts */
        disable_irq(lp->rx_irq);
        disable_irq(lp->tx_irq);
@@ -136,7 +136,7 @@
  
        korina_abort_tx(dev);
        tmp = readl(&lp->tx_dma_regs->dmasm);
-@@ -1072,8 +995,6 @@ static int korina_close(struct net_devic
+@@ -1073,8 +996,6 @@ static int korina_close(struct net_devic
  
        free_irq(lp->rx_irq, dev);
        free_irq(lp->tx_irq, dev);