diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2016-02-17 11:48:29 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-17 15:22:18 -0500 |
| commit | 793494228fdf15acb252063f9f6dcccd3d1d497e (patch) | |
| tree | 50fe8fe7eb7e0267cd0cf86a9743a21f0b7ac808 | |
| parent | 491aefb38a31bb163e1e4393ba42abf68ce4c6eb (diff) | |
| download | linux-793494228fdf15acb252063f9f6dcccd3d1d497e.tar.bz2 | |
amd-xgbe: Use __napi_schedule_irqoff
Change from calling __napi_schedule to __napi_schedule_irqoff when running
in interrupt context or when called by netpoll with interrupts already
disabled. The Tx timer function will continue to use __napi_schedule.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index 5a4d9ca369d7..80ef4041e7a3 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -356,7 +356,7 @@ static irqreturn_t xgbe_isr(int irq, void *data) xgbe_disable_rx_tx_ints(pdata); /* Turn on polling */ - __napi_schedule(&pdata->napi); + __napi_schedule_irqoff(&pdata->napi); } } @@ -409,7 +409,7 @@ static irqreturn_t xgbe_dma_isr(int irq, void *data) disable_irq_nosync(channel->dma_irq); /* Turn on polling */ - __napi_schedule(&channel->napi); + __napi_schedule_irqoff(&channel->napi); } return IRQ_HANDLED; |