From 1069c3999002eedd7745ce299d37a79a1c384689 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 22 Jul 2012 02:37:20 +0000 Subject: [PATCH] atl1c: fix issue of transmit queue 0 timed out svn path=/dists/sid/linux/; revision=19272 --- debian/changelog | 1 + ...-issue-of-transmit-queue-0-timed-out.patch | 36 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 38 insertions(+) create mode 100644 debian/patches/bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch diff --git a/debian/changelog b/debian/changelog index 89481dcc7..205148d04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,7 @@ linux (3.2.23-1) UNRELEASED; urgency=low (Closes: #658662) * cipso: don't follow a NULL pointer when setsockopt() is called * [x86] hwmon: Enable SENSORS_SCH5636 as module (Closes: #680934) + * atl1c: fix issue of transmit queue 0 timed out [ Arnaud Patard ] * [mipsel] add r8169 to d-i udeb. diff --git a/debian/patches/bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch b/debian/patches/bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch new file mode 100644 index 000000000..39c2c4d07 --- /dev/null +++ b/debian/patches/bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch @@ -0,0 +1,36 @@ +From: Cloud Ren +Date: Tue, 3 Jul 2012 16:51:48 +0000 +Subject: atl1c: fix issue of transmit queue 0 timed out + +commit b94e52f62683dc0b00c6d1b58b80929a078c0fd5 upstream. + +some people report atl1c could cause system hang with following +kernel trace info: +--------------------------------------- +WARNING: at.../net/sched/sch_generic.c:258 dev_watchdog+0x1db/0x1d0() +... +NETDEV WATCHDOG: eth0 (atl1c): transmit queue 0 timed out +... +--------------------------------------- +This is caused by netif_stop_queue calling when cable Link is down. +So remove netif_stop_queue, because link_watch will take it over. + +Signed-off-by: xiong +Signed-off-by: Cloud Ren +Signed-off-by: David S. Miller +--- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +index 9cc1570..1f78b63 100644 +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +@@ -261,7 +261,6 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter) + if ((phy_data & BMSR_LSTATUS) == 0) { + /* link down */ + netif_carrier_off(netdev); +- netif_stop_queue(netdev); + hw->hibernate = true; + if (atl1c_reset_mac(hw) != 0) + if (netif_msg_hw(adapter)) diff --git a/debian/patches/series b/debian/patches/series index 84b813cdf..6850344f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -382,3 +382,4 @@ features/all/fermi-accel/drm-nouveau-bump-version-to-1.0.0.patch bugfix/all/net-e100-ucode-is-optional-in-some-cases.patch bugfix/x86/drm-i915-prefer-wide-slow-to-fast-narrow-in-DP-confi.patch bugfix/all/cipso-don-t-follow-a-NULL-pointer-when-setsockopt-is.patch +bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch