PERFORCE change 67597 for review

John Baldwin jhb at FreeBSD.org
Thu Dec 23 11:56:42 PST 2004


http://perforce.freebsd.org/chv.cgi?CH=67597

Change 67597 by jhb at jhb_slimer on 2004/12/23 19:56:09

	IFC @67594.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#39 integrate
.. //depot/projects/smpng/sys/arm/conf/SIMICS#6 integrate
.. //depot/projects/smpng/sys/arm/include/atomic.h#4 integrate
.. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#7 integrate
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#3 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/smpng/sys/boot/Makefile#18 integrate
.. //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#8 integrate
.. //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#5 integrate
.. //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#6 integrate
.. //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#4 integrate
.. //depot/projects/smpng/sys/boot/arc/loader/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#11 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/i386/cdboot/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#12 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/Makefile#18 integrate
.. //depot/projects/smpng/sys/boot/i386/mbr/Makefile#8 integrate
.. //depot/projects/smpng/sys/boot/ia64/efi/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/ia64/ski/Makefile#2 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot0.5/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot0/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#13 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#10 integrate
.. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#14 integrate
.. //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#13 integrate
.. //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#8 integrate
.. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#16 integrate
.. //depot/projects/smpng/sys/conf/NOTES#87 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#26 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#14 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#12 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf.c#14 integrate
.. //depot/projects/smpng/sys/crypto/rijndael/Makefile#3 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#25 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#25 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#11 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#51 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#26 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#7 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_card.h#5 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.c#5 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.h#2 integrate
.. //depot/projects/smpng/sys/dev/bktr/msp34xx.c#5 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#57 integrate
.. //depot/projects/smpng/sys/dev/hptmv/entry.c#2 integrate
.. //depot/projects/smpng/sys/dev/kbd/atkbd.c#13 integrate
.. //depot/projects/smpng/sys/dev/kbd/atkbdreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/kbd/kbd.c#15 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#10 integrate
.. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#24 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#13 integrate
.. //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#5 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#13 integrate
.. //depot/projects/smpng/sys/dev/random/randomdev.c#28 integrate
.. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#7 integrate
.. //depot/projects/smpng/sys/dev/snp/snp.c#20 integrate
.. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#3 integrate
.. //depot/projects/smpng/sys/dev/twe/twe.c#13 integrate
.. //depot/projects/smpng/sys/dev/twe/tweio.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/ugen.c#32 integrate
.. //depot/projects/smpng/sys/dev/usb/uhid.c#25 integrate
.. //depot/projects/smpng/sys/dev/usb/ums.c#20 integrate
.. //depot/projects/smpng/sys/dev/usb/usb.c#28 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#67 integrate
.. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#2 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi.c#66 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#37 integrate
.. //depot/projects/smpng/sys/geom/geom.h#43 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#13 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#5 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#3 integrate
.. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#9 integrate
.. //depot/projects/smpng/sys/kern/init_sysent.c#50 integrate
.. //depot/projects/smpng/sys/kern/kern_umtx.c#13 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#50 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#51 integrate
.. //depot/projects/smpng/sys/kern/tty.c#55 integrate
.. //depot/projects/smpng/sys/kern/tty_pty.c#36 integrate
.. //depot/projects/smpng/sys/kern/uipc_sem.c#11 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#63 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket2.c#39 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#44 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#40 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#90 integrate
.. //depot/projects/smpng/sys/modules/Makefile#88 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_video/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/cp/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/if_gif/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/ipfilter/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/netgraph/Makefile#17 integrate
.. //depot/projects/smpng/sys/modules/netgraph/fec/sample_startup#2 delete
.. //depot/projects/smpng/sys/modules/pf/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/wlan_ccmp/Makefile#2 integrate
.. //depot/projects/smpng/sys/net/bpf.c#43 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#31 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#38 integrate
.. //depot/projects/smpng/sys/net/ppp_tty.c#16 integrate
.. //depot/projects/smpng/sys/netgraph/ng_base.c#29 integrate
.. //depot/projects/smpng/sys/netgraph/ng_sample.c#7 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#61 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#22 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#31 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs.h#22 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#36 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#14 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#44 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#45 integrate
.. //depot/projects/smpng/sys/nfsclient/nfsnode.h#12 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fd.c#41 integrate
.. //depot/projects/smpng/sys/pci/if_sk.c#39 integrate
.. //depot/projects/smpng/sys/sys/proc.h#136 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#49 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#49 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#51 integrate
.. //depot/projects/smpng/sys/sys/umtx.h#5 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#53 integrate
.. //depot/projects/smpng/sys/vm/vm_meter.c#21 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#63 integrate

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#39 (text+ko) ====

