projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6d79541
)
amd-xgbe: Use disable_irq_nosync from within timer function
author
Lendacky, Thomas
<
[email protected]
>
Fri, 5 Jun 2015 21:02:26 +0000
(16:02 -0500)
committer
David S. Miller
<
[email protected]
>
Sun, 7 Jun 2015 07:21:12 +0000
(
00:21
-0700)
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 <
[email protected]
>
Signed-off-by: Tom Lendacky <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index db84ddcfec8464191a3edcccfd87c869ac1c5a7c..9fd6c69a8bac3c77d1c0c6e99eb4f3644561f78a 100644
(file)
--- 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);