diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-06-05 23:29:30 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-06-07 09:03:05 +0200 |
| commit | 6f8eb1b50fd8549524de3be3c540fe917b102393 (patch) | |
| tree | dd7f76b2c918e46df7acb22be73f8a094d1ab40e /target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch | |
| parent | 805e59cdcc2b6b2bb3f7583d8ccdb932e6cdeb7b (diff) | |
| download | upstream-6f8eb1b50fd8549524de3be3c540fe917b102393.tar.gz upstream-6f8eb1b50fd8549524de3be3c540fe917b102393.tar.bz2 upstream-6f8eb1b50fd8549524de3be3c540fe917b102393.zip | |
kernel: bump 4.9 to 4.9.106 for 18.06
Refreshed patches. The following patches were upstreamed and have been deleted:
* target/linux/ar71xx/patches-4.9/106-01-MIPS-ath79-fix-AR724X_PLL_REG_PCIE_CONFIG-offset.patch
* target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch
* target/linux/generic/pending-4.9/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch
* target/linux/generic/pending-4.9/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch')
| -rw-r--r-- | target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch | 18 |
1 files changed, 9 insertions, 9 deletions
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 ea703839f1..5c0388ed0f 100644 --- 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(®s->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; |