linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / 8390.c

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index d2935ae..f870274 100644 (file)
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -249,7 +249,7 @@ void ei_tx_timeout(struct net_device *dev)
 
        /* Ugly but a reset can be slow, yet must be protected */
                
-       disable_irq_nosync_lockdep(dev->irq);
+       disable_irq_nosync(dev->irq);
        spin_lock(&ei_local->page_lock);
                
        /* Try to restart the card.  Perhaps the user has fixed something. */
@@ -257,7 +257,7 @@ void ei_tx_timeout(struct net_device *dev)
        NS8390_init(dev, 1);
                
        spin_unlock(&ei_local->page_lock);
-       enable_irq_lockdep(dev->irq);
+       enable_irq(dev->irq);
        netif_wake_queue(dev);
 }
     
@@ -275,14 +275,12 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
        int send_length = skb->len, output_page;
        unsigned long flags;
-       char buf[ETH_ZLEN];
-       char *data = skb->data;
 
        if (skb->len < ETH_ZLEN) {
-               memset(buf, 0, ETH_ZLEN);       /* more efficient than doing just the needed bits */
-               memcpy(buf, data, skb->len);
+               skb = skb_padto(skb, ETH_ZLEN);
+               if (skb == NULL)
+                       return 0;
                send_length = ETH_ZLEN;
-               data = buf;
        }
 
        /* Mask interrupts from the ethercard. 
@@ -349,7 +347,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
         * trigger the send later, upon receiving a Tx done interrupt.
         */
         
-       ei_block_output(dev, send_length, data, output_page);
+       ei_block_output(dev, send_length, skb->data, output_page);
                
        if (! ei_local->txing) 
        {