diff options
Diffstat (limited to 'drivers/net/enic/enic_main.c')
-rw-r--r-- | drivers/net/enic/enic_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 7d60551d538f..4617956821cd 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c | |||
@@ -411,8 +411,8 @@ static irqreturn_t enic_isr_legacy(int irq, void *data) | |||
411 | } | 411 | } |
412 | 412 | ||
413 | if (ENIC_TEST_INTR(pba, ENIC_INTX_WQ_RQ)) { | 413 | if (ENIC_TEST_INTR(pba, ENIC_INTX_WQ_RQ)) { |
414 | if (netif_rx_schedule_prep(&enic->napi)) | 414 | if (napi_schedule_prep(&enic->napi)) |
415 | __netif_rx_schedule(&enic->napi); | 415 | __napi_schedule(&enic->napi); |
416 | } else { | 416 | } else { |
417 | vnic_intr_unmask(&enic->intr[ENIC_INTX_WQ_RQ]); | 417 | vnic_intr_unmask(&enic->intr[ENIC_INTX_WQ_RQ]); |
418 | } | 418 | } |
@@ -440,7 +440,7 @@ static irqreturn_t enic_isr_msi(int irq, void *data) | |||
440 | * writes). | 440 | * writes). |
441 | */ | 441 | */ |
442 | 442 | ||
443 | netif_rx_schedule(&enic->napi); | 443 | napi_schedule(&enic->napi); |
444 | 444 | ||
445 | return IRQ_HANDLED; | 445 | return IRQ_HANDLED; |
446 | } | 446 | } |
@@ -450,7 +450,7 @@ static irqreturn_t enic_isr_msix_rq(int irq, void *data) | |||
450 | struct enic *enic = data; | 450 | struct enic *enic = data; |
451 | 451 | ||
452 | /* schedule NAPI polling for RQ cleanup */ | 452 | /* schedule NAPI polling for RQ cleanup */ |
453 | netif_rx_schedule(&enic->napi); | 453 | napi_schedule(&enic->napi); |
454 | 454 | ||
455 | return IRQ_HANDLED; | 455 | return IRQ_HANDLED; |
456 | } | 456 | } |
@@ -1068,7 +1068,7 @@ static int enic_poll(struct napi_struct *napi, int budget) | |||
1068 | if (netdev->features & NETIF_F_LRO) | 1068 | if (netdev->features & NETIF_F_LRO) |
1069 | lro_flush_all(&enic->lro_mgr); | 1069 | lro_flush_all(&enic->lro_mgr); |
1070 | 1070 | ||
1071 | netif_rx_complete(napi); | 1071 | napi_complete(napi); |
1072 | vnic_intr_unmask(&enic->intr[ENIC_MSIX_RQ]); | 1072 | vnic_intr_unmask(&enic->intr[ENIC_MSIX_RQ]); |
1073 | } | 1073 | } |
1074 | 1074 | ||
@@ -1112,7 +1112,7 @@ static int enic_poll_msix(struct napi_struct *napi, int budget) | |||
1112 | if (netdev->features & NETIF_F_LRO) | 1112 | if (netdev->features & NETIF_F_LRO) |
1113 | lro_flush_all(&enic->lro_mgr); | 1113 | lro_flush_all(&enic->lro_mgr); |
1114 | 1114 | ||
1115 | netif_rx_complete(napi); | 1115 | napi_complete(napi); |
1116 | vnic_intr_unmask(&enic->intr[ENIC_MSIX_RQ]); | 1116 | vnic_intr_unmask(&enic->intr[ENIC_MSIX_RQ]); |
1117 | } | 1117 | } |
1118 | 1118 | ||