diff options
author | David S. Miller <davem@davemloft.net> | 2012-04-15 13:19:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-15 13:19:04 -0400 |
commit | 56845d78cee8576a8160cee8aeac62efdb561ae2 (patch) | |
tree | f891afed5324d359da1713a80a7131968373acc4 /drivers/net/ethernet/atheros/atlx/atlx.c | |
parent | df8ef8f3aaa6692970a436204c4429210addb23a (diff) | |
parent | 8a9a0ea6032186e3030419262678d652b88bf6a8 (diff) | |
download | op-kernel-dev-56845d78cee8576a8160cee8aeac62efdb561ae2.zip op-kernel-dev-56845d78cee8576a8160cee8aeac62efdb561ae2.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/atheros/atlx/atl1.c
drivers/net/ethernet/atheros/atlx/atl1.h
Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros/atlx/atlx.c')
-rw-r--r-- | drivers/net/ethernet/atheros/atlx/atlx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c index 95975b5..b4f3aa4 100644 --- a/drivers/net/ethernet/atheros/atlx/atlx.c +++ b/drivers/net/ethernet/atheros/atlx/atlx.c @@ -201,7 +201,7 @@ static void atlx_tx_timeout(struct net_device *netdev) { struct atlx_adapter *adapter = netdev_priv(netdev); /* Do the reset outside of interrupt context */ - schedule_work(&adapter->tx_timeout_task); + schedule_work(&adapter->reset_dev_task); } /* |