From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat, 5 May 2007 15:19:09 +0000 (+0200)
Subject: ieee1394: eth1394: remove bogus netif_wake_queue
X-Git-Tag: v2.6.22-rc4~97^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69c29fa7d142d65b13e366ae51e50944484b65ab;p=linux-2.6

ieee1394: eth1394: remove bogus netif_wake_queue

When we are within hard_start_xmit, the queue is already awake.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 2296d43a24..8e4c959e58 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1636,7 +1636,6 @@ static int ether1394_tx(struct sk_buff *skb, struct net_device *dev)
 	if (ether1394_send_packet(ptask, tx_len))
 		goto fail;
 
-	netif_wake_queue(dev);
 	return NETDEV_TX_OK;
 fail:
 	if (ptask)
@@ -1650,9 +1649,6 @@ fail:
 	priv->stats.tx_errors++;
 	spin_unlock_irqrestore(&priv->lock, flags);
 
-	if (netif_queue_stopped(dev))
-		netif_wake_queue(dev);
-
 	/*
 	 * FIXME: According to a patch from 2003-02-26, "returning non-zero
 	 * causes serious problems" here, allegedly.  Before that patch,