From 7bff1e363df375243f36be048279416c8b6075f5 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 9 Jun 2005 12:36:33 -0700
Subject: [PATCH] --- yaml --- r: 1943 b: refs/heads/master c:
 243cd55e021baf28babdd88112ac03ae5cd4bb9c h: refs/heads/master i:   1941:
 773c381995823324f3bd37a2c5c6b1f92e0612d6   1939:
 bf0a79df6b5089bc4e87320278013b07aed9437e   1935:
 984ecad338cbbe4147d46581f10ae9254de2ea6b v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/iseries_veth.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7062e702d165..f0dd5e4611c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fbdf1a23be1837b8bc5bcec096015ca99e00aa7
+refs/heads/master: 243cd55e021baf28babdd88112ac03ae5cd4bb9c
diff --git a/trunk/drivers/net/iseries_veth.c b/trunk/drivers/net/iseries_veth.c
index 13ed8dc1e91d..55af32e9bf08 100644
--- a/trunk/drivers/net/iseries_veth.c
+++ b/trunk/drivers/net/iseries_veth.c
@@ -802,13 +802,14 @@ static void veth_tx_timeout(struct net_device *dev)
 
 	spin_lock_irqsave(&port->pending_gate, flags);
 
+	if (!port->pending_lpmask) {
+		spin_unlock_irqrestore(&port->pending_gate, flags);
+		return;
+	}
+
 	printk(KERN_WARNING "%s: Tx timeout!  Resetting lp connections: %08x\n",
 	       dev->name, port->pending_lpmask);
 
-	/* If we've timed out the queue must be stopped, which should
-	 * only ever happen when there is a pending packet. */
-	WARN_ON(! port->pending_lpmask);
-
 	for (i = 0; i < HVMAXARCHITECTEDLPS; i++) {
 		struct veth_lpar_connection *cnx = veth_cnx[i];