## Automatically generated incremental diff
## From:   linux-2.4.22-bk52
## To:     linux-2.4.22-bk53
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.4.22-bk52/Makefile linux-2.4.22-bk53/Makefile
--- linux-2.4.22-bk52/Makefile	2003-11-14 02:50:52.000000000 -0800
+++ linux-2.4.22-bk53/Makefile	2003-11-14 02:50:58.000000000 -0800
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 22
-EXTRAVERSION = -bk52
+EXTRAVERSION = -bk53
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.22-bk52/arch/i386/kernel/pci-irq.c linux-2.4.22-bk53/arch/i386/kernel/pci-irq.c
--- linux-2.4.22-bk52/arch/i386/kernel/pci-irq.c	2003-11-14 02:50:52.000000000 -0800
+++ linux-2.4.22-bk53/arch/i386/kernel/pci-irq.c	2003-11-14 02:50:58.000000000 -0800
@@ -575,7 +575,8 @@
 {
 	/* We must not touch 440GX even if we have tables. 440GX has
 	   different IRQ routing weirdness */
-	if(pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82450GX, NULL))
+	if(pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0, NULL) ||
+	   pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_2, NULL))
 		return 0;
 	switch(device)
 	{
diff -urN linux-2.4.22-bk52/include/linux/pci_ids.h linux-2.4.22-bk53/include/linux/pci_ids.h
--- linux-2.4.22-bk52/include/linux/pci_ids.h	2003-11-14 02:50:55.000000000 -0800
+++ linux-2.4.22-bk53/include/linux/pci_ids.h	2003-11-14 02:51:16.000000000 -0800
@@ -1891,6 +1891,9 @@
 #define PCI_DEVICE_ID_INTEL_82443MX_1	0x7199
 #define PCI_DEVICE_ID_INTEL_82443MX_2	0x719a
 #define PCI_DEVICE_ID_INTEL_82443MX_3	0x719b
+#define PCI_DEVICE_ID_INTEL_82443GX_0	0x71a0
+#define PCI_DEVICE_ID_INTEL_82443GX_1	0x71a1
+#define PCI_DEVICE_ID_INTEL_82443GX_2	0x71a2
 #define PCI_DEVICE_ID_INTEL_82372FB_0	0x7600
 #define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601
 #define PCI_DEVICE_ID_INTEL_82372FB_2	0x7602
diff -urN linux-2.4.22-bk52/net/ipv4/netfilter/ip_nat_core.c linux-2.4.22-bk53/net/ipv4/netfilter/ip_nat_core.c
--- linux-2.4.22-bk52/net/ipv4/netfilter/ip_nat_core.c	2003-11-14 02:50:56.000000000 -0800
+++ linux-2.4.22-bk53/net/ipv4/netfilter/ip_nat_core.c	2003-11-14 02:51:17.000000000 -0800
@@ -157,8 +157,8 @@
 				continue;
 		}
 
-		if (!(mr->range[i].flags & IP_NAT_RANGE_PROTO_SPECIFIED)
-		    || proto->in_range(&newtuple, IP_NAT_MANIP_SRC,
+		if ((mr->range[i].flags & IP_NAT_RANGE_PROTO_SPECIFIED)
+		    && proto->in_range(&newtuple, IP_NAT_MANIP_SRC,
 				       &mr->range[i].min, &mr->range[i].max))
 			return 1;
 	}