kernel: bump 4.9 to 4.9.106 for 18.06

[openwrt/openwrt.git] / target / linux / generic / backport-4.9 / 090-net-generalize-napi_complete_done.patch

diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
index ea703839f13313165325ca486a658071ef97b8c5..5c0388ed0fe30d613a98f8528e142d2e2cce93f7 100644 (file)
--- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
+++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
@@ -357,7 +357,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        enet_dmac_writel(priv, priv->dma_chan_int_mask,
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1145,7 +1145,7 @@ static int bgmac_poll(struct napi_struct
+@@ -1146,7 +1146,7 @@ static int bgmac_poll(struct napi_struct
                return weight;
  
        if (handled < weight) {
@@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                return received;
 --- a/drivers/net/ethernet/freescale/gianfar.c
 +++ b/drivers/net/ethernet/freescale/gianfar.c
-@@ -3193,7 +3193,7 @@ static int gfar_poll_rx_sq(struct napi_s
+@@ -3197,7 +3197,7 @@ static int gfar_poll_rx_sq(struct napi_s
  
        if (work_done < budget) {
                u32 imask;
@@ -646,7 +646,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                /* Clear the halt bit in RSTAT */
                gfar_write(&regs->rstat, gfargrp->rstat);
  
-@@ -3282,7 +3282,7 @@ static int gfar_poll_rx(struct napi_stru
+@@ -3286,7 +3286,7 @@ static int gfar_poll_rx(struct napi_stru
  
        if (!num_act_queues) {
                u32 imask;
@@ -712,7 +712,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                 * then check once more to make sure we are done.
 --- a/drivers/net/ethernet/ibm/ibmvnic.c
 +++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -1027,7 +1027,7 @@ restart_poll:
+@@ -1028,7 +1028,7 @@ restart_poll:
  
        if (frames_processed < budget) {
                enable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]);
@@ -803,7 +803,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -2701,11 +2701,9 @@ static int mvneta_poll(struct napi_struc
+@@ -2702,11 +2702,9 @@ static int mvneta_poll(struct napi_struc
                        rx_done = mvneta_rx_swbm(pp, budget, &pp->rxqs[rx_queue]);
        }
  
@@ -1095,7 +1095,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA);
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -2693,7 +2693,7 @@ static int stmmac_poll(struct napi_struc
+@@ -2705,7 +2705,7 @@ static int stmmac_poll(struct napi_struc
  
        work_done = stmmac_rx(priv, budget);
        if (work_done < budget) {
@@ -1304,7 +1304,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        adapter->rx_last_jiffies = jiffies;
 --- a/drivers/net/vmxnet3/vmxnet3_drv.c
 +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
-@@ -1851,7 +1851,7 @@ vmxnet3_poll(struct napi_struct *napi, i
+@@ -1873,7 +1873,7 @@ vmxnet3_poll(struct napi_struct *napi, i
        rxd_done = vmxnet3_do_poll(rx_queue->adapter, budget);
  
        if (rxd_done < budget) {
@@ -1313,7 +1313,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                vmxnet3_enable_all_intrs(rx_queue->adapter);
        }
        return rxd_done;
-@@ -1882,7 +1882,7 @@ vmxnet3_poll_rx_only(struct napi_struct
+@@ -1904,7 +1904,7 @@ vmxnet3_poll_rx_only(struct napi_struct
        rxd_done = vmxnet3_rq_rx_complete(rq, adapter, budget);
  
        if (rxd_done < budget) {
@@ -1379,7 +1379,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                 */
 --- a/drivers/net/xen-netfront.c
 +++ b/drivers/net/xen-netfront.c
-@@ -1061,7 +1061,7 @@ err:
+@@ -1064,7 +1064,7 @@ err:
        if (work_done < budget) {
                int more_to_do = 0;