From owner-p4-projects@FreeBSD.ORG Thu Dec 9 17:27:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59FFF16A4D0; Thu, 9 Dec 2004 17:27:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C54216A4CE for ; Thu, 9 Dec 2004 17:27:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA3D943D2F for ; Thu, 9 Dec 2004 17:27:55 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB9HRtcF075863 for ; Thu, 9 Dec 2004 17:27:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB9HRtoj075860 for perforce@freebsd.org; Thu, 9 Dec 2004 17:27:55 GMT (envelope-from sam@freebsd.org) Date: Thu, 9 Dec 2004 17:27:55 GMT Message-Id: <200412091727.iB9HRtoj075860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Dec 2004 17:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=66742 Change 66742 by sam@sam_ebb on 2004/12/09 17:27:07 IFC @ 66741 Affected files ... .. //depot/projects/wifi/UPDATING#4 integrate .. //depot/projects/wifi/lib/libc/softfloat/bits32/softfloat.c#2 integrate .. //depot/projects/wifi/sbin/geom/class/stripe/gstripe.8#3 integrate .. //depot/projects/wifi/sbin/ifconfig/Makefile#3 integrate .. //depot/projects/wifi/sbin/ifconfig/af_atalk.c#3 integrate .. //depot/projects/wifi/sbin/ifconfig/af_inet.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/af_inet6.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/af_ipx.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/ifclone.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#6 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#30 integrate .. //depot/projects/wifi/sbin/ifconfig/ifmac.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifvlan.c#5 integrate .. //depot/projects/wifi/sbin/mksnap_ffs/mksnap_ffs.c#2 integrate .. //depot/projects/wifi/share/man/man4/Makefile#8 integrate .. //depot/projects/wifi/share/man/man4/ath.4#3 integrate .. //depot/projects/wifi/share/man/man4/mac_portacl.4#2 integrate .. //depot/projects/wifi/share/man/man4/udav.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan_acl.4#1 branch .. //depot/projects/wifi/share/man/man4/wlan_ccmp.4#1 branch .. //depot/projects/wifi/share/man/man4/wlan_tkip.4#1 branch .. //depot/projects/wifi/share/man/man4/wlan_wep.4#1 branch .. //depot/projects/wifi/share/man/man4/wlan_xauth.4#1 branch .. //depot/projects/wifi/share/man/man7/tuning.7#4 integrate .. //depot/projects/wifi/share/man/man9/devclass_get_count.9#1 branch .. //depot/projects/wifi/share/man/man9/mbuf.9#2 integrate .. //depot/projects/wifi/sys/conf/files#10 edit .. //depot/projects/wifi/sys/conf/files.i386#6 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#5 integrate .. //depot/projects/wifi/sys/conf/options#6 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_osdep.h#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#3 delete .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/opt_ah.h#3 delete .. //depot/projects/wifi/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/i386-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/sh4-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/x86_64-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/version.h#3 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#1 branch .. //depot/projects/wifi/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.h#2 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#40 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/wifi/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/wifi/sys/dev/awi/awi.c#6 integrate .. //depot/projects/wifi/sys/dev/awi/awivar.h#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/wifi/sys/dev/mii/mii.c#4 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#5 integrate .. //depot/projects/wifi/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/wifi/sys/dev/ray/if_rayvar.h#3 integrate .. //depot/projects/wifi/sys/dev/uart/uart_cpu_ia64.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/FILES#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/wi/if_wivar.h#4 integrate .. //depot/projects/wifi/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/wifi/sys/i386/conf/NOTES#5 integrate .. //depot/projects/wifi/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/wifi/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/wifi/sys/i386/include/smp.h#2 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/wifi/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/wifi/sys/kern/kern_subr.c#4 integrate .. //depot/projects/wifi/sys/kern/subr_bus.c#4 integrate .. //depot/projects/wifi/sys/kern/uipc_domain.c#6 integrate .. //depot/projects/wifi/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/wifi/sys/modules/Makefile#7 integrate .. //depot/projects/wifi/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/acpi/acpi_ibm/Makefile#1 branch .. //depot/projects/wifi/sys/modules/ath_hal/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ath_rate_onoe/Makefile#1 branch .. //depot/projects/wifi/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/wifi/sys/net/bpf.c#3 integrate .. //depot/projects/wifi/sys/net/if.c#6 integrate .. //depot/projects/wifi/sys/net/if_var.h#7 integrate .. //depot/projects/wifi/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.c#15 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#6 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#8 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#10 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#26 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#28 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#17 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#26 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#16 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#24 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#16 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#18 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/wifi/sys/netinet/if_ether.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/wifi/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/wifi/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/wifi/sys/sys/bus.h#2 integrate .. //depot/projects/wifi/sys/sys/mbuf.h#5 integrate .. //depot/projects/wifi/sys/sys/uio.h#2 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_object.h#3 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#7 integrate .. //depot/projects/wifi/tools/regression/net80211/ccmp/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/net80211/ccmp/test_ccmp.c#2 integrate .. //depot/projects/wifi/tools/regression/net80211/tkip/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/net80211/tkip/test_tkip.c#2 integrate .. //depot/projects/wifi/tools/regression/net80211/wep/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/net80211/wep/test_wep.c#2 integrate .. //depot/projects/wifi/tools/tools/ath/80211debug.c#4 integrate .. //depot/projects/wifi/tools/tools/ath/80211stats.c#5 integrate .. //depot/projects/wifi/tools/tools/ath/Makefile#5 integrate .. //depot/projects/wifi/tools/tools/ath/athdebug.c#3 integrate .. //depot/projects/wifi/tools/tools/ath/athstats.c#6 integrate .. //depot/projects/wifi/usr.bin/make/Makefile#4 integrate .. //depot/projects/wifi/usr.bin/make/arch.c#5 integrate .. //depot/projects/wifi/usr.bin/make/cond.c#4 integrate .. //depot/projects/wifi/usr.bin/make/dir.c#5 integrate .. //depot/projects/wifi/usr.bin/make/job.c#9 integrate .. //depot/projects/wifi/usr.bin/make/lst.h#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstAppend.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstClose.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstConcat.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDeQueue.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDestroy.c#6 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDupl.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstFindFrom.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInit.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInsert.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstIsAtEnd.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstNext.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstOpen.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstRemove.c#5 integrate .. //depot/projects/wifi/usr.bin/make/main.c#9 integrate .. //depot/projects/wifi/usr.bin/make/make.c#6 integrate .. //depot/projects/wifi/usr.bin/make/make.h#3 integrate .. //depot/projects/wifi/usr.bin/make/nonints.h#4 integrate .. //depot/projects/wifi/usr.bin/make/str.c#4 integrate .. //depot/projects/wifi/usr.bin/make/suff.c#5 integrate .. //depot/projects/wifi/usr.bin/make/targ.c#5 integrate .. //depot/projects/wifi/usr.bin/make/var.c#5 integrate Differences ... ==== //depot/projects/wifi/UPDATING#4 (text+ko) ==== @@ -195,12 +195,10 @@ is installed. 20040817: - IPFW has been converted to use PFIL_HOOKS. This change is + IPFW has been converted to use pfil(9). This change is transparent to userland and preserves the ipfw ABI. The ipfw core packet inspection and filtering functions have not been - changed, only how ipfw is invoked is different. Note that - "option PFIL_HOOKS" is required to use IPFIREWALL compiled - into the kernel or as KLD. + changed, only how ipfw is invoked is different. 20040814: The RANDOM_IP_ID option has been replaced by the sysctl @@ -423,8 +421,7 @@ sure to run mergemaster -p before installworld to create required user account ("proxy"). If you do not want to build pf with your system you can use the NO_PF knob in make.conf. - Also note that pf requires "options PFIL_HOOKS" in the kernel. The - pf system consists of the following three devices: + The pf system consists of the following three devices: device pf # required device pflog # optional device pfsync # optional @@ -580,13 +577,6 @@ kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and mount_cd9660(8) need to be in sync with kernel. -20030925: - Configuring a system to use IPFILTER now requires that PFIL_HOOKS - also be explicitly configured. Previously this dependency was - magically handled through some cruft in net/pfil.h; but that has - been removed. Building a kernel with IPFILTER but not PFIL_HOOKS - will fail with obtuse errors in ip_fil.c. - 20030923: Fix a bug in arplookup(), whereby a hostile party on a locally attached network could exhaust kernel memory, and cause a system @@ -1973,4 +1963,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.379 2004/11/16 21:18:41 jhb Exp $ +$FreeBSD: src/UPDATING,v 1.380 2004/12/08 04:08:33 mlaier Exp $ ==== //depot/projects/wifi/lib/libc/softfloat/bits32/softfloat.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.1 2004/05/14 12:13:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.2 2004/12/08 18:41:42 cognet Exp $"); #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" @@ -77,7 +77,7 @@ Floating-point rounding mode and exception flags. ------------------------------------------------------------------------------- */ -fp_rnd float_rounding_mode = float_round_nearest_even; +fp_rnd_t float_rounding_mode = float_round_nearest_even; fp_except float_exception_flags = 0; /* ==== //depot/projects/wifi/sbin/geom/class/stripe/gstripe.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.17 2004/11/04 19:12:43 ceri Exp $ +.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.18 2004/12/09 12:26:47 pjd Exp $ .\" .Dd May 21, 2004 .Dt GSTRIPE 8 @@ -169,7 +169,7 @@ This can be set to a number between 0 and 3 inclusive. If set to 0 minimal debug information is printed, and if set to 3 the maximum amount of debug information in printed. -.It Va kern.geom.stripe.fast : No 1 +.It Va kern.geom.stripe.fast : No 0 If set to a non-zero value enable .Dq "fast mode" instead of the normal @@ -182,7 +182,7 @@ .Nm STRIPE will fall back to .Dq "economic mode" . -.It Va kern.geom.stripe.maxmem : No 1310720 +.It Va kern.geom.stripe.maxmem : No 13107200 Maximum amount of memory that can be consumed by .Dq "fast mode" (in bytes). @@ -204,7 +204,7 @@ create a file system on it, and mount it: .Bd -literal -offset indent -gstripe label -v -s 4096 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 +gstripe label -v -s 131072 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 newfs /dev/stripe/data mount /dev/stripe/data /mnt [...] ==== //depot/projects/wifi/sbin/ifconfig/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.25 2004/02/23 20:13:52 johan Exp $ +# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.26 2004/12/08 19:18:07 sam Exp $ PROG= ifconfig ==== //depot/projects/wifi/sbin/ifconfig/af_atalk.c#3 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/af_inet.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/af_inet6.c#5 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/af_ipx.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/af_link.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/ifclone.c#5 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.8#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.86 2004/11/06 13:38:45 ru Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.87 2004/12/08 19:18:07 sam Exp $ .\" .Dd Nov 2, 2004 .Dt IFCONFIG 8 ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.107 2004/09/01 18:22:14 brooks Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.108 2004/12/08 19:18:07 sam Exp $"; #endif /* not lint */ #include ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.12 2004/03/30 22:59:22 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.13 2004/12/08 19:18:07 sam Exp $ */ #define __constructor __attribute__((constructor)) ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#30 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.10 2004/04/04 07:28:58 phk Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.11 2004/12/08 19:18:07 sam Exp $ */ /*- ==== //depot/projects/wifi/sbin/ifconfig/ifmac.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifmac.c,v 1.2 2002/10/23 22:50:04 rwatson Exp $ + * $FreeBSD: src/sbin/ifconfig/ifmac.c,v 1.3 2004/12/08 19:18:07 sam Exp $ */ #include ==== //depot/projects/wifi/sbin/ifconfig/ifmedia.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */ -/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.16 2004/01/15 15:19:19 sam Exp $ */ +/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.17 2004/12/08 19:18:07 sam Exp $ */ /* * Copyright (c) 1997 Jason R. Thorpe. ==== //depot/projects/wifi/sbin/ifconfig/ifvlan.c#5 (text+ko) ==== @@ -56,7 +56,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.5 2002/04/18 17:14:09 imp Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.6 2004/12/08 19:18:07 sam Exp $"; #endif static int __tag = 0; static int __have_tag = 0; ==== //depot/projects/wifi/sbin/mksnap_ffs/mksnap_ffs.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.7 2004/01/27 19:28:13 des Exp $ + * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.8 2004/12/08 11:54:50 phk Exp $ */ #include @@ -66,6 +66,7 @@ usage(); dir = argv[1]; + memset(&args, 0, sizeof args); args.fspec = argv[2]; /* @@ -103,7 +104,7 @@ */ if ((grp = getgrnam("operator")) == NULL) errx(1, "Cannot retrieve operator gid"); - if (mount("ffs", dir, MNT_UPDATE | MNT_SNAPSHOT | stfsbuf.f_flags, + if (mount("ufs", dir, MNT_UPDATE | MNT_SNAPSHOT | stfsbuf.f_flags, &args) < 0) err(1, "Cannot create %s", args.fspec); if ((fd = open(args.fspec, O_RDONLY)) < 0) ==== //depot/projects/wifi/share/man/man4/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.296 2004/11/30 16:16:34 brueffer Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.297 2004/12/08 17:47:32 sam Exp $ MAN= aac.4 \ acpi.4 \ @@ -341,6 +341,11 @@ wi.4 \ witness.4 \ wlan.4 \ + wlan_acl.4 \ + wlan_ccmp.4 \ + wlan_tkip.4 \ + wlan_wep.4 \ + wlan_xauth.4 \ worm.4 \ xe.4 \ xl.4 \ ==== //depot/projects/wifi/share/man/man4/ath.4#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting +.\" Copyright (c) 2002-2004 Sam Leffler, Errno Consulting .\" All rights reserved. .\"" .\" Redistribution and use in source and binary forms, with or without @@ -29,17 +29,18 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.23 2004/11/07 13:40:27 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.25 2004/12/09 13:11:52 brueffer Exp $ .\"/ -.Dd August 26, 2004 +.Dd December 7, 2004 .Dt ATH 4 .Os .Sh NAME .Nm ath -.Nd "Atheros IEEE 802.11 driver" +.Nd "Atheros IEEE 802.11 wireless network driver" .Sh SYNOPSIS .Cd "device ath" .Cd "device ath_hal" +.Cd "device ath_rate_onoe" .Cd "device wlan" .Sh DESCRIPTION The @@ -67,14 +68,15 @@ AR5212-based devices support 802.11a, 802.11b, and 802.11g operation with transmit speeds appropriate to each. All chips also support an Atheros Turbo Mode (TM) that operates in -the 802.11a frequency range with 2x the transmit speeds. -(This mode is, however, only interoperable with other Atheros-based devices.) +the 5Ghz frequency range with 2x the transmit speeds. +Some chips also support Turbo mode in the 2.4Ghz range with 802.11g. +(These modes are, however, only interoperable with other Atheros-based devices.) The actual transmit speed used is dependent on signal quality and the .Dq "rate control" algorithm employed by the driver. All chips support WEP encryption. -AR5211 and AR5212 support the AES, TKIP, and Michael cryptographic -operations required for WPA but at this time the driver does not support them. +The AR5212 has hardware support for the AES-CCM, TKIP, and Michael cryptographic +operations required for WPA. To enable encryption, use .Xr ifconfig 8 as shown below. @@ -95,9 +97,9 @@ In this mode a host may function as an access point (base station). Access points are different than operating in IBSS mode. They operate in BSS mode. -They allow for easier roaming and bridge all ethernet traffic such +They allow for easier roaming and bridge all Ethernet traffic such that machines connected via an access point appear to be on the local -ethernet segment. +Ethernet segment. .Pp For more information on configuring this device, see .Xr ifconfig 8 . @@ -211,11 +213,11 @@ and receive descriptors. This usually indicates system memory is scarce and/or fragmented. .It "ath%d: unable to setup a data xmit queue!" -The request to the HAL to setup the transmit queue for normal +The request to the HAL to set up the transmit queue for normal data frames failed. This should not happen. .It "ath%d: unable to setup a beacon xmit queue!" -The request to the HAL to setup the transmit queue for 802.11 beacon frames +The request to the HAL to set up the transmit queue for 802.11 beacon frames frames failed. This should not happen. .It "ath%d: 802.11 address: %s" @@ -258,13 +260,6 @@ A problem occurred while querying the HAL to find the set of available channels for the device. This should not happen. -.It "ath%d: %s: %dM -> %dM (%d ok, %d err, %d retr)" -The driver's rate control algorithm changed the current rate for transmitting -frames. -This message is temporarily enabled for normal use to help in diagnosing -and improving the rate control algorithm. -The message indicates the new and old transmit rates and the statistics -it used to decide on this change. .It "ath%d: failed to enable memory mapping" The driver was unable to enable memory-mapped I/O to the PCI device registers. This should not happen. ==== //depot/projects/wifi/share/man/man4/mac_portacl.4#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.5 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.8 2004/12/09 13:48:33 trhodes Exp $ .\" -.Dd February 13, 2004 +.Dd December , 2004 .Dt MAC_PORTACL 4 .Os .Sh NAME @@ -203,6 +203,12 @@ protected ports, even if the port access control list does not explicitly allow this. (Default: 1). +.It Va security.mac.portacl.autoport_exempt +Allow applications to use automatic binding to port 0. +Applications use port 0 as a request for automatic port allocation when +binding an IP address to a socket. +This tunable will exempt port 0 allocation from rule checking. +(Default: 1) .El .Sh SEE ALSO .Xr mac 3 , ==== //depot/projects/wifi/share/man/man4/udav.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/udav.4,v 1.2 2004/07/08 12:40:42 ru Exp $ +.\" $FreeBSD: src/share/man/man4/udav.4,v 1.3 2004/12/09 13:27:44 brueffer Exp $ .\" -.Dd August 22, 2003 +.Dd December 9, 2004 .Dt UDAV 4 .Os .Sh NAME @@ -71,7 +71,7 @@ .Xr ifconfig 8 .Rs .%T "Davicom DM9601 data sheet" -.%O http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-F01-062202s.pdf +.%O http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-P01-930914.pdf .Re .Sh HISTORY The ==== //depot/projects/wifi/share/man/man4/wlan.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.4 2004/06/16 08:33:54 ru Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.5 2004/12/08 17:47:32 sam Exp $ .\" -.Dd September 25, 2003 +.Dd December 7, 2004 .Dt WLAN 4 .Os .Sh NAME @@ -36,26 +36,64 @@ .Sh DESCRIPTION The .Nm -device provides generic code to support 802.11 -drivers, including host AP mode. -Currently it is required for the +module provides generic code to support 802.11 drivers. +Where a device does not directly support 802.11 functionality +this layer fills in. +The +.Nm +is required for the .Xr wi 4 , .Xr an 4 and .Xr ath 4 -drivers but will eventually be required by all 802.11 drivers. +drivers, with other drivers to follow. +.Pp +The +.Nm +module supports multi-mode devices capable of +operating in both 2.4GHz and 5GHz bands and supports numerous +802.11 protocols: 802.11a, 802.11b, and 802.11g. +The WPA, 802.11i, and 802.1x security protocols are supported +through a combination of in-kernel code and user-mode applications. +The WME and WMM multi-media protocols are supported entirely within +the +.Nm +module but require a suitably capable hardware device. .Pp +The +.Nm +module defines several mechanisms by which plugin modules may +be used to extend functionality. +Cryptographic support such as WEP, TKIP, and AES-CCMP are implemented +as modules that are loaded on demand (if not statically configured +into a system). +Similarly there is an authenticator framework for defining 802.11 +authentication services and a framework for integrating access +control mechanisms specific to the 802.11 protocol. +.Sh DEBUGGING If the associated interface is marked for debugging with, for example, .Pp .Dl "ifconfig wi0 debug" .Pp then messages describing the operation of the 802.11 protocol will be sent to the console. -With the interface marked for debugging, doing: +Complete debugging controls are available using: +.Pp +.Dl "sysctl net.wlan.X.debug=mask" +.Pp +where X is the number of the +.Nm +instance and mask is a bit-or of control bits that determine which +debugging messages to enable. +For example, +.Dl "sysctl net.wlan.0.debug=0x00200000" .Pp -.Dl "sysctl debug.ieee80211=1" +enables debugging messages related to scanning for an access point, +adhoc neighbor, or an unoccupied channel when operation as an access point. +The +.Xr 80211debug +tool provides a more user-friendly mechanism for doing the same thing. .Pp -causes additional messages to be generated. Many drivers will also display the contents of each 802.11 frame sent and received when the interface is marked with both debugging and @@ -76,7 +114,12 @@ .Xr ath 4 , .Xr awi 4 , .Xr netintro 4 , -.Xr wi 4 +.Xr wi 4 , +.Xr wlan_wep 4 , +.Xr wlan_tkip 4 , +.Xr wlan_ccmp 4 , +.Xr wlan_xauth 4 , +.Xr wlan_acl 4 .Sh STANDARDS More information can be found in the IEEE 802.11 Standard. .Sh HISTORY @@ -85,13 +128,15 @@ driver first appeared in .Fx 5.0 . .Sh AUTHORS -Atsushi Onoe is the original author of this software. -The +Atsushi Onoe is the author of original .Nx -support was adapted to +software from which this work began. +.An -nosplit +.An Sam Leffler +brought the code into .Fx -by -.An -nosplit -.An Sam Leffler . +and then rewrote it to support multi-mode devices, +802.11g, WPA/802.11i, WME, and add the extensible frameworks +for cryptographic, authentication, and access control plugins. This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . ==== //depot/projects/wifi/share/man/man7/tuning.7#4 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.69 2004/11/16 21:22:09 jhb Exp $ +.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.70 2004/12/09 15:52:51 keramida Exp $ .\" .Dd June 25, 2002 .Dt TUNING 7 @@ -814,16 +814,15 @@ by a megabyte or more, leaving more memory available for applications. .Pp .Dv SCSI_DELAY -and -.Dv IDE_DELAY may be used to reduce system boot times. The defaults are fairly high and -can be responsible for 15+ seconds of delay in the boot process. +can be responsible for 5+ seconds of delay in the boot process. Reducing .Dv SCSI_DELAY -to 5 seconds usually works (especially with modern drives). +to something below 5 seconds could work (especially with modern drives). Reducing .Dv IDE_DELAY +(only available for PC98) also works but you have to be a little more careful. .Pp There are a number of ==== //depot/projects/wifi/share/man/man9/mbuf.9#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.52 2004/08/28 03:46:18 jmg Exp $ +.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.53 2004/12/08 17:47:49 sam Exp $ .\" .Dd August 27, 2004 .Dt MBUF 9 @@ -90,6 +90,8 @@ .Ss Mbuf utility functions .Ft void .Fn m_adj "struct mbuf *mbuf" "int len" +.Ft int +.Fn m_append "struct mbuf *mbuf" "int len" "c_caddr_t cp" .Ft struct mbuf * .Fn m_prepend "struct mbuf *mbuf" "int len" "int how" .Ft struct mbuf * @@ -581,6 +583,16 @@ .Fa len is positive, from the tail otherwise. .\" +.It Fn m_append mbuf len cp +Append +.Vt len +bytes of data +.Vt cp +to the +.Vt mbuf chain . +Extend the mbuf chain if the new data does not fit in +existing space. +.\" .It Fn m_prepend mbuf len how Allocate a new .Vt mbuf ==== //depot/projects/wifi/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.973 2004/12/06 00:43:36 alc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.975 2004/12/09 13:54:28 takawata Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -275,6 +275,7 @@ dev/acpi_support/acpi_asus.c optional acpi_asus acpi dev/acpi_support/acpi_panasonic.c optional acpi_panasonic acpi dev/acpi_support/acpi_sony.c optional acpi_sony acpi +dev/acpi_support/acpi_ibm.c optional acpi_ibm acpi dev/acpi_support/acpi_toshiba.c optional acpi_toshiba acpi dev/acpica/acpi.c optional acpi dev/acpica/acpi_acad.c optional acpi @@ -366,6 +367,10 @@ dev/ath/if_ath_pci.c optional ath card dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe +dev/ath/ath_rate/atheros/bsd.c optional ath_rate_atheros +dev/ath/ath_rate/atheros/ratectrl.c optional ath_rate_atheros +dev/ath/ath_rate/atheros/ar5212Phy.c optional ath_rate_atheros +dev/ath/ath_rate/atheros/ar5211Phy.c optional ath_rate_atheros dev/awi/am79c930.c optional awi dev/awi/awi.c optional awi dev/awi/if_awi_pccard.c optional awi card ==== //depot/projects/wifi/sys/conf/files.i386#6 (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.i386,v 1.509 2004/11/23 00:00:43 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.510 2004/12/08 18:20:52 sam Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/wifi/sys/conf/kmod.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.174 2004/12/04 14:20:56 marius Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.176 2004/12/08 07:23:12 ru Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -305,8 +305,7 @@ .if !target(${_src}) .if !exists(@) ${_src}: @ -.endif -.if exists(@) +.else ${_src}: @/tools/makeobjops.awk @/${_srcsrc} .endif ${AWK} -f @/tools/makeobjops.awk @/${_srcsrc} -${_ext} @@ -315,18 +314,31 @@ .endfor # _ext .endfor # _srcsrc -.for _ext in c h -.if ${SRCS:Mvnode_if.${_ext}} != "" -CLEANFILES+= vnode_if.${_ext} +.if ${SRCS:Mvnode_if.c} != "" +CLEANFILES+= vnode_if.c .if !exists(@) -vnode_if.${_ext}: @ +vnode_if.c: @ +.else +vnode_if.c: @/tools/vnode_if.awk @/kern/vnode_if.src +.endif + ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -c .endif -.if exists(@) -vnode_if.${_ext}: @/tools/vnode_if.awk @/kern/vnode_if.src + +.if ${SRCS:Mvnode_if.h} != "" +CLEANFILES+= vnode_if.h vnode_if_newproto.h vnode_if_typedef.h +.if !exists(@) +vnode_if.h vnode_if_newproto.h vnode_if_typedef.h: @ +.else +vnode_if.h vnode_if_newproto.h vnode_if_typedef.h: @/tools/vnode_if.awk \ + @/kern/vnode_if.src .endif - ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -${_ext} +vnode_if.h: vnode_if_newproto.h vnode_if_typedef.h + ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -h +vnode_if_newproto.h: + ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -p +vnode_if_typedef.h: + ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -q .endif -.endfor .for _i in mii pccard usb .if ${SRCS:M${_i}devs.h} != "" @@ -337,8 +349,7 @@ .endif .if !exists(@) ${_i}devs.h: @ -.endif -.if exists(@) +.else ${_i}devs.h: @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs .endif ${AWK} -f @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs @@ -349,8 +360,7 @@ CLEANFILES+= acpi_quirks.h .if !exists(@) acpi_quirks.h: @ -.endif -.if exists(@) +.else acpi_quirks.h: @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks .endif ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks ==== //depot/projects/wifi/sys/conf/options#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.487 2004/11/12 19:44:30 peter Exp $ +# $FreeBSD: src/sys/conf/options,v 1.488 2004/12/08 18:20:53 sam Exp $ # # On the handling of kernel options # @@ -491,7 +491,6 @@ INVARIANT_SUPPORT opt_global.h INVARIANTS opt_global.h LOOKUP_SHARED opt_global.h -MBUF_GUARD opt_global.h MCLSHIFT opt_global.h MUTEX_DEBUG opt_global.h MUTEX_NOINLINE opt_global.h @@ -671,9 +670,9 @@ AH_SUPPORT_AR5210 opt_ah.h AH_SUPPORT_AR5211 opt_ah.h AH_SUPPORT_AR5212 opt_ah.h -AH_SUPPORT_AR5111 opt_ah.h -AH_SUPPORT_AR5112 opt_ah.h -AH_SUPPORT_AR2413 opt_ah.h +AH_SUPPORT_5111 opt_ah.h +AH_SUPPORT_5112 opt_ah.h +AH_SUPPORT_2413 opt_ah.h AH_DEBUG opt_ah.h AH_DEBUG_ALQ opt_ah.h AH_ASSERT opt_ah.h ==== //depot/projects/wifi/sys/contrib/dev/ath/COPYRIGHT#3 (text+ko) ==== ==== //depot/projects/wifi/sys/contrib/dev/ath/README#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<