diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:03:12 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:06:46 +1100 |
commit | cf76a3a7b8292423b127f6c0ecbacac8e65d40ad (patch) | |
tree | 8fc46b6d104d5fdc68f5bbf7e380243c6fb5cc19 /drivers/net/atlx/atl1.h | |
parent | eabeb7dac4934602a90b14649c07c13eb7e43d90 (diff) | |
parent | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff) |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/atlx/atl1.h')
-rw-r--r-- | drivers/net/atlx/atl1.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h index ffa73fc8d95e..146372fd6683 100644 --- a/drivers/net/atlx/atl1.h +++ b/drivers/net/atlx/atl1.h @@ -754,7 +754,7 @@ struct atl1_hw { struct atl1_adapter { struct net_device *netdev; struct pci_dev *pdev; - struct net_device_stats net_stats; + struct atl1_sft_stats soft_stats; struct vlan_group *vlgrp; u32 rx_buffer_len; @@ -765,7 +765,7 @@ struct atl1_adapter { struct work_struct tx_timeout_task; struct work_struct link_chg_task; struct work_struct pcie_dma_to_rst_task; - struct timer_list watchdog_timer; + struct timer_list phy_config_timer; bool phy_timer_pending; |