## Automatically generated incremental diff
## From:   linux-2.2.15-pre16
## To:     linux-2.2.15-pre17
## Robot:  $Id: make-incremental-diff,v 1.7 2001/12/04 05:19:54 hpa Exp $

diff -urN linux-2.2.15-pre16/Documentation/Configure.help linux/Documentation/Configure.help
--- linux-2.2.15-pre16/Documentation/Configure.help	Mon Dec  3 22:01:58 2001
+++ linux/Documentation/Configure.help	Mon Dec  3 22:02:04 2001
@@ -2550,6 +2550,20 @@
   kernel whenever you want; read Documentation/modules.txt for
   details.
 
+IP: UDP masquerading loose checking
+CONFIG_IP_MASQUERADE_UDP_LOOSE
+  Whether UDP masquerading does address checking in a loose fashion.
+
+  If you say Y here, then UDP masqueraded connections will allow
+  any external system to be connect back through the firewall to the
+  port on the internal machine.  However it will allow the more
+  efficient use of masqueraded ports, and may be required for some
+  gaming uses.
+
+  You should only say Y here if you understand the consequences since
+  it will open your internal network to external probing and potential
+  attacks.  In all other cases choose N
+
 IP: ICMP masquerading
 CONFIG_IP_MASQUERADE_ICMP
   The basic masquerade code described for "IP: masquerading" above
@@ -6549,8 +6563,8 @@
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called tulip.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt as well as
+  The module will be called old_tulip.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
 Digi Intl. RightSwitch support
diff -urN linux-2.2.15-pre16/Makefile linux/Makefile
--- linux-2.2.15-pre16/Makefile	Mon Dec  3 22:01:58 2001
+++ linux/Makefile	Mon Dec  3 22:02:04 2001
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 15
-EXTRAVERSION = pre16
+EXTRAVERSION = pre17
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
diff -urN linux-2.2.15-pre16/arch/alpha/kernel/traps.c linux/arch/alpha/kernel/traps.c
--- linux-2.2.15-pre16/arch/alpha/kernel/traps.c	Mon Dec  3 22:01:58 2001
+++ linux/arch/alpha/kernel/traps.c	Tue Jan  4 10:12:11 2000
@@ -417,13 +417,8 @@
 			/* EV4 does not implement anything except normal
 			   rounding.  Everything else will come here as
 			   an illegal instruction.  Emulate them.  */
-			if (alpha_fp_emul(regs.pc))
-			{
-				/* Increment the PC so that the program in
-				   user space continues */
-				regs.pc += 4;
+			if (alpha_fp_emul(regs.pc - 4))
 				return;
-			}
 		}
 		send_sig(SIGILL, current, 1);
 		break;
diff -urN linux-2.2.15-pre16/drivers/isdn/avmb1/b1dma.c linux/drivers/isdn/avmb1/b1dma.c
--- linux-2.2.15-pre16/drivers/isdn/avmb1/b1dma.c	Mon Dec  3 22:01:58 2001
+++ linux/drivers/isdn/avmb1/b1dma.c	Mon Dec  3 22:02:05 2001
@@ -40,7 +40,7 @@
 
 MODULE_AUTHOR("Carsten Paeth <calle@calle.in-berlin.de>");
 
-int suppress_pollack = 0;
+static int suppress_pollack = 0;
 MODULE_PARM(suppress_pollack, "0-1i");
 
 /* ------------------------------------------------------------- */
diff -urN linux-2.2.15-pre16/drivers/isdn/avmb1/c4.c linux/drivers/isdn/avmb1/c4.c
--- linux-2.2.15-pre16/drivers/isdn/avmb1/c4.c	Mon Dec  3 22:01:58 2001
+++ linux/drivers/isdn/avmb1/c4.c	Mon Dec  3 22:02:05 2001
@@ -68,7 +68,7 @@
 
 /* ------------------------------------------------------------- */
 
-int suppress_pollack = 0;
+static int suppress_pollack = 0;
 
 MODULE_AUTHOR("Carsten Paeth <calle@calle.in-berlin.de>");
 
diff -urN linux-2.2.15-pre16/net/ipv4/Config.in linux/net/ipv4/Config.in
--- linux-2.2.15-pre16/net/ipv4/Config.in	Tue Oct 26 17:53:42 1999
+++ linux/net/ipv4/Config.in	Mon Dec  3 22:02:06 2001
@@ -41,6 +41,7 @@
     bool 'IP: masquerading' CONFIG_IP_MASQUERADE
     if [ "$CONFIG_IP_MASQUERADE" != "n" ]; then
       comment 'Protocol-specific masquerading support will be built as modules.'
+      bool 'IP: UDP masquerading loose checking' CONFIG_IP_MASQUERADE_UDP_LOOSE
       bool 'IP: ICMP masquerading' CONFIG_IP_MASQUERADE_ICMP
       comment 'Protocol-specific masquerading support will be built as modules.'
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
diff -urN linux-2.2.15-pre16/net/ipv4/ip_masq.c linux/net/ipv4/ip_masq.c
--- linux-2.2.15-pre16/net/ipv4/ip_masq.c	Tue Jan  4 10:12:26 2000
+++ linux/net/ipv4/ip_masq.c	Mon Dec  3 22:02:06 2001
@@ -412,12 +412,6 @@
 #define MASQ_DPORT_PASS	(IP_MASQ_F_NO_DPORT|IP_MASQ_F_DLOOSE)
 
 /*
- *	By default enable dest loose semantics
- */
-#define CONFIG_IP_MASQ_LOOSE_DEFAULT 1
-
-
-/*
  * 	Set masq expiration (deletion) and adds timer,
  *	if timeout==0 cancel expiration.
  *	Warning: it does not check/delete previous timer!
@@ -937,7 +931,7 @@
 	atomic_set(&ms->refcnt,0);
 
         if (proto == IPPROTO_UDP && !mport)
-#ifdef CONFIG_IP_MASQ_LOOSE_DEFAULT
+#ifdef CONFIG_IP_MASQUERADE_UDP_LOOSE
 		/*
 		 *	Flag this tunnel as "dest loose"
 		 *	
