git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', ...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
amd
/
xgbe
/
xgbe-drv.c
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);