2 files changed, 14 insertions, 10 deletions

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index f87027420081..86be96af9c8f 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -275,12 +275,14 @@ 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) {
-                skb = skb_padto(skb, ETH_ZLEN);
-                if (skb == NULL)
-                        return 0;
+                memset(buf, 0, ETH_ZLEN);       /* more efficient than doing just the needed bits */
+                memcpy(buf, data, skb->len);
                 send_length = ETH_ZLEN;
+                data = buf;
         }
 
         /* Mask interrupts from the ethercard. 
@@ -347,7 +349,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, skb->data, output_page);
+        ei_block_output(dev, send_length, data, output_page);
                 
         if (! ei_local->txing) 
         {
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index b327b640823b..5b69befdab74 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -2903,6 +2903,7 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
 {
         net_local *lp = (net_local *) dev->priv;
         unsigned long flags;
+        char data[ETH_ZLEN];
 
 #ifdef DEBUG_TX_TRACE
         printk(KERN_DEBUG "%s: ->wavelan_packet_xmit(0x%X)\n", dev->name,
@@ -2937,15 +2938,16 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
          * able to detect collisions, therefore in theory we don't really
          * need to pad. Jean II */
         if (skb->len < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
-                if (skb == NULL)
-                        return 0;
+                memset(data, 0, ETH_ZLEN);
+                memcpy(data, skb->data, skb->len);
+                /* Write packet on the card */
+                if(wv_packet_write(dev, data, ETH_ZLEN))
+                        return 1;       /* We failed */
         }
-
-        /* Write packet on the card */
-        if(wv_packet_write(dev, skb->data, skb->len))
+        else if(wv_packet_write(dev, skb->data, skb->len))
                 return 1;       /* We failed */
 
+
         dev_kfree_skb(skb);
 
 #ifdef DEBUG_TX_TRACE