diff options
| author | Tony Zelenoff <antonz@parallels.com> | 2012-04-11 06:15:03 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-27 09:51:20 -0700 |
| commit | bb2f6102c815c14572642205191eb0fa883d8723 (patch) | |
| tree | 4158479d3746658d5b2c1efcf3c9c86010105be5 /drivers/net/atlx/atl1.h | |
| parent | 4a1abcbd24d856fe49029c3dc6f7fe8dc66ddaac (diff) | |
atl1: fix kernel panic in case of DMA errors
[ Upstream commit 03662e41c7cff64a776bfb1b3816de4be43de881 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/atlx/atl1.h')
| -rw-r--r-- | drivers/net/atlx/atl1.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h index 68de8cbfb3ec..c27b724a834b 100644 --- a/drivers/net/atlx/atl1.h +++ b/drivers/net/atlx/atl1.h @@ -759,9 +759,8 @@ struct atl1_adapter { u16 link_speed; u16 link_duplex; spinlock_t lock; - 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; |