Import 1.0.4

Makefile

 VERSION = 1
 PATCHLEVEL = 0
-SUBLEVEL = 3
+SUBLEVEL = 4
 
 all:	Version zImage
 

config.in

@@ -104,8 +104,6 @@ bool 'System V and Coherent filesystem support' CONFIG_SYSV_FS n
 *
 *  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

drivers/net/8390.c

@@ -153,6 +153,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct device *dev)
 		else {
 			/* The 8390 probably hasn't gotten on the cable yet. */
 			printk(KERN_DEBUG "%s: Possible network cable problem?\n", dev->name);
+			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. */
@@ -285,7 +286,7 @@ void ei_interrupt(int reg_ptr)
     
     /* !!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);

fs/proc/net.c

@@ -168,10 +168,10 @@ static int proc_readnet(struct inode * inode, struct file * file,
 		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;

net/inet/ip.c

@@ -1198,7 +1198,7 @@ ip_forward(struct sk_buff *skb, struct device *dev, int is_frag)
 	{
 		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);