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/atl1.h | |
parent | macvlan: add FDB bridge ops and macvlan flags (diff) | |
parent | net/ethernet: ks8851_mll fix rx frame buffer overflow (diff) | |
download | linux-dev-56845d78cee8576a8160cee8aeac62efdb561ae2.tar.xz linux-dev-56845d78cee8576a8160cee8aeac62efdb561ae2.zip |
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/atl1.h')
-rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h index 1cb658b2ff92..b1fb209b9dd9 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.h +++ b/drivers/net/ethernet/atheros/atlx/atl1.h @@ -764,8 +764,8 @@ struct atl1_adapter { spinlock_t lock; struct napi_struct napi; struct work_struct tx_timeout_task; + struct work_struct reset_dev_task; struct work_struct link_chg_task; - struct work_struct pcie_dma_to_rst_task; struct timer_list phy_config_timer; bool phy_timer_pending; |