aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/atheros/atlx/atl1.h
diff options
context:
space:
mode:
authorTony Zelenoff <antonz@parallels.com>2012-04-11 02:15:03 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-13 13:34:20 -0400
commit03662e41c7cff64a776bfb1b3816de4be43de881 (patch)
treefeb67db3b6a9710b58f0b5458ec366bceb391246 /drivers/net/ethernet/atheros/atlx/atl1.h
parentca8f4fb21d08747013cce9cf1840aa5bfc31f2d8 (diff)
atl1: fix kernel panic in case of DMA errors
Problem: There was two separate work_struct structures which share one handler. Unfortunately getting atl1_adapter structure from work_struct in case of DMA error was done from incorrect offset which cause kernel panics. Solution: The useless work_struct for DMA error removed and handler name changed to more generic one. Signed-off-by: Tony Zelenoff <antonz@parallels.com> 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.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h
index 109d6da8be97..e04bf4d71e46 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.h
+++ b/drivers/net/ethernet/atheros/atlx/atl1.h
@@ -758,9 +758,8 @@ struct atl1_adapter {
758 u16 link_speed; 758 u16 link_speed;
759 u16 link_duplex; 759 u16 link_duplex;
760 spinlock_t lock; 760 spinlock_t lock;
761 struct work_struct tx_timeout_task; 761 struct work_struct reset_dev_task;
762 struct work_struct link_chg_task; 762 struct work_struct link_chg_task;
763 struct work_struct pcie_dma_to_rst_task;
764 763
765 struct timer_list phy_config_timer; 764 struct timer_list phy_config_timer;
766 bool phy_timer_pending; 765 bool phy_timer_pending;