diff -Naur -X /g/g/lib/dontdiff /spare/tmp/linux-2.5.1/drivers/net/tulip/ChangeLog linux_2_5/drivers/net/tulip/ChangeLog
--- /spare/tmp/linux-2.5.1/drivers/net/tulip/ChangeLog	Tue Dec 11 18:47:49 2001
+++ linux_2_5/drivers/net/tulip/ChangeLog	Tue Dec 18 04:56:59 2001
@@ -1,3 +1,12 @@
+2001-12-17  Jeff Garzik  <jgarzik@mandrakesoft.com>
+
+	* tulip.h: remove 21041-related declarations
+
+2001-12-16  Andrew Lambeth  <wal@vmware.com>
+
+	* tulip_core.c (tulip_start_xmit): Use the more-portable
+	spin_lock_irqsave.
+
 2001-12-11  Jeff Garzik  <jgarzik@mandrakesoft.com>
 
 	* eeprom.c, timer.c, media.c, tulip_core.c:
diff -Naur -X /g/g/lib/dontdiff /spare/tmp/linux-2.5.1/drivers/net/tulip/tulip.h linux_2_5/drivers/net/tulip/tulip.h
--- /spare/tmp/linux-2.5.1/drivers/net/tulip/tulip.h	Fri Nov  9 21:45:35 2001
+++ linux_2_5/drivers/net/tulip/tulip.h	Tue Dec 18 04:55:10 2001
@@ -70,8 +70,8 @@
  * are used throughout the driver as indices into arrays */
 /* Note 21142 == 21143. */
 enum chips {
-	DC21040 = 0,
-	DC21041 = 1,
+	reserved0 = 0,
+	reserved1 = 1,
 	DC21140 = 2,
 	DC21142 = 3, DC21143 = 3,
 	LC82C168,
@@ -191,16 +191,6 @@
 };
 
 
-enum t21041_csr13_bits {
-	csr13_eng = (0xEF0<<4), /* for eng. purposes only, hardcode at EF0h */
-	csr13_aui = (1<<3), /* clear to force 10bT, set to force AUI/BNC */
-	csr13_cac = (1<<2), /* CSR13/14/15 autoconfiguration */
-	csr13_srl = (1<<0), /* When reset, resets all SIA functions, machines */
-
-	csr13_mask_auibnc = (csr13_eng | csr13_aui | csr13_srl),
-	csr13_mask_10bt = (csr13_eng | csr13_srl),
-};
-
 enum t21143_csr6_bits {
 	csr6_sc = (1<<31),
 	csr6_ra = (1<<30),
@@ -445,10 +435,6 @@
 extern const char * const medianame[];
 extern const char tulip_media_cap[];
 extern struct tulip_chip_table tulip_tbl[];
-extern u8 t21040_csr13[];
-extern u16 t21041_csr13[];
-extern u16 t21041_csr14[];
-extern u16 t21041_csr15[];
 
 #ifndef USE_IO_OPS
 #undef inb
diff -Naur -X /g/g/lib/dontdiff /spare/tmp/linux-2.5.1/drivers/net/tulip/tulip_core.c linux_2_5/drivers/net/tulip/tulip_core.c
--- /spare/tmp/linux-2.5.1/drivers/net/tulip/tulip_core.c	Tue Dec 11 18:47:49 2001
+++ linux_2_5/drivers/net/tulip/tulip_core.c	Tue Dec 18 04:58:51 2001
@@ -1,4 +1,4 @@
-/* tulip_core.c: A DEC 21x4x-family ethernet driver for Linux. */
+/* tulip_core.c: A DEC 2114x-family ethernet driver for Linux. */
 
 /*
 	Maintained by Jeff Garzik <jgarzik@mandrakesoft.com>
@@ -15,8 +15,8 @@
 */
 
 #define DRV_NAME	"tulip"
-#define DRV_VERSION	"1.1.0"
-#define DRV_RELDATE	"Dec 11, 2001"
+#define DRV_VERSION	"1.1.10"
+#define DRV_RELDATE	"Dec 17, 2001"
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -641,8 +641,9 @@
 	int entry;
 	u32 flag;
 	dma_addr_t mapping;
+	unsigned long eflags;
 
-	spin_lock_irq(&tp->lock);
+	spin_lock_irqsave(&tp->lock, eflags);
 
 	/* Calculate the next Tx descriptor entry. */
 	entry = tp->cur_tx % TX_RING_SIZE;
@@ -677,7 +678,7 @@
 	/* Trigger an immediate transmit demand. */
 	outl(0, dev->base_addr + CSR1);
 
-	spin_unlock_irq(&tp->lock);
+	spin_unlock_irqrestore(&tp->lock, eflags);
 
 	dev->trans_start = jiffies;