@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.512 2004/12/15 19:55:04 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.513 2004/12/21 19:25:56 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -858,7 +858,7 @@
 	if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) {
 		pa = DMAP_TO_PHYS(va);
 	} else {
-		pde = pmap_pde(kernel_pmap, va);
+		pde = vtopde(va);
 		if (*pde & PG_PS) {
 			pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1));
 		} else {

==== //depot/projects/smpng/sys/arm/conf/SIMICS#6 (text+ko) ====

@@ -15,7 +15,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.6 2004/11/07 23:02:15 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.7 2004/12/18 17:58:49 cognet Exp $
 
 machine		arm
 ident		SIMICS
@@ -40,7 +40,6 @@
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	MD_ROOT			#MD is a potential root device
-options		MD_ROOT_SIZE=65535
 options		ROOTDEVNAME=\"ufs:md0\"
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server

==== //depot/projects/smpng/sys/arm/include/atomic.h#4 (text+ko) ====

@@ -33,7 +33,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/atomic.h,v 1.3 2004/11/05 23:48:12 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/atomic.h,v 1.4 2004/12/18 17:43:01 cognet Exp $
  */
 
 #ifndef	_MACHINE_ATOMIC_H_
@@ -75,7 +75,7 @@
 __swp(uint32_t val, volatile uint32_t *ptr)
 {
 	__asm __volatile("swp	%0, %1, [%2]"
-	    : "=r" (val) : "r" (val) , "r" (ptr) : "memory");
+	    : "=&r" (val) : "r" (val) , "r" (ptr) : "memory");
 	return (val);
 }
 

==== //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#7 (text+ko) ====

@@ -47,7 +47,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.7 2004/11/20 16:51:32 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.8 2004/12/18 17:58:49 cognet Exp $");
 
 #include "opt_md.h"
 
@@ -134,7 +134,7 @@
 struct pcpu *pcpup = &__pcpu;
 
 #ifndef MD_ROOT_SIZE
-#error SIMICS needs MD_ROOT and MD_ROOT_SIZE
+#define MD_ROOT_SIZE 65535
 #endif
 /* Physical and virtual addresses for some global pages */
 
@@ -400,14 +400,14 @@
 
 	pmap_curmaxkvaddr = freemempos + KERNEL_PT_VMDATA_NUM * 0x400000;
 
-	pmap_bootstrap(KERNEL_VM_BASE, 
+	pmap_bootstrap(freemempos, 
 	    0xd0000000, &kernel_l1pt);
 
 	
 	mutex_init();
 	
 	
-	phys_avail[0] = round_page(freemempos);
+	phys_avail[0] = round_page(virtual_avail);
 	phys_avail[1] = 0xc0000000 + 0x02000000 - 1;
 	phys_avail[2] = 0;
 	phys_avail[3] = 0;

==== //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#3 (text+ko) ====

@@ -76,7 +76,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.2 2004/09/23 22:33:38 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.3 2004/12/18 17:58:49 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -115,16 +115,26 @@
 	return(bus_space_read_4(sc->sc_iot, sc->sc_ioh, SAIPIC_IP));
 }
 
