## Automatically generated incremental diff
## From:   linux-2.2.24-rc3
## To:     linux-2.2.24-rc4
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.2.24-rc3/Makefile linux-2.2.24-rc4/Makefile
--- linux-2.2.24-rc3/Makefile	Wed Feb 19 05:55:35 2003
+++ linux-2.2.24-rc4/Makefile	Wed Feb 19 05:55:36 2003
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 24
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
diff -urN linux-2.2.24-rc3/drivers/net/8139too.c linux-2.2.24-rc4/drivers/net/8139too.c
--- linux-2.2.24-rc3/drivers/net/8139too.c	Mon May 20 16:32:35 2002
+++ linux-2.2.24-rc4/drivers/net/8139too.c	Wed Feb 19 05:55:36 2003
@@ -1840,6 +1840,14 @@
 			return 0;
 		}
 	}
+	
+	if(skb->len < ETH_ZLEN)
+	{
+		skb = skb_padto(skb, ETH_ZLEN);
+		if(skb == NULL)
+			return 0;
+	}
+	
 	mb();
 
 	/* Calculate the next Tx descriptor entry. */
diff -urN linux-2.2.24-rc3/drivers/net/rtl8139.c linux-2.2.24-rc4/drivers/net/rtl8139.c
--- linux-2.2.24-rc3/drivers/net/rtl8139.c	Fri Nov  2 08:39:07 2001
+++ linux-2.2.24-rc4/drivers/net/rtl8139.c	Wed Feb 19 05:55:36 2003
@@ -970,6 +970,16 @@
 			rtl8129_tx_timeout(dev);
 		return 1;
 	}
+	
+	if(skb->len < ETH_ZLEN)
+	{
+		skb = skb_padto(skb, ETH_ZLEN);
+		if(skb == NULL)
+		{
+			clear_bit(0, (void *)&dev->tbusy);
+			return 0;
+		}
+	}
 
 	/* Calculate the next Tx descriptor entry. */
 	entry = tp->cur_tx % NUM_TX_DESC;
diff -urN linux-2.2.24-rc3/net/netsyms.c linux-2.2.24-rc4/net/netsyms.c
--- linux-2.2.24-rc3/net/netsyms.c	Sun Mar 25 08:37:41 2001
+++ linux-2.2.24-rc4/net/netsyms.c	Wed Feb 19 05:55:37 2003
@@ -489,6 +489,7 @@
 EXPORT_SYMBOL(__kfree_skb);
 EXPORT_SYMBOL(skb_clone);
 EXPORT_SYMBOL(skb_copy);
+EXPORT_SYMBOL(skb_pad);
 EXPORT_SYMBOL(netif_rx);
 EXPORT_SYMBOL(dev_add_pack);
 EXPORT_SYMBOL(dev_remove_pack);
