OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 190... Line 190...
190 m_can_enable_all_interrupts(priv); 190 m_can_enable_all_interrupts(priv);
191 } 191 }
Line 192... Line 192...
192 192
193 --- a/drivers/net/can/rcar/rcar_can.c 193 --- a/drivers/net/can/rcar/rcar_can.c
194 +++ b/drivers/net/can/rcar/rcar_can.c 194 +++ b/drivers/net/can/rcar/rcar_can.c
195 @@ -698,7 +698,7 @@ static int rcar_can_rx_poll(struct napi_ 195 @@ -695,7 +695,7 @@ static int rcar_can_rx_poll(struct napi_
196 } 196 }
197 /* All packets processed */ 197 /* All packets processed */
198 if (num_pkts < quota) { 198 if (num_pkts < quota) {
199 - napi_complete(napi); 199 - napi_complete(napi);
Line 267... Line 267...
267 267
268 netdev_dbg(priv->dev, 268 netdev_dbg(priv->dev,
269 "NAPI Complete, did %d packets with budget %d\n", 269 "NAPI Complete, did %d packets with budget %d\n",
270 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c 270 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
271 +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c 271 +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
272 @@ -655,7 +655,7 @@ static int xgene_enet_napi(struct napi_s 272 @@ -658,7 +658,7 @@ static int xgene_enet_napi(struct napi_s
Line 273... Line 273...
273 processed = xgene_enet_process_ring(ring, budget); 273 processed = xgene_enet_process_ring(ring, budget);
274 274
275 if (processed != budget) { 275 if (processed != budget) {
Line 300... Line 300...
300 300
301 /* enable interrupt */ 301 /* enable interrupt */
302 if (alx->flags & ALX_FLAG_USING_MSIX) { 302 if (alx->flags & ALX_FLAG_USING_MSIX) {
303 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 303 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
304 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 304 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
Line 305... Line 305...
305 @@ -1886,7 +1886,7 @@ static int atl1c_clean(struct napi_struc 305 @@ -1885,7 +1885,7 @@ static int atl1c_clean(struct napi_struc
306 306
307 if (work_done < budget) { 307 if (work_done < budget) {
308 quit_polling: 308 quit_polling:
Line 386... Line 386...
386 if (likely(bp->flags & BNX2_FLAG_USING_MSI_OR_MSIX)) { 386 if (likely(bp->flags & BNX2_FLAG_USING_MSI_OR_MSIX)) {
387 BNX2_WR(bp, BNX2_PCICFG_INT_ACK_CMD, 387 BNX2_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
388 BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | 388 BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
389 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 389 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
390 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 390 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
391 @@ -3236,7 +3236,7 @@ static int bnx2x_poll(struct napi_struct 391 @@ -3230,7 +3230,7 @@ static int bnx2x_poll(struct napi_struct
392 * has been updated when NAPI was scheduled. 392 * has been updated when NAPI was scheduled.
393 */ 393 */
394 if (IS_FCOE_FP(fp)) { 394 if (IS_FCOE_FP(fp)) {
395 - napi_complete(napi); 395 - napi_complete(napi);
396 + napi_complete_done(napi, rx_work_done); 396 + napi_complete_done(napi, rx_work_done);
397 } else { 397 } else {
398 bnx2x_update_fpsb_idx(fp); 398 bnx2x_update_fpsb_idx(fp);
399 /* bnx2x_has_rx_work() reads the status block, 399 /* bnx2x_has_rx_work() reads the status block,
400 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c 400 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
401 +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c 401 +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
402 @@ -1781,7 +1781,7 @@ static int bnxt_poll_nitroa0(struct napi 402 @@ -1778,7 +1778,7 @@ static int bnxt_poll_nitroa0(struct napi
403 } 403 }
Line 404... Line 404...
404 404
405 if (!bnxt_has_work(bp, cpr) && rx_pkts < budget) { 405 if (!bnxt_has_work(bp, cpr) && rx_pkts < budget) {
406 - napi_complete(napi); 406 - napi_complete(napi);
Line 655... Line 655...
655 655
656 /* Clear the halt bit in RSTAT */ 656 /* Clear the halt bit in RSTAT */
657 gfar_write(&regs->rstat, gfargrp->rstat); 657 gfar_write(&regs->rstat, gfargrp->rstat);
658 --- a/drivers/net/ethernet/freescale/ucc_geth.c 658 --- a/drivers/net/ethernet/freescale/ucc_geth.c
659 +++ b/drivers/net/ethernet/freescale/ucc_geth.c 659 +++ b/drivers/net/ethernet/freescale/ucc_geth.c
660 @@ -3303,7 +3303,7 @@ static int ucc_geth_poll(struct napi_str 660 @@ -3301,7 +3301,7 @@ static int ucc_geth_poll(struct napi_str
Line 661... Line 661...
661 howmany += ucc_geth_rx(ugeth, i, budget - howmany); 661 howmany += ucc_geth_rx(ugeth, i, budget - howmany);
662 662
663 if (howmany < budget) { 663 if (howmany < budget) {
Line 699... Line 699...
699 hix5hd2_irq_enable(priv); 699 hix5hd2_irq_enable(priv);
700 } 700 }
Line 701... Line 701...
701 701
702 --- a/drivers/net/ethernet/ibm/ibmveth.c 702 --- a/drivers/net/ethernet/ibm/ibmveth.c
703 +++ b/drivers/net/ethernet/ibm/ibmveth.c 703 +++ b/drivers/net/ethernet/ibm/ibmveth.c
704 @@ -1324,7 +1324,7 @@ restart_poll: 704 @@ -1320,7 +1320,7 @@ restart_poll:
Line 705... Line 705...
705 ibmveth_replenish_task(adapter); 705 ibmveth_replenish_task(adapter);
706 706
707 if (frames_processed < budget) { 707 if (frames_processed < budget) {
Line 817... Line 817...
817 enable_percpu_irq(pp->dev->irq, 0); 817 enable_percpu_irq(pp->dev->irq, 0);
818 } 818 }
Line 819... Line 819...
819 819
820 --- a/drivers/net/ethernet/marvell/mvpp2.c 820 --- a/drivers/net/ethernet/marvell/mvpp2.c
821 +++ b/drivers/net/ethernet/marvell/mvpp2.c 821 +++ b/drivers/net/ethernet/marvell/mvpp2.c
Line 822... Line 822...
822 @@ -5406,7 +5406,7 @@ static int mvpp2_poll(struct napi_struct 822 @@ -5404,7 +5404,7 @@ static int mvpp2_poll(struct napi_struct
823 823
824 if (budget > 0) { 824 if (budget > 0) {
825 cause_rx = 0; 825 cause_rx = 0;
Line 1038... Line 1038...
1038 1038
1039 irq->mask |= rx_q->intr; 1039 irq->mask |= rx_q->intr;
1040 writel(irq->mask, adpt->base + EMAC_INT_MASK); 1040 writel(irq->mask, adpt->base + EMAC_INT_MASK);
1041 --- a/drivers/net/ethernet/realtek/r8169.c 1041 --- a/drivers/net/ethernet/realtek/r8169.c
1042 +++ b/drivers/net/ethernet/realtek/r8169.c 1042 +++ b/drivers/net/ethernet/realtek/r8169.c
1043 @@ -7578,7 +7578,7 @@ static int rtl8169_poll(struct napi_stru 1043 @@ -7577,7 +7577,7 @@ static int rtl8169_poll(struct napi_stru
Line 1044... Line 1044...
1044 } 1044 }
1045 1045
1046 if (work_done < budget) { 1046 if (work_done < budget) {
Line 1093... Line 1093...
1093 1093
1094 /* re-enable RX DMA interrupts */ 1094 /* re-enable RX DMA interrupts */
1095 dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA); 1095 dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA);
1096 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c 1096 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
1097 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c 1097 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Line 1098... Line 1098...
1098 @@ -2706,7 +2706,7 @@ static int stmmac_poll(struct napi_struc 1098 @@ -2705,7 +2705,7 @@ static int stmmac_poll(struct napi_struc
1099 1099
1100 work_done = stmmac_rx(priv, budget); 1100 work_done = stmmac_rx(priv, budget);
1101 if (work_done < budget) { 1101 if (work_done < budget) {
Line 1377... Line 1377...
1377 /* If the queue is rate-limited, it shall be 1377 /* If the queue is rate-limited, it shall be
1378 * rescheduled in the timer callback. 1378 * rescheduled in the timer callback.
1379 */ 1379 */
1380 --- a/drivers/net/xen-netfront.c 1380 --- a/drivers/net/xen-netfront.c
1381 +++ b/drivers/net/xen-netfront.c 1381 +++ b/drivers/net/xen-netfront.c
1382 @@ -1070,7 +1070,7 @@ err: 1382 @@ -1065,7 +1065,7 @@ err:
1383 if (work_done < budget) { 1383 if (work_done < budget) {
1384 int more_to_do = 0; 1384 int more_to_do = 0;
Line 1385... Line 1385...
1385 1385
1386 - napi_complete(napi); 1386 - napi_complete(napi);