+static uint32_t sa11x0_irq_mask = 0xfffffff;
+
+extern vm_offset_t saipic_base;
+
 void
 arm_mask_irqs(int irq)
 {
-	/* XXX */	
+
+	sa11x0_irq_mask &= ~irq;
+	__asm __volatile("str	%0, [%1, #0x04]" /* SAIPIC_MR */
+	    : : "r" (sa11x0_irq_mask), "r" (saipic_base));
 }
 
 void
 arm_unmask_irqs(int irq)
 {
-	/* XXX */
+
+	sa11x0_irq_mask |= irq;
+	__asm __volatile("str	%0, [%1, #0x04]" /* SAIPIC_MR */
+	    : : "r" (sa11x0_irq_mask), "r" (saipic_base));
 }
 
 void stray_irqhandler(void *);

==== //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.1 2004/09/23 22:45:36 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.2 2004/12/21 11:36:09 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -236,7 +236,7 @@
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	uint32_t addr;
 
-	if (i80321_pci_conf_setup(sc, bus, slot, func, reg, &addr))
+	if (i80321_pci_conf_setup(sc, bus, slot, func, reg & ~3, &addr))
 		return;
 
 
@@ -244,10 +244,12 @@
 	    addr);
 	switch (bytes) {
 	case 1:
-		bus_space_write_1(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR, data);
+		bus_space_write_1(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR +
+		    (reg & 3), data);
 		break;
 	case 2:
-		bus_space_write_2(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR, data);
+		bus_space_write_2(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR +
+		    (reg & 3), data);
 		break;
 	case 4:
 		bus_space_write_4(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR, data);
@@ -266,7 +268,6 @@
 	int func;
 	uint32_t busno;
 	struct i80321_pci_softc *sc = device_get_softc(pcib);
-
 	bus = pci_get_bus(dev);
 	device = pci_get_slot(dev);
 	func = pci_get_function(dev);
@@ -293,6 +294,10 @@
 		goto no_mapping;
 		/* IQ80321 PCI */
 	case 4: /* i82544 Gig-E */
+	case 8: /*
+		 * Apparently you can set the device for the ethernet adapter
+		 * to 8 with a jumper, so handle that as well
+		 */
 		if (pin == 1)
 			return (ICU_INT_XINT(0));
 		goto no_mapping;
@@ -362,7 +367,10 @@
 	case SYS_RES_MEMORY:
 		rm = &sc->sc_mem_rman;
 		bt = sc->sc_pcimem;
-		bh = sc->sc_mem;
+		bh = (start >= 0x80000000 && start < 0x84000000) ? 0x80000000 :
+		    sc->sc_mem;
+		start &= (0x1000000 - 1);
+		end &= (0x1000000 - 1);
 		break;
 	case SYS_RES_IOPORT:
 		rm = &sc->sc_io_rman;

==== //depot/projects/smpng/sys/boot/Makefile#18 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/sys/boot/Makefile,v 1.25 2004/11/23 05:52:00 marcel Exp $
+# $FreeBSD: src/sys/boot/Makefile,v 1.26 2004/12/21 12:32:13 ru Exp $
 
-.if !defined(NOFORTH)
+.if !defined(NO_FORTH)
 # Build the add-in FORTH interpreter.
 SUBDIR+=		ficl
 .endif

==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#8 (text+ko) ====

@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $
-# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.17 2004/02/11 22:01:17 ru Exp $
+# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.18 2004/12/21 08:47:11 ru Exp $
 
 PROG=	boot1.sym
 INTERNALPROG=
-NOMAN=
+NO_MAN=
 LINKS=	${BINDIR}/boot1 ${BINDIR}/boot
 
 .PATH: ${.CURDIR}/../libalpha

==== //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#5 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $
+# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.9 2004/12/21 08:47:12 ru Exp $
 
 BOOT= 		cdboot
-NOMAN=
+NO_MAN=
 NEWVERSWHAT=	"SRM CD9660 boot" alpha
 LOAD_ADDRESS=	${PRIMARY_LOAD_ADDRESS}
 

==== //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.19 2004/08/22 00:26:01 marcel Exp $
+# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.20 2004/12/21 12:32:13 ru Exp $
 #
 # Common Alpha loader build rules
 
@@ -15,7 +15,7 @@
 
 .PATH: ${.CURDIR}/../libalpha
 
-.if !defined(NOFORTH)
+.if !defined(NO_FORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH

==== //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#4 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.11 2004/02/11 22:01:17 ru Exp $
+# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.12 2004/12/21 08:47:12 ru Exp $
 #	$NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $
 
 BOOT= 		netboot
-NOMAN=
+NO_MAN=
 NEWVERSWHAT=	"SRM net boot" alpha
 LOAD_ADDRESS=	${PRIMARY_LOAD_ADDRESS}
 

==== //depot/projects/smpng/sys/boot/arc/loader/Makefile#3 (text+ko) ====

@@ -1,9 +1,9 @@
 #	$NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $
-# $FreeBSD: src/sys/boot/arc/loader/Makefile,v 1.7 2002/05/10 09:26:30 obrien Exp $
+# $FreeBSD: src/sys/boot/arc/loader/Makefile,v 1.8 2004/12/21 08:47:12 ru Exp $
 
 BASE= 		loader
 PROG= 		${BASE}.exe
-NOMAN=
+NO_MAN=
 NEWVERSWHAT=	"ARC disk boot" ${MACHINE_ARCH}
 
 .PATH:		${.CURDIR}/../common

==== //depot/projects/smpng/sys/boot/i386/boot0/Makefile#11 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.30 2004/08/27 00:18:03 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.31 2004/12/21 08:47:13 ru Exp $
 
 PROG?=	boot0
 STRIP=
 BINMODE=${NOBINMODE}
-NOMAN=
+NO_MAN=
 SRCS=	${PROG}.S
 
 # The default set of flags compiled into boot0.  This enables update (writing

==== //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#7 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.18 2004/04/27 19:45:15 ru Exp $
+# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.19 2004/12/21 08:47:13 ru Exp $
 
 PROG=	btx
 INTERNALPROG=
-NOMAN=
+NO_MAN=
 SRCS=	btx.S
 
 .if defined(PAGING)

==== //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#7 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.17 2004/04/27 19:45:16 ru Exp $
+# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.18 2004/12/21 08:47:13 ru Exp $
 
 PROG=	btxldr
 INTERNALPROG=
-NOMAN=
+NO_MAN=
 SRCS=	btxldr.S
 
 CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}

==== //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#7 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.12 2004/02/09 14:11:57 ru Exp $
+# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $
 
 PROG=	crt0.o
 INTERNALPROG=
-NOMAN=
+NO_MAN=
 SRCS=	btxcsu.s btxsys.s btxv86.s
 LDFLAGS=-Wl,-r
 

==== //depot/projects/smpng/sys/boot/i386/cdboot/Makefile#6 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.12 2004/04/28 21:31:20 ru Exp $
+# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $
 
 PROG=	cdboot
 STRIP=
 BINMODE=${NOBINMODE}
-NOMAN=
+NO_MAN=
 SRCS=	${PROG}.s
 
 ORG=	0x7c00

==== //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#12 (text+ko) ====

@@ -1,15 +1,15 @@
-# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.20 2004/02/12 22:06:33 ru Exp $
+# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.22 2004/12/21 09:59:44 ru Exp $
 
 PROG=	kgzldr.o
 STRIP=
 BINMODE=${LIBMODE}
 BINDIR=	${LIBDIR}
-NOMAN=
+NO_MAN=
 
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
 CFLAGS=	-Os
 CFLAGS+=-DKZIP
-NOSHARED=
+NO_SHARED=
 LDFLAGS=-Wl,-r
 .PATH:	${.CURDIR}/../../../kern
 

==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#18 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.78 2004/11/29 09:31:04 ru Exp $
+# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.79 2004/12/21 12:32:14 ru Exp $
 
 PROG=		loader.sym
 INTERNALPROG=
@@ -18,7 +18,7 @@
 HAVE_PNP=	yes
 HAVE_ISABUS=	yes
 
-.if !defined(NOFORTH)
+.if !defined(NO_FORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386

==== //depot/projects/smpng/sys/boot/i386/mbr/Makefile#8 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.14 2004/08/28 08:39:35 yar Exp $
+# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.15 2004/12/21 08:47:15 ru Exp $
 
 PROG=	mbr
 STRIP=
 BINMODE=${NOBINMODE}
-NOMAN=
+NO_MAN=
 SRCS=	${PROG}.s
 
 # MBR flags: 0x80 -- try packet interface (also known as EDD or LBA)

==== //depot/projects/smpng/sys/boot/ia64/efi/Makefile#3 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.24 2004/11/28 00:26:11 marcel Exp $
+# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.26 2004/12/21 12:32:14 ru Exp $
 
 PROG=		loader.sym
 INTERNALPROG=
 SRCS=		conf.c dev_net.c efimd.c main.c start.S vers.c
-NOMAN=
+NO_MAN=
 
 CFLAGS+=	-DLOADER
 CFLAGS+=	-I${.CURDIR}/../../efi/include
@@ -11,7 +11,7 @@
 CFLAGS+=	-I${.CURDIR}/../../efi/libefi
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
 
-.if !defined(NOFORTH)
+.if !defined(NO_FORTH)
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH
 CFLAGS+=	-I${.CURDIR}/../../ficl

==== //depot/projects/smpng/sys/boot/ia64/ski/Makefile#2 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.16 2004/09/24 04:06:22 marcel Exp $
+# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.18 2004/12/21 12:32:14 ru Exp $
 
 PROG=		skiload
-NOMAN=
+NO_MAN=
 NEWVERSWHAT=	"ia64 SKI boot" ${MACHINE_ARCH}
 STRIP=		# We must not strip skiload at install time.
 
@@ -16,7 +16,7 @@
 CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
 LDFLAGS=	-Wl,-T${.CURDIR}/ldscript.ia64
 
-.if !defined(NOFORTH)
+.if !defined(NO_FORTH)
 CFLAGS+=	-DBOOT_FORTH
 CFLAGS+=	-I${.CURDIR}/../../ficl
 CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_ARCH}

==== //depot/projects/smpng/sys/boot/pc98/boot0.5/Makefile#3 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.3 2004/02/09 16:01:45 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $
 
 PROG=	${BOOT}.out
 INTERNALPROG=
 FILES=	${BOOT}
-NOMAN=
+NO_MAN=
 SRCS=	start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s
 CLEANFILES= ${BOOT} ${BOOT}.bin
 

==== //depot/projects/smpng/sys/boot/pc98/boot0/Makefile#3 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/pc98/boot0/Makefile,v 1.3 2004/02/09 16:01:45 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/boot0/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $
 
 PROG=	${BOOT}.out
 INTERNALPROG=
 FILES=	${BOOT}
-NOMAN=
+NO_MAN=
 SRCS=	${BOOT}.s
 CLEANFILES= ${BOOT}
 

==== //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#13 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.19 2004/09/18 00:12:04 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.21 2004/12/21 09:59:44 ru Exp $
 #
 
 PROG=	boot
@@ -49,8 +49,8 @@
 
 CLEANFILES+=	boot.nohdr boot.strip boot.ldr boot1 boot2 sizetest
 LDFLAGS+=	-N -Ttext 0 -e start
-NOSHARED=	YES
-NOMAN=
+NO_SHARED=	YES
+NO_MAN=
 STRIP=
 
 # tunable timeout parameter, waiting for keypress, calibrated in ms

==== //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#7 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/boot/pc98/btx/btx/Makefile,v 1.10 2004/04/29 08:24:30 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/btx/btx/Makefile,v 1.11 2004/12/21 08:47:17 ru Exp $
 
 PROG=	btx
 INTERNALPROG=
-NOMAN=
+NO_MAN=
 SRCS=	btx.S
 
 CFLAGS+=-DPC98

==== //depot/projects/smpng/sys/boot/pc98/btx/btxldr/Makefile#6 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/boot/pc98/btx/btxldr/Makefile,v 1.8 2004/04/29 08:24:57 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/btx/btxldr/Makefile,v 1.9 2004/12/21 08:47:17 ru Exp $
 
 PROG=	btxldr
 INTERNALPROG=
-NOMAN=
+NO_MAN=
 SRCS=	btxldr.S
 
 CFLAGS+=-DPC98

==== //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#6 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/boot/pc98/btx/lib/Makefile,v 1.9 2004/02/09 16:01:45 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/btx/lib/Makefile,v 1.10 2004/12/21 08:47:18 ru Exp $
 
 PROG=	crt0.o
 INTERNALPROG=
-NOMAN=
+NO_MAN=
 SRCS=	btxcsu.s btxsys.s btxv86.s
 LDFLAGS=-Wl,-r
 

==== //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#10 (text+ko) ====

@@ -1,15 +1,15 @@
-# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.14 2004/02/13 15:24:25 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.16 2004/12/21 09:59:44 ru Exp $
 
 PROG=	kgzldr.o
 STRIP=
 BINMODE=${LIBMODE}
 BINDIR=	${LIBDIR}
-NOMAN=
+NO_MAN=
 
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
 CFLAGS=	-Os
 CFLAGS+=-DKZIP
-NOSHARED=
+NO_SHARED=
 LDFLAGS=-Wl,-r
 .PATH:	${.CURDIR}/../../../kern
 .PATH:	${.CURDIR}/../../i386/kgzldr

==== //depot/projects/smpng/sys/boot/pc98/loader/Makefile#14 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.36 2004/11/29 11:55:14 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.37 2004/12/21 12:32:15 ru Exp $
 
 PROG=		loader.sym
 INTERNALPROG=
@@ -20,7 +20,7 @@
 HAVE_PNP=	yes
 HAVE_ISABUS=	yes
 
-.if !defined(NOFORTH)
+.if !defined(NO_FORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386

==== //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#13 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.17 2004/08/18 11:31:00 grehan Exp $
+# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.18 2004/12/21 12:32:15 ru Exp $
 
 PROG=		loader
 NEWVERSWHAT=	"bootstrap loader" "Open Firmware/PowerPC"
@@ -46,7 +46,7 @@
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif
 
-.if !defined(NOFORTH)
+.if !defined(NO_FORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc

==== //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#8 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.10 2004/02/11 21:17:04 ru Exp $
+# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.11 2004/12/21 08:47:18 ru Exp $
 
 PROG=	boot1.elf
 INTERNALPROG=
-NOMAN=
+NO_MAN=
 FILES=	boot1
 SRCS=	_start.s boot1.c
 

==== //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#16 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.18 2004/08/16 15:45:25 marius Exp $
+# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.19 2004/12/21 12:32:15 ru Exp $
 
 PROG=		loader
 NEWVERSWHAT=	"bootstrap loader" sparc64
@@ -41,7 +41,7 @@
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif
 
-.if !defined(NOFORTH)
+.if !defined(NO_FORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/sparc64

==== //depot/projects/smpng/sys/conf/NOTES#87 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1289 2004/11/20 02:32:15 das Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1290 2004/12/20 04:22:41 sam Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -525,8 +525,17 @@
 #  The `vlan' device implements the VLAN tagging of Ethernet frames
 #  according to IEEE 802.1Q.  It requires `device miibus'.
 #  The `wlan' device provides generic code to support 802.11
-#  drivers, including host AP mode; it is MANDATORY for the wi
-#  driver and will eventually be required by all 802.11 drivers.
+#  drivers, including host AP mode; it is MANDATORY for the wi,
+#  ath, and awi drivers and will eventually be required by all 802.11 drivers.
+#  The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide
+#  support for WEP, TKIP, and AES-CCMP crypto protocols optionally
+#  used with 802.11 devices that depend on the `wlan' module.
+#  The `wlan_xauth' device provides support for external (i.e. user-mode)
+#  authenticators for use with 802.11 drivers that use the `wlan'
+#  module and supoprt 802.1x and/or WPA security protocols.
+#  The `wlan_acl' device provides a MAC-based access control mechanism
+#  for use with 802.11 drivers operating in ap mode and using the
+#  `wlan' module.
 #  The `fddi' device provides generic code to support FDDI.
 #  The `arcnet' device provides generic code to support Arcnet.
 #  The `sppp' device serves a similar role for certain types
@@ -570,6 +579,11 @@
 device		ether			#Generic Ethernet
 device		vlan			#VLAN support (needs miibus)
 device		wlan			#802.11 support
+device		wlan_wep		#802.11 WEP support
+device		wlan_ccmp		#802.11 CCMP support
+device		wlan_tkip		#802.11 TKIP support
+device		wlan_xauth		#802.11 external authenticator support
+device		wlan_acl		#802.11 MAC ACL support
 device		token			#Generic TokenRing
 device		fddi			#Generic FDDI
 device		arcnet			#Generic Arcnet

==== //depot/projects/smpng/sys/conf/files.amd64#26 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.amd64,v 1.52 2004/12/15 02:21:23 peter Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.54 2004/12/21 02:08:14 obrien Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -28,7 +28,7 @@
 #
 ia32_assym.h			standard				\
 	dependency 	"$S/kern/genassym.sh ia32_genassym.o"		\
-	compile-with	"env NM=${NM} sh $S/kern/genassym.sh ia32_genassym.o > ${.TARGET}" \
+	compile-with	"env NM='${NM}' sh $S/kern/genassym.sh ia32_genassym.o > ${.TARGET}" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"ia32_assym.h"
 #
@@ -57,7 +57,6 @@
 	no-obj no-implicit-rule before-depend				\
 	clean		"opt_ah.h"
 #
-dev/acpica/acpi_if.m		standard
 amd64/acpica/OsdEnvironment.c	optional	acpi
 amd64/acpica/acpi_machdep.c	optional	acpi
 amd64/acpica/acpi_wakeup.c	optional	acpi
@@ -121,6 +120,7 @@
 crypto/des/des_enc.c		optional	ipsec ipsec_esp
 crypto/des/des_enc.c		optional	netsmbcrypto
 crypto/des/des_setkey.c		optional	netsmbcrypto
+dev/acpica/acpi_if.m		standard
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
 dev/fb/splash.c			optional	splash

==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#14 (text+ko) ====

@@ -100,7 +100,7 @@
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.39 2004/06/29 03:39:06 darrenr Exp $";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.40 2004/12/16 21:02:15 darrenr Exp $";
 #endif
 
 #ifndef	_KERNEL
@@ -2433,7 +2433,12 @@
 		ATOMIC_INCL(frstats[out].fr_pull[0]);
 		qf->qf_data = MTOD(m, char *) + ipoff;
 # else
-		m = m_pullup(m, len);
+#  if (__FreeBSD_version >= 490000)
+		if ((len > MHLEN) && ((m->m_flags & M_PKTHDR) != 0))
+			m = m_defrag(m, M_DONTWAIT);
+		else
+#  endif
+			m = m_pullup(m, len);
 		*fin->fin_mp = m;
 		if (m == NULL) {
 			ATOMIC_INCL(frstats[out].fr_pull[1]);

==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#12 (text+ko) ====

@@ -111,7 +111,7 @@
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_nat.c	1.11 6/5/96 (C) 1995 Darren Reed";
 /* static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.37.2.44 2001/07/21 07:17:22 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.34 2004/06/21 22:46:35 darrenr Exp $";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.37 2004/12/18 03:47:54 mlaier Exp $";
 #endif
 
 nat_t	**nat_table[2] = { NULL, NULL },
@@ -132,7 +132,7 @@
 	fr_defnaticmpage = 6;		/* 3 seconds */
 natstat_t nat_stats;
 int	fr_nat_lock = 0;
-#if	(SOLARIS || defined(__sgi)) && defined(_KERNEL)
+#ifdef USE_MUTEX
 extern	kmutex_t	ipf_rw;
 extern	KRWLOCK_T	ipf_nat;
 #endif
@@ -2613,8 +2613,10 @@
 		hv = NAT_HASH_FN(iph, 0, ipf_rdrrules_sz);
 		for (np = rdr_rules[hv]; np; np = np->in_rnext) {
 			if ((np->in_ifp && (np->in_ifp != ifp)) ||
-			    (np->in_p && (np->in_p != fin->fin_p)) ||
-			    (np->in_flags && !(nflags & np->in_flags)))
+			    (np->in_p && (np->in_p != fin->fin_p)))
+				continue;
+			if ((np->in_flags & IPN_RF) &&
+			    !(nflags & np->in_flags))
 				continue;
 			if (np->in_flags & IPN_FILTER) {
 				if (!nat_match(fin, np, ip))
@@ -2877,11 +2879,14 @@
 struct nat *nat;
 u_int type;
 {
+# ifndef LARGE_NAT
 	struct ipnat *np;
+	int rulen;
+# endif
 	struct natlog natl;
 	void *items[1];
 	size_t sizes[1];
-	int rulen, types[1];
+	int types[1];
 
 	natl.nl_inip = nat->nat_inip;
 	natl.nl_outip = nat->nat_outip;

==== //depot/projects/smpng/sys/contrib/pf/net/pf.c#14 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.24 2004/12/05 12:15:43 dhartmei Exp $	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.25 2004/12/19 19:43:04 dhartmei Exp $	*/
 /*	$OpenBSD: pf.c,v 1.433.2.2 2004/07/17 03:22:34 brad Exp $ */
 /* add	$OpenBSD: pf.c,v 1.448 2004/05/11 07:34:11 dhartmei Exp $ */
 
@@ -2087,6 +2087,8 @@
 
 	get_addr:
 		PF_ACPY(naddr, &rpool->counter, af);
+		if (init_addr != NULL && PF_AZERO(init_addr, af))
+			PF_ACPY(init_addr, naddr, af);
 		PF_AINC(&rpool->counter, af);
 		break;
 	}
@@ -2129,7 +2131,7 @@
 		 * similar 2 portloop in in_pcbbind
 		 */
 		if (!(proto == IPPROTO_TCP || proto == IPPROTO_UDP)) {
-			key.gwy.port = 0;
+			key.gwy.port = dport;
 			if (pf_find_state_all(&key, PF_EXT_GWY, NULL) == NULL)
 				return (0);
 		} else if (low == 0 && high == 0) {
@@ -3405,7 +3407,7 @@
 	if (direction == PF_OUT) {
 		/* check outgoing packet for BINAT/NAT */
 		if ((nr = pf_get_translation(pd, m, off, PF_OUT, kif, &nsn,
-		    saddr, 0, daddr, 0, &pd->naddr, NULL)) != NULL) {
+		    saddr, icmpid, daddr, icmpid, &pd->naddr, NULL)) != NULL) {
 			PF_ACPY(&pd->baddr, saddr, af);
 			switch (af) {
 #ifdef INET
@@ -3429,7 +3431,7 @@
 	} else {
 		/* check incoming packet for BINAT/RDR */
 		if ((nr = pf_get_translation(pd, m, off, PF_IN, kif, &nsn,
-		    saddr, 0, daddr, 0, &pd->naddr, NULL)) != NULL) {
+		    saddr, icmpid, daddr, icmpid, &pd->naddr, NULL)) != NULL) {
 			PF_ACPY(&pd->baddr, daddr, af);
 			switch (af) {
 #ifdef INET

==== //depot/projects/smpng/sys/crypto/rijndael/Makefile#3 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/crypto/rijndael/Makefile,v 1.2 2004/10/24 15:32:50 ru Exp $
+# $FreeBSD: src/sys/crypto/rijndael/Makefile,v 1.3 2004/12/21 08:47:18 ru Exp $
 
 PROG=test00
-NOMAN=
+NO_MAN=
 SRCS= ${PROG}.c rijndael-alg-fst.c rijndael-api-fst.c
 
 CFLAGS += -I${.CURDIR}/../.. -g -static

==== //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#25 (text+ko) ====

@@ -25,7 +25,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list