mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-25 05:16:57 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From 4cad7c8fe708e7795f298240e246cec993a7e74b Mon Sep 17 00:00:00 2001
|
|
From: Tushar Dave <tushar.n.dave@intel.com>
|
|
Date: Thu, 17 May 2012 01:04:50 +0000
|
|
Subject: [PATCH 51/56] e1000: Prevent reset task killing itself.
|
|
|
|
commit 8ce6909f77ba1b7bcdea65cc2388fd1742b6d669 upstream.
|
|
|
|
Killing reset task while adapter is resetting causes deadlock.
|
|
Only kill reset task if adapter is not resetting.
|
|
Ref bug #43132 on bugzilla.kernel.org
|
|
|
|
Signed-off-by: Tushar Dave <tushar.n.dave@intel.com>
|
|
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
|
|
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +++++-
|
|
1 files changed, 5 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
|
|
index cf480b5..de00805 100644
|
|
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
|
|
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
|
|
@@ -494,7 +494,11 @@ out:
|
|
static void e1000_down_and_stop(struct e1000_adapter *adapter)
|
|
{
|
|
set_bit(__E1000_DOWN, &adapter->flags);
|
|
- cancel_work_sync(&adapter->reset_task);
|
|
+
|
|
+ /* Only kill reset task if adapter is not resetting */
|
|
+ if (!test_bit(__E1000_RESETTING, &adapter->flags))
|
|
+ cancel_work_sync(&adapter->reset_task);
|
|
+
|
|
cancel_delayed_work_sync(&adapter->watchdog_task);
|
|
cancel_delayed_work_sync(&adapter->phy_info_task);
|
|
cancel_delayed_work_sync(&adapter->fifo_stall_task);
|
|
--
|
|
1.7.7.6
|
|
|