]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ieee1394: eth1394: remove bogus netif_wake_queue
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 5 May 2007 15:19:09 +0000 (17:19 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 27 May 2007 21:20:58 +0000 (23:20 +0200)
When we are within hard_start_xmit, the queue is already awake.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
drivers/ieee1394/eth1394.c

index 2296d43a24140ab121c3467313af3a5c4df2acb6..8e4c959e586ae0f286fbf6940231a655db079093 100644 (file)
@@ -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,