diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-05-05 11:19:09 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-05-27 17:20:58 -0400 |
commit | 69c29fa7d142d65b13e366ae51e50944484b65ab (patch) | |
tree | 282a3a2565e842349543dbb693c8886b49e4d7df /drivers/ieee1394/eth1394.c | |
parent | 20e2008e1f24a6831bf4311f8e2f8692f16a92de (diff) |
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>
Diffstat (limited to 'drivers/ieee1394/eth1394.c')
-rw-r--r-- | drivers/ieee1394/eth1394.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index 2296d43a2414..8e4c959e586a 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) | |||
1636 | if (ether1394_send_packet(ptask, tx_len)) | 1636 | if (ether1394_send_packet(ptask, tx_len)) |
1637 | goto fail; | 1637 | goto fail; |
1638 | 1638 | ||
1639 | netif_wake_queue(dev); | ||
1640 | return NETDEV_TX_OK; | 1639 | return NETDEV_TX_OK; |
1641 | fail: | 1640 | fail: |
1642 | if (ptask) | 1641 | if (ptask) |
@@ -1650,9 +1649,6 @@ fail: | |||
1650 | priv->stats.tx_errors++; | 1649 | priv->stats.tx_errors++; |
1651 | spin_unlock_irqrestore(&priv->lock, flags); | 1650 | spin_unlock_irqrestore(&priv->lock, flags); |
1652 | 1651 | ||
1653 | if (netif_queue_stopped(dev)) | ||
1654 | netif_wake_queue(dev); | ||
1655 | |||
1656 | /* | 1652 | /* |
1657 | * FIXME: According to a patch from 2003-02-26, "returning non-zero | 1653 | * FIXME: According to a patch from 2003-02-26, "returning non-zero |
1658 | * causes serious problems" here, allegedly. Before that patch, | 1654 | * causes serious problems" here, allegedly. Before that patch, |