/branches/18.06.1/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch |
@@ -192,7 +192,7 @@ |
|
--- a/drivers/net/can/rcar/rcar_can.c |
+++ b/drivers/net/can/rcar/rcar_can.c |
@@ -698,7 +698,7 @@ static int rcar_can_rx_poll(struct napi_ |
@@ -695,7 +695,7 @@ static int rcar_can_rx_poll(struct napi_ |
} |
/* All packets processed */ |
if (num_pkts < quota) { |
@@ -269,7 +269,7 @@ |
"NAPI Complete, did %d packets with budget %d\n", |
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c |
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c |
@@ -655,7 +655,7 @@ static int xgene_enet_napi(struct napi_s |
@@ -658,7 +658,7 @@ static int xgene_enet_napi(struct napi_s |
processed = xgene_enet_process_ring(ring, budget); |
|
if (processed != budget) { |
@@ -302,7 +302,7 @@ |
if (alx->flags & ALX_FLAG_USING_MSIX) { |
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c |
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c |
@@ -1886,7 +1886,7 @@ static int atl1c_clean(struct napi_struc |
@@ -1885,7 +1885,7 @@ static int atl1c_clean(struct napi_struc |
|
if (work_done < budget) { |
quit_polling: |
@@ -388,7 +388,7 @@ |
BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | |
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c |
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c |
@@ -3236,7 +3236,7 @@ static int bnx2x_poll(struct napi_struct |
@@ -3230,7 +3230,7 @@ static int bnx2x_poll(struct napi_struct |
* has been updated when NAPI was scheduled. |
*/ |
if (IS_FCOE_FP(fp)) { |
@@ -399,7 +399,7 @@ |
/* bnx2x_has_rx_work() reads the status block, |
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c |
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c |
@@ -1781,7 +1781,7 @@ static int bnxt_poll_nitroa0(struct napi |
@@ -1778,7 +1778,7 @@ static int bnxt_poll_nitroa0(struct napi |
} |
|
if (!bnxt_has_work(bp, cpr) && rx_pkts < budget) { |
@@ -657,7 +657,7 @@ |
gfar_write(®s->rstat, gfargrp->rstat); |
--- a/drivers/net/ethernet/freescale/ucc_geth.c |
+++ b/drivers/net/ethernet/freescale/ucc_geth.c |
@@ -3303,7 +3303,7 @@ static int ucc_geth_poll(struct napi_str |
@@ -3301,7 +3301,7 @@ static int ucc_geth_poll(struct napi_str |
howmany += ucc_geth_rx(ugeth, i, budget - howmany); |
|
if (howmany < budget) { |
@@ -701,7 +701,7 @@ |
|
--- a/drivers/net/ethernet/ibm/ibmveth.c |
+++ b/drivers/net/ethernet/ibm/ibmveth.c |
@@ -1324,7 +1324,7 @@ restart_poll: |
@@ -1320,7 +1320,7 @@ restart_poll: |
ibmveth_replenish_task(adapter); |
|
if (frames_processed < budget) { |
@@ -819,7 +819,7 @@ |
|
--- a/drivers/net/ethernet/marvell/mvpp2.c |
+++ b/drivers/net/ethernet/marvell/mvpp2.c |
@@ -5406,7 +5406,7 @@ static int mvpp2_poll(struct napi_struct |
@@ -5404,7 +5404,7 @@ static int mvpp2_poll(struct napi_struct |
|
if (budget > 0) { |
cause_rx = 0; |
@@ -1040,7 +1040,7 @@ |
writel(irq->mask, adpt->base + EMAC_INT_MASK); |
--- a/drivers/net/ethernet/realtek/r8169.c |
+++ b/drivers/net/ethernet/realtek/r8169.c |
@@ -7578,7 +7578,7 @@ static int rtl8169_poll(struct napi_stru |
@@ -7577,7 +7577,7 @@ static int rtl8169_poll(struct napi_stru |
} |
|
if (work_done < budget) { |
@@ -1095,7 +1095,7 @@ |
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 |
@@ -2706,7 +2706,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) { |
@@ -1379,7 +1379,7 @@ |
*/ |
--- a/drivers/net/xen-netfront.c |
+++ b/drivers/net/xen-netfront.c |
@@ -1070,7 +1070,7 @@ err: |
@@ -1065,7 +1065,7 @@ err: |
if (work_done < budget) { |
int more_to_do = 0; |
|