diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2015-06-05 16:02:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-07 00:21:12 -0700 |
| commit | 078b29d7e92e4254b6de16097d0369dde17efe21 (patch) | |
| tree | f196fbc764d3dd3ce0944064025ce3b3f7d87865 | |
| parent | 6d7954130c8d7100b7aba3c986fc4eefedf1a1ad (diff) | |
amd-xgbe: Use disable_irq_nosync from within timer function
Since the Tx timer function runs in softirq context the driver needs
to call disable_irq_nosync instead of a disable_irq.
Reported-by: Josh Stone <jistone@redhat.com>
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index db84ddcfec84..9fd6c69a8bac 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -423,7 +423,7 @@ static void xgbe_tx_timer(unsigned long data) if (napi_schedule_prep(napi)) { /* Disable Tx and Rx interrupts */ if (pdata->per_channel_irq) - disable_irq(channel->dma_irq); + disable_irq_nosync(channel->dma_irq); else xgbe_disable_rx_tx_ints(pdata); |