Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / drivers / net / sgiseeq.c

diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index beb537d..cc4bd8c 100644 (file)
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -574,7 +574,7 @@ static inline int sgiseeq_reset(struct net_device *dev)
        if (err)
                return err;
 
-       dev->trans_start = jiffies;
+       dev->trans_start = jiffies; /* prevent tx timeout */
        netif_wake_queue(dev);
 
        return 0;
@@ -593,8 +593,10 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* Setup... */
        len = skb->len;
        if (len < ETH_ZLEN) {
-               if (skb_padto(skb, ETH_ZLEN))
+               if (skb_padto(skb, ETH_ZLEN)) {
+                       spin_unlock_irqrestore(&sp->tx_lock, flags);
                        return NETDEV_TX_OK;
+               }
                len = ETH_ZLEN;
        }
 
@@ -636,8 +638,6 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (!(hregs->tx_ctrl & HPC3_ETXCTRL_ACTIVE))
                kick_tx(dev, sp, hregs);
 
-       dev->trans_start = jiffies;
-
        if (!TX_BUFFS_AVAIL(sp))
                netif_stop_queue(dev);
        spin_unlock_irqrestore(&sp->tx_lock, flags);
@@ -650,7 +650,7 @@ static void timeout(struct net_device *dev)
        printk(KERN_NOTICE "%s: transmit timed out, resetting\n", dev->name);
        sgiseeq_reset(dev);
 
-       dev->trans_start = jiffies;
+       dev->trans_start = jiffies; /* prevent tx timeout */
        netif_wake_queue(dev);
 }