From bfc5a270acdd4f70e6473d68375ac9cf21b9264d Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linuxfoundation.org>
Date: Fri, 23 Nov 2007 15:09:25 -0500
Subject: [PATCH] Import 1.0.4

---
 Makefile           | 2 +-
 config.in          | 2 --
 drivers/net/8390.c | 5 +++--
 fs/proc/net.c      | 2 +-
 net/inet/ip.c      | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 596fb957d82f..d61951966cd7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 1
 PATCHLEVEL = 0
-SUBLEVEL = 3
+SUBLEVEL = 4
 
 all:	Version zImage
 
diff --git a/config.in b/config.in
index 85e19af45979..42e4599177a7 100644
--- a/config.in
+++ b/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
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index adc62503fd47..a40990bb18b8 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -153,7 +153,8 @@ 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);
-			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 @@ 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);
diff --git a/fs/proc/net.c b/fs/proc/net.c
index c7c300e26efe..c1e5d4f9ff5a 100644
--- a/fs/proc/net.c
+++ b/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;
diff --git a/net/inet/ip.c b/net/inet/ip.c
index 0311b554d90e..a3f17e710513 100644
--- a/net/inet/ip.c
+++ b/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);
-- 
2.39.5