mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-21 03:17:18 +00:00
Koen Kooi
7df8fc578b
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 8bdd32d35e2bc723a11b475eb797a9f11e8db598 Mon Sep 17 00:00:00 2001
|
|
From: Eric Dumazet <eric.dumazet@gmail.com>
|
|
Date: Wed, 15 Feb 2012 20:43:11 +0000
|
|
Subject: [PATCH 14/42] atl1c: dont use highprio tx queue
|
|
|
|
[ Upstream commit 11aad99af6ef629ff3b05d1c9f0936589b204316 ]
|
|
|
|
This driver attempts to use two TX rings but lacks proper support :
|
|
|
|
1) IRQ handler only takes care of TX completion on first TX ring
|
|
2) the stop/start logic uses the legacy functions (for non multiqueue
|
|
drivers)
|
|
|
|
This means all packets witk skb mark set to 1 are sent through high
|
|
queue but are never cleaned and queue eventualy fills and block the
|
|
device, triggering the infamous "NETDEV WATCHDOG" message.
|
|
|
|
Lets use a single TX ring to fix the problem, this driver is not a real
|
|
multiqueue one yet.
|
|
|
|
Minimal fix for stable kernels.
|
|
|
|
Reported-by: Thomas Meyer <thomas@m3y3r.de>
|
|
Tested-by: Thomas Meyer <thomas@m3y3r.de>
|
|
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
|
|
Cc: Jay Cliburn <jcliburn@gmail.com>
|
|
Cc: Chris Snook <chris.snook@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
|
|
index 02c7ed8..eccdcff 100644
|
|
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
|
|
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
|
|
@@ -2241,10 +2241,6 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
|
|
dev_info(&adapter->pdev->dev, "tx locked\n");
|
|
return NETDEV_TX_LOCKED;
|
|
}
|
|
- if (skb->mark == 0x01)
|
|
- type = atl1c_trans_high;
|
|
- else
|
|
- type = atl1c_trans_normal;
|
|
|
|
if (atl1c_tpd_avail(adapter, type) < tpd_req) {
|
|
/* no enough descriptor, just stop queue */
|
|
--
|
|
1.7.9.4
|
|
|