From 8a48ba73f3e84c073a7341868634252bdd65fd37 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 5 May 2007 17:19:09 +0200 Subject: [PATCH] --- yaml --- r: 57055 b: refs/heads/master c: 69c29fa7d142d65b13e366ae51e50944484b65ab h: refs/heads/master i: 57053: 377e1d2aed9e6f84c1edb65c6fe0ae9315e6901c 57051: 76f4867d6ddbd810188d53eab1f62ec2d06d55aa 57047: 833ad90ecaecd75cfded0e870e66aaeec3882cb1 57039: 343ebb8efaeb8ca4b0bd8394f8435d54bee9d33a 57023: eb475033c93551965dcd135912ade1e837f14748 v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/eth1394.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b3bc613e0436..ff085bf2a074 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20e2008e1f24a6831bf4311f8e2f8692f16a92de +refs/heads/master: 69c29fa7d142d65b13e366ae51e50944484b65ab diff --git a/trunk/drivers/ieee1394/eth1394.c b/trunk/drivers/ieee1394/eth1394.c index 2296d43a2414..8e4c959e586a 100644 --- a/trunk/drivers/ieee1394/eth1394.c +++ b/trunk/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 @@ static int ether1394_tx(struct sk_buff *skb, struct net_device *dev) 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,