diff -urN linux-2.4.11-pre2/drivers/net/tulip/eeprom.c linux.to-linus/drivers/net/tulip/eeprom.c --- linux-2.4.11-pre2/drivers/net/tulip/eeprom.c Wed May 16 13:25:39 2001 +++ linux.to-linus/drivers/net/tulip/eeprom.c Tue Oct 2 05:37:03 2001 @@ -148,10 +148,10 @@ for (i = 0; i < count; i++) { unsigned char media_block = *p++; int media_code = media_block & MEDIA_MASK; - if (media_code & 0x40) + if (media_block & 0x40) p += 6; printk(KERN_INFO "%s: 21041 media #%d, %s.\n", - dev->name, media_code & 15, medianame[media_code & 15]); + dev->name, media_code, medianame[media_code]); } } else { unsigned char *p = (void *)ee_data + ee_data[27]; diff -urN linux-2.4.11-pre2/drivers/net/tulip/interrupt.c linux.to-linus/drivers/net/tulip/interrupt.c --- linux-2.4.11-pre2/drivers/net/tulip/interrupt.c Wed Jun 20 14:15:44 2001 +++ linux.to-linus/drivers/net/tulip/interrupt.c Tue Oct 2 05:31:34 2001 @@ -301,7 +301,7 @@ long ioaddr = dev->base_addr; int csr5; int entry; - int missed; + int csr8; int rx = 0; int tx = 0; int oi = 0; @@ -434,7 +434,6 @@ } } if (csr5 & RxDied) { /* Missed a Rx frame. */ - tp->stats.rx_missed_errors += inl(ioaddr + CSR8) & 0xffff; #ifdef CONFIG_NET_HW_FLOWCONTROL if (tp->fc_bit && !test_bit(tp->fc_bit, &netdev_fc_xoff)) { tp->stats.rx_errors++; @@ -548,9 +547,8 @@ } } - if ((missed = inl(ioaddr + CSR8) & 0x1ffff)) { - tp->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed; - } + csr8 = inl(ioaddr + CSR8); + tp->stats.rx_dropped += (csr8 & 0x1ffff) + ((csr8 >> 17) & 0xfff); if (tulip_debug > 4) printk(KERN_DEBUG "%s: exiting interrupt, csr5=%#4.4x.\n", diff -urN linux-2.4.11-pre2/drivers/net/tulip/tulip_core.c linux.to-linus/drivers/net/tulip/tulip_core.c --- linux-2.4.11-pre2/drivers/net/tulip/tulip_core.c Mon Oct 1 18:13:16 2001 +++ linux.to-linus/drivers/net/tulip/tulip_core.c Tue Oct 2 05:36:36 2001 @@ -15,8 +15,8 @@ */ #define DRV_NAME "tulip" -#define DRV_VERSION "0.9.15-pre6" -#define DRV_RELDATE "July 2, 2001" +#define DRV_VERSION "0.9.15-pre7" +#define DRV_RELDATE "Oct 2, 2001" #include #include