diff -u --recursive v1.0.3/linux/Makefile linux/Makefile --- v1.0.3/linux/Makefile Mon Mar 21 20:42:08 1994 +++ linux/Makefile Tue Mar 22 16:54:31 1994 @@ -1,6 +1,6 @@ VERSION = 1 PATCHLEVEL = 0 -SUBLEVEL = 3 +SUBLEVEL = 4 all: Version zImage diff -u --recursive v1.0.3/linux/config.in linux/config.in --- v1.0.3/linux/config.in Mon Mar 14 11:30:52 1994 +++ linux/config.in Tue Mar 22 15:53:53 1994 @@ -104,8 +104,6 @@ * * character devices * -#bool 'Keyboard meta-key sends ESC-prefix' CONFIG_KBD_META y -#bool 'Keyboard Num Lock on by default' CONFIG_KBD_NUML y bool 'Parallel printer support' CONFIG_PRINTER n bool 'Logitech busmouse support' CONFIG_BUSMOUSE n bool 'PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE y diff -u --recursive v1.0.3/linux/drivers/net/8390.c linux/drivers/net/8390.c --- v1.0.3/linux/drivers/net/8390.c Fri Mar 18 10:21:33 1994 +++ linux/drivers/net/8390.c Tue Mar 22 09:03:31 1994 @@ -153,7 +153,8 @@ else { /* The 8390 probably hasn't gotten on the cable yet. */ printk(KERN_DEBUG "%s: Possible network cable problem?\n", dev->name); - ei_local->interface_num ^= 1; /* Try a different xcvr. */ + if (ei_local->stat.tx_packets == 0) + ei_local->interface_num ^= 1; /* Try a different xcvr. */ } /* Try to restart the card. Perhaps the user has fixed something. */ ei_reset_8390(dev); @@ -285,7 +286,7 @@ /* !!Assumption!! -- we stay in page 0. Don't break this. */ while ((interrupts = inb_p(e8390_base + EN0_ISR)) != 0 - && ++boguscount < 5) { + && ++boguscount < 9) { if (interrupts & ENISR_RDC) { /* Ack meaningless DMA complete. */ outb_p(ENISR_RDC, e8390_base + EN0_ISR); diff -u --recursive v1.0.3/linux/fs/proc/net.c linux/fs/proc/net.c --- v1.0.3/linux/fs/proc/net.c Thu Dec 16 17:09:13 1993 +++ linux/fs/proc/net.c Tue Mar 22 08:54:43 1994 @@ -168,10 +168,10 @@ return -ENOMEM; ino = inode->i_ino; switch (ino) { -#ifdef CONFIG_INET case 128: length = unix_get_info(page); break; +#ifdef CONFIG_INET case 129: length = arp_get_info(page); break; diff -u --recursive v1.0.3/linux/net/inet/ip.c linux/net/inet/ip.c --- v1.0.3/linux/net/inet/ip.c Mon Mar 21 20:42:11 1994 +++ linux/net/inet/ip.c Mon Mar 21 19:45:35 1994 @@ -1198,7 +1198,7 @@ { if(iph->tos & IPTOS_LOWDELAY) dev2->queue_xmit(skb2, dev2, SOPRI_INTERACTIVE); - if(iph->tos & IPTOS_THROUGHPUT) + else if(iph->tos & IPTOS_THROUGHPUT) dev2->queue_xmit(skb2, dev2, SOPRI_BACKGROUND); else dev2->queue_xmit(skb2, dev2, SOPRI_NORMAL);