Index: projects/bsnmp-ipv6-mib/Makefile.inc1
===================================================================
--- projects/bsnmp-ipv6-mib/Makefile.inc1	(revision 311636)
+++ projects/bsnmp-ipv6-mib/Makefile.inc1	(revision 311637)
@@ -1,2631 +1,2631 @@
 #
 # $FreeBSD$
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNO_CLEAN do not clean at all
 #	-DDB_FROM_SRC use the user/group databases in src/etc instead of
 #	    the system database when installing.
 #	-DNO_SHARE do not go into share subdir
 #	-DKERNFAST define NO_KERNEL{CONFIG,CLEAN,OBJ}
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
 #	-DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
 #	-DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_ROOT install without using root privilege
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
 #	-DWITHOUT_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	LOCAL_ITOOLS="list of tools" to add additional tools to the ITOOLS list
 #	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
 #	LOCAL_MTREE="list of mtree files" to process to allow local directories
 #	    to be created before files are installed
 #	LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
 #	    list
 #	LOCAL_XTOOL_DIRS="list of dirs" to add additional dirs to the
 #	    cross-tools target
 #	METALOG="path to metadata log" to write permission and ownership
 #	    when NO_ROOT is set.  (default: ${DESTDIR}/METALOG)
 #	TARGET="machine" to crossbuild world for a different machine type
 #	TARGET_ARCH= may be required when a TARGET supports multiple endians
 #	BUILDENV_SHELL= shell to launch for the buildenv target (def:${SHELL})
 #	WORLD_FLAGS= additional flags to pass to make(1) during buildworld
 #	KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel
 #	SUBDIR_OVERRIDE="list of dirs" to build rather than everything.
 #	    All libraries and includes, and some build tools will still build.
 
 #
 # The intended user-driven targets are:
 # buildworld  - rebuild *everything*, including glue to help do upgrades
 # installworld- install everything built by "buildworld"
 # checkworld  - run test suite on installed world
 # doxygen     - build API documentation of the kernel
 # update      - convenient way to update your source tree (eg: svn/svnup)
 #
 # Standard targets (not defined here) are documented in the makefiles in
 # /usr/share/mk.  These include:
 #		obj depend all install clean cleandepend cleanobj
 
 .if !defined(TARGET) || !defined(TARGET_ARCH)
 .error "Both TARGET and TARGET_ARCH must be defined."
 .endif
 
 SRCDIR?=	${.CURDIR}
 LOCALBASE?=	/usr/local
 
 # Cross toolchain changes must be in effect before bsd.compiler.mk
 # so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes.
 .if defined(CROSS_TOOLCHAIN)
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
 CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}"
 .endif
 .if defined(CROSS_TOOLCHAIN_PREFIX)
 CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 .endif
 
 XCOMPILERS=	CC CXX CPP
 .for COMPILER in ${XCOMPILERS}
 .if defined(CROSS_COMPILER_PREFIX)
 X${COMPILER}?=	${CROSS_COMPILER_PREFIX}${${COMPILER}}
 .else
 X${COMPILER}?=	${${COMPILER}}
 .endif
 .endfor
 # If a full path to an external cross compiler is given, don't build
 # a cross compiler.
 .if ${XCC:N${CCACHE_BIN}:M/*}
 MK_CLANG_BOOTSTRAP=	no
 MK_GCC_BOOTSTRAP=	no
 .endif
 
 # Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early.
 .include <bsd.compiler.mk>
 .include "share/mk/src.opts.mk"
 
 # Check if there is a local compiler that can satisfy as an external compiler.
 # Which compiler is expected to be used?
 .if ${MK_CLANG_BOOTSTRAP} == "yes"
 WANT_COMPILER_TYPE=	clang
 .elif ${MK_GCC_BOOTSTRAP} == "yes"
 WANT_COMPILER_TYPE=	gcc
 .else
 WANT_COMPILER_TYPE=
 .endif
 .if !defined(WANT_COMPILER_FREEBSD_VERSION)
 .if ${WANT_COMPILER_TYPE} == "clang"
 WANT_COMPILER_FREEBSD_VERSION_FILE= lib/clang/freebsd_cc_version.h
 WANT_COMPILER_FREEBSD_VERSION!= \
 	awk '$$2 == "FREEBSD_CC_VERSION" {printf("%d\n", $$3)}' \
 	${SRCDIR}/${WANT_COMPILER_FREEBSD_VERSION_FILE} || echo unknown
 WANT_COMPILER_VERSION_FILE= lib/clang/include/clang/Basic/Version.inc
 WANT_COMPILER_VERSION!= \
 	awk '$$2 == "CLANG_VERSION" {split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \
 	${SRCDIR}/${WANT_COMPILER_VERSION_FILE} || echo unknown
 .elif ${WANT_COMPILER_TYPE} == "gcc"
 WANT_COMPILER_FREEBSD_VERSION_FILE= gnu/usr.bin/cc/cc_tools/freebsd-native.h
 WANT_COMPILER_FREEBSD_VERSION!= \
 	awk '$$2 == "FBSD_CC_VER" {printf("%d\n", $$3)}' \
 	${SRCDIR}/${WANT_COMPILER_FREEBSD_VERSION_FILE} || echo unknown
 WANT_COMPILER_VERSION_FILE= contrib/gcc/BASE-VER
 WANT_COMPILER_VERSION!= \
 	awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3}' \
 	${SRCDIR}/${WANT_COMPILER_VERSION_FILE} || echo unknown
 .endif
 .export WANT_COMPILER_FREEBSD_VERSION WANT_COMPILER_VERSION
 .endif	# !defined(WANT_COMPILER_FREEBSD_VERSION)
 # It needs to be the same revision as we would build for the bootstrap.
 # If the expected vs CC is different then we can't skip.
 # GCC cannot be used for cross-arch yet.  For clang we pass -target later if
 # TARGET_ARCH!=MACHINE_ARCH.
 .if ${MK_SYSTEM_COMPILER} == "yes" && \
     (${MK_CLANG_BOOTSTRAP} == "yes" || ${MK_GCC_BOOTSTRAP} == "yes") && \
     !make(showconfig) && !make(native-xtools) && !make(xdev*) && \
     ${WANT_COMPILER_TYPE} == ${COMPILER_TYPE} && \
     (${COMPILER_TYPE} == "clang" || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
     ${COMPILER_VERSION} == ${WANT_COMPILER_VERSION} && \
     ${COMPILER_FREEBSD_VERSION} == ${WANT_COMPILER_FREEBSD_VERSION}
 # Everything matches, disable the bootstrap compiler.
 MK_CLANG_BOOTSTRAP=	no
 MK_GCC_BOOTSTRAP=	no
 USING_SYSTEM_COMPILER=	yes
 .endif	# ${WANT_COMPILER_TYPE} == ${COMPILER_TYPE}
 USING_SYSTEM_COMPILER?=	no
 TEST_SYSTEM_COMPILER_VARS= \
 	USING_SYSTEM_COMPILER MK_SYSTEM_COMPILER \
 	MK_CROSS_COMPILER MK_CLANG_BOOTSTRAP MK_GCC_BOOTSTRAP \
 	WANT_COMPILER_TYPE WANT_COMPILER_VERSION WANT_COMPILER_VERSION_FILE \
 	WANT_COMPILER_FREEBSD_VERSION WANT_COMPILER_FREEBSD_VERSION_FILE \
 	CC COMPILER_TYPE COMPILER_VERSION COMPILER_FREEBSD_VERSION
 test-system-compiler: .PHONY
 .for v in ${TEST_SYSTEM_COMPILER_VARS}
 	${_+_}@printf "%-35s= %s\n" "${v}" "${${v}}"
 .endfor
 .if ${USING_SYSTEM_COMPILER} == "yes" && \
     (make(buildworld) || make(buildkernel) || make(kernel-toolchain) || \
     make(toolchain) || make(_cross-tools))
 .info SYSTEM_COMPILER: Determined that CC=${CC} matches the source tree.  Not bootstrapping a cross-compiler.
 .endif
 
 # For installworld need to ensure that the looked-up compiler metadata is
 # passed along rather than trying to run cc from the restricted
 # STRICTTMPPATH.
 .if ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"
 .if !defined(X_COMPILER_TYPE)
 CROSSENV+=	COMPILER_VERSION=${COMPILER_VERSION} \
 		COMPILER_TYPE=${COMPILER_TYPE} \
 		COMPILER_FREEBSD_VERSION=${COMPILER_FREEBSD_VERSION}
 .else
 CROSSENV+=	COMPILER_VERSION=${X_COMPILER_VERSION} \
 		COMPILER_TYPE=${X_COMPILER_TYPE} \
 		COMPILER_FREEBSD_VERSION=${X_COMPILER_FREEBSD_VERSION}
 .endif
 .endif
 
 # Handle external binutils.
 .if defined(CROSS_TOOLCHAIN_PREFIX)
 CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 .endif
 # If we do not have a bootstrap binutils (because the in-tree one does not
 # support the target architecture), provide a default cross-binutils prefix.
 # This allows aarch64 builds, for example, to automatically use the
 # aarch64-binutils port or package.
 .if !make(showconfig)
 .if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \
     !defined(CROSS_BINUTILS_PREFIX)
 CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/
 .if !exists(${CROSS_BINUTILS_PREFIX})
 .error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX.
 .endif
 .endif
 .endif
 XBINUTILS=	AS AR LD NM OBJCOPY RANLIB SIZE STRINGS
 .for BINUTIL in ${XBINUTILS}
 .if defined(CROSS_BINUTILS_PREFIX) && \
     exists(${CROSS_BINUTILS_PREFIX}${${BINUTIL}})
 X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
 .else
 X${BINUTIL}?=	${${BINUTIL}}
 .endif
 .endfor
 
 
 # We must do lib/ and libexec/ before bin/ in case of a mid-install error to
 # keep the users system reasonably usable.  For static->dynamic root upgrades,
 # we don't want to install a dynamic binary without rtld and the needed
 # libraries.  More commonly, for dynamic root, we don't want to install a
 # binary that requires a newer library version that hasn't been installed yet.
 # This ordering is not a guarantee though.  The only guarantee of a working
 # system here would require fine-grained ordering of all components based
 # on their dependencies.
 .if !empty(SUBDIR_OVERRIDE)
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	lib libexec
 .if !defined(NO_ROOT) && (make(installworld) || make(install))
 # Ensure libraries are installed before progressing.
 SUBDIR+=.WAIT
 .endif
 SUBDIR+=bin
 .if ${MK_CDDL} != "no"
 SUBDIR+=cddl
 .endif
 SUBDIR+=gnu include
 .if ${MK_KERBEROS} != "no"
 SUBDIR+=kerberos5
 .endif
 .if ${MK_RESCUE} != "no"
 SUBDIR+=rescue
 .endif
 SUBDIR+=sbin
 .if ${MK_CRYPT} != "no"
 SUBDIR+=secure
 .endif
 .if !defined(NO_SHARE)
 SUBDIR+=share
 .endif
 SUBDIR+=sys usr.bin usr.sbin
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 .if ${MK_OFED} != "no"
 SUBDIR+=contrib/ofed
 .endif
 
 # Local directories are last, since it is nice to at least get the base
 # system rebuilt before you do them.
 .for _DIR in ${LOCAL_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
 SUBDIR+=	${_DIR}
 .endif
 .endfor
 # Add LOCAL_LIB_DIRS, but only if they will not be picked up as a SUBDIR
 # of a LOCAL_DIRS directory.  This allows LOCAL_DIRS=foo and
 # LOCAL_LIB_DIRS=foo/lib to behave as expected.
 .for _DIR in ${LOCAL_DIRS:M*/} ${LOCAL_DIRS:N*/:S|$|/|}
 _REDUNDENT_LIB_DIRS+=    ${LOCAL_LIB_DIRS:M${_DIR}*}
 .endfor
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if empty(_REDUNDENT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile)
 SUBDIR+=	${_DIR}
 .else
 .warning ${_DIR} not added to SUBDIR list.  See UPDATING 20141121.
 .endif
 .endfor
 
 # We must do etc/ last as it hooks into building the man whatis file
 # by calling 'makedb' in share/man.  This is only relevant for
 # install/distribute so they build the whatis file after every manpage is
 # installed.
 .if make(installworld) || make(install)
 SUBDIR+=.WAIT
 .endif
 SUBDIR+=etc
 
 .endif	# !empty(SUBDIR_OVERRIDE)
 
 .if defined(NOCLEAN)
 .warning NOCLEAN option is deprecated. Use NO_CLEAN instead.
 NO_CLEAN=	${NOCLEAN}
 .endif
 .if defined(NO_CLEANDIR)
 CLEANDIR=	clean cleandepend
 .else
 CLEANDIR=	cleandir
 .endif
 
 .if ${MK_META_MODE} == "yes"
 # If filemon is used then we can rely on the build being incremental-safe.
 # The .meta files will also track the build command and rebuild should
 # it change.
 .if empty(.MAKE.MODE:Mnofilemon)
 NO_CLEAN=	t
 .endif
 .endif
 
 LOCAL_TOOL_DIRS?=
 PACKAGEDIR?=	${DESTDIR}/${DISTDIR}
 
 .if empty(SHELL:M*csh*)
 BUILDENV_SHELL?=${SHELL}
 .else
 BUILDENV_SHELL?=/bin/sh
 .endif
 
 .if !defined(SVN) || empty(SVN)
 . for _P in /usr/bin /usr/local/bin
 .  for _S in svn svnlite
 .   if exists(${_P}/${_S})
 SVN=   ${_P}/${_S}
 .   endif
 .  endfor
 . endfor
 .endif
 SVNFLAGS?=	-r HEAD
 
 MAKEOBJDIRPREFIX?=	/usr/obj
 .if !defined(OSRELDATE)
 .if exists(/usr/include/osreldate.h)
 OSRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 		/usr/include/osreldate.h
 .else
 OSRELDATE=	0
 .endif
 .export OSRELDATE
 .endif
 
 # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
 .if !defined(_REVISION)
 _REVISION!=	MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V REVISION
 .export _REVISION
 .endif
 .if !defined(_BRANCH)
 _BRANCH!=	MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V BRANCH
 .export _BRANCH
 .endif
 .if !defined(SRCRELDATE)
 SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 		${SRCDIR}/sys/sys/param.h
 .export SRCRELDATE
 .endif
 .if !defined(VERSION)
 VERSION=	FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .export VERSION
 .endif
 
 .if !defined(PKG_VERSION)
 .if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*} || ${_BRANCH:MALPHA*}
 TIMENOW=	%Y%m%d%H%M%S
 EXTRA_REVISION=	.s${TIMENOW:gmtime}
 .endif
 .if ${_BRANCH:M*-p*}
 EXTRA_REVISION=	_${_BRANCH:C/.*-p([0-9]+$)/\1/}
 .endif
 PKG_VERSION=	${_REVISION}${EXTRA_REVISION}
 .endif
 
 KNOWN_ARCHES?=	aarch64/arm64 \
 		amd64 \
 		arm \
 		armeb/arm \
 		armv6/arm \
 		i386 \
 		i386/pc98 \
 		mips \
 		mipsel/mips \
 		mips64el/mips \
 		mipsn32el/mips \
 		mips64/mips \
 		mipsn32/mips \
 		mipshf/mips \
 		mipselhf/mips \
 		mips64elhf/mips \
 		mips64hf/mips \
 		powerpc \
 		powerpc64/powerpc \
 		powerpcspe/powerpc \
 		riscv64/riscv \
 		riscv64sf/riscv \
 		sparc64
 
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
 _t=		${TARGET_ARCH}/${TARGET}
 .endif
 .for _t in ${_t}
 .if empty(KNOWN_ARCHES:M${_t})
 .error Unknown target ${TARGET_ARCH}:${TARGET}.
 .endif
 .endfor
 
 .if ${TARGET} == ${MACHINE}
 TARGET_CPUTYPE?=${CPUTYPE}
 .else
 TARGET_CPUTYPE?=
 .endif
 
 .if !empty(TARGET_CPUTYPE)
 _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 .else
 _TARGET_CPUTYPE=dummy
 .endif
 _CPUTYPE!=	MK_AUTO_OBJ=no MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
 		-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
 .if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
 .if make(buildworld)
 BUILD_ARCH!=	uname -p
 .if ${MACHINE_ARCH} != ${BUILD_ARCH}
 .error To cross-build, set TARGET_ARCH.
 .endif
 .endif
 .if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
 OBJTREE=	${MAKEOBJDIRPREFIX}
 .else
 OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
 BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
 XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
 STRICTTMPPATH=	${BPATH}:${XPATH}
 TMPPATH=	${STRICTTMPPATH}:${PATH}
 
 #
 # Avoid running mktemp(1) unless actually needed.
 # It may not be functional, e.g., due to new ABI
 # when in the middle of installing over this system.
 #
 .if make(distributeworld) || make(installworld) || make(stageworld)
 INSTALLTMP!=	/usr/bin/mktemp -d -u -t install
 .endif
 
 .if make(stagekernel) || make(distributekernel)
 TAGS+=		kernel
 PACKAGE=	kernel
 .endif
 
 #
 # Building a world goes through the following stages
 #
 # 1. legacy stage [BMAKE]
 #	This stage is responsible for creating compatibility
 #	shims that are needed by the bootstrap-tools,
 #	build-tools and cross-tools stages. These are generally
 #	APIs that tools from one of those three stages need to
 #	build that aren't present on the host.
 # 1. bootstrap-tools stage [BMAKE]
 #	This stage is responsible for creating programs that
 #	are needed for backward compatibility reasons. They
 #	are not built as cross-tools.
 # 2. build-tools stage [TMAKE]
 #	This stage is responsible for creating the object
 #	tree and building any tools that are needed during
 #	the build process. Some programs are listed during
 #	this phase because they build binaries to generate
 #	files needed to build these programs. This stage also
 #	builds the 'build-tools' target rather than 'all'.
 # 3. cross-tools stage [XMAKE]
 #	This stage is responsible for creating any tools that
 #	are needed for building the system. A cross-compiler is one
 #	of them. This differs from build tools in two ways:
 #	1. the 'all' target is built rather than 'build-tools'
 #	2. these tools are installed into TMPPATH for stage 4.
 # 4. world stage [WMAKE]
 #	This stage actually builds the world.
 # 5. install stage (optional) [IMAKE]
 #	This stage installs a previously built world.
 #
 
 BOOTSTRAPPING?=	0
 # Keep these in sync -- see below for special case exception
 MINIMUM_SUPPORTED_OSREL?= 900044
 MINIMUM_SUPPORTED_REL?= 9.1
 
 # Common environment for world related stages
 CROSSENV+=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		MACHINE_ARCH=${TARGET_ARCH} \
 		MACHINE=${TARGET} \
 		CPUTYPE=${TARGET_CPUTYPE}
 .if ${MK_META_MODE} != "no"
 # Don't rebuild build-tools targets during normal build.
 CROSSENV+=	BUILD_TOOLS_META=.NOMETA_CMP
 .endif
 .if ${MK_GROFF} != "no"
 CROSSENV+=	GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
 		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
 		GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
 .endif
 .if defined(TARGET_CFLAGS)
 CROSSENV+=	${TARGET_CFLAGS}
 .endif
 
 # bootstrap-tools stage
 BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		TOOLS_PREFIX=${WORLDTMP} \
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP} \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
 BSARGS= 	DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		MK_HTML=no NO_LINT=yes MK_MAN=no \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
 		MK_LLDB=no MK_TESTS=no \
 		MK_INCLUDES=yes
 
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		${BSARGS}
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DNO_LINT \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
 		MK_LLDB=no MK_TESTS=no
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		MK_GDB=no MK_TESTS=no MK_LLD_AS_LD=no
 
 # kernel-tools stage
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP}
 KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		MK_HTML=no -DNO_LINT MK_MAN=no \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no
 
 # world stage
 WMAKEENV=	${CROSSENV} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
 
 # make hierarchy
 HMAKE=		PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q}
 .if defined(NO_ROOT)
 HMAKE+=		PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
 .endif
 
 CROSSENV+=	CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCXXFLAGS} ${XCFLAGS}" \
 		CPP="${XCPP} ${XCFLAGS}" \
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" LLVM_LINK="${XLLVM_LINK}" \
 		NM=${XNM} OBJCOPY="${XOBJCOPY}" \
 		RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
 		SIZE="${XSIZE}"
 
 .if defined(CROSS_BINUTILS_PREFIX) && exists(${CROSS_BINUTILS_PREFIX})
 # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a
 # directory, but the compiler will look in the right place for its
 # tools so we don't need to tell it where to look.
 BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .endif
 
 
 # The internal bootstrap compiler has a default sysroot set by TOOLS_PREFIX
 # and target set by TARGET/TARGET_ARCH.  However, there are several needs to
 # always pass an explicit --sysroot and -target.
 # - External compiler needs sysroot and target flags.
 # - External ld needs sysroot.
 # - To be clear about the use of a sysroot when using the internal compiler.
 # - Easier debugging.
 # - Allowing WITH_SYSTEM_COMPILER+WITH_META_MODE to work together due to
 #   the flip-flopping build command when sometimes using external and
 #   sometimes using internal.
 # - Allow using lld which has no support for default paths.
 .if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX})
 BFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
 .if ${TARGET} == "arm"
 .if ${TARGET_ARCH:Marmv6*} != "" && ${TARGET_CPUTYPE:M*soft*} == ""
 TARGET_ABI=	gnueabihf
 .else
 TARGET_ABI=	gnueabi
 .endif
 .endif
 .if ${WANT_COMPILER_TYPE} == gcc || \
     (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
 # GCC requires -isystem and -L when using a cross-compiler.  --sysroot
 # won't set header path and -L is used to ensure the base library path
 # is added before the port PREFIX library path.
 XCFLAGS+=	-isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
 # GCC requires -B to find /usr/lib/crti.o when using a cross-compiler
 # combined with --sysroot.
 XCFLAGS+=	-B${WORLDTMP}/usr/lib
 # Force using libc++ for external GCC.
 # XXX: This should be checking MK_GNUCXX == no
 .if ${X_COMPILER_VERSION} >= 40800
 XCXXFLAGS+=	-isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
 		-nostdinc++
 .endif
 .elif ${WANT_COMPILER_TYPE} == clang || \
     (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang)
 TARGET_ABI?=	unknown
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd12.0
 XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 XCFLAGS+=	--sysroot=${WORLDTMP}
 
 .if !empty(BFLAGS)
 XCFLAGS+=	${BFLAGS}
 .endif
 
 .if ${MK_LIB32} != "no" && (${TARGET_ARCH} == "amd64" || \
-    ${TARGET_ARCH} == "powerpc64")
+    ${TARGET_ARCH} == "powerpc64") || ${TARGET_ARCH:Mmips64*} != ""
 LIBCOMPAT= 32
 .include "Makefile.libcompat"
 .elif ${MK_LIBSOFT} != "no" && ${TARGET_ARCH} == "armv6"
 LIBCOMPAT= SOFT
 .include "Makefile.libcompat"
 .endif
 
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 IMAKEENV=	${CROSSENV}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
 		${IMAKE_INSTALL} ${IMAKE_MTREE}
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
 		LD_LIBRARY_PATH=${INSTALLTMP} \
 		PATH_LOCALE=${INSTALLTMP}/locale
 IMAKE+=		__MAKE_SHELL=${INSTALLTMP}/sh
 .else
 IMAKEENV+=	PATH=${TMPPATH}:${INSTALLTMP}
 .endif
 .if defined(DB_FROM_SRC)
 INSTALLFLAGS+=	-N ${.CURDIR}/etc
 MTREEFLAGS+=	-N ${.CURDIR}/etc
 .endif
 _INSTALL_DDIR=	${DESTDIR}/${DISTDIR}
 INSTALL_DDIR=	${_INSTALL_DDIR:S://:/:g:C:/$::}
 .if defined(NO_ROOT)
 METALOG?=	${DESTDIR}/${DISTDIR}/METALOG
 IMAKE+=		-DNO_ROOT METALOG=${METALOG}
 INSTALLFLAGS+=	-U -M ${METALOG} -D ${INSTALL_DDIR}
 MTREEFLAGS+=	-W
 .endif
 .if defined(BUILD_PKGS)
 INSTALLFLAGS+=	-h sha256
 .endif
 .if defined(DB_FROM_SRC) || defined(NO_ROOT)
 IMAKE_INSTALL=	INSTALL="install ${INSTALLFLAGS}"
 IMAKE_MTREE=	MTREE_CMD="mtree ${MTREEFLAGS}"
 .endif
 
 # kernel stage
 KMAKEENV=	${WMAKEENV}
 KMAKE=		${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME}
 
 #
 # buildworld
 #
 # Attempt to rebuild the entire system, with reasonable chance of
 # success, regardless of how old your existing system is.
 #
 _worldtmp: .PHONY
 .if ${.CURDIR:C/[^,]//g} != ""
 #	The m4 build of sendmail files doesn't like it if ',' is used
 #	anywhere in the path of it's files.
 	@echo
 	@echo "*** Error: path to source tree contains a comma ','"
 	@echo
 	false
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Rebuilding the temporary build tree"
 	@echo "--------------------------------------------------------------"
 .if !defined(NO_CLEAN)
 	rm -rf ${WORLDTMP}
 .if defined(LIBCOMPAT)
 	rm -rf ${LIBCOMPATTMP}
 .endif
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
 .endif
 .for _dir in \
     lib lib/casper usr legacy/bin legacy/usr
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${WORLDTMP}/legacy/usr >/dev/null
 .if ${MK_GROFF} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \
 	    -p ${WORLDTMP}/legacy/usr >/dev/null
 .endif
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${WORLDTMP}/legacy/usr/include >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${WORLDTMP}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${WORLDTMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 .if ${MK_DEBUG_FILES} != "no"
 	# We could instead disable debug files for these build stages
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/legacy/usr/lib >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/usr/lib >/dev/null
 .endif
 .if defined(LIBCOMPAT)
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${WORLDTMP}/usr >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${WORLDTMP}/legacy/usr/lib/debug/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null
 .endif
 .endif
 .if ${MK_TESTS} != "no"
 	mkdir -p ${WORLDTMP}${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
 	    -p ${WORLDTMP}${TESTSBASE} >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mkdir -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
 	    -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} >/dev/null
 .endif
 .endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
 .endfor
 _legacy:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1.1: legacy release compatibility shims"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${BMAKE} legacy
 _bootstrap-tools:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1.2: bootstrap tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
 _cleanobj:
 .if !defined(NO_CLEAN)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR}
 .if defined(LIBCOMPAT)
 	${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} -f Makefile.inc1 ${CLEANDIR}
 .endif
 .endif
 _obj:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.2: rebuilding the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} obj
 _build-tools:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${TMAKE} build-tools
 _cross-tools:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 3: cross tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
 	${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
 _includes:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.1: building includes"
 	@echo "--------------------------------------------------------------"
 # Special handling for SUBDIR_OVERRIDE in buildworld as they most likely need
 # headers from default SUBDIR.  Do SUBDIR_OVERRIDE includes last.
 	${_+_}cd ${.CURDIR}; ${WMAKE} SUBDIR_OVERRIDE= SHARED=symlinks \
 	    MK_INCLUDES=yes includes
 .if !empty(SUBDIR_OVERRIDE) && make(buildworld)
 	${_+_}cd ${.CURDIR}; ${WMAKE} MK_INCLUDES=yes SHARED=symlinks includes
 .endif
 _libraries:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.2: building libraries"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
 	    ${WMAKE} -DNO_FSCHG MK_HTML=no -DNO_LINT MK_MAN=no \
 	    MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} libraries
 everything: .PHONY
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.3: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all
 
 WMAKE_TGTS=
 WMAKE_TGTS+=	_worldtmp _legacy
 .if empty(SUBDIR_OVERRIDE)
 WMAKE_TGTS+=	_bootstrap-tools
 .endif
 WMAKE_TGTS+=	_cleanobj _obj _build-tools _cross-tools
 WMAKE_TGTS+=	_includes _libraries
 WMAKE_TGTS+=	everything
 .if defined(LIBCOMPAT) && empty(SUBDIR_OVERRIDE)
 WMAKE_TGTS+=	build${libcompat}
 .endif
 
 buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue .PHONY
 .ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
 
 buildworld_prologue: .PHONY
 	@echo "--------------------------------------------------------------"
 	@echo ">>> World build started on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 
 buildworld_epilogue: .PHONY
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> World build completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 
 #
 # We need to have this as a target because the indirection between Makefile
 # and Makefile.inc1 causes the correct PATH to be used, rather than a
 # modification of the current environment's PATH.  In addition, we need
 # to quote multiword values.
 #
 buildenvvars: .PHONY
 	@echo ${WMAKEENV:Q} ${.MAKE.EXPORTED:@v@$v=\"${$v}\"@}
 
 .if ${.TARGETS:Mbuildenv}
 .if ${.MAKEFLAGS:M-j}
 .error The buildenv target is incompatible with -j
 .endif
 .endif
 BUILDENV_DIR?=	${.CURDIR}
 buildenv: .PHONY
 	@echo Entering world for ${TARGET_ARCH}:${TARGET}
 .if ${BUILDENV_SHELL:M*zsh*}
 	@echo For ZSH you must run: export CPUTYPE=${TARGET_CPUTYPE}
 .endif
 	@cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \
 	    || true
 
 TOOLCHAIN_TGTS=	${WMAKE_TGTS:Neverything:Nbuild${libcompat}}
 toolchain: ${TOOLCHAIN_TGTS} .PHONY
 kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} .PHONY
 
 #
 # installcheck
 #
 # Checks to be sure system is ready for installworld/installkernel.
 #
 installcheck: _installcheck_world _installcheck_kernel .PHONY
 _installcheck_world: .PHONY
 _installcheck_kernel: .PHONY
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
 # using the user/group database in the source tree.
 #
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
     defined(DB_FROM_SRC)
 .if !make(distributeworld)
 _installcheck_world: __installcheck_DESTDIR
 _installcheck_kernel: __installcheck_DESTDIR
 __installcheck_DESTDIR: .PHONY
 .if !defined(DESTDIR) || empty(DESTDIR)
 	@echo "ERROR: Please set DESTDIR!"; \
 	false
 .endif
 .endif
 .endif
 
 .if !defined(DB_FROM_SRC)
 #
 # Check for missing UIDs/GIDs.
 #
 CHECK_UIDS=	auditdistd
 CHECK_GIDS=	audit
 .if ${MK_SENDMAIL} != "no"
 CHECK_UIDS+=	smmsp
 CHECK_GIDS+=	smmsp
 .endif
 .if ${MK_PF} != "no"
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
 .if ${MK_UNBOUND} != "no"
 CHECK_UIDS+=	unbound
 CHECK_GIDS+=	unbound
 .endif
 _installcheck_world: __installcheck_UGID
 __installcheck_UGID: .PHONY
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
 		false; \
 	fi
 .endfor
 .for gid in ${CHECK_GIDS}
 	@if ! `find / -prune -group ${gid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \
 		false; \
 	fi
 .endfor
 .endif
 
 #
 # Required install tools to be saved in a scratch dir for safety.
 #
 .if ${MK_ZONEINFO} != "no"
 _zoneinfo=	zic tzsetup
 .endif
 
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown cmp cp \
 	date echo egrep find grep id install ${_install-info} \
 	ln make mkdir mtree mv pwd_mkdb \
 	rm sed services_mkdb sh strip sysctl test true uname wc ${_zoneinfo} \
 	${LOCAL_ITOOLS}
 
 # Needed for share/man
 .if ${MK_MAN_UTILS} != "no"
 ITOOLS+=makewhatis
 .endif
 
 #
 # distributeworld
 #
 # Distributes everything compiled by a `buildworld'.
 #
 # installworld
 #
 # Installs everything compiled by a 'buildworld'.
 #
 
 # Non-base distributions produced by the base system
 EXTRA_DISTRIBUTIONS=	doc
 .if defined(LIBCOMPAT)
 EXTRA_DISTRIBUTIONS+=	lib${libcompat}
 .endif
 .if ${MK_TESTS} != "no"
 EXTRA_DISTRIBUTIONS+=	tests
 .endif
 
 DEBUG_DISTRIBUTIONS=
 .if ${MK_DEBUG_FILES} != "no"
 DEBUG_DISTRIBUTIONS+=	base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,}
 .endif
 
 MTREE_MAGIC?=	mtree 2.0
 
 distributeworld installworld stageworld: _installcheck_world .PHONY
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
 			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
 	    done); \
 	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
 	    while read line; do \
 		set -- $$line; \
 		if [ "$$2 $$3" != "not found" ]; then \
 			echo $$2; \
 		else \
 			echo "Required library $$1 not found." >&2; \
 			exit 1; \
 		fi; \
 	    done); \
 	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 .if defined(NO_ROOT)
 	-mkdir -p ${METALOG:H}
 	echo "#${MTREE_MAGIC}" > ${METALOG}
 .endif
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
 	-mkdir ${DESTDIR}/${DISTDIR}/${dist}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
 .endif
 .if defined(LIBCOMPAT)
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null
 .endif
 .endif
 .if ${MK_TESTS} != "no" && ${dist} == "tests"
 	-mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/${TESTSBASE} >/dev/null
 .endif
 .endif
 .if defined(NO_ROOT)
 	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
 	    sed -e 's#^\./#./${dist}/#' >> ${METALOG}
 	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \
 	    sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
 	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
 	    sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG}
 .if defined(LIBCOMPAT)
 	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist | \
 	    sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
 .endif
 .endif
 .endfor
 	-mkdir ${DESTDIR}/${DISTDIR}/base
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
 	    DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
 .endif
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
 	find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -type d -empty -delete
 .endfor
 .if defined(NO_ROOT)
 .for dist in base ${EXTRA_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
 	@# a line containing only the filename will sort immediately before
 	@# the relevant mtree line.
 	cd ${DESTDIR}/${DISTDIR}; \
 	find ./${dist} | sort -u ${METALOG} - | \
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.meta
 .endfor
 .for dist in ${DEBUG_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
 	@# a line containing only the filename will sort immediately before
 	@# the relevant mtree line.
 	cd ${DESTDIR}/${DISTDIR}; \
 	find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.debug.meta
 .endfor
 .endif
 .endif
 
 packageworld: .PHONY
 .for dist in base ${EXTRA_DISTRIBUTIONS}
 .if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvf - --exclude usr/lib/debug \
 	    @${DESTDIR}/${DISTDIR}/${dist}.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
 .else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvf - --exclude usr/lib/debug . | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
 .endif
 .endfor
 
 .for dist in ${DEBUG_DISTRIBUTIONS}
 . if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
 . else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvLf - usr/lib/debug | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
 . endif
 .endfor
 
 #
 # reinstall
 #
 # If you have a build server, you can NFS mount the source and obj directories
 # and do a 'make reinstall' on the *client* to install new binaries from the
 # most recent server build.
 #
 restage reinstall: .MAKE .PHONY
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Making hierarchy"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
 .if make(restage)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Making distribution"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} distribution
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
 .if defined(LIBCOMPAT)
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat}
 .endif
 
 redistribute: .MAKE .PHONY
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Distributing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
 .if defined(LIBCOMPAT)
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute${libcompat} \
 	    DISTRIBUTION=lib${libcompat}
 .endif
 
 distrib-dirs distribution: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 .if make(distribution)
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
 		METALOG=${METALOG} MK_TESTS=no installconfig
 .endif
 
 #
 # buildkernel and installkernel
 #
 # Which kernels to build and/or install is specified by setting
 # KERNCONF. If not defined a GENERIC kernel is built/installed.
 # Only the existing (depending TARGET) config files are used
 # for building kernels and only the first of these is designated
 # as the one being installed.
 #
 # Note that we have to use TARGET instead of TARGET_ARCH when
 # we're in kernel-land. Since only TARGET_ARCH is (expected) to
 # be set to cross-build, we have to make sure TARGET is set
 # properly.
 
 .if defined(KERNFAST)
 NO_KERNELCLEAN=	t
 NO_KERNELCONFIG=	t
 NO_KERNELOBJ=		t
 # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah
 .if !defined(KERNCONF) && ${KERNFAST} != "1"
 KERNCONF=${KERNFAST}
 .endif
 .endif
 .if ${TARGET_ARCH} == "powerpc64"
 KERNCONF?=	GENERIC64
 .else
 KERNCONF?=	GENERIC
 .endif
 INSTKERNNAME?=	kernel
 
 KERNSRCDIR?=	${.CURDIR}/sys
 KRNLCONFDIR=	${KERNSRCDIR}/${TARGET}/conf
 KRNLOBJDIR=	${OBJTREE}${KERNSRCDIR}
 KERNCONFDIR?=	${KRNLCONFDIR}
 
 BUILDKERNELS=
 INSTALLKERNEL=
 .if defined(NO_INSTALLKERNEL)
 # All of the BUILDKERNELS loops start at index 1.
 BUILDKERNELS+= dummy
 .endif
 .for _kernel in ${KERNCONF}
 .if exists(${KERNCONFDIR}/${_kernel})
 BUILDKERNELS+=	${_kernel}
 .if empty(INSTALLKERNEL) && !defined(NO_INSTALLKERNEL)
 INSTALLKERNEL= ${_kernel}
 .endif
 .endif
 .endfor
 
 ${WMAKE_TGTS:N_worldtmp:Nbuild${libcompat}} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY
 
 #
 # buildkernel
 #
 # Builds all kernels defined by BUILDKERNELS.
 #
 buildkernel: .MAKE .PHONY
 .if empty(BUILDKERNELS:Ndummy)
 	@echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \
 	false
 .endif
 	@echo
 .for _kernel in ${BUILDKERNELS:Ndummy}
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 	@echo "===> ${_kernel}"
 	mkdir -p ${KRNLOBJDIR}
 .if !defined(NO_KERNELCONFIG)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1: configuring the kernel"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLCONFDIR}; \
 		PATH=${TMPPATH} \
 		    config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
 			-I '${KERNCONFDIR}' '${KERNCONFDIR}/${_kernel}'
 .endif
 .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR}
 .endif
 .if !defined(NO_KERNELOBJ)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.2: rebuilding the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 3.1: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 .endfor
 
 NO_INSTALLEXTRAKERNELS?=	yes
 
 #
 # installkernel, etc.
 #
 # Install the kernel defined by INSTALLKERNEL
 #
 installkernel installkernel.debug \
 reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
 .if !defined(NO_INSTALLKERNEL)
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
 .endif
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing kernel ${INSTALLKERNEL}"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${CROSSENV} PATH=${TMPPATH} \
 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
 .endif
 .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing kernel ${_kernel}"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    ${CROSSENV} PATH=${TMPPATH} \
 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}.${_kernel} ${.TARGET:S/kernel//}
 .endfor
 .endif
 
 distributekernel distributekernel.debug: .PHONY
 .if !defined(NO_INSTALLKERNEL)
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
 .endif
 	mkdir -p ${DESTDIR}/${DISTDIR}
 .if defined(NO_ROOT)
 	@echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
 .endif
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
 	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
 	    DESTDIR=${INSTALL_DDIR}/kernel \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
 	@sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .endif
 .endif
 .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 .if defined(NO_ROOT)
 	@echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
 	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} \
 	    KERNEL=${INSTKERNNAME}.${_kernel} \
 	    DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
 	@sed -e "s|^./kernel.${_kernel}|.|" \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endif
 .endfor
 .endif
 
 packagekernel: .PHONY
 .if defined(NO_ROOT)
 .if !defined(NO_INSTALLKERNEL)
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - --exclude '*.debug' \
 	    @${DESTDIR}/${DISTDIR}/kernel.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .endif
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - --include '*/*/*.debug' \
 	    @${DESTDIR}/${DISTDIR}/kernel.meta | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
 .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - --exclude '*.debug' \
 	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - --include '*/*/*.debug' \
 	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz
 .endfor
 .endif
 .else
 .if !defined(NO_INSTALLKERNEL)
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - --exclude '*.debug' . | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .endif
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - --include '*/*/*.debug' $$(eval find .) | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
 .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - --exclude '*.debug' . | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - --include '*/*/*.debug' $$(eval find .) | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz
 .endfor
 .endif
 .endif
 
 stagekernel: .PHONY
 	${_+_}${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
 
 PORTSDIR?=	/usr/ports
 WSTAGEDIR?=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
 KSTAGEDIR?=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
 REPODIR?=	${MAKEOBJDIRPREFIX}${.CURDIR}/repo
 PKGSIGNKEY?=	# empty
 
 .ORDER:		stage-packages create-packages
 .ORDER:		create-packages create-world-packages
 .ORDER:		create-packages create-kernel-packages
 .ORDER:		create-packages sign-packages
 
 _pkgbootstrap: .PHONY
 .if !exists(${LOCALBASE}/sbin/pkg)
 	@env ASSUME_ALWAYS_YES=YES pkg bootstrap
 .endif
 
 packages: .PHONY
 	${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-packages
 
 package-pkg: .PHONY
 	rm -rf /tmp/ports.${TARGET} || :
 	env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \
 		PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \
 		WSTAGEDIR=${WSTAGEDIR} \
 		sh ${.CURDIR}/release/scripts/make-pkg-package.sh
 
 real-packages:	stage-packages create-packages sign-packages .PHONY
 
 stage-packages: .PHONY
 	@mkdir -p ${REPODIR} ${WSTAGEDIR} ${KSTAGEDIR}
 	${_+_}@cd ${.CURDIR}; \
 		${MAKE} DESTDIR=${WSTAGEDIR} -DNO_ROOT -B stageworld ; \
 		${MAKE} DESTDIR=${KSTAGEDIR} -DNO_ROOT -B stagekernel
 
 create-packages:	_pkgbootstrap .PHONY
 	@mkdir -p ${REPODIR}
 	${_+_}@cd ${.CURDIR}; \
 		${MAKE} DESTDIR=${WSTAGEDIR} \
 			PKG_VERSION=${PKG_VERSION} create-world-packages ; \
 		${MAKE} DESTDIR=${KSTAGEDIR} \
 			PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
 			create-kernel-packages
 
 create-world-packages:	_pkgbootstrap .PHONY
 	@rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || :
 	@cd ${WSTAGEDIR} ; \
 		awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		${WSTAGEDIR}/METALOG
 	@for plist in ${WSTAGEDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
 		pkgname=$${plist%.plist} ; \
 		sh ${SRCDIR}/release/packages/generate-ucl.sh -o $${pkgname} \
 			-s ${SRCDIR} -u ${WSTAGEDIR}/$${pkgname}.ucl ; \
 	done
 	@for plist in ${WSTAGEDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
 		pkgname=$${plist%.plist} ; \
 		awk -F\" ' \
 			/^name/ { printf("===> Creating %s-", $$2); next } \
 			/^version/ { print $$2; next } \
 			' ${WSTAGEDIR}/$${pkgname}.ucl ; \
 		${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
 			create -M ${WSTAGEDIR}/$${pkgname}.ucl \
 			-p ${WSTAGEDIR}/$${pkgname}.plist \
 			-r ${WSTAGEDIR} \
 			-o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} ; \
 	done
 
 create-kernel-packages:	_pkgbootstrap .PHONY
 .if exists(${KSTAGEDIR}/kernel.meta)
 .for flavor in "" -debug
 	@cd ${KSTAGEDIR}/${DISTDIR} ; \
 	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		-v kernel=yes -v _kernconf=${INSTALLKERNEL} \
 		${KSTAGEDIR}/kernel.meta ; \
 	cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
 	pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
 	sed -e "s/%VERSION%/${PKG_VERSION}/" \
 		-e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}${flavor}/" \
 		-e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
 		-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
 	awk -F\" ' \
 		/name/ { printf("===> Creating %s-", $$2); next } \
 		/version/ {print $$2; next } ' \
 		${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
 	${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
 		create -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
 		-p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
 		-r ${KSTAGEDIR}/${DISTDIR} \
 		-o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
 .endfor
 .endif
 .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 .if exists(${KSTAGEDIR}/kernel.${_kernel}.meta)
 .for flavor in "" -debug
 	@cd ${KSTAGEDIR}/kernel.${_kernel} ; \
 	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		-v kernel=yes -v _kernconf=${_kernel} \
 		${KSTAGEDIR}/kernel.${_kernel}.meta ; \
 	cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
 	pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
 	sed -e "s/%VERSION%/${PKG_VERSION}/" \
 		-e "s/%PKGNAME%/kernel-${_kernel:tl}${flavor}/" \
 		-e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
 		-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
 	awk -F\" ' \
 		/name/ { printf("===> Creating %s-", $$2); next } \
 		/version/ {print $$2; next } ' \
 		${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
 	${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
 		create -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \
 		-p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \
 		-r ${KSTAGEDIR}/kernel.${_kernel} \
 		-o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
 .endfor
 .endif
 .endfor
 .endif
 
 sign-packages:	_pkgbootstrap .PHONY
 	@[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \
 		unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest ; \
 	${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \
 		-o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \
 		${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \
 		${PKGSIGNKEY} ; \
 	ln -s ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \
 		${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest
 
 #
 #
 # checkworld
 #
 # Run test suite on installed world.
 #
 checkworld: .PHONY
 	@if [ ! -x ${LOCALBASE}/bin/kyua ]; then \
 		echo "You need kyua (devel/kyua) to run the test suite." | /usr/bin/fmt; \
 		exit 1; \
 	fi
 	${_+_}${LOCALBASE}/bin/kyua test -k ${TESTSBASE}/Kyuafile
 
 #
 #
 # doxygen
 #
 # Build the API documentation with doxygen
 #
 doxygen: .PHONY
 	@if [ ! -x ${LOCALBASE}/bin/doxygen ]; then \
 		echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
 		exit 1; \
 	fi
 	${_+_}cd ${.CURDIR}/tools/kerneldoc/subsys; ${MAKE} obj all
 
 #
 # update
 #
 # Update the source tree(s), by running svn/svnup to update to the
 # latest copy.
 #
 update: .PHONY
 .if defined(SVN_UPDATE)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} using Subversion"
 	@echo "--------------------------------------------------------------"
 	@(cd ${.CURDIR}; ${SVN} update ${SVNFLAGS})
 .endif
 
 #
 # ------------------------------------------------------------------------
 #
 # From here onwards are utility targets used by the 'make world' and
 # related targets.  If your 'world' breaks, you may like to try to fix
 # the problem and manually run the following targets to attempt to
 # complete the build.  Beware, this is *not* guaranteed to work, you
 # need to have a pretty good grip on the current state of the system
 # to attempt to manually finish it.  If in doubt, 'make world' again.
 #
 
 #
 # legacy: Build compatibility shims for the next three targets. This is a
 # minimal set of tools and shims necessary to compensate for older systems
 # which don't have the APIs required by the targets built in bootstrap-tools,
 # build-tools or cross-tools.
 #
 
 # ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
 # r296685 fix cross-endian objcopy
 .if ${BOOTSTRAPPING} < 1100102
 _elftoolchain_libs= lib/libelf lib/libdwarf
 .endif
 
 legacy: .PHONY
 # Temporary special case for automatically detecting the clang compiler issue
 # Note: 9.x didn't have FreeBSD_version bumps often enough, so you may need to
 # set BOOTSTRAPPING to 0 if you're stable/9 tree post-dates r286035 but is before
 # the version bump in r296219 (from July 29, 2015 -> Feb 29, 2016).
 .if ${BOOTSTRAPPING} != 0 && \
 	${WANT_COMPILER_TYPE} == "clang" && ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30601
 .if   ${BOOTSTRAPPING} > 10000000 && ${BOOTSTRAPPING} < 1002501
 	@echo "ERROR: Source upgrades from stable/10 prior to r286033 are not supported."; false
 .elif ${BOOTSTRAPPING} >  9000000 && ${BOOTSTRAPPING} <  903509
 	@echo "ERROR: Source upgrades from stable/9 prior to r286035 are not supported."; false
 .endif
 .endif
 .if ${BOOTSTRAPPING} < ${MINIMUM_SUPPORTED_OSREL} && ${BOOTSTRAPPING} != 0
 	@echo "ERROR: Source upgrades from versions prior to ${MINIMUM_SUPPORTED_REL} are not supported."; \
 	false
 .endif
 
 .for _tool in tools/build ${_elftoolchain_libs}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \
 	    cd ${.CURDIR}/${_tool}; \
 	    ${MAKE} DIRPRFX=${_tool}/ obj; \
 	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
 	    ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no all; \
 	    ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no \
 	        DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 .endfor
 
 #
 # bootstrap-tools: Build tools needed for compatibility. These are binaries that
 # are built to build other binaries in the system. However, the focus of these
 # binaries is usually quite narrow. Bootstrap tools use the host's compiler and
 # libraries, augmented by -legacy.
 #
 _bt=		_bootstrap-tools
 
 .if ${MK_GAMES} != "no"
 _strfile=	usr.bin/fortune/strfile
 .endif
 
 .if ${MK_GCC} != "no" && ${MK_CXX} != "no"
 _gperf=		gnu/usr.bin/gperf
 .endif
 
 .if ${MK_SHAREDOCS} != "no" && ${MK_GROFF} != "no"
 _groff=		gnu/usr.bin/groff \
 		usr.bin/soelim
 .endif
 
 .if ${MK_VT} != "no"
 _vtfontcvt=	usr.bin/vtfontcvt
 .endif
 
 .if ${BOOTSTRAPPING} < 1000033
 _libopenbsd=	lib/libopenbsd
 _m4=		usr.bin/m4
 _lex=		usr.bin/lex
 
 ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd
 ${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
 .endif
 
 .if ${BOOTSTRAPPING} < 1000026
 _nmtree=	lib/libnetbsd \
 		usr.sbin/nmtree
 
 ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd
 .endif
 
 .if ${BOOTSTRAPPING} < 1000027
 _cat=		bin/cat
 .endif
 
 # r277259 crunchide: Correct 64-bit section header offset
 # r281674 crunchide: always include both 32- and 64-bit ELF support
 .if ${BOOTSTRAPPING} < 1100078
 _crunchide=	usr.sbin/crunch/crunchide
 .endif
 
 # r285986 crunchen: use STRIPBIN rather than STRIP
 # 1100113: Support MK_AUTO_OBJ
 # 1200006: META_MODE fixes
 .if ${BOOTSTRAPPING} < 1100078 || \
     (${MK_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) || \
     (${MK_META_MODE} == "yes" && ${BOOTSTRAPPING} < 1200006)
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
 # r296926 -P keymap search path, MFC to stable/10 in r298297
 .if ${BOOTSTRAPPING} < 1003501 || \
 	(${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103)
 _kbdcontrol=	usr.sbin/kbdcontrol
 .endif
 
 _yacc=		lib/liby \
 		usr.bin/yacc
 
 ${_bt}-usr.bin/yacc: ${_bt}-lib/liby
 
 .if ${MK_BSNMP} != "no"
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 
 # We need to build tblgen when we're building clang either as
 # the bootstrap compiler, or as the part of the normal build.
 .if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmminimal \
 	usr.bin/clang/llvm-tblgen \
 	usr.bin/clang/clang-tblgen
 
 ${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/libllvmminimal
 ${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmminimal
 .endif
 
 # Default to building the GPL DTC, but build the BSDL one if users explicitly
 # request it.
 _dtc= usr.bin/dtc
 .if ${MK_GPL_DTC} != "no"
 _dtc= gnu/usr.bin/dtc
 .endif
 
 .if ${MK_KERBEROS} != "no"
 _kerberos5_bootstrap_tools= \
 	kerberos5/tools/make-roken \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
 	kerberos5/tools/asn1_compile \
 	kerberos5/tools/slc \
 	usr.bin/compile_et
 
 .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
 .endif
 
 # r283777 makewhatis(1) replaced with mandoc version which builds a database.
 .if ${MK_MANDOCDB} != "no" && ${BOOTSTRAPPING} < 1100075
 _libopenbsd?=	lib/libopenbsd
 _makewhatis=	lib/libsqlite3 \
 		usr.bin/mandoc
 ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libsqlite3
 .endif
 
 bootstrap-tools: .PHONY
 
 #	Please document (add comment) why something is in 'bootstrap-tools'.
 #	Try to bound the building of the bootstrap-tool to just the
 #	FreeBSD versions that need the tool built at this stage of the build.
 .for _tool in \
     ${_clang_tblgen} \
     ${_kerberos5_bootstrap_tools} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
     ${_dtc} \
     ${_cat} \
     ${_kbdcontrol} \
     usr.bin/lorder \
     ${_libopenbsd} \
     ${_makewhatis} \
     usr.bin/rpcgen \
     ${_yacc} \
     ${_m4} \
     ${_lex} \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
     ${_crunchide} \
     ${_crunchgen} \
     ${_nmtree} \
     ${_vtfontcvt} \
     usr.bin/localedef
 ${_bt}-${_tool}: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
 		${MAKE} DIRPRFX=${_tool}/ all; \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 
 bootstrap-tools: ${_bt}-${_tool}
 .endfor
 
 #
 # build-tools: Build special purpose build tools
 #
 .if !defined(NO_SHARE)
 _share=	share/syscons/scrnmaps
 .endif
 
 .if ${MK_GCC} != "no"
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
 .if ${MK_RESCUE} != "no"
 # rescue includes programs that have build-tools targets
 _rescue=rescue/rescue
 .endif
 
 .for _tool in \
     bin/csh \
     bin/sh \
     ${LOCAL_TOOL_DIRS} \
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
     ${_rescue} \
     ${_share} \
     usr.bin/awk \
     lib/libmagic \
     usr.bin/mkesdb_static \
     usr.bin/mkcsmapper_static \
     usr.bin/vi/catalog
 build-tools_${_tool}: .PHONY
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
 		${MAKE} DIRPRFX=${_tool}/ build-tools
 build-tools: build-tools_${_tool}
 .endfor
 .for _tool in \
     ${_gcc_tools}
 build-tools_${_tool}: .PHONY
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,all)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
 		${MAKE} DIRPRFX=${_tool}/ all
 build-tools: build-tools_${_tool}
 .endfor
 
 #
 # kernel-tools: Build kernel-building tools
 #
 kernel-tools: .PHONY
 	mkdir -p ${MAKEOBJDIRPREFIX}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
 
 #
 # cross-tools: All the tools needed to build the rest of the system after
 # we get done with the earlier stages. It is the last set of tools needed
 # to begin building the target binaries.
 #
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif
 .endif
 
 # Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures
 # resulting from missing bug fixes or ELF Toolchain updates.
 .if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/lib/libctf cddl/usr.bin/ctfconvert \
     cddl/usr.bin/ctfmerge
 .endif
 
 # If we're given an XAS, don't build binutils.
 .if ${XAS:M/*} == ""
 .if ${MK_BINUTILS_BOOTSTRAP} != "no"
 _binutils=	gnu/usr.bin/binutils
 .endif
 .if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 _elftctools=	lib/libelftc \
 		lib/libpe \
 		usr.bin/elfcopy \
 		usr.bin/nm \
 		usr.bin/size \
 		usr.bin/strings
 # These are not required by the build, but can be useful for developers who
 # cross-build on a FreeBSD 10 host:
 _elftctools+=	usr.bin/addr2line
 .endif
 .elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 # If cross-building with an external binutils we still need to build strip for
 # the target (for at least crunchide).
 _elftctools=	lib/libelftc \
 		lib/libpe \
 		usr.bin/elfcopy
 .endif
 
 .if ${MK_CLANG_BOOTSTRAP} != "no"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
 .endif
 .if ${MK_GCC_BOOTSTRAP} != "no"
 _cc=		gnu/usr.bin/cc
 .endif
 .if ${MK_USB} != "no"
 _usb_tools=	sys/boot/usb/tools
 .endif
 
 cross-tools: .MAKE .PHONY
 .for _tool in \
     ${LOCAL_XTOOL_DIRS} \
     ${_clang_libs} \
     ${_clang} \
     ${_binutils} \
     ${_elftctools} \
     ${_dtrace_tools} \
     ${_cc} \
     ${_btxld} \
     ${_usb_tools}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
 		${MAKE} DIRPRFX=${_tool}/ all; \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
 .endfor
 
 NXBDESTDIR=	${OBJTREE}/nxb-bin
 NXBENV=		MAKEOBJDIRPREFIX=${OBJTREE}/nxb \
 		TOOLS_PREFIX= \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin
 NXBMAKE=	${NXBENV} ${MAKE} \
 		LLVM_TBLGEN=${NXBDESTDIR}/usr/bin/llvm-tblgen \
 		CLANG_TBLGEN=${NXBDESTDIR}/usr/bin/clang-tblgen \
 		MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
 		MK_GDB=no MK_TESTS=no \
 		SSP_CFLAGS= \
 		MK_HTML=no NO_LINT=yes MK_MAN=no \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
 		MK_LLDB=no MK_DEBUG_FILES=no
 
 # native-xtools is the current target for qemu-user cross builds of ports
 # via poudriere and the imgact_binmisc kernel module.
 # For non-clang enabled targets that are still using the in tree gcc
 # we must build a gperf binary for one instance of its Makefiles.  On
 # clang-enabled systems, the gperf binary is obsolete.
 native-xtools: .PHONY
 .if ${MK_GCC_BOOTSTRAP} != "no"
 	mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin
 	${_+_}@${ECHODIR} "===> ${_gperf} (obj,all,install)"; \
 	cd ${.CURDIR}/${_gperf}; \
 	${NXBMAKE} DIRPRFX=${_gperf}/ obj; \
 	${NXBMAKE} DIRPRFX=${_gperf}/ all; \
 	${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install
 .endif
 	mkdir -p ${NXBDESTDIR}/bin ${NXBDESTDIR}/sbin ${NXBDESTDIR}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${NXBDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${NXBDESTDIR}/usr/include >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${NXBDESTDIR}/usr/lib >/dev/null
 .endif
 .for _tool in \
     bin/cat \
     bin/chmod \
     bin/cp \
     bin/csh \
     bin/echo \
     bin/expr \
     bin/hostname \
     bin/ln \
     bin/ls \
     bin/mkdir \
     bin/mv \
     bin/ps \
     bin/realpath \
     bin/rm \
     bin/rmdir \
     bin/sh \
     bin/sleep \
     ${_clang_tblgen} \
     usr.bin/ar \
     ${_binutils} \
     ${_elftctools} \
     ${_cc} \
     ${_gcc_tools} \
     ${_clang_libs} \
     ${_clang} \
     sbin/md5 \
     sbin/sysctl \
     gnu/usr.bin/diff \
     usr.bin/awk \
     usr.bin/basename \
     usr.bin/bmake \
     usr.bin/bzip2 \
     usr.bin/cmp \
     usr.bin/dirname \
     usr.bin/env \
     usr.bin/fetch \
     usr.bin/find \
     usr.bin/grep \
     usr.bin/gzip \
     usr.bin/id \
     usr.bin/lex \
     usr.bin/limits \
     usr.bin/lorder \
     usr.bin/mktemp \
     usr.bin/mt \
     usr.bin/patch \
     usr.bin/sed \
     usr.bin/sort \
     usr.bin/tar \
     usr.bin/touch \
     usr.bin/tr \
     usr.bin/true \
     usr.bin/uniq \
     usr.bin/unzip \
     usr.bin/xargs \
     usr.bin/xinstall \
     usr.bin/xz \
     usr.bin/yacc \
     usr.sbin/chown
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${NXBMAKE} DIRPRFX=${_tool}/ obj; \
 		${NXBMAKE} DIRPRFX=${_tool}/ all; \
 		${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${NXBDESTDIR} install
 .endfor
 
 #
 # hierarchy - ensure that all the needed directories are present
 #
 hierarchy hier: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${HMAKE} distrib-dirs
 
 #
 # libraries - build all libraries, and install them under ${DESTDIR}.
 #
 # The list of libraries with dependents (${_prebuild_libs}) and their
 # interdependencies (__L) are built automatically by the
 # ${.CURDIR}/tools/make_libdeps.sh script.
 #
 libraries: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}; \
 	    ${MAKE} -f Makefile.inc1 _prereq_libs; \
 	    ${MAKE} -f Makefile.inc1 _startup_libs; \
 	    ${MAKE} -f Makefile.inc1 _prebuild_libs; \
 	    ${MAKE} -f Makefile.inc1 _generic_libs
 
 #
 # static libgcc.a prerequisite for shared libc
 #
 _prereq_libs= lib/libcompiler_rt
 .if ${MK_SSP} != "no"
 _prereq_libs+= gnu/lib/libssp/libssp_nonshared
 .endif
 
 # These dependencies are not automatically generated:
 #
 # gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before
 # all shared libraries for ELF.
 #
 _startup_libs=	gnu/lib/csu
 _startup_libs+=	lib/csu
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
 _startup_libs+=	lib/libc_nonshared
 .if ${MK_LIBCPLUSPLUS} != "no"
 _startup_libs+=	lib/libcxxrt
 .endif
 
 .if ${MK_LLVM_LIBUNWIND} != "no"
 _prereq_libs+=	lib/libgcc_eh lib/libgcc_s
 _startup_libs+=	lib/libgcc_eh lib/libgcc_s
 
 lib/libgcc_s__L: lib/libc__L
 lib/libgcc_s__L: lib/libc_nonshared__L
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libcxxrt__L: lib/libgcc_s__L
 .endif
 
 .else # MK_LLVM_LIBUNWIND == no
 
 _prereq_libs+=	gnu/lib/libgcc
 _startup_libs+=	gnu/lib/libgcc
 
 gnu/lib/libgcc__L: lib/libc__L
 gnu/lib/libgcc__L: lib/libc_nonshared__L
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libcxxrt__L: gnu/lib/libgcc__L
 .endif
 .endif
 
 _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		${_kerberos5_lib_libhdb} \
 		${_kerberos5_lib_libheimbase} \
 		${_kerberos5_lib_libheimntlm} \
 		${_libsqlite3} \
 		${_kerberos5_lib_libheimipcc} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		${_kerberos5_lib_libwind} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
 		lib/libfigpar \
 		${_lib_libgssapi} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \
 		${_lib_casper} \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam/libpam ${_lib_libthr} \
 		${_lib_libradius} lib/libsbuf lib/libtacplus \
 		lib/libgeom \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libuutil} \
 		${_cddl_lib_libavl} \
 		${_cddl_lib_libzfs_core} \
 		${_cddl_lib_libctf} \
 		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
 
 .if ${MK_GNUCXX} != "no"
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
 gnu/lib/libstdc++__L: lib/msun__L
 gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
 .endif
 
 .if ${MK_DIALOG} != "no"
 _prebuild_libs+= gnu/lib/libdialog
 gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
 .endif
 
 .if ${MK_LIBCPLUSPLUS} != "no"
 _prebuild_libs+= lib/libc++
 .endif
 
 lib/libgeom__L: lib/libexpat__L
 lib/libkvm__L: lib/libelf__L
 
 .if ${MK_LIBTHR} != "no"
 _lib_libthr=	lib/libthr
 .endif
 
 .if ${MK_RADIUS_SUPPORT} != "no"
 _lib_libradius=	lib/libradius
 .endif
 
 .if ${MK_OFED} != "no"
 _ofed_lib=		contrib/ofed/usr.lib
 _prebuild_libs+=	contrib/ofed/usr.lib/libosmcomp
 _prebuild_libs+=	contrib/ofed/usr.lib/libopensm
 _prebuild_libs+=	contrib/ofed/usr.lib/libibcommon
 _prebuild_libs+=	contrib/ofed/usr.lib/libibverbs
 _prebuild_libs+=	contrib/ofed/usr.lib/libibumad
 
 contrib/ofed/usr.lib/libopensm__L: lib/libthr__L
 contrib/ofed/usr.lib/libosmcomp__L: lib/libthr__L
 contrib/ofed/usr.lib/libibumad__L: contrib/ofed/usr.lib/libibcommon__L
 .endif
 
 .if ${MK_CASPER} != "no"
 _lib_casper=	lib/libcasper
 .endif
 
 lib/libpjdlog__L: lib/libutil__L
 lib/libcasper__L: lib/libnv__L
 lib/liblzma__L: lib/libthr__L
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile) && empty(_generic_libs:M${_DIR})
 _generic_libs+= ${_DIR}
 .endif
 .endfor
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
 .if ${MK_CDDL} != "no"
 _cddl_lib_libumem= cddl/lib/libumem
 _cddl_lib_libnvpair= cddl/lib/libnvpair
 _cddl_lib_libavl= cddl/lib/libavl
 _cddl_lib_libuutil= cddl/lib/libuutil
 _cddl_lib_libzfs_core= cddl/lib/libzfs_core
 _cddl_lib_libctf= cddl/lib/libctf
 _cddl_lib= cddl/lib
 cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
 cddl/lib/libzfs__L: lib/libgeom__L
 cddl/lib/libctf__L: lib/libz__L
 .endif
 # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built
 # on select architectures though (see cddl/lib/Makefile)
 .if ${MACHINE_CPUARCH} != "sparc64"
 _prebuild_libs+=	lib/libprocstat lib/libproc lib/librtld_db
 lib/libprocstat__L: lib/libelf__L lib/libkvm__L lib/libutil__L
 lib/libproc__L: lib/libprocstat__L
 lib/librtld_db__L: lib/libprocstat__L
 .endif
 
 .if ${MK_CRYPT} != "no"
 .if ${MK_OPENSSL} != "no"
 _secure_lib_libcrypto= secure/lib/libcrypto
 _secure_lib_libssl= secure/lib/libssl
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
 .if ${MK_LDNS} != "no"
 _lib_libldns= lib/libldns
 lib/libldns__L: secure/lib/libcrypto__L
 .endif
 .if ${MK_OPENSSH} != "no"
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_LDNS} != "no"
 secure/lib/libssh__L: lib/libldns__L
 .endif
 .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libmd__L kerberos5/lib/libroken__L
 .endif
 .endif
 .endif
 _secure_lib=	secure/lib
 .endif
 
 .if ${MK_KERBEROS} != "no"
 kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
 kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
     kerberos5/lib/libwind__L lib/libsqlite3__L
 kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     secure/lib/libcrypto__L kerberos5/lib/libroken__L kerberos5/lib/libwind__L
 kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \
     kerberos5/lib/libroken__L kerberos5/lib/libwind__L \
     kerberos5/lib/libheimbase__L kerberos5/lib/libheimipcc__L
 kerberos5/lib/libroken__L: lib/libcrypt__L
 kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libheimbase__L: lib/libthr__L
 kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
 .endif
 
 lib/libsqlite3__L: lib/libthr__L
 
 .if ${MK_GSSAPI} != "no"
 _lib_libgssapi=	lib/libgssapi
 .endif
 
 .if ${MK_KERBEROS} != "no"
 _kerberos5_lib=	kerberos5/lib
 _kerberos5_lib_libasn1= kerberos5/lib/libasn1
 _kerberos5_lib_libhdb= kerberos5/lib/libhdb
 _kerberos5_lib_libheimbase= kerberos5/lib/libheimbase
 _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
 _kerberos5_lib_libhx509= kerberos5/lib/libhx509
 _kerberos5_lib_libroken= kerberos5/lib/libroken
 _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
 _libsqlite3= lib/libsqlite3
 _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
 _kerberos5_lib_libwind= kerberos5/lib/libwind
 _libcom_err= lib/libcom_err
 .endif
 
 .if ${MK_NIS} != "no"
 _lib_libypclnt=	lib/libypclnt
 .endif
 
 .if ${MK_OPENSSL} == "no"
 lib/libradius__L: lib/libmd__L
 .endif
 
 lib/libproc__L: \
     ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__L
 .if ${MK_CXX} != "no"
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libproc__L: lib/libcxxrt__L
 .else # This implies MK_GNUCXX != "no"; see lib/libproc
 lib/libproc__L: gnu/lib/libsupc++__L
 .endif
 .endif
 
 .for _lib in ${_prereq_libs}
 ${_lib}__PL: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \
 		cd ${.CURDIR}/${_lib}; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \
 		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ all; \
 		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
 .for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs}
 ${_lib}__L: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \
 		cd ${.CURDIR}/${_lib}; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}
 _prebuild_libs: ${_prebuild_libs:S/$/__L/}
 _generic_libs: ${_generic_libs:S/$/__L/}
 
 # Enable SUBDIR_PARALLEL when not calling 'make all', unless called from
 # 'everything' with _PARALLEL_SUBDIR_OK set.  This is because it is unlikely
 # that running 'make all' from the top-level, especially with a SUBDIR_OVERRIDE
 # or LOCAL_DIRS set, will have a reliable build if SUBDIRs are built in
 # parallel.  This is safe for the world stage of buildworld though since it has
 # already built libraries in a proper order and installed includes into
 # WORLDTMP. Special handling is done for SUBDIR ordering for 'install*' to
 # avoid trashing a system if it crashes mid-install.
 .if !make(all) || defined(_PARALLEL_SUBDIR_OK)
 SUBDIR_PARALLEL=
 .endif
 
 .include <bsd.subdir.mk>
 
 .if make(check-old) || make(check-old-dirs) || \
     make(check-old-files) || make(check-old-libs) || \
     make(delete-old) || make(delete-old-dirs) || \
     make(delete-old-files) || make(delete-old-libs)
 
 #
 # check for / delete old files section
 #
 
 .include "ObsoleteFiles.inc"
 
 OLD_LIBS_MESSAGE="Please be sure no application still uses those libraries, \
 else you can not start such an application. Consult UPDATING for more \
 information regarding how to cope with the removal/revision bump of a \
 specific library."
 
 .if !defined(BATCH_DELETE_OLD_FILES)
 RM_I=-i
 .else
 RM_I=-v
 .endif
 
 delete-old-files: .PHONY
 	@echo ">>> Removing old files (only deletes safe to delete libs)"
 # Ask for every old file if the user really wants to remove it.
 # It's annoying, but better safe than sorry.
 # NB: We cannot pass the list of OLD_FILES as a parameter because the
 # argument list will get too long. Using .for/.endfor make "loops" will make
 # the Makefile parser segfault.
 	@exec 3<&0; \
 	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
 		fi; \
 		for ext in debug symbols; do \
 		  if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \
 		      "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
 			  rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \
 			      <&3; \
 		  fi; \
 		done; \
 	done
 # Remove catpages without corresponding manpages.
 	@exec 3<&0; \
 	find ${DESTDIR}/usr/share/man/cat* ! -type d | \
 	sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
 	while read catpage; do \
 		read manpage; \
 		if [ ! -e "$${manpage}" ]; then \
 			rm ${RM_I} $${catpage} <&3; \
 	        fi; \
 	done
 	@echo ">>> Old files removed"
 
 check-old-files: .PHONY
 	@echo ">>> Checking for old files"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 		 	echo "${DESTDIR}/$${file}"; \
 		fi; \
 		for ext in debug symbols; do \
 		  if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
 			  echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \
 		  fi; \
 		done; \
 	done
 # Check for catpages without corresponding manpages.
 	@find ${DESTDIR}/usr/share/man/cat* ! -type d | \
 	sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
 	while read catpage; do \
 		read manpage; \
 		if [ ! -e "$${manpage}" ]; then \
 			echo $${catpage}; \
 	        fi; \
 	done
 
 delete-old-libs: .PHONY
 	@echo ">>> Removing old libraries"
 	@echo "${OLD_LIBS_MESSAGE}" | fmt
 	@exec 3<&0; \
 	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
 		fi; \
 		for ext in debug symbols; do \
 		  if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \
 		      "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
 			  rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \
 			      <&3; \
 		  fi; \
 		done; \
 	done
 	@echo ">>> Old libraries removed"
 
 check-old-libs: .PHONY
 	@echo ">>> Checking for old libraries"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			echo "${DESTDIR}/$${file}"; \
 		fi; \
 		for ext in debug symbols; do \
 		  if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
 			  echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \
 		  fi; \
 		done; \
 	done
 
 delete-old-dirs: .PHONY
 	@echo ">>> Removing old directories"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | sort -r | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
 			rmdir -v "${DESTDIR}/$${dir}" || true; \
 		elif [ -L "${DESTDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \
 		fi; \
 		if [ -d "${DESTDIR}${DEBUGDIR}/$${dir}" ]; then \
 			rmdir -v "${DESTDIR}${DEBUGDIR}/$${dir}" || true; \
 		elif [ -L "${DESTDIR}${DEBUGDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}${DEBUGDIR}/$${dir} is a link, please remove everything manually."; \
 		fi; \
 	done
 	@echo ">>> Old directories removed"
 
 check-old-dirs: .PHONY
 	@echo ">>> Checking for old directories"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}/$${dir}"; \
 		elif [ -L "${DESTDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \
 		fi; \
 		if [ -d "${DESTDIR}${DEBUGDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}${DEBUGDIR}/$${dir}"; \
 		elif [ -L "${DESTDIR}${DEBUGDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}${DEBUGDIR}/$${dir} is a link, please remove everything manually."; \
 		fi; \
 	done
 
 delete-old: delete-old-files delete-old-dirs .PHONY
 	@echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'."
 
 check-old: check-old-files check-old-libs check-old-dirs .PHONY
 	@echo "To remove old files and directories run '${MAKE_CMD} delete-old'."
 	@echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'."
 
 .endif
 
 #
 # showconfig - show build configuration.
 #
 showconfig: .PHONY
 	@(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \
 	  ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u
 
 .if !empty(KRNLOBJDIR) && !empty(KERNCONF)
 DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
 
 .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
 .if exists(${KERNCONFDIR}/${KERNCONF})
 FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
 	'${KERNCONFDIR}/${KERNCONF}' ; echo
 .endif
 .endif
 
 .endif
 
 .if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
 DTBOUTPUTPATH= ${.CURDIR}
 .endif
 
 #
 # Build 'standalone' Device Tree Blob
 #
 builddtb: .PHONY
 	@PATH=${TMPPATH} MACHINE=${TARGET} \
 	${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \
 	    "${FDT_DTS_FILE}" ${DTBOUTPUTPATH}
 
 ###############
 
 # cleanworld
 # In the following, the first 'rm' in a series will usually remove all
 # files and directories.  If it does not, then there are probably some
 # files with file flags set, so this unsets them and tries the 'rm' a
 # second time.  There are situations where this target will be cleaning
 # some directories via more than one method, but that duplication is
 # needed to correctly handle all the possible situations.  Removing all
 # files without file flags set in the first 'rm' instance saves time,
 # because 'chflags' will need to operate on fewer files afterwards.
 #
 # It is expected that BW_CANONICALOBJDIR == the CANONICALOBJDIR as would be
 # created by bsd.obj.mk, except that we don't want to .include that file
 # in this makefile.
 #
 BW_CANONICALOBJDIR:=${OBJTREE}${.CURDIR}
 cleanworld: .PHONY
 .if exists(${BW_CANONICALOBJDIR}/)
 	-rm -rf ${BW_CANONICALOBJDIR}/*
 	-chflags -R 0 ${BW_CANONICALOBJDIR}
 	rm -rf ${BW_CANONICALOBJDIR}/*
 .endif
 .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
 	#   To be safe in this case, fall back to a 'make cleandir'
 	${_+_}@cd ${.CURDIR}; ${MAKE} cleandir
 .endif
 
 .if defined(TARGET) && defined(TARGET_ARCH)
 
 .if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH}
 XDEV_CPUTYPE?=${CPUTYPE}
 .else
 XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif
 
 NOFUN=-DNO_FSCHG MK_HTML=no -DNO_LINT \
 	MK_MAN=no MK_NLS=no MK_PROFILE=no \
 	MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WARNS=no \
 	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
 
 XDDIR=${TARGET_ARCH}-freebsd
 XDTP?=/usr/${XDDIR}
 .if ${XDTP:N/*}
 .error XDTP variable should be an absolute path
 .endif
 
 CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
 	INSTALL="sh ${.CURDIR}/tools/install.sh"
 CDENV= ${CDBENV} \
 	TOOLS_PREFIX=${XDTP}
 CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \
 	--sysroot=${XDDESTDIR}/ -B${XDDESTDIR}/usr/libexec \
 	-B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib
 CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \
 	CPP="${CPP} ${CD2CFLAGS}" \
 	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}
 
 CDTMP=	${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
 CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
 CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
 XDDESTDIR=${DESTDIR}/${XDTP}
 .if !defined(OSREL)
 OSREL!= uname -r | sed -e 's/[-(].*//'
 .endif
 
 .ORDER: xdev-build xdev-install xdev-links
 xdev: xdev-build xdev-install .PHONY
 
 .ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools
 xdev-build: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools .PHONY
 
 _xb-worldtmp: .PHONY
 	mkdir -p ${CDTMP}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${CDTMP}/usr >/dev/null
 
 _xb-bootstrap-tools: .PHONY
 .for _tool in \
     ${_clang_tblgen} \
     ${_gperf}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ obj; \
 	${CDMAKE} DIRPRFX=${_tool}/ all; \
 	${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install
 .endfor
 
 _xb-build-tools: .PHONY
 	${_+_}@cd ${.CURDIR}; \
 	${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
 
 _xb-cross-tools: .PHONY
 .for _tool in \
     ${_binutils} \
     ${_elftctools} \
     usr.bin/ar \
     ${_clang_libs} \
     ${_clang} \
     ${_cc}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,all)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ obj; \
 	${CDMAKE} DIRPRFX=${_tool}/ all
 .endfor
 
 _xi-mtree: .PHONY
 	${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}"
 	mkdir -p ${XDDESTDIR}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
 	    -p ${XDDESTDIR} >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${XDDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${XDDESTDIR}/usr/include >/dev/null
 .if defined(LIBCOMPAT)
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${XDDESTDIR}/usr >/dev/null
 .endif
 .if ${MK_TESTS} != "no"
 	mkdir -p ${XDDESTDIR}${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
 	    -p ${XDDESTDIR}${TESTSBASE} >/dev/null
 .endif
 
 .ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
 xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries .PHONY
 
 _xi-cross-tools: .PHONY
 	@echo "_xi-cross-tools"
 .for _tool in \
     ${_binutils} \
     ${_elftctools} \
     usr.bin/ar \
     ${_clang_libs} \
     ${_clang} \
     ${_cc}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
 .endfor
 
 _xi-includes: .PHONY
 	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 includes \
 		DESTDIR=${XDDESTDIR}
 
 _xi-libraries: .PHONY
 	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \
 		DESTDIR=${XDDESTDIR}
 
 xdev-links: .PHONY
 	${_+_}cd ${XDDESTDIR}/usr/bin; \
 	mkdir -p ../../../../usr/bin; \
 		for i in *; do \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}-$$i; \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
 		done
 .else
 xdev xdev-build xdev-install xdev-links: .PHONY
 	@echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${.TARGET}\" target"
 .endif
Index: projects/bsnmp-ipv6-mib/Makefile.libcompat
===================================================================
--- projects/bsnmp-ipv6-mib/Makefile.libcompat	(revision 311636)
+++ projects/bsnmp-ipv6-mib/Makefile.libcompat	(revision 311637)
@@ -1,184 +1,200 @@
 # $FreeBSD$
 
 .if !targets(__<${_this:T}>__)
 __<${_this:T}>__:
 
 # Makefile for the compatibility libraries.
-# - 32-bit compat libraries on PowerPC and AMD64.
-#   could also be for mips, but that doesn't work today.
+# - 32-bit compat libraries on MIPS, PowerPC, and AMD64.
 
 # -------------------------------------------------------------------
 # 32 bit world
 .if ${TARGET_ARCH} == "amd64"
 .if empty(TARGET_CPUTYPE)
 LIB32CPUFLAGS=	-march=i686 -mmmx -msse -msse2
 .else
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
+LIB32CPUFLAGS+=	-m32
 LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
 		MACHINE_CPU="i686 mmx sse sse2"
 LIB32WMAKEFLAGS=	\
 		AS="${XAS} --32" \
 		LD="${XLD} -m elf_i386_fbsd -L${LIBCOMPATTMP}/usr/lib32" \
 		OBJCOPY="${XOBJCOPY}"
 
 .elif ${TARGET_ARCH} == "powerpc64"
 .if empty(TARGET_CPUTYPE)
 LIB32CPUFLAGS=	-mcpu=powerpc
 .else
 LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
 .endif
+LIB32CPUFLAGS+=	-m32
 LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
 LIB32WMAKEFLAGS=	\
 		LD="${XLD} -m elf32ppc_fbsd" \
 		OBJCOPY="${XOBJCOPY}"
+
+.elif ${TARGET_ARCH:Mmips64*} != ""
+.if empty(TARGET_CPUTYPE)
+LIB32CPUFLAGS=	-march=mips3
+.else
+LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
+LIB32CPUFLAGS+= -mabi=32
+LIB32WMAKEENV=	MACHINE=mips MACHINE_ARCH=mips
+.if ${TARGET_ARCH:Mmips64el*} != ""
+LIB32WMAKEFLAGS= LD="${XLD} -m elf32ltsmip_fbsd"
+.else
+LIB32WMAKEFLAGS= LD="${XLD} -m elf32btsmip_fbsd"
+.endif
+LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}"
+.endif
 
 
-LIB32CFLAGS=	-m32 -DCOMPAT_32BIT
+LIB32CFLAGS=	-DCOMPAT_32BIT
 LIB32DTRACE=	${DTRACE} -32
 LIB32WMAKEFLAGS+=	-DCOMPAT_32BIT
 
 # -------------------------------------------------------------------
 # soft-fp world
 .if ${TARGET_ARCH} == "armv6"
 LIBSOFTCFLAGS=        -DCOMPAT_SOFTFP
 LIBSOFTCPUFLAGS= -mfloat-abi=softfp
 LIBSOFTWMAKEENV= CPUTYPE=soft MACHINE=arm MACHINE_ARCH=armv6
 LIBSOFTWMAKEFLAGS=        -DCOMPAT_SOFTFP
 .endif
 
 # -------------------------------------------------------------------
 # Generic code for each type.
 # Set defaults based on type.
 libcompat=	${LIBCOMPAT:tl}
 _LIBCOMPAT_MAKEVARS=	_OBJTREE TMP CPUFLAGS CFLAGS CXXFLAGS WMAKEENV \
 			WMAKEFLAGS WMAKE
 .for _var in ${_LIBCOMPAT_MAKEVARS}
 .if !empty(LIB${LIBCOMPAT}${_var})
 LIBCOMPAT${_var}?=	${LIB${LIBCOMPAT}${_var}}
 .endif
 .endfor
 
 # Shared flags
 LIBCOMPAT_OBJTREE?=	${OBJTREE}${.CURDIR}/world${libcompat}
 LIBCOMPATTMP?=		${OBJTREE}${.CURDIR}/lib${libcompat}
 
 LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
 			-L${LIBCOMPATTMP}/usr/lib${libcompat} \
 			--sysroot=${LIBCOMPATTMP} \
 			${BFLAGS}
 
 # -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for
 # Clang/GCC.
 LIBCOMPATCFLAGS+=	-B${LIBCOMPATTMP}/usr/lib${libcompat}
 
 .if ${WANT_COMPILER_TYPE} == gcc || \
     (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
 # GCC requires -isystem when using a cross-compiler and --sysroot.  Note that
 # Makefile.inc1 only applies this with an external compiler but libcompat
 # always does since even in-tree GCC 4.2 needs this to override the built-in
 # sysroot path which --sysroot does not actually do for headers.
 LIBCOMPATCFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include
 # Force using libc++ for external GCC.
 # XXX: This should be checking MK_GNUCXX == no
 .if ${X_COMPILER_VERSION} >= 40800 && \
     (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
 LIBCOMPATCXXFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
 			-nostdinc++
 .endif
 .endif
 
 # Yes, the flags are redundant.
 LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		LIBDIR=/usr/lib${libcompat} \
 		SHLIBDIR=/usr/lib${libcompat} \
 		DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}"
 .if ${MK_META_MODE} != "no"
 # Don't rebuild build-tools targets during normal build.
 LIBCOMPATWMAKEENV+=	BUILD_TOOLS_META=.NOMETA_CMP
 .endif
 LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
 		CXX="${XCXX} ${LIBCOMPATCXXFLAGS} ${LIBCOMPATCFLAGS}" \
 		CPP="${XCPP} ${LIBCOMPATCFLAGS}" \
 		DESTDIR=${LIBCOMPATTMP} \
 		-DNO_CPU_CFLAGS \
 		MK_CTF=no \
 		-DNO_LINT \
 		MK_TESTS=no
 LIBCOMPATWMAKE+=	${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
 			MK_MAN=no MK_HTML=no
 LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
 			MK_TOOLCHAIN=no ${IMAKE_INSTALL} \
 			-DLIBRARIES_ONLY
 
 _LC_LIBDIRS.yes=		lib gnu/lib
 _LC_LIBDIRS.${MK_CDDL:tl}+=	cddl/lib
 _LC_LIBDIRS.${MK_CRYPT:tl}+=	secure/lib
 _LC_LIBDIRS.${MK_KERBEROS:tl}+=	kerberos5/lib
 
 _LC_INCDIRS=	\
 		include \
 		lib/ncurses/ncursesw \
 		${_LC_LIBDIRS.yes}
 
 # Shared logic
 build${libcompat}: .PHONY
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 5.1: building lib${libcompat} shim libraries"
 	@echo "--------------------------------------------------------------"
 	mkdir -p ${LIBCOMPATTMP}/usr/include
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${LIBCOMPATTMP}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIBCOMPATTMP}/usr/include >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${LIBCOMPATTMP}/usr >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${LIBCOMPATTMP}/usr/lib >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${LIBCOMPATTMP}/usr/lib/debug/usr >/dev/null
 .endif
 	mkdir -p ${WORLDTMP}
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 .for _t in obj includes
 .for _dir in ${_LC_INCDIRS}
 	${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} MK_INCLUDES=yes \
 	    DIRPRFX=${_dir}/ ${_t}
 .endfor
 .endfor
 .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
 	${_+_}cd ${.CURDIR}/${_dir}; \
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
 	    MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \
 	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 	    build-tools
 .endfor
 	${_+_}cd ${.CURDIR}; \
 	    ${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
 .if ${libcompat} == "32"
 .for _t in obj all
 	${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIBCOMPATWMAKE} \
 	    -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t}
 	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATWMAKE} \
 	    DIRPRFX=usr.bin/ldd ${_t}
 .endfor
 .endif
 
 distribute${libcompat} install${libcompat}: .PHONY
 .for _dir in ${_LC_LIBDIRS.yes}
 	${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATIMAKE} ${.TARGET:S/${libcompat}$//}
 .endfor
 .if ${libcompat} == "32"
 	${_+_}cd ${.CURDIR}/libexec/rtld-elf; \
 	    PROG=ld-elf32.so.1 ${LIBCOMPATIMAKE} ${.TARGET:S/32$//}
 	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATIMAKE} \
 	    ${.TARGET:S/32$//}
 .endif
 
 .endif
Index: projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/tcpd.h
===================================================================
--- projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/tcpd.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/tcpd.h	(revision 311637)
@@ -1,219 +1,224 @@
  /*
   * @(#) tcpd.h 1.5 96/03/19 16:22:24
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
   * $FreeBSD$
   */
 
 #ifdef INET6
 #define	TCPD_SOCKADDR struct sockaddr
 #else
 #define	TCPD_SOCKADDR struct sockaddr_in
 #endif
 
+#ifndef _STDFILE_DECLARED
+#define _STDFILE_DECLARED
+typedef struct __sFILE FILE;
+#endif
+
 /* Structure to describe one communications endpoint. */
 
 #define	STRING_LENGTH	128		/* hosts, users, processes */
 
 struct host_info {
     char    name[STRING_LENGTH];	/* access via eval_hostname(host) */
     char    addr[STRING_LENGTH];	/* access via eval_hostaddr(host) */
     TCPD_SOCKADDR *sin;			/* socket address or 0 */
     struct t_unitdata *unit;		/* TLI transport address or 0 */
     struct request_info *request;	/* for shared information */
 };
 
 /* Structure to describe what we know about a service request. */
 
 struct request_info {
     int     fd;				/* socket handle */
     char    user[STRING_LENGTH];	/* access via eval_user(request) */
     char    daemon[STRING_LENGTH];	/* access via eval_daemon(request) */
     char    pid[10];			/* access via eval_pid(request) */
     struct host_info client[1];		/* client endpoint info */
     struct host_info server[1];		/* server endpoint info */
     void  (*sink) (int);		/* datagram sink function or 0 */
     void  (*hostname) (struct host_info *); /* address to printable hostname */
     void  (*hostaddr) (struct host_info *); /* address to printable address */
     void  (*cleanup) (struct request_info *); /* cleanup function or 0 */
     struct netconfig *config;		/* netdir handle */
 };
 
 /* Common string operations. Less clutter should be more readable. */
 
 #define	STRN_CPY(d,s,l)	{ strncpy((d),(s),(l)); (d)[(l)-1] = 0; }
 
 #define	STRN_EQ(x,y,l)	(strncasecmp((x),(y),(l)) == 0)
 #define	STRN_NE(x,y,l)	(strncasecmp((x),(y),(l)) != 0)
 #define	STR_EQ(x,y)	(strcasecmp((x),(y)) == 0)
 #define	STR_NE(x,y)	(strcasecmp((x),(y)) != 0)
 
  /*
   * Initially, all above strings have the empty value. Information that
   * cannot be determined at runtime is set to "unknown", so that we can
   * distinguish between `unavailable' and `not yet looked up'. A hostname
   * that we do not believe in is set to "paranoid".
   */
 
 #define	STRING_UNKNOWN	"unknown"	/* lookup failed */
 #define	STRING_PARANOID	"paranoid"	/* hostname conflict */
 
 extern char unknown[];
 extern char paranoid[];
 
 #define	HOSTNAME_KNOWN(s) (STR_NE((s),unknown) && STR_NE((s),paranoid))
 
 #define	NOT_INADDR(s) (s[strspn(s,"01234567890./")] != 0)
 
 /* Global functions. */
 
 #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
 void fromhost(struct request_info *);	/* get/validate client host info */
 #else
 #define	fromhost sock_host		/* no TLI support needed */
 #endif
 
 int hosts_access(struct request_info *);			/* access control */
 int hosts_ctl(char *, char *, char *, char *);			/* wrapper around request_init() */
 void shell_cmd(char *);						/* execute shell command */
 char *percent_x(char *, int, char *, struct request_info *);	/* do %<char> expansion */
 void rfc931(TCPD_SOCKADDR *, TCPD_SOCKADDR *, char *);		/* client name from RFC 931 daemon */
 void clean_exit(struct request_info *);				/* clean up and exit */
 void refuse(struct request_info *);				/* clean up and exit */
 char *xgets(char *, int, FILE *);				/* fgets() on steroids */
 
 char *split_at(char *, int);					/* strchr() and split */
 unsigned long dot_quad_addr(char *);				/* restricted inet_addr() */
 
 /* Global variables. */
 
 extern int allow_severity;		/* for connection logging */
 extern int deny_severity;		/* for connection logging */
 extern char *hosts_allow_table;		/* for verification mode redirection */
 extern char *hosts_deny_table;		/* for verification mode redirection */
 extern int hosts_access_verbose;	/* for verbose matching mode */
 extern int rfc931_timeout;		/* user lookup timeout */
 extern int resident;			/* > 0 if resident process */
 
  /*
   * Routines for controlled initialization and update of request structure
   * attributes. Each attribute has its own key.
   */
 
 struct request_info *request_init(struct request_info *,...);	/* initialize request */
 struct request_info *request_set(struct request_info *,...);	/* update request structure */
 
 #define	RQ_FILE		1		/* file descriptor */
 #define	RQ_DAEMON	2		/* server process (argv[0]) */
 #define	RQ_USER		3		/* client user name */
 #define	RQ_CLIENT_NAME	4		/* client host name */
 #define	RQ_CLIENT_ADDR	5		/* client host address */
 #define	RQ_CLIENT_SIN	6		/* client endpoint (internal) */
 #define	RQ_SERVER_NAME	7		/* server host name */
 #define	RQ_SERVER_ADDR	8		/* server host address */
 #define	RQ_SERVER_SIN	9		/* server endpoint (internal) */
 
  /*
   * Routines for delayed evaluation of request attributes. Each attribute
   * type has its own access method. The trivial ones are implemented by
   * macros. The other ones are wrappers around the transport-specific host
   * name, address, and client user lookup methods. The request_info and
   * host_info structures serve as caches for the lookup results.
   */
 
 char *eval_user(struct request_info *);		/* client user */
 char *eval_hostname(struct host_info *);	/* printable hostname */
 char *eval_hostaddr(struct host_info *);	/* printable host address */
 char *eval_hostinfo(struct host_info *);	/* host name or address */
 char *eval_client(struct request_info *);	/* whatever is available */
 char *eval_server(struct request_info *);	/* whatever is available */
 #define	eval_daemon(r)	((r)->daemon)	/* daemon process name */
 #define	eval_pid(r)	((r)->pid)	/* process id */
 
 /* Socket-specific methods, including DNS hostname lookups. */
 
 void sock_host(struct request_info *);		/* look up endpoint addresses */
 void sock_hostname(struct host_info *);		/* translate address to hostname */
 void sock_hostaddr(struct host_info *);		/* address to printable address */
 #define	sock_methods(r) \
 	{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
 
 /* The System V Transport-Level Interface (TLI) interface. */
 
 #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
 void tli_host(struct request_info *);		/* look up endpoint addresses etc. */
 #endif
 
  /*
   * Problem reporting interface. Additional file/line context is reported
   * when available. The jump buffer (tcpd_buf) is not declared here, or
   * everyone would have to include <setjmp.h>.
   */
 
 void tcpd_warn(char *, ...);		/* report problem and proceed */
 void tcpd_jump(char *, ...);		/* report problem and jump */
 
 struct tcpd_context {
     char   *file;			/* current file */
     int     line;			/* current line */
 };
 extern struct tcpd_context tcpd_context;
 
  /*
   * While processing access control rules, error conditions are handled by
   * jumping back into the hosts_access() routine. This is cleaner than
   * checking the return value of each and every silly little function. The
   * (-1) returns are here because zero is already taken by longjmp().
   */
 
 #define	AC_PERMIT	1		/* permit access */
 #define	AC_DENY		(-1)		/* deny_access */
 #define	AC_ERROR	AC_DENY		/* XXX */
 
  /*
   * In verification mode an option function should just say what it would do,
   * instead of really doing it. An option function that would not return
   * should clear the dry_run flag to inform the caller of this unusual
   * behavior.
   */
 
 void process_options(char *, struct request_info *);	/* execute options */
 extern int dry_run;					/* verification flag */
 
 /* Bug workarounds. */
 
 #ifdef INET_ADDR_BUG			/* inet_addr() returns struct */
 #define	inet_addr fix_inet_addr
 long fix_inet_addr(char *);
 #endif
 
 #ifdef BROKEN_FGETS			/* partial reads from sockets */
 #define	fgets fix_fgets
 char *fix_fgets(char *, int, FILE *);
 #endif
 
 #ifdef RECVFROM_BUG			/* no address family info */
 #define	recvfrom fix_recvfrom
 int fix_recvfrom(int, char *, int, int, struct sockaddr *, int *);
 #endif
 
 #ifdef GETPEERNAME_BUG			/* claims success with UDP */
 #define	getpeername fix_getpeername
 int fix_getpeername(int, struct sockaddr *, int *);
 #endif
 
 #ifdef SOLARIS_24_GETHOSTBYNAME_BUG	/* lists addresses as aliases */
 #define	gethostbyname fix_gethostbyname
 struct hostent *fix_gethostbyname(char *);
 #endif
 
 #ifdef USE_STRSEP			/* libc calls strtok() */
 #define	strtok	fix_strtok
 char *fix_strtok(char *, char *);
 #endif
 
 #ifdef LIBC_CALLS_STRTOK		/* libc calls strtok() */
 #define	strtok	my_strtok
 char *my_strtok(char *, char *);
 #endif
Index: projects/bsnmp-ipv6-mib/contrib/tcpdump/print-tcp.c
===================================================================
--- projects/bsnmp-ipv6-mib/contrib/tcpdump/print-tcp.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/contrib/tcpdump/print-tcp.c	(revision 311637)
@@ -1,897 +1,897 @@
 /*	$NetBSD: print-tcp.c,v 1.9 2007/07/26 18:15:12 plunky Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1999-2004 The tcpdump.org project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may be used to endorse
  * or promote products derived from this software without specific prior
  * written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 #ifndef lint
 #else
 __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #endif
 
 #define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 
 #include "tcp.h"
 
 #include "ip.h"
 #ifdef INET6
 #include "ip6.h"
 #endif
 #include "ipproto.h"
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 
 #include "nameser.h"
 
 #ifdef HAVE_LIBCRYPTO
 #include <openssl/md5.h>
 #include <signature.h>
 
 static int tcp_verify_signature(netdissect_options *ndo,
                                 const struct ip *ip, const struct tcphdr *tp,
                                 const u_char *data, int length, const u_char *rcvsig);
 #endif
 
 static void print_tcp_rst_data(netdissect_options *, register const u_char *sp, u_int length);
 
 #define MAX_RST_DATA_LEN	30
 
 
 struct tha {
         struct in_addr src;
         struct in_addr dst;
         u_int port;
 };
 
 struct tcp_seq_hash {
         struct tcp_seq_hash *nxt;
         struct tha addr;
         tcp_seq seq;
         tcp_seq ack;
 };
 
 #ifdef INET6
 struct tha6 {
         struct in6_addr src;
         struct in6_addr dst;
         u_int port;
 };
 
 struct tcp_seq_hash6 {
         struct tcp_seq_hash6 *nxt;
         struct tha6 addr;
         tcp_seq seq;
         tcp_seq ack;
 };
 #endif
 
 #define TSEQ_HASHSIZE 919
 
 /* These tcp optinos do not have the size octet */
 #define ZEROLENOPT(o) ((o) == TCPOPT_EOL || (o) == TCPOPT_NOP)
 
 static struct tcp_seq_hash tcp_seq_hash4[TSEQ_HASHSIZE];
 #ifdef INET6
 static struct tcp_seq_hash6 tcp_seq_hash6[TSEQ_HASHSIZE];
 #endif
 
 static const struct tok tcp_flag_values[] = {
         { TH_FIN, "F" },
         { TH_SYN, "S" },
         { TH_RST, "R" },
         { TH_PUSH, "P" },
         { TH_ACK, "." },
         { TH_URG, "U" },
         { TH_ECNECHO, "E" },
         { TH_CWR, "W" },
         { 0, NULL }
 };
 
 static const struct tok tcp_option_values[] = {
         { TCPOPT_EOL, "eol" },
         { TCPOPT_NOP, "nop" },
         { TCPOPT_MAXSEG, "mss" },
         { TCPOPT_WSCALE, "wscale" },
         { TCPOPT_SACKOK, "sackOK" },
         { TCPOPT_SACK, "sack" },
         { TCPOPT_ECHO, "echo" },
         { TCPOPT_ECHOREPLY, "echoreply" },
         { TCPOPT_TIMESTAMP, "TS" },
         { TCPOPT_CC, "cc" },
         { TCPOPT_CCNEW, "ccnew" },
         { TCPOPT_CCECHO, "" },
         { TCPOPT_SIGNATURE, "md5" },
         { TCPOPT_AUTH, "enhanced auth" },
         { TCPOPT_UTO, "uto" },
         { TCPOPT_MPTCP, "mptcp" },
         { TCPOPT_EXPERIMENT2, "exp" },
         { 0, NULL }
 };
 
 static int
 tcp_cksum(netdissect_options *ndo,
           register const struct ip *ip,
           register const struct tcphdr *tp,
           register u_int len)
 {
 	return nextproto4_cksum(ndo, ip, (const uint8_t *)tp, len, len,
 				IPPROTO_TCP);
 }
 
 void
 tcp_print(netdissect_options *ndo,
           register const u_char *bp, register u_int length,
           register const u_char *bp2, int fragmented)
 {
         register const struct tcphdr *tp;
         register const struct ip *ip;
         register u_char flags;
         register u_int hlen;
         register char ch;
         uint16_t sport, dport, win, urp;
         uint32_t seq, ack, thseq, thack;
         u_int utoval;
         uint16_t magic;
         register int rev;
 #ifdef INET6
         register const struct ip6_hdr *ip6;
 #endif
 
         tp = (struct tcphdr *)bp;
         ip = (struct ip *)bp2;
 #ifdef INET6
         if (IP_V(ip) == 6)
                 ip6 = (struct ip6_hdr *)bp2;
         else
                 ip6 = NULL;
 #endif /*INET6*/
         ch = '\0';
         if (!ND_TTEST(tp->th_dport)) {
                 ND_PRINT((ndo, "%s > %s: [|tcp]",
                              ipaddr_string(ndo, &ip->ip_src),
                              ipaddr_string(ndo, &ip->ip_dst)));
                 return;
         }
 
         sport = EXTRACT_16BITS(&tp->th_sport);
         dport = EXTRACT_16BITS(&tp->th_dport);
 
         hlen = TH_OFF(tp) * 4;
 
 #ifdef INET6
         if (ip6) {
                 if (ip6->ip6_nxt == IPPROTO_TCP) {
                         ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                      ip6addr_string(ndo, &ip6->ip6_src),
                                      tcpport_string(sport),
                                      ip6addr_string(ndo, &ip6->ip6_dst),
                                      tcpport_string(dport)));
                 } else {
                         ND_PRINT((ndo, "%s > %s: ",
                                      tcpport_string(sport), tcpport_string(dport)));
                 }
         } else
 #endif /*INET6*/
         {
                 if (ip->ip_p == IPPROTO_TCP) {
                         ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                      ipaddr_string(ndo, &ip->ip_src),
                                      tcpport_string(sport),
                                      ipaddr_string(ndo, &ip->ip_dst),
                                      tcpport_string(dport)));
                 } else {
                         ND_PRINT((ndo, "%s > %s: ",
                                      tcpport_string(sport), tcpport_string(dport)));
                 }
         }
 
         if (hlen < sizeof(*tp)) {
                 ND_PRINT((ndo, " tcp %d [bad hdr length %u - too short, < %lu]",
                              length - hlen, hlen, (unsigned long)sizeof(*tp)));
                 return;
         }
 
         ND_TCHECK(*tp);
 
         seq = EXTRACT_32BITS(&tp->th_seq);
         ack = EXTRACT_32BITS(&tp->th_ack);
         win = EXTRACT_16BITS(&tp->th_win);
         urp = EXTRACT_16BITS(&tp->th_urp);
 
         if (ndo->ndo_qflag) {
                 ND_PRINT((ndo, "tcp %d", length - hlen));
                 if (hlen > length) {
                         ND_PRINT((ndo, " [bad hdr length %u - too long, > %u]",
                                      hlen, length));
                 }
                 return;
         }
 
         flags = tp->th_flags;
         ND_PRINT((ndo, "Flags [%s]", bittok2str_nosep(tcp_flag_values, "none", flags)));
 
         if (!ndo->ndo_Sflag && (flags & TH_ACK)) {
                 /*
                  * Find (or record) the initial sequence numbers for
                  * this conversation.  (we pick an arbitrary
                  * collating order so there's only one entry for
                  * both directions).
                  */
                 rev = 0;
 #ifdef INET6
                 if (ip6) {
                         register struct tcp_seq_hash6 *th;
                         struct tcp_seq_hash6 *tcp_seq_hash;
-                        const struct in6_addr *src, *dst;
+                        const void *src, *dst;
                         struct tha6 tha;
 
                         tcp_seq_hash = tcp_seq_hash6;
                         src = &ip6->ip6_src;
                         dst = &ip6->ip6_dst;
                         if (sport > dport)
                                 rev = 1;
                         else if (sport == dport) {
                                 if (UNALIGNED_MEMCMP(src, dst, sizeof ip6->ip6_dst) > 0)
                                         rev = 1;
                         }
                         if (rev) {
                                 UNALIGNED_MEMCPY(&tha.src, dst, sizeof ip6->ip6_dst);
                                 UNALIGNED_MEMCPY(&tha.dst, src, sizeof ip6->ip6_src);
                                 tha.port = dport << 16 | sport;
                         } else {
                                 UNALIGNED_MEMCPY(&tha.dst, dst, sizeof ip6->ip6_dst);
                                 UNALIGNED_MEMCPY(&tha.src, src, sizeof ip6->ip6_src);
                                 tha.port = sport << 16 | dport;
                         }
 
                         for (th = &tcp_seq_hash[tha.port % TSEQ_HASHSIZE];
                              th->nxt; th = th->nxt)
                                 if (memcmp((char *)&tha, (char *)&th->addr,
                                            sizeof(th->addr)) == 0)
                                         break;
 
                         if (!th->nxt || (flags & TH_SYN)) {
                                 /* didn't find it or new conversation */
                                 if (th->nxt == NULL) {
                                         th->nxt = (struct tcp_seq_hash6 *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)
                                                 error("tcp_print: calloc");
                                 }
                                 th->addr = tha;
                                 if (rev)
                                         th->ack = seq, th->seq = ack - 1;
                                 else
                                         th->seq = seq, th->ack = ack - 1;
                         } else {
                                 if (rev)
                                         seq -= th->ack, ack -= th->seq;
                                 else
                                         seq -= th->seq, ack -= th->ack;
                         }
 
                         thseq = th->seq;
                         thack = th->ack;
                 } else {
 #else  /*INET6*/
                 {
 #endif /*INET6*/
                         register struct tcp_seq_hash *th;
                         struct tcp_seq_hash *tcp_seq_hash;
-                        const struct in_addr *src, *dst;
+                        const void *src, *dst;
                         struct tha tha;
 
                         tcp_seq_hash = tcp_seq_hash4;
                         src = &ip->ip_src;
                         dst = &ip->ip_dst;
                         if (sport > dport)
                                 rev = 1;
                         else if (sport == dport) {
                                 if (UNALIGNED_MEMCMP(src, dst, sizeof ip->ip_dst) > 0)
                                         rev = 1;
                         }
                         if (rev) {
                                 UNALIGNED_MEMCPY(&tha.src, dst, sizeof ip->ip_dst);
                                 UNALIGNED_MEMCPY(&tha.dst, src, sizeof ip->ip_src);
                                 tha.port = dport << 16 | sport;
                         } else {
                                 UNALIGNED_MEMCPY(&tha.dst, dst, sizeof ip->ip_dst);
                                 UNALIGNED_MEMCPY(&tha.src, src, sizeof ip->ip_src);
                                 tha.port = sport << 16 | dport;
                         }
 
                         for (th = &tcp_seq_hash[tha.port % TSEQ_HASHSIZE];
                              th->nxt; th = th->nxt)
                                 if (memcmp((char *)&tha, (char *)&th->addr,
                                            sizeof(th->addr)) == 0)
                                         break;
 
                         if (!th->nxt || (flags & TH_SYN)) {
                                 /* didn't find it or new conversation */
                                 if (th->nxt == NULL) {
                                         th->nxt = (struct tcp_seq_hash *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)
                                                 error("tcp_print: calloc");
                                 }
                                 th->addr = tha;
                                 if (rev)
                                         th->ack = seq, th->seq = ack - 1;
                                 else
                                         th->seq = seq, th->ack = ack - 1;
                         } else {
                                 if (rev)
                                         seq -= th->ack, ack -= th->seq;
                                 else
                                         seq -= th->seq, ack -= th->ack;
                         }
 
                         thseq = th->seq;
                         thack = th->ack;
                 }
         } else {
                 /*fool gcc*/
                 thseq = thack = rev = 0;
         }
         if (hlen > length) {
                 ND_PRINT((ndo, " [bad hdr length %u - too long, > %u]",
                              hlen, length));
                 return;
         }
 
         if (ndo->ndo_vflag && !ndo->ndo_Kflag && !fragmented) {
                 /* Check the checksum, if possible. */
                 uint16_t sum, tcp_sum;
 
                 if (IP_V(ip) == 4) {
                         if (ND_TTEST2(tp->th_sport, length)) {
                                 sum = tcp_cksum(ndo, ip, tp, length);
                                 tcp_sum = EXTRACT_16BITS(&tp->th_sum);
 
                                 ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum));
                                 if (sum != 0)
                                         ND_PRINT((ndo, " (incorrect -> 0x%04x)",
                                             in_cksum_shouldbe(tcp_sum, sum)));
                                 else
                                         ND_PRINT((ndo, " (correct)"));
                         }
                 }
 #ifdef INET6
                 else if (IP_V(ip) == 6 && ip6->ip6_plen) {
                         if (ND_TTEST2(tp->th_sport, length)) {
                                 sum = nextproto6_cksum(ip6, (const uint8_t *)tp,
 							length, length, IPPROTO_TCP);
                                 tcp_sum = EXTRACT_16BITS(&tp->th_sum);
 
                                 ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum));
                                 if (sum != 0)
                                         ND_PRINT((ndo, " (incorrect -> 0x%04x)",
                                             in_cksum_shouldbe(tcp_sum, sum)));
                                 else
                                         ND_PRINT((ndo, " (correct)"));
 
                         }
                 }
 #endif
         }
 
         length -= hlen;
         if (ndo->ndo_vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST)) {
                 ND_PRINT((ndo, ", seq %u", seq));
 
                 if (length > 0) {
                         ND_PRINT((ndo, ":%u", seq + length));
                 }
         }
 
         if (flags & TH_ACK) {
                 ND_PRINT((ndo, ", ack %u", ack));
         }
 
         ND_PRINT((ndo, ", win %d", win));
 
         if (flags & TH_URG)
                 ND_PRINT((ndo, ", urg %d", urp));
         /*
          * Handle any options.
          */
         if (hlen > sizeof(*tp)) {
                 register const u_char *cp;
                 register u_int i, opt, datalen;
                 register u_int len;
 
                 hlen -= sizeof(*tp);
                 cp = (const u_char *)tp + sizeof(*tp);
                 ND_PRINT((ndo, ", options ["));
                 while (hlen > 0) {
                         if (ch != '\0')
                                 ND_PRINT((ndo, "%c", ch));
                         ND_TCHECK(*cp);
                         opt = *cp++;
                         if (ZEROLENOPT(opt))
                                 len = 1;
                         else {
                                 ND_TCHECK(*cp);
                                 len = *cp++;	/* total including type, len */
                                 if (len < 2 || len > hlen)
                                         goto bad;
                                 --hlen;		/* account for length byte */
                         }
                         --hlen;			/* account for type byte */
                         datalen = 0;
 
 /* Bail if "l" bytes of data are not left or were not captured  */
 #define LENCHECK(l) { if ((l) > hlen) goto bad; ND_TCHECK2(*cp, l); }
 
 
                         ND_PRINT((ndo, "%s", tok2str(tcp_option_values, "unknown-%u", opt)));
 
                         switch (opt) {
 
                         case TCPOPT_MAXSEG:
                                 datalen = 2;
                                 LENCHECK(datalen);
                                 ND_PRINT((ndo, " %u", EXTRACT_16BITS(cp)));
                                 break;
 
                         case TCPOPT_WSCALE:
                                 datalen = 1;
                                 LENCHECK(datalen);
                                 ND_PRINT((ndo, " %u", *cp));
                                 break;
 
                         case TCPOPT_SACK:
                                 datalen = len - 2;
                                 if (datalen % 8 != 0) {
                                         ND_PRINT((ndo, "malformed sack"));
                                 } else {
                                         uint32_t s, e;
 
                                         ND_PRINT((ndo, " %d ", datalen / 8));
                                         for (i = 0; i < datalen; i += 8) {
                                                 LENCHECK(i + 4);
                                                 s = EXTRACT_32BITS(cp + i);
                                                 LENCHECK(i + 8);
                                                 e = EXTRACT_32BITS(cp + i + 4);
                                                 if (rev) {
                                                         s -= thseq;
                                                         e -= thseq;
                                                 } else {
                                                         s -= thack;
                                                         e -= thack;
                                                 }
                                                 ND_PRINT((ndo, "{%u:%u}", s, e));
                                         }
                                 }
                                 break;
 
                         case TCPOPT_CC:
                         case TCPOPT_CCNEW:
                         case TCPOPT_CCECHO:
                         case TCPOPT_ECHO:
                         case TCPOPT_ECHOREPLY:
 
                                 /*
                                  * those options share their semantics.
                                  * fall through
                                  */
                                 datalen = 4;
                                 LENCHECK(datalen);
                                 ND_PRINT((ndo, " %u", EXTRACT_32BITS(cp)));
                                 break;
 
                         case TCPOPT_TIMESTAMP:
                                 datalen = 8;
                                 LENCHECK(datalen);
                                 ND_PRINT((ndo, " val %u ecr %u",
                                              EXTRACT_32BITS(cp),
                                              EXTRACT_32BITS(cp + 4)));
                                 break;
 
                         case TCPOPT_SIGNATURE:
                                 datalen = TCP_SIGLEN;
                                 LENCHECK(datalen);
 #ifdef HAVE_LIBCRYPTO
                                 switch (tcp_verify_signature(ndo, ip, tp,
                                                              bp + TH_OFF(tp) * 4, length, cp)) {
 
                                 case SIGNATURE_VALID:
                                         ND_PRINT((ndo, "valid"));
                                         break;
 
                                 case SIGNATURE_INVALID:
                                         ND_PRINT((ndo, "invalid"));
                                         break;
 
                                 case CANT_CHECK_SIGNATURE:
                                         ND_PRINT((ndo, "can't check - "));
                                         for (i = 0; i < TCP_SIGLEN; ++i)
                                                 ND_PRINT((ndo, "%02x", cp[i]));
                                         break;
                                 }
 #else
                                 for (i = 0; i < TCP_SIGLEN; ++i)
                                         ND_PRINT((ndo, "%02x", cp[i]));
 #endif
                                 break;
 
                         case TCPOPT_AUTH:
                                 ND_PRINT((ndo, "keyid %d", *cp++));
                                 datalen = len - 3;
                                 for (i = 0; i < datalen; ++i) {
                                         LENCHECK(i);
                                         ND_PRINT((ndo, "%02x", cp[i]));
                                 }
                                 break;
 
 
                         case TCPOPT_EOL:
                         case TCPOPT_NOP:
                         case TCPOPT_SACKOK:
                                 /*
                                  * Nothing interesting.
                                  * fall through
                                  */
                                 break;
 
                         case TCPOPT_UTO:
                                 datalen = 2;
                                 LENCHECK(datalen);
                                 utoval = EXTRACT_16BITS(cp);
                                 ND_PRINT((ndo, "0x%x", utoval));
                                 if (utoval & 0x0001)
                                         utoval = (utoval >> 1) * 60;
                                 else
                                         utoval >>= 1;
                                 ND_PRINT((ndo, " %u", utoval));
                                 break;
 
                         case TCPOPT_MPTCP:
                                 datalen = len - 2;
                                 LENCHECK(datalen);
                                 if (!mptcp_print(ndo, cp-2, len, flags))
                                         goto bad;
                                 break;
 
                         case TCPOPT_EXPERIMENT2:
                                 datalen = len - 2;
                                 LENCHECK(datalen);
                                 if (datalen < 2)
                                         goto bad;
                                 /* RFC6994 */
                                 magic = EXTRACT_16BITS(cp);
                                 ND_PRINT((ndo, "-"));
 
                                 switch(magic) {
 
                                 case 0xf989:
                                         /* TCP Fast Open: RFC 7413 */
                                         if (datalen == 2) {
                                                 /* Fast Open Cookie Request */
                                                 ND_PRINT((ndo, "tfo cookiereq"));
                                         } else {
                                                 /* Fast Open Cookie */
                                                 if (datalen % 2 != 0 || datalen < 6 || datalen > 18) {
                                                         ND_PRINT((ndo, "tfo malformed"));
                                                 } else {
                                                         ND_PRINT((ndo, "tfo cookie "));
                                                         for (i = 2; i < datalen; ++i)
                                                                 ND_PRINT((ndo, "%02x", cp[i]));
                                                 }
                                         }
                                         break;
 
                                 default:
                                         /* Unknown magic number */
                                         ND_PRINT((ndo, "%04x", magic));
                                         break;
                                 }
                                 break;
 
                         default:
                                 datalen = len - 2;
                                 if (datalen)
                                         ND_PRINT((ndo, " 0x"));
                                 for (i = 0; i < datalen; ++i) {
                                         LENCHECK(i);
                                         ND_PRINT((ndo, "%02x", cp[i]));
                                 }
                                 break;
                         }
 
                         /* Account for data printed */
                         cp += datalen;
                         hlen -= datalen;
 
                         /* Check specification against observed length */
                         ++datalen;			/* option octet */
                         if (!ZEROLENOPT(opt))
                                 ++datalen;		/* size octet */
                         if (datalen != len)
                                 ND_PRINT((ndo, "[len %d]", len));
                         ch = ',';
                         if (opt == TCPOPT_EOL)
                                 break;
                 }
                 ND_PRINT((ndo, "]"));
         }
 
         /*
          * Print length field before crawling down the stack.
          */
         ND_PRINT((ndo, ", length %u", length));
 
         if (length <= 0)
                 return;
 
         /*
          * Decode payload if necessary.
          */
         bp += TH_OFF(tp) * 4;
         if ((flags & TH_RST) && ndo->ndo_vflag) {
                 print_tcp_rst_data(ndo, bp, length);
                 return;
         }
 
         if (ndo->ndo_packettype) {
                 switch (ndo->ndo_packettype) {
                 case PT_ZMTP1:
                         zmtp1_print(ndo, bp, length);
                         break;
                 }
                 return;
         }
 
         if (sport == TELNET_PORT || dport == TELNET_PORT) {
                 telnet_print(ndo, bp, length);
         } else if (sport == SMTP_PORT || dport == SMTP_PORT) {
                 ND_PRINT((ndo, ": "));
                 smtp_print(ndo, bp, length);
         } else if (sport == BGP_PORT || dport == BGP_PORT)
                 bgp_print(ndo, bp, length);
         else if (sport == PPTP_PORT || dport == PPTP_PORT)
                 pptp_print(ndo, bp);
 #ifdef TCPDUMP_DO_SMB
         else if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT)
                 nbt_tcp_print(ndo, bp, length);
 	else if (sport == SMB_PORT || dport == SMB_PORT)
 		smb_tcp_print(ndo, bp, length);
 #endif
         else if (sport == BEEP_PORT || dport == BEEP_PORT)
                 beep_print(ndo, bp, length);
         else if (sport == OPENFLOW_PORT_OLD || dport == OPENFLOW_PORT_OLD ||
                  sport == OPENFLOW_PORT_IANA || dport == OPENFLOW_PORT_IANA)
                 openflow_print(ndo, bp, length);
         else if (sport == FTP_PORT || dport == FTP_PORT) {
                 ND_PRINT((ndo, ": "));
                 ftp_print(ndo, bp, length);
         } else if (sport == HTTP_PORT || dport == HTTP_PORT ||
             sport == HTTP_PORT_ALT || dport == HTTP_PORT_ALT) {
                 ND_PRINT((ndo, ": "));
                 http_print(ndo, bp, length);
         } else if (sport == RTSP_PORT || dport == RTSP_PORT ||
             sport == RTSP_PORT_ALT || dport == RTSP_PORT_ALT) {
                 ND_PRINT((ndo, ": "));
                 rtsp_print(ndo, bp, length);
         } else if (length > 2 &&
                  (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT ||
                   sport == MULTICASTDNS_PORT || dport == MULTICASTDNS_PORT)) {
                 /*
                  * TCP DNS query has 2byte length at the head.
                  * XXX packet could be unaligned, it can go strange
                  */
                 ns_print(ndo, bp + 2, length - 2, 0);
         } else if (sport == MSDP_PORT || dport == MSDP_PORT) {
                 msdp_print(ndo, bp, length);
         } else if (sport == RPKI_RTR_PORT || dport == RPKI_RTR_PORT) {
                 rpki_rtr_print(ndo, bp, length);
         }
         else if (length > 0 && (sport == LDP_PORT || dport == LDP_PORT)) {
                 ldp_print(ndo, bp, length);
         }
         else if ((sport == NFS_PORT || dport == NFS_PORT) &&
                  length >= 4 && ND_TTEST2(*bp, 4)) {
                 /*
                  * If data present, header length valid, and NFS port used,
                  * assume NFS.
                  * Pass offset of data plus 4 bytes for RPC TCP msg length
                  * to NFS print routines.
                  */
                 uint32_t fraglen;
                 register struct sunrpc_msg *rp;
                 enum sunrpc_msg_type direction;
 
                 fraglen = EXTRACT_32BITS(bp) & 0x7FFFFFFF;
                 if (fraglen > (length) - 4)
                         fraglen = (length) - 4;
                 rp = (struct sunrpc_msg *)(bp + 4);
                 if (ND_TTEST(rp->rm_direction)) {
                         direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
                         if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                                 ND_PRINT((ndo, ": NFS request xid %u ", EXTRACT_32BITS(&rp->rm_xid)));
                                 nfsreq_print_noaddr(ndo, (u_char *)rp, fraglen, (u_char *)ip);
                                 return;
                         }
                         if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
                                 ND_PRINT((ndo, ": NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid)));
                                 nfsreply_print_noaddr(ndo, (u_char *)rp, fraglen, (u_char *)ip);
                                 return;
                         }
                 }
         }
 
         return;
  bad:
         ND_PRINT((ndo, "[bad opt]"));
         if (ch != '\0')
                 ND_PRINT((ndo, ">"));
         return;
  trunc:
         ND_PRINT((ndo, "[|tcp]"));
         if (ch != '\0')
                 ND_PRINT((ndo, ">"));
 }
 
 /*
  * RFC1122 says the following on data in RST segments:
  *
  *         4.2.2.12  RST Segment: RFC-793 Section 3.4
  *
  *            A TCP SHOULD allow a received RST segment to include data.
  *
  *            DISCUSSION
  *                 It has been suggested that a RST segment could contain
  *                 ASCII text that encoded and explained the cause of the
  *                 RST.  No standard has yet been established for such
  *                 data.
  *
  */
 
 static void
 print_tcp_rst_data(netdissect_options *ndo,
                    register const u_char *sp, u_int length)
 {
         int c;
 
         ND_PRINT((ndo, ND_TTEST2(*sp, length) ? " [RST" : " [!RST"));
         if (length > MAX_RST_DATA_LEN) {
                 length = MAX_RST_DATA_LEN;	/* can use -X for longer */
                 ND_PRINT((ndo, "+"));			/* indicate we truncate */
         }
         ND_PRINT((ndo, " "));
         while (length-- && sp <= ndo->ndo_snapend) {
                 c = *sp++;
                 safeputchar(ndo, c);
         }
         ND_PRINT((ndo, "]"));
 }
 
 #ifdef HAVE_LIBCRYPTO
 USES_APPLE_DEPRECATED_API
 static int
 tcp_verify_signature(netdissect_options *ndo,
                      const struct ip *ip, const struct tcphdr *tp,
                      const u_char *data, int length, const u_char *rcvsig)
 {
         struct tcphdr tp1;
         u_char sig[TCP_SIGLEN];
         char zero_proto = 0;
         MD5_CTX ctx;
         uint16_t savecsum, tlen;
 #ifdef INET6
         struct ip6_hdr *ip6;
         uint32_t len32;
         uint8_t nxt;
 #endif
 
 	if (data + length > ndo->ndo_snapend) {
 		ND_PRINT((ndo, "snaplen too short, "));
 		return (CANT_CHECK_SIGNATURE);
 	}
 
         tp1 = *tp;
 
         if (ndo->ndo_sigsecret == NULL) {
 		ND_PRINT((ndo, "shared secret not supplied with -M, "));
                 return (CANT_CHECK_SIGNATURE);
         }
 
         MD5_Init(&ctx);
         /*
          * Step 1: Update MD5 hash with IP pseudo-header.
          */
         if (IP_V(ip) == 4) {
                 MD5_Update(&ctx, (char *)&ip->ip_src, sizeof(ip->ip_src));
                 MD5_Update(&ctx, (char *)&ip->ip_dst, sizeof(ip->ip_dst));
                 MD5_Update(&ctx, (char *)&zero_proto, sizeof(zero_proto));
                 MD5_Update(&ctx, (char *)&ip->ip_p, sizeof(ip->ip_p));
                 tlen = EXTRACT_16BITS(&ip->ip_len) - IP_HL(ip) * 4;
                 tlen = htons(tlen);
                 MD5_Update(&ctx, (char *)&tlen, sizeof(tlen));
 #ifdef INET6
         } else if (IP_V(ip) == 6) {
                 ip6 = (struct ip6_hdr *)ip;
                 MD5_Update(&ctx, (char *)&ip6->ip6_src, sizeof(ip6->ip6_src));
                 MD5_Update(&ctx, (char *)&ip6->ip6_dst, sizeof(ip6->ip6_dst));
                 len32 = htonl(EXTRACT_16BITS(&ip6->ip6_plen));
                 MD5_Update(&ctx, (char *)&len32, sizeof(len32));
                 nxt = 0;
                 MD5_Update(&ctx, (char *)&nxt, sizeof(nxt));
                 MD5_Update(&ctx, (char *)&nxt, sizeof(nxt));
                 MD5_Update(&ctx, (char *)&nxt, sizeof(nxt));
                 nxt = IPPROTO_TCP;
                 MD5_Update(&ctx, (char *)&nxt, sizeof(nxt));
 #endif
         } else {
 #ifdef INET6
 		ND_PRINT((ndo, "IP version not 4 or 6, "));
 #else
 		ND_PRINT((ndo, "IP version not 4, "));
 #endif
                 return (CANT_CHECK_SIGNATURE);
         }
 
         /*
          * Step 2: Update MD5 hash with TCP header, excluding options.
          * The TCP checksum must be set to zero.
          */
         savecsum = tp1.th_sum;
         tp1.th_sum = 0;
         MD5_Update(&ctx, (char *)&tp1, sizeof(struct tcphdr));
         tp1.th_sum = savecsum;
         /*
          * Step 3: Update MD5 hash with TCP segment data, if present.
          */
         if (length > 0)
                 MD5_Update(&ctx, data, length);
         /*
          * Step 4: Update MD5 hash with shared secret.
          */
         MD5_Update(&ctx, ndo->ndo_sigsecret, strlen(ndo->ndo_sigsecret));
         MD5_Final(sig, &ctx);
 
         if (memcmp(rcvsig, sig, TCP_SIGLEN) == 0)
                 return (SIGNATURE_VALID);
         else
                 return (SIGNATURE_INVALID);
 }
 USES_APPLE_RST
 #endif /* HAVE_LIBCRYPTO */
 
 /*
  * Local Variables:
  * c-style: whitesmith
  * c-basic-offset: 8
  * End:
  */
Index: projects/bsnmp-ipv6-mib/contrib/tcpdump
===================================================================
--- projects/bsnmp-ipv6-mib/contrib/tcpdump	(revision 311636)
+++ projects/bsnmp-ipv6-mib/contrib/tcpdump	(revision 311637)

Property changes on: projects/bsnmp-ipv6-mib/contrib/tcpdump
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/contrib/tcpdump:r311262-311635
Index: projects/bsnmp-ipv6-mib/crypto/openssh/config.h
===================================================================
--- projects/bsnmp-ipv6-mib/crypto/openssh/config.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/crypto/openssh/config.h	(revision 311637)
@@ -1,1751 +1,1751 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address
    */
 /* #undef AIX_GETNAMEINFO_HACK */
 
 /* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */
 /* #undef AIX_LOGINFAILED_4ARG */
 
 /* System only supports IPv4 audit records */
 /* #undef AU_IPv4 */
 
 /* Define if your resolver libs need this for getrrsetbyname */
 /* #undef BIND_8_COMPAT */
 
 /* The system has incomplete BSM API */
 /* #undef BROKEN_BSM_API */
 
 /* Define if cmsg_type is not passed correctly */
 /* #undef BROKEN_CMSG_TYPE */
 
 /* getaddrinfo is broken (if present) */
 /* #undef BROKEN_GETADDRINFO */
 
 /* getgroups(0,NULL) will return -1 */
 /* #undef BROKEN_GETGROUPS */
 
 /* FreeBSD glob does not do what we need */
 #define BROKEN_GLOB 1
 
 /* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */
 /* #undef BROKEN_INET_NTOA */
 
 /* ia_uinfo routines not supported by OS yet */
 /* #undef BROKEN_LIBIAF */
 
 /* Ultrix mmap can't map files */
 /* #undef BROKEN_MMAP */
 
 /* Define if your struct dirent expects you to allocate extra space for d_name
    */
 /* #undef BROKEN_ONE_BYTE_DIRENT_D_NAME */
 
 /* Can't do comparisons on readv */
 /* #undef BROKEN_READV_COMPARISON */
 
 /* NetBSD read function is sometimes redirected, breaking atomicio comparisons
    against it */
 /* #undef BROKEN_READ_COMPARISON */
 
 /* realpath does not work with nonexistent files */
 #define BROKEN_REALPATH 1
 
 /* Needed for NeXT */
 /* #undef BROKEN_SAVED_UIDS */
 
 /* Define if your setregid() is broken */
 /* #undef BROKEN_SETREGID */
 
 /* Define if your setresgid() is broken */
 /* #undef BROKEN_SETRESGID */
 
 /* Define if your setresuid() is broken */
 /* #undef BROKEN_SETRESUID */
 
 /* Define if your setreuid() is broken */
 /* #undef BROKEN_SETREUID */
 
 /* LynxOS has broken setvbuf() implementation */
 /* #undef BROKEN_SETVBUF */
 
 /* QNX shadow support is broken */
 /* #undef BROKEN_SHADOW_EXPIRE */
 
 /* Define if your snprintf is busted */
 /* #undef BROKEN_SNPRINTF */
 
 /* FreeBSD strnvis argument order is swapped compared to OpenBSD */
 #define BROKEN_STRNVIS 1
 
 /* tcgetattr with ICANON may hang */
 /* #undef BROKEN_TCGETATTR_ICANON */
 
 /* updwtmpx is broken (if present) */
 /* #undef BROKEN_UPDWTMPX */
 
 /* Define if you have BSD auth support */
 /* #undef BSD_AUTH */
 
 /* Define if you want to specify the path to your lastlog file */
 /* #undef CONF_LASTLOG_FILE */
 
 /* Define if you want to specify the path to your utmp file */
 /* #undef CONF_UTMP_FILE */
 
 /* Define if you want to specify the path to your wtmpx file */
 /* #undef CONF_WTMPX_FILE */
 
 /* Define if you want to specify the path to your wtmp file */
 /* #undef CONF_WTMP_FILE */
 
 /* Define if your platform needs to skip post auth file descriptor passing */
 /* #undef DISABLE_FD_PASSING */
 
 /* Define if you don't want to use lastlog */
 #define DISABLE_LASTLOG 1
 
 /* Define if you don't want to use your system's login() call */
 /* #undef DISABLE_LOGIN */
 
 /* Define if you don't want to use pututline() etc. to write [uw]tmp */
 /* #undef DISABLE_PUTUTLINE */
 
 /* Define if you don't want to use pututxline() etc. to write [uw]tmpx */
 /* #undef DISABLE_PUTUTXLINE */
 
 /* Define if you want to disable shadow passwords */
 /* #undef DISABLE_SHADOW */
 
 /* Define if you don't want to use utmp */
 #define DISABLE_UTMP 1
 
 /* Define if you don't want to use utmpx */
 /* #undef DISABLE_UTMPX */
 
 /* Define if you don't want to use wtmp */
 #define DISABLE_WTMP 1
 
 /* Define if you don't want to use wtmpx */
 #define DISABLE_WTMPX 1
 
 /* Enable for PKCS#11 support */
 #define ENABLE_PKCS11 /**/
 
 /* File names may not contain backslash characters */
 /* #undef FILESYSTEM_NO_BACKSLASH */
 
 /* fsid_t has member val */
 /* #undef FSID_HAS_VAL */
 
 /* fsid_t has member __val */
 /* #undef FSID_HAS___VAL */
 
 /* Define to 1 if the `getpgrp' function requires zero arguments. */
 #define GETPGRP_VOID 1
 
 /* Conflicting defs for getspnam */
 /* #undef GETSPNAM_CONFLICTING_DEFS */
 
 /* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */
 #define GLOB_HAS_ALTDIRFUNC 1
 
 /* Define if your system glob() function has gl_matchc options in glob_t */
 #define GLOB_HAS_GL_MATCHC 1
 
 /* Define if your system glob() function has gl_statv options in glob_t */
 /* #undef GLOB_HAS_GL_STATV */
 
 /* Define this if you want GSSAPI support in the version 2 protocol */
 /* #undef GSSAPI */
 
 /* Define if you want to use shadow password expire field */
 /* #undef HAS_SHADOW_EXPIRE */
 
 /* Define if your system uses access rights style file descriptor passing */
 /* #undef HAVE_ACCRIGHTS_IN_MSGHDR */
 
 /* Define if you have ut_addr in utmp.h */
 /* #undef HAVE_ADDR_IN_UTMP */
 
 /* Define if you have ut_addr in utmpx.h */
 /* #undef HAVE_ADDR_IN_UTMPX */
 
 /* Define if you have ut_addr_v6 in utmp.h */
 /* #undef HAVE_ADDR_V6_IN_UTMP */
 
 /* Define if you have ut_addr_v6 in utmpx.h */
 /* #undef HAVE_ADDR_V6_IN_UTMPX */
 
 /* Define to 1 if you have the `arc4random' function. */
 #define HAVE_ARC4RANDOM 1
 
 /* Define to 1 if you have the `arc4random_buf' function. */
 #define HAVE_ARC4RANDOM_BUF 1
 
 /* Define to 1 if you have the `arc4random_stir' function. */
 #define HAVE_ARC4RANDOM_STIR 1
 
 /* Define to 1 if you have the `arc4random_uniform' function. */
 #define HAVE_ARC4RANDOM_UNIFORM 1
 
 /* Define to 1 if you have the `asprintf' function. */
 #define HAVE_ASPRINTF 1
 
 /* OpenBSD's gcc has bounded */
 /* #undef HAVE_ATTRIBUTE__BOUNDED__ */
 
 /* Have attribute nonnull */
 #define HAVE_ATTRIBUTE__NONNULL__ 1
 
 /* OpenBSD's gcc has sentinel */
 /* #undef HAVE_ATTRIBUTE__SENTINEL__ */
 
 /* Define to 1 if you have the `aug_get_machine' function. */
 /* #undef HAVE_AUG_GET_MACHINE */
 
 /* Define to 1 if you have the `b64_ntop' function. */
 /* #undef HAVE_B64_NTOP */
 
 /* Define to 1 if you have the `b64_pton' function. */
 /* #undef HAVE_B64_PTON */
 
 /* Define if you have the basename function. */
 #define HAVE_BASENAME 1
 
 /* Define to 1 if you have the `bcopy' function. */
 #define HAVE_BCOPY 1
 
 /* Define to 1 if you have the `bcrypt_pbkdf' function. */
 /* #undef HAVE_BCRYPT_PBKDF */
 
 /* Define to 1 if you have the `bindresvport_sa' function. */
 #define HAVE_BINDRESVPORT_SA 1
 
 /* Define to 1 if you have the `blf_enc' function. */
 /* #undef HAVE_BLF_ENC */
 
 /* Define to 1 if you have the <blf.h> header file. */
 /* #undef HAVE_BLF_H */
 
 /* Define to 1 if you have the `Blowfish_expand0state' function. */
 /* #undef HAVE_BLOWFISH_EXPAND0STATE */
 
 /* Define to 1 if you have the `Blowfish_expandstate' function. */
 /* #undef HAVE_BLOWFISH_EXPANDSTATE */
 
 /* Define to 1 if you have the `Blowfish_initstate' function. */
 /* #undef HAVE_BLOWFISH_INITSTATE */
 
 /* Define to 1 if you have the `Blowfish_stream2word' function. */
 /* #undef HAVE_BLOWFISH_STREAM2WORD */
 
 /* Define to 1 if you have the `BN_is_prime_ex' function. */
 #define HAVE_BN_IS_PRIME_EX 1
 
 /* Define to 1 if you have the <bsd/libutil.h> header file. */
 /* #undef HAVE_BSD_LIBUTIL_H */
 
 /* Define to 1 if you have the <bsm/audit.h> header file. */
 /* #undef HAVE_BSM_AUDIT_H */
 
 /* Define to 1 if you have the <bstring.h> header file. */
 /* #undef HAVE_BSTRING_H */
 
 /* Define to 1 if you have the `cap_rights_limit' function. */
 #define HAVE_CAP_RIGHTS_LIMIT 1
 
 /* Define to 1 if you have the `clock' function. */
 #define HAVE_CLOCK 1
 
 /* Have clock_gettime */
 #define HAVE_CLOCK_GETTIME 1
 
 /* define if you have clock_t data type */
 #define HAVE_CLOCK_T 1
 
 /* Define to 1 if you have the `closefrom' function. */
 #define HAVE_CLOSEFROM 1
 
 /* Define if gai_strerror() returns const char * */
 #define HAVE_CONST_GAI_STRERROR_PROTO 1
 
 /* Define if your system uses ancillary data style file descriptor passing */
 #define HAVE_CONTROL_IN_MSGHDR 1
 
 /* Define to 1 if you have the `crypt' function. */
 #define HAVE_CRYPT 1
 
 /* Define to 1 if you have the <crypto/sha2.h> header file. */
 /* #undef HAVE_CRYPTO_SHA2_H */
 
 /* Define to 1 if you have the <crypt.h> header file. */
 /* #undef HAVE_CRYPT_H */
 
 /* Define if you are on Cygwin */
 /* #undef HAVE_CYGWIN */
 
 /* Define if your libraries define daemon() */
 #define HAVE_DAEMON 1
 
 /* Define to 1 if you have the declaration of `AI_NUMERICSERV', and to 0 if
    you don't. */
 #define HAVE_DECL_AI_NUMERICSERV 1
 
 /* Define to 1 if you have the declaration of `authenticate', and to 0 if you
    don't. */
 /* #undef HAVE_DECL_AUTHENTICATE */
 
 /* Define to 1 if you have the declaration of `GLOB_NOMATCH', and to 0 if you
    don't. */
 #define HAVE_DECL_GLOB_NOMATCH 1
 
 /* Define to 1 if you have the declaration of `GSS_C_NT_HOSTBASED_SERVICE',
    and to 0 if you don't. */
 /* #undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE */
 
 /* Define to 1 if you have the declaration of `howmany', and to 0 if you
    don't. */
 #define HAVE_DECL_HOWMANY 1
 
 /* Define to 1 if you have the declaration of `h_errno', and to 0 if you
    don't. */
 #define HAVE_DECL_H_ERRNO 1
 
 /* Define to 1 if you have the declaration of `loginfailed', and to 0 if you
    don't. */
 /* #undef HAVE_DECL_LOGINFAILED */
 
 /* Define to 1 if you have the declaration of `loginrestrictions', and to 0 if
    you don't. */
 /* #undef HAVE_DECL_LOGINRESTRICTIONS */
 
 /* Define to 1 if you have the declaration of `loginsuccess', and to 0 if you
    don't. */
 /* #undef HAVE_DECL_LOGINSUCCESS */
 
 /* Define to 1 if you have the declaration of `MAXSYMLINKS', and to 0 if you
    don't. */
 #define HAVE_DECL_MAXSYMLINKS 1
 
 /* Define to 1 if you have the declaration of `NFDBITS', and to 0 if you
    don't. */
 #define HAVE_DECL_NFDBITS 1
 
 /* Define to 1 if you have the declaration of `offsetof', and to 0 if you
    don't. */
 #define HAVE_DECL_OFFSETOF 1
 
 /* Define to 1 if you have the declaration of `O_NONBLOCK', and to 0 if you
    don't. */
 #define HAVE_DECL_O_NONBLOCK 1
 
 /* Define to 1 if you have the declaration of `passwdexpired', and to 0 if you
    don't. */
 /* #undef HAVE_DECL_PASSWDEXPIRED */
 
 /* Define to 1 if you have the declaration of `setauthdb', and to 0 if you
    don't. */
 /* #undef HAVE_DECL_SETAUTHDB */
 
 /* Define to 1 if you have the declaration of `SHUT_RD', and to 0 if you
    don't. */
 #define HAVE_DECL_SHUT_RD 1
 
 /* Define to 1 if you have the declaration of `writev', and to 0 if you don't.
    */
 #define HAVE_DECL_WRITEV 1
 
 /* Define to 1 if you have the declaration of `_getlong', and to 0 if you
    don't. */
 #define HAVE_DECL__GETLONG 0
 
 /* Define to 1 if you have the declaration of `_getshort', and to 0 if you
    don't. */
 #define HAVE_DECL__GETSHORT 0
 
 /* Define to 1 if you have the `DES_crypt' function. */
 #define HAVE_DES_CRYPT 1
 
 /* Define if you have /dev/ptmx */
 /* #undef HAVE_DEV_PTMX */
 
 /* Define if you have /dev/ptc */
 /* #undef HAVE_DEV_PTS_AND_PTC */
 
 /* Define to 1 if you have the <dirent.h> header file. */
 #define HAVE_DIRENT_H 1
 
 /* Define to 1 if you have the `dirfd' function. */
 #define HAVE_DIRFD 1
 
 /* Define to 1 if you have the `dirname' function. */
 #define HAVE_DIRNAME 1
 
 /* Define to 1 if you have the `DSA_generate_parameters_ex' function. */
 #define HAVE_DSA_GENERATE_PARAMETERS_EX 1
 
 /* Define to 1 if you have the <elf.h> header file. */
 #define HAVE_ELF_H 1
 
 /* Define to 1 if you have the `endgrent' function. */
 #define HAVE_ENDGRENT 1
 
 /* Define to 1 if you have the <endian.h> header file. */
 /* #undef HAVE_ENDIAN_H */
 
 /* Define to 1 if you have the `endutent' function. */
 /* #undef HAVE_ENDUTENT */
 
 /* Define to 1 if you have the `endutxent' function. */
 #define HAVE_ENDUTXENT 1
 
 /* Define if your system has /etc/default/login */
 /* #undef HAVE_ETC_DEFAULT_LOGIN */
 
 /* Define if libcrypto has EVP_CIPHER_CTX_ctrl */
 #define HAVE_EVP_CIPHER_CTX_CTRL 1
 
 /* Define to 1 if you have the `EVP_DigestFinal_ex' function. */
 #define HAVE_EVP_DIGESTFINAL_EX 1
 
 /* Define to 1 if you have the `EVP_DigestInit_ex' function. */
 #define HAVE_EVP_DIGESTINIT_EX 1
 
 /* Define to 1 if you have the `EVP_MD_CTX_cleanup' function. */
 #define HAVE_EVP_MD_CTX_CLEANUP 1
 
 /* Define to 1 if you have the `EVP_MD_CTX_copy_ex' function. */
 #define HAVE_EVP_MD_CTX_COPY_EX 1
 
 /* Define to 1 if you have the `EVP_MD_CTX_init' function. */
 #define HAVE_EVP_MD_CTX_INIT 1
 
 /* Define to 1 if you have the `EVP_ripemd160' function. */
 #define HAVE_EVP_RIPEMD160 1
 
 /* Define to 1 if you have the `EVP_sha256' function. */
 #define HAVE_EVP_SHA256 1
 
 /* Define if you have ut_exit in utmp.h */
 /* #undef HAVE_EXIT_IN_UTMP */
 
 /* Define to 1 if you have the `explicit_bzero' function. */
 #define HAVE_EXPLICIT_BZERO 1
 
 /* Define to 1 if you have the `fchmod' function. */
 #define HAVE_FCHMOD 1
 
 /* Define to 1 if you have the `fchown' function. */
 #define HAVE_FCHOWN 1
 
 /* Use F_CLOSEM fcntl for closefrom */
 /* #undef HAVE_FCNTL_CLOSEM */
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
 /* Define to 1 if the system has the type `fd_mask'. */
 #define HAVE_FD_MASK 1
 
 /* Define to 1 if you have the <features.h> header file. */
 /* #undef HAVE_FEATURES_H */
 
 /* Define to 1 if you have the <floatingpoint.h> header file. */
 #define HAVE_FLOATINGPOINT_H 1
 
 /* Define to 1 if you have the `fmt_scaled' function. */
 /* #undef HAVE_FMT_SCALED */
 
 /* Define to 1 if you have the `freeaddrinfo' function. */
 #define HAVE_FREEADDRINFO 1
 
 /* Define to 1 if the system has the type `fsblkcnt_t'. */
 #define HAVE_FSBLKCNT_T 1
 
 /* Define to 1 if the system has the type `fsfilcnt_t'. */
 #define HAVE_FSFILCNT_T 1
 
 /* Define to 1 if you have the `fstatfs' function. */
 #define HAVE_FSTATFS 1
 
 /* Define to 1 if you have the `fstatvfs' function. */
 #define HAVE_FSTATVFS 1
 
 /* Define to 1 if you have the `futimes' function. */
 #define HAVE_FUTIMES 1
 
 /* Define to 1 if you have the `gai_strerror' function. */
 #define HAVE_GAI_STRERROR 1
 
 /* Define to 1 if you have the `getaddrinfo' function. */
 #define HAVE_GETADDRINFO 1
 
 /* Define to 1 if you have the `getaudit' function. */
 /* #undef HAVE_GETAUDIT */
 
 /* Define to 1 if you have the `getaudit_addr' function. */
 /* #undef HAVE_GETAUDIT_ADDR */
 
 /* Define to 1 if you have the `getcwd' function. */
 #define HAVE_GETCWD 1
 
 /* Define to 1 if you have the `getgrouplist' function. */
 #define HAVE_GETGROUPLIST 1
 
 /* Define to 1 if you have the `getgrset' function. */
 /* #undef HAVE_GETGRSET */
 
 /* Define to 1 if you have the `getlastlogxbyname' function. */
 /* #undef HAVE_GETLASTLOGXBYNAME */
 
 /* Define to 1 if you have the `getluid' function. */
 /* #undef HAVE_GETLUID */
 
 /* Define to 1 if you have the `getnameinfo' function. */
 #define HAVE_GETNAMEINFO 1
 
 /* Define to 1 if you have the `getopt' function. */
 #define HAVE_GETOPT 1
 
 /* Define to 1 if you have the <getopt.h> header file. */
 #define HAVE_GETOPT_H 1
 
 /* Define if your getopt(3) defines and uses optreset */
 #define HAVE_GETOPT_OPTRESET 1
 
 /* Define if your libraries define getpagesize() */
 #define HAVE_GETPAGESIZE 1
 
 /* Define to 1 if you have the `getpeereid' function. */
 #define HAVE_GETPEEREID 1
 
 /* Define to 1 if you have the `getpeerucred' function. */
 /* #undef HAVE_GETPEERUCRED */
 
 /* Define to 1 if you have the `getpgid' function. */
 #define HAVE_GETPGID 1
 
 /* Define to 1 if you have the `getpgrp' function. */
 #define HAVE_GETPGRP 1
 
 /* Define to 1 if you have the `getpwanam' function. */
 /* #undef HAVE_GETPWANAM */
 
 /* Define to 1 if you have the `getrlimit' function. */
 #define HAVE_GETRLIMIT 1
 
 /* Define if getrrsetbyname() exists */
 /* #undef HAVE_GETRRSETBYNAME */
 
 /* Define to 1 if you have the `getrusage' function. */
 /* #undef HAVE_GETRUSAGE */
 
 /* Define to 1 if you have the `getseuserbyname' function. */
 /* #undef HAVE_GETSEUSERBYNAME */
 
 /* Define to 1 if you have the `gettimeofday' function. */
 #define HAVE_GETTIMEOFDAY 1
 
 /* Define to 1 if you have the `getttyent' function. */
 #define HAVE_GETTTYENT 1
 
 /* Define to 1 if you have the `getutent' function. */
 /* #undef HAVE_GETUTENT */
 
 /* Define to 1 if you have the `getutid' function. */
 /* #undef HAVE_GETUTID */
 
 /* Define to 1 if you have the `getutline' function. */
 /* #undef HAVE_GETUTLINE */
 
 /* Define to 1 if you have the `getutxent' function. */
 #define HAVE_GETUTXENT 1
 
 /* Define to 1 if you have the `getutxid' function. */
 #define HAVE_GETUTXID 1
 
 /* Define to 1 if you have the `getutxline' function. */
 #define HAVE_GETUTXLINE 1
 
 /* Define to 1 if you have the `getutxuser' function. */
 #define HAVE_GETUTXUSER 1
 
 /* Define to 1 if you have the `get_default_context_with_level' function. */
 /* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */
 
 /* Define to 1 if you have the `glob' function. */
 #define HAVE_GLOB 1
 
 /* Define to 1 if you have the <glob.h> header file. */
 #define HAVE_GLOB_H 1
 
 /* Define to 1 if you have the `group_from_gid' function. */
 #define HAVE_GROUP_FROM_GID 1
 
 /* Define to 1 if you have the <gssapi_generic.h> header file. */
 /* #undef HAVE_GSSAPI_GENERIC_H */
 
 /* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
 /* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
 
 /* Define to 1 if you have the <gssapi/gssapi.h> header file. */
 /* #undef HAVE_GSSAPI_GSSAPI_H */
 
 /* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */
 /* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */
 
 /* Define to 1 if you have the <gssapi.h> header file. */
 /* #undef HAVE_GSSAPI_H */
 
 /* Define to 1 if you have the <gssapi_krb5.h> header file. */
 /* #undef HAVE_GSSAPI_KRB5_H */
 
 /* Define if HEADER.ad exists in arpa/nameser.h */
 #define HAVE_HEADER_AD 1
 
 /* Define to 1 if you have the `HMAC_CTX_init' function. */
 #define HAVE_HMAC_CTX_INIT 1
 
 /* Define if you have ut_host in utmp.h */
 /* #undef HAVE_HOST_IN_UTMP */
 
 /* Define if you have ut_host in utmpx.h */
 #define HAVE_HOST_IN_UTMPX 1
 
 /* Define to 1 if you have the <iaf.h> header file. */
 /* #undef HAVE_IAF_H */
 
 /* Define to 1 if you have the <ia.h> header file. */
 /* #undef HAVE_IA_H */
 
 /* Define if you have ut_id in utmp.h */
 /* #undef HAVE_ID_IN_UTMP */
 
 /* Define if you have ut_id in utmpx.h */
 #define HAVE_ID_IN_UTMPX 1
 
 /* Define to 1 if you have the `inet_aton' function. */
 #define HAVE_INET_ATON 1
 
 /* Define to 1 if you have the `inet_ntoa' function. */
 #define HAVE_INET_NTOA 1
 
 /* Define to 1 if you have the `inet_ntop' function. */
 #define HAVE_INET_NTOP 1
 
 /* Define to 1 if you have the `innetgr' function. */
 #define HAVE_INNETGR 1
 
 /* define if you have int64_t data type */
 #define HAVE_INT64_T 1
 
 /* Define to 1 if the system has the type `intmax_t'. */
 #define HAVE_INTMAX_T 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
 /* define if you have intxx_t data type */
 #define HAVE_INTXX_T 1
 
 /* Define to 1 if the system has the type `in_addr_t'. */
 #define HAVE_IN_ADDR_T 1
 
 /* Define to 1 if the system has the type `in_port_t'. */
 #define HAVE_IN_PORT_T 1
 
 /* Define if you have isblank(3C). */
 #define HAVE_ISBLANK 1
 
 /* Define to 1 if you have the `krb5_cc_new_unique' function. */
 /* #undef HAVE_KRB5_CC_NEW_UNIQUE */
 
 /* Define to 1 if you have the `krb5_free_error_message' function. */
 /* #undef HAVE_KRB5_FREE_ERROR_MESSAGE */
 
 /* Define to 1 if you have the `krb5_get_error_message' function. */
 /* #undef HAVE_KRB5_GET_ERROR_MESSAGE */
 
 /* Define to 1 if you have the <lastlog.h> header file. */
 /* #undef HAVE_LASTLOG_H */
 
 /* Define if you want ldns support */
 /* #undef HAVE_LDNS */
 
 /* Define to 1 if you have the <libaudit.h> header file. */
 /* #undef HAVE_LIBAUDIT_H */
 
 /* Define to 1 if you have the `bsm' library (-lbsm). */
 /* #undef HAVE_LIBBSM */
 
 /* Define to 1 if you have the `crypt' library (-lcrypt). */
 /* #undef HAVE_LIBCRYPT */
 
 /* Define to 1 if you have the `dl' library (-ldl). */
 /* #undef HAVE_LIBDL */
 
 /* Define to 1 if you have the <libgen.h> header file. */
 #define HAVE_LIBGEN_H 1
 
 /* Define if system has libiaf that supports set_id */
 /* #undef HAVE_LIBIAF */
 
 /* Define to 1 if you have the `network' library (-lnetwork). */
 /* #undef HAVE_LIBNETWORK */
 
 /* Define to 1 if you have the `pam' library (-lpam). */
 #define HAVE_LIBPAM 1
 
 /* Define to 1 if you have the `socket' library (-lsocket). */
 /* #undef HAVE_LIBSOCKET */
 
 /* Define to 1 if you have the <libutil.h> header file. */
 #define HAVE_LIBUTIL_H 1
 
 /* Define to 1 if you have the `xnet' library (-lxnet). */
 /* #undef HAVE_LIBXNET */
 
 /* Define to 1 if you have the `z' library (-lz). */
 #define HAVE_LIBZ 1
 
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
 /* Define to 1 if you have the <linux/audit.h> header file. */
 /* #undef HAVE_LINUX_AUDIT_H */
 
 /* Define to 1 if you have the <linux/filter.h> header file. */
 /* #undef HAVE_LINUX_FILTER_H */
 
 /* Define to 1 if you have the <linux/if_tun.h> header file. */
 /* #undef HAVE_LINUX_IF_TUN_H */
 
 /* Define to 1 if you have the <linux/seccomp.h> header file. */
 /* #undef HAVE_LINUX_SECCOMP_H */
 
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
 /* Define to 1 if you have the `login' function. */
 /* #undef HAVE_LOGIN */
 
 /* Define to 1 if you have the <login_cap.h> header file. */
 #define HAVE_LOGIN_CAP_H 1
 
 /* Define to 1 if you have the `login_getcapbool' function. */
 #define HAVE_LOGIN_GETCAPBOOL 1
 
 /* Define to 1 if you have the <login.h> header file. */
 /* #undef HAVE_LOGIN_H */
 
 /* Define to 1 if you have the `logout' function. */
 /* #undef HAVE_LOGOUT */
 
 /* Define to 1 if you have the `logwtmp' function. */
 /* #undef HAVE_LOGWTMP */
 
 /* Define to 1 if the system has the type `long double'. */
 #define HAVE_LONG_DOUBLE 1
 
 /* Define to 1 if the system has the type `long long'. */
 #define HAVE_LONG_LONG 1
 
 /* Define to 1 if you have the <maillock.h> header file. */
 /* #undef HAVE_MAILLOCK_H */
 
 /* Define to 1 if you have the `mblen' function. */
 #define HAVE_MBLEN 1
 
 /* Define to 1 if you have the `md5_crypt' function. */
 /* #undef HAVE_MD5_CRYPT */
 
 /* Define if you want to allow MD5 passwords */
 /* #undef HAVE_MD5_PASSWORDS */
 
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the `memset_s' function. */
 /* #undef HAVE_MEMSET_S */
 
 /* Define to 1 if you have the `mkdtemp' function. */
 #define HAVE_MKDTEMP 1
 
 /* Define to 1 if you have the `mmap' function. */
 #define HAVE_MMAP 1
 
 /* define if you have mode_t data type */
 #define HAVE_MODE_T 1
 
 /* Some systems put nanosleep outside of libc */
 #define HAVE_NANOSLEEP 1
 
 /* Define to 1 if you have the <ndir.h> header file. */
 /* #undef HAVE_NDIR_H */
 
 /* Define to 1 if you have the <netdb.h> header file. */
 #define HAVE_NETDB_H 1
 
 /* Define to 1 if you have the <netgroup.h> header file. */
 /* #undef HAVE_NETGROUP_H */
 
 /* Define to 1 if you have the <net/if_tun.h> header file. */
 #define HAVE_NET_IF_TUN_H 1
 
 /* Define if you are on NeXT */
 /* #undef HAVE_NEXT */
 
 /* Define to 1 if you have the `ngetaddrinfo' function. */
 /* #undef HAVE_NGETADDRINFO */
 
 /* Define to 1 if you have the `nsleep' function. */
 /* #undef HAVE_NSLEEP */
 
 /* Define to 1 if you have the `ogetaddrinfo' function. */
 /* #undef HAVE_OGETADDRINFO */
 
 /* Define if you have an old version of PAM which takes only one argument to
    pam_strerror */
 /* #undef HAVE_OLD_PAM */
 
 /* Define to 1 if you have the `openlog_r' function. */
 /* #undef HAVE_OPENLOG_R */
 
 /* Define to 1 if you have the `openpty' function. */
 #define HAVE_OPENPTY 1
 
 /* Define if your ssl headers are included with #include <openssl/header.h> */
 #define HAVE_OPENSSL 1
 
 /* Define if you have Digital Unix Security Integration Architecture */
 /* #undef HAVE_OSF_SIA */
 
 /* Define to 1 if you have the `pam_getenvlist' function. */
 #define HAVE_PAM_GETENVLIST 1
 
 /* Define to 1 if you have the <pam/pam_appl.h> header file. */
 /* #undef HAVE_PAM_PAM_APPL_H */
 
 /* Define to 1 if you have the `pam_putenv' function. */
 #define HAVE_PAM_PUTENV 1
 
 /* Define to 1 if you have the <paths.h> header file. */
 #define HAVE_PATHS_H 1
 
 /* Define if you have ut_pid in utmp.h */
 /* #undef HAVE_PID_IN_UTMP */
 
 /* define if you have pid_t data type */
 #define HAVE_PID_T 1
 
 /* Define to 1 if you have the `pledge' function. */
 /* #undef HAVE_PLEDGE */
 
 /* Define to 1 if you have the `poll' function. */
 #define HAVE_POLL 1
 
 /* Define to 1 if you have the <poll.h> header file. */
 #define HAVE_POLL_H 1
 
 /* Define to 1 if you have the `prctl' function. */
 /* #undef HAVE_PRCTL */
 
 /* Define to 1 if you have the `priv_basicset' function. */
 /* #undef HAVE_PRIV_BASICSET */
 
 /* Define to 1 if you have the <priv.h> header file. */
 /* #undef HAVE_PRIV_H */
 
 /* Define if you have /proc/$pid/fd */
 /* #undef HAVE_PROC_PID */
 
 /* Define to 1 if you have the `pstat' function. */
 /* #undef HAVE_PSTAT */
 
 /* Define to 1 if you have the <pty.h> header file. */
 /* #undef HAVE_PTY_H */
 
 /* Define to 1 if you have the `pututline' function. */
 /* #undef HAVE_PUTUTLINE */
 
 /* Define to 1 if you have the `pututxline' function. */
 #define HAVE_PUTUTXLINE 1
 
 /* Define to 1 if you have the `readpassphrase' function. */
 #define HAVE_READPASSPHRASE 1
 
 /* Define to 1 if you have the <readpassphrase.h> header file. */
 #define HAVE_READPASSPHRASE_H 1
 
 /* Define to 1 if you have the `reallocarray' function. */
 #define HAVE_REALLOCARRAY 1
 
 /* Define to 1 if you have the `realpath' function. */
 #define HAVE_REALPATH 1
 
 /* Define to 1 if you have the `recvmsg' function. */
 #define HAVE_RECVMSG 1
 
 /* sys/resource.h has RLIMIT_NPROC */
 #define HAVE_RLIMIT_NPROC /**/
 
 /* Define to 1 if you have the <rpc/types.h> header file. */
 #define HAVE_RPC_TYPES_H 1
 
 /* Define to 1 if you have the `rresvport_af' function. */
 #define HAVE_RRESVPORT_AF 1
 
 /* Define to 1 if you have the `RSA_generate_key_ex' function. */
 #define HAVE_RSA_GENERATE_KEY_EX 1
 
 /* Define to 1 if you have the `RSA_get_default_method' function. */
 #define HAVE_RSA_GET_DEFAULT_METHOD 1
 
 /* Define to 1 if you have the <sandbox.h> header file. */
 /* #undef HAVE_SANDBOX_H */
 
 /* Define to 1 if you have the `sandbox_init' function. */
 /* #undef HAVE_SANDBOX_INIT */
 
 /* define if you have sa_family_t data type */
 #define HAVE_SA_FAMILY_T 1
 
 /* Define to 1 if you have the `scan_scaled' function. */
 /* #undef HAVE_SCAN_SCALED */
 
 /* Define if you have SecureWare-based protected password database */
 /* #undef HAVE_SECUREWARE */
 
 /* Define to 1 if you have the <security/pam_appl.h> header file. */
 #define HAVE_SECURITY_PAM_APPL_H 1
 
 /* Define to 1 if you have the `sendmsg' function. */
 #define HAVE_SENDMSG 1
 
 /* Define to 1 if you have the `setauthdb' function. */
 /* #undef HAVE_SETAUTHDB */
 
 /* Define to 1 if you have the `setdtablesize' function. */
 /* #undef HAVE_SETDTABLESIZE */
 
 /* Define to 1 if you have the `setegid' function. */
 #define HAVE_SETEGID 1
 
 /* Define to 1 if you have the `setenv' function. */
 #define HAVE_SETENV 1
 
 /* Define to 1 if you have the `seteuid' function. */
 #define HAVE_SETEUID 1
 
 /* Define to 1 if you have the `setgroupent' function. */
 #define HAVE_SETGROUPENT 1
 
 /* Define to 1 if you have the `setgroups' function. */
 #define HAVE_SETGROUPS 1
 
 /* Define to 1 if you have the `setlinebuf' function. */
 #define HAVE_SETLINEBUF 1
 
 /* Define to 1 if you have the `setlogin' function. */
 #define HAVE_SETLOGIN 1
 
 /* Define to 1 if you have the `setluid' function. */
 /* #undef HAVE_SETLUID */
 
 /* Define to 1 if you have the `setpassent' function. */
 #define HAVE_SETPASSENT 1
 
 /* Define to 1 if you have the `setpcred' function. */
 /* #undef HAVE_SETPCRED */
 
 /* Define to 1 if you have the `setppriv' function. */
 /* #undef HAVE_SETPPRIV */
 
 /* Define to 1 if you have the `setproctitle' function. */
 #define HAVE_SETPROCTITLE 1
 
 /* Define to 1 if you have the `setregid' function. */
 #define HAVE_SETREGID 1
 
 /* Define to 1 if you have the `setresgid' function. */
 #define HAVE_SETRESGID 1
 
 /* Define to 1 if you have the `setresuid' function. */
 #define HAVE_SETRESUID 1
 
 /* Define to 1 if you have the `setreuid' function. */
 #define HAVE_SETREUID 1
 
 /* Define to 1 if you have the `setrlimit' function. */
 #define HAVE_SETRLIMIT 1
 
 /* Define to 1 if you have the `setsid' function. */
 #define HAVE_SETSID 1
 
 /* Define to 1 if you have the `setutent' function. */
 /* #undef HAVE_SETUTENT */
 
 /* Define to 1 if you have the `setutxdb' function. */
 #define HAVE_SETUTXDB 1
 
 /* Define to 1 if you have the `setutxent' function. */
 #define HAVE_SETUTXENT 1
 
 /* Define to 1 if you have the `setvbuf' function. */
 #define HAVE_SETVBUF 1
 
 /* Define to 1 if you have the `set_id' function. */
 /* #undef HAVE_SET_ID */
 
 /* Define to 1 if you have the `SHA256_Update' function. */
 #define HAVE_SHA256_UPDATE 1
 
 /* Define to 1 if you have the <sha2.h> header file. */
 /* #undef HAVE_SHA2_H */
 
 /* Define to 1 if you have the <shadow.h> header file. */
 /* #undef HAVE_SHADOW_H */
 
 /* Define to 1 if you have the `sigaction' function. */
 #define HAVE_SIGACTION 1
 
 /* Define to 1 if you have the `sigvec' function. */
 #define HAVE_SIGVEC 1
 
 /* Define to 1 if the system has the type `sig_atomic_t'. */
 #define HAVE_SIG_ATOMIC_T 1
 
 /* define if you have size_t data type */
 #define HAVE_SIZE_T 1
 
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
 /* Define to 1 if you have the `socketpair' function. */
 #define HAVE_SOCKETPAIR 1
 
 /* Have PEERCRED socket option */
 /* #undef HAVE_SO_PEERCRED */
 
 /* define if you have ssize_t data type */
 #define HAVE_SSIZE_T 1
 
 /* Fields in struct sockaddr_storage */
 #define HAVE_SS_FAMILY_IN_SS 1
 
 /* Define to 1 if you have the `statfs' function. */
 #define HAVE_STATFS 1
 
 /* Define to 1 if you have the `statvfs' function. */
 #define HAVE_STATVFS 1
 
 /* Define to 1 if you have the <stddef.h> header file. */
 #define HAVE_STDDEF_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the `strdup' function. */
 #define HAVE_STRDUP 1
 
 /* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
 /* Define to 1 if you have the `strftime' function. */
 #define HAVE_STRFTIME 1
 
 /* Silly mkstemp() */
 /* #undef HAVE_STRICT_MKSTEMP */
 
 /* Define to 1 if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have the `strlcat' function. */
 #define HAVE_STRLCAT 1
 
 /* Define to 1 if you have the `strlcpy' function. */
 #define HAVE_STRLCPY 1
 
 /* Define to 1 if you have the `strmode' function. */
 #define HAVE_STRMODE 1
 
 /* Define to 1 if you have the `strnlen' function. */
 #define HAVE_STRNLEN 1
 
 /* Define to 1 if you have the `strnvis' function. */
 #define HAVE_STRNVIS 1
 
 /* Define to 1 if you have the `strptime' function. */
 #define HAVE_STRPTIME 1
 
 /* Define to 1 if you have the `strsep' function. */
 #define HAVE_STRSEP 1
 
 /* Define to 1 if you have the `strtoll' function. */
 #define HAVE_STRTOLL 1
 
 /* Define to 1 if you have the `strtonum' function. */
 #define HAVE_STRTONUM 1
 
 /* Define to 1 if you have the `strtoul' function. */
 #define HAVE_STRTOUL 1
 
 /* Define to 1 if you have the `strtoull' function. */
 #define HAVE_STRTOULL 1
 
 /* define if you have struct addrinfo data type */
 #define HAVE_STRUCT_ADDRINFO 1
 
 /* define if you have struct in6_addr data type */
 #define HAVE_STRUCT_IN6_ADDR 1
 
 /* Define to 1 if `pw_change' is a member of `struct passwd'. */
 #define HAVE_STRUCT_PASSWD_PW_CHANGE 1
 
 /* Define to 1 if `pw_class' is a member of `struct passwd'. */
 #define HAVE_STRUCT_PASSWD_PW_CLASS 1
 
 /* Define to 1 if `pw_expire' is a member of `struct passwd'. */
 #define HAVE_STRUCT_PASSWD_PW_EXPIRE 1
 
 /* Define to 1 if `pw_gecos' is a member of `struct passwd'. */
 #define HAVE_STRUCT_PASSWD_PW_GECOS 1
 
 /* define if you have struct sockaddr_in6 data type */
 #define HAVE_STRUCT_SOCKADDR_IN6 1
 
 /* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */
 #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
 
 /* define if you have struct sockaddr_storage data type */
 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
 
 /* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
 
 /* Define to 1 if the system has the type `struct timespec'. */
 #define HAVE_STRUCT_TIMESPEC 1
 
 /* define if you have struct timeval */
 #define HAVE_STRUCT_TIMEVAL 1
 
 /* Define to 1 if you have the `swap32' function. */
 /* #undef HAVE_SWAP32 */
 
 /* Define to 1 if you have the `sysconf' function. */
 #define HAVE_SYSCONF 1
 
 /* Define if you have syslen in utmpx.h */
 /* #undef HAVE_SYSLEN_IN_UTMPX */
 
 /* Define to 1 if you have the <sys/audit.h> header file. */
 /* #undef HAVE_SYS_AUDIT_H */
 
 /* Define to 1 if you have the <sys/bitypes.h> header file. */
 /* #undef HAVE_SYS_BITYPES_H */
 
 /* Define to 1 if you have the <sys/bsdtty.h> header file. */
 /* #undef HAVE_SYS_BSDTTY_H */
 
 /* Define to 1 if you have the <sys/capsicum.h> header file. */
 #define HAVE_SYS_CAPSICUM_H 1
 
 /* Define to 1 if you have the <sys/cdefs.h> header file. */
 #define HAVE_SYS_CDEFS_H 1
 
 /* Define to 1 if you have the <sys/dir.h> header file. */
 #define HAVE_SYS_DIR_H 1
 
 /* Define if your system defines sys_errlist[] */
 #define HAVE_SYS_ERRLIST 1
 
 /* Define to 1 if you have the <sys/mman.h> header file. */
 #define HAVE_SYS_MMAN_H 1
 
 /* Define to 1 if you have the <sys/mount.h> header file. */
 #define HAVE_SYS_MOUNT_H 1
 
 /* Define to 1 if you have the <sys/ndir.h> header file. */
 /* #undef HAVE_SYS_NDIR_H */
 
 /* Define if your system defines sys_nerr */
 #define HAVE_SYS_NERR 1
 
 /* Define to 1 if you have the <sys/poll.h> header file. */
 #define HAVE_SYS_POLL_H 1
 
 /* Define to 1 if you have the <sys/prctl.h> header file. */
 /* #undef HAVE_SYS_PRCTL_H */
 
 /* Define to 1 if you have the <sys/pstat.h> header file. */
 /* #undef HAVE_SYS_PSTAT_H */
 
 /* Define to 1 if you have the <sys/ptms.h> header file. */
 /* #undef HAVE_SYS_PTMS_H */
 
 /* Define to 1 if you have the <sys/select.h> header file. */
 #define HAVE_SYS_SELECT_H 1
 
 /* Define to 1 if you have the <sys/statvfs.h> header file. */
 #define HAVE_SYS_STATVFS_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/stream.h> header file. */
 /* #undef HAVE_SYS_STREAM_H */
 
 /* Define to 1 if you have the <sys/stropts.h> header file. */
 /* #undef HAVE_SYS_STROPTS_H */
 
 /* Define to 1 if you have the <sys/strtio.h> header file. */
 /* #undef HAVE_SYS_STRTIO_H */
 
 /* Force use of sys/syslog.h on Ultrix */
 /* #undef HAVE_SYS_SYSLOG_H */
 
 /* Define to 1 if you have the <sys/sysmacros.h> header file. */
 /* #undef HAVE_SYS_SYSMACROS_H */
 
 /* Define to 1 if you have the <sys/timers.h> header file. */
 #define HAVE_SYS_TIMERS_H 1
 
 /* Define to 1 if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <sys/un.h> header file. */
 #define HAVE_SYS_UN_H 1
 
 /* Define to 1 if you have the `tcgetpgrp' function. */
 #define HAVE_TCGETPGRP 1
 
 /* Define to 1 if you have the `tcsendbreak' function. */
 #define HAVE_TCSENDBREAK 1
 
 /* Define to 1 if you have the `time' function. */
 #define HAVE_TIME 1
 
 /* Define to 1 if you have the <time.h> header file. */
 #define HAVE_TIME_H 1
 
 /* Define if you have ut_time in utmp.h */
 /* #undef HAVE_TIME_IN_UTMP */
 
 /* Define if you have ut_time in utmpx.h */
 /* #undef HAVE_TIME_IN_UTMPX */
 
 /* Define to 1 if you have the `timingsafe_bcmp' function. */
 /* #undef HAVE_TIMINGSAFE_BCMP */
 
 /* Define to 1 if you have the <tmpdir.h> header file. */
 /* #undef HAVE_TMPDIR_H */
 
 /* Define to 1 if you have the `truncate' function. */
 #define HAVE_TRUNCATE 1
 
 /* Define to 1 if you have the <ttyent.h> header file. */
 #define HAVE_TTYENT_H 1
 
 /* Define if you have ut_tv in utmp.h */
 /* #undef HAVE_TV_IN_UTMP */
 
 /* Define if you have ut_tv in utmpx.h */
 #define HAVE_TV_IN_UTMPX 1
 
 /* Define if you have ut_type in utmp.h */
 /* #undef HAVE_TYPE_IN_UTMP */
 
 /* Define if you have ut_type in utmpx.h */
 #define HAVE_TYPE_IN_UTMPX 1
 
 /* Define to 1 if you have the <ucred.h> header file. */
 /* #undef HAVE_UCRED_H */
 
 /* Define to 1 if the system has the type `uintmax_t'. */
 #define HAVE_UINTMAX_T 1
 
 /* define if you have uintxx_t data type */
 #define HAVE_UINTXX_T 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the `unsetenv' function. */
 #define HAVE_UNSETENV 1
 
 /* Define to 1 if the system has the type `unsigned long long'. */
 #define HAVE_UNSIGNED_LONG_LONG 1
 
 /* Define to 1 if you have the `updwtmp' function. */
 /* #undef HAVE_UPDWTMP */
 
 /* Define to 1 if you have the `updwtmpx' function. */
 /* #undef HAVE_UPDWTMPX */
 
 /* Define to 1 if you have the <usersec.h> header file. */
 /* #undef HAVE_USERSEC_H */
 
 /* Define to 1 if you have the `user_from_uid' function. */
 #define HAVE_USER_FROM_UID 1
 
 /* Define to 1 if you have the `usleep' function. */
 #define HAVE_USLEEP 1
 
 /* Define to 1 if you have the <util.h> header file. */
 /* #undef HAVE_UTIL_H */
 
 /* Define to 1 if you have the `utimes' function. */
 #define HAVE_UTIMES 1
 
 /* Define to 1 if you have the <utime.h> header file. */
 #define HAVE_UTIME_H 1
 
 /* Define to 1 if you have the `utmpname' function. */
 /* #undef HAVE_UTMPNAME */
 
 /* Define to 1 if you have the `utmpxname' function. */
 /* #undef HAVE_UTMPXNAME */
 
 /* Define to 1 if you have the <utmpx.h> header file. */
 #define HAVE_UTMPX_H 1
 
 /* Define to 1 if you have the <utmp.h> header file. */
 /* #undef HAVE_UTMP_H */
 
 /* define if you have u_char data type */
 #define HAVE_U_CHAR 1
 
 /* define if you have u_int data type */
 #define HAVE_U_INT 1
 
 /* define if you have u_int64_t data type */
 #define HAVE_U_INT64_T 1
 
 /* define if you have u_intxx_t data type */
 #define HAVE_U_INTXX_T 1
 
 /* Define to 1 if you have the `vasprintf' function. */
 #define HAVE_VASPRINTF 1
 
 /* Define if va_copy exists */
 #define HAVE_VA_COPY 1
 
 /* Define to 1 if you have the <vis.h> header file. */
 #define HAVE_VIS_H 1
 
 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1
 
 /* Define to 1 if you have the `waitpid' function. */
 #define HAVE_WAITPID 1
 
 /* Define to 1 if you have the `_getlong' function. */
 #define HAVE__GETLONG 1
 
 /* Define to 1 if you have the `_getpty' function. */
 /* #undef HAVE__GETPTY */
 
 /* Define to 1 if you have the `_getshort' function. */
 #define HAVE__GETSHORT 1
 
 /* Define if you have struct __res_state _res as an extern */
 #define HAVE__RES_EXTERN 1
 
 /* Define to 1 if you have the `__b64_ntop' function. */
 #define HAVE___B64_NTOP 1
 
 /* Define to 1 if you have the `__b64_pton' function. */
 #define HAVE___B64_PTON 1
 
 /* Define if compiler implements __FUNCTION__ */
 #define HAVE___FUNCTION__ 1
 
 /* Define if libc defines __progname */
 #define HAVE___PROGNAME 1
 
 /* Fields in struct sockaddr_storage */
 /* #undef HAVE___SS_FAMILY_IN_SS */
 
 /* Define if __va_copy exists */
 #define HAVE___VA_COPY 1
 
 /* Define if compiler implements __func__ */
 #define HAVE___func__ 1
 
 /* Define this if you are using the Heimdal version of Kerberos V5 */
 /* #undef HEIMDAL */
 
 /* Define if you need to use IP address instead of hostname in $DISPLAY */
 /* #undef IPADDR_IN_DISPLAY */
 
 /* Detect IPv4 in IPv6 mapped addresses and treat as IPv4 */
 /* #undef IPV4_IN_IPV6 */
 
 /* Define if your system choked on IP TOS setting */
 /* #undef IP_TOS_IS_BROKEN */
 
 /* Define if you want Kerberos 5 support */
 /* #undef KRB5 */
 
 /* Define if pututxline updates lastlog too */
 /* #undef LASTLOG_WRITE_PUTUTXLINE */
 
 /* Define if you want TCP Wrappers support */
-#define LIBWRAP 1
+/* #undef LIBWRAP */
 
 /* Define to whatever link() returns for "not supported" if it doesn't return
    EOPNOTSUPP. */
 /* #undef LINK_OPNOTSUPP_ERRNO */
 
 /* Adjust Linux out-of-memory killer */
 /* #undef LINUX_OOM_ADJUST */
 
 /* max value of long long calculated by configure */
 /* #undef LLONG_MAX */
 
 /* min value of long long calculated by configure */
 /* #undef LLONG_MIN */
 
 /* Account locked with pw(1) */
 #define LOCKED_PASSWD_PREFIX "*LOCKED*"
 
 /* String used in /etc/passwd to denote locked account */
 /* #undef LOCKED_PASSWD_STRING */
 
 /* String used in /etc/passwd to denote locked account */
 /* #undef LOCKED_PASSWD_SUBSTR */
 
 /* Some versions of /bin/login need the TERM supplied on the commandline */
 /* #undef LOGIN_NEEDS_TERM */
 
 /* Some systems need a utmpx entry for /bin/login to work */
 /* #undef LOGIN_NEEDS_UTMPX */
 
 /* Define if your login program cannot handle end of options ("--") */
 /* #undef LOGIN_NO_ENDOPT */
 
 /* If your header files don't define LOGIN_PROGRAM, then use this (detected)
    from environment and PATH */
 #define LOGIN_PROGRAM_FALLBACK "/usr/bin/login"
 
 /* Set this to your mail directory if you do not have _PATH_MAILDIR */
 /* #undef MAIL_DIRECTORY */
 
 /* Need setpgrp to acquire controlling tty */
 /* #undef NEED_SETPGRP */
 
 /* compiler does not accept __attribute__ on return types */
 /* #undef NO_ATTRIBUTE_ON_RETURN_TYPE */
 
 /* Define if the concept of ports only accessible to superusers isn't known */
 /* #undef NO_IPPORT_RESERVED_CONCEPT */
 
 /* Define if you don't want to use lastlog in session.c */
 /* #undef NO_SSH_LASTLOG */
 
 /* Define to disable UID restoration test */
 /* #undef NO_UID_RESTORATION_TEST */
 
 /* Define if X11 doesn't support AF_UNIX sockets on that system */
 /* #undef NO_X11_UNIX_SOCKETS */
 
 /* Define if EVP_DigestUpdate returns void */
 /* #undef OPENSSL_EVP_DIGESTUPDATE_VOID */
 
 /* OpenSSL has ECC */
 #define OPENSSL_HAS_ECC 1
 
 /* libcrypto has NID_X9_62_prime256v1 */
 #define OPENSSL_HAS_NISTP256 1
 
 /* libcrypto has NID_secp384r1 */
 #define OPENSSL_HAS_NISTP384 1
 
 /* libcrypto has NID_secp521r1 */
 #define OPENSSL_HAS_NISTP521 1
 
 /* libcrypto has EVP AES CTR */
 #define OPENSSL_HAVE_EVPCTR 1
 
 /* libcrypto has EVP AES GCM */
 #define OPENSSL_HAVE_EVPGCM 1
 
 /* libcrypto is missing AES 192 and 256 bit functions */
 /* #undef OPENSSL_LOBOTOMISED_AES */
 
 /* Define if you want the OpenSSL internally seeded PRNG only */
 #define OPENSSL_PRNG_ONLY 1
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "openssh-unix-dev@mindrot.org"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "OpenSSH"
 
 /* Define to the full name and version of this package. */
 #define PACKAGE_STRING "OpenSSH Portable"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "openssh"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "Portable"
 
 /* Define if you are using Solaris-derived PAM which passes pam_messages to
    the conversation function with an extra level of indirection */
 /* #undef PAM_SUN_CODEBASE */
 
 /* Work around problematic Linux PAM modules handling of PAM_TTY */
 /* #undef PAM_TTY_KLUDGE */
 
 /* must supply username to passwd */
 /* #undef PASSWD_NEEDS_USERNAME */
 
 /* System dirs owned by bin (uid 2) */
 /* #undef PLATFORM_SYS_DIR_UID */
 
 /* Port number of PRNGD/EGD random number socket */
 /* #undef PRNGD_PORT */
 
 /* Location of PRNGD/EGD random number socket */
 /* #undef PRNGD_SOCKET */
 
 /* read(1) can return 0 for a non-closed fd */
 /* #undef PTY_ZEROREAD */
 
 /* Sandbox using capsicum */
 #define SANDBOX_CAPSICUM 1
 
 /* Sandbox using Darwin sandbox_init(3) */
 /* #undef SANDBOX_DARWIN */
 
 /* no privsep sandboxing */
 /* #undef SANDBOX_NULL */
 
 /* Sandbox using pledge(2) */
 /* #undef SANDBOX_PLEDGE */
 
 /* Sandbox using setrlimit(2) */
 /* #undef SANDBOX_RLIMIT */
 
 /* Sandbox using seccomp filter */
 /* #undef SANDBOX_SECCOMP_FILTER */
 
 /* setrlimit RLIMIT_FSIZE works */
 /* #undef SANDBOX_SKIP_RLIMIT_FSIZE */
 
 /* define if setrlimit RLIMIT_NOFILE breaks things */
 #define SANDBOX_SKIP_RLIMIT_NOFILE 1
 
 /* Sandbox using Solaris/Illumos privileges */
 /* #undef SANDBOX_SOLARIS */
 
 /* Sandbox using systrace(4) */
 /* #undef SANDBOX_SYSTRACE */
 
 /* Specify the system call convention in use */
 /* #undef SECCOMP_AUDIT_ARCH */
 
 /* Define if your platform breaks doing a seteuid before a setuid */
 /* #undef SETEUID_BREAKS_SETUID */
 
 /* The size of `int', as computed by sizeof. */
 #define SIZEOF_INT 4
 
 /* The size of `long int', as computed by sizeof. */
 #define SIZEOF_LONG_INT 8
 
 /* The size of `long long int', as computed by sizeof. */
 #define SIZEOF_LONG_LONG_INT 8
 
 /* The size of `short int', as computed by sizeof. */
 #define SIZEOF_SHORT_INT 2
 
 /* Define if you want S/Key support */
 /* #undef SKEY */
 
 /* Define if your skeychallenge() function takes 4 arguments (NetBSD) */
 /* #undef SKEYCHALLENGE_4ARG */
 
 /* Define as const if snprintf() can declare const char *fmt */
 #define SNPRINTF_CONST const
 
 /* Define to a Set Process Title type if your system is supported by
    bsd-setproctitle.c */
 /* #undef SPT_TYPE */
 
 /* Define if sshd somehow reacquires a controlling TTY after setsid() */
 /* #undef SSHD_ACQUIRES_CTTY */
 
 /* Define if pam_chauthtok wants real uid set to the unpriv'ed user */
 /* #undef SSHPAM_CHAUTHTOK_NEEDS_RUID */
 
 /* Use audit debugging module */
 /* #undef SSH_AUDIT_EVENTS */
 
 /* Windows is sensitive to read buffer size */
 /* #undef SSH_IOBUFSZ */
 
 /* non-privileged user for privilege separation */
 #define SSH_PRIVSEP_USER "sshd"
 
 /* Use tunnel device compatibility to OpenBSD */
 /* #undef SSH_TUN_COMPAT_AF */
 
 /* Open tunnel devices the FreeBSD way */
 #define SSH_TUN_FREEBSD 1
 
 /* Open tunnel devices the Linux tun/tap way */
 /* #undef SSH_TUN_LINUX */
 
 /* No layer 2 tunnel support */
 /* #undef SSH_TUN_NO_L2 */
 
 /* Open tunnel devices the OpenBSD way */
 /* #undef SSH_TUN_OPENBSD */
 
 /* Prepend the address family to IP tunnel traffic */
 /* #undef SSH_TUN_PREPEND_AF */
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Define if you want a different $PATH for the superuser */
 /* #undef SUPERUSER_PATH */
 
 /* syslog_r function is safe to use in in a signal handler */
 /* #undef SYSLOG_R_SAFE_IN_SIGHAND */
 
 /* Support passwords > 8 chars */
 /* #undef UNIXWARE_LONG_PASSWORDS */
 
 /* Specify default $PATH */
 /* #undef USER_PATH */
 
 /* Define this if you want to use libkafs' AFS support */
 /* #undef USE_AFS */
 
 /* Use BSM audit module */
 /* #undef USE_BSM_AUDIT */
 
 /* Use btmp to log bad logins */
 /* #undef USE_BTMP */
 
 /* Use libedit for sftp */
 #define USE_LIBEDIT 1
 
 /* Use Linux audit module */
 /* #undef USE_LINUX_AUDIT */
 
 /* Enable OpenSSL engine support */
 #define USE_OPENSSL_ENGINE 1
 
 /* Define if you want to enable PAM support */
 #define USE_PAM 1
 
 /* Use PIPES instead of a socketpair() */
 /* #undef USE_PIPES */
 
 /* Define if you have Solaris privileges */
 /* #undef USE_SOLARIS_PRIVS */
 
 /* Define if you have Solaris process contracts */
 /* #undef USE_SOLARIS_PROCESS_CONTRACTS */
 
 /* Define if you have Solaris projects */
 /* #undef USE_SOLARIS_PROJECTS */
 
 /* Define if you shouldn't strip 'tty' from your ttyname in [uw]tmp */
 /* #undef WITH_ABBREV_NO_TTY */
 
 /* Define if you want to enable AIX4's authenticate function */
 /* #undef WITH_AIXAUTHENTICATE */
 
 /* Define if you have/want arrays (cluster-wide session managment, not C
    arrays) */
 /* #undef WITH_IRIX_ARRAY */
 
 /* Define if you want IRIX audit trails */
 /* #undef WITH_IRIX_AUDIT */
 
 /* Define if you want IRIX kernel jobs */
 /* #undef WITH_IRIX_JOBS */
 
 /* Define if you want IRIX project management */
 /* #undef WITH_IRIX_PROJECT */
 
 /* use libcrypto for cryptography */
 #define WITH_OPENSSL 1
 
 /* Define if you want SELinux support. */
 /* #undef WITH_SELINUX */
 
 /* include SSH protocol version 1 support */
 /* #undef WITH_SSH1 */
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
 # if defined __BIG_ENDIAN__
 #  define WORDS_BIGENDIAN 1
 # endif
 #else
 # ifndef WORDS_BIGENDIAN
 /* #  undef WORDS_BIGENDIAN */
 # endif
 #endif
 
 /* Define if xauth is found in your path */
 /* #undef XAUTH_PATH */
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1
 #endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
 /* log for bad login attempts */
 /* #undef _PATH_BTMP */
 
 /* Full path of your "passwd" program */
 #define _PATH_PASSWD_PROG "/usr/bin/passwd"
 
 /* Specify location of ssh.pid */
 #define _PATH_SSH_PIDDIR "/var/run"
 
 /* Define if we don't have struct __res_state in resolv.h */
 /* #undef __res_state */
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 /* #undef inline */
 #endif
 
 /* type to use in place of socklen_t if not defined */
 /* #undef socklen_t */
Index: projects/bsnmp-ipv6-mib/crypto/openssh
===================================================================
--- projects/bsnmp-ipv6-mib/crypto/openssh	(revision 311636)
+++ projects/bsnmp-ipv6-mib/crypto/openssh	(revision 311637)

Property changes on: projects/bsnmp-ipv6-mib/crypto/openssh
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/crypto/openssh:r311262-311635
Index: projects/bsnmp-ipv6-mib/etc/snmpd.config
===================================================================
--- projects/bsnmp-ipv6-mib/etc/snmpd.config	(revision 311636)
+++ projects/bsnmp-ipv6-mib/etc/snmpd.config	(revision 311637)
@@ -1,324 +1,327 @@
 # $FreeBSD$
 #
 # Example configuration file for bsnmpd(1).
 #
 
 #
 # Set some common variables
 #
 location := "Room 200"
 contact := "sysmeister@example.com"
 system := 1	# FreeBSD
 traphost := localhost
 trapport := 162
 
 #
 # Set the SNMP engine ID.
 #
 # The snmpEngineID object required from the SNMPv3 Framework. If not explicitly set via
 # this configuration file, an ID is assigned based on the value of the
 # kern.hostid variable
 # engine := 0x80:0x10:0x08:0x10:0x80:0x25
 # snmpEngineID = $(engine)
 
 # Change this!
 read := "public"
 # Uncomment begemotSnmpdCommunityString.0.2 below that sets the community
 # string to enable write access.
 write := "geheim"
 trap := "mytrap"
 
 #
 # Declarations for SNMP-USER-BASED-SM-MIB authentication and privacy options
 #
 
 NoAuthProtocol		:= 1.3.6.1.6.3.10.1.1.1
 HMACMD5AuthProtocol	:= 1.3.6.1.6.3.10.1.1.2
 HMACSHAAuthProtocol	:= 1.3.6.1.6.3.10.1.1.3
 NoPrivProtocol		:= 1.3.6.1.6.3.10.1.2.1
 DESPrivProtocol		:= 1.3.6.1.6.3.10.1.2.2
 AesCfb128Protocol	:= 1.3.6.1.6.3.10.1.2.4
 
 #
 # Enumerations from SNMP-FRAMEWORK-MIB
 #
 
 # Security models
 securityModelAny	:= 0
 securityModelSNMPv1	:= 1
 securityModelSNMPv2c	:= 2
 securityModelUSM	:= 3
 
 # Message Processing models
 MPmodelSNMPv1		:= 0
 MPmodelSNMPv2c		:= 1
 MPmodelSNMPv3		:= 3
 
 # Security levels
 noAuthNoPriv := 1
 authNoPriv := 2
 authPriv := 3
 
 
 # SNMPv3 USM User definition
 #
 # The localized hex password for a user may be obtained by setting SNMPUSER, SNMPPASSWD,
 # SNMPAUTH and SNMPPRIV environment variables to the desired parameters and invoking
 # 'bsnmpget -v 3 -D -K -o verbose' against the running bsnmpd(1). For other
 # usages refer to the bsnmpget(1) manual page. The following lines define a user "bsnmp"
 # with a private password "bsnmptest", localized for the above engine ID.
 #
 #user1 := "bsnmp"
 #user1passwd := 0x22:0x98:0x1a:0x6e:0x39:0x93:0x16:0x5e:0x6a:0x21:0x1b:0xd8:0xa9:0x81:0x31:0x05:0x16:0x33:0x38:0x60
 
 #
 # Configuration
 #
 %snmpd
 begemotSnmpdDebugDumpPdus	= 2
 begemotSnmpdDebugSyslogPri	= 7
 
 #
 # Set the read and write communities.
 #
 # The default value of the community strings is NULL (note, that this is
 # different from the empty string). This disables both read and write access.
 # To enable read access only the read community string must be set. Setting
 # the write community string enables both read and write access with that
 # string.
 #
 # Be sure to understand the security implications of SNMPv2 - the community
 # strings are readable on the wire!
 #
 begemotSnmpdCommunityString.0.1	= $(read)
 # begemotSnmpdCommunityString.0.2	= $(write)
 begemotSnmpdCommunityDisable	= 1
 
 # open standard SNMP ports
 begemotSnmpdPortStatus.0.0.0.0.161 = 1
 
 # open a unix domain socket
 begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1
 begemotSnmpdLocalPortType."/var/run/snmpd.sock" = 4
 
 # send traps to the traphost
 begemotTrapSinkStatus.[$(traphost)].$(trapport) = 4
 begemotTrapSinkVersion.[$(traphost)].$(trapport) = 2
 begemotTrapSinkComm.[$(traphost)].$(trapport) = $(trap)
 
 sysContact	= $(contact)
 sysLocation	= $(location)
 sysObjectId 	= 1.3.6.1.4.1.12325.1.1.2.1.$(system)
 
 snmpEnableAuthenTraps = 2
 
 # Uncomment `begemotSnmpdModulePath.".." = ".."' entries below to enable
 # modules
 
 #
 # Control configuration for the modules in the module specific sections, e.g.
 # the "usm" module (begemotSnmpdModulePath."usm") can be controlled in the
 # %usm specific section. You must uncomment the section specific header in
 # order to use the enclosed variables, e.g. `usmUserStatus.$(engine).$(user1)`
 # can only be used if %usm is uncommented.
 #
+# Modules are loaded in the order listed, so they must be before any
+# dependent modules, e.g. "mibII" vs "bridge".
+#
 
 #
+# MIB-2 module
+#
+begemotSnmpdModulePath."mibII"	= "/usr/lib/snmp_mibII.so"
+
+#
 # Bridge module
 #  This requires the mibII module.
 #
 #begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so"
 
 #
 # Host resources module
 #  This requires the mibII module.
 #
 #begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so"
 
 #
 # IPv6 module
 #
 #begemotSnmpdModulePath."ipv6MIB" = "/usr/lib/snmp_ipv6MIB.so"
 
 #
 # LM75 Sensor module
 #
 #begemotSnmpdModulePath."lm75" = "/usr/lib/snmp_lm75.so"
-
-#
-# MIB-2 module
-#
-begemotSnmpdModulePath."mibII"	= "/usr/lib/snmp_mibII.so"
 
 #
 # Netgraph module
 #
 #begemotSnmpdModulePath."netgraph" = "/usr/lib/snmp_netgraph.so"
 
 #
 # pf(4) module
 #
 #begemotSnmpdModulePath."pf"	= "/usr/lib/snmp_pf.so"
 
 #
 # SNMPv3 Notification Targets
 #
 # begemotSnmpdModulePath."target"	= "/usr/lib/snmp_target.so"
 
 #
 # SNMPv3 User-based security module - must be loaded for SNMPv3 USM
 #
 #begemotSnmpdModulePath."usm"	= "/usr/lib/snmp_usm.so"
 
 #
 # SNMPv3 View-based Access Control module
 #
 #begemotSnmpdModulePath."vacm"	= "/usr/lib/snmp_vacm.so"
 
 #
 # Wireless module
 #  This requires the mibII module.
 #
 #begemotSnmpdModulePath."wlan" = "/usr/lib/snmp_wlan.so"
 
 #
 # SNMPv3 USM User definition.
 #
 
 #%usm
 
 #
 # The following block creates a user with name "bsnmp" and sets privacy
 # and encryption options to SHA256 message digests and AES encryption
 # for this user.
 #
 # usmUserStatus.$(engine).$(user1) = 5
 # usmUserAuthProtocol.$(engine).$(user1) = $(HMACSHAAuthProtocol)
 # usmUserAuthKeyChange.$(engine).$(user1) = $(user1passwd)
 # usmUserPrivProtocol.$(engine).$(user1) = $(AesCfb128Protocol)
 # usmUserPrivKeyChange.$(engine).$(user1) = $(user1passwd)
 # usmUserStatus.$(engine).$(user1) = 1
 #
 
 #
 # The following block creates a user with name "public" with no authentication
 # or encryption options.
 #
 # usmUserStatus.$(engine).$(read) = 5
 # usmUserAuthProtocol.$(engine).$(read) = $(NoAuthProtocol)
 # usmUserPrivProtocol.$(engine).$(read) = $(NoPrivProtocol)
 # usmUserStatus.$(engine).$(read) = 1
 #
 
 #
 # Definition of view-based access control entries.
 #
 #%vacm
 
 # Definition of a SNMPv1 group
 # vacmSecurityToGroupStatus.$(securityModelSNMPv1).$(read) = 4
 # vacmGroupName.$(securityModelSNMPv1).$(read) = $(read)
 
 # Definition of SNMPv2 group
 # vacmSecurityToGroupStatus.$(securityModelSNMPv2c).$(write) = 4
 # vacmGroupName.$(securityModelSNMPv2c).$(write) = $(write)
 
 # Definition of SNMPv3 group with users "bsnmp" and "public"
 # vacmSecurityToGroupStatus.$(securityModelUSM).$(user1) = 4
 # vacmGroupName.$(securityModelUSM).$(user1) = $(write)
 # vacmSecurityToGroupStatus.$(securityModelUSM).$(read) = 4
 # vacmGroupName.$(securityModelUSM).$(read) = $(write)
 
 #
 # The OID of the .iso.org.dod.internet subtree
 #
 # internetoid := 1.3.6.1
 # internetoidlen := 4
 
 #
 # Definitions of two views
 #
 # vacmViewTreeFamilyStatus."internet".$(internetoidlen).$(internetoid) = 4
 # vacmViewTreeFamilyStatus."restricted".$(internetoidlen).$(internetoid) = 4
 
 #
 # Access control
 #
 
 #
 # Read-only access for SNMPv1 users
 #
 # vacmAccessStatus.$(read)."".$(securityModelSNMPv1).$(noAuthNoPriv) = 4
 # vacmAccessReadViewName.$(read)."".$(securityModelSNMPv1).$(noAuthNoPriv) = "internet"
 
 #
 # Read-write access for SNMPv2 users
 #
 # vacmAccessStatus.$(write)."".$(securityModelSNMPv2c).$(noAuthNoPriv) = 4
 # vacmAccessReadViewName.$(write)."".$(securityModelSNMPv2c).$(noAuthNoPriv) = "internet"
 # vacmAccessWriteViewName.$(write)."".$(securityModelSNMPv2c).$(noAuthNoPriv) = "internet"
 
 #
 # Read-write-notify access for SNMPv3 USM users with noAuthNoPriv
 #
 # vacmAccessStatus.$(write)."".3.$(noAuthNoPriv) = 4
 # vacmAccessReadViewName.$(write)."".$(securityModelUSM).$(noAuthNoPriv) = "internet"
 # vacmAccessWriteViewName.$(write)."".$(securityModelUSM).$(noAuthNoPriv) = "internet"
 # vacmAccessNotifyViewName.$(write)."".$(securityModelUSM).$(noAuthNoPriv) = "internet"
 
 #
 #Read-write-notify access to restricted for SNMPv3 USM users with authPriv
 #
 # vacmAccessStatus.$(write)."".$(securityModelUSM).$(authPriv) = 4
 # vacmAccessReadViewName.$(write)."".$(securityModelUSM).$(authPriv) = "restricted"
 # vacmAccessWriteViewName.$(write)."".$(securityModelUSM).$(authPriv) = "restricted"
 # vacmAccessNotifyViewName.$(write)."".$(securityModelUSM).$(authPriv) = "restricted"
 
 #%target
 # Send notifications to target tag "test"
 # tag		:= "test"
 # snmpNotifyRowStatus.$(tag) = 4
 # snmpNotifyTag.$(tag) = $(tag)
 
 # tagremote		:= "testremote"
 # snmpNotifyRowStatus.$(tagremote) = 4
 # snmpNotifyTag.$(tagremote) = $(tagremote)
 
 #
 # Specify the target parameters for the notifications - send with the credentials
 # of user "bsnmp"
 #
 # snmpTargetParamsRowStatus.$(tag) = 5
 # snmpTargetParamsMPModel.$(tag) = $(MPmodelSNMPv3)
 # snmpTargetParamsSecurityModel.$(tag) = $(securityModelUSM)
 # snmpTargetParamsSecurityName.$(tag) = $(user1)
 # snmpTargetParamsSecurityLevel.$(tag) = $(authPriv)
 # snmpTargetParamsRowStatus.$(tag) = 1
 
 #
 # Define the notifications' target address - port 162 on localhost
 #
 # snmpTargetAddrRowStatus.$(tag) = 5
 # snmpTargetAddrTAddress.$(tag) = 0x7f:0x0:0x0:0x1:0x0:0xa2
 # snmpTargetAddrTagList.$(tag) = "test notification"
 # snmpTargetAddrParams.$(tag) = $(tag)
 # snmpTargetAddrRowStatus.$(tag) = 1
 
 #
 # Define the notifications' target address - port 162 on 10.0.0.1
 #
 # snmpTargetAddrRowStatus.$(tagremote) = 5
 # snmpTargetAddrTAddress.$(tagremote) = 0x0a:0x00:0x00:0x1:0x0:0xa2
 # snmpTargetAddrTagList.$(tagremote) = $(tagremote)
 # snmpTargetAddrParams.$(tagremote) = $(tag)
 # snmpTargetAddrRowStatus.$(tagremote) = 1
 
 # Force a polling rate for the 64-bit interface counters in case
 # the automatic computation is wrong (which may be the case if an interface
 # announces the wrong bit rate via its MIB).
 #%mibII
 #begemotIfForcePoll = 2000
 
 #%netgraph
 #begemotNgControlNodeName = "snmpd"
 
Index: projects/bsnmp-ipv6-mib/gnu/lib/libgcc/Makefile
===================================================================
--- projects/bsnmp-ipv6-mib/gnu/lib/libgcc/Makefile	(revision 311636)
+++ projects/bsnmp-ipv6-mib/gnu/lib/libgcc/Makefile	(revision 311637)
@@ -1,373 +1,374 @@
 # $FreeBSD$
 
 PACKAGE=	clibs
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 CCDIR=	${.CURDIR}/../../usr.bin/cc
 
 SHLIB_NAME=	libgcc_s.so.1
 SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 #
 # libgcc is linked in last and thus cannot depend on ssp symbols coming
 # from earlier libraries. Disable stack protection for this library.
 #
 MK_SSP=	no
 
 .include "${CCDIR}/Makefile.tgt"
 .include "${CCDIR}/cc_tools/Makefile.hdrs"
 
 .if ${TARGET_CPUARCH} == "arm"
 CFLAGS+=	-DTARGET_ARM_EABI
 .endif
 
 .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}/config ${GCCDIR}
 
 CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
 		-DHAVE_GTHR_DEFAULT \
 		-I${GCCLIB}/include \
 		-I${GCCDIR}/config -I${GCCDIR} -I. \
 		-I${CCDIR}/cc_tools
 
 LDFLAGS+=	-nodefaultlibs
 LIBADD+=	c
 
 SOBJS=		# added to below in various ways depending on TARGET_CPUARCH
 
 #---------------------------------------------------------------------------
 #
 # Library members defined in libgcc2.c.
 # When upgrading GCC, obtain the following list from mklibgcc.in
 #
 LIB2FUNCS= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
 	_cmpdi2 _ucmpdi2 \
 	_enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \
 	_addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \
 	_ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \
 	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \
 	_powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 \
 	_divxc3 _divtc3 _bswapsi2 _bswapdi2
 .if ${COMPILER_TYPE} != "clang" || ${TARGET_CPUARCH} != "arm"
 LIB2FUNCS+= _clear_cache
 .endif
 
 # The floating-point conversion routines that involve a single-word integer.
 .for mode in sf df xf
 LIB2FUNCS+= _fixuns${mode}si
 .endfor
 
 # Likewise double-word routines.
 .if ${TARGET_CPUARCH} != "aarch64" && ${TARGET_CPUARCH} != "arm" && \
     ${TARGET_CPUARCH} != "riscv64"
 # These are implemented in an ARM specific file but will not be filtered out.
 # RISCVTODO: can't compile
 .for mode in sf df xf tf
 LIB2FUNCS+= _fix${mode}di _fixuns${mode}di
 LIB2FUNCS+= _floatdi${mode} _floatundi${mode}
 .endfor
 .endif
 
 LIB2ADD = $(LIB2FUNCS_EXTRA)
 LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
 
 
 .if ${TARGET_CPUARCH} == "arm"
 LIB2ADDEH =	unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c
 .else
 LIB2ADDEH = unwind-dw2.c unwind-dw2-fde-glibc.c unwind-sjlj.c gthr-gnat.c \
 	unwind-c.c
 .endif
 
 LIB2ADDEHSTATIC = $(LIB2ADDEH)
 LIB2ADDEHSHARED = $(LIB2ADDEH)
 
 # List of extra C and assembler files to add to static and shared libgcc2.
 # Assembler files should have names ending in `.asm'.
 LIB2FUNCS_EXTRA =
 
 # List of extra C and assembler files to add to static libgcc2.
 # Assembler files should have names ending in `.asm'.
 LIB2FUNCS_STATIC_EXTRA =
 
 # Defined in libgcc2.c, included only in the static library.
 # KAN: Excluded _sf_to_tf and _df_to_tf as TPBIT_FUNCS are not
 # built on any of our platforms.
 LIB2FUNCS_ST = _eprintf __gcc_bcmp
 
 FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \
     _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \
     _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \
     _sf_to_df _thenan_sf _sf_to_usi _usi_to_sf
 
 DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
     _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \
     _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \
     _df_to_sf _thenan_df _df_to_usi _usi_to_df
 
 TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \
     _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \
     _lt_tf _le_tf _unord_tf _si_to_tf _tf_to_si _negate_tf _make_tf \
     _tf_to_df _tf_to_sf _thenan_tf _tf_to_usi _usi_to_tf
 
 # These might cause a divide overflow trap and so are compiled with
 # unwinder info.
 LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
 
 #-----------------------------------------------------------------------
 #
 #	Platform specific bits.
 #	When upgrading GCC, get the following definitions from config/<cpu>/t-*
 #
 .if ${TARGET_CPUARCH} == "arm"
 #	from config/arm/t-strongarm-elf
 CFLAGS+=	-Dinhibit_libc -fno-inline
 CFLAGS.clang+=	-fheinous-gnu-extensions
 
 LIB1ASMSRC =	lib1funcs.asm
 LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
 # Some compilers generate __aeabi_ functions libgcc_s is missing
 LIBADD+=	compiler_rt
 .endif
 
 .if ${TARGET_CPUARCH} == mips
 LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
 # ABIs other than o32 need this
-.if ${TARGET_ARCH:Mmips64*} != "" || ${TARGET_ARCH:Mmipsn32*} != ""
+.if (${TARGET_ARCH:Mmips64*} != "" || ${TARGET_ARCH:Mmipsn32*} != "") && \
+    !defined(COMPAT_32BIT)
 LIB2FUNCS_EXTRA+= floatdidf.c fixunsdfsi.c
 LIB2FUNCS_EXTRA+= floatdisf.c floatundidf.c
 LIB2FUNCS_EXTRA+= fixsfdi.c floatundisf.c
 LIB2FUNCS_EXTRA+= fixdfdi.c fixunssfsi.c
 .endif
 .endif
 
 .if ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpcspe"
 #	from config/rs6000/t-ppccomm
 LIB2FUNCS_EXTRA = tramp.asm
 LIB2FUNCS_STATIC_EXTRA = eabi.asm
 .endif
 
 .if ${TARGET_ARCH} == "powerpc64"
 #	from config/rs6000/t-ppccomm
 LIB2FUNCS_EXTRA = tramp.asm
 .endif
 
 .if ${TARGET_CPUARCH} == "sparc64"
 #	from config/sparc/t-elf
 LIB1ASMSRC =   lb1spc.asm
 LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3
 .endif
 
 #-----------------------------------------------------------------------
 
 # Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are
 # defined as optimized assembly code in LIB1ASMFUNCS.
 .if defined(LIB1ASMFUNCS)
 .for sym in ${LIB1ASMFUNCS}
 LIB2FUNCS:=	${LIB2FUNCS:S/${sym}//g}
 LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g}
 .endfor
 .endif
 
 COMMONHDRS=	tm.h tconfig.h options.h gthr-default.h
 COMMONHDRS+=	unwind.h
 
 #-----------------------------------------------------------------------
 #
 # Helpful shortcuts for compiler invocations.
 #
 HIDE =  -fvisibility=hidden -DHIDE_EXPORTS
 CC_T =	${CC} -c ${CFLAGS} ${HIDE} -fPIC
 CC_P =	${CC} -c ${CFLAGS} ${HIDE} -p -fPIC
 CC_S =	${CC} -c ${CFLAGS} ${SHARED_CFLAGS} ${PICFLAG} -DSHARED
 
 #-----------------------------------------------------------------------
 #
 # Functions from libgcc2.c
 #
 STD_CFLAGS =
 DIV_CFLAGS =	-fexceptions -fnon-call-exceptions
 
 STD_FUNCS =	${LIB2FUNCS}
 DIV_FUNCS =	${LIB2_DIVMOD_FUNCS}
 
 STD_CFILE =	libgcc2.c
 DIV_CFILE =	libgcc2.c
 
 OBJ_GRPS =	STD DIV
 
 #-----------------------------------------------------------------------
 #
 # Floating point emulation functions
 #
 .if ${TARGET_CPUARCH} == "armNOT_YET" || \
     ${TARGET_CPUARCH} == "powerpc" || ${TARGET_CPUARCH} == "sparc64"
 
 FPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES -DFLOAT
 DPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES
 
 FPBIT_CFILE =	config/fp-bit.c
 DPBIT_CFILE =	config/fp-bit.c
 
 OBJ_GRPS +=	FPBIT DPBIT
 .endif
 
 #-----------------------------------------------------------------------
 #
 # Generic build rules for object groups defined above
 #
 .for T in ${OBJ_GRPS}
 ${T}_OBJS_T =	${${T}_FUNCS:S/$/.o/}
 ${T}_OBJS_P =	${${T}_FUNCS:S/$/.po/}
 ${T}_OBJS_S =	${${T}_FUNCS:S/$/.pico/}
 SOBJS +=	${${T}_FUNCS:S/$/.pico/}
 
 ${${T}_OBJS_T}: ${${T}_CFILE} ${COMMONHDRS}
 	${CC_T} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 ${${T}_OBJS_P}: ${${T}_CFILE} ${COMMONHDRS}
 	${CC_P} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 ${${T}_OBJS_S}: ${${T}_CFILE} ${COMMONHDRS}
 	${CC_S} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endfor
 
 #-----------------------------------------------------------------------
 #
 # Extra objects coming from separate files
 #
 .if !empty(LIB2ADD)
 SOBJS +=	${LIB2ADD:R:S/$/.pico/}
 .endif
 
 #-----------------------------------------------------------------------
 #
 # Objects that should be in static library only.
 #
 SYMS_ST =	${LIB2FUNCS_ST}	${LIB2ADD_ST}
 STAT_OBJS_T = 	${SYMS_ST:S/$/.o/}
 STAT_OBJS_P = 	${SYMS_ST:S/$/.po/}
 STATICOBJS  =	${SYMS_ST:S/$/.o/}
 
 ${STAT_OBJS_T}:	${STD_CFILE} ${COMMONHDRS}
 	${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 ${STAT_OBJS_P}:	${STD_CFILE} ${COMMONHDRS}
 	${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 
 #-----------------------------------------------------------------------
 #
 # Assembler files.
 #
 .if defined(LIB1ASMSRC)
 ASM_T =		${LIB1ASMFUNCS:S/$/.o/}
 ASM_P =		${LIB1ASMFUNCS:S/$/.po/}
 ASM_S =		${LIB1ASMFUNCS:S/$/.pico/}
 ASM_V =		${LIB1ASMFUNCS:S/$/.vis/}
 SOBJS +=	${LIB1ASMFUNCS:S/$/.pico/}
 
 ${ASM_T}: ${LIB1ASMSRC} ${.PREFIX}.vis
 	${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis}
 ${ASM_P}: ${LIB1ASMSRC} ${.PREFIX}.vis
 	${CC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis}
 ${ASM_S}: ${LIB1ASMSRC}
 	${CC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.TARGET} ${.ALLSRC:N*.h}
 ${ASM_V}: ${LIB1ASMSRC}
 	${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.PREFIX}.vo ${.ALLSRC:N*.h}
 	( ${NM} -pg ${.PREFIX}.vo | \
 		awk 'NF == 3 && $$2 !~ /^[UN]$$/ { print "\t.hidden ", $$3 }'\
 	) > ${.TARGET}
 
 CLEANFILES += ${ASM_V} ${ASM_V:R:S/$/.vo/}
 .endif
 
 #-----------------------------------------------------------------------
 #
 # Exception handling / unwinding support.
 #
 EH_OBJS_T = ${LIB2ADDEHSTATIC:R:S/$/.o/}
 EH_OBJS_P = ${LIB2ADDEHSTATIC:R:S/$/.po/}
 EH_OBJS_S = ${LIB2ADDEHSHARED:R:S/$/.pico/}
 EH_CFLAGS = -fexceptions -D__GLIBC__=3 -DElfW=__ElfN
 .if ${TARGET_CPUARCH} != "riscv64"
 # RISCVTODO: unwinding support
 SOBJS    += ${EH_OBJS_S}
 .endif
 
 .for _src in ${LIB2ADDEHSTATIC:M*.c}
 ${_src:R:S/$/.o/}: ${_src} ${COMMONHDRS}
 	${CC_T} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
 ${_src:R:S/$/.po/}: ${_src} ${COMMONHDRS}
 	${CC_P} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
 .endfor
 .for _src in ${LIB2ADDEHSHARED:M*.c}
 ${_src:R:S/$/.pico/}: ${_src} ${COMMONHDRS}
 	${CC_S} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
 .endfor
 
 
 CLEANFILES += ${COMMONHDRS}
 CLEANFILES += cs-*.h option*
 
 #-----------------------------------------------------------------------
 #
 # Build symbol version map
 #
 SHLIB_MKMAP      = ${GCCDIR}/mkmap-symver.awk
 SHLIB_MKMAP_OPTS =
 SHLIB_MAPFILES   = ${GCCDIR}/libgcc-std.ver
 .if ${TARGET_CPUARCH} == "arm"
 SHLIB_MAPFILES  += ${GCCDIR}/config/arm/libgcc-bpabi.ver
 .endif
 VERSION_MAP      = libgcc.map
 
 libgcc.map: ${SHLIB_MKMAP} ${SHLIB_MAPFILES} ${SOBJS}
 	(  ${NM} -pg ${SOBJS};echo %% ; \
 	  cat ${SHLIB_MAPFILES} \
 	    | sed -e '/^[   ]*#/d' \
 	          -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' \
 	    | ${CC} ${CFLAGS} -E -xassembler-with-cpp -; \
 	) | awk -f ${SHLIB_MKMAP} ${SHLIB_MKMAP_OPTS} > ${.TARGET}
 
 CLEANFILES +=	libgcc.map
 
 #-----------------------------------------------------------------------
 #
 # Build additional static libgcc_eh[_p].a libraries.
 #
 libgcc_eh.a:	${EH_OBJS_T}
 	@${ECHO} building static gcc_eh library
 	@rm -f ${.TARGET}
 	${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 
 _LIBS+= libgcc_eh.a
 
 .if ${MK_PROFILE} != "no"
 libgcc_eh_p.a:	${EH_OBJS_P}
 	@${ECHO} building profiled gcc_eh library
 	@rm -f ${.TARGET}
 	${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 
 _LIBS+= libgcc_eh_p.a
 .endif
 
 _libinstall: _lib-eh-install
 
 _lib-eh-install:
 .if ${MK_INSTALLLIB} != "no"
 	${INSTALL} ${TAG_ARGS} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 		${_INSTALLFLAGS} libgcc_eh.a ${DESTDIR}${LIBDIR}
 .endif
 .if ${MK_PROFILE} != "no"
 	${INSTALL} ${TAG_ARGS} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 		${_INSTALLFLAGS} libgcc_eh_p.a ${DESTDIR}${LIBDIR}
 .endif
 
 CLEANFILES+=	libgcc_eh.a libgcc_eh_p.a ${EH_OBJS_T} ${EH_OBJS_P}
 
 .include <bsd.lib.mk>
 
 .SUFFIXES: .vis .vo
Index: projects/bsnmp-ipv6-mib/gnu/lib
===================================================================
--- projects/bsnmp-ipv6-mib/gnu/lib	(revision 311636)
+++ projects/bsnmp-ipv6-mib/gnu/lib	(revision 311637)

Property changes on: projects/bsnmp-ipv6-mib/gnu/lib
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/gnu/lib:r311262-311635
Index: projects/bsnmp-ipv6-mib/gnu/usr.bin/binutils/ld/Makefile.mips
===================================================================
--- projects/bsnmp-ipv6-mib/gnu/usr.bin/binutils/ld/Makefile.mips	(revision 311636)
+++ projects/bsnmp-ipv6-mib/gnu/usr.bin/binutils/ld/Makefile.mips	(revision 311637)
@@ -1,37 +1,38 @@
 # $FreeBSD$
 
 .if ${TARGET_ARCH:Mmips*el*} != ""
 _EMULATION_ENDIAN=l
 .else
 _EMULATION_ENDIAN=b
 .endif
 
 .if ${TARGET_ARCH:Mmips64*} != ""
 NATIVE_EMULATION=elf64${_EMULATION_ENDIAN}tsmip_fbsd
+LIBSEARCHPATH.elf32${_EMULATION_ENDIAN}tsmip_fbsd=\"=/usr/lib32\"
 .elif ${TARGET_ARCH:Mmipsn32*} != ""
 NATIVE_EMULATION=elf32${_EMULATION_ENDIAN}tsmipn32_fbsd
 .else
 NATIVE_EMULATION?=elf32${_EMULATION_ENDIAN}tsmip_fbsd
 .endif
 
 MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd \
     elf32btsmipn32_fbsd elf32ltsmipn32_fbsd
 .for abi in ${MIPS_ABIS}
 #.if (${abi} != ${NATIVE_EMULATION})
 EMS+= ${abi}
 #.endif
 .for ext in ${ELF_SCR_EXT}
 LDSCRIPTS+= ${abi}.${ext}
 ldscripts/${abi}.${ext}: e${abi}.c
 .endfor
 SRCS+=	e${abi}.c 
 CLEANFILES+=	e${abi}.c
 # nb: elf32 handles both elf32 and elf64 targets
 e${abi}.c:	${.CURDIR}/${abi}.sh emultempl/elf32.em \
     scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSEARCHPATH} \
 	    ${TOOLS_PREFIX}/usr \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    ${abi} ""  no ${abi} ${TARGET_TUPLE} \
 	    ${.CURDIR}/${abi}.sh
 .endfor
Index: projects/bsnmp-ipv6-mib/gnu/usr.bin/binutils
===================================================================
--- projects/bsnmp-ipv6-mib/gnu/usr.bin/binutils	(revision 311636)
+++ projects/bsnmp-ipv6-mib/gnu/usr.bin/binutils	(revision 311637)

Property changes on: projects/bsnmp-ipv6-mib/gnu/usr.bin/binutils
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/gnu/usr.bin/binutils:r311262-311635
Index: projects/bsnmp-ipv6-mib/lib/lib80211/lib80211_regdomain.c
===================================================================
--- projects/bsnmp-ipv6-mib/lib/lib80211/lib80211_regdomain.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/lib/lib80211/lib80211_regdomain.c	(revision 311637)
@@ -1,707 +1,739 @@
 /*-
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef lint
 static const char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/sbuf.h>
 #include <sys/stat.h>
 
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <err.h>
 #include <unistd.h>
 
 #include <bsdxml.h>
 
 #include "lib80211_regdomain.h"
 
 #include <net80211/_ieee80211.h>
 
 #define	MAXLEVEL	20
 
 struct mystate {
 	XML_Parser		parser;
 	struct regdata		*rdp;
 	struct regdomain	*rd;		/* current domain */
 	struct netband		*netband;	/* current netband */
 	struct freqband		*freqband;	/* current freqband */
 	struct country		*country;	/* current country */
 	netband_head		*curband;	/* current netband list */
 	int			level;
 	struct sbuf		*sbuf[MAXLEVEL];
 	int			nident;
 };
 
 struct ident {
 	const void *id;
 	void *p;
 	enum { DOMAIN, COUNTRY, FREQBAND } type;
 };
 
 static void
 start_element(void *data, const char *name, const char **attr)
 {
 #define	iseq(a,b)	(strcasecmp(a,b) == 0)
 	struct mystate *mt;
 	const void *id, *ref, *mode;
 	int i;
 
 	mt = data;
 	if (++mt->level == MAXLEVEL) {
 		/* XXX force parser to abort */
 		return;
 	}
 	mt->sbuf[mt->level] = sbuf_new_auto();
 	id = ref = mode = NULL;
 	for (i = 0; attr[i] != NULL; i += 2) {
 		if (iseq(attr[i], "id")) {
 			id = attr[i+1];
 		} else if (iseq(attr[i], "ref")) {
 			ref = attr[i+1];
 		} else if (iseq(attr[i], "mode")) {
 			mode = attr[i+1];
 		} else
 			printf("%*.*s[%s = %s]\n", mt->level + 1,
 			    mt->level + 1, "", attr[i], attr[i+1]);
 	}
 	if (iseq(name, "rd") && mt->rd == NULL) {
 		if (mt->country == NULL) {
 			mt->rd = calloc(1, sizeof(struct regdomain));
 			mt->rd->name = strdup(id);
 			mt->nident++;
 			LIST_INSERT_HEAD(&mt->rdp->domains, mt->rd, next);
 		} else
 			mt->country->rd = (void *)strdup(ref);
 		return;
 	}
 	if (iseq(name, "defcc") && mt->rd != NULL) {
 		mt->rd->cc = (void *)strdup(ref);
 		return;
 	}
 	if (iseq(name, "netband") && mt->curband == NULL && mt->rd != NULL) {
 		if (mode == NULL) {
 			warnx("no mode for netband at line %ld",
 			    XML_GetCurrentLineNumber(mt->parser));
 			return;
 		}
 		if (iseq(mode, "11b"))
 			mt->curband = &mt->rd->bands_11b;
 		else if (iseq(mode, "11g"))
 			mt->curband = &mt->rd->bands_11g;
 		else if (iseq(mode, "11a"))
 			mt->curband = &mt->rd->bands_11a;
 		else if (iseq(mode, "11ng"))
 			mt->curband = &mt->rd->bands_11ng;
 		else if (iseq(mode, "11na"))
 			mt->curband = &mt->rd->bands_11na;
+		else if (iseq(mode, "11ac"))
+			mt->curband = &mt->rd->bands_11ac;
+		else if (iseq(mode, "11acg"))
+			mt->curband = &mt->rd->bands_11acg;
 		else
 			warnx("unknown mode \"%s\" at line %ld",
 			    __DECONST(char *, mode),
 			    XML_GetCurrentLineNumber(mt->parser));
 		return;
 	}
 	if (iseq(name, "band") && mt->netband == NULL) {
 		if (mt->curband == NULL) {
 			warnx("band without enclosing netband at line %ld",
 			    XML_GetCurrentLineNumber(mt->parser));
 			return;
 		}
 		mt->netband = calloc(1, sizeof(struct netband));
 		LIST_INSERT_HEAD(mt->curband, mt->netband, next);
 		return;
 	}
 	if (iseq(name, "freqband") && mt->freqband == NULL && mt->netband != NULL) {
 		/* XXX handle inlines and merge into table? */
 		if (mt->netband->band != NULL) {
 			warnx("duplicate freqband at line %ld ignored",
 			    XML_GetCurrentLineNumber(mt->parser));
 			/* XXX complain */
 		} else
 			mt->netband->band = (void *)strdup(ref);
 		return;
 	}
 
 	if (iseq(name, "country") && mt->country == NULL) {
 		mt->country = calloc(1, sizeof(struct country));
 		mt->country->isoname = strdup(id);
 		mt->country->code = NO_COUNTRY;
 		mt->nident++;
 		LIST_INSERT_HEAD(&mt->rdp->countries, mt->country, next);
 		return;
 	}
 
 	if (iseq(name, "freqband") && mt->freqband == NULL) {
 		mt->freqband = calloc(1, sizeof(struct freqband));
 		mt->freqband->id = strdup(id);
 		mt->nident++;
 		LIST_INSERT_HEAD(&mt->rdp->freqbands, mt->freqband, next);
 		return;
 	}
 #undef iseq
 }
 
 static int
 decode_flag(struct mystate *mt, const char *p, int len)
 {
 #define	iseq(a,b)	(strcasecmp(a,b) == 0)
 	static const struct {
 		const char *name;
 		int len;
 		uint32_t value;
 	} flags[] = {
 #define	FLAG(x)	{ #x, sizeof(#x)-1, x }
 		FLAG(IEEE80211_CHAN_A),
 		FLAG(IEEE80211_CHAN_B),
 		FLAG(IEEE80211_CHAN_G),
 		FLAG(IEEE80211_CHAN_HT20),
 		FLAG(IEEE80211_CHAN_HT40),
+		FLAG(IEEE80211_CHAN_VHT20),
+		FLAG(IEEE80211_CHAN_VHT40),
+		FLAG(IEEE80211_CHAN_VHT80),
+		/*
+		 * XXX VHT80_80? This likely should be done by
+		 * 80MHz chan logic in net80211 / ifconfig.
+		 */
+		FLAG(IEEE80211_CHAN_VHT160),
 		FLAG(IEEE80211_CHAN_ST),
 		FLAG(IEEE80211_CHAN_TURBO),
 		FLAG(IEEE80211_CHAN_PASSIVE),
 		FLAG(IEEE80211_CHAN_DFS),
 		FLAG(IEEE80211_CHAN_CCK),
 		FLAG(IEEE80211_CHAN_OFDM),
 		FLAG(IEEE80211_CHAN_2GHZ),
 		FLAG(IEEE80211_CHAN_5GHZ),
 		FLAG(IEEE80211_CHAN_DYN),
 		FLAG(IEEE80211_CHAN_GFSK),
 		FLAG(IEEE80211_CHAN_GSM),
 		FLAG(IEEE80211_CHAN_STURBO),
 		FLAG(IEEE80211_CHAN_HALF),
 		FLAG(IEEE80211_CHAN_QUARTER),
 		FLAG(IEEE80211_CHAN_HT40U),
 		FLAG(IEEE80211_CHAN_HT40D),
 		FLAG(IEEE80211_CHAN_4MSXMIT),
 		FLAG(IEEE80211_CHAN_NOADHOC),
 		FLAG(IEEE80211_CHAN_NOHOSTAP),
 		FLAG(IEEE80211_CHAN_11D),
 		FLAG(IEEE80211_CHAN_FHSS),
 		FLAG(IEEE80211_CHAN_PUREG),
 		FLAG(IEEE80211_CHAN_108A),
 		FLAG(IEEE80211_CHAN_108G),
 #undef FLAG
 		{ "ECM",	3,	REQ_ECM },
 		{ "INDOOR",	6,	REQ_INDOOR },
 		{ "OUTDOOR",	7,	REQ_OUTDOOR },
 	};
 	unsigned int i;
 
 	for (i = 0; i < nitems(flags); i++)
 		if (len == flags[i].len && iseq(p, flags[i].name))
 			return flags[i].value;
 	warnx("unknown flag \"%.*s\" at line %ld ignored",
 	    len, p, XML_GetCurrentLineNumber(mt->parser));
 	return 0;
 #undef iseq
 }
 
 static void
 end_element(void *data, const char *name)
 {
 #define	iseq(a,b)	(strcasecmp(a,b) == 0)
 	struct mystate *mt;
 	int len;
 	char *p;
 
 	mt = data;
 	sbuf_finish(mt->sbuf[mt->level]);
 	p = sbuf_data(mt->sbuf[mt->level]);
 	len = sbuf_len(mt->sbuf[mt->level]);
 
 	/* <freqband>...</freqband> */
 	if (iseq(name, "freqstart") && mt->freqband != NULL) {
 		mt->freqband->freqStart = strtoul(p, NULL, 0);
 		goto done;
 	}
 	if (iseq(name, "freqend") && mt->freqband != NULL) {
 		mt->freqband->freqEnd = strtoul(p, NULL, 0);
 		goto done;
 	}
 	if (iseq(name, "chanwidth") && mt->freqband != NULL) {
 		mt->freqband->chanWidth = strtoul(p, NULL, 0);
 		goto done;
 	}
 	if (iseq(name, "chansep") && mt->freqband != NULL) {
 		mt->freqband->chanSep = strtoul(p, NULL, 0);
 		goto done;
 	}
 	if (iseq(name, "flags")) {
 		if (mt->freqband != NULL)
 			mt->freqband->flags |= decode_flag(mt, p, len);
 		else if (mt->netband != NULL)
 			mt->netband->flags |= decode_flag(mt, p, len);
 		else {
 			warnx("flags without freqband or netband at line %ld ignored",
 			    XML_GetCurrentLineNumber(mt->parser));
 		}
 		goto done;
 	}
 
 	/* <rd> ... </rd> */
 	if (iseq(name, "name") && mt->rd != NULL) {
 		mt->rd->name = strdup(p);
 		goto done;
 	}
 	if (iseq(name, "sku") && mt->rd != NULL) {
 		mt->rd->sku = strtoul(p, NULL, 0);
 		goto done;
 	}
 	if (iseq(name, "netband") && mt->rd != NULL) {
 		mt->curband = NULL;
 		goto done;
 	}
 
 	/* <band> ... </band> */
 	if (iseq(name, "freqband") && mt->netband != NULL) {
 		/* XXX handle inline freqbands */
 		goto done;
 	}
 	if (iseq(name, "maxpower") && mt->netband != NULL) {
 		mt->netband->maxPower = strtoul(p, NULL, 0);
 		goto done;
 	}
 	if (iseq(name, "maxpowerdfs") && mt->netband != NULL) {
 		mt->netband->maxPowerDFS = strtoul(p, NULL, 0);
 		goto done;
 	}
 	if (iseq(name, "maxantgain") && mt->netband != NULL) {
 		mt->netband->maxAntGain = strtoul(p, NULL, 0);
 		goto done;
 	}
 
 	/* <country>...</country> */
 	if (iseq(name, "isocc") && mt->country != NULL) {
 		mt->country->code = strtoul(p, NULL, 0);
 		goto done;
 	}
 	if (iseq(name, "name") && mt->country != NULL) {
 		mt->country->name = strdup(p);
 		goto done;
 	}
 
 	if (len != 0) {
 		warnx("unexpected XML token \"%s\" data \"%s\" at line %ld",
 		    name, p, XML_GetCurrentLineNumber(mt->parser));
 		/* XXX goto done? */
 	}
 	/* </freqband> */
 	if (iseq(name, "freqband") && mt->freqband != NULL) {
 		/* XXX must have start/end frequencies */
 		/* XXX must have channel width/sep */
 		mt->freqband = NULL;
 		goto done;
 	}
 	/* </rd> */
 	if (iseq(name, "rd") && mt->rd != NULL) {
 		mt->rd = NULL;
 		goto done;
 	}
 	/* </band> */
 	if (iseq(name, "band") && mt->netband != NULL) {
 		if (mt->netband->band == NULL) {
 			warnx("no freqbands for band at line %ld",
 			   XML_GetCurrentLineNumber(mt->parser));
 		}
 		if (mt->netband->maxPower == 0) {
 			warnx("no maxpower for band at line %ld",
 			   XML_GetCurrentLineNumber(mt->parser));
 		}
 		/* default max power w/ DFS to max power */
 		if (mt->netband->maxPowerDFS == 0)
 			mt->netband->maxPowerDFS = mt->netband->maxPower;
 		mt->netband = NULL;
 		goto done;
 	}
 	/* </netband> */
 	if (iseq(name, "netband") && mt->netband != NULL) {
 		mt->curband = NULL;
 		goto done;
 	}
 	/* </country> */
 	if (iseq(name, "country") && mt->country != NULL) {
 		/* XXX NO_COUNTRY should be in the net80211 country enum */
 		if ((int) mt->country->code == NO_COUNTRY) {
 			warnx("no ISO cc for country at line %ld",
 			   XML_GetCurrentLineNumber(mt->parser));
 		}
 		if (mt->country->name == NULL) {
 			warnx("no name for country at line %ld",
 			   XML_GetCurrentLineNumber(mt->parser));
 		}
 		if (mt->country->rd == NULL) {
 			warnx("no regdomain reference for country at line %ld",
 			   XML_GetCurrentLineNumber(mt->parser));
 		}
 		mt->country = NULL;
 		goto done;
 	}
 done:
 	sbuf_delete(mt->sbuf[mt->level]);
 	mt->sbuf[mt->level--] = NULL;
 #undef iseq
 }
 
 static void
 char_data(void *data, const XML_Char *s, int len)
 {
 	struct mystate *mt;
 	const char *b, *e;
 
 	mt = data;
 
 	b = s;
 	e = s + len-1;
 	for (; isspace(*b) && b < e; b++)
 		;
 	for (; isspace(*e) && e > b; e++)
 		;
 	if (e != b || (*b != '\0' && !isspace(*b)))
 		sbuf_bcat(mt->sbuf[mt->level], b, e-b+1);
 }
 
 static void *
 findid(struct regdata *rdp, const void *id, int type)
 {
 	struct ident *ip;
 
 	for (ip = rdp->ident; ip->id != NULL; ip++)
 		if ((int) ip->type == type && strcasecmp(ip->id, id) == 0)
 			return ip->p;
 	return NULL;
 }
 
 /*
  * Parse an regdomain XML configuration and build the internal representation.
  */
 int
 lib80211_regdomain_readconfig(struct regdata *rdp, const void *p, size_t len)
 {
 	struct mystate *mt;
 	struct regdomain *dp;
 	struct country *cp;
 	struct freqband *fp;
 	struct netband *nb;
 	const void *id;
 	int i, errors;
 
 	memset(rdp, 0, sizeof(struct regdata));
 	mt = calloc(1, sizeof(struct mystate));
 	if (mt == NULL)
 		return ENOMEM;
 	/* parse the XML input */
 	mt->rdp = rdp;
 	mt->parser = XML_ParserCreate(NULL);
 	XML_SetUserData(mt->parser, mt);
 	XML_SetElementHandler(mt->parser, start_element, end_element);
 	XML_SetCharacterDataHandler(mt->parser, char_data);
 	if (XML_Parse(mt->parser, p, len, 1) != XML_STATUS_OK) {
 		warnx("%s: %s at line %ld", __func__,
 		   XML_ErrorString(XML_GetErrorCode(mt->parser)),
 		   XML_GetCurrentLineNumber(mt->parser));
 		return -1;
 	}
 	XML_ParserFree(mt->parser);
 
 	/* setup the identifer table */
 	rdp->ident = calloc(sizeof(struct ident), mt->nident + 1);
 	if (rdp->ident == NULL)
 		return ENOMEM;
 	free(mt);
 
 	errors = 0;
 	i = 0;
 	LIST_FOREACH(dp, &rdp->domains, next) {
 		rdp->ident[i].id = dp->name;
 		rdp->ident[i].p = dp;
 		rdp->ident[i].type = DOMAIN;
 		i++;
 	}
 	LIST_FOREACH(fp, &rdp->freqbands, next) {
 		rdp->ident[i].id = fp->id;
 		rdp->ident[i].p = fp;
 		rdp->ident[i].type = FREQBAND;
 		i++;
 	}
 	LIST_FOREACH(cp, &rdp->countries, next) {
 		rdp->ident[i].id = cp->isoname;
 		rdp->ident[i].p = cp;
 		rdp->ident[i].type = COUNTRY;
 		i++;
 	}
 
 	/* patch references */
 	LIST_FOREACH(dp, &rdp->domains, next) {
 		if (dp->cc != NULL) {
 			id = dp->cc;
 			dp->cc = findid(rdp, id, COUNTRY);
 			if (dp->cc == NULL) {
 				warnx("undefined country \"%s\"",
 				    __DECONST(char *, id));
 				errors++;
 			}
 			free(__DECONST(char *, id));
 		}
 		LIST_FOREACH(nb, &dp->bands_11b, next) {
 			id = findid(rdp, nb->band, FREQBAND);
 			if (id == NULL) {
 				warnx("undefined 11b band \"%s\"",
 				    __DECONST(char *, nb->band));
 				errors++;
 			}
 			nb->band = id;
 		}
 		LIST_FOREACH(nb, &dp->bands_11g, next) {
 			id = findid(rdp, nb->band, FREQBAND);
 			if (id == NULL) {
 				warnx("undefined 11g band \"%s\"",
 				    __DECONST(char *, nb->band));
 				errors++;
 			}
 			nb->band = id;
 		}
 		LIST_FOREACH(nb, &dp->bands_11a, next) {
 			id = findid(rdp, nb->band, FREQBAND);
 			if (id == NULL) {
 				warnx("undefined 11a band \"%s\"",
 				    __DECONST(char *, nb->band));
 				errors++;
 			}
 			nb->band = id;
 		}
 		LIST_FOREACH(nb, &dp->bands_11ng, next) {
 			id = findid(rdp, nb->band, FREQBAND);
 			if (id == NULL) {
 				warnx("undefined 11ng band \"%s\"",
 				    __DECONST(char *, nb->band));
 				errors++;
 			}
 			nb->band = id;
 		}
 		LIST_FOREACH(nb, &dp->bands_11na, next) {
 			id = findid(rdp, nb->band, FREQBAND);
 			if (id == NULL) {
 				warnx("undefined 11na band \"%s\"",
 				    __DECONST(char *, nb->band));
 				errors++;
 			}
 			nb->band = id;
 		}
+		LIST_FOREACH(nb, &dp->bands_11ac, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11ac band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
+		LIST_FOREACH(nb, &dp->bands_11acg, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11acg band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
 	}
 	LIST_FOREACH(cp, &rdp->countries, next) {
 		id = cp->rd;
 		cp->rd = findid(rdp, id, DOMAIN);
 		if (cp->rd == NULL) {
 			warnx("undefined country \"%s\"",
 			    __DECONST(char *, id));
 			errors++;
 		}
 		free(__DECONST(char *, id));
 	}
 
 	return errors ? EINVAL : 0;
 }
 
 static void
 cleanup_bands(netband_head *head)
 {
 	struct netband *nb;
 
 	for (;;) {
 		nb = LIST_FIRST(head);
 		if (nb == NULL)
 			break;
 		free(nb);
 	}
 }
 
 /*
  * Cleanup state/resources for a previously parsed regdomain database.
  */
 void
 lib80211_regdomain_cleanup(struct regdata *rdp)
 {
 
 	free(rdp->ident);
 	rdp->ident = NULL;
 	for (;;) {
 		struct regdomain *dp = LIST_FIRST(&rdp->domains);
 		if (dp == NULL)
 			break;
 		LIST_REMOVE(dp, next);
 		cleanup_bands(&dp->bands_11b);
 		cleanup_bands(&dp->bands_11g);
 		cleanup_bands(&dp->bands_11a);
 		cleanup_bands(&dp->bands_11ng);
 		cleanup_bands(&dp->bands_11na);
+		cleanup_bands(&dp->bands_11ac);
+		cleanup_bands(&dp->bands_11acg);
 		if (dp->name != NULL)
 			free(__DECONST(char *, dp->name));
 	}
 	for (;;) {
 		struct country *cp = LIST_FIRST(&rdp->countries);
 		if (cp == NULL)
 			break;
 		LIST_REMOVE(cp, next);
 		if (cp->name != NULL)
 			free(__DECONST(char *, cp->name));
 		free(cp);
 	}
 	for (;;) {
 		struct freqband *fp = LIST_FIRST(&rdp->freqbands);
 		if (fp == NULL)
 			break;
 		LIST_REMOVE(fp, next);
 		free(fp);
 	}
 }
 
 struct regdata *
 lib80211_alloc_regdata(void)
 {
 	struct regdata *rdp;
 	struct stat sb;
 	void *xml;
 	int fd;
 
 	rdp = calloc(1, sizeof(struct regdata));
 
 	fd = open(_PATH_REGDOMAIN, O_RDONLY);
 	if (fd < 0) {
 #ifdef DEBUG
 		warn("%s: open(%s)", __func__, _PATH_REGDOMAIN);
 #endif
 		free(rdp);
 		return NULL;
 	}
 	if (fstat(fd, &sb) < 0) {
 #ifdef DEBUG
 		warn("%s: fstat(%s)", __func__, _PATH_REGDOMAIN);
 #endif
 		close(fd);
 		free(rdp);
 		return NULL;
 	}
 	xml = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	if (xml == MAP_FAILED) {
 #ifdef DEBUG
 		warn("%s: mmap", __func__);
 #endif
 		close(fd);
 		free(rdp);
 		return NULL;
 	}
 	if (lib80211_regdomain_readconfig(rdp, xml, sb.st_size) != 0) {
 #ifdef DEBUG
 		warn("%s: error reading regulatory database", __func__);
 #endif
 		munmap(xml, sb.st_size);
 		close(fd);
 		free(rdp);
 		return NULL;
 	}
 	munmap(xml, sb.st_size);
 	close(fd);
 
 	return rdp;
 }
 
 void
 lib80211_free_regdata(struct regdata *rdp)
 {
 	lib80211_regdomain_cleanup(rdp);
 	free(rdp);
 }
 
 /*
  * Lookup a regdomain by SKU.
  */
 const struct regdomain *
 lib80211_regdomain_findbysku(const struct regdata *rdp, enum RegdomainCode sku)
 {
 	const struct regdomain *dp;
 
 	LIST_FOREACH(dp, &rdp->domains, next) {
 		if (dp->sku == sku)
 			return dp;
 	}
 	return NULL;
 }
 
 /*
  * Lookup a regdomain by name.
  */
 const struct regdomain *
 lib80211_regdomain_findbyname(const struct regdata *rdp, const char *name)
 {
 	const struct regdomain *dp;
 
 	LIST_FOREACH(dp, &rdp->domains, next) {
 		if (strcasecmp(dp->name, name) == 0)
 			return dp;
 	}
 	return NULL;
 }
 
 /*
  * Lookup a country by ISO country code.
  */
 const struct country *
 lib80211_country_findbycc(const struct regdata *rdp, enum ISOCountryCode cc)
 {
 	const struct country *cp;
 
 	LIST_FOREACH(cp, &rdp->countries, next) {
 		if (cp->code == cc)
 			return cp;
 	}
 	return NULL;
 }
 
 /*
  * Lookup a country by ISO/long name.
  */
 const struct country *
 lib80211_country_findbyname(const struct regdata *rdp, const char *name)
 {
 	const struct country *cp;
 	int len;
 
 	len = strlen(name);
 	LIST_FOREACH(cp, &rdp->countries, next) {
 		if (strcasecmp(cp->isoname, name) == 0)
 			return cp;
 	}
 	LIST_FOREACH(cp, &rdp->countries, next) {
 		if (strncasecmp(cp->name, name, len) == 0)
 			return cp;
 	}
 	return NULL;
 }
Index: projects/bsnmp-ipv6-mib/lib/lib80211/lib80211_regdomain.h
===================================================================
--- projects/bsnmp-ipv6-mib/lib/lib80211/lib80211_regdomain.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/lib/lib80211/lib80211_regdomain.h	(revision 311637)
@@ -1,121 +1,123 @@
 /*-
  * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 #ifndef _LIB80211_REGDOMAIN_H_
 #define _LIB80211_REGDOMAIN_H_
 
 #include <sys/cdefs.h>
 #include <sys/queue.h>
 
 #include <net80211/ieee80211_regdomain.h>
 
 __BEGIN_DECLS
 
 struct freqband {
 	uint16_t	freqStart;	/* starting frequency (MHz) */
 	uint16_t	freqEnd;	/* ending frequency (MHz) */
 	uint8_t		chanWidth;	/* channel width (MHz) */
 	uint8_t		chanSep;	/* channel sepaaration (MHz) */
 	uint32_t	flags;		/* common operational constraints */
 
 	const void	*id;
 	LIST_ENTRY(freqband) next;
 };
 
 /* private flags, don't pass to os */
 #define	REQ_ECM		0x1		/* enable if ECM set */
 #define	REQ_INDOOR	0x2		/* enable only for indoor operation */
 #define	REQ_OUTDOOR	0x4		/* enable only for outdoor operation */
 
 #define	REQ_FLAGS	(REQ_ECM|REQ_INDOOR|REQ_OUTDOOR)
 
 struct netband {
 	const struct freqband *band;	/* channel list description */
 	uint8_t		maxPower;	/* regulatory cap on tx power (dBm) */
 	uint8_t		maxPowerDFS;	/* regulatory cap w/ DFS (dBm) */
 	uint8_t		maxAntGain;	/* max allowed antenna gain (.5 dBm) */
 	uint32_t	flags;		/* net80211 channel flags */
 
 	LIST_ENTRY(netband) next;
 };
 typedef LIST_HEAD(, netband) netband_head;
 
 struct country;
 
 struct regdomain {
 	enum RegdomainCode	sku;	/* regdomain code/SKU */
 	const char		*name;	/* printable name */ 
 	const struct country	*cc;	/* country code for 1-1/default map */
 
 	netband_head	 bands_11b;	/* 11b operation */
 	netband_head	 bands_11g;	/* 11g operation */
 	netband_head	 bands_11a;	/* 11a operation */
 	netband_head	 bands_11ng;/* 11ng operation */
 	netband_head	 bands_11na;/* 11na operation */
+	netband_head	 bands_11ac;/* 11ac 5GHz operation */
+	netband_head	 bands_11acg;/* 11ac 2GHz operation */
 
 	LIST_ENTRY(regdomain)	next;
 };
 
 struct country {
 	enum ISOCountryCode	code;	   
 #define	NO_COUNTRY	0xffff
 	const struct regdomain	*rd;
 	const char*		isoname;
 	const char*		name;
 
 	LIST_ENTRY(country)	next;
 };
 
 struct ident;
 
 struct regdata {
 	LIST_HEAD(, country)	countries;	/* country code table */
 	LIST_HEAD(, regdomain)	domains;	/* regulatory domains */
 	LIST_HEAD(, freqband)	freqbands;	/* frequency band table */
 	struct ident		*ident;		/* identifier table */
 };
 
 #define	_PATH_REGDOMAIN	"/etc/regdomain.xml"
 
 struct regdata *lib80211_alloc_regdata(void);
 void	lib80211_free_regdata(struct regdata *);
 
 int	lib80211_regdomain_readconfig(struct regdata *, const void *, size_t);
 void	lib80211_regdomain_cleanup(struct regdata *);
 
 const struct regdomain *lib80211_regdomain_findbysku(const struct regdata *,
 	enum RegdomainCode);
 const struct regdomain *lib80211_regdomain_findbyname(const struct regdata *,
 	const char *);
 
 const struct country *lib80211_country_findbycc(const struct regdata *,
 	enum ISOCountryCode);
 const struct country *lib80211_country_findbyname(const struct regdata *,
 	const char *);
 
 __END_DECLS
 
 #endif /* _LIB80211_REGDOMAIN_H_ */
Index: projects/bsnmp-ipv6-mib/lib/libcam/scsi_cmdparse.c
===================================================================
--- projects/bsnmp-ipv6-mib/lib/libcam/scsi_cmdparse.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/lib/libcam/scsi_cmdparse.c	(revision 311637)
@@ -1,852 +1,858 @@
 /*
  * Taken from the original FreeBSD user SCSI library.
  */
 /* Copyright (c) 1994 HD Associates
  * (contact: dufault@hda.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  * This product includes software developed by HD Associates
  * 4. Neither the name of the HD Associaates nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL HD ASSOCIATES OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * From: scsi.c,v 1.8 1997/02/22 15:07:54 peter Exp $
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 #include <sys/errno.h>
 #include <stdarg.h>
 #include <fcntl.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/scsi/scsi_message.h>
 #include "camlib.h"
 
 /*
  * Decode: Decode the data section of a scsireq.  This decodes
  * trivial grammar:
  *
  * fields : field fields
  *        ;
  *
  * field : field_specifier
  *       | control
  *       ;
  *
  * control : 's' seek_value
  *       | 's' '+' seek_value
  *       ;
  *
  * seek_value : DECIMAL_NUMBER
  *       | 'v'				// For indirect seek, i.e., value from the arg list
  *       ;
  *
  * field_specifier : type_specifier field_width
  *       | '{' NAME '}' type_specifier field_width
  *       ;
  *
  * field_width : DECIMAL_NUMBER
  *       ;
  *
  * type_specifier : 'i'	// Integral types (i1, i2, i3, i4)
  *       | 'b'				// Bits
  *       | 't'				// Bits
  *       | 'c'				// Character arrays
  *       | 'z'				// Character arrays with zeroed trailing spaces
  *       ;
  *
  * Notes:
  * 1. Integral types are swapped into host order.
  * 2. Bit fields are allocated MSB to LSB to match the SCSI spec documentation.
  * 3. 's' permits "seeking" in the string.  "s+DECIMAL" seeks relative to
  *    DECIMAL; "sDECIMAL" seeks absolute to decimal.
  * 4. 's' permits an indirect reference.  "sv" or "s+v" will get the
  *    next integer value from the arg array.
  * 5. Field names can be anything between the braces
  *
  * BUGS:
  * i and b types are promoted to ints.
  *
  */
 
 static int
-do_buff_decode(u_int8_t *databuf, size_t len,
+do_buff_decode(u_int8_t *buff, size_t len,
 	       void (*arg_put)(void *, int , void *, int, char *),
 	       void *puthook, const char *fmt, va_list *ap)
 {
+	int ind = 0;
 	int assigned = 0;
 	int width;
 	int suppress;
 	int plus;
 	int done = 0;
 	static u_char mask[] = {0, 0x01, 0x03, 0x07, 0x0f,
 				   0x1f, 0x3f, 0x7f, 0xff};
 	int value;
-	u_char *base = databuf;
 	char *intendp;
 	char letter;
 	char field_name[80];
 
-#	define ARG_PUT(ARG) \
-	do \
-	{ \
-		if (!suppress) \
-		{ \
+#define ARG_PUT(ARG) \
+	do { \
+		if (!suppress) { \
 			if (arg_put) \
-				(*arg_put)(puthook, (letter == 't' ? \
-					'b' : letter), \
-					(void *)((long)(ARG)), width, \
-					field_name); \
+				(*arg_put)(puthook, (letter == 't' ? 'b' : \
+				    letter), (void *)((long)(ARG)), width, \
+				    field_name); \
 			else \
 				*(va_arg(*ap, int *)) = (ARG); \
 			assigned++; \
 		} \
 		field_name[0] = 0; \
 		suppress = 0; \
 	} while (0)
 
 	u_char bits = 0;	/* For bit fields */
 	int shift = 0;		/* Bits already shifted out */
 	suppress = 0;
 	field_name[0] = 0;
 
 	while (!done) {
 		switch(letter = *fmt) {
 		case ' ':	/* White space */
 		case '\t':
 		case '\r':
 		case '\n':
 		case '\f':
 			fmt++;
 			break;
 
 		case '#':	/* Comment */
 			while (*fmt && (*fmt != '\n'))
 				fmt++;
 			if (fmt)
 				fmt++;	/* Skip '\n' */
 			break;
 
 		case '*':	/* Suppress assignment */
 			fmt++;
 			suppress = 1;
 			break;
 
 		case '{':	/* Field Name */
 		{
 			int i = 0;
 			fmt++;	/* Skip '{' */
 			while (*fmt && (*fmt != '}')) {
 				if (i < sizeof(field_name))
 					field_name[i++] = *fmt;
 
 				fmt++;
 			}
 			if (fmt)
 				fmt++;	/* Skip '}' */
 			field_name[i] = 0;
 			break;
 		}
 
 		case 't':	/* Bit (field) */
 		case 'b':	/* Bits */
 			fmt++;
 			width = strtol(fmt, &intendp, 10);
 			fmt = intendp;
 			if (width > 8)
 				done = 1;
 			else {
 				if (shift <= 0) {
-					bits = *databuf++;
+					if (ind >= len) {
+						done = 1;
+						break;
+					}
+					bits = buff[ind++];
 					shift = 8;
 				}
 				value = (bits >> (shift - width)) &
 					 mask[width];
 
 #if 0
 				printf("shift %2d bits %02x value %02x width %2d mask %02x\n",
 				shift, bits, value, width, mask[width]);
 #endif
 
 				ARG_PUT(value);
 
 				shift -= width;
 			}
 			break;
 
 		case 'i':	/* Integral values */
 			shift = 0;
 			fmt++;
 			width = strtol(fmt, &intendp, 10);
 			fmt = intendp;
+			if (ind + width > len) {
+				done = 1;
+				break;
+			}
 			switch(width) {
 			case 1:
-				ARG_PUT(*databuf);
-				databuf++;
+				ARG_PUT(buff[ind]);
+				ind++;
 				break;
 
 			case 2:
-				ARG_PUT((*databuf) << 8 | *(databuf + 1));
-				databuf += 2;
+				ARG_PUT(buff[ind] << 8 | buff[ind + 1]);
+				ind += 2;
 				break;
 
 			case 3:
-				ARG_PUT((*databuf) << 16 |
-					(*(databuf + 1)) << 8 | *(databuf + 2));
-				databuf += 3;
+				ARG_PUT(buff[ind] << 16 |
+					buff[ind + 1] << 8 | buff[ind + 2]);
+				ind += 3;
 				break;
 
 			case 4:
-				ARG_PUT((*databuf) << 24 |
-					(*(databuf + 1)) << 16 |
-					(*(databuf + 2)) << 8 |
-					*(databuf + 3));
-				databuf += 4;
+				ARG_PUT(buff[ind] << 24 | buff[ind + 1] << 16 |
+					buff[ind + 2] << 8 | buff[ind + 3]);
+				ind += 4;
 				break;
 
 			default:
 				done = 1;
 				break;
 			}
 
 			break;
 
 		case 'c':	/* Characters (i.e., not swapped) */
-		case 'z':	/* Characters with zeroed trailing
-					   spaces  */
+		case 'z':	/* Characters with zeroed trailing spaces */
 			shift = 0;
 			fmt++;
 			width = strtol(fmt, &intendp, 10);
 			fmt = intendp;
+			if (ind + width > len) {
+				done = 1;
+				break;
+			}
 			if (!suppress) {
 				if (arg_put)
 					(*arg_put)(puthook,
-						(letter == 't' ? 'b' : letter),
-						databuf, width, field_name);
+					    (letter == 't' ? 'b' : letter),
+					    &buff[ind], width, field_name);
 				else {
 					char *dest;
 					dest = va_arg(*ap, char *);
-					bcopy(databuf, dest, width);
+					bcopy(&buff[ind], dest, width);
 					if (letter == 'z') {
 						char *p;
 						for (p = dest + width - 1;
-						     (p >= (char *)dest)
-						     && (*p == ' '); p--)
+						    p >= dest && *p == ' ';
+						    p--)
 							*p = 0;
 					}
 				}
 				assigned++;
 			}
-			databuf += width;
+			ind += width;
 			field_name[0] = 0;
 			suppress = 0;
 			break;
 
 		case 's':	/* Seek */
 			shift = 0;
 			fmt++;
 			if (*fmt == '+') {
 				plus = 1;
 				fmt++;
 			} else
 				plus = 0;
 
 			if (tolower(*fmt) == 'v') {
 				/*
 				 * You can't suppress a seek value.  You also
 				 * can't have a variable seek when you are using
 				 * "arg_put".
 				 */
 				width = (arg_put) ? 0 : va_arg(*ap, int);
 				fmt++;
 			} else {
 				width = strtol(fmt, &intendp, 10);
 				fmt = intendp;
 			}
 
 			if (plus)
-				databuf += width;	/* Relative seek */
+				ind += width;	/* Relative seek */
 			else
-				databuf = base + width;	/* Absolute seek */
+				ind = width;	/* Absolute seek */
 
 			break;
 
 		case 0:
 			done = 1;
 			break;
 
 		default:
 			fprintf(stderr, "Unknown letter in format: %c\n",
 				letter);
 			fmt++;
 			break;
 		}
 	}
 
 	return (assigned);
 }
 
 /* next_field: Return the next field in a command specifier.  This
  * builds up a SCSI command using this trivial grammar:
  *
  * fields : field fields
  *        ;
  *
  * field : value
  *       | value ':' field_width
  *       ;
  *
  * field_width : digit
  *       | 'i' digit		// i2 = 2 byte integer, i3 = 3 byte integer etc.
  *       ;
  *
  * value : HEX_NUMBER
  *       | 'v'				// For indirection.
  *       ;
  *
  * Notes:
  *  Bit fields are specified MSB first to match the SCSI spec.
  *
  * Examples:
  *  TUR: "0 0 0 0 0 0"
  *  WRITE BUFFER: "38 v:3 0:2 0:3 v v:i3 v:i3 0", mode, buffer_id, list_length
  *
  * The function returns the value:
  *  0: For reached end, with error_p set if an error was found
  *  1: For valid stuff setup
  *  2: For "v" was entered as the value (implies use varargs)
  *
  */
 
 static int
 next_field(const char **pp, char *fmt, int *width_p, int *value_p, char *name,
 	   int n_name, int *error_p, int *suppress_p)
 {
 	const char *p = *pp;
 	char *intendp;
 
 	int something = 0;
 
 	enum {
 		BETWEEN_FIELDS,
 		START_FIELD,
 		GET_FIELD,
 		DONE,
 	} state;
 
 	int value = 0;
 	int field_size;		/* Default to byte field type... */
 	int field_width;	/* 1 byte wide */
 	int is_error = 0;
 	int suppress = 0;
 
 	field_size = 8;		/* Default to byte field type... */
 	*fmt = 'i';
 	field_width = 1;	/* 1 byte wide */
 	if (name)
 		*name = 0;
 
 	state = BETWEEN_FIELDS;
 
 	while (state != DONE) {
 		switch(state) {
 		case BETWEEN_FIELDS:
 			if (*p == 0)
 				state = DONE;
 			else if (isspace(*p))
 				p++;
 			else if (*p == '#') {
 				while (*p && *p != '\n')
 					p++;
 				if (p)
 					p++;
 			} else if (*p == '{') {
 				int i = 0;
 
 				p++;
 
 				while (*p && *p != '}') {
 					if(name && i < n_name) {
 						name[i] = *p;
 						i++;
 					}
 					p++;
 				}
 
 				if(name && i < n_name)
 					name[i] = 0;
 
 				if (*p == '}')
 					p++;
 			} else if (*p == '*') {
 				p++;
 				suppress = 1;
 			} else if (isxdigit(*p)) {
 				something = 1;
 				value = strtol(p, &intendp, 16);
 				p = intendp;
 				state = START_FIELD;
 			} else if (tolower(*p) == 'v') {
 				p++;
 				something = 2;
 				value = *value_p;
 				state = START_FIELD;
 			} else if (tolower(*p) == 'i') {
 				/*
 				 * Try to work without the "v".
 				 */
 				something = 2;
 				value = *value_p;
 				p++;
 
 				*fmt = 'i';
 				field_size = 8;
 				field_width = strtol(p, &intendp, 10);
 				p = intendp;
 				state = DONE;
 
 			} else if (tolower(*p) == 't') {
 				/*
 				 * XXX: B can't work: Sees the 'b' as a
 				 * hex digit in "isxdigit".  try "t" for
 				 * bit field.
 				 */
 				something = 2;
 				value = *value_p;
 				p++;
 
 				*fmt = 'b';
 				field_size = 1;
 				field_width = strtol(p, &intendp, 10);
 				p = intendp;
 				state = DONE;
 			} else if (tolower(*p) == 's') {
 				/* Seek */
 				*fmt = 's';
 				p++;
 				if (tolower(*p) == 'v') {
 					p++;
 					something = 2;
 					value = *value_p;
 				} else {
 					something = 1;
 					value = strtol(p, &intendp, 0);
 					p = intendp;
 				}
 				state = DONE;
 			} else {
 				fprintf(stderr, "Invalid starting "
 					"character: %c\n", *p);
 				is_error = 1;
 				state = DONE;
 			}
 			break;
 
 		case START_FIELD:
 			if (*p == ':') {
 				p++;
 				field_size = 1;		/* Default to bits
 							   when specified */
 				state = GET_FIELD;
 			} else
 				state = DONE;
 			break;
 
 		case GET_FIELD:
 			if (isdigit(*p)) {
 				*fmt = 'b';
 				field_size = 1;
 				field_width = strtol(p, &intendp, 10);
 				p = intendp;
 				state = DONE;
 			} else if (*p == 'i') {
 
 				/* Integral (bytes) */
 				p++;
 
 				*fmt = 'i';
 				field_size = 8;
 				field_width = strtol(p, &intendp, 10);
 				p = intendp;
 				state = DONE;
 			} else if (*p == 'b') {
 
 				/* Bits */
 				p++;
 
 				*fmt = 'b';
 				field_size = 1;
 				field_width = strtol(p, &intendp, 10);
 				p = intendp;
 				state = DONE;
 			} else {
 				fprintf(stderr, "Invalid startfield %c "
 					"(%02x)\n", *p, *p);
 				is_error = 1;
 				state = DONE;
 			}
 			break;
 
 		case DONE:
 			break;
 		}
 	}
 
 	if (is_error) {
 		*error_p = 1;
 		return 0;
 	}
 
 	*error_p = 0;
 	*pp = p;
 	*width_p = field_width * field_size;
 	*value_p = value;
 	*suppress_p = suppress;
 
 	return (something);
 }
 
 static int
 do_encode(u_char *buff, size_t vec_max, size_t *used,
 	  int (*arg_get)(void *, char *), void *gethook, const char *fmt,
 	  va_list *ap)
 {
 	int ind;
 	int shift;
 	u_char val;
 	int ret;
 	int width, value, error, suppress;
 	char c;
 	int encoded = 0;
 	char field_name[80];
 
 	ind = 0;
 	shift = 0;
 	val = 0;
 
  	while ((ret = next_field(&fmt, &c, &width, &value, field_name,
 				 sizeof(field_name), &error, &suppress))) {
 		encoded++;
 
 		if (ret == 2) {
 			if (suppress)
 				value = 0;
 			else
 				value = arg_get ?
 					(*arg_get)(gethook, field_name) :
 					va_arg(*ap, int);
 		}
 
 #if 0
 		printf(
 "do_encode: ret %d fmt %c width %d value %d name \"%s\" error %d suppress %d\n",
 		ret, c, width, value, field_name, error, suppress);
 #endif
 		/* Absolute seek */
 		if (c == 's') {
 			ind = value;
 			continue;
 		}
 
 		/* A width of < 8 is a bit field. */
 		if (width < 8) {
 
 			/* This is a bit field.  We start with the high bits
 			 * so it reads the same as the SCSI spec.
 			 */
 
 			shift += width;
 
 			val |= (value << (8 - shift));
 
 			if (shift == 8) {
 				if (ind < vec_max) {
 					buff[ind++] = val;
 					val = 0;
 				}
 				shift = 0;
 			}
 		} else {
 			if (shift) {
 				if (ind < vec_max) {
 					buff[ind++] = val;
 					val = 0;
 				}
 				shift = 0;
 			}
 			switch(width) {
 			case 8:		/* 1 byte integer */
 				if (ind < vec_max)
 					buff[ind++] = value;
 				break;
 
 			case 16:	/* 2 byte integer */
 				if (ind < vec_max - 2 + 1) {
 					buff[ind++] = value >> 8;
 					buff[ind++] = value;
 				}
 				break;
 
 			case 24:	/* 3 byte integer */
 				if (ind < vec_max - 3 + 1) {
 					buff[ind++] = value >> 16;
 					buff[ind++] = value >> 8;
 					buff[ind++] = value;
 				}
 				break;
 
 			case 32:	/* 4 byte integer */
 				if (ind < vec_max - 4 + 1) {
 					buff[ind++] = value >> 24;
 					buff[ind++] = value >> 16;
 					buff[ind++] = value >> 8;
 					buff[ind++] = value;
 				}
 				break;
 
 			default:
 				fprintf(stderr, "do_encode: Illegal width\n");
 				break;
 			}
 		}
 	}
 
 	/* Flush out any remaining bits
 	 */
 	if (shift && ind < vec_max) {
 		buff[ind++] = val;
 		val = 0;
 	}
 
 
 	if (used)
 		*used = ind;
 
 	if (error)
 		return -1;
 
 	return encoded;
 }
 
 int
 csio_decode(struct ccb_scsiio *csio, const char *fmt, ...)
 {
 	va_list ap;
 	int retval;
 
 	va_start(ap, fmt);
 
 	retval = do_buff_decode(csio->data_ptr, (size_t)csio->dxfer_len, 0, 0,
 		 fmt, &ap);
 
 	va_end(ap);
 
 	return (retval);
 }
 
 int
 csio_decode_visit(struct ccb_scsiio *csio, const char *fmt,
 		  void (*arg_put)(void *, int, void *, int, char *),
 		  void *puthook)
 {
 
 	/*
 	 * We need some way to output things; we can't do it without
 	 * the arg_put function.
 	 */
 	if (arg_put == NULL)
 		return (-1);
 
 	return (do_buff_decode(csio->data_ptr, (size_t)csio->dxfer_len,
 		    arg_put, puthook, fmt, NULL));
 }
 
 int
 buff_decode(u_int8_t *buff, size_t len, const char *fmt, ...)
 {
 	va_list ap;
 	int retval;
 
 	va_start(ap, fmt);
 
 	retval = do_buff_decode(buff, len, 0, 0, fmt, &ap);
 
 	va_end(ap);
 
 	return (retval);
 }
 
 int
 buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
 		  void (*arg_put)(void *, int, void *, int, char *),
 		  void *puthook)
 {
 
 	/*
 	 * We need some way to output things; we can't do it without
 	 * the arg_put function.
 	 */
 	if (arg_put == NULL)
 		return(-1);
 
 	return (do_buff_decode(buff, len, arg_put, puthook, fmt, NULL));
 }
 
 /*
  * Build a SCSI CCB, given the command and data pointers and a format
  * string describing the 
  */
 int
 csio_build(struct ccb_scsiio *csio, u_int8_t *data_ptr, u_int32_t dxfer_len,
 	   u_int32_t flags, int retry_count, int timeout, const char *cmd_spec,
 	   ...)
 {
 	size_t cmdlen;
 	int retval;
 	va_list ap;
 
 	if (csio == NULL)
 		return (0);
 
 	bzero(csio, sizeof(struct ccb_scsiio));
 
 	va_start(ap, cmd_spec);
 
 	if ((retval = do_encode(csio->cdb_io.cdb_bytes, SCSI_MAX_CDBLEN,
 				&cmdlen, NULL, NULL, cmd_spec, &ap)) == -1)
 		goto done;
 
 	cam_fill_csio(csio,
 		      /* retries */ retry_count,
 		      /* cbfcnp */ NULL,
 		      /* flags */ flags,
 		      /* tag_action */ MSG_SIMPLE_Q_TAG,
 		      /* data_ptr */ data_ptr,
 		      /* dxfer_len */ dxfer_len,
 		      /* sense_len */ SSD_FULL_SIZE,
 		      /* cdb_len */ cmdlen,
 		      /* timeout */ timeout ? timeout : 5000);
 
 done:
 	va_end(ap);
 
 	return (retval);
 }
 
 int
 csio_build_visit(struct ccb_scsiio *csio, u_int8_t *data_ptr,
 		 u_int32_t dxfer_len, u_int32_t flags, int retry_count,
 		 int timeout, const char *cmd_spec,
 		 int (*arg_get)(void *hook, char *field_name), void *gethook)
 {
 	size_t cmdlen;
 	int retval;
 
 	if (csio == NULL)
 		return(0);
 
 	/*
 	 * We need something to encode, but we can't get it without the
 	 * arg_get function.
 	 */
 	if (arg_get == NULL)
 		return(-1);
 
 	bzero(csio, sizeof(struct ccb_scsiio));
 
 	if ((retval = do_encode(csio->cdb_io.cdb_bytes, SCSI_MAX_CDBLEN,
 				&cmdlen, arg_get, gethook, cmd_spec, NULL)) == -1)
 		return(retval);
 
 	cam_fill_csio(csio,
 		      /* retries */ retry_count,
 		      /* cbfcnp */ NULL,
 		      /* flags */ flags,
 		      /* tag_action */ MSG_SIMPLE_Q_TAG,
 		      /* data_ptr */ data_ptr,
 		      /* dxfer_len */ dxfer_len,
 		      /* sense_len */ SSD_FULL_SIZE,
 		      /* cdb_len */ cmdlen,
 		      /* timeout */ timeout ? timeout : 5000);
 
 	return(retval);
 }
 
 int
 csio_encode(struct ccb_scsiio *csio, const char *fmt, ...)
 {
 	va_list ap;
 	int retval;
 
 	if (csio == NULL)
 		return (0);
 
 	va_start(ap, fmt);
 
 	retval = do_encode(csio->data_ptr, csio->dxfer_len, 0, 0, 0, fmt, &ap);
 
 	va_end(ap);
 
 	return (retval);
 }
 
 int
 buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
 		  int (*arg_get)(void *hook, char *field_name), void *gethook)
 {
 
 	/*
 	 * We need something to encode, but we can't get it without the
 	 * arg_get function.
 	 */
 	if (arg_get == NULL)
 		return(-1);
 
 	return (do_encode(buff, len, 0, arg_get, gethook, fmt, NULL));
 }
 
 int
 csio_encode_visit(struct ccb_scsiio *csio, const char *fmt,
 		  int (*arg_get)(void *hook, char *field_name), void *gethook)
 {
 
 	/*
 	 * We need something to encode, but we can't get it without the
 	 * arg_get function.
 	 */
 	if (arg_get == NULL)
 		return(-1);
 
 	return (do_encode(csio->data_ptr, csio->dxfer_len, 0, arg_get,
 			 gethook, fmt, NULL));
 }
Index: projects/bsnmp-ipv6-mib/lib/libsysdecode/mktables
===================================================================
--- projects/bsnmp-ipv6-mib/lib/libsysdecode/mktables	(revision 311636)
+++ projects/bsnmp-ipv6-mib/lib/libsysdecode/mktables	(revision 311637)
@@ -1,158 +1,158 @@
 #!/bin/sh
 #
 # Copyright (c) 2006 "David Kirchner" <dpk@dpk.net>. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 # Generates tables.h
 #
 # Originally this script was 'mksubr' for kdump which generated a complete
 # C file along with function definitions.  Now this script generates tables
 # of constants and names extracted from header files.
 
 set -e
 
 LC_ALL=C; export LC_ALL
 
 if [ -z "$1" ]
 then
 	echo "usage: sh $0 include-dir [output-file]"
 	exit 1
 fi
 include_dir=$1
 if [ -n "$2" ]; then
 	output_file="$2"
 	exec > "$output_file"
 fi
 
 all_headers=
 #
 # Generate a table C #definitions.  The including file can define the
 # TABLE_NAME(n), TABLE_ENTRY(x), and TABLE_END macros to define what
 # the tables map to.
 #
 gen_table()
 {
 	local name grep file excl filter
 	name=$1
 	grep=$2
 	file=$3
 	excl=$4
 
 	if [ -z "$excl" ]; then
 		filter="cat"
 	else
 		filter="egrep -v"
 	fi
 	all_headers="${all_headers:+${all_headers} }${file}"
 	cat <<_EOF_
 TABLE_START(${name})
 _EOF_
 	egrep "^#[[:space:]]*define[[:space:]]+"${grep}"[[:space:]]*" \
 		$include_dir/$file | ${filter} ${excl} | \
 	awk '{ for (i = 1; i <= NF; i++) \
 		if ($i ~ /define/) \
 			break; \
 		++i; \
 		printf "TABLE_ENTRY(%s)\n", $i }'
 cat <<_EOF_
 TABLE_END
 
 _EOF_
 }
 
 cat <<_EOF_
 /* This file is auto-generated. */
 
 _EOF_
 
 gen_table "accessmode"      "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+"         "sys/unistd.h"
 gen_table "acltype"         "ACL_TYPE_[A-Z4_]+[[:space:]]+0x[0-9]+"        "sys/acl.h"
 gen_table "capfcntl"        "CAP_FCNTL_[A-Z]+[[:space:]]+\(1"              "sys/capsicum.h"
 gen_table "extattrns"       "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h"
 gen_table "fadvisebehav"    "POSIX_FADV_[A-Z]+[[:space:]]+[0-9]+"          "sys/fcntl.h"
 gen_table "openflags"       "O_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+"           "sys/fcntl.h"	"O_RDONLY|O_RDWR|O_WRONLY"
 gen_table "flockops"        "LOCK_[A-Z]+[[:space:]]+0x[0-9]+"              "sys/fcntl.h"
 gen_table "kldsymcmd"       "KLDSYM_[A-Z]+[[:space:]]+[0-9]+"              "sys/linker.h"
 gen_table "kldunloadfflags" "LINKER_UNLOAD_[A-Z]+[[:space:]]+[0-9]+"       "sys/linker.h"
 gen_table "lio_listiomodes" "LIO_(NO)?WAIT[[:space:]]+[0-9]+"              "aio.h"
 gen_table "madvisebehav"    "_?MADV_[A-Z]+[[:space:]]+[0-9]+"              "sys/mman.h"
 gen_table "minheritflags"   "INHERIT_[A-Z]+[[:space:]]+[0-9]+"             "sys/mman.h"
 gen_table "mlockallflags"   "MCL_[A-Z]+[[:space:]]+0x[0-9]+"               "sys/mman.h"
 gen_table "mmapprot"        "PROT_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+"        "sys/mman.h"
 gen_table "ngbtsolevel"     "SOL_[A-Z0-9]+[[:space:]]+0x[0-9A-Fa-f]+"      "netgraph/bluetooth/include/ng_btsocket.h"
 gen_table "fileflags"       "[SU]F_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+"       "sys/stat.h"		"UF_COMPRESSED|UF_TRACKED|UF_SETTABLE|SF_SETTABLE"
 gen_table "filemode"        "S_[A-Z]+[[:space:]]+[0-6]{7}"                 "sys/stat.h"
 gen_table "mountflags"      "MNT_[A-Z]+[[:space:]]+0x[0-9]+"               "sys/mount.h"
 gen_table "msyncflags"      "MS_[A-Z]+[[:space:]]+0x[0-9]+"                "sys/mman.h"
 gen_table "nfssvcflags"     "NFSSVC_[A-Z0-9]+[[:space:]]+0x[0-9]+"         "nfs/nfssvc.h"
 gen_table "prio"            "PRIO_[A-Z]+[[:space:]]+[0-9]"                 "sys/resource.h"
 gen_table "procctlcmd"      "PROC_[A-Z_]+[[:space:]]+[0-9]"                 "sys/procctl.h"	"PROC_TRACE_CTL_"
 gen_table "ptraceop"        "PT_[[:alnum:]_]+[[:space:]]+[0-9]+"           "sys/ptrace.h"
 gen_table "quotactlcmds"    "Q_[A-Z]+[[:space:]]+0x[0-9]+"                 "ufs/ufs/quota.h"
 gen_table "rebootopt"       "RB_[A-Z]+[[:space:]]+0x[0-9]+"                "sys/reboot.h"
 gen_table "rforkflags"      "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)"       "sys/unistd.h"
 gen_table "rlimit"          "RLIMIT_[A-Z]+[[:space:]]+[0-9]+"              "sys/resource.h"
 gen_table "schedpolicy"     "SCHED_[A-Z]+[[:space:]]+[0-9]+"               "sched.h"
 gen_table "sendfileflags"   "SF_[A-Z]+[[:space:]]+[0-9]+"                  "sys/socket.h"
 gen_table "shmatflags"      "SHM_[A-Z]+[[:space:]]+[0-9]{6}+"              "sys/shm.h"
 gen_table "shutdownhow"     "SHUT_[A-Z]+[[:space:]]+[0-9]+"                "sys/socket.h"
 gen_table "sigbuscode"      "BUS_[A-Z]+[[:space:]]+[0-9]+"                 "sys/signal.h"
 gen_table "sigchldcode"     "CLD_[A-Z]+[[:space:]]+[0-9]+"                 "sys/signal.h"
 gen_table "sigfpecode"      "FPE_[A-Z]+[[:space:]]+[0-9]+"                 "sys/signal.h"
 gen_table "sigprocmaskhow"  "SIG_[A-Z]+[[:space:]]+[0-9]+"                 "sys/signal.h"
 gen_table "sigillcode"      "ILL_[A-Z]+[[:space:]]+[0-9]+"                 "sys/signal.h"
 gen_table "sigsegvcode"     "SEGV_[A-Z]+[[:space:]]+[0-9]+"                "sys/signal.h"
 gen_table "sigtrapcode"     "TRAP_[A-Z]+[[:space:]]+[0-9]+"                "sys/signal.h"
 gen_table "sockdomain"      "PF_[[:alnum:]]+[[:space:]]+"                  "sys/socket.h"
 gen_table "sockfamily"      "AF_[[:alnum:]]+[[:space:]]+"                  "sys/socket.h"
 gen_table "sockipproto"     "IPPROTO_[[:alnum:]]+[[:space:]]+"             "netinet/in.h"
 gen_table "sockopt"         "SO_[A-Z]+[[:space:]]+0x[0-9]+"                "sys/socket.h"
 gen_table "sockoptip"       "(IP_[[:alnum:]_]+|MCAST_[[:alnum:]_]+_GROUP)[[:space:]]+" "netinet/in.h" "IP_DEFAULT|IP_MIN|IP_MAX|IP_PORTRANGE"
 gen_table "sockopttcp"      "TCP_[[:alnum:]_]+[[:space:]]+[0-9]+"          "netinet/tcp.h"      "TCP_MIN|TCP_MAX[^S]|TCP_MSS|TCP_[[:alnum:]_]+_MAX"
 gen_table "sockoptudp"      "UDP_[[:alnum:]]+[[:space:]]+[0-9]+"           "netinet/udp.h"      "UDP_ENCAP_"
 gen_table "socktype"        "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*"          "sys/socket.h"
 gen_table "thrcreateflags"  "THR_[A-Z]+[[:space:]]+0x[0-9]+"               "sys/thr.h"
 gen_table "umtxop"          "UMTX_OP_[[:alnum:]_]+[[:space:]]+[0-9]+"      "sys/umtx.h"
 gen_table "vmprot"          "VM_PROT_[A-Z]+[[:space:]]+\(\(vm_prot_t\)\)"  "vm/vm.h"
 gen_table "vmresult"        "KERN_[A-Z]+[[:space:]]+[0-9]+"                "vm/vm_param.h"
 gen_table "wait6opt"        "W[A-Z]+[[:space:]]+[0-9]+"                    "sys/wait.h"
 gen_table "seekwhence"      "SEEK_[A-Z]+[[:space:]]+[0-9]+"                "sys/unistd.h"
 gen_table "fcntlcmd"        "F_[A-Z0-9_]+[[:space:]]+[0-9]+[[:space:]]+"   "sys/fcntl.h"	"F_CANCEL|F_..LCK"
 gen_table "mmapflags"       "MAP_[A-Z_]+[[:space:]]+0x[0-9A-Fa-f]+"        "sys/mman.h"
 gen_table "rtpriofuncs"     "RTP_[A-Z]+[[:space:]]+[0-9]+"                 "sys/rtprio.h"
-gen_table "msgflags"        "MSG_[A-Z]+[[:space:]]+0x[0-9]+"               "sys/socket.h"	"MSG_SOCALLBCK"
+gen_table "msgflags"        "MSG_[A-Z]+[[:space:]]+0x[0-9]+"               "sys/socket.h"	"MSG_SOCALLBCK|MSG_MORETOCOME"
 gen_table "sigcode"         "SI_[A-Z]+[[:space:]]+0(x[0-9abcdef]+)?"       "sys/signal.h"
 gen_table "umtxcvwaitflags" "CVWAIT_[A-Z_]+[[:space:]]+0x[0-9]+"           "sys/umtx.h"
 gen_table "umtxrwlockflags" "URWLOCK_PREFER_READER[[:space:]]+0x[0-9]+"    "sys/umtx.h"
 gen_table "caprights"       "CAP_[A-Z_]+[[:space:]]+CAPRIGHT\([0-9],[[:space:]]+0x[0-9]{16}ULL\)"   "sys/capsicum.h"
 
 # Generate a .depend file for our output file
 if [ -n "$output_file" ]; then
 	echo "$output_file: \\" > ".depend.$output_file"
 	echo "$all_headers" | tr ' ' '\n' | sort -u |
 	    sed -e "s,^,	$include_dir/," -e 's,$, \\,' >> \
 	    ".depend.$output_file"
 	echo >> ".depend.$output_file"
 fi
Index: projects/bsnmp-ipv6-mib/sbin/camcontrol/modeedit.c
===================================================================
--- projects/bsnmp-ipv6-mib/sbin/camcontrol/modeedit.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sbin/camcontrol/modeedit.c	(revision 311637)
@@ -1,906 +1,913 @@
 /*-
  * Copyright (c) 2000 Kelly Yancey <kbyanc@posi.net>
  * Derived from work done by Julian Elischer <julian@tfs.com,
  * julian@dialix.oz.au>, 1993, and Peter Dufault <dufault@hda.com>, 1994.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer,
  *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution. 
  *    
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT  
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/queue.h>
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <sysexits.h>
 #include <unistd.h>
 
 #include <cam/scsi/scsi_all.h>
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <camlib.h>
 #include "camcontrol.h"
 
 #define	DEFAULT_SCSI_MODE_DB	"/usr/share/misc/scsi_modes"
 #define	DEFAULT_EDITOR		"vi"
 #define	MAX_FORMAT_SPEC		4096	/* Max CDB format specifier. */
 #define	MAX_PAGENUM_LEN		10	/* Max characters in page num. */
 #define	MAX_PAGENAME_LEN	64	/* Max characters in page name. */
 #define	PAGEDEF_START		'{'	/* Page definition delimiter. */
 #define	PAGEDEF_END		'}'	/* Page definition delimiter. */
 #define	PAGENAME_START		'"'	/* Page name delimiter. */
 #define	PAGENAME_END		'"'	/* Page name delimiter. */
 #define	PAGEENTRY_END		';'	/* Page entry terminator (optional). */
 #define	MAX_COMMAND_SIZE	255	/* Mode/Log sense data buffer size. */
 #define PAGE_CTRL_SHIFT		6	/* Bit offset to page control field. */
 
 
 /* Macros for working with mode pages. */
 #define	MODE_PAGE_HEADER(mh)						\
 	(struct scsi_mode_page_header *)find_mode_page_6(mh)
 
 #define	MODE_PAGE_DATA(mph)						\
 	(u_int8_t *)(mph) + sizeof(struct scsi_mode_page_header)
 
 
 struct editentry {
 	STAILQ_ENTRY(editentry) link;
 	char	*name;
 	char	type;
 	int	editable;
 	int	size;
 	union {
 		int	ivalue;
 		char	*svalue;
 	} value;
 };
 static STAILQ_HEAD(, editentry) editlist; /* List of page entries. */
 static int editlist_changed = 0;	/* Whether any entries were changed. */
 
 struct pagename {
 	SLIST_ENTRY(pagename) link;
 	int pagenum;
 	char *name;
 };
 static SLIST_HEAD(, pagename) namelist;	/* Page number to name mappings. */
 
 static char format[MAX_FORMAT_SPEC];	/* Buffer for scsi cdb format def. */
 
 static FILE *edit_file = NULL;		/* File handle for edit file. */
 static char edit_path[] = "/tmp/camXXXXXX";
 
 
 /* Function prototypes. */
 static void		 editentry_create(void *hook, int letter, void *arg,
 					  int count, char *name);
 static void		 editentry_update(void *hook, int letter, void *arg,
 					  int count, char *name);
 static int		 editentry_save(void *hook, char *name);
 static struct editentry	*editentry_lookup(char *name);
 static int		 editentry_set(char *name, char *newvalue,
 				       int editonly);
 static void		 editlist_populate(struct cam_device *device,
 					   int modepage, int page_control,
 					   int dbd, int retries, int timeout);
 static void		 editlist_save(struct cam_device *device, int modepage,
 				       int page_control, int dbd, int retries,
 				       int timeout);
 static void		 nameentry_create(int pagenum, char *name);
 static struct pagename	*nameentry_lookup(int pagenum);
 static int		 load_format(const char *pagedb_path, int page);
 static int		 modepage_write(FILE *file, int editonly);
 static int		 modepage_read(FILE *file);
 static void		 modepage_edit(void);
 static void		 modepage_dump(struct cam_device *device, int page,
 				       int page_control, int dbd, int retries,
 				       int timeout);
 static void		 cleanup_editfile(void);
 
 
 #define	returnerr(code) do {						\
 	errno = code;							\
 	return (-1);							\
 } while (0)
 
 
 #define	RTRIM(string) do {						\
 	int _length;							\
 	while (isspace(string[_length = strlen(string) - 1]))		\
 		string[_length] = '\0';					\
 } while (0)
 
 
 static void
 editentry_create(void *hook __unused, int letter, void *arg, int count,
 		 char *name)
 {
 	struct editentry *newentry;	/* Buffer to hold new entry. */
 
 	/* Allocate memory for the new entry and a copy of the entry name. */
 	if ((newentry = malloc(sizeof(struct editentry))) == NULL ||
 	    (newentry->name = strdup(name)) == NULL)
 		err(EX_OSERR, NULL);
 
 	/* Trim any trailing whitespace for the entry name. */
 	RTRIM(newentry->name);
 
 	newentry->editable = (arg != NULL);
 	newentry->type = letter;
 	newentry->size = count;		/* Placeholder; not accurate. */
 	newentry->value.svalue = NULL;
 
 	STAILQ_INSERT_TAIL(&editlist, newentry, link);
 }
 
 static void
 editentry_update(void *hook __unused, int letter, void *arg, int count,
 		 char *name)
 {
 	struct editentry *dest;		/* Buffer to hold entry to update. */
 
 	dest = editentry_lookup(name);
 	assert(dest != NULL);
 
 	dest->type = letter;
 	dest->size = count;		/* We get the real size now. */
 
 	switch (dest->type) {
 	case 'i':			/* Byte-sized integral type. */
 	case 'b':			/* Bit-sized integral types. */
 	case 't':
 		dest->value.ivalue = (intptr_t)arg;
 		break;
 
 	case 'c':			/* Character array. */
 	case 'z':			/* Null-padded string. */
 		editentry_set(name, (char *)arg, 0);
 		break;
 	default:
 		; /* NOTREACHED */
 	}
 }
 
 static int
 editentry_save(void *hook __unused, char *name)
 {
 	struct editentry *src;		/* Entry value to save. */
 
 	src = editentry_lookup(name);
-	assert(src != NULL);
+	if (src == 0) {
+		/*
+		 * This happens if field does not fit into read page size.
+		 * It also means that this field won't be written, so the
+		 * returned value does not really matter.
+		 */
+		return (0);
+	}
 
 	switch (src->type) {
 	case 'i':			/* Byte-sized integral type. */
 	case 'b':			/* Bit-sized integral types. */
 	case 't':
 		return (src->value.ivalue);
 		/* NOTREACHED */
 
 	case 'c':			/* Character array. */
 	case 'z':			/* Null-padded string. */
 		return ((intptr_t)src->value.svalue);
 		/* NOTREACHED */
 
 	default:
 		; /* NOTREACHED */
 	}
 
 	return (0);			/* This should never happen. */
 }
 
 static struct editentry *
 editentry_lookup(char *name)
 {
 	struct editentry *scan;
 
 	assert(name != NULL);
 
 	STAILQ_FOREACH(scan, &editlist, link) {
 		if (strcasecmp(scan->name, name) == 0)
 			return (scan);
 	}
 
 	/* Not found during list traversal. */
 	return (NULL);
 }
 
 static int
 editentry_set(char *name, char *newvalue, int editonly)
 {
 	struct editentry *dest;	/* Modepage entry to update. */
 	char *cval;		/* Pointer to new string value. */
 	char *convertend;	/* End-of-conversion pointer. */
 	int ival;		/* New integral value. */
 	int resolution;		/* Resolution in bits for integer conversion. */
 
 /*
  * Macro to determine the maximum value of the given size for the current
  * resolution.
  * XXX Lovely x86's optimize out the case of shifting by 32 and gcc doesn't
  *     currently workaround it (even for int64's), so we have to kludge it.
  */
 #define	RESOLUTION_MAX(size) ((resolution * (size) == 32)? 		\
 	INT_MAX: (1 << (resolution * (size))) - 1)
 
 	assert(newvalue != NULL);
 	if (*newvalue == '\0')
 		return (0);	/* Nothing to do. */
 
 	if ((dest = editentry_lookup(name)) == NULL)
 		returnerr(ENOENT);
 	if (!dest->editable && editonly)
 		returnerr(EPERM);
 
 	switch (dest->type) {
 	case 'i':		/* Byte-sized integral type. */
 	case 'b':		/* Bit-sized integral types. */
 	case 't':
 		/* Convert the value string to an integer. */
 		resolution = (dest->type == 'i')? 8: 1;
 		ival = (int)strtol(newvalue, &convertend, 0);
 		if (*convertend != '\0')
 			returnerr(EINVAL);
 		if (ival > RESOLUTION_MAX(dest->size) || ival < 0) {
 			int newival = (ival < 0)? 0: RESOLUTION_MAX(dest->size);
 			warnx("value %d is out of range for entry %s; clipping "
 			    "to %d", ival, name, newival);
 			ival = newival;
 		}
 		if (dest->value.ivalue != ival)
 			editlist_changed = 1;
 		dest->value.ivalue = ival;
 		break;
 
 	case 'c':		/* Character array. */
 	case 'z':		/* Null-padded string. */
 		if ((cval = malloc(dest->size + 1)) == NULL)
 			err(EX_OSERR, NULL);
 		bzero(cval, dest->size + 1);
 		strncpy(cval, newvalue, dest->size);
 		if (dest->type == 'z') {
 			/* Convert trailing spaces to nulls. */
 			char *convertend2;
 
 			for (convertend2 = cval + dest->size;
 			    convertend2 >= cval; convertend2--) {
 				if (*convertend2 == ' ')
 					*convertend2 = '\0';
 				else if (*convertend2 != '\0')
 					break;
 			}
 		}
 		if (strncmp(dest->value.svalue, cval, dest->size) == 0) {
 			/* Nothing changed, free the newly allocated string. */
 			free(cval);
 			break;
 		}
 		if (dest->value.svalue != NULL) {
 			/* Free the current string buffer. */
 			free(dest->value.svalue);
 			dest->value.svalue = NULL;
 		}
 		dest->value.svalue = cval;
 		editlist_changed = 1;
 		break;
 
 	default:
 		; /* NOTREACHED */
 	}
 
 	return (0);
 #undef RESOLUTION_MAX
 }
 
 static void
 nameentry_create(int pagenum, char *name) {
 	struct pagename *newentry;
 
 	if (pagenum < 0 || name == NULL || name[0] == '\0')
 		return;
 
 	/* Allocate memory for the new entry and a copy of the entry name. */
 	if ((newentry = malloc(sizeof(struct pagename))) == NULL ||
 	    (newentry->name = strdup(name)) == NULL)
 		err(EX_OSERR, NULL);
 
 	/* Trim any trailing whitespace for the page name. */
 	RTRIM(newentry->name);
 
 	newentry->pagenum = pagenum;
 	SLIST_INSERT_HEAD(&namelist, newentry, link);
 }
 
 static struct pagename *
 nameentry_lookup(int pagenum) {
 	struct pagename *scan;
 
 	SLIST_FOREACH(scan, &namelist, link) {
 		if (pagenum == scan->pagenum)
 			return (scan);
 	}
 
 	/* Not found during list traversal. */
 	return (NULL);
 }
 
 static int
 load_format(const char *pagedb_path, int page)
 {
 	FILE *pagedb;
 	char str_pagenum[MAX_PAGENUM_LEN];
 	char str_pagename[MAX_PAGENAME_LEN];
 	int pagenum;
 	int depth;			/* Quoting depth. */
 	int found;
 	int lineno;
 	enum { LOCATE, PAGENAME, PAGEDEF } state;
 	int ch;
 	char c;
 
 #define	SETSTATE_LOCATE do {						\
 	str_pagenum[0] = '\0';						\
 	str_pagename[0] = '\0';						\
 	pagenum = -1;							\
 	state = LOCATE;							\
 } while (0)
 
 #define	SETSTATE_PAGENAME do {						\
 	str_pagename[0] = '\0';						\
 	state = PAGENAME;						\
 } while (0)
 
 #define	SETSTATE_PAGEDEF do {						\
 	format[0] = '\0';						\
 	state = PAGEDEF;						\
 } while (0)
 
 #define	UPDATE_LINENO do {						\
 	if (c == '\n')							\
 		lineno++;						\
 } while (0)
 
 #define	BUFFERFULL(buffer)	(strlen(buffer) + 1 >= sizeof(buffer))
 
 	if ((pagedb = fopen(pagedb_path, "r")) == NULL)
 		returnerr(ENOENT);
 
 	SLIST_INIT(&namelist);
 
 	c = '\0';
 	depth = 0;
 	lineno = 0;
 	found = 0;
 	SETSTATE_LOCATE;
 	while ((ch = fgetc(pagedb)) != EOF) {
 
 		/* Keep a line count to make error messages more useful. */
 		UPDATE_LINENO;
 
 		/* Skip over comments anywhere in the mode database. */
 		if (ch == '#') {
 			do {
 				ch = fgetc(pagedb);
 			} while (ch != '\n' && ch != EOF);
 			UPDATE_LINENO;
 			continue;
 		}
 		c = ch;
 
 		/* Strip out newline characters. */
 		if (c == '\n')
 			continue;
 
 		/* Keep track of the nesting depth for braces. */
 		if (c == PAGEDEF_START)
 			depth++;
 		else if (c == PAGEDEF_END) {
 			depth--;
 			if (depth < 0) {
 				errx(EX_OSFILE, "%s:%d: %s", pagedb_path,
 				    lineno, "mismatched bracket");
 			}
 		}
 
 		switch (state) {
 		case LOCATE:
 			/*
 			 * Locate the page the user is interested in, skipping
 			 * all others.
 			 */
 			if (isspace(c)) {
 				/* Ignore all whitespace between pages. */
 				break;
 			} else if (depth == 0 && c == PAGEENTRY_END) {
 				/*
 				 * A page entry terminator will reset page
 				 * scanning (useful for assigning names to
 				 * modes without providing a mode definition).
 				 */
 				/* Record the name of this page. */
 				pagenum = strtol(str_pagenum, NULL, 0);
 				nameentry_create(pagenum, str_pagename);
 				SETSTATE_LOCATE;
 			} else if (depth == 0 && c == PAGENAME_START) {
 				SETSTATE_PAGENAME;
 			} else if (c == PAGEDEF_START) {
 				pagenum = strtol(str_pagenum, NULL, 0);
 				if (depth == 1) {
 					/* Record the name of this page. */
 					nameentry_create(pagenum, str_pagename);
 					/*
 					 * Only record the format if this is
 					 * the page we are interested in.
 					 */
 					if (page == pagenum && !found)
 						SETSTATE_PAGEDEF;
 				}
 			} else if (c == PAGEDEF_END) {
 				/* Reset the processor state. */
 				SETSTATE_LOCATE;
 			} else if (depth == 0 && ! BUFFERFULL(str_pagenum)) {
 				strncat(str_pagenum, &c, 1);
 			} else if (depth == 0) {
 				errx(EX_OSFILE, "%s:%d: %s %zd %s", pagedb_path,
 				    lineno, "page identifier exceeds",
 				    sizeof(str_pagenum) - 1, "characters");
 			}
 			break;
 
 		case PAGENAME:
 			if (c == PAGENAME_END) {
 				/*
 				 * Return to LOCATE state without resetting the
 				 * page number buffer.
 				 */
 				state = LOCATE;
 			} else if (! BUFFERFULL(str_pagename)) {
 				strncat(str_pagename, &c, 1);
 			} else {
 				errx(EX_OSFILE, "%s:%d: %s %zd %s", pagedb_path,
 				    lineno, "page name exceeds",
 				    sizeof(str_pagenum) - 1, "characters");
 			}
 			break;
 
 		case PAGEDEF:
 			/*
 			 * Transfer the page definition into a format buffer
 			 * suitable for use with CDB encoding/decoding routines.
 			 */
 			if (depth == 0) {
 				found = 1;
 				SETSTATE_LOCATE;
 			} else if (! BUFFERFULL(format)) {
 				strncat(format, &c, 1);
 			} else {
 				errx(EX_OSFILE, "%s:%d: %s %zd %s", pagedb_path,
 				    lineno, "page definition exceeds",
 				    sizeof(format) - 1, "characters");
 			}
 			break;
 
 		default:
 			; /* NOTREACHED */
 		}
 
 		/* Repeat processing loop with next character. */
 	}
 
 	if (ferror(pagedb))
 		err(EX_OSFILE, "%s", pagedb_path);
 
 	/* Close the SCSI page database. */
 	fclose(pagedb);
 
 	if (!found)			/* Never found a matching page. */
 		returnerr(ESRCH);
 
 	return (0);
 }
 
 static void
 editlist_populate(struct cam_device *device, int modepage, int page_control,
 		  int dbd, int retries, int timeout)
 {
 	u_int8_t data[MAX_COMMAND_SIZE];/* Buffer to hold sense data. */
 	u_int8_t *mode_pars;		/* Pointer to modepage params. */
 	struct scsi_mode_header_6 *mh;	/* Location of mode header. */
 	struct scsi_mode_page_header *mph;
 
 	STAILQ_INIT(&editlist);
 
 	/* Fetch changeable values; use to build initial editlist. */
 	mode_sense(device, modepage, 1, dbd, retries, timeout, data,
 		   sizeof(data));
 
 	mh = (struct scsi_mode_header_6 *)data;
 	mph = MODE_PAGE_HEADER(mh);
 	mode_pars = MODE_PAGE_DATA(mph);
 
 	/* Decode the value data, creating edit_entries for each value. */
 	buff_decode_visit(mode_pars, mh->data_length, format,
 	    editentry_create, 0);
 
 	/* Fetch the current/saved values; use to set editentry values. */
 	mode_sense(device, modepage, page_control, dbd, retries, timeout, data,
 		   sizeof(data));
 	buff_decode_visit(mode_pars, mh->data_length, format,
 	    editentry_update, 0);
 }
 
 static void
 editlist_save(struct cam_device *device, int modepage, int page_control,
 	      int dbd, int retries, int timeout)
 {
 	u_int8_t data[MAX_COMMAND_SIZE];/* Buffer to hold sense data. */
 	u_int8_t *mode_pars;		/* Pointer to modepage params. */
 	struct scsi_mode_header_6 *mh;	/* Location of mode header. */
 	struct scsi_mode_page_header *mph;
 
 	/* Make sure that something changed before continuing. */
 	if (! editlist_changed)
 		return;
 
 	/*
 	 * Preload the CDB buffer with the current mode page data.
 	 * XXX If buff_encode_visit would return the number of bytes encoded
 	 *     we *should* use that to build a header from scratch. As it is
 	 *     now, we need mode_sense to find out the page length.
 	 */
 	mode_sense(device, modepage, page_control, dbd, retries, timeout, data,
 		   sizeof(data));
 
 	/* Initial headers & offsets. */
 	mh = (struct scsi_mode_header_6 *)data;
 	mph = MODE_PAGE_HEADER(mh);
 	mode_pars = MODE_PAGE_DATA(mph);
 
 	/* Encode the value data to be passed back to the device. */
 	buff_encode_visit(mode_pars, mh->data_length, format,
 	    editentry_save, 0);
 
 	/* Eliminate block descriptors. */
 	bcopy(mph, ((u_int8_t *)mh) + sizeof(*mh),
 	    sizeof(*mph) + mph->page_length);
 
 	/* Recalculate headers & offsets. */
 	mh->blk_desc_len = 0;		/* No block descriptors. */
 	mh->dev_spec = 0;		/* Clear device-specific parameters. */
 	mph = MODE_PAGE_HEADER(mh);
 	mode_pars = MODE_PAGE_DATA(mph);
 
 	mph->page_code &= SMS_PAGE_CODE;/* Isolate just the page code. */
 	mh->data_length = 0;		/* Reserved for MODE SELECT command. */
 
 	/*
 	 * Write the changes back to the device. If the user editted control
 	 * page 3 (saved values) then request the changes be permanently
 	 * recorded.
 	 */
 	mode_select(device,
 	    (page_control << PAGE_CTRL_SHIFT == SMS_PAGE_CTRL_SAVED),
 	    retries, timeout, (u_int8_t *)mh,
 	    sizeof(*mh) + mh->blk_desc_len + sizeof(*mph) + mph->page_length);
 }
 
 static int
 modepage_write(FILE *file, int editonly)
 {
 	struct editentry *scan;
 	int written = 0;
 
 	STAILQ_FOREACH(scan, &editlist, link) {
 		if (scan->editable || !editonly) {
 			written++;
 			if (scan->type == 'c' || scan->type == 'z') {
 				fprintf(file, "%s:  %s\n", scan->name,
 				    scan->value.svalue);
 			} else {
 				fprintf(file, "%s:  %d\n", scan->name,
 				    scan->value.ivalue);
 			}
 		}
 	}
 	return (written);
 }
 
 static int
 modepage_read(FILE *file)
 {
 	char *buffer;			/* Pointer to dynamic line buffer.  */
 	char *line;			/* Pointer to static fgetln buffer. */
 	char *name;			/* Name portion of the line buffer. */
 	char *value;			/* Value portion of line buffer.    */
 	size_t length;			/* Length of static fgetln buffer.  */
 
 #define	ABORT_READ(message, param) do {					\
 	warnx(message, param);						\
 	free(buffer);							\
 	returnerr(EAGAIN);						\
 } while (0)
 
 	while ((line = fgetln(file, &length)) != NULL) {
 		/* Trim trailing whitespace (including optional newline). */
 		while (length > 0 && isspace(line[length - 1]))
 			length--;
 
 	    	/* Allocate a buffer to hold the line + terminating null. */
 	    	if ((buffer = malloc(length + 1)) == NULL)
 			err(EX_OSERR, NULL);
 		memcpy(buffer, line, length);
 		buffer[length] = '\0';
 
 		/* Strip out comments. */
 		if ((value = strchr(buffer, '#')) != NULL)
 			*value = '\0';
 
 		/* The name is first in the buffer. Trim whitespace.*/
 		name = buffer;
 		RTRIM(name);
 		while (isspace(*name))
 			name++;
 
 		/* Skip empty lines. */
 		if (strlen(name) == 0)
 			continue;
 
 		/* The name ends at the colon; the value starts there. */
 		if ((value = strrchr(buffer, ':')) == NULL)
 			ABORT_READ("no value associated with %s", name);
 		*value = '\0';			/* Null-terminate name. */
 		value++;			/* Value starts afterwards. */
 
 		/* Trim leading and trailing whitespace. */
 		RTRIM(value);
 		while (isspace(*value))
 			value++;
 
 		/* Make sure there is a value left. */
 		if (strlen(value) == 0)
 			ABORT_READ("no value associated with %s", name);
 
 		/* Update our in-memory copy of the modepage entry value. */
 		if (editentry_set(name, value, 1) != 0) {
 			if (errno == ENOENT) {
 				/* No entry by the name. */
 				ABORT_READ("no such modepage entry \"%s\"",
 				    name);
 			} else if (errno == EINVAL) {
 				/* Invalid value. */
 				ABORT_READ("Invalid value for entry \"%s\"",
 				    name);
 			} else if (errno == ERANGE) {
 				/* Value out of range for entry type. */
 				ABORT_READ("value out of range for %s", name);
 			} else if (errno == EPERM) {
 				/* Entry is not editable; not fatal. */
 				warnx("modepage entry \"%s\" is read-only; "
 				    "skipping.", name);
 			}
 		}
 
 		free(buffer);
 	}
 	return (ferror(file)? -1: 0);
 
 #undef ABORT_READ
 }
 
 static void
 modepage_edit(void)
 {
 	const char *editor;
 	char *commandline;
 	int fd;
 	int written;
 
 	if (!isatty(fileno(stdin))) {
 		/* Not a tty, read changes from stdin. */
 		modepage_read(stdin);
 		return;
 	}
 
 	/* Lookup editor to invoke. */
 	if ((editor = getenv("EDITOR")) == NULL)
 		editor = DEFAULT_EDITOR;
 
 	/* Create temp file for editor to modify. */
 	if ((fd = mkstemp(edit_path)) == -1)
 		errx(EX_CANTCREAT, "mkstemp failed");
 
 	atexit(cleanup_editfile);
 
 	if ((edit_file = fdopen(fd, "w")) == NULL)
 		err(EX_NOINPUT, "%s", edit_path);
 
 	written = modepage_write(edit_file, 1);
 
 	fclose(edit_file);
 	edit_file = NULL;
 
 	if (written == 0) {
 		warnx("no editable entries");
 		cleanup_editfile();
 		return;
 	}
 
 	/*
 	 * Allocate memory to hold the command line (the 2 extra characters
 	 * are to hold the argument separator (a space), and the terminating
 	 * null character.
 	 */
 	commandline = malloc(strlen(editor) + strlen(edit_path) + 2);
 	if (commandline == NULL)
 		err(EX_OSERR, NULL);
 	sprintf(commandline, "%s %s", editor, edit_path);
 
 	/* Invoke the editor on the temp file. */
 	if (system(commandline) == -1)
 		err(EX_UNAVAILABLE, "could not invoke %s", editor);
 	free(commandline);
 
 	if ((edit_file = fopen(edit_path, "r")) == NULL)
 		err(EX_NOINPUT, "%s", edit_path);
 
 	/* Read any changes made to the temp file. */
 	modepage_read(edit_file);
 
 	cleanup_editfile();
 }
 
 static void
 modepage_dump(struct cam_device *device, int page, int page_control, int dbd,
 	      int retries, int timeout)
 {
 	u_int8_t data[MAX_COMMAND_SIZE];/* Buffer to hold sense data. */
 	u_int8_t *mode_pars;		/* Pointer to modepage params. */
 	struct scsi_mode_header_6 *mh;	/* Location of mode header. */
 	struct scsi_mode_page_header *mph;
 	int indx;			/* Index for scanning mode params. */
 
 	mode_sense(device, page, page_control, dbd, retries, timeout, data,
 		   sizeof(data));
 
 	mh = (struct scsi_mode_header_6 *)data;
 	mph = MODE_PAGE_HEADER(mh);
 	mode_pars = MODE_PAGE_DATA(mph);
 
 	/* Print the raw mode page data with newlines each 8 bytes. */
 	for (indx = 0; indx < mph->page_length; indx++) {
 		printf("%02x%c",mode_pars[indx],
 		    (((indx + 1) % 8) == 0) ? '\n' : ' ');
 	}
 	putchar('\n');
 }
 
 static void
 cleanup_editfile(void)
 {
 	if (edit_file == NULL)
 		return;
 	if (fclose(edit_file) != 0 || unlink(edit_path) != 0)
 		warn("%s", edit_path);
 	edit_file = NULL;
 }
 
 void
 mode_edit(struct cam_device *device, int page, int page_control, int dbd,
 	  int edit, int binary, int retry_count, int timeout)
 {
 	const char *pagedb_path;	/* Path to modepage database. */
 
 	if (edit && binary)
 		errx(EX_USAGE, "cannot edit in binary mode.");
 
 	if (! binary) {
 		if ((pagedb_path = getenv("SCSI_MODES")) == NULL)
 			pagedb_path = DEFAULT_SCSI_MODE_DB;
 
 		if (load_format(pagedb_path, page) != 0 && (edit || verbose)) {
 			if (errno == ENOENT) {
 				/* Modepage database file not found. */
 				warn("cannot open modepage database \"%s\"",
 				    pagedb_path);
 			} else if (errno == ESRCH) {
 				/* Modepage entry not found in database. */
 				warnx("modepage %d not found in database"
 				    "\"%s\"", page, pagedb_path);
 			}
 			/* We can recover in display mode, otherwise we exit. */
 			if (!edit) {
 				warnx("reverting to binary display only");
 				binary = 1;
 			} else
 				exit(EX_OSFILE);
 		}
 
 		editlist_populate(device, page, page_control, dbd, retry_count,
 			timeout);
 	}
 
 	if (edit) {
 		if (page_control << PAGE_CTRL_SHIFT != SMS_PAGE_CTRL_CURRENT &&
 		    page_control << PAGE_CTRL_SHIFT != SMS_PAGE_CTRL_SAVED)
 			errx(EX_USAGE, "it only makes sense to edit page 0 "
 			    "(current) or page 3 (saved values)");
 		modepage_edit();
 		editlist_save(device, page, page_control, dbd, retry_count,
 			timeout);
 	} else if (binary || STAILQ_EMPTY(&editlist)) {
 		/* Display without formatting information. */
 		modepage_dump(device, page, page_control, dbd, retry_count,
 		    timeout);
 	} else {
 		/* Display with format. */
 		modepage_write(stdout, 0);
 	}
 }
 
 void
 mode_list(struct cam_device *device, int page_control, int dbd,
 	  int retry_count, int timeout)
 {
 	u_int8_t data[MAX_COMMAND_SIZE];/* Buffer to hold sense data. */
 	struct scsi_mode_header_6 *mh;	/* Location of mode header. */
 	struct scsi_mode_page_header *mph;
 	struct pagename *nameentry;
 	const char *pagedb_path;
 	int len;
 
 	if ((pagedb_path = getenv("SCSI_MODES")) == NULL)
 		pagedb_path = DEFAULT_SCSI_MODE_DB;
 
 	if (load_format(pagedb_path, 0) != 0 && verbose && errno == ENOENT) {
 		/* Modepage database file not found. */
 		warn("cannot open modepage database \"%s\"", pagedb_path);
 	}
 
 	/* Build the list of all mode pages by querying the "all pages" page. */
 	mode_sense(device, SMS_ALL_PAGES_PAGE, page_control, dbd, retry_count,
 	    timeout, data, sizeof(data));
 
 	mh = (struct scsi_mode_header_6 *)data;
 	len = sizeof(*mh) + mh->blk_desc_len;	/* Skip block descriptors. */
 	/* Iterate through the pages in the reply. */
 	while (len < mh->data_length) {
 		/* Locate the next mode page header. */
 		mph = (struct scsi_mode_page_header *)
 		    ((intptr_t)mh + len);
 
 		mph->page_code &= SMS_PAGE_CODE;
 		nameentry = nameentry_lookup(mph->page_code);
 
 		if (nameentry == NULL || nameentry->name == NULL)
 			printf("0x%02x\n", mph->page_code);
 		else
 			printf("0x%02x\t%s\n", mph->page_code,
 			    nameentry->name); 
 		len += mph->page_length + sizeof(*mph);
 	}
 }
Index: projects/bsnmp-ipv6-mib/sbin/ifconfig/ifieee80211.c
===================================================================
--- projects/bsnmp-ipv6-mib/sbin/ifconfig/ifieee80211.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sbin/ifconfig/ifieee80211.c	(revision 311637)
@@ -1,5484 +1,5703 @@
 /*
  * Copyright 2001 The Aerospace Corporation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of The Aerospace Corporation may not be used to endorse or
  *    promote products derived from this software.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AEROSPACE CORPORATION BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
 #include <net/route.h>
 
 #include <net80211/ieee80211_ioctl.h>
 #include <net80211/ieee80211_freebsd.h>
 #include <net80211/ieee80211_superg.h>
 #include <net80211/ieee80211_tdma.h>
 #include <net80211/ieee80211_mesh.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <stddef.h>		/* NB: for offsetof */
 
 #include "ifconfig.h"
 
 #include <lib80211/lib80211_regdomain.h>
 #include <lib80211/lib80211_ioctl.h>
 
 #ifndef IEEE80211_FIXED_RATE_NONE
 #define	IEEE80211_FIXED_RATE_NONE	0xff
 #endif
 
 /* XXX need these publicly defined or similar */
 #ifndef IEEE80211_NODE_AUTH
 #define	IEEE80211_NODE_AUTH	0x000001	/* authorized for data */
 #define	IEEE80211_NODE_QOS	0x000002	/* QoS enabled */
 #define	IEEE80211_NODE_ERP	0x000004	/* ERP enabled */
 #define	IEEE80211_NODE_PWR_MGT	0x000010	/* power save mode enabled */
 #define	IEEE80211_NODE_AREF	0x000020	/* authentication ref held */
 #define	IEEE80211_NODE_HT	0x000040	/* HT enabled */
 #define	IEEE80211_NODE_HTCOMPAT	0x000080	/* HT setup w/ vendor OUI's */
 #define	IEEE80211_NODE_WPS	0x000100	/* WPS association */
 #define	IEEE80211_NODE_TSN	0x000200	/* TSN association */
 #define	IEEE80211_NODE_AMPDU_RX	0x000400	/* AMPDU rx enabled */
 #define	IEEE80211_NODE_AMPDU_TX	0x000800	/* AMPDU tx enabled */
 #define	IEEE80211_NODE_MIMO_PS	0x001000	/* MIMO power save enabled */
 #define	IEEE80211_NODE_MIMO_RTS	0x002000	/* send RTS in MIMO PS */
 #define	IEEE80211_NODE_RIFS	0x004000	/* RIFS enabled */
 #define	IEEE80211_NODE_SGI20	0x008000	/* Short GI in HT20 enabled */
 #define	IEEE80211_NODE_SGI40	0x010000	/* Short GI in HT40 enabled */
 #define	IEEE80211_NODE_ASSOCID	0x020000	/* xmit requires associd */
 #define	IEEE80211_NODE_AMSDU_RX	0x040000	/* AMSDU rx enabled */
 #define	IEEE80211_NODE_AMSDU_TX	0x080000	/* AMSDU tx enabled */
+#define	IEEE80211_NODE_VHT	0x100000	/* VHT enabled */
 #endif
 
 #define	MAXCHAN	1536		/* max 1.5K channels */
 
 #define	MAXCOL	78
 static	int col;
 static	char spacer;
 
 static void LINE_INIT(char c);
 static void LINE_BREAK(void);
 static void LINE_CHECK(const char *fmt, ...);
 
 static const char *modename[IEEE80211_MODE_MAX] = {
 	[IEEE80211_MODE_AUTO]	  = "auto",
 	[IEEE80211_MODE_11A]	  = "11a",
 	[IEEE80211_MODE_11B]	  = "11b",
 	[IEEE80211_MODE_11G]	  = "11g",
 	[IEEE80211_MODE_FH]	  = "fh",
 	[IEEE80211_MODE_TURBO_A]  = "turboA",
 	[IEEE80211_MODE_TURBO_G]  = "turboG",
 	[IEEE80211_MODE_STURBO_A] = "sturbo",
 	[IEEE80211_MODE_11NA]	  = "11na",
 	[IEEE80211_MODE_11NG]	  = "11ng",
 	[IEEE80211_MODE_HALF]	  = "half",
-	[IEEE80211_MODE_QUARTER]  = "quarter"
+	[IEEE80211_MODE_QUARTER]  = "quarter",
+	[IEEE80211_MODE_VHT_2GHZ] = "11acg",
+	[IEEE80211_MODE_VHT_5GHZ] = "11ac",
 };
 
 static void set80211(int s, int type, int val, int len, void *data);
 static int get80211(int s, int type, void *data, int len);
 static int get80211len(int s, int type, void *data, int len, int *plen);
 static int get80211val(int s, int type, int *val);
 static const char *get_string(const char *val, const char *sep,
     u_int8_t *buf, int *lenp);
 static void print_string(const u_int8_t *buf, int len);
 static void print_regdomain(const struct ieee80211_regdomain *, int);
 static void print_channels(int, const struct ieee80211req_chaninfo *,
     int allchans, int verbose);
 static void regdomain_makechannels(struct ieee80211_regdomain_req *,
     const struct ieee80211_devcaps_req *);
 static const char *mesh_linkstate_string(uint8_t state);
 
 static struct ieee80211req_chaninfo *chaninfo;
 static struct ieee80211_regdomain regdomain;
 static int gotregdomain = 0;
 static struct ieee80211_roamparams_req roamparams;
 static int gotroam = 0;
 static struct ieee80211_txparams_req txparams;
 static int gottxparams = 0;
 static struct ieee80211_channel curchan;
 static int gotcurchan = 0;
 static struct ifmediareq *ifmr;
 static int htconf = 0;
 static	int gothtconf = 0;
 
 static void
 gethtconf(int s)
 {
 	if (gothtconf)
 		return;
 	if (get80211val(s, IEEE80211_IOC_HTCONF, &htconf) < 0)
 		warn("unable to get HT configuration information");
 	gothtconf = 1;
 }
 
+/* VHT */
+static int vhtconf = 0;
+static	int gotvhtconf = 0;
+
+static void
+getvhtconf(int s)
+{
+	if (gotvhtconf)
+		return;
+	if (get80211val(s, IEEE80211_IOC_VHTCONF, &vhtconf) < 0)
+		warn("unable to get VHT configuration information");
+	gotvhtconf = 1;
+}
+
 /*
  * Collect channel info from the kernel.  We use this (mostly)
  * to handle mapping between frequency and IEEE channel number.
  */
 static void
 getchaninfo(int s)
 {
 	if (chaninfo != NULL)
 		return;
 	chaninfo = malloc(IEEE80211_CHANINFO_SIZE(MAXCHAN));
 	if (chaninfo == NULL)
 		errx(1, "no space for channel list");
 	if (get80211(s, IEEE80211_IOC_CHANINFO, chaninfo,
 	    IEEE80211_CHANINFO_SIZE(MAXCHAN)) < 0)
 		err(1, "unable to get channel information");
 	ifmr = ifmedia_getstate(s);
 	gethtconf(s);
+	getvhtconf(s);
 }
 
 static struct regdata *
 getregdata(void)
 {
 	static struct regdata *rdp = NULL;
 	if (rdp == NULL) {
 		rdp = lib80211_alloc_regdata();
 		if (rdp == NULL)
 			errx(-1, "missing or corrupted regdomain database");
 	}
 	return rdp;
 }
 
 /*
  * Given the channel at index i with attributes from,
  * check if there is a channel with attributes to in
  * the channel table.  With suitable attributes this
  * allows the caller to look for promotion; e.g. from
  * 11b > 11g.
  */
 static int
 canpromote(int i, int from, int to)
 {
 	const struct ieee80211_channel *fc = &chaninfo->ic_chans[i];
 	u_int j;
 
 	if ((fc->ic_flags & from) != from)
 		return i;
 	/* NB: quick check exploiting ordering of chans w/ same frequency */
 	if (i+1 < chaninfo->ic_nchans &&
 	    chaninfo->ic_chans[i+1].ic_freq == fc->ic_freq &&
 	    (chaninfo->ic_chans[i+1].ic_flags & to) == to)
 		return i+1;
 	/* brute force search in case channel list is not ordered */
 	for (j = 0; j < chaninfo->ic_nchans; j++) {
 		const struct ieee80211_channel *tc = &chaninfo->ic_chans[j];
 		if (j != i &&
 		    tc->ic_freq == fc->ic_freq && (tc->ic_flags & to) == to)
 		return j;
 	}
 	return i;
 }
 
 /*
  * Handle channel promotion.  When a channel is specified with
  * only a frequency we want to promote it to the ``best'' channel
  * available.  The channel list has separate entries for 11b, 11g,
  * 11a, and 11n[ga] channels so specifying a frequency w/o any
  * attributes requires we upgrade, e.g. from 11b -> 11g.  This
  * gets complicated when the channel is specified on the same
  * command line with a media request that constrains the available
  * channe list (e.g. mode 11a); we want to honor that to avoid
  * confusing behaviour.
  */
+/*
+ * XXX VHT
+ */
 static int
 promote(int i)
 {
 	/*
 	 * Query the current mode of the interface in case it's
 	 * constrained (e.g. to 11a).  We must do this carefully
 	 * as there may be a pending ifmedia request in which case
 	 * asking the kernel will give us the wrong answer.  This
 	 * is an unfortunate side-effect of the way ifconfig is
 	 * structure for modularity (yech).
 	 *
 	 * NB: ifmr is actually setup in getchaninfo (above); we
 	 *     assume it's called coincident with to this call so
 	 *     we have a ``current setting''; otherwise we must pass
 	 *     the socket descriptor down to here so we can make
 	 *     the ifmedia_getstate call ourselves.
 	 */
 	int chanmode = ifmr != NULL ? IFM_MODE(ifmr->ifm_current) : IFM_AUTO;
 
 	/* when ambiguous promote to ``best'' */
 	/* NB: we abitrarily pick HT40+ over HT40- */
 	if (chanmode != IFM_IEEE80211_11B)
 		i = canpromote(i, IEEE80211_CHAN_B, IEEE80211_CHAN_G);
 	if (chanmode != IFM_IEEE80211_11G && (htconf & 1)) {
 		i = canpromote(i, IEEE80211_CHAN_G,
 			IEEE80211_CHAN_G | IEEE80211_CHAN_HT20);
 		if (htconf & 2) {
 			i = canpromote(i, IEEE80211_CHAN_G,
 				IEEE80211_CHAN_G | IEEE80211_CHAN_HT40D);
 			i = canpromote(i, IEEE80211_CHAN_G,
 				IEEE80211_CHAN_G | IEEE80211_CHAN_HT40U);
 		}
 	}
 	if (chanmode != IFM_IEEE80211_11A && (htconf & 1)) {
 		i = canpromote(i, IEEE80211_CHAN_A,
 			IEEE80211_CHAN_A | IEEE80211_CHAN_HT20);
 		if (htconf & 2) {
 			i = canpromote(i, IEEE80211_CHAN_A,
 				IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D);
 			i = canpromote(i, IEEE80211_CHAN_A,
 				IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U);
 		}
 	}
 	return i;
 }
 
 static void
 mapfreq(struct ieee80211_channel *chan, int freq, int flags)
 {
 	u_int i;
 
 	for (i = 0; i < chaninfo->ic_nchans; i++) {
 		const struct ieee80211_channel *c = &chaninfo->ic_chans[i];
 
 		if (c->ic_freq == freq && (c->ic_flags & flags) == flags) {
 			if (flags == 0) {
 				/* when ambiguous promote to ``best'' */
 				c = &chaninfo->ic_chans[promote(i)];
 			}
 			*chan = *c;
 			return;
 		}
 	}
 	errx(1, "unknown/undefined frequency %u/0x%x", freq, flags);
 }
 
 static void
 mapchan(struct ieee80211_channel *chan, int ieee, int flags)
 {
 	u_int i;
 
 	for (i = 0; i < chaninfo->ic_nchans; i++) {
 		const struct ieee80211_channel *c = &chaninfo->ic_chans[i];
 
 		if (c->ic_ieee == ieee && (c->ic_flags & flags) == flags) {
 			if (flags == 0) {
 				/* when ambiguous promote to ``best'' */
 				c = &chaninfo->ic_chans[promote(i)];
 			}
 			*chan = *c;
 			return;
 		}
 	}
 	errx(1, "unknown/undefined channel number %d flags 0x%x", ieee, flags);
 }
 
 static const struct ieee80211_channel *
 getcurchan(int s)
 {
 	if (gotcurchan)
 		return &curchan;
 	if (get80211(s, IEEE80211_IOC_CURCHAN, &curchan, sizeof(curchan)) < 0) {
 		int val;
 		/* fall back to legacy ioctl */
 		if (get80211val(s, IEEE80211_IOC_CHANNEL, &val) < 0)
 			err(-1, "cannot figure out current channel");
 		getchaninfo(s);
 		mapchan(&curchan, val, 0);
 	}
 	gotcurchan = 1;
 	return &curchan;
 }
 
 static enum ieee80211_phymode
 chan2mode(const struct ieee80211_channel *c)
 {
+	if (IEEE80211_IS_CHAN_VHTA(c))
+		return IEEE80211_MODE_VHT_5GHZ;
+	if (IEEE80211_IS_CHAN_VHTG(c))
+		return IEEE80211_MODE_VHT_2GHZ;
 	if (IEEE80211_IS_CHAN_HTA(c))
 		return IEEE80211_MODE_11NA;
 	if (IEEE80211_IS_CHAN_HTG(c))
 		return IEEE80211_MODE_11NG;
 	if (IEEE80211_IS_CHAN_108A(c))
 		return IEEE80211_MODE_TURBO_A;
 	if (IEEE80211_IS_CHAN_108G(c))
 		return IEEE80211_MODE_TURBO_G;
 	if (IEEE80211_IS_CHAN_ST(c))
 		return IEEE80211_MODE_STURBO_A;
 	if (IEEE80211_IS_CHAN_FHSS(c))
 		return IEEE80211_MODE_FH;
 	if (IEEE80211_IS_CHAN_HALF(c))
 		return IEEE80211_MODE_HALF;
 	if (IEEE80211_IS_CHAN_QUARTER(c))
 		return IEEE80211_MODE_QUARTER;
 	if (IEEE80211_IS_CHAN_A(c))
 		return IEEE80211_MODE_11A;
 	if (IEEE80211_IS_CHAN_ANYG(c))
 		return IEEE80211_MODE_11G;
 	if (IEEE80211_IS_CHAN_B(c))
 		return IEEE80211_MODE_11B;
 	return IEEE80211_MODE_AUTO;
 }
 
 static void
 getroam(int s)
 {
 	if (gotroam)
 		return;
 	if (get80211(s, IEEE80211_IOC_ROAM,
 	    &roamparams, sizeof(roamparams)) < 0)
 		err(1, "unable to get roaming parameters");
 	gotroam = 1;
 }
 
 static void
 setroam_cb(int s, void *arg)
 {
 	struct ieee80211_roamparams_req *roam = arg;
 	set80211(s, IEEE80211_IOC_ROAM, 0, sizeof(*roam), roam);
 }
 
 static void
 gettxparams(int s)
 {
 	if (gottxparams)
 		return;
 	if (get80211(s, IEEE80211_IOC_TXPARAMS,
 	    &txparams, sizeof(txparams)) < 0)
 		err(1, "unable to get transmit parameters");
 	gottxparams = 1;
 }
 
 static void
 settxparams_cb(int s, void *arg)
 {
 	struct ieee80211_txparams_req *txp = arg;
 	set80211(s, IEEE80211_IOC_TXPARAMS, 0, sizeof(*txp), txp);
 }
 
 static void
 getregdomain(int s)
 {
 	if (gotregdomain)
 		return;
 	if (get80211(s, IEEE80211_IOC_REGDOMAIN,
 	    &regdomain, sizeof(regdomain)) < 0)
 		err(1, "unable to get regulatory domain info");
 	gotregdomain = 1;
 }
 
 static void
 getdevcaps(int s, struct ieee80211_devcaps_req *dc)
 {
 	if (get80211(s, IEEE80211_IOC_DEVCAPS, dc,
 	    IEEE80211_DEVCAPS_SPACE(dc)) < 0)
 		err(1, "unable to get device capabilities");
 }
 
 static void
 setregdomain_cb(int s, void *arg)
 {
 	struct ieee80211_regdomain_req *req;
 	struct ieee80211_regdomain *rd = arg;
 	struct ieee80211_devcaps_req *dc;
 	struct regdata *rdp = getregdata();
 
 	if (rd->country != NO_COUNTRY) {
 		const struct country *cc;
 		/*
 		 * Check current country seting to make sure it's
 		 * compatible with the new regdomain.  If not, then
 		 * override it with any default country for this
 		 * SKU.  If we cannot arrange a match, then abort.
 		 */
 		cc = lib80211_country_findbycc(rdp, rd->country);
 		if (cc == NULL)
 			errx(1, "unknown ISO country code %d", rd->country);
 		if (cc->rd->sku != rd->regdomain) {
 			const struct regdomain *rp;
 			/*
 			 * Check if country is incompatible with regdomain.
 			 * To enable multiple regdomains for a country code
 			 * we permit a mismatch between the regdomain and
 			 * the country's associated regdomain when the
 			 * regdomain is setup w/o a default country.  For
 			 * example, US is bound to the FCC regdomain but
 			 * we allow US to be combined with FCC3 because FCC3
 			 * has not default country.  This allows bogus
 			 * combinations like FCC3+DK which are resolved when
 			 * constructing the channel list by deferring to the
 			 * regdomain to construct the channel list.
 			 */
 			rp = lib80211_regdomain_findbysku(rdp, rd->regdomain);
 			if (rp == NULL)
 				errx(1, "country %s (%s) is not usable with "
 				    "regdomain %d", cc->isoname, cc->name,
 				    rd->regdomain);
 			else if (rp->cc != NULL && rp->cc != cc)
 				errx(1, "country %s (%s) is not usable with "
 				   "regdomain %s", cc->isoname, cc->name,
 				   rp->name);
 		}
 	}
 	/*
 	 * Fetch the device capabilities and calculate the
 	 * full set of netbands for which we request a new
 	 * channel list be constructed.  Once that's done we
 	 * push the regdomain info + channel list to the kernel.
 	 */
 	dc = malloc(IEEE80211_DEVCAPS_SIZE(MAXCHAN));
 	if (dc == NULL)
 		errx(1, "no space for device capabilities");
 	dc->dc_chaninfo.ic_nchans = MAXCHAN;
 	getdevcaps(s, dc);
 #if 0
 	if (verbose) {
 		printf("drivercaps: 0x%x\n", dc->dc_drivercaps);
 		printf("cryptocaps: 0x%x\n", dc->dc_cryptocaps);
 		printf("htcaps    : 0x%x\n", dc->dc_htcaps);
+		printf("vhtcaps   : 0x%x\n", dc->dc_vhtcaps);
+#if 0
 		memcpy(chaninfo, &dc->dc_chaninfo,
 		    IEEE80211_CHANINFO_SPACE(&dc->dc_chaninfo));
 		print_channels(s, &dc->dc_chaninfo, 1/*allchans*/, 1/*verbose*/);
+#endif
 	}
 #endif
 	req = malloc(IEEE80211_REGDOMAIN_SIZE(dc->dc_chaninfo.ic_nchans));
 	if (req == NULL)
 		errx(1, "no space for regdomain request");
 	req->rd = *rd;
 	regdomain_makechannels(req, dc);
 	if (verbose) {
 		LINE_INIT(':');
 		print_regdomain(rd, 1/*verbose*/);
 		LINE_BREAK();
 		/* blech, reallocate channel list for new data */
 		if (chaninfo != NULL)
 			free(chaninfo);
 		chaninfo = malloc(IEEE80211_CHANINFO_SPACE(&req->chaninfo));
 		if (chaninfo == NULL)
 			errx(1, "no space for channel list");
 		memcpy(chaninfo, &req->chaninfo,
 		    IEEE80211_CHANINFO_SPACE(&req->chaninfo));
 		print_channels(s, &req->chaninfo, 1/*allchans*/, 1/*verbose*/);
 	}
 	if (req->chaninfo.ic_nchans == 0)
 		errx(1, "no channels calculated");
 	set80211(s, IEEE80211_IOC_REGDOMAIN, 0,
 	    IEEE80211_REGDOMAIN_SPACE(req), req);
 	free(req);
 	free(dc);
 }
 
 static int
 ieee80211_mhz2ieee(int freq, int flags)
 {
 	struct ieee80211_channel chan;
 	mapfreq(&chan, freq, flags);
 	return chan.ic_ieee;
 }
 
 static int
 isanyarg(const char *arg)
 {
 	return (strncmp(arg, "-", 1) == 0 ||
 	    strncasecmp(arg, "any", 3) == 0 || strncasecmp(arg, "off", 3) == 0);
 }
 
 static void
 set80211ssid(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int		ssid;
 	int		len;
 	u_int8_t	data[IEEE80211_NWID_LEN];
 
 	ssid = 0;
 	len = strlen(val);
 	if (len > 2 && isdigit((int)val[0]) && val[1] == ':') {
 		ssid = atoi(val)-1;
 		val += 2;
 	}
 
 	bzero(data, sizeof(data));
 	len = sizeof(data);
 	if (get_string(val, NULL, data, &len) == NULL)
 		exit(1);
 
 	set80211(s, IEEE80211_IOC_SSID, ssid, len, data);
 }
 
 static void
 set80211meshid(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int		len;
 	u_int8_t	data[IEEE80211_NWID_LEN];
 
 	memset(data, 0, sizeof(data));
 	len = sizeof(data);
 	if (get_string(val, NULL, data, &len) == NULL)
 		exit(1);
 
 	set80211(s, IEEE80211_IOC_MESH_ID, 0, len, data);
 }	
 
 static void
 set80211stationname(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int			len;
 	u_int8_t		data[33];
 
 	bzero(data, sizeof(data));
 	len = sizeof(data);
 	get_string(val, NULL, data, &len);
 
 	set80211(s, IEEE80211_IOC_STATIONNAME, 0, len, data);
 }
 
 /*
  * Parse a channel specification for attributes/flags.
  * The syntax is:
  *	freq/xx		channel width (5,10,20,40,40+,40-)
  *	freq:mode	channel mode (a,b,g,h,n,t,s,d)
  *
  * These can be combined in either order; e.g. 2437:ng/40.
  * Modes are case insensitive.
  *
  * The result is not validated here; it's assumed to be
  * checked against the channel table fetched from the kernel.
  */ 
 static int
 getchannelflags(const char *val, int freq)
 {
 #define	_CHAN_HT	0x80000000
 	const char *cp;
 	int flags;
+	int is_vht = 0;
 
 	flags = 0;
 
 	cp = strchr(val, ':');
 	if (cp != NULL) {
 		for (cp++; isalpha((int) *cp); cp++) {
 			/* accept mixed case */
 			int c = *cp;
 			if (isupper(c))
 				c = tolower(c);
 			switch (c) {
 			case 'a':		/* 802.11a */
 				flags |= IEEE80211_CHAN_A;
 				break;
 			case 'b':		/* 802.11b */
 				flags |= IEEE80211_CHAN_B;
 				break;
 			case 'g':		/* 802.11g */
 				flags |= IEEE80211_CHAN_G;
 				break;
+			case 'v':		/* vht: 802.11ac */
+				is_vht = 1;
+				/* Fallthrough */
 			case 'h':		/* ht = 802.11n */
 			case 'n':		/* 802.11n */
 				flags |= _CHAN_HT;	/* NB: private */
 				break;
 			case 'd':		/* dt = Atheros Dynamic Turbo */
 				flags |= IEEE80211_CHAN_TURBO;
 				break;
 			case 't':		/* ht, dt, st, t */
 				/* dt and unadorned t specify Dynamic Turbo */
 				if ((flags & (IEEE80211_CHAN_STURBO|_CHAN_HT)) == 0)
 					flags |= IEEE80211_CHAN_TURBO;
 				break;
 			case 's':		/* st = Atheros Static Turbo */
 				flags |= IEEE80211_CHAN_STURBO;
 				break;
 			default:
 				errx(-1, "%s: Invalid channel attribute %c\n",
 				    val, *cp);
 			}
 		}
 	}
 	cp = strchr(val, '/');
 	if (cp != NULL) {
 		char *ep;
 		u_long cw = strtoul(cp+1, &ep, 10);
 
 		switch (cw) {
 		case 5:
 			flags |= IEEE80211_CHAN_QUARTER;
 			break;
 		case 10:
 			flags |= IEEE80211_CHAN_HALF;
 			break;
 		case 20:
 			/* NB: this may be removed below */
 			flags |= IEEE80211_CHAN_HT20;
 			break;
 		case 40:
+		case 80:
+		case 160:
+			/* Handle the 80/160 VHT flag */
+			if (cw == 80)
+				flags |= IEEE80211_CHAN_VHT80;
+			else if (cw == 160)
+				flags |= IEEE80211_CHAN_VHT160;
+
+			/* Fallthrough */
 			if (ep != NULL && *ep == '+')
 				flags |= IEEE80211_CHAN_HT40U;
 			else if (ep != NULL && *ep == '-')
 				flags |= IEEE80211_CHAN_HT40D;
 			break;
 		default:
 			errx(-1, "%s: Invalid channel width\n", val);
 		}
 	}
+
 	/*
 	 * Cleanup specifications.
 	 */ 
 	if ((flags & _CHAN_HT) == 0) {
 		/*
 		 * If user specified freq/20 or freq/40 quietly remove
 		 * HT cw attributes depending on channel use.  To give
 		 * an explicit 20/40 width for an HT channel you must
 		 * indicate it is an HT channel since all HT channels
 		 * are also usable for legacy operation; e.g. freq:n/40.
 		 */
 		flags &= ~IEEE80211_CHAN_HT;
+		flags &= ~IEEE80211_CHAN_VHT;
 	} else {
 		/*
 		 * Remove private indicator that this is an HT channel
 		 * and if no explicit channel width has been given
 		 * provide the default settings.
 		 */
 		flags &= ~_CHAN_HT;
 		if ((flags & IEEE80211_CHAN_HT) == 0) {
 			struct ieee80211_channel chan;
 			/*
 			 * Consult the channel list to see if we can use
 			 * HT40+ or HT40- (if both the map routines choose).
 			 */
 			if (freq > 255)
 				mapfreq(&chan, freq, 0);
 			else
 				mapchan(&chan, freq, 0);
 			flags |= (chan.ic_flags & IEEE80211_CHAN_HT);
 		}
+
+		/*
+		 * If VHT is enabled, then also set the VHT flag and the
+		 * relevant channel up/down.
+		 */
+		if (is_vht && (flags & IEEE80211_CHAN_HT)) {
+			/*
+			 * XXX yes, maybe we should just have VHT, and reuse
+			 * HT20/HT40U/HT40D
+			 */
+			if (flags & IEEE80211_CHAN_VHT80)
+				;
+			else if (flags & IEEE80211_CHAN_HT20)
+				flags |= IEEE80211_CHAN_VHT20;
+			else if (flags & IEEE80211_CHAN_HT40U)
+				flags |= IEEE80211_CHAN_VHT40U;
+			else if (flags & IEEE80211_CHAN_HT40D)
+				flags |= IEEE80211_CHAN_VHT40D;
+		}
 	}
 	return flags;
 #undef _CHAN_HT
 }
 
 static void
 getchannel(int s, struct ieee80211_channel *chan, const char *val)
 {
 	int v, flags;
 	char *eptr;
 
 	memset(chan, 0, sizeof(*chan));
 	if (isanyarg(val)) {
 		chan->ic_freq = IEEE80211_CHAN_ANY;
 		return;
 	}
 	getchaninfo(s);
 	errno = 0;
 	v = strtol(val, &eptr, 10);
 	if (val[0] == '\0' || val == eptr || errno == ERANGE ||
 	    /* channel may be suffixed with nothing, :flag, or /width */
 	    (eptr[0] != '\0' && eptr[0] != ':' && eptr[0] != '/'))
 		errx(1, "invalid channel specification%s",
 		    errno == ERANGE ? " (out of range)" : "");
 	flags = getchannelflags(val, v);
 	if (v > 255) {		/* treat as frequency */
 		mapfreq(chan, v, flags);
 	} else {
 		mapchan(chan, v, flags);
 	}
 }
 
 static void
 set80211channel(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	struct ieee80211_channel chan;
 
 	getchannel(s, &chan, val);
 	set80211(s, IEEE80211_IOC_CURCHAN, 0, sizeof(chan), &chan);
 }
 
 static void
 set80211chanswitch(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	struct ieee80211_chanswitch_req csr;
 
 	getchannel(s, &csr.csa_chan, val);
 	csr.csa_mode = 1;
 	csr.csa_count = 5;
 	set80211(s, IEEE80211_IOC_CHANSWITCH, 0, sizeof(csr), &csr);
 }
 
 static void
 set80211authmode(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int	mode;
 
 	if (strcasecmp(val, "none") == 0) {
 		mode = IEEE80211_AUTH_NONE;
 	} else if (strcasecmp(val, "open") == 0) {
 		mode = IEEE80211_AUTH_OPEN;
 	} else if (strcasecmp(val, "shared") == 0) {
 		mode = IEEE80211_AUTH_SHARED;
 	} else if (strcasecmp(val, "8021x") == 0) {
 		mode = IEEE80211_AUTH_8021X;
 	} else if (strcasecmp(val, "wpa") == 0) {
 		mode = IEEE80211_AUTH_WPA;
 	} else {
 		errx(1, "unknown authmode");
 	}
 
 	set80211(s, IEEE80211_IOC_AUTHMODE, mode, 0, NULL);
 }
 
 static void
 set80211powersavemode(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int	mode;
 
 	if (strcasecmp(val, "off") == 0) {
 		mode = IEEE80211_POWERSAVE_OFF;
 	} else if (strcasecmp(val, "on") == 0) {
 		mode = IEEE80211_POWERSAVE_ON;
 	} else if (strcasecmp(val, "cam") == 0) {
 		mode = IEEE80211_POWERSAVE_CAM;
 	} else if (strcasecmp(val, "psp") == 0) {
 		mode = IEEE80211_POWERSAVE_PSP;
 	} else if (strcasecmp(val, "psp-cam") == 0) {
 		mode = IEEE80211_POWERSAVE_PSP_CAM;
 	} else {
 		errx(1, "unknown powersavemode");
 	}
 
 	set80211(s, IEEE80211_IOC_POWERSAVE, mode, 0, NULL);
 }
 
 static void
 set80211powersave(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	if (d == 0)
 		set80211(s, IEEE80211_IOC_POWERSAVE, IEEE80211_POWERSAVE_OFF,
 		    0, NULL);
 	else
 		set80211(s, IEEE80211_IOC_POWERSAVE, IEEE80211_POWERSAVE_ON,
 		    0, NULL);
 }
 
 static void
 set80211powersavesleep(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_POWERSAVESLEEP, atoi(val), 0, NULL);
 }
 
 static void
 set80211wepmode(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int	mode;
 
 	if (strcasecmp(val, "off") == 0) {
 		mode = IEEE80211_WEP_OFF;
 	} else if (strcasecmp(val, "on") == 0) {
 		mode = IEEE80211_WEP_ON;
 	} else if (strcasecmp(val, "mixed") == 0) {
 		mode = IEEE80211_WEP_MIXED;
 	} else {
 		errx(1, "unknown wep mode");
 	}
 
 	set80211(s, IEEE80211_IOC_WEP, mode, 0, NULL);
 }
 
 static void
 set80211wep(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_WEP, d, 0, NULL);
 }
 
 static int
 isundefarg(const char *arg)
 {
 	return (strcmp(arg, "-") == 0 || strncasecmp(arg, "undef", 5) == 0);
 }
 
 static void
 set80211weptxkey(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	if (isundefarg(val))
 		set80211(s, IEEE80211_IOC_WEPTXKEY, IEEE80211_KEYIX_NONE, 0, NULL);
 	else
 		set80211(s, IEEE80211_IOC_WEPTXKEY, atoi(val)-1, 0, NULL);
 }
 
 static void
 set80211wepkey(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int		key = 0;
 	int		len;
 	u_int8_t	data[IEEE80211_KEYBUF_SIZE];
 
 	if (isdigit((int)val[0]) && val[1] == ':') {
 		key = atoi(val)-1;
 		val += 2;
 	}
 
 	bzero(data, sizeof(data));
 	len = sizeof(data);
 	get_string(val, NULL, data, &len);
 
 	set80211(s, IEEE80211_IOC_WEPKEY, key, len, data);
 }
 
 /*
  * This function is purely a NetBSD compatibility interface.  The NetBSD
  * interface is too inflexible, but it's there so we'll support it since
  * it's not all that hard.
  */
 static void
 set80211nwkey(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int		txkey;
 	int		i, len;
 	u_int8_t	data[IEEE80211_KEYBUF_SIZE];
 
 	set80211(s, IEEE80211_IOC_WEP, IEEE80211_WEP_ON, 0, NULL);
 
 	if (isdigit((int)val[0]) && val[1] == ':') {
 		txkey = val[0]-'0'-1;
 		val += 2;
 
 		for (i = 0; i < 4; i++) {
 			bzero(data, sizeof(data));
 			len = sizeof(data);
 			val = get_string(val, ",", data, &len);
 			if (val == NULL)
 				exit(1);
 
 			set80211(s, IEEE80211_IOC_WEPKEY, i, len, data);
 		}
 	} else {
 		bzero(data, sizeof(data));
 		len = sizeof(data);
 		get_string(val, NULL, data, &len);
 		txkey = 0;
 
 		set80211(s, IEEE80211_IOC_WEPKEY, 0, len, data);
 
 		bzero(data, sizeof(data));
 		for (i = 1; i < 4; i++)
 			set80211(s, IEEE80211_IOC_WEPKEY, i, 0, data);
 	}
 
 	set80211(s, IEEE80211_IOC_WEPTXKEY, txkey, 0, NULL);
 }
 
 static void
 set80211rtsthreshold(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_RTSTHRESHOLD,
 		isundefarg(val) ? IEEE80211_RTS_MAX : atoi(val), 0, NULL);
 }
 
 static void
 set80211protmode(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int	mode;
 
 	if (strcasecmp(val, "off") == 0) {
 		mode = IEEE80211_PROTMODE_OFF;
 	} else if (strcasecmp(val, "cts") == 0) {
 		mode = IEEE80211_PROTMODE_CTS;
 	} else if (strncasecmp(val, "rtscts", 3) == 0) {
 		mode = IEEE80211_PROTMODE_RTSCTS;
 	} else {
 		errx(1, "unknown protection mode");
 	}
 
 	set80211(s, IEEE80211_IOC_PROTMODE, mode, 0, NULL);
 }
 
 static void
 set80211htprotmode(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int	mode;
 
 	if (strcasecmp(val, "off") == 0) {
 		mode = IEEE80211_PROTMODE_OFF;
 	} else if (strncasecmp(val, "rts", 3) == 0) {
 		mode = IEEE80211_PROTMODE_RTSCTS;
 	} else {
 		errx(1, "unknown protection mode");
 	}
 
 	set80211(s, IEEE80211_IOC_HTPROTMODE, mode, 0, NULL);
 }
 
 static void
 set80211txpower(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	double v = atof(val);
 	int txpow;
 
 	txpow = (int) (2*v);
 	if (txpow != 2*v)
 		errx(-1, "invalid tx power (must be .5 dBm units)");
 	set80211(s, IEEE80211_IOC_TXPOWER, txpow, 0, NULL);
 }
 
 #define	IEEE80211_ROAMING_DEVICE	0
 #define	IEEE80211_ROAMING_AUTO		1
 #define	IEEE80211_ROAMING_MANUAL	2
 
 static void
 set80211roaming(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int mode;
 
 	if (strcasecmp(val, "device") == 0) {
 		mode = IEEE80211_ROAMING_DEVICE;
 	} else if (strcasecmp(val, "auto") == 0) {
 		mode = IEEE80211_ROAMING_AUTO;
 	} else if (strcasecmp(val, "manual") == 0) {
 		mode = IEEE80211_ROAMING_MANUAL;
 	} else {
 		errx(1, "unknown roaming mode");
 	}
 	set80211(s, IEEE80211_IOC_ROAMING, mode, 0, NULL);
 }
 
 static void
 set80211wme(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_WME, d, 0, NULL);
 }
 
 static void
 set80211hidessid(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_HIDESSID, d, 0, NULL);
 }
 
 static void
 set80211apbridge(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_APBRIDGE, d, 0, NULL);
 }
 
 static void
 set80211fastframes(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_FF, d, 0, NULL);
 }
 
 static void
 set80211dturbo(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_TURBOP, d, 0, NULL);
 }
 
 static void
 set80211chanlist(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	struct ieee80211req_chanlist chanlist;
 	char *temp, *cp, *tp;
 
 	temp = malloc(strlen(val) + 1);
 	if (temp == NULL)
 		errx(1, "malloc failed");
 	strcpy(temp, val);
 	memset(&chanlist, 0, sizeof(chanlist));
 	cp = temp;
 	for (;;) {
 		int first, last, f, c;
 
 		tp = strchr(cp, ',');
 		if (tp != NULL)
 			*tp++ = '\0';
 		switch (sscanf(cp, "%u-%u", &first, &last)) {
 		case 1:
 			if (first > IEEE80211_CHAN_MAX)
 				errx(-1, "channel %u out of range, max %u",
 					first, IEEE80211_CHAN_MAX);
 			setbit(chanlist.ic_channels, first);
 			break;
 		case 2:
 			if (first > IEEE80211_CHAN_MAX)
 				errx(-1, "channel %u out of range, max %u",
 					first, IEEE80211_CHAN_MAX);
 			if (last > IEEE80211_CHAN_MAX)
 				errx(-1, "channel %u out of range, max %u",
 					last, IEEE80211_CHAN_MAX);
 			if (first > last)
 				errx(-1, "void channel range, %u > %u",
 					first, last);
 			for (f = first; f <= last; f++)
 				setbit(chanlist.ic_channels, f);
 			break;
 		}
 		if (tp == NULL)
 			break;
 		c = *tp;
 		while (isspace(c))
 			tp++;
 		if (!isdigit(c))
 			break;
 		cp = tp;
 	}
 	set80211(s, IEEE80211_IOC_CHANLIST, 0, sizeof(chanlist), &chanlist);
 }
 
 static void
 set80211bssid(const char *val, int d, int s, const struct afswtch *rafp)
 {
 
 	if (!isanyarg(val)) {
 		char *temp;
 		struct sockaddr_dl sdl;
 
 		temp = malloc(strlen(val) + 2); /* ':' and '\0' */
 		if (temp == NULL)
 			errx(1, "malloc failed");
 		temp[0] = ':';
 		strcpy(temp + 1, val);
 		sdl.sdl_len = sizeof(sdl);
 		link_addr(temp, &sdl);
 		free(temp);
 		if (sdl.sdl_alen != IEEE80211_ADDR_LEN)
 			errx(1, "malformed link-level address");
 		set80211(s, IEEE80211_IOC_BSSID, 0,
 			IEEE80211_ADDR_LEN, LLADDR(&sdl));
 	} else {
 		uint8_t zerobssid[IEEE80211_ADDR_LEN];
 		memset(zerobssid, 0, sizeof(zerobssid));
 		set80211(s, IEEE80211_IOC_BSSID, 0,
 			IEEE80211_ADDR_LEN, zerobssid);
 	}
 }
 
 static int
 getac(const char *ac)
 {
 	if (strcasecmp(ac, "ac_be") == 0 || strcasecmp(ac, "be") == 0)
 		return WME_AC_BE;
 	if (strcasecmp(ac, "ac_bk") == 0 || strcasecmp(ac, "bk") == 0)
 		return WME_AC_BK;
 	if (strcasecmp(ac, "ac_vi") == 0 || strcasecmp(ac, "vi") == 0)
 		return WME_AC_VI;
 	if (strcasecmp(ac, "ac_vo") == 0 || strcasecmp(ac, "vo") == 0)
 		return WME_AC_VO;
 	errx(1, "unknown wme access class %s", ac);
 }
 
 static
 DECL_CMD_FUNC2(set80211cwmin, ac, val)
 {
 	set80211(s, IEEE80211_IOC_WME_CWMIN, atoi(val), getac(ac), NULL);
 }
 
 static
 DECL_CMD_FUNC2(set80211cwmax, ac, val)
 {
 	set80211(s, IEEE80211_IOC_WME_CWMAX, atoi(val), getac(ac), NULL);
 }
 
 static
 DECL_CMD_FUNC2(set80211aifs, ac, val)
 {
 	set80211(s, IEEE80211_IOC_WME_AIFS, atoi(val), getac(ac), NULL);
 }
 
 static
 DECL_CMD_FUNC2(set80211txoplimit, ac, val)
 {
 	set80211(s, IEEE80211_IOC_WME_TXOPLIMIT, atoi(val), getac(ac), NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211acm, ac, d)
 {
 	set80211(s, IEEE80211_IOC_WME_ACM, 1, getac(ac), NULL);
 }
 static
 DECL_CMD_FUNC(set80211noacm, ac, d)
 {
 	set80211(s, IEEE80211_IOC_WME_ACM, 0, getac(ac), NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211ackpolicy, ac, d)
 {
 	set80211(s, IEEE80211_IOC_WME_ACKPOLICY, 1, getac(ac), NULL);
 }
 static
 DECL_CMD_FUNC(set80211noackpolicy, ac, d)
 {
 	set80211(s, IEEE80211_IOC_WME_ACKPOLICY, 0, getac(ac), NULL);
 }
 
 static
 DECL_CMD_FUNC2(set80211bsscwmin, ac, val)
 {
 	set80211(s, IEEE80211_IOC_WME_CWMIN, atoi(val),
 		getac(ac)|IEEE80211_WMEPARAM_BSS, NULL);
 }
 
 static
 DECL_CMD_FUNC2(set80211bsscwmax, ac, val)
 {
 	set80211(s, IEEE80211_IOC_WME_CWMAX, atoi(val),
 		getac(ac)|IEEE80211_WMEPARAM_BSS, NULL);
 }
 
 static
 DECL_CMD_FUNC2(set80211bssaifs, ac, val)
 {
 	set80211(s, IEEE80211_IOC_WME_AIFS, atoi(val),
 		getac(ac)|IEEE80211_WMEPARAM_BSS, NULL);
 }
 
 static
 DECL_CMD_FUNC2(set80211bsstxoplimit, ac, val)
 {
 	set80211(s, IEEE80211_IOC_WME_TXOPLIMIT, atoi(val),
 		getac(ac)|IEEE80211_WMEPARAM_BSS, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211dtimperiod, val, d)
 {
 	set80211(s, IEEE80211_IOC_DTIM_PERIOD, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211bintval, val, d)
 {
 	set80211(s, IEEE80211_IOC_BEACON_INTERVAL, atoi(val), 0, NULL);
 }
 
 static void
 set80211macmac(int s, int op, const char *val)
 {
 	char *temp;
 	struct sockaddr_dl sdl;
 
 	temp = malloc(strlen(val) + 2); /* ':' and '\0' */
 	if (temp == NULL)
 		errx(1, "malloc failed");
 	temp[0] = ':';
 	strcpy(temp + 1, val);
 	sdl.sdl_len = sizeof(sdl);
 	link_addr(temp, &sdl);
 	free(temp);
 	if (sdl.sdl_alen != IEEE80211_ADDR_LEN)
 		errx(1, "malformed link-level address");
 	set80211(s, op, 0, IEEE80211_ADDR_LEN, LLADDR(&sdl));
 }
 
 static
 DECL_CMD_FUNC(set80211addmac, val, d)
 {
 	set80211macmac(s, IEEE80211_IOC_ADDMAC, val);
 }
 
 static
 DECL_CMD_FUNC(set80211delmac, val, d)
 {
 	set80211macmac(s, IEEE80211_IOC_DELMAC, val);
 }
 
 static
 DECL_CMD_FUNC(set80211kickmac, val, d)
 {
 	char *temp;
 	struct sockaddr_dl sdl;
 	struct ieee80211req_mlme mlme;
 
 	temp = malloc(strlen(val) + 2); /* ':' and '\0' */
 	if (temp == NULL)
 		errx(1, "malloc failed");
 	temp[0] = ':';
 	strcpy(temp + 1, val);
 	sdl.sdl_len = sizeof(sdl);
 	link_addr(temp, &sdl);
 	free(temp);
 	if (sdl.sdl_alen != IEEE80211_ADDR_LEN)
 		errx(1, "malformed link-level address");
 	memset(&mlme, 0, sizeof(mlme));
 	mlme.im_op = IEEE80211_MLME_DEAUTH;
 	mlme.im_reason = IEEE80211_REASON_AUTH_EXPIRE;
 	memcpy(mlme.im_macaddr, LLADDR(&sdl), IEEE80211_ADDR_LEN);
 	set80211(s, IEEE80211_IOC_MLME, 0, sizeof(mlme), &mlme);
 }
 
 static
 DECL_CMD_FUNC(set80211maccmd, val, d)
 {
 	set80211(s, IEEE80211_IOC_MACCMD, d, 0, NULL);
 }
 
 static void
 set80211meshrtmac(int s, int req, const char *val)
 {
 	char *temp;
 	struct sockaddr_dl sdl;
 
 	temp = malloc(strlen(val) + 2); /* ':' and '\0' */
 	if (temp == NULL)
 		errx(1, "malloc failed");
 	temp[0] = ':';
 	strcpy(temp + 1, val);
 	sdl.sdl_len = sizeof(sdl);
 	link_addr(temp, &sdl);
 	free(temp);
 	if (sdl.sdl_alen != IEEE80211_ADDR_LEN)
 		errx(1, "malformed link-level address");
 	set80211(s, IEEE80211_IOC_MESH_RTCMD, req,
 	    IEEE80211_ADDR_LEN, LLADDR(&sdl));
 }
 
 static
 DECL_CMD_FUNC(set80211addmeshrt, val, d)
 {
 	set80211meshrtmac(s, IEEE80211_MESH_RTCMD_ADD, val);
 }
 
 static
 DECL_CMD_FUNC(set80211delmeshrt, val, d)
 {
 	set80211meshrtmac(s, IEEE80211_MESH_RTCMD_DELETE, val);
 }
 
 static
 DECL_CMD_FUNC(set80211meshrtcmd, val, d)
 {
 	set80211(s, IEEE80211_IOC_MESH_RTCMD, d, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211hwmprootmode, val, d)
 {
 	int mode;
 
 	if (strcasecmp(val, "normal") == 0)
 		mode = IEEE80211_HWMP_ROOTMODE_NORMAL;
 	else if (strcasecmp(val, "proactive") == 0)
 		mode = IEEE80211_HWMP_ROOTMODE_PROACTIVE;
 	else if (strcasecmp(val, "rann") == 0)
 		mode = IEEE80211_HWMP_ROOTMODE_RANN;
 	else
 		mode = IEEE80211_HWMP_ROOTMODE_DISABLED;
 	set80211(s, IEEE80211_IOC_HWMP_ROOTMODE, mode, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211hwmpmaxhops, val, d)
 {
 	set80211(s, IEEE80211_IOC_HWMP_MAXHOPS, atoi(val), 0, NULL);
 }
 
 static void
 set80211pureg(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_PUREG, d, 0, NULL);
 }
 
 static void
 set80211quiet(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_QUIET, d, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211quietperiod, val, d)
 {
 	set80211(s, IEEE80211_IOC_QUIET_PERIOD, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211quietcount, val, d)
 {
 	set80211(s, IEEE80211_IOC_QUIET_COUNT, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211quietduration, val, d)
 {
 	set80211(s, IEEE80211_IOC_QUIET_DUR, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211quietoffset, val, d)
 {
 	set80211(s, IEEE80211_IOC_QUIET_OFFSET, atoi(val), 0, NULL);
 }
 
 static void
 set80211bgscan(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_BGSCAN, d, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211bgscanidle, val, d)
 {
 	set80211(s, IEEE80211_IOC_BGSCAN_IDLE, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211bgscanintvl, val, d)
 {
 	set80211(s, IEEE80211_IOC_BGSCAN_INTERVAL, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211scanvalid, val, d)
 {
 	set80211(s, IEEE80211_IOC_SCANVALID, atoi(val), 0, NULL);
 }
 
 /*
  * Parse an optional trailing specification of which netbands
  * to apply a parameter to.  This is basically the same syntax
  * as used for channels but you can concatenate to specify
  * multiple.  For example:
  *	14:abg		apply to 11a, 11b, and 11g
  *	6:ht		apply to 11na and 11ng
  * We don't make a big effort to catch silly things; this is
  * really a convenience mechanism.
  */
 static int
 getmodeflags(const char *val)
 {
 	const char *cp;
 	int flags;
 
 	flags = 0;
 
 	cp = strchr(val, ':');
 	if (cp != NULL) {
 		for (cp++; isalpha((int) *cp); cp++) {
 			/* accept mixed case */
 			int c = *cp;
 			if (isupper(c))
 				c = tolower(c);
 			switch (c) {
 			case 'a':		/* 802.11a */
 				flags |= IEEE80211_CHAN_A;
 				break;
 			case 'b':		/* 802.11b */
 				flags |= IEEE80211_CHAN_B;
 				break;
 			case 'g':		/* 802.11g */
 				flags |= IEEE80211_CHAN_G;
 				break;
 			case 'n':		/* 802.11n */
 				flags |= IEEE80211_CHAN_HT;
 				break;
 			case 'd':		/* dt = Atheros Dynamic Turbo */
 				flags |= IEEE80211_CHAN_TURBO;
 				break;
 			case 't':		/* ht, dt, st, t */
 				/* dt and unadorned t specify Dynamic Turbo */
 				if ((flags & (IEEE80211_CHAN_STURBO|IEEE80211_CHAN_HT)) == 0)
 					flags |= IEEE80211_CHAN_TURBO;
 				break;
 			case 's':		/* st = Atheros Static Turbo */
 				flags |= IEEE80211_CHAN_STURBO;
 				break;
 			case 'h':		/* 1/2-width channels */
 				flags |= IEEE80211_CHAN_HALF;
 				break;
 			case 'q':		/* 1/4-width channels */
 				flags |= IEEE80211_CHAN_QUARTER;
 				break;
+			case 'v':
+				/* XXX set HT too? */
+				flags |= IEEE80211_CHAN_VHT;
+				break;
 			default:
 				errx(-1, "%s: Invalid mode attribute %c\n",
 				    val, *cp);
 			}
 		}
 	}
 	return flags;
 }
 
 #define	IEEE80211_CHAN_HTA	(IEEE80211_CHAN_HT|IEEE80211_CHAN_5GHZ)
 #define	IEEE80211_CHAN_HTG	(IEEE80211_CHAN_HT|IEEE80211_CHAN_2GHZ)
 
 #define	_APPLY(_flags, _base, _param, _v) do {				\
     if (_flags & IEEE80211_CHAN_HT) {					\
 	    if ((_flags & (IEEE80211_CHAN_5GHZ|IEEE80211_CHAN_2GHZ)) == 0) {\
 		    _base.params[IEEE80211_MODE_11NA]._param = _v;	\
 		    _base.params[IEEE80211_MODE_11NG]._param = _v;	\
 	    } else if (_flags & IEEE80211_CHAN_5GHZ)			\
 		    _base.params[IEEE80211_MODE_11NA]._param = _v;	\
 	    else							\
 		    _base.params[IEEE80211_MODE_11NG]._param = _v;	\
     }									\
     if (_flags & IEEE80211_CHAN_TURBO) {				\
 	    if ((_flags & (IEEE80211_CHAN_5GHZ|IEEE80211_CHAN_2GHZ)) == 0) {\
 		    _base.params[IEEE80211_MODE_TURBO_A]._param = _v;	\
 		    _base.params[IEEE80211_MODE_TURBO_G]._param = _v;	\
 	    } else if (_flags & IEEE80211_CHAN_5GHZ)			\
 		    _base.params[IEEE80211_MODE_TURBO_A]._param = _v;	\
 	    else							\
 		    _base.params[IEEE80211_MODE_TURBO_G]._param = _v;	\
     }									\
     if (_flags & IEEE80211_CHAN_STURBO)					\
 	    _base.params[IEEE80211_MODE_STURBO_A]._param = _v;		\
     if ((_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A)		\
 	    _base.params[IEEE80211_MODE_11A]._param = _v;		\
     if ((_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G)		\
 	    _base.params[IEEE80211_MODE_11G]._param = _v;		\
     if ((_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B)		\
 	    _base.params[IEEE80211_MODE_11B]._param = _v;		\
     if (_flags & IEEE80211_CHAN_HALF)					\
 	    _base.params[IEEE80211_MODE_HALF]._param = _v;		\
     if (_flags & IEEE80211_CHAN_QUARTER)				\
 	    _base.params[IEEE80211_MODE_QUARTER]._param = _v;		\
 } while (0)
 #define	_APPLY1(_flags, _base, _param, _v) do {				\
     if (_flags & IEEE80211_CHAN_HT) {					\
 	    if (_flags & IEEE80211_CHAN_5GHZ)				\
 		    _base.params[IEEE80211_MODE_11NA]._param = _v;	\
 	    else							\
 		    _base.params[IEEE80211_MODE_11NG]._param = _v;	\
     } else if ((_flags & IEEE80211_CHAN_108A) == IEEE80211_CHAN_108A)	\
 	    _base.params[IEEE80211_MODE_TURBO_A]._param = _v;		\
     else if ((_flags & IEEE80211_CHAN_108G) == IEEE80211_CHAN_108G)	\
 	    _base.params[IEEE80211_MODE_TURBO_G]._param = _v;		\
     else if ((_flags & IEEE80211_CHAN_ST) == IEEE80211_CHAN_ST)		\
 	    _base.params[IEEE80211_MODE_STURBO_A]._param = _v;		\
     else if (_flags & IEEE80211_CHAN_HALF)				\
 	    _base.params[IEEE80211_MODE_HALF]._param = _v;		\
     else if (_flags & IEEE80211_CHAN_QUARTER)				\
 	    _base.params[IEEE80211_MODE_QUARTER]._param = _v;		\
     else if ((_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A)		\
 	    _base.params[IEEE80211_MODE_11A]._param = _v;		\
     else if ((_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G)		\
 	    _base.params[IEEE80211_MODE_11G]._param = _v;		\
     else if ((_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B)		\
 	    _base.params[IEEE80211_MODE_11B]._param = _v;		\
 } while (0)
 #define	_APPLY_RATE(_flags, _base, _param, _v) do {			\
     if (_flags & IEEE80211_CHAN_HT) {					\
 	(_v) = (_v / 2) | IEEE80211_RATE_MCS;				\
     }									\
     _APPLY(_flags, _base, _param, _v);					\
 } while (0)
 #define	_APPLY_RATE1(_flags, _base, _param, _v) do {			\
     if (_flags & IEEE80211_CHAN_HT) {					\
 	(_v) = (_v / 2) | IEEE80211_RATE_MCS;				\
     }									\
     _APPLY1(_flags, _base, _param, _v);					\
 } while (0)
 
 static
 DECL_CMD_FUNC(set80211roamrssi, val, d)
 {
 	double v = atof(val);
 	int rssi, flags;
 
 	rssi = (int) (2*v);
 	if (rssi != 2*v)
 		errx(-1, "invalid rssi (must be .5 dBm units)");
 	flags = getmodeflags(val);
 	getroam(s);
 	if (flags == 0) {		/* NB: no flags => current channel */
 		flags = getcurchan(s)->ic_flags;
 		_APPLY1(flags, roamparams, rssi, rssi);
 	} else
 		_APPLY(flags, roamparams, rssi, rssi);
 	callback_register(setroam_cb, &roamparams);
 }
 
 static int
 getrate(const char *val, const char *tag)
 {
 	double v = atof(val);
 	int rate;
 
 	rate = (int) (2*v);
 	if (rate != 2*v)
 		errx(-1, "invalid %s rate (must be .5 Mb/s units)", tag);
 	return rate;		/* NB: returns 2x the specified value */
 }
 
 static
 DECL_CMD_FUNC(set80211roamrate, val, d)
 {
 	int rate, flags;
 
 	rate = getrate(val, "roam");
 	flags = getmodeflags(val);
 	getroam(s);
 	if (flags == 0) {		/* NB: no flags => current channel */
 		flags = getcurchan(s)->ic_flags;
 		_APPLY_RATE1(flags, roamparams, rate, rate);
 	} else
 		_APPLY_RATE(flags, roamparams, rate, rate);
 	callback_register(setroam_cb, &roamparams);
 }
 
 static
 DECL_CMD_FUNC(set80211mcastrate, val, d)
 {
 	int rate, flags;
 
 	rate = getrate(val, "mcast");
 	flags = getmodeflags(val);
 	gettxparams(s);
 	if (flags == 0) {		/* NB: no flags => current channel */
 		flags = getcurchan(s)->ic_flags;
 		_APPLY_RATE1(flags, txparams, mcastrate, rate);
 	} else
 		_APPLY_RATE(flags, txparams, mcastrate, rate);
 	callback_register(settxparams_cb, &txparams);
 }
 
 static
 DECL_CMD_FUNC(set80211mgtrate, val, d)
 {
 	int rate, flags;
 
 	rate = getrate(val, "mgmt");
 	flags = getmodeflags(val);
 	gettxparams(s);
 	if (flags == 0) {		/* NB: no flags => current channel */
 		flags = getcurchan(s)->ic_flags;
 		_APPLY_RATE1(flags, txparams, mgmtrate, rate);
 	} else
 		_APPLY_RATE(flags, txparams, mgmtrate, rate);
 	callback_register(settxparams_cb, &txparams);
 }
 
 static
 DECL_CMD_FUNC(set80211ucastrate, val, d)
 {
 	int flags;
 
 	gettxparams(s);
 	flags = getmodeflags(val);
 	if (isanyarg(val)) {
 		if (flags == 0) {	/* NB: no flags => current channel */
 			flags = getcurchan(s)->ic_flags;
 			_APPLY1(flags, txparams, ucastrate,
 			    IEEE80211_FIXED_RATE_NONE);
 		} else
 			_APPLY(flags, txparams, ucastrate,
 			    IEEE80211_FIXED_RATE_NONE);
 	} else {
 		int rate = getrate(val, "ucast");
 		if (flags == 0) {	/* NB: no flags => current channel */
 			flags = getcurchan(s)->ic_flags;
 			_APPLY_RATE1(flags, txparams, ucastrate, rate);
 		} else
 			_APPLY_RATE(flags, txparams, ucastrate, rate);
 	}
 	callback_register(settxparams_cb, &txparams);
 }
 
 static
 DECL_CMD_FUNC(set80211maxretry, val, d)
 {
 	int v = atoi(val), flags;
 
 	flags = getmodeflags(val);
 	gettxparams(s);
 	if (flags == 0) {		/* NB: no flags => current channel */
 		flags = getcurchan(s)->ic_flags;
 		_APPLY1(flags, txparams, maxretry, v);
 	} else
 		_APPLY(flags, txparams, maxretry, v);
 	callback_register(settxparams_cb, &txparams);
 }
 #undef _APPLY_RATE
 #undef _APPLY
 #undef IEEE80211_CHAN_HTA
 #undef IEEE80211_CHAN_HTG
 
 static
 DECL_CMD_FUNC(set80211fragthreshold, val, d)
 {
 	set80211(s, IEEE80211_IOC_FRAGTHRESHOLD,
 		isundefarg(val) ? IEEE80211_FRAG_MAX : atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211bmissthreshold, val, d)
 {
 	set80211(s, IEEE80211_IOC_BMISSTHRESHOLD,
 		isundefarg(val) ? IEEE80211_HWBMISS_MAX : atoi(val), 0, NULL);
 }
 
 static void
 set80211burst(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_BURST, d, 0, NULL);
 }
 
 static void
 set80211doth(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_DOTH, d, 0, NULL);
 }
 
 static void
 set80211dfs(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_DFS, d, 0, NULL);
 }
 
 static void
 set80211shortgi(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_SHORTGI,
 		d ? (IEEE80211_HTCAP_SHORTGI20 | IEEE80211_HTCAP_SHORTGI40) : 0,
 		0, NULL);
 }
 
 static void
 set80211ampdu(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int ampdu;
 
 	if (get80211val(s, IEEE80211_IOC_AMPDU, &ampdu) < 0)
 		errx(-1, "cannot set AMPDU setting");
 	if (d < 0) {
 		d = -d;
 		ampdu &= ~d;
 	} else
 		ampdu |= d;
 	set80211(s, IEEE80211_IOC_AMPDU, ampdu, 0, NULL);
 }
 
 static void
 set80211stbc(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int stbc;
 
 	if (get80211val(s, IEEE80211_IOC_STBC, &stbc) < 0)
 		errx(-1, "cannot set STBC setting");
 	if (d < 0) {
 		d = -d;
 		stbc &= ~d;
 	} else
 		stbc |= d;
 	set80211(s, IEEE80211_IOC_STBC, stbc, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211ampdulimit, val, d)
 {
 	int v;
 
 	switch (atoi(val)) {
 	case 8:
 	case 8*1024:
 		v = IEEE80211_HTCAP_MAXRXAMPDU_8K;
 		break;
 	case 16:
 	case 16*1024:
 		v = IEEE80211_HTCAP_MAXRXAMPDU_16K;
 		break;
 	case 32:
 	case 32*1024:
 		v = IEEE80211_HTCAP_MAXRXAMPDU_32K;
 		break;
 	case 64:
 	case 64*1024:
 		v = IEEE80211_HTCAP_MAXRXAMPDU_64K;
 		break;
 	default:
 		errx(-1, "invalid A-MPDU limit %s", val);
 	}
 	set80211(s, IEEE80211_IOC_AMPDU_LIMIT, v, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211ampdudensity, val, d)
 {
 	int v;
 
 	if (isanyarg(val) || strcasecmp(val, "na") == 0)
 		v = IEEE80211_HTCAP_MPDUDENSITY_NA;
 	else switch ((int)(atof(val)*4)) {
 	case 0:
 		v = IEEE80211_HTCAP_MPDUDENSITY_NA;
 		break;
 	case 1:
 		v = IEEE80211_HTCAP_MPDUDENSITY_025;
 		break;
 	case 2:
 		v = IEEE80211_HTCAP_MPDUDENSITY_05;
 		break;
 	case 4:
 		v = IEEE80211_HTCAP_MPDUDENSITY_1;
 		break;
 	case 8:
 		v = IEEE80211_HTCAP_MPDUDENSITY_2;
 		break;
 	case 16:
 		v = IEEE80211_HTCAP_MPDUDENSITY_4;
 		break;
 	case 32:
 		v = IEEE80211_HTCAP_MPDUDENSITY_8;
 		break;
 	case 64:
 		v = IEEE80211_HTCAP_MPDUDENSITY_16;
 		break;
 	default:
 		errx(-1, "invalid A-MPDU density %s", val);
 	}
 	set80211(s, IEEE80211_IOC_AMPDU_DENSITY, v, 0, NULL);
 }
 
 static void
 set80211amsdu(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int amsdu;
 
 	if (get80211val(s, IEEE80211_IOC_AMSDU, &amsdu) < 0)
 		err(-1, "cannot get AMSDU setting");
 	if (d < 0) {
 		d = -d;
 		amsdu &= ~d;
 	} else
 		amsdu |= d;
 	set80211(s, IEEE80211_IOC_AMSDU, amsdu, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211amsdulimit, val, d)
 {
 	set80211(s, IEEE80211_IOC_AMSDU_LIMIT, atoi(val), 0, NULL);
 }
 
 static void
 set80211puren(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_PUREN, d, 0, NULL);
 }
 
 static void
 set80211htcompat(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_HTCOMPAT, d, 0, NULL);
 }
 
 static void
 set80211htconf(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_HTCONF, d, 0, NULL);
 	htconf = d;
 }
 
 static void
 set80211dwds(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_DWDS, d, 0, NULL);
 }
 
 static void
 set80211inact(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_INACTIVITY, d, 0, NULL);
 }
 
 static void
 set80211tsn(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_TSN, d, 0, NULL);
 }
 
 static void
 set80211dotd(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_DOTD, d, 0, NULL);
 }
 
 static void
 set80211smps(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_SMPS, d, 0, NULL);
 }
 
 static void
 set80211rifs(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	set80211(s, IEEE80211_IOC_RIFS, d, 0, NULL);
 }
 
+static void
+set80211vhtconf(const char *val, int d, int s, const struct afswtch *rafp)
+{
+	if (get80211val(s, IEEE80211_IOC_VHTCONF, &vhtconf) < 0)
+		errx(-1, "cannot set VHT setting");
+	printf("%s: vhtconf=0x%08x, d=%d\n", __func__, vhtconf, d);
+	if (d < 0) {
+		d = -d;
+		vhtconf &= ~d;
+	} else
+		vhtconf |= d;
+	printf("%s: vhtconf is now 0x%08x\n", __func__, vhtconf);
+	set80211(s, IEEE80211_IOC_VHTCONF, vhtconf, 0, NULL);
+}
+
 static
 DECL_CMD_FUNC(set80211tdmaslot, val, d)
 {
 	set80211(s, IEEE80211_IOC_TDMA_SLOT, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211tdmaslotcnt, val, d)
 {
 	set80211(s, IEEE80211_IOC_TDMA_SLOTCNT, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211tdmaslotlen, val, d)
 {
 	set80211(s, IEEE80211_IOC_TDMA_SLOTLEN, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211tdmabintval, val, d)
 {
 	set80211(s, IEEE80211_IOC_TDMA_BINTERVAL, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211meshttl, val, d)
 {
 	set80211(s, IEEE80211_IOC_MESH_TTL, atoi(val), 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211meshforward, val, d)
 {
 	set80211(s, IEEE80211_IOC_MESH_FWRD, d, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211meshgate, val, d)
 {
 	set80211(s, IEEE80211_IOC_MESH_GATE, d, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211meshpeering, val, d)
 {
 	set80211(s, IEEE80211_IOC_MESH_AP, d, 0, NULL);
 }
 
 static
 DECL_CMD_FUNC(set80211meshmetric, val, d)
 {
 	char v[12];
 	
 	memcpy(v, val, sizeof(v));
 	set80211(s, IEEE80211_IOC_MESH_PR_METRIC, 0, 0, v);
 }
 
 static
 DECL_CMD_FUNC(set80211meshpath, val, d)
 {
 	char v[12];
 	
 	memcpy(v, val, sizeof(v));
 	set80211(s, IEEE80211_IOC_MESH_PR_PATH, 0, 0, v);
 }
 
 static int
 regdomain_sort(const void *a, const void *b)
 {
 #define	CHAN_ALL \
 	(IEEE80211_CHAN_ALLTURBO|IEEE80211_CHAN_HALF|IEEE80211_CHAN_QUARTER)
 	const struct ieee80211_channel *ca = a;
 	const struct ieee80211_channel *cb = b;
 
 	return ca->ic_freq == cb->ic_freq ?
 	    (ca->ic_flags & CHAN_ALL) - (cb->ic_flags & CHAN_ALL) :
 	    ca->ic_freq - cb->ic_freq;
 #undef CHAN_ALL
 }
 
 static const struct ieee80211_channel *
 chanlookup(const struct ieee80211_channel chans[], int nchans,
 	int freq, int flags)
 {
 	int i;
 
 	flags &= IEEE80211_CHAN_ALLTURBO;
 	for (i = 0; i < nchans; i++) {
 		const struct ieee80211_channel *c = &chans[i];
 		if (c->ic_freq == freq &&
 		    (c->ic_flags & IEEE80211_CHAN_ALLTURBO) == flags)
 			return c;
 	}
 	return NULL;
 }
 
 static int
 chanfind(const struct ieee80211_channel chans[], int nchans, int flags)
 {
 	int i;
 
 	for (i = 0; i < nchans; i++) {
 		const struct ieee80211_channel *c = &chans[i];
 		if ((c->ic_flags & flags) == flags)
 			return 1;
 	}
 	return 0;
 }
 
 /*
  * Check channel compatibility.
  */
 static int
 checkchan(const struct ieee80211req_chaninfo *avail, int freq, int flags)
 {
 	flags &= ~REQ_FLAGS;
 	/*
 	 * Check if exact channel is in the calibration table;
 	 * everything below is to deal with channels that we
 	 * want to include but that are not explicitly listed.
 	 */
 	if (chanlookup(avail->ic_chans, avail->ic_nchans, freq, flags) != NULL)
 		return 1;
 	if (flags & IEEE80211_CHAN_GSM) {
 		/*
 		 * XXX GSM frequency mapping is handled in the kernel
 		 * so we cannot find them in the calibration table;
 		 * just accept the channel and the kernel will reject
 		 * the channel list if it's wrong.
 		 */
 		return 1;
 	}
 	/*
 	 * If this is a 1/2 or 1/4 width channel allow it if a full
 	 * width channel is present for this frequency, and the device
 	 * supports fractional channels on this band.  This is a hack
 	 * that avoids bloating the calibration table; it may be better
 	 * by per-band attributes though (we are effectively calculating
 	 * this attribute by scanning the channel list ourself).
 	 */
 	if ((flags & (IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER)) == 0)
 		return 0;
 	if (chanlookup(avail->ic_chans, avail->ic_nchans, freq,
 	    flags &~ (IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER)) == NULL)
 		return 0;
 	if (flags & IEEE80211_CHAN_HALF) {
 		return chanfind(avail->ic_chans, avail->ic_nchans,
 		    IEEE80211_CHAN_HALF |
 		       (flags & (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ)));
 	} else {
 		return chanfind(avail->ic_chans, avail->ic_nchans,
 		    IEEE80211_CHAN_QUARTER |
 			(flags & (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ)));
 	}
 }
 
 static void
 regdomain_addchans(struct ieee80211req_chaninfo *ci,
 	const netband_head *bands,
 	const struct ieee80211_regdomain *reg,
 	uint32_t chanFlags,
 	const struct ieee80211req_chaninfo *avail)
 {
 	const struct netband *nb;
 	const struct freqband *b;
 	struct ieee80211_channel *c, *prev;
 	int freq, hi_adj, lo_adj, channelSep;
 	uint32_t flags;
 
 	hi_adj = (chanFlags & IEEE80211_CHAN_HT40U) ? -20 : 0;
 	lo_adj = (chanFlags & IEEE80211_CHAN_HT40D) ? 20 : 0;
 	channelSep = (chanFlags & IEEE80211_CHAN_2GHZ) ? 0 : 40;
+
 	LIST_FOREACH(nb, bands, next) {
 		b = nb->band;
 		if (verbose) {
 			printf("%s:", __func__);
 			printb(" chanFlags", chanFlags, IEEE80211_CHAN_BITS);
 			printb(" bandFlags", nb->flags | b->flags,
 			    IEEE80211_CHAN_BITS);
 			putchar('\n');
 		}
 		prev = NULL;
+
 		for (freq = b->freqStart + lo_adj;
 		     freq <= b->freqEnd + hi_adj; freq += b->chanSep) {
 			/*
 			 * Construct flags for the new channel.  We take
 			 * the attributes from the band descriptions except
 			 * for HT40 which is enabled generically (i.e. +/-
 			 * extension channel) in the band description and
 			 * then constrained according by channel separation.
 			 */
 			flags = nb->flags | b->flags;
+
+			/*
+			 * VHT first - HT is a subset.
+			 *
+			 * XXX TODO: VHT80p80, VHT160 is not yet done.
+			 */
+			if (flags & IEEE80211_CHAN_VHT) {
+				if ((chanFlags & IEEE80211_CHAN_VHT20) &&
+				    (flags & IEEE80211_CHAN_VHT20) == 0) {
+					if (verbose)
+						printf("%u: skip, not a "
+						    "VHT20 channel\n", freq);
+					continue;
+				}
+				if ((chanFlags & IEEE80211_CHAN_VHT40) &&
+				    (flags & IEEE80211_CHAN_VHT40) == 0) {
+					if (verbose)
+						printf("%u: skip, not a "
+						    "VHT40 channel\n", freq);
+					continue;
+				}
+				if ((chanFlags & IEEE80211_CHAN_VHT80) &&
+				    (flags & IEEE80211_CHAN_VHT80) == 0) {
+					if (verbose)
+						printf("%u: skip, not a "
+						    "VHT80 channel\n", freq);
+					continue;
+				}
+
+				flags &= ~IEEE80211_CHAN_VHT;
+				flags |= chanFlags & IEEE80211_CHAN_VHT;
+			}
+
+			/* Now, constrain HT */
 			if (flags & IEEE80211_CHAN_HT) {
 				/*
 				 * HT channels are generated specially; we're
 				 * called to add HT20, HT40+, and HT40- chan's
 				 * so we need to expand only band specs for
 				 * the HT channel type being added.
 				 */
 				if ((chanFlags & IEEE80211_CHAN_HT20) &&
 				    (flags & IEEE80211_CHAN_HT20) == 0) {
 					if (verbose)
 						printf("%u: skip, not an "
 						    "HT20 channel\n", freq);
 					continue;
 				}
 				if ((chanFlags & IEEE80211_CHAN_HT40) &&
 				    (flags & IEEE80211_CHAN_HT40) == 0) {
 					if (verbose)
 						printf("%u: skip, not an "
 						    "HT40 channel\n", freq);
 					continue;
 				}
 				/* NB: HT attribute comes from caller */
 				flags &= ~IEEE80211_CHAN_HT;
 				flags |= chanFlags & IEEE80211_CHAN_HT;
 			}
 			/*
 			 * Check if device can operate on this frequency.
 			 */
 			if (!checkchan(avail, freq, flags)) {
 				if (verbose) {
 					printf("%u: skip, ", freq);
 					printb("flags", flags,
 					    IEEE80211_CHAN_BITS);
 					printf(" not available\n");
 				}
 				continue;
 			}
 			if ((flags & REQ_ECM) && !reg->ecm) {
 				if (verbose)
 					printf("%u: skip, ECM channel\n", freq);
 				continue;
 			}
 			if ((flags & REQ_INDOOR) && reg->location == 'O') {
 				if (verbose)
 					printf("%u: skip, indoor channel\n",
 					    freq);
 				continue;
 			}
 			if ((flags & REQ_OUTDOOR) && reg->location == 'I') {
 				if (verbose)
 					printf("%u: skip, outdoor channel\n",
 					    freq);
 				continue;
 			}
 			if ((flags & IEEE80211_CHAN_HT40) &&
 			    prev != NULL && (freq - prev->ic_freq) < channelSep) {
 				if (verbose)
 					printf("%u: skip, only %u channel "
 					    "separation, need %d\n", freq, 
 					    freq - prev->ic_freq, channelSep);
 				continue;
 			}
 			if (ci->ic_nchans == IEEE80211_CHAN_MAX) {
 				if (verbose)
 					printf("%u: skip, channel table full\n",
 					    freq);
 				break;
 			}
 			c = &ci->ic_chans[ci->ic_nchans++];
 			memset(c, 0, sizeof(*c));
 			c->ic_freq = freq;
 			c->ic_flags = flags;
-			if (c->ic_flags & IEEE80211_CHAN_DFS)
+		if (c->ic_flags & IEEE80211_CHAN_DFS)
 				c->ic_maxregpower = nb->maxPowerDFS;
 			else
 				c->ic_maxregpower = nb->maxPower;
 			if (verbose) {
 				printf("[%3d] add freq %u ",
 				    ci->ic_nchans-1, c->ic_freq);
 				printb("flags", c->ic_flags, IEEE80211_CHAN_BITS);
 				printf(" power %u\n", c->ic_maxregpower);
 			}
 			/* NB: kernel fills in other fields */
 			prev = c;
 		}
 	}
 }
 
 static void
 regdomain_makechannels(
 	struct ieee80211_regdomain_req *req,
 	const struct ieee80211_devcaps_req *dc)
 {
 	struct regdata *rdp = getregdata();
 	const struct country *cc;
 	const struct ieee80211_regdomain *reg = &req->rd;
 	struct ieee80211req_chaninfo *ci = &req->chaninfo;
 	const struct regdomain *rd;
 
 	/*
 	 * Locate construction table for new channel list.  We treat
 	 * the regdomain/SKU as definitive so a country can be in
 	 * multiple with different properties (e.g. US in FCC+FCC3).
 	 * If no regdomain is specified then we fallback on the country
 	 * code to find the associated regdomain since countries always
 	 * belong to at least one regdomain.
 	 */
 	if (reg->regdomain == 0) {
 		cc = lib80211_country_findbycc(rdp, reg->country);
 		if (cc == NULL)
 			errx(1, "internal error, country %d not found",
 			    reg->country);
 		rd = cc->rd;
 	} else
 		rd = lib80211_regdomain_findbysku(rdp, reg->regdomain);
 	if (rd == NULL)
 		errx(1, "internal error, regdomain %d not found",
 			    reg->regdomain);
 	if (rd->sku != SKU_DEBUG) {
 		/*
 		 * regdomain_addchans incrememnts the channel count for
 		 * each channel it adds so initialize ic_nchans to zero.
 		 * Note that we know we have enough space to hold all possible
 		 * channels because the devcaps list size was used to
 		 * allocate our request.
 		 */
 		ci->ic_nchans = 0;
 		if (!LIST_EMPTY(&rd->bands_11b))
 			regdomain_addchans(ci, &rd->bands_11b, reg,
 			    IEEE80211_CHAN_B, &dc->dc_chaninfo);
 		if (!LIST_EMPTY(&rd->bands_11g))
 			regdomain_addchans(ci, &rd->bands_11g, reg,
 			    IEEE80211_CHAN_G, &dc->dc_chaninfo);
 		if (!LIST_EMPTY(&rd->bands_11a))
 			regdomain_addchans(ci, &rd->bands_11a, reg,
 			    IEEE80211_CHAN_A, &dc->dc_chaninfo);
 		if (!LIST_EMPTY(&rd->bands_11na) && dc->dc_htcaps != 0) {
 			regdomain_addchans(ci, &rd->bands_11na, reg,
 			    IEEE80211_CHAN_A | IEEE80211_CHAN_HT20,
 			    &dc->dc_chaninfo);
 			if (dc->dc_htcaps & IEEE80211_HTCAP_CHWIDTH40) {
 				regdomain_addchans(ci, &rd->bands_11na, reg,
 				    IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U,
 				    &dc->dc_chaninfo);
 				regdomain_addchans(ci, &rd->bands_11na, reg,
 				    IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D,
 				    &dc->dc_chaninfo);
 			}
 		}
+		if (!LIST_EMPTY(&rd->bands_11ac) && dc->dc_vhtcaps != 0) {
+			regdomain_addchans(ci, &rd->bands_11ac, reg,
+			    IEEE80211_CHAN_A | IEEE80211_CHAN_HT20 |
+			    IEEE80211_CHAN_VHT20,
+			    &dc->dc_chaninfo);
+
+			/* VHT40 is a function of HT40.. */
+			if (dc->dc_htcaps & IEEE80211_HTCAP_CHWIDTH40) {
+				regdomain_addchans(ci, &rd->bands_11ac, reg,
+				    IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U |
+				    IEEE80211_CHAN_VHT40U,
+				    &dc->dc_chaninfo);
+				regdomain_addchans(ci, &rd->bands_11ac, reg,
+				    IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D |
+				    IEEE80211_CHAN_VHT40D,
+				    &dc->dc_chaninfo);
+			}
+
+			/* VHT80 */
+			/* XXX dc_vhtcap? */
+			if (1) {
+				regdomain_addchans(ci, &rd->bands_11ac, reg,
+				    IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U |
+				    IEEE80211_CHAN_VHT80,
+				    &dc->dc_chaninfo);
+				regdomain_addchans(ci, &rd->bands_11ac, reg,
+				    IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D |
+				    IEEE80211_CHAN_VHT80,
+				    &dc->dc_chaninfo);
+			}
+
+			/* XXX TODO: VHT80_80, VHT160 */
+		}
+
 		if (!LIST_EMPTY(&rd->bands_11ng) && dc->dc_htcaps != 0) {
 			regdomain_addchans(ci, &rd->bands_11ng, reg,
 			    IEEE80211_CHAN_G | IEEE80211_CHAN_HT20,
 			    &dc->dc_chaninfo);
 			if (dc->dc_htcaps & IEEE80211_HTCAP_CHWIDTH40) {
 				regdomain_addchans(ci, &rd->bands_11ng, reg,
 				    IEEE80211_CHAN_G | IEEE80211_CHAN_HT40U,
 				    &dc->dc_chaninfo);
 				regdomain_addchans(ci, &rd->bands_11ng, reg,
 				    IEEE80211_CHAN_G | IEEE80211_CHAN_HT40D,
 				    &dc->dc_chaninfo);
 			}
 		}
 		qsort(ci->ic_chans, ci->ic_nchans, sizeof(ci->ic_chans[0]),
 		    regdomain_sort);
 	} else
 		memcpy(ci, &dc->dc_chaninfo,
 		    IEEE80211_CHANINFO_SPACE(&dc->dc_chaninfo));
 }
 
 static void
 list_countries(void)
 {
 	struct regdata *rdp = getregdata();
 	const struct country *cp;
 	const struct regdomain *dp;
 	int i;
 
 	i = 0;
 	printf("\nCountry codes:\n");
 	LIST_FOREACH(cp, &rdp->countries, next) {
 		printf("%2s %-15.15s%s", cp->isoname,
 		    cp->name, ((i+1)%4) == 0 ? "\n" : " ");
 		i++;
 	}
 	i = 0;
 	printf("\nRegulatory domains:\n");
 	LIST_FOREACH(dp, &rdp->domains, next) {
 		printf("%-15.15s%s", dp->name, ((i+1)%4) == 0 ? "\n" : " ");
 		i++;
 	}
 	printf("\n");
 }
 
 static void
 defaultcountry(const struct regdomain *rd)
 {
 	struct regdata *rdp = getregdata();
 	const struct country *cc;
 
 	cc = lib80211_country_findbycc(rdp, rd->cc->code);
 	if (cc == NULL)
 		errx(1, "internal error, ISO country code %d not "
 		    "defined for regdomain %s", rd->cc->code, rd->name);
 	regdomain.country = cc->code;
 	regdomain.isocc[0] = cc->isoname[0];
 	regdomain.isocc[1] = cc->isoname[1];
 }
 
 static
 DECL_CMD_FUNC(set80211regdomain, val, d)
 {
 	struct regdata *rdp = getregdata();
 	const struct regdomain *rd;
 
 	rd = lib80211_regdomain_findbyname(rdp, val);
 	if (rd == NULL) {
 		char *eptr;
 		long sku = strtol(val, &eptr, 0);
 
 		if (eptr != val)
 			rd = lib80211_regdomain_findbysku(rdp, sku);
 		if (eptr == val || rd == NULL)
 			errx(1, "unknown regdomain %s", val);
 	}
 	getregdomain(s);
 	regdomain.regdomain = rd->sku;
 	if (regdomain.country == 0 && rd->cc != NULL) {
 		/*
 		 * No country code setup and there's a default
 		 * one for this regdomain fill it in.
 		 */
 		defaultcountry(rd);
 	}
 	callback_register(setregdomain_cb, &regdomain);
 }
 
 static
 DECL_CMD_FUNC(set80211country, val, d)
 {
 	struct regdata *rdp = getregdata();
 	const struct country *cc;
 
 	cc = lib80211_country_findbyname(rdp, val);
 	if (cc == NULL) {
 		char *eptr;
 		long code = strtol(val, &eptr, 0);
 
 		if (eptr != val)
 			cc = lib80211_country_findbycc(rdp, code);
 		if (eptr == val || cc == NULL)
 			errx(1, "unknown ISO country code %s", val);
 	}
 	getregdomain(s);
 	regdomain.regdomain = cc->rd->sku;
 	regdomain.country = cc->code;
 	regdomain.isocc[0] = cc->isoname[0];
 	regdomain.isocc[1] = cc->isoname[1];
 	callback_register(setregdomain_cb, &regdomain);
 }
 
 static void
 set80211location(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	getregdomain(s);
 	regdomain.location = d;
 	callback_register(setregdomain_cb, &regdomain);
 }
 
 static void
 set80211ecm(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	getregdomain(s);
 	regdomain.ecm = d;
 	callback_register(setregdomain_cb, &regdomain);
 }
 
 static void
 LINE_INIT(char c)
 {
 	spacer = c;
 	if (c == '\t')
 		col = 8;
 	else
 		col = 1;
 }
 
 static void
 LINE_BREAK(void)
 {
 	if (spacer != '\t') {
 		printf("\n");
 		spacer = '\t';
 	}
 	col = 8;		/* 8-col tab */
 }
 
 static void
 LINE_CHECK(const char *fmt, ...)
 {
 	char buf[80];
 	va_list ap;
 	int n;
 
 	va_start(ap, fmt);
 	n = vsnprintf(buf+1, sizeof(buf)-1, fmt, ap);
 	va_end(ap);
 	col += 1+n;
 	if (col > MAXCOL) {
 		LINE_BREAK();
 		col += n;
 	}
 	buf[0] = spacer;
 	printf("%s", buf);
 	spacer = ' ';
 }
 
 static int
 getmaxrate(const uint8_t rates[15], uint8_t nrates)
 {
 	int i, maxrate = -1;
 
 	for (i = 0; i < nrates; i++) {
 		int rate = rates[i] & IEEE80211_RATE_VAL;
 		if (rate > maxrate)
 			maxrate = rate;
 	}
 	return maxrate / 2;
 }
 
 static const char *
 getcaps(int capinfo)
 {
 	static char capstring[32];
 	char *cp = capstring;
 
 	if (capinfo & IEEE80211_CAPINFO_ESS)
 		*cp++ = 'E';
 	if (capinfo & IEEE80211_CAPINFO_IBSS)
 		*cp++ = 'I';
 	if (capinfo & IEEE80211_CAPINFO_CF_POLLABLE)
 		*cp++ = 'c';
 	if (capinfo & IEEE80211_CAPINFO_CF_POLLREQ)
 		*cp++ = 'C';
 	if (capinfo & IEEE80211_CAPINFO_PRIVACY)
 		*cp++ = 'P';
 	if (capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE)
 		*cp++ = 'S';
 	if (capinfo & IEEE80211_CAPINFO_PBCC)
 		*cp++ = 'B';
 	if (capinfo & IEEE80211_CAPINFO_CHNL_AGILITY)
 		*cp++ = 'A';
 	if (capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)
 		*cp++ = 's';
 	if (capinfo & IEEE80211_CAPINFO_RSN)
 		*cp++ = 'R';
 	if (capinfo & IEEE80211_CAPINFO_DSSSOFDM)
 		*cp++ = 'D';
 	*cp = '\0';
 	return capstring;
 }
 
 static const char *
 getflags(int flags)
 {
 	static char flagstring[32];
 	char *cp = flagstring;
 
 	if (flags & IEEE80211_NODE_AUTH)
 		*cp++ = 'A';
 	if (flags & IEEE80211_NODE_QOS)
 		*cp++ = 'Q';
 	if (flags & IEEE80211_NODE_ERP)
 		*cp++ = 'E';
 	if (flags & IEEE80211_NODE_PWR_MGT)
 		*cp++ = 'P';
 	if (flags & IEEE80211_NODE_HT) {
 		*cp++ = 'H';
 		if (flags & IEEE80211_NODE_HTCOMPAT)
 			*cp++ = '+';
 	}
+	if (flags & IEEE80211_NODE_VHT)
+		*cp++ = 'V';
 	if (flags & IEEE80211_NODE_WPS)
 		*cp++ = 'W';
 	if (flags & IEEE80211_NODE_TSN)
 		*cp++ = 'N';
 	if (flags & IEEE80211_NODE_AMPDU_TX)
 		*cp++ = 'T';
 	if (flags & IEEE80211_NODE_AMPDU_RX)
 		*cp++ = 'R';
 	if (flags & IEEE80211_NODE_MIMO_PS) {
 		*cp++ = 'M';
 		if (flags & IEEE80211_NODE_MIMO_RTS)
 			*cp++ = '+';
 	}
 	if (flags & IEEE80211_NODE_RIFS)
 		*cp++ = 'I';
 	if (flags & IEEE80211_NODE_SGI40) {
 		*cp++ = 'S';
 		if (flags & IEEE80211_NODE_SGI20)
 			*cp++ = '+';
 	} else if (flags & IEEE80211_NODE_SGI20)
 		*cp++ = 's';
 	if (flags & IEEE80211_NODE_AMSDU_TX)
 		*cp++ = 't';
 	if (flags & IEEE80211_NODE_AMSDU_RX)
 		*cp++ = 'r';
 	*cp = '\0';
 	return flagstring;
 }
 
 static void
 printie(const char* tag, const uint8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose) {
 		maxlen -= strlen(tag)+2;
 		if (2*ielen > maxlen)
 			maxlen--;
 		printf("<");
 		for (; ielen > 0; ie++, ielen--) {
 			if (maxlen-- <= 0)
 				break;
 			printf("%02x", *ie);
 		}
 		if (ielen != 0)
 			printf("-");
 		printf(">");
 	}
 }
 
 #define LE_READ_2(p)					\
 	((u_int16_t)					\
 	 ((((const u_int8_t *)(p))[0]      ) |		\
 	  (((const u_int8_t *)(p))[1] <<  8)))
 #define LE_READ_4(p)					\
 	((u_int32_t)					\
 	 ((((const u_int8_t *)(p))[0]      ) |		\
 	  (((const u_int8_t *)(p))[1] <<  8) |		\
 	  (((const u_int8_t *)(p))[2] << 16) |		\
 	  (((const u_int8_t *)(p))[3] << 24)))
 
 /*
  * NB: The decoding routines assume a properly formatted ie
  *     which should be safe as the kernel only retains them
  *     if they parse ok.
  */
 
 static void
 printwmeparam(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 #define	MS(_v, _f)	(((_v) & _f) >> _f##_S)
 	static const char *acnames[] = { "BE", "BK", "VO", "VI" };
 	const struct ieee80211_wme_param *wme =
 	    (const struct ieee80211_wme_param *) ie;
 	int i;
 
 	printf("%s", tag);
 	if (!verbose)
 		return;
 	printf("<qosinfo 0x%x", wme->param_qosInfo);
 	ie += offsetof(struct ieee80211_wme_param, params_acParams);
 	for (i = 0; i < WME_NUM_AC; i++) {
 		const struct ieee80211_wme_acparams *ac =
 		    &wme->params_acParams[i];
 
 		printf(" %s[%saifsn %u cwmin %u cwmax %u txop %u]"
 			, acnames[i]
 			, MS(ac->acp_aci_aifsn, WME_PARAM_ACM) ? "acm " : ""
 			, MS(ac->acp_aci_aifsn, WME_PARAM_AIFSN)
 			, MS(ac->acp_logcwminmax, WME_PARAM_LOGCWMIN)
 			, MS(ac->acp_logcwminmax, WME_PARAM_LOGCWMAX)
 			, LE_READ_2(&ac->acp_txop)
 		);
 	}
 	printf(">");
 #undef MS
 }
 
 static void
 printwmeinfo(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose) {
 		const struct ieee80211_wme_info *wme =
 		    (const struct ieee80211_wme_info *) ie;
 		printf("<version 0x%x info 0x%x>",
 		    wme->wme_version, wme->wme_info);
 	}
 }
 
 static void
 printvhtcap(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose) {
 		const struct ieee80211_ie_vhtcap *vhtcap =
 		    (const struct ieee80211_ie_vhtcap *) ie;
 		uint32_t vhtcap_info = LE_READ_4(&vhtcap->vht_cap_info);
 
 		printf("<cap 0x%08x", vhtcap_info);
 		printf(" rx_mcs_map 0x%x",
 		    LE_READ_2(&vhtcap->supp_mcs.rx_mcs_map));
 		printf(" rx_highest %d",
 		    LE_READ_2(&vhtcap->supp_mcs.rx_highest) & 0x1fff);
 		printf(" tx_mcs_map 0x%x",
 		    LE_READ_2(&vhtcap->supp_mcs.tx_mcs_map));
 		printf(" tx_highest %d",
 		    LE_READ_2(&vhtcap->supp_mcs.tx_highest) & 0x1fff);
 
 		printf(">");
 	}
 }
 
 static void
 printvhtinfo(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose) {
 		const struct ieee80211_ie_vht_operation *vhtinfo =
 		    (const struct ieee80211_ie_vht_operation *) ie;
 
 		printf("<chw %d freq1_idx %d freq2_idx %d basic_mcs_set 0x%04x>",
 		    vhtinfo->chan_width,
 		    vhtinfo->center_freq_seg1_idx,
 		    vhtinfo->center_freq_seg2_idx,
 		    LE_READ_2(&vhtinfo->basic_mcs_set));
 	}
 }
 
 static void
 printvhtpwrenv(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	static const char *txpwrmap[] = {
 		"20",
 		"40",
 		"80",
 		"160",
 	};
 	if (verbose) {
 		const struct ieee80211_ie_vht_txpwrenv *vhtpwr =
 		    (const struct ieee80211_ie_vht_txpwrenv *) ie;
 		int i, n;
 		const char *sep = "";
 
 		/* Get count; trim at ielen */
 		n = (vhtpwr->tx_info &
 		    IEEE80211_VHT_TXPWRENV_INFO_COUNT_MASK) + 1;
 		/* Trim at ielen */
 		if (n > ielen - 3)
 			n = ielen - 3;
 		printf("<tx_info 0x%02x pwr:[", vhtpwr->tx_info);
 		for (i = 0; i < n; i++) {
 			printf("%s%s:%.2f", sep, txpwrmap[i],
 			    ((float) ((int8_t) ie[i+3])) / 2.0);
 			sep = " ";
 		}
 
 		printf("]>");
 	}
 }
 
 static void
 printhtcap(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose) {
 		const struct ieee80211_ie_htcap *htcap =
 		    (const struct ieee80211_ie_htcap *) ie;
 		const char *sep;
 		int i, j;
 
 		printf("<cap 0x%x param 0x%x",
 		    LE_READ_2(&htcap->hc_cap), htcap->hc_param);
 		printf(" mcsset[");
 		sep = "";
 		for (i = 0; i < IEEE80211_HTRATE_MAXSIZE; i++)
 			if (isset(htcap->hc_mcsset, i)) {
 				for (j = i+1; j < IEEE80211_HTRATE_MAXSIZE; j++)
 					if (isclr(htcap->hc_mcsset, j))
 						break;
 				j--;
 				if (i == j)
 					printf("%s%u", sep, i);
 				else
 					printf("%s%u-%u", sep, i, j);
 				i += j-i;
 				sep = ",";
 			}
 		printf("] extcap 0x%x txbf 0x%x antenna 0x%x>",
 		    LE_READ_2(&htcap->hc_extcap),
 		    LE_READ_4(&htcap->hc_txbf),
 		    htcap->hc_antenna);
 	}
 }
 
 static void
 printhtinfo(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose) {
 		const struct ieee80211_ie_htinfo *htinfo =
 		    (const struct ieee80211_ie_htinfo *) ie;
 		const char *sep;
 		int i, j;
 
 		printf("<ctl %u, %x,%x,%x,%x", htinfo->hi_ctrlchannel,
 		    htinfo->hi_byte1, htinfo->hi_byte2, htinfo->hi_byte3,
 		    LE_READ_2(&htinfo->hi_byte45));
 		printf(" basicmcs[");
 		sep = "";
 		for (i = 0; i < IEEE80211_HTRATE_MAXSIZE; i++)
 			if (isset(htinfo->hi_basicmcsset, i)) {
 				for (j = i+1; j < IEEE80211_HTRATE_MAXSIZE; j++)
 					if (isclr(htinfo->hi_basicmcsset, j))
 						break;
 				j--;
 				if (i == j)
 					printf("%s%u", sep, i);
 				else
 					printf("%s%u-%u", sep, i, j);
 				i += j-i;
 				sep = ",";
 			}
 		printf("]>");
 	}
 }
 
 static void
 printathie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 
 	printf("%s", tag);
 	if (verbose) {
 		const struct ieee80211_ath_ie *ath =
 			(const struct ieee80211_ath_ie *)ie;
 
 		printf("<");
 		if (ath->ath_capability & ATHEROS_CAP_TURBO_PRIME)
 			printf("DTURBO,");
 		if (ath->ath_capability & ATHEROS_CAP_COMPRESSION)
 			printf("COMP,");
 		if (ath->ath_capability & ATHEROS_CAP_FAST_FRAME)
 			printf("FF,");
 		if (ath->ath_capability & ATHEROS_CAP_XR)
 			printf("XR,");
 		if (ath->ath_capability & ATHEROS_CAP_AR)
 			printf("AR,");
 		if (ath->ath_capability & ATHEROS_CAP_BURST)
 			printf("BURST,");
 		if (ath->ath_capability & ATHEROS_CAP_WME)
 			printf("WME,");
 		if (ath->ath_capability & ATHEROS_CAP_BOOST)
 			printf("BOOST,");
 		printf("0x%x>", LE_READ_2(ath->ath_defkeyix));
 	}
 }
 
 
 static void
 printmeshconf(const char *tag, const uint8_t *ie, size_t ielen, int maxlen)
 {
 
 	printf("%s", tag);
 	if (verbose) {
 		const struct ieee80211_meshconf_ie *mconf =
 			(const struct ieee80211_meshconf_ie *)ie;
 		printf("<PATH:");
 		if (mconf->conf_pselid == IEEE80211_MESHCONF_PATH_HWMP)
 			printf("HWMP");
 		else
 			printf("UNKNOWN");
 		printf(" LINK:");
 		if (mconf->conf_pmetid == IEEE80211_MESHCONF_METRIC_AIRTIME)
 			printf("AIRTIME");
 		else
 			printf("UNKNOWN");
 		printf(" CONGESTION:");
 		if (mconf->conf_ccid == IEEE80211_MESHCONF_CC_DISABLED)
 			printf("DISABLED");
 		else
 			printf("UNKNOWN");
 		printf(" SYNC:");
 		if (mconf->conf_syncid == IEEE80211_MESHCONF_SYNC_NEIGHOFF)
 			printf("NEIGHOFF");
 		else
 			printf("UNKNOWN");
 		printf(" AUTH:");
 		if (mconf->conf_authid == IEEE80211_MESHCONF_AUTH_DISABLED)
 			printf("DISABLED");
 		else
 			printf("UNKNOWN");
 		printf(" FORM:0x%x CAPS:0x%x>", mconf->conf_form,
 		    mconf->conf_cap);
 	}
 }
 
 static void
 printbssload(const char *tag, const uint8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose) {
 		const struct ieee80211_bss_load_ie *bssload =
 		    (const struct ieee80211_bss_load_ie *) ie;
 		printf("<sta count %d, chan load %d, aac %d>",
 		    LE_READ_2(&bssload->sta_count),
 		    bssload->chan_load,
 		    bssload->aac);
 	}
 }
 
 static void
 printapchanrep(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose) {
 		const struct ieee80211_ap_chan_report_ie *ap =
 		    (const struct ieee80211_ap_chan_report_ie *) ie;
 		const char *sep = "";
 		int i;
 
 		printf("<class %u, chan:[", ap->i_class);
 
 		for (i = 3; i < ielen; i++) {
 			printf("%s%u", sep, ie[i]);
 			sep = ",";
 		}
 		printf("]>");
 	}
 }
 
 static const char *
 wpa_cipher(const u_int8_t *sel)
 {
 #define	WPA_SEL(x)	(((x)<<24)|WPA_OUI)
 	u_int32_t w = LE_READ_4(sel);
 
 	switch (w) {
 	case WPA_SEL(WPA_CSE_NULL):
 		return "NONE";
 	case WPA_SEL(WPA_CSE_WEP40):
 		return "WEP40";
 	case WPA_SEL(WPA_CSE_WEP104):
 		return "WEP104";
 	case WPA_SEL(WPA_CSE_TKIP):
 		return "TKIP";
 	case WPA_SEL(WPA_CSE_CCMP):
 		return "AES-CCMP";
 	}
 	return "?";		/* NB: so 1<< is discarded */
 #undef WPA_SEL
 }
 
 static const char *
 wpa_keymgmt(const u_int8_t *sel)
 {
 #define	WPA_SEL(x)	(((x)<<24)|WPA_OUI)
 	u_int32_t w = LE_READ_4(sel);
 
 	switch (w) {
 	case WPA_SEL(WPA_ASE_8021X_UNSPEC):
 		return "8021X-UNSPEC";
 	case WPA_SEL(WPA_ASE_8021X_PSK):
 		return "8021X-PSK";
 	case WPA_SEL(WPA_ASE_NONE):
 		return "NONE";
 	}
 	return "?";
 #undef WPA_SEL
 }
 
 static void
 printwpaie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	u_int8_t len = ie[1];
 
 	printf("%s", tag);
 	if (verbose) {
 		const char *sep;
 		int n;
 
 		ie += 6, len -= 4;		/* NB: len is payload only */
 
 		printf("<v%u", LE_READ_2(ie));
 		ie += 2, len -= 2;
 
 		printf(" mc:%s", wpa_cipher(ie));
 		ie += 4, len -= 4;
 
 		/* unicast ciphers */
 		n = LE_READ_2(ie);
 		ie += 2, len -= 2;
 		sep = " uc:";
 		for (; n > 0; n--) {
 			printf("%s%s", sep, wpa_cipher(ie));
 			ie += 4, len -= 4;
 			sep = "+";
 		}
 
 		/* key management algorithms */
 		n = LE_READ_2(ie);
 		ie += 2, len -= 2;
 		sep = " km:";
 		for (; n > 0; n--) {
 			printf("%s%s", sep, wpa_keymgmt(ie));
 			ie += 4, len -= 4;
 			sep = "+";
 		}
 
 		if (len > 2)		/* optional capabilities */
 			printf(", caps 0x%x", LE_READ_2(ie));
 		printf(">");
 	}
 }
 
 static const char *
 rsn_cipher(const u_int8_t *sel)
 {
 #define	RSN_SEL(x)	(((x)<<24)|RSN_OUI)
 	u_int32_t w = LE_READ_4(sel);
 
 	switch (w) {
 	case RSN_SEL(RSN_CSE_NULL):
 		return "NONE";
 	case RSN_SEL(RSN_CSE_WEP40):
 		return "WEP40";
 	case RSN_SEL(RSN_CSE_WEP104):
 		return "WEP104";
 	case RSN_SEL(RSN_CSE_TKIP):
 		return "TKIP";
 	case RSN_SEL(RSN_CSE_CCMP):
 		return "AES-CCMP";
 	case RSN_SEL(RSN_CSE_WRAP):
 		return "AES-OCB";
 	}
 	return "?";
 #undef WPA_SEL
 }
 
 static const char *
 rsn_keymgmt(const u_int8_t *sel)
 {
 #define	RSN_SEL(x)	(((x)<<24)|RSN_OUI)
 	u_int32_t w = LE_READ_4(sel);
 
 	switch (w) {
 	case RSN_SEL(RSN_ASE_8021X_UNSPEC):
 		return "8021X-UNSPEC";
 	case RSN_SEL(RSN_ASE_8021X_PSK):
 		return "8021X-PSK";
 	case RSN_SEL(RSN_ASE_NONE):
 		return "NONE";
 	}
 	return "?";
 #undef RSN_SEL
 }
 
 static void
 printrsnie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose) {
 		const char *sep;
 		int n;
 
 		ie += 2, ielen -= 2;
 
 		printf("<v%u", LE_READ_2(ie));
 		ie += 2, ielen -= 2;
 
 		printf(" mc:%s", rsn_cipher(ie));
 		ie += 4, ielen -= 4;
 
 		/* unicast ciphers */
 		n = LE_READ_2(ie);
 		ie += 2, ielen -= 2;
 		sep = " uc:";
 		for (; n > 0; n--) {
 			printf("%s%s", sep, rsn_cipher(ie));
 			ie += 4, ielen -= 4;
 			sep = "+";
 		}
 
 		/* key management algorithms */
 		n = LE_READ_2(ie);
 		ie += 2, ielen -= 2;
 		sep = " km:";
 		for (; n > 0; n--) {
 			printf("%s%s", sep, rsn_keymgmt(ie));
 			ie += 4, ielen -= 4;
 			sep = "+";
 		}
 
 		if (ielen > 2)		/* optional capabilities */
 			printf(", caps 0x%x", LE_READ_2(ie));
 		/* XXXPMKID */
 		printf(">");
 	}
 }
 
 /* XXX move to a public include file */
 #define IEEE80211_WPS_DEV_PASS_ID	0x1012
 #define IEEE80211_WPS_SELECTED_REG	0x1041
 #define IEEE80211_WPS_SETUP_STATE	0x1044
 #define IEEE80211_WPS_UUID_E		0x1047
 #define IEEE80211_WPS_VERSION		0x104a
 
 #define BE_READ_2(p)					\
 	((u_int16_t)					\
 	 ((((const u_int8_t *)(p))[1]      ) |		\
 	  (((const u_int8_t *)(p))[0] <<  8)))
 
 static void
 printwpsie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	u_int8_t len = ie[1];
 
 	printf("%s", tag);
 	if (verbose) {
 		static const char *dev_pass_id[] = {
 			"D",	/* Default (PIN) */
 			"U",	/* User-specified */
 			"M",	/* Machine-specified */
 			"K",	/* Rekey */
 			"P",	/* PushButton */
 			"R"	/* Registrar-specified */
 		};
 		int n;
 
 		ie +=6, len -= 4;		/* NB: len is payload only */
 
 		/* WPS IE in Beacon and Probe Resp frames have different fields */
 		printf("<");
 		while (len) {
 			uint16_t tlv_type = BE_READ_2(ie);
 			uint16_t tlv_len  = BE_READ_2(ie + 2);
 
 			ie += 4, len -= 4;
 
 			switch (tlv_type) {
 			case IEEE80211_WPS_VERSION:
 				printf("v:%d.%d", *ie >> 4, *ie & 0xf);
 				break;
 			case IEEE80211_WPS_SETUP_STATE:
 				/* Only 1 and 2 are valid */
 				if (*ie == 0 || *ie >= 3)
 					printf(" state:B");
 				else
 					printf(" st:%s", *ie == 1 ? "N" : "C");
 				break;
 			case IEEE80211_WPS_SELECTED_REG:
 				printf(" sel:%s", *ie ? "T" : "F");
 				break;
 			case IEEE80211_WPS_DEV_PASS_ID:
 				n = LE_READ_2(ie);
 				if (n < nitems(dev_pass_id))
 					printf(" dpi:%s", dev_pass_id[n]);
 				break;
 			case IEEE80211_WPS_UUID_E:
 				printf(" uuid-e:");
 				for (n = 0; n < (tlv_len - 1); n++)
 					printf("%02x-", ie[n]);
 				printf("%02x", ie[n]);
 				break;
 			}
 			ie += tlv_len, len -= tlv_len;
 		}
 		printf(">");
 	}
 }
 
 static void
 printtdmaie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	printf("%s", tag);
 	if (verbose && ielen >= sizeof(struct ieee80211_tdma_param)) {
 		const struct ieee80211_tdma_param *tdma =
 		   (const struct ieee80211_tdma_param *) ie;
 
 		/* XXX tstamp */
 		printf("<v%u slot:%u slotcnt:%u slotlen:%u bintval:%u inuse:0x%x>",
 		    tdma->tdma_version, tdma->tdma_slot, tdma->tdma_slotcnt,
 		    LE_READ_2(&tdma->tdma_slotlen), tdma->tdma_bintval,
 		    tdma->tdma_inuse[0]);
 	}
 }
 
 /*
  * Copy the ssid string contents into buf, truncating to fit.  If the
  * ssid is entirely printable then just copy intact.  Otherwise convert
  * to hexadecimal.  If the result is truncated then replace the last
  * three characters with "...".
  */
 static int
 copy_essid(char buf[], size_t bufsize, const u_int8_t *essid, size_t essid_len)
 {
 	const u_int8_t *p; 
 	size_t maxlen;
 	u_int i;
 
 	if (essid_len > bufsize)
 		maxlen = bufsize;
 	else
 		maxlen = essid_len;
 	/* determine printable or not */
 	for (i = 0, p = essid; i < maxlen; i++, p++) {
 		if (*p < ' ' || *p > 0x7e)
 			break;
 	}
 	if (i != maxlen) {		/* not printable, print as hex */
 		if (bufsize < 3)
 			return 0;
 		strlcpy(buf, "0x", bufsize);
 		bufsize -= 2;
 		p = essid;
 		for (i = 0; i < maxlen && bufsize >= 2; i++) {
 			sprintf(&buf[2+2*i], "%02x", p[i]);
 			bufsize -= 2;
 		}
 		if (i != essid_len)
 			memcpy(&buf[2+2*i-3], "...", 3);
 	} else {			/* printable, truncate as needed */
 		memcpy(buf, essid, maxlen);
 		if (maxlen != essid_len)
 			memcpy(&buf[maxlen-3], "...", 3);
 	}
 	return maxlen;
 }
 
 static void
 printssid(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	char ssid[2*IEEE80211_NWID_LEN+1];
 
 	printf("%s<%.*s>", tag, copy_essid(ssid, maxlen, ie+2, ie[1]), ssid);
 }
 
 static void
 printrates(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	const char *sep;
 	int i;
 
 	printf("%s", tag);
 	sep = "<";
 	for (i = 2; i < ielen; i++) {
 		printf("%s%s%d", sep,
 		    ie[i] & IEEE80211_RATE_BASIC ? "B" : "",
 		    ie[i] & IEEE80211_RATE_VAL);
 		sep = ",";
 	}
 	printf(">");
 }
 
 static void
 printcountry(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
 {
 	const struct ieee80211_country_ie *cie =
 	   (const struct ieee80211_country_ie *) ie;
 	int i, nbands, schan, nchan;
 
 	printf("%s<%c%c%c", tag, cie->cc[0], cie->cc[1], cie->cc[2]);
 	nbands = (cie->len - 3) / sizeof(cie->band[0]);
 	for (i = 0; i < nbands; i++) {
 		schan = cie->band[i].schan;
 		nchan = cie->band[i].nchan;
 		if (nchan != 1)
 			printf(" %u-%u,%u", schan, schan + nchan-1,
 			    cie->band[i].maxtxpwr);
 		else
 			printf(" %u,%u", schan, cie->band[i].maxtxpwr);
 	}
 	printf(">");
 }
 
 static __inline int
 iswpaoui(const u_int8_t *frm)
 {
 	return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI);
 }
 
 static __inline int
 iswmeinfo(const u_int8_t *frm)
 {
 	return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) &&
 		frm[6] == WME_INFO_OUI_SUBTYPE;
 }
 
 static __inline int
 iswmeparam(const u_int8_t *frm)
 {
 	return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) &&
 		frm[6] == WME_PARAM_OUI_SUBTYPE;
 }
 
 static __inline int
 isatherosoui(const u_int8_t *frm)
 {
 	return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI);
 }
 
 static __inline int
 istdmaoui(const uint8_t *frm)
 {
 	return frm[1] > 3 && LE_READ_4(frm+2) == ((TDMA_OUI_TYPE<<24)|TDMA_OUI);
 }
 
 static __inline int
 iswpsoui(const uint8_t *frm)
 {
 	return frm[1] > 3 && LE_READ_4(frm+2) == ((WPS_OUI_TYPE<<24)|WPA_OUI);
 }
 
 static const char *
 iename(int elemid)
 {
 	switch (elemid) {
 	case IEEE80211_ELEMID_FHPARMS:	return " FHPARMS";
 	case IEEE80211_ELEMID_CFPARMS:	return " CFPARMS";
 	case IEEE80211_ELEMID_TIM:	return " TIM";
 	case IEEE80211_ELEMID_IBSSPARMS:return " IBSSPARMS";
 	case IEEE80211_ELEMID_BSSLOAD:	return " BSSLOAD";
 	case IEEE80211_ELEMID_CHALLENGE:return " CHALLENGE";
 	case IEEE80211_ELEMID_PWRCNSTR:	return " PWRCNSTR";
 	case IEEE80211_ELEMID_PWRCAP:	return " PWRCAP";
 	case IEEE80211_ELEMID_TPCREQ:	return " TPCREQ";
 	case IEEE80211_ELEMID_TPCREP:	return " TPCREP";
 	case IEEE80211_ELEMID_SUPPCHAN:	return " SUPPCHAN";
 	case IEEE80211_ELEMID_CSA:	return " CSA";
 	case IEEE80211_ELEMID_MEASREQ:	return " MEASREQ";
 	case IEEE80211_ELEMID_MEASREP:	return " MEASREP";
 	case IEEE80211_ELEMID_QUIET:	return " QUIET";
 	case IEEE80211_ELEMID_IBSSDFS:	return " IBSSDFS";
 	case IEEE80211_ELEMID_TPC:	return " TPC";
 	case IEEE80211_ELEMID_CCKM:	return " CCKM";
 	}
 	return " ???";
 }
 
 static void
 printies(const u_int8_t *vp, int ielen, int maxcols)
 {
 	while (ielen > 0) {
 		switch (vp[0]) {
 		case IEEE80211_ELEMID_SSID:
 			if (verbose)
 				printssid(" SSID", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_RATES:
 		case IEEE80211_ELEMID_XRATES:
 			if (verbose)
 				printrates(vp[0] == IEEE80211_ELEMID_RATES ?
 				    " RATES" : " XRATES", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_DSPARMS:
 			if (verbose)
 				printf(" DSPARMS<%u>", vp[2]);
 			break;
 		case IEEE80211_ELEMID_COUNTRY:
 			if (verbose)
 				printcountry(" COUNTRY", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_ERP:
 			if (verbose)
 				printf(" ERP<0x%x>", vp[2]);
 			break;
 		case IEEE80211_ELEMID_VENDOR:
 			if (iswpaoui(vp))
 				printwpaie(" WPA", vp, 2+vp[1], maxcols);
 			else if (iswmeinfo(vp))
 				printwmeinfo(" WME", vp, 2+vp[1], maxcols);
 			else if (iswmeparam(vp))
 				printwmeparam(" WME", vp, 2+vp[1], maxcols);
 			else if (isatherosoui(vp))
 				printathie(" ATH", vp, 2+vp[1], maxcols);
 			else if (iswpsoui(vp))
 				printwpsie(" WPS", vp, 2+vp[1], maxcols);
 			else if (istdmaoui(vp))
 				printtdmaie(" TDMA", vp, 2+vp[1], maxcols);
 			else if (verbose)
 				printie(" VEN", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_RSN:
 			printrsnie(" RSN", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_HTCAP:
 			printhtcap(" HTCAP", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_HTINFO:
 			if (verbose)
 				printhtinfo(" HTINFO", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_MESHID:
 			if (verbose)
 				printssid(" MESHID", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_MESHCONF:
 			printmeshconf(" MESHCONF", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_VHT_CAP:
 			printvhtcap(" VHTCAP", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_VHT_OPMODE:
 			printvhtinfo(" VHTOPMODE", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_VHT_PWR_ENV:
 			printvhtpwrenv(" VHTPWRENV", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_BSSLOAD:
 			printbssload(" BSSLOAD", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_APCHANREP:
 			printapchanrep(" APCHANREP", vp, 2+vp[1], maxcols);
 			break;
 		default:
 			if (verbose)
 				printie(iename(vp[0]), vp, 2+vp[1], maxcols);
 			break;
 		}
 		ielen -= 2+vp[1];
 		vp += 2+vp[1];
 	}
 }
 
 static void
 printmimo(const struct ieee80211_mimo_info *mi)
 {
 	/* NB: don't muddy display unless there's something to show */
 	if (mi->rssi[0] != 0 || mi->rssi[1] != 0 || mi->rssi[2] != 0) {
 		/* XXX ignore EVM for now */
 		printf(" (rssi %.1f:%.1f:%.1f nf %d:%d:%d)",
 		    mi->rssi[0] / 2.0, mi->rssi[1] / 2.0, mi->rssi[2] / 2.0,
 		    mi->noise[0], mi->noise[1], mi->noise[2]);
 	}
 }
 
 static void
 list_scan(int s)
 {
 	uint8_t buf[24*1024];
 	char ssid[IEEE80211_NWID_LEN+1];
 	const uint8_t *cp;
 	int len, ssidmax, idlen;
 
 	if (get80211len(s, IEEE80211_IOC_SCAN_RESULTS, buf, sizeof(buf), &len) < 0)
 		errx(1, "unable to get scan results");
 	if (len < sizeof(struct ieee80211req_scan_result))
 		return;
 
 	getchaninfo(s);
 
 	ssidmax = verbose ? IEEE80211_NWID_LEN : 14;
 	printf("%-*.*s  %-17.17s  %4s %4s   %-7s  %3s %4s\n"
 		, ssidmax, ssidmax, "SSID/MESH ID"
 		, "BSSID"
 		, "CHAN"
 		, "RATE"
 		, " S:N"
 		, "INT"
 		, "CAPS"
 	);
 	cp = buf;
 	do {
 		const struct ieee80211req_scan_result *sr;
 		const uint8_t *vp, *idp;
 
 		sr = (const struct ieee80211req_scan_result *) cp;
 		vp = cp + sr->isr_ie_off;
 		if (sr->isr_meshid_len) {
 			idp = vp + sr->isr_ssid_len;
 			idlen = sr->isr_meshid_len;
 		} else {
 			idp = vp;
 			idlen = sr->isr_ssid_len;
 		}
 		printf("%-*.*s  %s  %3d  %3dM %4d:%-4d %4d %-4.4s"
 			, ssidmax
 			  , copy_essid(ssid, ssidmax, idp, idlen)
 			  , ssid
 			, ether_ntoa((const struct ether_addr *) sr->isr_bssid)
 			, ieee80211_mhz2ieee(sr->isr_freq, sr->isr_flags)
 			, getmaxrate(sr->isr_rates, sr->isr_nrates)
 			, (sr->isr_rssi/2)+sr->isr_noise, sr->isr_noise
 			, sr->isr_intval
 			, getcaps(sr->isr_capinfo)
 		);
 		printies(vp + sr->isr_ssid_len + sr->isr_meshid_len,
 		    sr->isr_ie_len, 24);
 		printf("\n");
 		cp += sr->isr_len, len -= sr->isr_len;
 	} while (len >= sizeof(struct ieee80211req_scan_result));
 }
 
 static void
 scan_and_wait(int s)
 {
 	struct ieee80211_scan_req sr;
 	struct ieee80211req ireq;
 	int sroute;
 
 	sroute = socket(PF_ROUTE, SOCK_RAW, 0);
 	if (sroute < 0) {
 		perror("socket(PF_ROUTE,SOCK_RAW)");
 		return;
 	}
 	(void) memset(&ireq, 0, sizeof(ireq));
 	(void) strlcpy(ireq.i_name, name, sizeof(ireq.i_name));
 	ireq.i_type = IEEE80211_IOC_SCAN_REQ;
 
 	memset(&sr, 0, sizeof(sr));
 	sr.sr_flags = IEEE80211_IOC_SCAN_ACTIVE
 		    | IEEE80211_IOC_SCAN_BGSCAN
 		    | IEEE80211_IOC_SCAN_NOPICK
 		    | IEEE80211_IOC_SCAN_ONCE;
 	sr.sr_duration = IEEE80211_IOC_SCAN_FOREVER;
 	sr.sr_nssid = 0;
 
 	ireq.i_data = &sr;
 	ireq.i_len = sizeof(sr);
 	/*
 	 * NB: only root can trigger a scan so ignore errors. Also ignore
 	 * possible errors from net80211, even if no new scan could be
 	 * started there might still be a valid scan cache.
 	 */
 	if (ioctl(s, SIOCS80211, &ireq) == 0) {
 		char buf[2048];
 		struct if_announcemsghdr *ifan;
 		struct rt_msghdr *rtm;
 
 		do {
 			if (read(sroute, buf, sizeof(buf)) < 0) {
 				perror("read(PF_ROUTE)");
 				break;
 			}
 			rtm = (struct rt_msghdr *) buf;
 			if (rtm->rtm_version != RTM_VERSION)
 				break;
 			ifan = (struct if_announcemsghdr *) rtm;
 		} while (rtm->rtm_type != RTM_IEEE80211 ||
 		    ifan->ifan_what != RTM_IEEE80211_SCAN);
 	}
 	close(sroute);
 }
 
 static
 DECL_CMD_FUNC(set80211scan, val, d)
 {
 	scan_and_wait(s);
 	list_scan(s);
 }
 
 static enum ieee80211_opmode get80211opmode(int s);
 
 static int
 gettxseq(const struct ieee80211req_sta_info *si)
 {
 	int i, txseq;
 
 	if ((si->isi_state & IEEE80211_NODE_QOS) == 0)
 		return si->isi_txseqs[0];
 	/* XXX not right but usually what folks want */
 	txseq = 0;
 	for (i = 0; i < IEEE80211_TID_SIZE; i++)
 		if (si->isi_txseqs[i] > txseq)
 			txseq = si->isi_txseqs[i];
 	return txseq;
 }
 
 static int
 getrxseq(const struct ieee80211req_sta_info *si)
 {
 	int i, rxseq;
 
 	if ((si->isi_state & IEEE80211_NODE_QOS) == 0)
 		return si->isi_rxseqs[0];
 	/* XXX not right but usually what folks want */
 	rxseq = 0;
 	for (i = 0; i < IEEE80211_TID_SIZE; i++)
 		if (si->isi_rxseqs[i] > rxseq)
 			rxseq = si->isi_rxseqs[i];
 	return rxseq;
 }
 
 static void
 list_stations(int s)
 {
 	union {
 		struct ieee80211req_sta_req req;
 		uint8_t buf[24*1024];
 	} u;
 	enum ieee80211_opmode opmode = get80211opmode(s);
 	const uint8_t *cp;
 	int len;
 
 	/* broadcast address =>'s get all stations */
 	(void) memset(u.req.is_u.macaddr, 0xff, IEEE80211_ADDR_LEN);
 	if (opmode == IEEE80211_M_STA) {
 		/*
 		 * Get information about the associated AP.
 		 */
 		(void) get80211(s, IEEE80211_IOC_BSSID,
 		    u.req.is_u.macaddr, IEEE80211_ADDR_LEN);
 	}
 	if (get80211len(s, IEEE80211_IOC_STA_INFO, &u, sizeof(u), &len) < 0)
 		errx(1, "unable to get station information");
 	if (len < sizeof(struct ieee80211req_sta_info))
 		return;
 
 	getchaninfo(s);
 
 	if (opmode == IEEE80211_M_MBSS)
 		printf("%-17.17s %4s %5s %5s %7s %4s %4s %4s %6s %6s\n"
 			, "ADDR"
 			, "CHAN"
 			, "LOCAL"
 			, "PEER"
 			, "STATE"
 			, "RATE"
 			, "RSSI"
 			, "IDLE"
 			, "TXSEQ"
 			, "RXSEQ"
 		);
 	else 
 		printf("%-17.17s %4s %4s %4s %4s %4s %6s %6s %4s %-7s\n"
 			, "ADDR"
 			, "AID"
 			, "CHAN"
 			, "RATE"
 			, "RSSI"
 			, "IDLE"
 			, "TXSEQ"
 			, "RXSEQ"
 			, "CAPS"
 			, "FLAG"
 		);
 	cp = (const uint8_t *) u.req.info;
 	do {
 		const struct ieee80211req_sta_info *si;
 
 		si = (const struct ieee80211req_sta_info *) cp;
 		if (si->isi_len < sizeof(*si))
 			break;
 		if (opmode == IEEE80211_M_MBSS)
 			printf("%s %4d %5x %5x %7.7s %3dM %4.1f %4d %6d %6d"
 				, ether_ntoa((const struct ether_addr*)
 				    si->isi_macaddr)
 				, ieee80211_mhz2ieee(si->isi_freq,
 				    si->isi_flags)
 				, si->isi_localid
 				, si->isi_peerid
 				, mesh_linkstate_string(si->isi_peerstate)
 				, si->isi_txmbps/2
 				, si->isi_rssi/2.
 				, si->isi_inact
 				, gettxseq(si)
 				, getrxseq(si)
 			);
 		else 
 			printf("%s %4u %4d %3dM %4.1f %4d %6d %6d %-4.4s %-7.7s"
 				, ether_ntoa((const struct ether_addr*)
 				    si->isi_macaddr)
 				, IEEE80211_AID(si->isi_associd)
 				, ieee80211_mhz2ieee(si->isi_freq,
 				    si->isi_flags)
 				, si->isi_txmbps/2
 				, si->isi_rssi/2.
 				, si->isi_inact
 				, gettxseq(si)
 				, getrxseq(si)
 				, getcaps(si->isi_capinfo)
 				, getflags(si->isi_state)
 			);
 		printies(cp + si->isi_ie_off, si->isi_ie_len, 24);
 		printmimo(&si->isi_mimo);
 		printf("\n");
 		cp += si->isi_len, len -= si->isi_len;
 	} while (len >= sizeof(struct ieee80211req_sta_info));
 }
 
 static const char *
 mesh_linkstate_string(uint8_t state)
 {
 	static const char *state_names[] = {
 	    [0] = "IDLE",
 	    [1] = "OPEN-TX",
 	    [2] = "OPEN-RX",
 	    [3] = "CONF-RX",
 	    [4] = "ESTAB",
 	    [5] = "HOLDING",
 	};
 
 	if (state >= nitems(state_names)) {
 		static char buf[10];
 		snprintf(buf, sizeof(buf), "#%u", state);
 		return buf;
 	} else
 		return state_names[state];
 }
 
 static const char *
 get_chaninfo(const struct ieee80211_channel *c, int precise,
 	char buf[], size_t bsize)
 {
 	buf[0] = '\0';
 	if (IEEE80211_IS_CHAN_FHSS(c))
 		strlcat(buf, " FHSS", bsize);
 	if (IEEE80211_IS_CHAN_A(c))
 		strlcat(buf, " 11a", bsize);
 	else if (IEEE80211_IS_CHAN_ANYG(c))
 		strlcat(buf, " 11g", bsize);
 	else if (IEEE80211_IS_CHAN_B(c))
 		strlcat(buf, " 11b", bsize);
 	if (IEEE80211_IS_CHAN_HALF(c))
 		strlcat(buf, "/10MHz", bsize);
 	if (IEEE80211_IS_CHAN_QUARTER(c))
 		strlcat(buf, "/5MHz", bsize);
 	if (IEEE80211_IS_CHAN_TURBO(c))
 		strlcat(buf, " Turbo", bsize);
 	if (precise) {
-		if (IEEE80211_IS_CHAN_HT20(c))
+		/* XXX should make VHT80U, VHT80D */
+		if (IEEE80211_IS_CHAN_VHT80(c) &&
+		    IEEE80211_IS_CHAN_HT40D(c))
+			strlcat(buf, " vht/80-", bsize);
+		else if (IEEE80211_IS_CHAN_VHT80(c) &&
+		    IEEE80211_IS_CHAN_HT40U(c))
+			strlcat(buf, " vht/80+", bsize);
+		else if (IEEE80211_IS_CHAN_VHT80(c))
+			strlcat(buf, " vht/80", bsize);
+		else if (IEEE80211_IS_CHAN_VHT40D(c))
+			strlcat(buf, " vht/40-", bsize);
+		else if (IEEE80211_IS_CHAN_VHT40U(c))
+			strlcat(buf, " vht/40+", bsize);
+		else if (IEEE80211_IS_CHAN_VHT20(c))
+			strlcat(buf, " vht/20", bsize);
+		else if (IEEE80211_IS_CHAN_HT20(c))
 			strlcat(buf, " ht/20", bsize);
 		else if (IEEE80211_IS_CHAN_HT40D(c))
 			strlcat(buf, " ht/40-", bsize);
 		else if (IEEE80211_IS_CHAN_HT40U(c))
 			strlcat(buf, " ht/40+", bsize);
 	} else {
-		if (IEEE80211_IS_CHAN_HT(c))
+		if (IEEE80211_IS_CHAN_VHT(c))
+			strlcat(buf, " vht", bsize);
+		else if (IEEE80211_IS_CHAN_HT(c))
 			strlcat(buf, " ht", bsize);
 	}
 	return buf;
 }
 
 static void
 print_chaninfo(const struct ieee80211_channel *c, int verb)
 {
 	char buf[14];
 
 	if (verb)
 		printf("Channel %3u : %u%c%c%c%c%c MHz%-14.14s",
 		    ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq,
 		    IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
 		    IEEE80211_IS_CHAN_DFS(c) ? 'D' : ' ',
 		    IEEE80211_IS_CHAN_RADAR(c) ? 'R' : ' ',
 		    IEEE80211_IS_CHAN_CWINT(c) ? 'I' : ' ',
 		    IEEE80211_IS_CHAN_CACDONE(c) ? 'C' : ' ',
 		    get_chaninfo(c, verb, buf, sizeof(buf)));
 	else
 	printf("Channel %3u : %u%c MHz%-14.14s",
 	    ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq,
 	    IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
 	    get_chaninfo(c, verb, buf, sizeof(buf)));
 
 }
 
 static int
 chanpref(const struct ieee80211_channel *c)
 {
+	if (IEEE80211_IS_CHAN_VHT160(c))
+		return 80;
+	if (IEEE80211_IS_CHAN_VHT80_80(c))
+		return 75;
+	if (IEEE80211_IS_CHAN_VHT80(c))
+		return 70;
+	if (IEEE80211_IS_CHAN_VHT40(c))
+		return 60;
+	if (IEEE80211_IS_CHAN_VHT20(c))
+		return 50;
 	if (IEEE80211_IS_CHAN_HT40(c))
 		return 40;
 	if (IEEE80211_IS_CHAN_HT20(c))
 		return 30;
 	if (IEEE80211_IS_CHAN_HALF(c))
 		return 10;
 	if (IEEE80211_IS_CHAN_QUARTER(c))
 		return 5;
 	if (IEEE80211_IS_CHAN_TURBO(c))
 		return 25;
 	if (IEEE80211_IS_CHAN_A(c))
 		return 20;
 	if (IEEE80211_IS_CHAN_G(c))
 		return 20;
 	if (IEEE80211_IS_CHAN_B(c))
 		return 15;
 	if (IEEE80211_IS_CHAN_PUREG(c))
 		return 15;
 	return 0;
 }
 
 static void
 print_channels(int s, const struct ieee80211req_chaninfo *chans,
 	int allchans, int verb)
 {
 	struct ieee80211req_chaninfo *achans;
 	uint8_t reported[IEEE80211_CHAN_BYTES];
 	const struct ieee80211_channel *c;
 	int i, half;
 
 	achans = malloc(IEEE80211_CHANINFO_SPACE(chans));
 	if (achans == NULL)
 		errx(1, "no space for active channel list");
 	achans->ic_nchans = 0;
 	memset(reported, 0, sizeof(reported));
 	if (!allchans) {
 		struct ieee80211req_chanlist active;
 
 		if (get80211(s, IEEE80211_IOC_CHANLIST, &active, sizeof(active)) < 0)
 			errx(1, "unable to get active channel list");
 		for (i = 0; i < chans->ic_nchans; i++) {
 			c = &chans->ic_chans[i];
 			if (!isset(active.ic_channels, c->ic_ieee))
 				continue;
 			/*
 			 * Suppress compatible duplicates unless
 			 * verbose.  The kernel gives us it's
 			 * complete channel list which has separate
 			 * entries for 11g/11b and 11a/turbo.
 			 */
 			if (isset(reported, c->ic_ieee) && !verb) {
 				/* XXX we assume duplicates are adjacent */
 				achans->ic_chans[achans->ic_nchans-1] = *c;
 			} else {
 				achans->ic_chans[achans->ic_nchans++] = *c;
 				setbit(reported, c->ic_ieee);
 			}
 		}
 	} else {
 		for (i = 0; i < chans->ic_nchans; i++) {
 			c = &chans->ic_chans[i];
 			/* suppress duplicates as above */
 			if (isset(reported, c->ic_ieee) && !verb) {
 				/* XXX we assume duplicates are adjacent */
 				struct ieee80211_channel *a =
 				    &achans->ic_chans[achans->ic_nchans-1];
 				if (chanpref(c) > chanpref(a))
 					*a = *c;
 			} else {
 				achans->ic_chans[achans->ic_nchans++] = *c;
 				setbit(reported, c->ic_ieee);
 			}
 		}
 	}
 	half = achans->ic_nchans / 2;
 	if (achans->ic_nchans % 2)
 		half++;
 
 	for (i = 0; i < achans->ic_nchans / 2; i++) {
 		print_chaninfo(&achans->ic_chans[i], verb);
 		print_chaninfo(&achans->ic_chans[half+i], verb);
 		printf("\n");
 	}
 	if (achans->ic_nchans % 2) {
 		print_chaninfo(&achans->ic_chans[i], verb);
 		printf("\n");
 	}
 	free(achans);
 }
 
 static void
 list_channels(int s, int allchans)
 {
 	getchaninfo(s);
 	print_channels(s, chaninfo, allchans, verbose);
 }
 
 static void
 print_txpow(const struct ieee80211_channel *c)
 {
 	printf("Channel %3u : %u MHz %3.1f reg %2d  ",
 	    c->ic_ieee, c->ic_freq,
 	    c->ic_maxpower/2., c->ic_maxregpower);
 }
 
 static void
 print_txpow_verbose(const struct ieee80211_channel *c)
 {
 	print_chaninfo(c, 1);
 	printf("min %4.1f dBm  max %3.1f dBm  reg %2d dBm",
 	    c->ic_minpower/2., c->ic_maxpower/2., c->ic_maxregpower);
 	/* indicate where regulatory cap limits power use */
 	if (c->ic_maxpower > 2*c->ic_maxregpower)
 		printf(" <");
 }
 
 static void
 list_txpow(int s)
 {
 	struct ieee80211req_chaninfo *achans;
 	uint8_t reported[IEEE80211_CHAN_BYTES];
 	struct ieee80211_channel *c, *prev;
 	int i, half;
 
 	getchaninfo(s);
 	achans = malloc(IEEE80211_CHANINFO_SPACE(chaninfo));
 	if (achans == NULL)
 		errx(1, "no space for active channel list");
 	achans->ic_nchans = 0;
 	memset(reported, 0, sizeof(reported));
 	for (i = 0; i < chaninfo->ic_nchans; i++) {
 		c = &chaninfo->ic_chans[i];
 		/* suppress duplicates as above */
 		if (isset(reported, c->ic_ieee) && !verbose) {
 			/* XXX we assume duplicates are adjacent */
 			assert(achans->ic_nchans > 0);
 			prev = &achans->ic_chans[achans->ic_nchans-1];
 			/* display highest power on channel */
 			if (c->ic_maxpower > prev->ic_maxpower)
 				*prev = *c;
 		} else {
 			achans->ic_chans[achans->ic_nchans++] = *c;
 			setbit(reported, c->ic_ieee);
 		}
 	}
 	if (!verbose) {
 		half = achans->ic_nchans / 2;
 		if (achans->ic_nchans % 2)
 			half++;
 
 		for (i = 0; i < achans->ic_nchans / 2; i++) {
 			print_txpow(&achans->ic_chans[i]);
 			print_txpow(&achans->ic_chans[half+i]);
 			printf("\n");
 		}
 		if (achans->ic_nchans % 2) {
 			print_txpow(&achans->ic_chans[i]);
 			printf("\n");
 		}
 	} else {
 		for (i = 0; i < achans->ic_nchans; i++) {
 			print_txpow_verbose(&achans->ic_chans[i]);
 			printf("\n");
 		}
 	}
 	free(achans);
 }
 
 static void
 list_keys(int s)
 {
 }
 
 static void
 list_capabilities(int s)
 {
 	struct ieee80211_devcaps_req *dc;
 
 	if (verbose)
 		dc = malloc(IEEE80211_DEVCAPS_SIZE(MAXCHAN));
 	else
 		dc = malloc(IEEE80211_DEVCAPS_SIZE(1));
 	if (dc == NULL)
 		errx(1, "no space for device capabilities");
 	dc->dc_chaninfo.ic_nchans = verbose ? MAXCHAN : 1;
 	getdevcaps(s, dc);
 	printb("drivercaps", dc->dc_drivercaps, IEEE80211_C_BITS);
 	if (dc->dc_cryptocaps != 0 || verbose) {
 		putchar('\n');
 		printb("cryptocaps", dc->dc_cryptocaps, IEEE80211_CRYPTO_BITS);
 	}
 	if (dc->dc_htcaps != 0 || verbose) {
 		putchar('\n');
 		printb("htcaps", dc->dc_htcaps, IEEE80211_HTCAP_BITS);
 	}
+	if (dc->dc_vhtcaps != 0 || verbose) {
+		putchar('\n');
+		printb("vhtcaps", dc->dc_vhtcaps, IEEE80211_VHTCAP_BITS);
+	}
+
 	putchar('\n');
 	if (verbose) {
 		chaninfo = &dc->dc_chaninfo;	/* XXX */
 		print_channels(s, &dc->dc_chaninfo, 1/*allchans*/, verbose);
 	}
 	free(dc);
 }
 
 static int
 get80211wme(int s, int param, int ac, int *val)
 {
 	struct ieee80211req ireq;
 
 	(void) memset(&ireq, 0, sizeof(ireq));
 	(void) strlcpy(ireq.i_name, name, sizeof(ireq.i_name));
 	ireq.i_type = param;
 	ireq.i_len = ac;
 	if (ioctl(s, SIOCG80211, &ireq) < 0) {
 		warn("cannot get WME parameter %d, ac %d%s",
 		    param, ac & IEEE80211_WMEPARAM_VAL,
 		    ac & IEEE80211_WMEPARAM_BSS ? " (BSS)" : "");
 		return -1;
 	}
 	*val = ireq.i_val;
 	return 0;
 }
 
 static void
 list_wme_aci(int s, const char *tag, int ac)
 {
 	int val;
 
 	printf("\t%s", tag);
 
 	/* show WME BSS parameters */
 	if (get80211wme(s, IEEE80211_IOC_WME_CWMIN, ac, &val) != -1)
 		printf(" cwmin %2u", val);
 	if (get80211wme(s, IEEE80211_IOC_WME_CWMAX, ac, &val) != -1)
 		printf(" cwmax %2u", val);
 	if (get80211wme(s, IEEE80211_IOC_WME_AIFS, ac, &val) != -1)
 		printf(" aifs %2u", val);
 	if (get80211wme(s, IEEE80211_IOC_WME_TXOPLIMIT, ac, &val) != -1)
 		printf(" txopLimit %3u", val);
 	if (get80211wme(s, IEEE80211_IOC_WME_ACM, ac, &val) != -1) {
 		if (val)
 			printf(" acm");
 		else if (verbose)
 			printf(" -acm");
 	}
 	/* !BSS only */
 	if ((ac & IEEE80211_WMEPARAM_BSS) == 0) {
 		if (get80211wme(s, IEEE80211_IOC_WME_ACKPOLICY, ac, &val) != -1) {
 			if (!val)
 				printf(" -ack");
 			else if (verbose)
 				printf(" ack");
 		}
 	}
 	printf("\n");
 }
 
 static void
 list_wme(int s)
 {
 	static const char *acnames[] = { "AC_BE", "AC_BK", "AC_VI", "AC_VO" };
 	int ac;
 
 	if (verbose) {
 		/* display both BSS and local settings */
 		for (ac = WME_AC_BE; ac <= WME_AC_VO; ac++) {
 	again:
 			if (ac & IEEE80211_WMEPARAM_BSS)
 				list_wme_aci(s, "     ", ac);
 			else
 				list_wme_aci(s, acnames[ac], ac);
 			if ((ac & IEEE80211_WMEPARAM_BSS) == 0) {
 				ac |= IEEE80211_WMEPARAM_BSS;
 				goto again;
 			} else
 				ac &= ~IEEE80211_WMEPARAM_BSS;
 		}
 	} else {
 		/* display only channel settings */
 		for (ac = WME_AC_BE; ac <= WME_AC_VO; ac++)
 			list_wme_aci(s, acnames[ac], ac);
 	}
 }
 
 static void
 list_roam(int s)
 {
 	const struct ieee80211_roamparam *rp;
 	int mode;
 
 	getroam(s);
 	for (mode = IEEE80211_MODE_11A; mode < IEEE80211_MODE_MAX; mode++) {
 		rp = &roamparams.params[mode];
 		if (rp->rssi == 0 && rp->rate == 0)
 			continue;
 		if (mode == IEEE80211_MODE_11NA || mode == IEEE80211_MODE_11NG) {
 			if (rp->rssi & 1)
 				LINE_CHECK("roam:%-7.7s rssi %2u.5dBm  MCS %2u    ",
 				    modename[mode], rp->rssi/2,
 				    rp->rate &~ IEEE80211_RATE_MCS);
 			else
 				LINE_CHECK("roam:%-7.7s rssi %4udBm  MCS %2u    ",
 				    modename[mode], rp->rssi/2,
 				    rp->rate &~ IEEE80211_RATE_MCS);
 		} else {
 			if (rp->rssi & 1)
 				LINE_CHECK("roam:%-7.7s rssi %2u.5dBm rate %2u Mb/s",
 				    modename[mode], rp->rssi/2, rp->rate/2);
 			else
 				LINE_CHECK("roam:%-7.7s rssi %4udBm rate %2u Mb/s",
 				    modename[mode], rp->rssi/2, rp->rate/2);
 		}
 	}
 }
 
 static void
 list_txparams(int s)
 {
 	const struct ieee80211_txparam *tp;
 	int mode;
 
 	gettxparams(s);
 	for (mode = IEEE80211_MODE_11A; mode < IEEE80211_MODE_MAX; mode++) {
 		tp = &txparams.params[mode];
 		if (tp->mgmtrate == 0 && tp->mcastrate == 0)
 			continue;
 		if (mode == IEEE80211_MODE_11NA || mode == IEEE80211_MODE_11NG) {
 			if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE)
 				LINE_CHECK("%-7.7s ucast NONE    mgmt %2u MCS  "
 				    "mcast %2u MCS  maxretry %u",
 				    modename[mode],
 				    tp->mgmtrate &~ IEEE80211_RATE_MCS,
 				    tp->mcastrate &~ IEEE80211_RATE_MCS,
 				    tp->maxretry);
 			else
 				LINE_CHECK("%-7.7s ucast %2u MCS  mgmt %2u MCS  "
 				    "mcast %2u MCS  maxretry %u",
 				    modename[mode],
 				    tp->ucastrate &~ IEEE80211_RATE_MCS,
 				    tp->mgmtrate &~ IEEE80211_RATE_MCS,
 				    tp->mcastrate &~ IEEE80211_RATE_MCS,
 				    tp->maxretry);
 		} else {
 			if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE)
 				LINE_CHECK("%-7.7s ucast NONE    mgmt %2u Mb/s "
 				    "mcast %2u Mb/s maxretry %u",
 				    modename[mode],
 				    tp->mgmtrate/2,
 				    tp->mcastrate/2, tp->maxretry);
 			else
 				LINE_CHECK("%-7.7s ucast %2u Mb/s mgmt %2u Mb/s "
 				    "mcast %2u Mb/s maxretry %u",
 				    modename[mode],
 				    tp->ucastrate/2, tp->mgmtrate/2,
 				    tp->mcastrate/2, tp->maxretry);
 		}
 	}
 }
 
 static void
 printpolicy(int policy)
 {
 	switch (policy) {
 	case IEEE80211_MACCMD_POLICY_OPEN:
 		printf("policy: open\n");
 		break;
 	case IEEE80211_MACCMD_POLICY_ALLOW:
 		printf("policy: allow\n");
 		break;
 	case IEEE80211_MACCMD_POLICY_DENY:
 		printf("policy: deny\n");
 		break;
 	case IEEE80211_MACCMD_POLICY_RADIUS:
 		printf("policy: radius\n");
 		break;
 	default:
 		printf("policy: unknown (%u)\n", policy);
 		break;
 	}
 }
 
 static void
 list_mac(int s)
 {
 	struct ieee80211req ireq;
 	struct ieee80211req_maclist *acllist;
 	int i, nacls, policy, len;
 	uint8_t *data;
 	char c;
 
 	(void) memset(&ireq, 0, sizeof(ireq));
 	(void) strlcpy(ireq.i_name, name, sizeof(ireq.i_name)); /* XXX ?? */
 	ireq.i_type = IEEE80211_IOC_MACCMD;
 	ireq.i_val = IEEE80211_MACCMD_POLICY;
 	if (ioctl(s, SIOCG80211, &ireq) < 0) {
 		if (errno == EINVAL) {
 			printf("No acl policy loaded\n");
 			return;
 		}
 		err(1, "unable to get mac policy");
 	}
 	policy = ireq.i_val;
 	if (policy == IEEE80211_MACCMD_POLICY_OPEN) {
 		c = '*';
 	} else if (policy == IEEE80211_MACCMD_POLICY_ALLOW) {
 		c = '+';
 	} else if (policy == IEEE80211_MACCMD_POLICY_DENY) {
 		c = '-';
 	} else if (policy == IEEE80211_MACCMD_POLICY_RADIUS) {
 		c = 'r';		/* NB: should never have entries */
 	} else {
 		printf("policy: unknown (%u)\n", policy);
 		c = '?';
 	}
 	if (verbose || c == '?')
 		printpolicy(policy);
 
 	ireq.i_val = IEEE80211_MACCMD_LIST;
 	ireq.i_len = 0;
 	if (ioctl(s, SIOCG80211, &ireq) < 0)
 		err(1, "unable to get mac acl list size");
 	if (ireq.i_len == 0) {		/* NB: no acls */
 		if (!(verbose || c == '?'))
 			printpolicy(policy);
 		return;
 	}
 	len = ireq.i_len;
 
 	data = malloc(len);
 	if (data == NULL)
 		err(1, "out of memory for acl list");
 
 	ireq.i_data = data;
 	if (ioctl(s, SIOCG80211, &ireq) < 0)
 		err(1, "unable to get mac acl list");
 	nacls = len / sizeof(*acllist);
 	acllist = (struct ieee80211req_maclist *) data;
 	for (i = 0; i < nacls; i++)
 		printf("%c%s\n", c, ether_ntoa(
 			(const struct ether_addr *) acllist[i].ml_macaddr));
 	free(data);
 }
 
 static void
 print_regdomain(const struct ieee80211_regdomain *reg, int verb)
 {
 	if ((reg->regdomain != 0 &&
 	    reg->regdomain != reg->country) || verb) {
 		const struct regdomain *rd =
 		    lib80211_regdomain_findbysku(getregdata(), reg->regdomain);
 		if (rd == NULL)
 			LINE_CHECK("regdomain %d", reg->regdomain);
 		else
 			LINE_CHECK("regdomain %s", rd->name);
 	}
 	if (reg->country != 0 || verb) {
 		const struct country *cc =
 		    lib80211_country_findbycc(getregdata(), reg->country);
 		if (cc == NULL)
 			LINE_CHECK("country %d", reg->country);
 		else
 			LINE_CHECK("country %s", cc->isoname);
 	}
 	if (reg->location == 'I')
 		LINE_CHECK("indoor");
 	else if (reg->location == 'O')
 		LINE_CHECK("outdoor");
 	else if (verb)
 		LINE_CHECK("anywhere");
 	if (reg->ecm)
 		LINE_CHECK("ecm");
 	else if (verb)
 		LINE_CHECK("-ecm");
 }
 
 static void
 list_regdomain(int s, int channelsalso)
 {
 	getregdomain(s);
 	if (channelsalso) {
 		getchaninfo(s);
 		spacer = ':';
 		print_regdomain(&regdomain, 1);
 		LINE_BREAK();
 		print_channels(s, chaninfo, 1/*allchans*/, 1/*verbose*/);
 	} else
 		print_regdomain(&regdomain, verbose);
 }
 
 static void
 list_mesh(int s)
 {
 	struct ieee80211req ireq;
 	struct ieee80211req_mesh_route routes[128];
 	struct ieee80211req_mesh_route *rt;
 
 	(void) memset(&ireq, 0, sizeof(ireq));
 	(void) strlcpy(ireq.i_name, name, sizeof(ireq.i_name));
 	ireq.i_type = IEEE80211_IOC_MESH_RTCMD;
 	ireq.i_val = IEEE80211_MESH_RTCMD_LIST;
 	ireq.i_data = &routes;
 	ireq.i_len = sizeof(routes);
 	if (ioctl(s, SIOCG80211, &ireq) < 0)
 	 	err(1, "unable to get the Mesh routing table");
 
 	printf("%-17.17s %-17.17s %4s %4s %4s %6s %s\n"
 		, "DEST"
 		, "NEXT HOP"
 		, "HOPS"
 		, "METRIC"
 		, "LIFETIME"
 		, "MSEQ"
 		, "FLAGS");
 
 	for (rt = &routes[0]; rt - &routes[0] < ireq.i_len / sizeof(*rt); rt++){
 		printf("%s ",
 		    ether_ntoa((const struct ether_addr *)rt->imr_dest));
 		printf("%s %4u   %4u   %6u %6u    %c%c\n",
 			ether_ntoa((const struct ether_addr *)rt->imr_nexthop),
 			rt->imr_nhops, rt->imr_metric, rt->imr_lifetime,
 			rt->imr_lastmseq,
 			(rt->imr_flags & IEEE80211_MESHRT_FLAGS_DISCOVER) ?
 			    'D' :
 			(rt->imr_flags & IEEE80211_MESHRT_FLAGS_VALID) ?
 			    'V' : '!',
 			(rt->imr_flags & IEEE80211_MESHRT_FLAGS_PROXY) ?
 			    'P' :
 			(rt->imr_flags & IEEE80211_MESHRT_FLAGS_GATE) ?
 			    'G' :' ');
 	}
 }
 
 static
 DECL_CMD_FUNC(set80211list, arg, d)
 {
 #define	iseq(a,b)	(strncasecmp(a,b,sizeof(b)-1) == 0)
 
 	LINE_INIT('\t');
 
 	if (iseq(arg, "sta"))
 		list_stations(s);
 	else if (iseq(arg, "scan") || iseq(arg, "ap"))
 		list_scan(s);
 	else if (iseq(arg, "chan") || iseq(arg, "freq"))
 		list_channels(s, 1);
 	else if (iseq(arg, "active"))
 		list_channels(s, 0);
 	else if (iseq(arg, "keys"))
 		list_keys(s);
 	else if (iseq(arg, "caps"))
 		list_capabilities(s);
 	else if (iseq(arg, "wme") || iseq(arg, "wmm"))
 		list_wme(s);
 	else if (iseq(arg, "mac"))
 		list_mac(s);
 	else if (iseq(arg, "txpow"))
 		list_txpow(s);
 	else if (iseq(arg, "roam"))
 		list_roam(s);
 	else if (iseq(arg, "txparam") || iseq(arg, "txparm"))
 		list_txparams(s);
 	else if (iseq(arg, "regdomain"))
 		list_regdomain(s, 1);
 	else if (iseq(arg, "countries"))
 		list_countries();
 	else if (iseq(arg, "mesh"))
 		list_mesh(s);
 	else
 		errx(1, "Don't know how to list %s for %s", arg, name);
 	LINE_BREAK();
 #undef iseq
 }
 
 static enum ieee80211_opmode
 get80211opmode(int s)
 {
 	struct ifmediareq ifmr;
 
 	(void) memset(&ifmr, 0, sizeof(ifmr));
 	(void) strlcpy(ifmr.ifm_name, name, sizeof(ifmr.ifm_name));
 
 	if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) >= 0) {
 		if (ifmr.ifm_current & IFM_IEEE80211_ADHOC) {
 			if (ifmr.ifm_current & IFM_FLAG0)
 				return IEEE80211_M_AHDEMO;
 			else
 				return IEEE80211_M_IBSS;
 		}
 		if (ifmr.ifm_current & IFM_IEEE80211_HOSTAP)
 			return IEEE80211_M_HOSTAP;
 		if (ifmr.ifm_current & IFM_IEEE80211_IBSS)
 			return IEEE80211_M_IBSS;
 		if (ifmr.ifm_current & IFM_IEEE80211_MONITOR)
 			return IEEE80211_M_MONITOR;
 		if (ifmr.ifm_current & IFM_IEEE80211_MBSS)
 			return IEEE80211_M_MBSS;
 	}
 	return IEEE80211_M_STA;
 }
 
 #if 0
 static void
 printcipher(int s, struct ieee80211req *ireq, int keylenop)
 {
 	switch (ireq->i_val) {
 	case IEEE80211_CIPHER_WEP:
 		ireq->i_type = keylenop;
 		if (ioctl(s, SIOCG80211, ireq) != -1)
 			printf("WEP-%s", 
 			    ireq->i_len <= 5 ? "40" :
 			    ireq->i_len <= 13 ? "104" : "128");
 		else
 			printf("WEP");
 		break;
 	case IEEE80211_CIPHER_TKIP:
 		printf("TKIP");
 		break;
 	case IEEE80211_CIPHER_AES_OCB:
 		printf("AES-OCB");
 		break;
 	case IEEE80211_CIPHER_AES_CCM:
 		printf("AES-CCM");
 		break;
 	case IEEE80211_CIPHER_CKIP:
 		printf("CKIP");
 		break;
 	case IEEE80211_CIPHER_NONE:
 		printf("NONE");
 		break;
 	default:
 		printf("UNKNOWN (0x%x)", ireq->i_val);
 		break;
 	}
 }
 #endif
 
 static void
 printkey(const struct ieee80211req_key *ik)
 {
 	static const uint8_t zerodata[IEEE80211_KEYBUF_SIZE];
 	u_int keylen = ik->ik_keylen;
 	int printcontents;
 
 	printcontents = printkeys &&
 		(memcmp(ik->ik_keydata, zerodata, keylen) != 0 || verbose);
 	if (printcontents)
 		LINE_BREAK();
 	switch (ik->ik_type) {
 	case IEEE80211_CIPHER_WEP:
 		/* compatibility */
 		LINE_CHECK("wepkey %u:%s", ik->ik_keyix+1,
 		    keylen <= 5 ? "40-bit" :
 		    keylen <= 13 ? "104-bit" : "128-bit");
 		break;
 	case IEEE80211_CIPHER_TKIP:
 		if (keylen > 128/8)
 			keylen -= 128/8;	/* ignore MIC for now */
 		LINE_CHECK("TKIP %u:%u-bit", ik->ik_keyix+1, 8*keylen);
 		break;
 	case IEEE80211_CIPHER_AES_OCB:
 		LINE_CHECK("AES-OCB %u:%u-bit", ik->ik_keyix+1, 8*keylen);
 		break;
 	case IEEE80211_CIPHER_AES_CCM:
 		LINE_CHECK("AES-CCM %u:%u-bit", ik->ik_keyix+1, 8*keylen);
 		break;
 	case IEEE80211_CIPHER_CKIP:
 		LINE_CHECK("CKIP %u:%u-bit", ik->ik_keyix+1, 8*keylen);
 		break;
 	case IEEE80211_CIPHER_NONE:
 		LINE_CHECK("NULL %u:%u-bit", ik->ik_keyix+1, 8*keylen);
 		break;
 	default:
 		LINE_CHECK("UNKNOWN (0x%x) %u:%u-bit",
 			ik->ik_type, ik->ik_keyix+1, 8*keylen);
 		break;
 	}
 	if (printcontents) {
 		u_int i;
 
 		printf(" <");
 		for (i = 0; i < keylen; i++)
 			printf("%02x", ik->ik_keydata[i]);
 		printf(">");
 		if (ik->ik_type != IEEE80211_CIPHER_WEP &&
 		    (ik->ik_keyrsc != 0 || verbose))
 			printf(" rsc %ju", (uintmax_t)ik->ik_keyrsc);
 		if (ik->ik_type != IEEE80211_CIPHER_WEP &&
 		    (ik->ik_keytsc != 0 || verbose))
 			printf(" tsc %ju", (uintmax_t)ik->ik_keytsc);
 		if (ik->ik_flags != 0 && verbose) {
 			const char *sep = " ";
 
 			if (ik->ik_flags & IEEE80211_KEY_XMIT)
 				printf("%stx", sep), sep = "+";
 			if (ik->ik_flags & IEEE80211_KEY_RECV)
 				printf("%srx", sep), sep = "+";
 			if (ik->ik_flags & IEEE80211_KEY_DEFAULT)
 				printf("%sdef", sep), sep = "+";
 		}
 		LINE_BREAK();
 	}
 }
 
 static void
 printrate(const char *tag, int v, int defrate, int defmcs)
 {
 	if ((v & IEEE80211_RATE_MCS) == 0) {
 		if (v != defrate) {
 			if (v & 1)
 				LINE_CHECK("%s %d.5", tag, v/2);
 			else
 				LINE_CHECK("%s %d", tag, v/2);
 		}
 	} else {
 		if (v != defmcs)
 			LINE_CHECK("%s %d", tag, v &~ 0x80);
 	}
 }
 
 static int
 getid(int s, int ix, void *data, size_t len, int *plen, int mesh)
 {
 	struct ieee80211req ireq;
 
 	(void) memset(&ireq, 0, sizeof(ireq));
 	(void) strlcpy(ireq.i_name, name, sizeof(ireq.i_name));
 	ireq.i_type = (!mesh) ? IEEE80211_IOC_SSID : IEEE80211_IOC_MESH_ID;
 	ireq.i_val = ix;
 	ireq.i_data = data;
 	ireq.i_len = len;
 	if (ioctl(s, SIOCG80211, &ireq) < 0)
 		return -1;
 	*plen = ireq.i_len;
 	return 0;
 }
 
 static void
 ieee80211_status(int s)
 {
 	static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
 	enum ieee80211_opmode opmode = get80211opmode(s);
 	int i, num, wpa, wme, bgscan, bgscaninterval, val, len, wepmode;
 	uint8_t data[32];
 	const struct ieee80211_channel *c;
 	const struct ieee80211_roamparam *rp;
 	const struct ieee80211_txparam *tp;
 
 	if (getid(s, -1, data, sizeof(data), &len, 0) < 0) {
 		/* If we can't get the SSID, this isn't an 802.11 device. */
 		return;
 	}
 
 	/*
 	 * Invalidate cached state so printing status for multiple
 	 * if's doesn't reuse the first interfaces' cached state.
 	 */
 	gotcurchan = 0;
 	gotroam = 0;
 	gottxparams = 0;
 	gothtconf = 0;
 	gotregdomain = 0;
 
 	printf("\t");
 	if (opmode == IEEE80211_M_MBSS) {
 		printf("meshid ");
 		getid(s, 0, data, sizeof(data), &len, 1);
 		print_string(data, len);
 	} else {
 		if (get80211val(s, IEEE80211_IOC_NUMSSIDS, &num) < 0)
 			num = 0;
 		printf("ssid ");
 		if (num > 1) {
 			for (i = 0; i < num; i++) {
 				if (getid(s, i, data, sizeof(data), &len, 0) >= 0 && len > 0) {
 					printf(" %d:", i + 1);
 					print_string(data, len);
 				}
 			}
 		} else
 			print_string(data, len);
 	}
 	c = getcurchan(s);
 	if (c->ic_freq != IEEE80211_CHAN_ANY) {
 		char buf[14];
 		printf(" channel %d (%u MHz%s)", c->ic_ieee, c->ic_freq,
 			get_chaninfo(c, 1, buf, sizeof(buf)));
 	} else if (verbose)
 		printf(" channel UNDEF");
 
 	if (get80211(s, IEEE80211_IOC_BSSID, data, IEEE80211_ADDR_LEN) >= 0 &&
 	    (memcmp(data, zerobssid, sizeof(zerobssid)) != 0 || verbose))
 		printf(" bssid %s", ether_ntoa((struct ether_addr *)data));
 
 	if (get80211len(s, IEEE80211_IOC_STATIONNAME, data, sizeof(data), &len) != -1) {
 		printf("\n\tstationname ");
 		print_string(data, len);
 	}
 
 	spacer = ' ';		/* force first break */
 	LINE_BREAK();
 
 	list_regdomain(s, 0);
 
 	wpa = 0;
 	if (get80211val(s, IEEE80211_IOC_AUTHMODE, &val) != -1) {
 		switch (val) {
 		case IEEE80211_AUTH_NONE:
 			LINE_CHECK("authmode NONE");
 			break;
 		case IEEE80211_AUTH_OPEN:
 			LINE_CHECK("authmode OPEN");
 			break;
 		case IEEE80211_AUTH_SHARED:
 			LINE_CHECK("authmode SHARED");
 			break;
 		case IEEE80211_AUTH_8021X:
 			LINE_CHECK("authmode 802.1x");
 			break;
 		case IEEE80211_AUTH_WPA:
 			if (get80211val(s, IEEE80211_IOC_WPA, &wpa) < 0)
 				wpa = 1;	/* default to WPA1 */
 			switch (wpa) {
 			case 2:
 				LINE_CHECK("authmode WPA2/802.11i");
 				break;
 			case 3:
 				LINE_CHECK("authmode WPA1+WPA2/802.11i");
 				break;
 			default:
 				LINE_CHECK("authmode WPA");
 				break;
 			}
 			break;
 		case IEEE80211_AUTH_AUTO:
 			LINE_CHECK("authmode AUTO");
 			break;
 		default:
 			LINE_CHECK("authmode UNKNOWN (0x%x)", val);
 			break;
 		}
 	}
 
 	if (wpa || verbose) {
 		if (get80211val(s, IEEE80211_IOC_WPS, &val) != -1) {
 			if (val)
 				LINE_CHECK("wps");
 			else if (verbose)
 				LINE_CHECK("-wps");
 		}
 		if (get80211val(s, IEEE80211_IOC_TSN, &val) != -1) {
 			if (val)
 				LINE_CHECK("tsn");
 			else if (verbose)
 				LINE_CHECK("-tsn");
 		}
 		if (ioctl(s, IEEE80211_IOC_COUNTERMEASURES, &val) != -1) {
 			if (val)
 				LINE_CHECK("countermeasures");
 			else if (verbose)
 				LINE_CHECK("-countermeasures");
 		}
 #if 0
 		/* XXX not interesting with WPA done in user space */
 		ireq.i_type = IEEE80211_IOC_KEYMGTALGS;
 		if (ioctl(s, SIOCG80211, &ireq) != -1) {
 		}
 
 		ireq.i_type = IEEE80211_IOC_MCASTCIPHER;
 		if (ioctl(s, SIOCG80211, &ireq) != -1) {
 			LINE_CHECK("mcastcipher ");
 			printcipher(s, &ireq, IEEE80211_IOC_MCASTKEYLEN);
 			spacer = ' ';
 		}
 
 		ireq.i_type = IEEE80211_IOC_UCASTCIPHER;
 		if (ioctl(s, SIOCG80211, &ireq) != -1) {
 			LINE_CHECK("ucastcipher ");
 			printcipher(s, &ireq, IEEE80211_IOC_UCASTKEYLEN);
 		}
 
 		if (wpa & 2) {
 			ireq.i_type = IEEE80211_IOC_RSNCAPS;
 			if (ioctl(s, SIOCG80211, &ireq) != -1) {
 				LINE_CHECK("RSN caps 0x%x", ireq.i_val);
 				spacer = ' ';
 			}
 		}
 
 		ireq.i_type = IEEE80211_IOC_UCASTCIPHERS;
 		if (ioctl(s, SIOCG80211, &ireq) != -1) {
 		}
 #endif
 	}
 
 	if (get80211val(s, IEEE80211_IOC_WEP, &wepmode) != -1 &&
 	    wepmode != IEEE80211_WEP_NOSUP) {
 
 		switch (wepmode) {
 		case IEEE80211_WEP_OFF:
 			LINE_CHECK("privacy OFF");
 			break;
 		case IEEE80211_WEP_ON:
 			LINE_CHECK("privacy ON");
 			break;
 		case IEEE80211_WEP_MIXED:
 			LINE_CHECK("privacy MIXED");
 			break;
 		default:
 			LINE_CHECK("privacy UNKNOWN (0x%x)", wepmode);
 			break;
 		}
 
 		/*
 		 * If we get here then we've got WEP support so we need
 		 * to print WEP status.
 		 */
 
 		if (get80211val(s, IEEE80211_IOC_WEPTXKEY, &val) < 0) {
 			warn("WEP support, but no tx key!");
 			goto end;
 		}
 		if (val != -1)
 			LINE_CHECK("deftxkey %d", val+1);
 		else if (wepmode != IEEE80211_WEP_OFF || verbose)
 			LINE_CHECK("deftxkey UNDEF");
 
 		if (get80211val(s, IEEE80211_IOC_NUMWEPKEYS, &num) < 0) {
 			warn("WEP support, but no NUMWEPKEYS support!");
 			goto end;
 		}
 
 		for (i = 0; i < num; i++) {
 			struct ieee80211req_key ik;
 
 			memset(&ik, 0, sizeof(ik));
 			ik.ik_keyix = i;
 			if (get80211(s, IEEE80211_IOC_WPAKEY, &ik, sizeof(ik)) < 0) {
 				warn("WEP support, but can get keys!");
 				goto end;
 			}
 			if (ik.ik_keylen != 0) {
 				if (verbose)
 					LINE_BREAK();
 				printkey(&ik);
 			}
 		}
 end:
 		;
 	}
 
 	if (get80211val(s, IEEE80211_IOC_POWERSAVE, &val) != -1 &&
 	    val != IEEE80211_POWERSAVE_NOSUP ) {
 		if (val != IEEE80211_POWERSAVE_OFF || verbose) {
 			switch (val) {
 			case IEEE80211_POWERSAVE_OFF:
 				LINE_CHECK("powersavemode OFF");
 				break;
 			case IEEE80211_POWERSAVE_CAM:
 				LINE_CHECK("powersavemode CAM");
 				break;
 			case IEEE80211_POWERSAVE_PSP:
 				LINE_CHECK("powersavemode PSP");
 				break;
 			case IEEE80211_POWERSAVE_PSP_CAM:
 				LINE_CHECK("powersavemode PSP-CAM");
 				break;
 			}
 			if (get80211val(s, IEEE80211_IOC_POWERSAVESLEEP, &val) != -1)
 				LINE_CHECK("powersavesleep %d", val);
 		}
 	}
 
 	if (get80211val(s, IEEE80211_IOC_TXPOWER, &val) != -1) {
 		if (val & 1)
 			LINE_CHECK("txpower %d.5", val/2);
 		else
 			LINE_CHECK("txpower %d", val/2);
 	}
 	if (verbose) {
 		if (get80211val(s, IEEE80211_IOC_TXPOWMAX, &val) != -1)
 			LINE_CHECK("txpowmax %.1f", val/2.);
 	}
 
 	if (get80211val(s, IEEE80211_IOC_DOTD, &val) != -1) {
 		if (val)
 			LINE_CHECK("dotd");
 		else if (verbose)
 			LINE_CHECK("-dotd");
 	}
 
 	if (get80211val(s, IEEE80211_IOC_RTSTHRESHOLD, &val) != -1) {
 		if (val != IEEE80211_RTS_MAX || verbose)
 			LINE_CHECK("rtsthreshold %d", val);
 	}
 
 	if (get80211val(s, IEEE80211_IOC_FRAGTHRESHOLD, &val) != -1) {
 		if (val != IEEE80211_FRAG_MAX || verbose)
 			LINE_CHECK("fragthreshold %d", val);
 	}
 	if (opmode == IEEE80211_M_STA || verbose) {
 		if (get80211val(s, IEEE80211_IOC_BMISSTHRESHOLD, &val) != -1) {
 			if (val != IEEE80211_HWBMISS_MAX || verbose)
 				LINE_CHECK("bmiss %d", val);
 		}
 	}
 
 	if (!verbose) {
 		gettxparams(s);
 		tp = &txparams.params[chan2mode(c)];
 		printrate("ucastrate", tp->ucastrate,
 		    IEEE80211_FIXED_RATE_NONE, IEEE80211_FIXED_RATE_NONE);
 		printrate("mcastrate", tp->mcastrate, 2*1,
 		    IEEE80211_RATE_MCS|0);
 		printrate("mgmtrate", tp->mgmtrate, 2*1,
 		    IEEE80211_RATE_MCS|0);
 		if (tp->maxretry != 6)		/* XXX */
 			LINE_CHECK("maxretry %d", tp->maxretry);
 	} else {
 		LINE_BREAK();
 		list_txparams(s);
 	}
 
 	bgscaninterval = -1;
 	(void) get80211val(s, IEEE80211_IOC_BGSCAN_INTERVAL, &bgscaninterval);
 
 	if (get80211val(s, IEEE80211_IOC_SCANVALID, &val) != -1) {
 		if (val != bgscaninterval || verbose)
 			LINE_CHECK("scanvalid %u", val);
 	}
 
 	bgscan = 0;
 	if (get80211val(s, IEEE80211_IOC_BGSCAN, &bgscan) != -1) {
 		if (bgscan)
 			LINE_CHECK("bgscan");
 		else if (verbose)
 			LINE_CHECK("-bgscan");
 	}
 	if (bgscan || verbose) {
 		if (bgscaninterval != -1)
 			LINE_CHECK("bgscanintvl %u", bgscaninterval);
 		if (get80211val(s, IEEE80211_IOC_BGSCAN_IDLE, &val) != -1)
 			LINE_CHECK("bgscanidle %u", val);
 		if (!verbose) {
 			getroam(s);
 			rp = &roamparams.params[chan2mode(c)];
 			if (rp->rssi & 1)
 				LINE_CHECK("roam:rssi %u.5", rp->rssi/2);
 			else
 				LINE_CHECK("roam:rssi %u", rp->rssi/2);
 			LINE_CHECK("roam:rate %u", rp->rate/2);
 		} else {
 			LINE_BREAK();
 			list_roam(s);
 			LINE_BREAK();
 		}
 	}
 
 	if (IEEE80211_IS_CHAN_ANYG(c) || verbose) {
 		if (get80211val(s, IEEE80211_IOC_PUREG, &val) != -1) {
 			if (val)
 				LINE_CHECK("pureg");
 			else if (verbose)
 				LINE_CHECK("-pureg");
 		}
 		if (get80211val(s, IEEE80211_IOC_PROTMODE, &val) != -1) {
 			switch (val) {
 			case IEEE80211_PROTMODE_OFF:
 				LINE_CHECK("protmode OFF");
 				break;
 			case IEEE80211_PROTMODE_CTS:
 				LINE_CHECK("protmode CTS");
 				break;
 			case IEEE80211_PROTMODE_RTSCTS:
 				LINE_CHECK("protmode RTSCTS");
 				break;
 			default:
 				LINE_CHECK("protmode UNKNOWN (0x%x)", val);
 				break;
 			}
 		}
 	}
 
 	if (IEEE80211_IS_CHAN_HT(c) || verbose) {
 		gethtconf(s);
 		switch (htconf & 3) {
 		case 0:
 		case 2:
 			LINE_CHECK("-ht");
 			break;
 		case 1:
 			LINE_CHECK("ht20");
 			break;
 		case 3:
 			if (verbose)
 				LINE_CHECK("ht");
 			break;
 		}
 		if (get80211val(s, IEEE80211_IOC_HTCOMPAT, &val) != -1) {
 			if (!val)
 				LINE_CHECK("-htcompat");
 			else if (verbose)
 				LINE_CHECK("htcompat");
 		}
 		if (get80211val(s, IEEE80211_IOC_AMPDU, &val) != -1) {
 			switch (val) {
 			case 0:
 				LINE_CHECK("-ampdu");
 				break;
 			case 1:
 				LINE_CHECK("ampdutx -ampdurx");
 				break;
 			case 2:
 				LINE_CHECK("-ampdutx ampdurx");
 				break;
 			case 3:
 				if (verbose)
 					LINE_CHECK("ampdu");
 				break;
 			}
 		}
 		if (get80211val(s, IEEE80211_IOC_AMPDU_LIMIT, &val) != -1) {
 			switch (val) {
 			case IEEE80211_HTCAP_MAXRXAMPDU_8K:
 				LINE_CHECK("ampdulimit 8k");
 				break;
 			case IEEE80211_HTCAP_MAXRXAMPDU_16K:
 				LINE_CHECK("ampdulimit 16k");
 				break;
 			case IEEE80211_HTCAP_MAXRXAMPDU_32K:
 				LINE_CHECK("ampdulimit 32k");
 				break;
 			case IEEE80211_HTCAP_MAXRXAMPDU_64K:
 				LINE_CHECK("ampdulimit 64k");
 				break;
 			}
 		}
 		if (get80211val(s, IEEE80211_IOC_AMPDU_DENSITY, &val) != -1) {
 			switch (val) {
 			case IEEE80211_HTCAP_MPDUDENSITY_NA:
 				if (verbose)
 					LINE_CHECK("ampdudensity NA");
 				break;
 			case IEEE80211_HTCAP_MPDUDENSITY_025:
 				LINE_CHECK("ampdudensity .25");
 				break;
 			case IEEE80211_HTCAP_MPDUDENSITY_05:
 				LINE_CHECK("ampdudensity .5");
 				break;
 			case IEEE80211_HTCAP_MPDUDENSITY_1:
 				LINE_CHECK("ampdudensity 1");
 				break;
 			case IEEE80211_HTCAP_MPDUDENSITY_2:
 				LINE_CHECK("ampdudensity 2");
 				break;
 			case IEEE80211_HTCAP_MPDUDENSITY_4:
 				LINE_CHECK("ampdudensity 4");
 				break;
 			case IEEE80211_HTCAP_MPDUDENSITY_8:
 				LINE_CHECK("ampdudensity 8");
 				break;
 			case IEEE80211_HTCAP_MPDUDENSITY_16:
 				LINE_CHECK("ampdudensity 16");
 				break;
 			}
 		}
 		if (get80211val(s, IEEE80211_IOC_AMSDU, &val) != -1) {
 			switch (val) {
 			case 0:
 				LINE_CHECK("-amsdu");
 				break;
 			case 1:
 				LINE_CHECK("amsdutx -amsdurx");
 				break;
 			case 2:
 				LINE_CHECK("-amsdutx amsdurx");
 				break;
 			case 3:
 				if (verbose)
 					LINE_CHECK("amsdu");
 				break;
 			}
 		}
 		/* XXX amsdu limit */
 		if (get80211val(s, IEEE80211_IOC_SHORTGI, &val) != -1) {
 			if (val)
 				LINE_CHECK("shortgi");
 			else if (verbose)
 				LINE_CHECK("-shortgi");
 		}
 		if (get80211val(s, IEEE80211_IOC_HTPROTMODE, &val) != -1) {
 			if (val == IEEE80211_PROTMODE_OFF)
 				LINE_CHECK("htprotmode OFF");
 			else if (val != IEEE80211_PROTMODE_RTSCTS)
 				LINE_CHECK("htprotmode UNKNOWN (0x%x)", val);
 			else if (verbose)
 				LINE_CHECK("htprotmode RTSCTS");
 		}
 		if (get80211val(s, IEEE80211_IOC_PUREN, &val) != -1) {
 			if (val)
 				LINE_CHECK("puren");
 			else if (verbose)
 				LINE_CHECK("-puren");
 		}
 		if (get80211val(s, IEEE80211_IOC_SMPS, &val) != -1) {
 			if (val == IEEE80211_HTCAP_SMPS_DYNAMIC)
 				LINE_CHECK("smpsdyn");
 			else if (val == IEEE80211_HTCAP_SMPS_ENA)
 				LINE_CHECK("smps");
 			else if (verbose)
 				LINE_CHECK("-smps");
 		}
 		if (get80211val(s, IEEE80211_IOC_RIFS, &val) != -1) {
 			if (val)
 				LINE_CHECK("rifs");
 			else if (verbose)
 				LINE_CHECK("-rifs");
 		}
 		if (get80211val(s, IEEE80211_IOC_STBC, &val) != -1) {
 			switch (val) {
 			case 0:
 				LINE_CHECK("-stbc");
 				break;
 			case 1:
 				LINE_CHECK("stbctx -stbcrx");
 				break;
 			case 2:
 				LINE_CHECK("-stbctx stbcrx");
 				break;
 			case 3:
 				if (verbose)
 					LINE_CHECK("stbc");
 				break;
 			}
 		}
 	}
 
+	if (IEEE80211_IS_CHAN_VHT(c) || verbose) {
+		getvhtconf(s);
+		if (vhtconf & 0x1)
+			LINE_CHECK("vht");
+		else
+			LINE_CHECK("-vht");
+		if (vhtconf & 0x2)
+			LINE_CHECK("vht40");
+		else
+			LINE_CHECK("-vht40");
+		if (vhtconf & 0x4)
+			LINE_CHECK("vht80");
+		else
+			LINE_CHECK("-vht80");
+		if (vhtconf & 0x8)
+			LINE_CHECK("vht80p80");
+		else
+			LINE_CHECK("-vht80p80");
+		if (vhtconf & 0x10)
+			LINE_CHECK("vht160");
+		else
+			LINE_CHECK("-vht160");
+	}
+
 	if (get80211val(s, IEEE80211_IOC_WME, &wme) != -1) {
 		if (wme)
 			LINE_CHECK("wme");
 		else if (verbose)
 			LINE_CHECK("-wme");
 	} else
 		wme = 0;
 
 	if (get80211val(s, IEEE80211_IOC_BURST, &val) != -1) {
 		if (val)
 			LINE_CHECK("burst");
 		else if (verbose)
 			LINE_CHECK("-burst");
 	}
 
 	if (get80211val(s, IEEE80211_IOC_FF, &val) != -1) {
 		if (val)
 			LINE_CHECK("ff");
 		else if (verbose)
 			LINE_CHECK("-ff");
 	}
 	if (get80211val(s, IEEE80211_IOC_TURBOP, &val) != -1) {
 		if (val)
 			LINE_CHECK("dturbo");
 		else if (verbose)
 			LINE_CHECK("-dturbo");
 	}
 	if (get80211val(s, IEEE80211_IOC_DWDS, &val) != -1) {
 		if (val)
 			LINE_CHECK("dwds");
 		else if (verbose)
 			LINE_CHECK("-dwds");
 	}
 
 	if (opmode == IEEE80211_M_HOSTAP) {
 		if (get80211val(s, IEEE80211_IOC_HIDESSID, &val) != -1) {
 			if (val)
 				LINE_CHECK("hidessid");
 			else if (verbose)
 				LINE_CHECK("-hidessid");
 		}
 		if (get80211val(s, IEEE80211_IOC_APBRIDGE, &val) != -1) {
 			if (!val)
 				LINE_CHECK("-apbridge");
 			else if (verbose)
 				LINE_CHECK("apbridge");
 		}
 		if (get80211val(s, IEEE80211_IOC_DTIM_PERIOD, &val) != -1)
 			LINE_CHECK("dtimperiod %u", val);
 
 		if (get80211val(s, IEEE80211_IOC_DOTH, &val) != -1) {
 			if (!val)
 				LINE_CHECK("-doth");
 			else if (verbose)
 				LINE_CHECK("doth");
 		}
 		if (get80211val(s, IEEE80211_IOC_DFS, &val) != -1) {
 			if (!val)
 				LINE_CHECK("-dfs");
 			else if (verbose)
 				LINE_CHECK("dfs");
 		}
 		if (get80211val(s, IEEE80211_IOC_INACTIVITY, &val) != -1) {
 			if (!val)
 				LINE_CHECK("-inact");
 			else if (verbose)
 				LINE_CHECK("inact");
 		}
 	} else {
 		if (get80211val(s, IEEE80211_IOC_ROAMING, &val) != -1) {
 			if (val != IEEE80211_ROAMING_AUTO || verbose) {
 				switch (val) {
 				case IEEE80211_ROAMING_DEVICE:
 					LINE_CHECK("roaming DEVICE");
 					break;
 				case IEEE80211_ROAMING_AUTO:
 					LINE_CHECK("roaming AUTO");
 					break;
 				case IEEE80211_ROAMING_MANUAL:
 					LINE_CHECK("roaming MANUAL");
 					break;
 				default:
 					LINE_CHECK("roaming UNKNOWN (0x%x)",
 						val);
 					break;
 				}
 			}
 		}
 	}
 
 	if (opmode == IEEE80211_M_AHDEMO) {
 		if (get80211val(s, IEEE80211_IOC_TDMA_SLOT, &val) != -1)
 			LINE_CHECK("tdmaslot %u", val);
 		if (get80211val(s, IEEE80211_IOC_TDMA_SLOTCNT, &val) != -1)
 			LINE_CHECK("tdmaslotcnt %u", val);
 		if (get80211val(s, IEEE80211_IOC_TDMA_SLOTLEN, &val) != -1)
 			LINE_CHECK("tdmaslotlen %u", val);
 		if (get80211val(s, IEEE80211_IOC_TDMA_BINTERVAL, &val) != -1)
 			LINE_CHECK("tdmabintval %u", val);
 	} else if (get80211val(s, IEEE80211_IOC_BEACON_INTERVAL, &val) != -1) {
 		/* XXX default define not visible */
 		if (val != 100 || verbose)
 			LINE_CHECK("bintval %u", val);
 	}
 
 	if (wme && verbose) {
 		LINE_BREAK();
 		list_wme(s);
 	}
 
 	if (opmode == IEEE80211_M_MBSS) {
 		if (get80211val(s, IEEE80211_IOC_MESH_TTL, &val) != -1) {
 			LINE_CHECK("meshttl %u", val);
 		}
 		if (get80211val(s, IEEE80211_IOC_MESH_AP, &val) != -1) {
 			if (val)
 				LINE_CHECK("meshpeering");
 			else
 				LINE_CHECK("-meshpeering");
 		}
 		if (get80211val(s, IEEE80211_IOC_MESH_FWRD, &val) != -1) {
 			if (val)
 				LINE_CHECK("meshforward");
 			else
 				LINE_CHECK("-meshforward");
 		}
 		if (get80211val(s, IEEE80211_IOC_MESH_GATE, &val) != -1) {
 			if (val)
 				LINE_CHECK("meshgate");
 			else
 				LINE_CHECK("-meshgate");
 		}
 		if (get80211len(s, IEEE80211_IOC_MESH_PR_METRIC, data, 12,
 		    &len) != -1) {
 			data[len] = '\0';
 			LINE_CHECK("meshmetric %s", data);
 		}
 		if (get80211len(s, IEEE80211_IOC_MESH_PR_PATH, data, 12,
 		    &len) != -1) {
 			data[len] = '\0';
 			LINE_CHECK("meshpath %s", data);
 		}
 		if (get80211val(s, IEEE80211_IOC_HWMP_ROOTMODE, &val) != -1) {
 			switch (val) {
 			case IEEE80211_HWMP_ROOTMODE_DISABLED:
 				LINE_CHECK("hwmprootmode DISABLED");
 				break;
 			case IEEE80211_HWMP_ROOTMODE_NORMAL:
 				LINE_CHECK("hwmprootmode NORMAL");
 				break;
 			case IEEE80211_HWMP_ROOTMODE_PROACTIVE:
 				LINE_CHECK("hwmprootmode PROACTIVE");
 				break;
 			case IEEE80211_HWMP_ROOTMODE_RANN:
 				LINE_CHECK("hwmprootmode RANN");
 				break;
 			default:
 				LINE_CHECK("hwmprootmode UNKNOWN(%d)", val);
 				break;
 			}
 		}
 		if (get80211val(s, IEEE80211_IOC_HWMP_MAXHOPS, &val) != -1) {
 			LINE_CHECK("hwmpmaxhops %u", val);
 		}
 	}
 
 	LINE_BREAK();
 }
 
 static int
 get80211(int s, int type, void *data, int len)
 {
 
 	return (lib80211_get80211(s, name, type, data, len));
 }
 
 static int
 get80211len(int s, int type, void *data, int len, int *plen)
 {
 
 	return (lib80211_get80211len(s, name, type, data, len, plen));
 }
 
 static int
 get80211val(int s, int type, int *val)
 {
 
 	return (lib80211_get80211val(s, name, type, val));
 }
 
 static void
 set80211(int s, int type, int val, int len, void *data)
 {
 	int ret;
 
 	ret = lib80211_set80211(s, name, type, val, len, data);
 	if (ret < 0)
 		err(1, "SIOCS80211");
 }
 
 static const char *
 get_string(const char *val, const char *sep, u_int8_t *buf, int *lenp)
 {
 	int len;
 	int hexstr;
 	u_int8_t *p;
 
 	len = *lenp;
 	p = buf;
 	hexstr = (val[0] == '0' && tolower((u_char)val[1]) == 'x');
 	if (hexstr)
 		val += 2;
 	for (;;) {
 		if (*val == '\0')
 			break;
 		if (sep != NULL && strchr(sep, *val) != NULL) {
 			val++;
 			break;
 		}
 		if (hexstr) {
 			if (!isxdigit((u_char)val[0])) {
 				warnx("bad hexadecimal digits");
 				return NULL;
 			}
 			if (!isxdigit((u_char)val[1])) {
 				warnx("odd count hexadecimal digits");
 				return NULL;
 			}
 		}
 		if (p >= buf + len) {
 			if (hexstr)
 				warnx("hexadecimal digits too long");
 			else
 				warnx("string too long");
 			return NULL;
 		}
 		if (hexstr) {
 #define	tohex(x)	(isdigit(x) ? (x) - '0' : tolower(x) - 'a' + 10)
 			*p++ = (tohex((u_char)val[0]) << 4) |
 			    tohex((u_char)val[1]);
 #undef tohex
 			val += 2;
 		} else
 			*p++ = *val++;
 	}
 	len = p - buf;
 	/* The string "-" is treated as the empty string. */
 	if (!hexstr && len == 1 && buf[0] == '-') {
 		len = 0;
 		memset(buf, 0, *lenp);
 	} else if (len < *lenp)
 		memset(p, 0, *lenp - len);
 	*lenp = len;
 	return val;
 }
 
 static void
 print_string(const u_int8_t *buf, int len)
 {
 	int i;
 	int hasspc;
 
 	i = 0;
 	hasspc = 0;
 	for (; i < len; i++) {
 		if (!isprint(buf[i]) && buf[i] != '\0')
 			break;
 		if (isspace(buf[i]))
 			hasspc++;
 	}
 	if (i == len) {
 		if (hasspc || len == 0 || buf[0] == '\0')
 			printf("\"%.*s\"", len, buf);
 		else
 			printf("%.*s", len, buf);
 	} else {
 		printf("0x");
 		for (i = 0; i < len; i++)
 			printf("%02x", buf[i]);
 	}
 }
 
 static void
 setdefregdomain(int s)
 {
 	struct regdata *rdp = getregdata();
 	const struct regdomain *rd;
 
 	/* Check if regdomain/country was already set by a previous call. */
 	/* XXX is it possible? */
 	if (regdomain.regdomain != 0 ||
 	    regdomain.country != CTRY_DEFAULT)
 		return;
 
 	getregdomain(s);
 
 	/* Check if it was already set by the driver. */
 	if (regdomain.regdomain != 0 ||
 	    regdomain.country != CTRY_DEFAULT)
 		return;
 
 	/* Set FCC/US as default. */
 	rd = lib80211_regdomain_findbysku(rdp, SKU_FCC);
 	if (rd == NULL)
 		errx(1, "FCC regdomain was not found");
 
 	regdomain.regdomain = rd->sku;
 	if (rd->cc != NULL)
 		defaultcountry(rd);
 
 	/* Send changes to net80211. */
 	setregdomain_cb(s, &regdomain);
 
 	/* Cleanup (so it can be overriden by subsequent parameters). */
 	regdomain.regdomain = 0;
 	regdomain.country = CTRY_DEFAULT;
 	regdomain.isocc[0] = 0;
 	regdomain.isocc[1] = 0;
 }
 
 /*
  * Virtual AP cloning support.
  */
 static struct ieee80211_clone_params params = {
 	.icp_opmode	= IEEE80211_M_STA,	/* default to station mode */
 };
 
 static void
 wlan_create(int s, struct ifreq *ifr)
 {
 	static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
 	char orig_name[IFNAMSIZ];
 
 	if (params.icp_parent[0] == '\0')
 		errx(1, "must specify a parent device (wlandev) when creating "
 		    "a wlan device");
 	if (params.icp_opmode == IEEE80211_M_WDS &&
 	    memcmp(params.icp_bssid, zerobssid, sizeof(zerobssid)) == 0)
 		errx(1, "no bssid specified for WDS (use wlanbssid)");
 	ifr->ifr_data = (caddr_t) &params;
 	if (ioctl(s, SIOCIFCREATE2, ifr) < 0)
 		err(1, "SIOCIFCREATE2");
 
 	/* XXX preserve original name for ifclonecreate(). */
 	strlcpy(orig_name, name, sizeof(orig_name));
 	strlcpy(name, ifr->ifr_name, sizeof(name));
 
 	setdefregdomain(s);
 
 	strlcpy(name, orig_name, sizeof(name));
 }
 
 static
 DECL_CMD_FUNC(set80211clone_wlandev, arg, d)
 {
 	strlcpy(params.icp_parent, arg, IFNAMSIZ);
 }
 
 static
 DECL_CMD_FUNC(set80211clone_wlanbssid, arg, d)
 {
 	const struct ether_addr *ea;
 
 	ea = ether_aton(arg);
 	if (ea == NULL)
 		errx(1, "%s: cannot parse bssid", arg);
 	memcpy(params.icp_bssid, ea->octet, IEEE80211_ADDR_LEN);
 }
 
 static
 DECL_CMD_FUNC(set80211clone_wlanaddr, arg, d)
 {
 	const struct ether_addr *ea;
 
 	ea = ether_aton(arg);
 	if (ea == NULL)
 		errx(1, "%s: cannot parse address", arg);
 	memcpy(params.icp_macaddr, ea->octet, IEEE80211_ADDR_LEN);
 	params.icp_flags |= IEEE80211_CLONE_MACADDR;
 }
 
 static
 DECL_CMD_FUNC(set80211clone_wlanmode, arg, d)
 {
 #define	iseq(a,b)	(strncasecmp(a,b,sizeof(b)-1) == 0)
 	if (iseq(arg, "sta"))
 		params.icp_opmode = IEEE80211_M_STA;
 	else if (iseq(arg, "ahdemo") || iseq(arg, "adhoc-demo"))
 		params.icp_opmode = IEEE80211_M_AHDEMO;
 	else if (iseq(arg, "ibss") || iseq(arg, "adhoc"))
 		params.icp_opmode = IEEE80211_M_IBSS;
 	else if (iseq(arg, "ap") || iseq(arg, "host"))
 		params.icp_opmode = IEEE80211_M_HOSTAP;
 	else if (iseq(arg, "wds"))
 		params.icp_opmode = IEEE80211_M_WDS;
 	else if (iseq(arg, "monitor"))
 		params.icp_opmode = IEEE80211_M_MONITOR;
 	else if (iseq(arg, "tdma")) {
 		params.icp_opmode = IEEE80211_M_AHDEMO;
 		params.icp_flags |= IEEE80211_CLONE_TDMA;
 	} else if (iseq(arg, "mesh") || iseq(arg, "mp")) /* mesh point */
 		params.icp_opmode = IEEE80211_M_MBSS;
 	else
 		errx(1, "Don't know to create %s for %s", arg, name);
 #undef iseq
 }
 
 static void
 set80211clone_beacons(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	/* NB: inverted sense */
 	if (d)
 		params.icp_flags &= ~IEEE80211_CLONE_NOBEACONS;
 	else
 		params.icp_flags |= IEEE80211_CLONE_NOBEACONS;
 }
 
 static void
 set80211clone_bssid(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	if (d)
 		params.icp_flags |= IEEE80211_CLONE_BSSID;
 	else
 		params.icp_flags &= ~IEEE80211_CLONE_BSSID;
 }
 
 static void
 set80211clone_wdslegacy(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	if (d)
 		params.icp_flags |= IEEE80211_CLONE_WDSLEGACY;
 	else
 		params.icp_flags &= ~IEEE80211_CLONE_WDSLEGACY;
 }
 
 static struct cmd ieee80211_cmds[] = {
 	DEF_CMD_ARG("ssid",		set80211ssid),
 	DEF_CMD_ARG("nwid",		set80211ssid),
 	DEF_CMD_ARG("meshid",		set80211meshid),
 	DEF_CMD_ARG("stationname",	set80211stationname),
 	DEF_CMD_ARG("station",		set80211stationname),	/* BSD/OS */
 	DEF_CMD_ARG("channel",		set80211channel),
 	DEF_CMD_ARG("authmode",		set80211authmode),
 	DEF_CMD_ARG("powersavemode",	set80211powersavemode),
 	DEF_CMD("powersave",	1,	set80211powersave),
 	DEF_CMD("-powersave",	0,	set80211powersave),
 	DEF_CMD_ARG("powersavesleep", 	set80211powersavesleep),
 	DEF_CMD_ARG("wepmode",		set80211wepmode),
 	DEF_CMD("wep",		1,	set80211wep),
 	DEF_CMD("-wep",		0,	set80211wep),
 	DEF_CMD_ARG("deftxkey",		set80211weptxkey),
 	DEF_CMD_ARG("weptxkey",		set80211weptxkey),
 	DEF_CMD_ARG("wepkey",		set80211wepkey),
 	DEF_CMD_ARG("nwkey",		set80211nwkey),		/* NetBSD */
 	DEF_CMD("-nwkey",	0,	set80211wep),		/* NetBSD */
 	DEF_CMD_ARG("rtsthreshold",	set80211rtsthreshold),
 	DEF_CMD_ARG("protmode",		set80211protmode),
 	DEF_CMD_ARG("txpower",		set80211txpower),
 	DEF_CMD_ARG("roaming",		set80211roaming),
 	DEF_CMD("wme",		1,	set80211wme),
 	DEF_CMD("-wme",		0,	set80211wme),
 	DEF_CMD("wmm",		1,	set80211wme),
 	DEF_CMD("-wmm",		0,	set80211wme),
 	DEF_CMD("hidessid",	1,	set80211hidessid),
 	DEF_CMD("-hidessid",	0,	set80211hidessid),
 	DEF_CMD("apbridge",	1,	set80211apbridge),
 	DEF_CMD("-apbridge",	0,	set80211apbridge),
 	DEF_CMD_ARG("chanlist",		set80211chanlist),
 	DEF_CMD_ARG("bssid",		set80211bssid),
 	DEF_CMD_ARG("ap",		set80211bssid),
 	DEF_CMD("scan",	0,		set80211scan),
 	DEF_CMD_ARG("list",		set80211list),
 	DEF_CMD_ARG2("cwmin",		set80211cwmin),
 	DEF_CMD_ARG2("cwmax",		set80211cwmax),
 	DEF_CMD_ARG2("aifs",		set80211aifs),
 	DEF_CMD_ARG2("txoplimit",	set80211txoplimit),
 	DEF_CMD_ARG("acm",		set80211acm),
 	DEF_CMD_ARG("-acm",		set80211noacm),
 	DEF_CMD_ARG("ack",		set80211ackpolicy),
 	DEF_CMD_ARG("-ack",		set80211noackpolicy),
 	DEF_CMD_ARG2("bss:cwmin",	set80211bsscwmin),
 	DEF_CMD_ARG2("bss:cwmax",	set80211bsscwmax),
 	DEF_CMD_ARG2("bss:aifs",	set80211bssaifs),
 	DEF_CMD_ARG2("bss:txoplimit",	set80211bsstxoplimit),
 	DEF_CMD_ARG("dtimperiod",	set80211dtimperiod),
 	DEF_CMD_ARG("bintval",		set80211bintval),
 	DEF_CMD("mac:open",	IEEE80211_MACCMD_POLICY_OPEN,	set80211maccmd),
 	DEF_CMD("mac:allow",	IEEE80211_MACCMD_POLICY_ALLOW,	set80211maccmd),
 	DEF_CMD("mac:deny",	IEEE80211_MACCMD_POLICY_DENY,	set80211maccmd),
 	DEF_CMD("mac:radius",	IEEE80211_MACCMD_POLICY_RADIUS,	set80211maccmd),
 	DEF_CMD("mac:flush",	IEEE80211_MACCMD_FLUSH,		set80211maccmd),
 	DEF_CMD("mac:detach",	IEEE80211_MACCMD_DETACH,	set80211maccmd),
 	DEF_CMD_ARG("mac:add",		set80211addmac),
 	DEF_CMD_ARG("mac:del",		set80211delmac),
 	DEF_CMD_ARG("mac:kick",		set80211kickmac),
 	DEF_CMD("pureg",	1,	set80211pureg),
 	DEF_CMD("-pureg",	0,	set80211pureg),
 	DEF_CMD("ff",		1,	set80211fastframes),
 	DEF_CMD("-ff",		0,	set80211fastframes),
 	DEF_CMD("dturbo",	1,	set80211dturbo),
 	DEF_CMD("-dturbo",	0,	set80211dturbo),
 	DEF_CMD("bgscan",	1,	set80211bgscan),
 	DEF_CMD("-bgscan",	0,	set80211bgscan),
 	DEF_CMD_ARG("bgscanidle",	set80211bgscanidle),
 	DEF_CMD_ARG("bgscanintvl",	set80211bgscanintvl),
 	DEF_CMD_ARG("scanvalid",	set80211scanvalid),
 	DEF_CMD("quiet",        1,      set80211quiet),
 	DEF_CMD("-quiet",       0,      set80211quiet),
 	DEF_CMD_ARG("quiet_count",      set80211quietcount),
 	DEF_CMD_ARG("quiet_period",     set80211quietperiod),
 	DEF_CMD_ARG("quiet_dur",        set80211quietduration),
 	DEF_CMD_ARG("quiet_offset",     set80211quietoffset),
 	DEF_CMD_ARG("roam:rssi",	set80211roamrssi),
 	DEF_CMD_ARG("roam:rate",	set80211roamrate),
 	DEF_CMD_ARG("mcastrate",	set80211mcastrate),
 	DEF_CMD_ARG("ucastrate",	set80211ucastrate),
 	DEF_CMD_ARG("mgtrate",		set80211mgtrate),
 	DEF_CMD_ARG("mgmtrate",		set80211mgtrate),
 	DEF_CMD_ARG("maxretry",		set80211maxretry),
 	DEF_CMD_ARG("fragthreshold",	set80211fragthreshold),
 	DEF_CMD("burst",	1,	set80211burst),
 	DEF_CMD("-burst",	0,	set80211burst),
 	DEF_CMD_ARG("bmiss",		set80211bmissthreshold),
 	DEF_CMD_ARG("bmissthreshold",	set80211bmissthreshold),
 	DEF_CMD("shortgi",	1,	set80211shortgi),
 	DEF_CMD("-shortgi",	0,	set80211shortgi),
 	DEF_CMD("ampdurx",	2,	set80211ampdu),
 	DEF_CMD("-ampdurx",	-2,	set80211ampdu),
 	DEF_CMD("ampdutx",	1,	set80211ampdu),
 	DEF_CMD("-ampdutx",	-1,	set80211ampdu),
 	DEF_CMD("ampdu",	3,	set80211ampdu),		/* NB: tx+rx */
 	DEF_CMD("-ampdu",	-3,	set80211ampdu),
 	DEF_CMD_ARG("ampdulimit",	set80211ampdulimit),
 	DEF_CMD_ARG("ampdudensity",	set80211ampdudensity),
 	DEF_CMD("amsdurx",	2,	set80211amsdu),
 	DEF_CMD("-amsdurx",	-2,	set80211amsdu),
 	DEF_CMD("amsdutx",	1,	set80211amsdu),
 	DEF_CMD("-amsdutx",	-1,	set80211amsdu),
 	DEF_CMD("amsdu",	3,	set80211amsdu),		/* NB: tx+rx */
 	DEF_CMD("-amsdu",	-3,	set80211amsdu),
 	DEF_CMD_ARG("amsdulimit",	set80211amsdulimit),
 	DEF_CMD("stbcrx",	2,	set80211stbc),
 	DEF_CMD("-stbcrx",	-2,	set80211stbc),
 	DEF_CMD("stbctx",	1,	set80211stbc),
 	DEF_CMD("-stbctx",	-1,	set80211stbc),
 	DEF_CMD("stbc",		3,	set80211stbc),		/* NB: tx+rx */
 	DEF_CMD("-ampdu",	-3,	set80211stbc),
 	DEF_CMD("puren",	1,	set80211puren),
 	DEF_CMD("-puren",	0,	set80211puren),
 	DEF_CMD("doth",		1,	set80211doth),
 	DEF_CMD("-doth",	0,	set80211doth),
 	DEF_CMD("dfs",		1,	set80211dfs),
 	DEF_CMD("-dfs",		0,	set80211dfs),
 	DEF_CMD("htcompat",	1,	set80211htcompat),
 	DEF_CMD("-htcompat",	0,	set80211htcompat),
 	DEF_CMD("dwds",		1,	set80211dwds),
 	DEF_CMD("-dwds",	0,	set80211dwds),
 	DEF_CMD("inact",	1,	set80211inact),
 	DEF_CMD("-inact",	0,	set80211inact),
 	DEF_CMD("tsn",		1,	set80211tsn),
 	DEF_CMD("-tsn",		0,	set80211tsn),
 	DEF_CMD_ARG("regdomain",	set80211regdomain),
 	DEF_CMD_ARG("country",		set80211country),
 	DEF_CMD("indoor",	'I',	set80211location),
 	DEF_CMD("-indoor",	'O',	set80211location),
 	DEF_CMD("outdoor",	'O',	set80211location),
 	DEF_CMD("-outdoor",	'I',	set80211location),
 	DEF_CMD("anywhere",	' ',	set80211location),
 	DEF_CMD("ecm",		1,	set80211ecm),
 	DEF_CMD("-ecm",		0,	set80211ecm),
 	DEF_CMD("dotd",		1,	set80211dotd),
 	DEF_CMD("-dotd",	0,	set80211dotd),
 	DEF_CMD_ARG("htprotmode",	set80211htprotmode),
 	DEF_CMD("ht20",		1,	set80211htconf),
 	DEF_CMD("-ht20",	0,	set80211htconf),
 	DEF_CMD("ht40",		3,	set80211htconf),	/* NB: 20+40 */
 	DEF_CMD("-ht40",	0,	set80211htconf),
 	DEF_CMD("ht",		3,	set80211htconf),	/* NB: 20+40 */
 	DEF_CMD("-ht",		0,	set80211htconf),
+	DEF_CMD("vht",		1,	set80211vhtconf),
+	DEF_CMD("-vht",		0,	set80211vhtconf),
+	DEF_CMD("vht40",		2,	set80211vhtconf),
+	DEF_CMD("-vht40",		-2,	set80211vhtconf),
+	DEF_CMD("vht80",		4,	set80211vhtconf),
+	DEF_CMD("-vht80",		-4,	set80211vhtconf),
+	DEF_CMD("vht80p80",		8,	set80211vhtconf),
+	DEF_CMD("-vht80p80",		-8,	set80211vhtconf),
+	DEF_CMD("vht160",		16,	set80211vhtconf),
+	DEF_CMD("-vht160",		-16,	set80211vhtconf),
 	DEF_CMD("rifs",		1,	set80211rifs),
 	DEF_CMD("-rifs",	0,	set80211rifs),
 	DEF_CMD("smps",		IEEE80211_HTCAP_SMPS_ENA,	set80211smps),
 	DEF_CMD("smpsdyn",	IEEE80211_HTCAP_SMPS_DYNAMIC,	set80211smps),
 	DEF_CMD("-smps",	IEEE80211_HTCAP_SMPS_OFF,	set80211smps),
 	/* XXX for testing */
 	DEF_CMD_ARG("chanswitch",	set80211chanswitch),
 
 	DEF_CMD_ARG("tdmaslot",		set80211tdmaslot),
 	DEF_CMD_ARG("tdmaslotcnt",	set80211tdmaslotcnt),
 	DEF_CMD_ARG("tdmaslotlen",	set80211tdmaslotlen),
 	DEF_CMD_ARG("tdmabintval",	set80211tdmabintval),
 
 	DEF_CMD_ARG("meshttl",		set80211meshttl),
 	DEF_CMD("meshforward",	1,	set80211meshforward),
 	DEF_CMD("-meshforward",	0,	set80211meshforward),
 	DEF_CMD("meshgate",	1,	set80211meshgate),
 	DEF_CMD("-meshgate",	0,	set80211meshgate),
 	DEF_CMD("meshpeering",	1,	set80211meshpeering),
 	DEF_CMD("-meshpeering",	0,	set80211meshpeering),
 	DEF_CMD_ARG("meshmetric",	set80211meshmetric),
 	DEF_CMD_ARG("meshpath",		set80211meshpath),
 	DEF_CMD("meshrt:flush",	IEEE80211_MESH_RTCMD_FLUSH,	set80211meshrtcmd),
 	DEF_CMD_ARG("meshrt:add",	set80211addmeshrt),
 	DEF_CMD_ARG("meshrt:del",	set80211delmeshrt),
 	DEF_CMD_ARG("hwmprootmode",	set80211hwmprootmode),
 	DEF_CMD_ARG("hwmpmaxhops",	set80211hwmpmaxhops),
 
 	/* vap cloning support */
 	DEF_CLONE_CMD_ARG("wlanaddr",	set80211clone_wlanaddr),
 	DEF_CLONE_CMD_ARG("wlanbssid",	set80211clone_wlanbssid),
 	DEF_CLONE_CMD_ARG("wlandev",	set80211clone_wlandev),
 	DEF_CLONE_CMD_ARG("wlanmode",	set80211clone_wlanmode),
 	DEF_CLONE_CMD("beacons", 1,	set80211clone_beacons),
 	DEF_CLONE_CMD("-beacons", 0,	set80211clone_beacons),
 	DEF_CLONE_CMD("bssid",	1,	set80211clone_bssid),
 	DEF_CLONE_CMD("-bssid",	0,	set80211clone_bssid),
 	DEF_CLONE_CMD("wdslegacy", 1,	set80211clone_wdslegacy),
 	DEF_CLONE_CMD("-wdslegacy", 0,	set80211clone_wdslegacy),
 };
 static struct afswtch af_ieee80211 = {
 	.af_name	= "af_ieee80211",
 	.af_af		= AF_UNSPEC,
 	.af_other_status = ieee80211_status,
 };
 
 static __constructor void
 ieee80211_ctor(void)
 {
 	int i;
 
 	for (i = 0; i < nitems(ieee80211_cmds);  i++)
 		cmd_register(&ieee80211_cmds[i]);
 	af_register(&af_ieee80211);
 	clone_setdefcallback("wlan", wlan_create);
 }
Index: projects/bsnmp-ipv6-mib/secure/usr.sbin/sshd/Makefile
===================================================================
--- projects/bsnmp-ipv6-mib/secure/usr.sbin/sshd/Makefile	(revision 311636)
+++ projects/bsnmp-ipv6-mib/secure/usr.sbin/sshd/Makefile	(revision 311637)
@@ -1,64 +1,69 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG=	sshd
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	audit.c audit-bsm.c audit-linux.c platform.c \
 	sshpty.c sshlogin.c servconf.c serverloop.c \
 	auth.c auth1.c auth2.c auth-options.c session.c \
 	auth-chall.c auth2-chall.c groupaccess.c \
 	auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
 	auth2-none.c auth2-passwd.c auth2-pubkey.c \
 	monitor_mm.c monitor.c monitor_wrap.c auth-krb5.c \
 	auth2-gss.c gss-serv.c gss-serv-krb5.c \
 	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
 	sftp-server.c sftp-common.c \
 	sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \
 	sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c \
 	sandbox-solaris.c
 PACKAGE=	ssh
 
 # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
 SRCS+=	gss-genr.c
 
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 SRCS+=	ssh_namespace.h
 
 # pam should always happen before ssh here for static linking
-LIBADD=	pam ssh util wrap
+LIBADD=	pam ssh util
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
 #DPADD+=	${LIBLDNS}
 #LDADD+=	-lldns
 .endif
 
 .if ${MK_AUDIT} != "no"
 CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR
 LIBADD+=	bsm
 .endif
 
 .if ${MK_BLACKLIST_SUPPORT} != "no"
 CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blacklist/include
 SRCS+=	blacklist.c
 LIBADD+= blacklist
 LDFLAGS+=-L${LIBBLACKLISTDIR}
 .endif
 
 .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
 SRCS+=	krb5_config.h
 LIBADD+=	gssapi_krb5 gssapi krb5
+.endif
+
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DLIBWRAP
+LIBADD+=	wrap
 .endif
 
 LIBADD+=	crypto
 
 .if defined(LOCALBASE)
 CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
 .endif
 
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}
Index: projects/bsnmp-ipv6-mib/sys/dev/cxgbe/tom/t4_connect.c
===================================================================
--- projects/bsnmp-ipv6-mib/sys/dev/cxgbe/tom/t4_connect.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/dev/cxgbe/tom/t4_connect.c	(revision 311637)
@@ -1,482 +1,485 @@
 /*-
  * Copyright (c) 2012 Chelsio Communications, Inc.
  * All rights reserved.
  * Written by: Navdeep Parhar <np@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
 
 #ifdef TCP_OFFLOAD
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/module.h>
 #include <sys/protosw.h>
 #include <sys/domain.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip.h>
 #define TCPSTATES
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_var.h>
 #include <netinet/toecore.h>
 
 #include "common/common.h"
 #include "common/t4_msg.h"
 #include "common/t4_regs.h"
 #include "common/t4_regs_values.h"
 #include "tom/t4_tom_l2t.h"
 #include "tom/t4_tom.h"
 
 /* atid services */
 static int alloc_atid(struct adapter *, void *);
 static void *lookup_atid(struct adapter *, int);
 static void free_atid(struct adapter *, int);
 
 static int
 alloc_atid(struct adapter *sc, void *ctx)
 {
 	struct tid_info *t = &sc->tids;
 	int atid = -1;
 
 	mtx_lock(&t->atid_lock);
 	if (t->afree) {
 		union aopen_entry *p = t->afree;
 
 		atid = p - t->atid_tab;
 		t->afree = p->next;
 		p->data = ctx;
 		t->atids_in_use++;
 	}
 	mtx_unlock(&t->atid_lock);
 	return (atid);
 }
 
 static void *
 lookup_atid(struct adapter *sc, int atid)
 {
 	struct tid_info *t = &sc->tids;
 
 	return (t->atid_tab[atid].data);
 }
 
 static void
 free_atid(struct adapter *sc, int atid)
 {
 	struct tid_info *t = &sc->tids;
 	union aopen_entry *p = &t->atid_tab[atid];
 
 	mtx_lock(&t->atid_lock);
 	p->next = t->afree;
 	t->afree = p;
 	t->atids_in_use--;
 	mtx_unlock(&t->atid_lock);
 }
 
 /*
- * Active open failed.
+ * Active open succeeded.
  */
 static int
 do_act_establish(struct sge_iq *iq, const struct rss_header *rss,
     struct mbuf *m)
 {
 	struct adapter *sc = iq->adapter;
 	const struct cpl_act_establish *cpl = (const void *)(rss + 1);
 	u_int tid = GET_TID(cpl);
 	u_int atid = G_TID_TID(ntohl(cpl->tos_atid));
 	struct toepcb *toep = lookup_atid(sc, atid);
 	struct inpcb *inp = toep->inp;
 
 	KASSERT(m == NULL, ("%s: wasn't expecting payload", __func__));
 	KASSERT(toep->tid == atid, ("%s: toep tid/atid mismatch", __func__));
 
 	CTR3(KTR_CXGBE, "%s: atid %u, tid %u", __func__, atid, tid);
 	free_atid(sc, atid);
 
 	INP_WLOCK(inp);
 	toep->tid = tid;
 	insert_tid(sc, tid, toep);
 	if (inp->inp_flags & INP_DROPPED) {
 
 		/* socket closed by the kernel before hw told us it connected */
 
 		send_flowc_wr(toep, NULL);
 		send_reset(sc, toep, be32toh(cpl->snd_isn));
 		goto done;
 	}
 
 	make_established(toep, cpl->snd_isn, cpl->rcv_isn, cpl->tcp_opt);
 done:
 	INP_WUNLOCK(inp);
 	return (0);
 }
 
 /*
  * Convert an ACT_OPEN_RPL status to an errno.
  */
 static inline int
 act_open_rpl_status_to_errno(int status)
 {
 
 	switch (status) {
 	case CPL_ERR_CONN_RESET:
 		return (ECONNREFUSED);
 	case CPL_ERR_ARP_MISS:
 		return (EHOSTUNREACH);
 	case CPL_ERR_CONN_TIMEDOUT:
 		return (ETIMEDOUT);
 	case CPL_ERR_TCAM_FULL:
 		return (EAGAIN);
 	case CPL_ERR_CONN_EXIST:
 		log(LOG_ERR, "ACTIVE_OPEN_RPL: 4-tuple in use\n");
 		return (EAGAIN);
 	default:
 		return (EIO);
 	}
 }
 
 void
 act_open_failure_cleanup(struct adapter *sc, u_int atid, u_int status)
 {
 	struct toepcb *toep = lookup_atid(sc, atid);
 	struct inpcb *inp = toep->inp;
 	struct toedev *tod = &toep->td->tod;
 
 	free_atid(sc, atid);
 	toep->tid = -1;
 
 	if (status != EAGAIN)
 		INP_INFO_RLOCK(&V_tcbinfo);
 	INP_WLOCK(inp);
 	toe_connect_failed(tod, inp, status);
 	final_cpl_received(toep);	/* unlocks inp */
 	if (status != EAGAIN)
 		INP_INFO_RUNLOCK(&V_tcbinfo);
 }
 
+/*
+ * Active open failed.
+ */
 static int
 do_act_open_rpl(struct sge_iq *iq, const struct rss_header *rss,
     struct mbuf *m)
 {
 	struct adapter *sc = iq->adapter;
 	const struct cpl_act_open_rpl *cpl = (const void *)(rss + 1);
 	u_int atid = G_TID_TID(G_AOPEN_ATID(be32toh(cpl->atid_status)));
 	u_int status = G_AOPEN_STATUS(be32toh(cpl->atid_status));
 	struct toepcb *toep = lookup_atid(sc, atid);
 	int rc;
 
 	KASSERT(m == NULL, ("%s: wasn't expecting payload", __func__));
 	KASSERT(toep->tid == atid, ("%s: toep tid/atid mismatch", __func__));
 
 	CTR3(KTR_CXGBE, "%s: atid %u, status %u ", __func__, atid, status);
 
 	/* Ignore negative advice */
 	if (negative_advice(status))
 		return (0);
 
 	if (status && act_open_has_tid(status))
 		release_tid(sc, GET_TID(cpl), toep->ctrlq);
 
 	rc = act_open_rpl_status_to_errno(status);
 	act_open_failure_cleanup(sc, atid, rc);
 
 	return (0);
 }
 
 /*
  * Options2 for active open.
  */
 static uint32_t
 calc_opt2a(struct socket *so, struct toepcb *toep)
 {
 	struct tcpcb *tp = so_sototcpcb(so);
 	struct port_info *pi = toep->vi->pi;
 	struct adapter *sc = pi->adapter;
 	uint32_t opt2;
 
 	opt2 = V_TX_QUEUE(sc->params.tp.tx_modq[pi->tx_chan]) |
 	    F_RSS_QUEUE_VALID | V_RSS_QUEUE(toep->ofld_rxq->iq.abs_id);
 
 	if (tp->t_flags & TF_SACK_PERMIT)
 		opt2 |= F_SACK_EN;
 
 	if (tp->t_flags & TF_REQ_TSTMP)
 		opt2 |= F_TSTAMPS_EN;
 
 	if (tp->t_flags & TF_REQ_SCALE)
 		opt2 |= F_WND_SCALE_EN;
 
 	if (V_tcp_do_ecn)
 		opt2 |= F_CCTRL_ECN;
 
 	/* RX_COALESCE is always a valid value (M_RX_COALESCE). */
 	if (is_t4(sc))
 		opt2 |= F_RX_COALESCE_VALID;
 	else {
 		opt2 |= F_T5_OPT_2_VALID;
 		opt2 |= F_T5_ISS;
 	}
 	if (sc->tt.rx_coalesce)
 		opt2 |= V_RX_COALESCE(M_RX_COALESCE);
 
 #ifdef USE_DDP_RX_FLOW_CONTROL
 	if (toep->ulp_mode == ULP_MODE_TCPDDP)
 		opt2 |= F_RX_FC_VALID | F_RX_FC_DDP;
 #endif
 
 	return (htobe32(opt2));
 }
 
 void
 t4_init_connect_cpl_handlers(void)
 {
 
 	t4_register_cpl_handler(CPL_ACT_ESTABLISH, do_act_establish);
 	t4_register_cpl_handler(CPL_ACT_OPEN_RPL, do_act_open_rpl);
 }
 
 #define DONT_OFFLOAD_ACTIVE_OPEN(x)	do { \
 	reason = __LINE__; \
 	rc = (x); \
 	goto failed; \
 } while (0)
 
 static inline int
 act_open_cpl_size(struct adapter *sc, int isipv6)
 {
 	int idx;
 	static const int sz_table[3][2] = {
 		{
 			sizeof (struct cpl_act_open_req),
 			sizeof (struct cpl_act_open_req6)
 		},
 		{
 			sizeof (struct cpl_t5_act_open_req),
 			sizeof (struct cpl_t5_act_open_req6)
 		},
 		{
 			sizeof (struct cpl_t6_act_open_req),
 			sizeof (struct cpl_t6_act_open_req6)
 		},
 	};
 
 	MPASS(chip_id(sc) >= CHELSIO_T4);
 	idx = min(chip_id(sc) - CHELSIO_T4, 2);
 
 	return (sz_table[idx][!!isipv6]);
 }
 
 /*
  * active open (soconnect).
  *
  * State of affairs on entry:
  * soisconnecting (so_state |= SS_ISCONNECTING)
  * tcbinfo not locked (This has changed - used to be WLOCKed)
  * inp WLOCKed
  * tp->t_state = TCPS_SYN_SENT
  * rtalloc1, RT_UNLOCK on rt.
  */
 int
 t4_connect(struct toedev *tod, struct socket *so, struct rtentry *rt,
     struct sockaddr *nam)
 {
 	struct adapter *sc = tod->tod_softc;
 	struct tom_data *td = tod_td(tod);
 	struct toepcb *toep = NULL;
 	struct wrqe *wr = NULL;
 	struct ifnet *rt_ifp = rt->rt_ifp;
 	struct vi_info *vi;
 	int mtu_idx, rscale, qid_atid, rc, isipv6;
 	struct inpcb *inp = sotoinpcb(so);
 	struct tcpcb *tp = intotcpcb(inp);
 	int reason;
 
 	INP_WLOCK_ASSERT(inp);
 	KASSERT(nam->sa_family == AF_INET || nam->sa_family == AF_INET6,
 	    ("%s: dest addr %p has family %u", __func__, nam, nam->sa_family));
 
 	if (rt_ifp->if_type == IFT_ETHER)
 		vi = rt_ifp->if_softc;
 	else if (rt_ifp->if_type == IFT_L2VLAN) {
 		struct ifnet *ifp = VLAN_COOKIE(rt_ifp);
 
 		vi = ifp->if_softc;
 	} else if (rt_ifp->if_type == IFT_IEEE8023ADLAG)
 		DONT_OFFLOAD_ACTIVE_OPEN(ENOSYS); /* XXX: implement lagg+TOE */
 	else
 		DONT_OFFLOAD_ACTIVE_OPEN(ENOTSUP);
 
 	toep = alloc_toepcb(vi, -1, -1, M_NOWAIT | M_ZERO);
 	if (toep == NULL)
 		DONT_OFFLOAD_ACTIVE_OPEN(ENOMEM);
 
 	toep->tid = alloc_atid(sc, toep);
 	if (toep->tid < 0)
 		DONT_OFFLOAD_ACTIVE_OPEN(ENOMEM);
 
 	toep->l2te = t4_l2t_get(vi->pi, rt_ifp,
 	    rt->rt_flags & RTF_GATEWAY ? rt->rt_gateway : nam);
 	if (toep->l2te == NULL)
 		DONT_OFFLOAD_ACTIVE_OPEN(ENOMEM);
 
 	isipv6 = nam->sa_family == AF_INET6;
 	wr = alloc_wrqe(act_open_cpl_size(sc, isipv6), toep->ctrlq);
 	if (wr == NULL)
 		DONT_OFFLOAD_ACTIVE_OPEN(ENOMEM);
 
 	if (sc->tt.ddp && (so->so_options & SO_NO_DDP) == 0)
 		set_tcpddp_ulp_mode(toep);
 	else
 		toep->ulp_mode = ULP_MODE_NONE;
 	SOCKBUF_LOCK(&so->so_rcv);
 	/* opt0 rcv_bufsiz initially, assumes its normal meaning later */
 	toep->rx_credits = min(select_rcv_wnd(so) >> 10, M_RCV_BUFSIZ);
 	SOCKBUF_UNLOCK(&so->so_rcv);
 
 	/*
 	 * The kernel sets request_r_scale based on sb_max whereas we need to
 	 * take hardware's MAX_RCV_WND into account too.  This is normally a
 	 * no-op as MAX_RCV_WND is much larger than the default sb_max.
 	 */
 	if (tp->t_flags & TF_REQ_SCALE)
 		rscale = tp->request_r_scale = select_rcv_wscale();
 	else
 		rscale = 0;
 	mtu_idx = find_best_mtu_idx(sc, &inp->inp_inc, 0);
 	qid_atid = (toep->ofld_rxq->iq.abs_id << 14) | toep->tid;
 
 	if (isipv6) {
 		struct cpl_act_open_req6 *cpl = wrtod(wr);
 		struct cpl_t5_act_open_req6 *cpl5 = (void *)cpl;
 		struct cpl_t6_act_open_req6 *cpl6 = (void *)cpl;
 
 		if ((inp->inp_vflag & INP_IPV6) == 0)
 			DONT_OFFLOAD_ACTIVE_OPEN(ENOTSUP);
 
 		toep->ce = hold_lip(td, &inp->in6p_laddr);
 		if (toep->ce == NULL)
 			DONT_OFFLOAD_ACTIVE_OPEN(ENOENT);
 
 		switch (chip_id(sc)) {
 		case CHELSIO_T4:
 			INIT_TP_WR(cpl, 0);
 			cpl->params = select_ntuple(vi, toep->l2te);
 			break;
 		case CHELSIO_T5:
 			INIT_TP_WR(cpl5, 0);
 			cpl5->iss = htobe32(tp->iss);
 			cpl5->params = select_ntuple(vi, toep->l2te);
 			break;
 		case CHELSIO_T6:
 		default:
 			INIT_TP_WR(cpl6, 0);
 			cpl6->iss = htobe32(tp->iss);
 			cpl6->params = select_ntuple(vi, toep->l2te);
 			break;
 		}
 		OPCODE_TID(cpl) = htobe32(MK_OPCODE_TID(CPL_ACT_OPEN_REQ6,
 		    qid_atid));
 		cpl->local_port = inp->inp_lport;
 		cpl->local_ip_hi = *(uint64_t *)&inp->in6p_laddr.s6_addr[0];
 		cpl->local_ip_lo = *(uint64_t *)&inp->in6p_laddr.s6_addr[8];
 		cpl->peer_port = inp->inp_fport;
 		cpl->peer_ip_hi = *(uint64_t *)&inp->in6p_faddr.s6_addr[0];
 		cpl->peer_ip_lo = *(uint64_t *)&inp->in6p_faddr.s6_addr[8];
 		cpl->opt0 = calc_opt0(so, vi, toep->l2te, mtu_idx, rscale,
 		    toep->rx_credits, toep->ulp_mode);
 		cpl->opt2 = calc_opt2a(so, toep);
 	} else {
 		struct cpl_act_open_req *cpl = wrtod(wr);
 		struct cpl_t5_act_open_req *cpl5 = (void *)cpl;
 		struct cpl_t6_act_open_req *cpl6 = (void *)cpl;
 
 		switch (chip_id(sc)) {
 		case CHELSIO_T4:
 			INIT_TP_WR(cpl, 0);
 			cpl->params = select_ntuple(vi, toep->l2te);
 			break;
 		case CHELSIO_T5:
 			INIT_TP_WR(cpl5, 0);
 			cpl5->iss = htobe32(tp->iss);
 			cpl5->params = select_ntuple(vi, toep->l2te);
 			break;
 		case CHELSIO_T6:
 		default:
 			INIT_TP_WR(cpl6, 0);
 			cpl6->iss = htobe32(tp->iss);
 			cpl6->params = select_ntuple(vi, toep->l2te);
 			break;
 		}
 		OPCODE_TID(cpl) = htobe32(MK_OPCODE_TID(CPL_ACT_OPEN_REQ,
 		    qid_atid));
 		inp_4tuple_get(inp, &cpl->local_ip, &cpl->local_port,
 		    &cpl->peer_ip, &cpl->peer_port);
 		cpl->opt0 = calc_opt0(so, vi, toep->l2te, mtu_idx, rscale,
 		    toep->rx_credits, toep->ulp_mode);
 		cpl->opt2 = calc_opt2a(so, toep);
 	}
 
 	CTR5(KTR_CXGBE, "%s: atid %u (%s), toep %p, inp %p", __func__,
 	    toep->tid, tcpstates[tp->t_state], toep, inp);
 
 	offload_socket(so, toep);
 	rc = t4_l2t_send(sc, wr, toep->l2te);
 	if (rc == 0) {
 		toep->flags |= TPF_CPL_PENDING;
 		return (0);
 	}
 
 	undo_offload_socket(so);
 	reason = __LINE__;
 failed:
 	CTR3(KTR_CXGBE, "%s: not offloading (%d), rc %d", __func__, reason, rc);
 
 	if (wr)
 		free_wrqe(wr);
 
 	if (toep) {
 		if (toep->tid >= 0)
 			free_atid(sc, toep->tid);
 		if (toep->l2te)
 			t4_l2t_release(toep->l2te);
 		if (toep->ce)
 			release_lip(td, toep->ce);
 		free_toepcb(toep);
 	}
 
 	return (rc);
 }
 #endif
Index: projects/bsnmp-ipv6-mib/sys/kern/sys_socket.c
===================================================================
--- projects/bsnmp-ipv6-mib/sys/kern/sys_socket.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/kern/sys_socket.c	(revision 311637)
@@ -1,802 +1,804 @@
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/aio.h>
 #include <sys/domain.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/sigio.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/filio.h>			/* XXX */
 #include <sys/sockio.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/sysproto.h>
 #include <sys/taskqueue.h>
 #include <sys/uio.h>
 #include <sys/ucred.h>
 #include <sys/un.h>
 #include <sys/unpcb.h>
 #include <sys/user.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
 
 #include <security/mac/mac_framework.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_map.h>
 
 static SYSCTL_NODE(_kern_ipc, OID_AUTO, aio, CTLFLAG_RD, NULL,
     "socket AIO stats");
 
 static int empty_results;
 SYSCTL_INT(_kern_ipc_aio, OID_AUTO, empty_results, CTLFLAG_RD, &empty_results,
     0, "socket operation returned EAGAIN");
 
 static int empty_retries;
 SYSCTL_INT(_kern_ipc_aio, OID_AUTO, empty_retries, CTLFLAG_RD, &empty_retries,
     0, "socket operation retries");
 
 static fo_rdwr_t soo_read;
 static fo_rdwr_t soo_write;
 static fo_ioctl_t soo_ioctl;
 static fo_poll_t soo_poll;
 extern fo_kqfilter_t soo_kqfilter;
 static fo_stat_t soo_stat;
 static fo_close_t soo_close;
 static fo_fill_kinfo_t soo_fill_kinfo;
 static fo_aio_queue_t soo_aio_queue;
 
 static void	soo_aio_cancel(struct kaiocb *job);
 
 struct fileops	socketops = {
 	.fo_read = soo_read,
 	.fo_write = soo_write,
 	.fo_truncate = invfo_truncate,
 	.fo_ioctl = soo_ioctl,
 	.fo_poll = soo_poll,
 	.fo_kqfilter = soo_kqfilter,
 	.fo_stat = soo_stat,
 	.fo_close = soo_close,
 	.fo_chmod = invfo_chmod,
 	.fo_chown = invfo_chown,
 	.fo_sendfile = invfo_sendfile,
 	.fo_fill_kinfo = soo_fill_kinfo,
 	.fo_aio_queue = soo_aio_queue,
 	.fo_flags = DFLAG_PASSABLE
 };
 
 static int
 soo_read(struct file *fp, struct uio *uio, struct ucred *active_cred,
     int flags, struct thread *td)
 {
 	struct socket *so = fp->f_data;
 	int error;
 
 #ifdef MAC
 	error = mac_socket_check_receive(active_cred, so);
 	if (error)
 		return (error);
 #endif
 	error = soreceive(so, 0, uio, 0, 0, 0);
 	return (error);
 }
 
 static int
 soo_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
     int flags, struct thread *td)
 {
 	struct socket *so = fp->f_data;
 	int error;
 
 #ifdef MAC
 	error = mac_socket_check_send(active_cred, so);
 	if (error)
 		return (error);
 #endif
 	error = sosend(so, 0, uio, 0, 0, 0, uio->uio_td);
 	if (error == EPIPE && (so->so_options & SO_NOSIGPIPE) == 0) {
 		PROC_LOCK(uio->uio_td->td_proc);
 		tdsignal(uio->uio_td, SIGPIPE);
 		PROC_UNLOCK(uio->uio_td->td_proc);
 	}
 	return (error);
 }
 
 static int
 soo_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred,
     struct thread *td)
 {
 	struct socket *so = fp->f_data;
 	int error = 0;
 
 	switch (cmd) {
 	case FIONBIO:
 		SOCK_LOCK(so);
 		if (*(int *)data)
 			so->so_state |= SS_NBIO;
 		else
 			so->so_state &= ~SS_NBIO;
 		SOCK_UNLOCK(so);
 		break;
 
 	case FIOASYNC:
 		/*
 		 * XXXRW: This code separately acquires SOCK_LOCK(so) and
 		 * SOCKBUF_LOCK(&so->so_rcv) even though they are the same
 		 * mutex to avoid introducing the assumption that they are
 		 * the same.
 		 */
 		if (*(int *)data) {
 			SOCK_LOCK(so);
 			so->so_state |= SS_ASYNC;
 			SOCK_UNLOCK(so);
 			SOCKBUF_LOCK(&so->so_rcv);
 			so->so_rcv.sb_flags |= SB_ASYNC;
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			SOCKBUF_LOCK(&so->so_snd);
 			so->so_snd.sb_flags |= SB_ASYNC;
 			SOCKBUF_UNLOCK(&so->so_snd);
 		} else {
 			SOCK_LOCK(so);
 			so->so_state &= ~SS_ASYNC;
 			SOCK_UNLOCK(so);
 			SOCKBUF_LOCK(&so->so_rcv);
 			so->so_rcv.sb_flags &= ~SB_ASYNC;
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			SOCKBUF_LOCK(&so->so_snd);
 			so->so_snd.sb_flags &= ~SB_ASYNC;
 			SOCKBUF_UNLOCK(&so->so_snd);
 		}
 		break;
 
 	case FIONREAD:
 		/* Unlocked read. */
 		*(int *)data = sbavail(&so->so_rcv);
 		break;
 
 	case FIONWRITE:
 		/* Unlocked read. */
 		*(int *)data = sbavail(&so->so_snd);
 		break;
 
 	case FIONSPACE:
 		/* Unlocked read. */
 		if ((so->so_snd.sb_hiwat < sbused(&so->so_snd)) ||
 		    (so->so_snd.sb_mbmax < so->so_snd.sb_mbcnt))
 			*(int *)data = 0;
 		else
 			*(int *)data = sbspace(&so->so_snd);
 		break;
 
 	case FIOSETOWN:
 		error = fsetown(*(int *)data, &so->so_sigio);
 		break;
 
 	case FIOGETOWN:
 		*(int *)data = fgetown(&so->so_sigio);
 		break;
 
 	case SIOCSPGRP:
 		error = fsetown(-(*(int *)data), &so->so_sigio);
 		break;
 
 	case SIOCGPGRP:
 		*(int *)data = -fgetown(&so->so_sigio);
 		break;
 
 	case SIOCATMARK:
 		/* Unlocked read. */
 		*(int *)data = (so->so_rcv.sb_state & SBS_RCVATMARK) != 0;
 		break;
 	default:
 		/*
 		 * Interface/routing/protocol specific ioctls: interface and
 		 * routing ioctls should have a different entry since a
 		 * socket is unnecessary.
 		 */
 		if (IOCGROUP(cmd) == 'i')
 			error = ifioctl(so, cmd, data, td);
 		else if (IOCGROUP(cmd) == 'r') {
 			CURVNET_SET(so->so_vnet);
 			error = rtioctl_fib(cmd, data, so->so_fibnum);
 			CURVNET_RESTORE();
 		} else {
 			CURVNET_SET(so->so_vnet);
 			error = ((*so->so_proto->pr_usrreqs->pru_control)
 			    (so, cmd, data, 0, td));
 			CURVNET_RESTORE();
 		}
 		break;
 	}
 	return (error);
 }
 
 static int
 soo_poll(struct file *fp, int events, struct ucred *active_cred,
     struct thread *td)
 {
 	struct socket *so = fp->f_data;
 #ifdef MAC
 	int error;
 
 	error = mac_socket_check_poll(active_cred, so);
 	if (error)
 		return (error);
 #endif
 	return (sopoll(so, events, fp->f_cred, td));
 }
 
 static int
 soo_stat(struct file *fp, struct stat *ub, struct ucred *active_cred,
     struct thread *td)
 {
 	struct socket *so = fp->f_data;
 	struct sockbuf *sb;
 #ifdef MAC
 	int error;
 #endif
 
 	bzero((caddr_t)ub, sizeof (*ub));
 	ub->st_mode = S_IFSOCK;
 #ifdef MAC
 	error = mac_socket_check_stat(active_cred, so);
 	if (error)
 		return (error);
 #endif
 	/*
 	 * If SBS_CANTRCVMORE is set, but there's still data left in the
 	 * receive buffer, the socket is still readable.
 	 */
 	sb = &so->so_rcv;
 	SOCKBUF_LOCK(sb);
 	if ((sb->sb_state & SBS_CANTRCVMORE) == 0 || sbavail(sb))
 		ub->st_mode |= S_IRUSR | S_IRGRP | S_IROTH;
 	ub->st_size = sbavail(sb) - sb->sb_ctl;
 	SOCKBUF_UNLOCK(sb);
 
 	sb = &so->so_snd;
 	SOCKBUF_LOCK(sb);
 	if ((sb->sb_state & SBS_CANTSENDMORE) == 0)
 		ub->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
 	SOCKBUF_UNLOCK(sb);
 	ub->st_uid = so->so_cred->cr_uid;
 	ub->st_gid = so->so_cred->cr_gid;
 	return (*so->so_proto->pr_usrreqs->pru_sense)(so, ub);
 }
 
 /*
  * API socket close on file pointer.  We call soclose() to close the socket
  * (including initiating closing protocols).  soclose() will sorele() the
  * file reference but the actual socket will not go away until the socket's
  * ref count hits 0.
  */
 static int
 soo_close(struct file *fp, struct thread *td)
 {
 	int error = 0;
 	struct socket *so;
 
 	so = fp->f_data;
 	fp->f_ops = &badfileops;
 	fp->f_data = NULL;
 
 	if (so)
 		error = soclose(so);
 	return (error);
 }
 
 static int
 soo_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
 {
 	struct sockaddr *sa;
 	struct inpcb *inpcb;
 	struct unpcb *unpcb;
 	struct socket *so;
 	int error;
 
 	kif->kf_type = KF_TYPE_SOCKET;
 	so = fp->f_data;
 	kif->kf_sock_domain = so->so_proto->pr_domain->dom_family;
 	kif->kf_sock_type = so->so_type;
 	kif->kf_sock_protocol = so->so_proto->pr_protocol;
 	kif->kf_un.kf_sock.kf_sock_pcb = (uintptr_t)so->so_pcb;
 	switch (kif->kf_sock_domain) {
 	case AF_INET:
 	case AF_INET6:
 		if (kif->kf_sock_protocol == IPPROTO_TCP) {
 			if (so->so_pcb != NULL) {
 				inpcb = (struct inpcb *)(so->so_pcb);
 				kif->kf_un.kf_sock.kf_sock_inpcb =
 				    (uintptr_t)inpcb->inp_ppcb;
 			}
 		}
 		break;
 	case AF_UNIX:
 		if (so->so_pcb != NULL) {
 			unpcb = (struct unpcb *)(so->so_pcb);
 			if (unpcb->unp_conn) {
 				kif->kf_un.kf_sock.kf_sock_unpconn =
 				    (uintptr_t)unpcb->unp_conn;
 				kif->kf_un.kf_sock.kf_sock_rcv_sb_state =
 				    so->so_rcv.sb_state;
 				kif->kf_un.kf_sock.kf_sock_snd_sb_state =
 				    so->so_snd.sb_state;
 			}
 		}
 		break;
 	}
 	error = so->so_proto->pr_usrreqs->pru_sockaddr(so, &sa);
 	if (error == 0 && sa->sa_len <= sizeof(kif->kf_sa_local)) {
 		bcopy(sa, &kif->kf_sa_local, sa->sa_len);
 		free(sa, M_SONAME);
 	}
 	error = so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa);
 	if (error == 0 && sa->sa_len <= sizeof(kif->kf_sa_peer)) {
 		bcopy(sa, &kif->kf_sa_peer, sa->sa_len);
 		free(sa, M_SONAME);
 	}
 	strncpy(kif->kf_path, so->so_proto->pr_domain->dom_name,
 	    sizeof(kif->kf_path));
 	return (0);	
 }
 
 /*
  * Use the 'backend3' field in AIO jobs to store the amount of data
  * completed by the AIO job so far.
  */
 #define	aio_done	backend3
 
 static STAILQ_HEAD(, task) soaio_jobs;
 static struct mtx soaio_jobs_lock;
 static struct task soaio_kproc_task;
 static int soaio_starting, soaio_idle, soaio_queued;
 static struct unrhdr *soaio_kproc_unr;
 
 static int soaio_max_procs = MAX_AIO_PROCS;
 SYSCTL_INT(_kern_ipc_aio, OID_AUTO, max_procs, CTLFLAG_RW, &soaio_max_procs, 0,
     "Maximum number of kernel processes to use for async socket IO");
 
 static int soaio_num_procs;
 SYSCTL_INT(_kern_ipc_aio, OID_AUTO, num_procs, CTLFLAG_RD, &soaio_num_procs, 0,
     "Number of active kernel processes for async socket IO");
 
 static int soaio_target_procs = TARGET_AIO_PROCS;
 SYSCTL_INT(_kern_ipc_aio, OID_AUTO, target_procs, CTLFLAG_RD,
     &soaio_target_procs, 0,
     "Preferred number of ready kernel processes for async socket IO");
 
 static int soaio_lifetime;
 SYSCTL_INT(_kern_ipc_aio, OID_AUTO, lifetime, CTLFLAG_RW, &soaio_lifetime, 0,
     "Maximum lifetime for idle aiod");
 
 static void
 soaio_kproc_loop(void *arg)
 {
 	struct proc *p;
 	struct vmspace *myvm;
 	struct task *task;
 	int error, id, pending;
 
 	id = (intptr_t)arg;
 
 	/*
 	 * Grab an extra reference on the daemon's vmspace so that it
 	 * doesn't get freed by jobs that switch to a different
 	 * vmspace.
 	 */
 	p = curproc;
 	myvm = vmspace_acquire_ref(p);
 
 	mtx_lock(&soaio_jobs_lock);
 	MPASS(soaio_starting > 0);
 	soaio_starting--;
 	for (;;) {
 		while (!STAILQ_EMPTY(&soaio_jobs)) {
 			task = STAILQ_FIRST(&soaio_jobs);
 			STAILQ_REMOVE_HEAD(&soaio_jobs, ta_link);
 			soaio_queued--;
 			pending = task->ta_pending;
 			task->ta_pending = 0;
 			mtx_unlock(&soaio_jobs_lock);
 
 			task->ta_func(task->ta_context, pending);
 
 			mtx_lock(&soaio_jobs_lock);
 		}
 		MPASS(soaio_queued == 0);
 
 		if (p->p_vmspace != myvm) {
 			mtx_unlock(&soaio_jobs_lock);
 			vmspace_switch_aio(myvm);
 			mtx_lock(&soaio_jobs_lock);
 			continue;
 		}
 
 		soaio_idle++;
 		error = mtx_sleep(&soaio_idle, &soaio_jobs_lock, 0, "-",
 		    soaio_lifetime);
 		soaio_idle--;
 		if (error == EWOULDBLOCK && STAILQ_EMPTY(&soaio_jobs) &&
 		    soaio_num_procs > soaio_target_procs)
 			break;
 	}
 	soaio_num_procs--;
 	mtx_unlock(&soaio_jobs_lock);
 	free_unr(soaio_kproc_unr, id);
 	kproc_exit(0);
 }
 
 static void
 soaio_kproc_create(void *context, int pending)
 {
 	struct proc *p;
 	int error, id;
 
 	mtx_lock(&soaio_jobs_lock);
 	for (;;) {
 		if (soaio_num_procs < soaio_target_procs) {
 			/* Must create */
 		} else if (soaio_num_procs >= soaio_max_procs) {
 			/*
 			 * Hit the limit on kernel processes, don't
 			 * create another one.
 			 */
 			break;
 		} else if (soaio_queued <= soaio_idle + soaio_starting) {
 			/*
 			 * No more AIO jobs waiting for a process to be
 			 * created, so stop.
 			 */
 			break;
 		}
 		soaio_starting++;
 		mtx_unlock(&soaio_jobs_lock);
 
 		id = alloc_unr(soaio_kproc_unr);
 		error = kproc_create(soaio_kproc_loop, (void *)(intptr_t)id,
 		    &p, 0, 0, "soaiod%d", id);
 		if (error != 0) {
 			free_unr(soaio_kproc_unr, id);
 			mtx_lock(&soaio_jobs_lock);
 			soaio_starting--;
 			break;
 		}
 
 		mtx_lock(&soaio_jobs_lock);
 		soaio_num_procs++;
 	}
 	mtx_unlock(&soaio_jobs_lock);
 }
 
 void
 soaio_enqueue(struct task *task)
 {
 
 	mtx_lock(&soaio_jobs_lock);
 	MPASS(task->ta_pending == 0);
 	task->ta_pending++;
 	STAILQ_INSERT_TAIL(&soaio_jobs, task, ta_link);
 	soaio_queued++;
 	if (soaio_queued <= soaio_idle)
 		wakeup_one(&soaio_idle);
 	else if (soaio_num_procs < soaio_max_procs)
 		taskqueue_enqueue(taskqueue_thread, &soaio_kproc_task);
 	mtx_unlock(&soaio_jobs_lock);
 }
 
 static void
 soaio_init(void)
 {
 
 	soaio_lifetime = AIOD_LIFETIME_DEFAULT;
 	STAILQ_INIT(&soaio_jobs);
 	mtx_init(&soaio_jobs_lock, "soaio jobs", NULL, MTX_DEF);
 	soaio_kproc_unr = new_unrhdr(1, INT_MAX, NULL);
 	TASK_INIT(&soaio_kproc_task, 0, soaio_kproc_create, NULL);
 	if (soaio_target_procs > 0)
 		taskqueue_enqueue(taskqueue_thread, &soaio_kproc_task);
 }
 SYSINIT(soaio, SI_SUB_VFS, SI_ORDER_ANY, soaio_init, NULL);
 
 static __inline int
 soaio_ready(struct socket *so, struct sockbuf *sb)
 {
 	return (sb == &so->so_rcv ? soreadable(so) : sowriteable(so));
 }
 
 static void
 soaio_process_job(struct socket *so, struct sockbuf *sb, struct kaiocb *job)
 {
 	struct ucred *td_savedcred;
 	struct thread *td;
 	struct file *fp;
 	struct uio uio;
 	struct iovec iov;
 	size_t cnt, done;
 	long ru_before;
 	int error, flags;
 
 	SOCKBUF_UNLOCK(sb);
 	aio_switch_vmspace(job);
 	td = curthread;
 	fp = job->fd_file;
 retry:
 	td_savedcred = td->td_ucred;
 	td->td_ucred = job->cred;
 
 	done = job->aio_done;
 	cnt = job->uaiocb.aio_nbytes - done;
 	iov.iov_base = (void *)((uintptr_t)job->uaiocb.aio_buf + done);
 	iov.iov_len = cnt;
 	uio.uio_iov = &iov;
 	uio.uio_iovcnt = 1;
 	uio.uio_offset = 0;
 	uio.uio_resid = cnt;
 	uio.uio_segflg = UIO_USERSPACE;
 	uio.uio_td = td;
 	flags = MSG_NBIO;
 
 	/*
 	 * For resource usage accounting, only count a completed request
 	 * as a single message to avoid counting multiple calls to
 	 * sosend/soreceive on a blocking socket.
 	 */
 
 	if (sb == &so->so_rcv) {
 		uio.uio_rw = UIO_READ;
 		ru_before = td->td_ru.ru_msgrcv;
 #ifdef MAC
 		error = mac_socket_check_receive(fp->f_cred, so);
 		if (error == 0)
 
 #endif
 			error = soreceive(so, NULL, &uio, NULL, NULL, &flags);
 		if (td->td_ru.ru_msgrcv != ru_before)
 			job->msgrcv = 1;
 	} else {
+		if (!TAILQ_EMPTY(&sb->sb_aiojobq))
+			flags |= MSG_MORETOCOME;
 		uio.uio_rw = UIO_WRITE;
 		ru_before = td->td_ru.ru_msgsnd;
 #ifdef MAC
 		error = mac_socket_check_send(fp->f_cred, so);
 		if (error == 0)
 #endif
 			error = sosend(so, NULL, &uio, NULL, NULL, flags, td);
 		if (td->td_ru.ru_msgsnd != ru_before)
 			job->msgsnd = 1;
 		if (error == EPIPE && (so->so_options & SO_NOSIGPIPE) == 0) {
 			PROC_LOCK(job->userproc);
 			kern_psignal(job->userproc, SIGPIPE);
 			PROC_UNLOCK(job->userproc);
 		}
 	}
 
 	done += cnt - uio.uio_resid;
 	job->aio_done = done;
 	td->td_ucred = td_savedcred;
 
 	if (error == EWOULDBLOCK) {
 		/*
 		 * The request was either partially completed or not
 		 * completed at all due to racing with a read() or
 		 * write() on the socket.  If the socket is
 		 * non-blocking, return with any partial completion.
 		 * If the socket is blocking or if no progress has
 		 * been made, requeue this request at the head of the
 		 * queue to try again when the socket is ready.
 		 */
 		MPASS(done != job->uaiocb.aio_nbytes);
 		SOCKBUF_LOCK(sb);
 		if (done == 0 || !(so->so_state & SS_NBIO)) {
 			empty_results++;
 			if (soaio_ready(so, sb)) {
 				empty_retries++;
 				SOCKBUF_UNLOCK(sb);
 				goto retry;
 			}
 			
 			if (!aio_set_cancel_function(job, soo_aio_cancel)) {
 				SOCKBUF_UNLOCK(sb);
 				if (done != 0)
 					aio_complete(job, done, 0);
 				else
 					aio_cancel(job);
 				SOCKBUF_LOCK(sb);
 			} else {
 				TAILQ_INSERT_HEAD(&sb->sb_aiojobq, job, list);
 			}
 			return;
 		}
 		SOCKBUF_UNLOCK(sb);
 	}		
 	if (done != 0 && (error == ERESTART || error == EINTR ||
 	    error == EWOULDBLOCK))
 		error = 0;
 	if (error)
 		aio_complete(job, -1, error);
 	else
 		aio_complete(job, done, 0);
 	SOCKBUF_LOCK(sb);
 }
 
 static void
 soaio_process_sb(struct socket *so, struct sockbuf *sb)
 {
 	struct kaiocb *job;
 
 	SOCKBUF_LOCK(sb);
 	while (!TAILQ_EMPTY(&sb->sb_aiojobq) && soaio_ready(so, sb)) {
 		job = TAILQ_FIRST(&sb->sb_aiojobq);
 		TAILQ_REMOVE(&sb->sb_aiojobq, job, list);
 		if (!aio_clear_cancel_function(job))
 			continue;
 
 		soaio_process_job(so, sb, job);
 	}
 
 	/*
 	 * If there are still pending requests, the socket must not be
 	 * ready so set SB_AIO to request a wakeup when the socket
 	 * becomes ready.
 	 */
 	if (!TAILQ_EMPTY(&sb->sb_aiojobq))
 		sb->sb_flags |= SB_AIO;
 	sb->sb_flags &= ~SB_AIO_RUNNING;
 	SOCKBUF_UNLOCK(sb);
 
 	ACCEPT_LOCK();
 	SOCK_LOCK(so);
 	sorele(so);
 }
 
 void
 soaio_rcv(void *context, int pending)
 {
 	struct socket *so;
 
 	so = context;
 	soaio_process_sb(so, &so->so_rcv);
 }
 
 void
 soaio_snd(void *context, int pending)
 {
 	struct socket *so;
 
 	so = context;
 	soaio_process_sb(so, &so->so_snd);
 }
 
 void
 sowakeup_aio(struct socket *so, struct sockbuf *sb)
 {
 
 	SOCKBUF_LOCK_ASSERT(sb);
 	sb->sb_flags &= ~SB_AIO;
 	if (sb->sb_flags & SB_AIO_RUNNING)
 		return;
 	sb->sb_flags |= SB_AIO_RUNNING;
 	if (sb == &so->so_snd)
 		SOCK_LOCK(so);
 	soref(so);
 	if (sb == &so->so_snd)
 		SOCK_UNLOCK(so);
 	soaio_enqueue(&sb->sb_aiotask);
 }
 
 static void
 soo_aio_cancel(struct kaiocb *job)
 {
 	struct socket *so;
 	struct sockbuf *sb;
 	long done;
 	int opcode;
 
 	so = job->fd_file->f_data;
 	opcode = job->uaiocb.aio_lio_opcode;
 	if (opcode == LIO_READ)
 		sb = &so->so_rcv;
 	else {
 		MPASS(opcode == LIO_WRITE);
 		sb = &so->so_snd;
 	}
 
 	SOCKBUF_LOCK(sb);
 	if (!aio_cancel_cleared(job))
 		TAILQ_REMOVE(&sb->sb_aiojobq, job, list);
 	if (TAILQ_EMPTY(&sb->sb_aiojobq))
 		sb->sb_flags &= ~SB_AIO;
 	SOCKBUF_UNLOCK(sb);
 
 	done = job->aio_done;
 	if (done != 0)
 		aio_complete(job, done, 0);
 	else
 		aio_cancel(job);
 }
 
 static int
 soo_aio_queue(struct file *fp, struct kaiocb *job)
 {
 	struct socket *so;
 	struct sockbuf *sb;
 	int error;
 
 	so = fp->f_data;
 	error = (*so->so_proto->pr_usrreqs->pru_aio_queue)(so, job);
 	if (error == 0)
 		return (0);
 
 	switch (job->uaiocb.aio_lio_opcode) {
 	case LIO_READ:
 		sb = &so->so_rcv;
 		break;
 	case LIO_WRITE:
 		sb = &so->so_snd;
 		break;
 	default:
 		return (EINVAL);
 	}
 
 	SOCKBUF_LOCK(sb);
 	if (!aio_set_cancel_function(job, soo_aio_cancel))
 		panic("new job was cancelled");
 	TAILQ_INSERT_TAIL(&sb->sb_aiojobq, job, list);
 	if (!(sb->sb_flags & SB_AIO_RUNNING)) {
 		if (soaio_ready(so, sb))
 			sowakeup_aio(so, sb);
 		else
 			sb->sb_flags |= SB_AIO;
 	}
 	SOCKBUF_UNLOCK(sb);
 	return (0);
 }
Index: projects/bsnmp-ipv6-mib/sys/kern/uipc_socket.c
===================================================================
--- projects/bsnmp-ipv6-mib/sys/kern/uipc_socket.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/kern/uipc_socket.c	(revision 311637)
@@ -1,3728 +1,3730 @@
 /*-
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
  *	The Regents of the University of California.
  * Copyright (c) 2004 The FreeBSD Foundation
  * Copyright (c) 2004-2008 Robert N. M. Watson
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
  */
 
 /*
  * Comments on the socket life cycle:
  *
  * soalloc() sets of socket layer state for a socket, called only by
  * socreate() and sonewconn().  Socket layer private.
  *
  * sodealloc() tears down socket layer state for a socket, called only by
  * sofree() and sonewconn().  Socket layer private.
  *
  * pru_attach() associates protocol layer state with an allocated socket;
  * called only once, may fail, aborting socket allocation.  This is called
  * from socreate() and sonewconn().  Socket layer private.
  *
  * pru_detach() disassociates protocol layer state from an attached socket,
  * and will be called exactly once for sockets in which pru_attach() has
  * been successfully called.  If pru_attach() returned an error,
  * pru_detach() will not be called.  Socket layer private.
  *
  * pru_abort() and pru_close() notify the protocol layer that the last
  * consumer of a socket is starting to tear down the socket, and that the
  * protocol should terminate the connection.  Historically, pru_abort() also
  * detached protocol state from the socket state, but this is no longer the
  * case.
  *
  * socreate() creates a socket and attaches protocol state.  This is a public
  * interface that may be used by socket layer consumers to create new
  * sockets.
  *
  * sonewconn() creates a socket and attaches protocol state.  This is a
  * public interface  that may be used by protocols to create new sockets when
  * a new connection is received and will be available for accept() on a
  * listen socket.
  *
  * soclose() destroys a socket after possibly waiting for it to disconnect.
  * This is a public interface that socket consumers should use to close and
  * release a socket when done with it.
  *
  * soabort() destroys a socket without waiting for it to disconnect (used
  * only for incoming connections that are already partially or fully
  * connected).  This is used internally by the socket layer when clearing
  * listen socket queues (due to overflow or close on the listen socket), but
  * is also a public interface protocols may use to abort connections in
  * their incomplete listen queues should they no longer be required.  Sockets
  * placed in completed connection listen queues should not be aborted for
  * reasons described in the comment above the soclose() implementation.  This
  * is not a general purpose close routine, and except in the specific
  * circumstances described here, should not be used.
  *
  * sofree() will free a socket and its protocol state if all references on
  * the socket have been released, and is the public interface to attempt to
  * free a socket when a reference is removed.  This is a socket layer private
  * interface.
  *
  * NOTE: In addition to socreate() and soclose(), which provide a single
  * socket reference to the consumer to be managed as required, there are two
  * calls to explicitly manage socket references, soref(), and sorele().
  * Currently, these are generally required only when transitioning a socket
  * from a listen queue to a file descriptor, in order to prevent garbage
  * collection of the socket at an untimely moment.  For a number of reasons,
  * these interfaces are not preferred, and should be avoided.
  *
  * NOTE: With regard to VNETs the general rule is that callers do not set
  * curvnet. Exceptions to this rule include soabort(), sodisconnect(),
  * sofree() (and with that sorele(), sotryfree()), as well as sonewconn()
  * and sorflush(), which are usually called from a pre-set VNET context.
  * sopoll() currently does not need a VNET context to be set.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_compat.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/domain.h>
 #include <sys/file.h>			/* for struct knote */
 #include <sys/hhook.h>
 #include <sys/kernel.h>
 #include <sys/khelp.h>
 #include <sys/event.h>
 #include <sys/eventhandler.h>
 #include <sys/poll.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/resourcevar.h>
 #include <net/route.h>
 #include <sys/signalvar.h>
 #include <sys/stat.h>
 #include <sys/sx.h>
 #include <sys/sysctl.h>
 #include <sys/taskqueue.h>
 #include <sys/uio.h>
 #include <sys/jail.h>
 #include <sys/syslog.h>
 #include <netinet/in.h>
 
 #include <net/vnet.h>
 
 #include <security/mac/mac_framework.h>
 
 #include <vm/uma.h>
 
 #ifdef COMPAT_FREEBSD32
 #include <sys/mount.h>
 #include <sys/sysent.h>
 #include <compat/freebsd32/freebsd32.h>
 #endif
 
 static int	soreceive_rcvoob(struct socket *so, struct uio *uio,
 		    int flags);
 
 static void	filt_sordetach(struct knote *kn);
 static int	filt_soread(struct knote *kn, long hint);
 static void	filt_sowdetach(struct knote *kn);
 static int	filt_sowrite(struct knote *kn, long hint);
 static int	filt_solisten(struct knote *kn, long hint);
 static int inline hhook_run_socket(struct socket *so, void *hctx, int32_t h_id);
 fo_kqfilter_t	soo_kqfilter;
 
 static struct filterops solisten_filtops = {
 	.f_isfd = 1,
 	.f_detach = filt_sordetach,
 	.f_event = filt_solisten,
 };
 static struct filterops soread_filtops = {
 	.f_isfd = 1,
 	.f_detach = filt_sordetach,
 	.f_event = filt_soread,
 };
 static struct filterops sowrite_filtops = {
 	.f_isfd = 1,
 	.f_detach = filt_sowdetach,
 	.f_event = filt_sowrite,
 };
 
 so_gen_t	so_gencnt;	/* generation count for sockets */
 
 MALLOC_DEFINE(M_SONAME, "soname", "socket name");
 MALLOC_DEFINE(M_PCB, "pcb", "protocol control block");
 
 #define	VNET_SO_ASSERT(so)						\
 	VNET_ASSERT(curvnet != NULL,					\
 	    ("%s:%d curvnet is NULL, so=%p", __func__, __LINE__, (so)));
 
 VNET_DEFINE(struct hhook_head *, socket_hhh[HHOOK_SOCKET_LAST + 1]);
 #define	V_socket_hhh		VNET(socket_hhh)
 
 /*
  * Limit on the number of connections in the listen queue waiting
  * for accept(2).
  * NB: The original sysctl somaxconn is still available but hidden
  * to prevent confusion about the actual purpose of this number.
  */
 static u_int somaxconn = SOMAXCONN;
 
 static int
 sysctl_somaxconn(SYSCTL_HANDLER_ARGS)
 {
 	int error;
 	int val;
 
 	val = somaxconn;
 	error = sysctl_handle_int(oidp, &val, 0, req);
 	if (error || !req->newptr )
 		return (error);
 
 	/*
 	 * The purpose of the UINT_MAX / 3 limit, is so that the formula
 	 *   3 * so_qlimit / 2
 	 * below, will not overflow.
          */
 
 	if (val < 1 || val > UINT_MAX / 3)
 		return (EINVAL);
 
 	somaxconn = val;
 	return (0);
 }
 SYSCTL_PROC(_kern_ipc, OID_AUTO, soacceptqueue, CTLTYPE_UINT | CTLFLAG_RW,
     0, sizeof(int), sysctl_somaxconn, "I",
     "Maximum listen socket pending connection accept queue size");
 SYSCTL_PROC(_kern_ipc, KIPC_SOMAXCONN, somaxconn,
     CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_SKIP,
     0, sizeof(int), sysctl_somaxconn, "I",
     "Maximum listen socket pending connection accept queue size (compat)");
 
 static int numopensockets;
 SYSCTL_INT(_kern_ipc, OID_AUTO, numopensockets, CTLFLAG_RD,
     &numopensockets, 0, "Number of open sockets");
 
 /*
  * accept_mtx locks down per-socket fields relating to accept queues.  See
  * socketvar.h for an annotation of the protected fields of struct socket.
  */
 struct mtx accept_mtx;
 MTX_SYSINIT(accept_mtx, &accept_mtx, "accept", MTX_DEF);
 
 /*
  * so_global_mtx protects so_gencnt, numopensockets, and the per-socket
  * so_gencnt field.
  */
 static struct mtx so_global_mtx;
 MTX_SYSINIT(so_global_mtx, &so_global_mtx, "so_glabel", MTX_DEF);
 
 /*
  * General IPC sysctl name space, used by sockets and a variety of other IPC
  * types.
  */
 SYSCTL_NODE(_kern, KERN_IPC, ipc, CTLFLAG_RW, 0, "IPC");
 
 /*
  * Initialize the socket subsystem and set up the socket
  * memory allocator.
  */
 static uma_zone_t socket_zone;
 int	maxsockets;
 
 static void
 socket_zone_change(void *tag)
 {
 
 	maxsockets = uma_zone_set_max(socket_zone, maxsockets);
 }
 
 static void
 socket_hhook_register(int subtype)
 {
 	
 	if (hhook_head_register(HHOOK_TYPE_SOCKET, subtype,
 	    &V_socket_hhh[subtype],
 	    HHOOK_NOWAIT|HHOOK_HEADISINVNET) != 0)
 		printf("%s: WARNING: unable to register hook\n", __func__);
 }
 
 static void
 socket_hhook_deregister(int subtype)
 {
 	
 	if (hhook_head_deregister(V_socket_hhh[subtype]) != 0)
 		printf("%s: WARNING: unable to deregister hook\n", __func__);
 }
 
 static void
 socket_init(void *tag)
 {
 
 	socket_zone = uma_zcreate("socket", sizeof(struct socket), NULL, NULL,
 	    NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
 	maxsockets = uma_zone_set_max(socket_zone, maxsockets);
 	uma_zone_set_warning(socket_zone, "kern.ipc.maxsockets limit reached");
 	EVENTHANDLER_REGISTER(maxsockets_change, socket_zone_change, NULL,
 	    EVENTHANDLER_PRI_FIRST);
 }
 SYSINIT(socket, SI_SUB_PROTO_DOMAININIT, SI_ORDER_ANY, socket_init, NULL);
 
 static void
 socket_vnet_init(const void *unused __unused)
 {
 	int i;
 
 	/* We expect a contiguous range */
 	for (i = 0; i <= HHOOK_SOCKET_LAST; i++)
 		socket_hhook_register(i);
 }
 VNET_SYSINIT(socket_vnet_init, SI_SUB_PROTO_DOMAININIT, SI_ORDER_ANY,
     socket_vnet_init, NULL);
 
 static void
 socket_vnet_uninit(const void *unused __unused)
 {
 	int i;
 
 	for (i = 0; i <= HHOOK_SOCKET_LAST; i++)
 		socket_hhook_deregister(i);
 }
 VNET_SYSUNINIT(socket_vnet_uninit, SI_SUB_PROTO_DOMAININIT, SI_ORDER_ANY,
     socket_vnet_uninit, NULL);
 
 /*
  * Initialise maxsockets.  This SYSINIT must be run after
  * tunable_mbinit().
  */
 static void
 init_maxsockets(void *ignored)
 {
 
 	TUNABLE_INT_FETCH("kern.ipc.maxsockets", &maxsockets);
 	maxsockets = imax(maxsockets, maxfiles);
 }
 SYSINIT(param, SI_SUB_TUNABLES, SI_ORDER_ANY, init_maxsockets, NULL);
 
 /*
  * Sysctl to get and set the maximum global sockets limit.  Notify protocols
  * of the change so that they can update their dependent limits as required.
  */
 static int
 sysctl_maxsockets(SYSCTL_HANDLER_ARGS)
 {
 	int error, newmaxsockets;
 
 	newmaxsockets = maxsockets;
 	error = sysctl_handle_int(oidp, &newmaxsockets, 0, req);
 	if (error == 0 && req->newptr) {
 		if (newmaxsockets > maxsockets &&
 		    newmaxsockets <= maxfiles) {
 			maxsockets = newmaxsockets;
 			EVENTHANDLER_INVOKE(maxsockets_change);
 		} else
 			error = EINVAL;
 	}
 	return (error);
 }
 SYSCTL_PROC(_kern_ipc, OID_AUTO, maxsockets, CTLTYPE_INT|CTLFLAG_RW,
     &maxsockets, 0, sysctl_maxsockets, "IU",
     "Maximum number of sockets available");
 
 /*
  * Socket operation routines.  These routines are called by the routines in
  * sys_socket.c or from a system process, and implement the semantics of
  * socket operations by switching out to the protocol specific routines.
  */
 
 /*
  * Get a socket structure from our zone, and initialize it.  Note that it
  * would probably be better to allocate socket and PCB at the same time, but
  * I'm not convinced that all the protocols can be easily modified to do
  * this.
  *
  * soalloc() returns a socket with a ref count of 0.
  */
 static struct socket *
 soalloc(struct vnet *vnet)
 {
 	struct socket *so;
 
 	so = uma_zalloc(socket_zone, M_NOWAIT | M_ZERO);
 	if (so == NULL)
 		return (NULL);
 #ifdef MAC
 	if (mac_socket_init(so, M_NOWAIT) != 0) {
 		uma_zfree(socket_zone, so);
 		return (NULL);
 	}
 #endif
 	if (khelp_init_osd(HELPER_CLASS_SOCKET, &so->osd)) {
 		uma_zfree(socket_zone, so);
 		return (NULL);
 	}
 
 	SOCKBUF_LOCK_INIT(&so->so_snd, "so_snd");
 	SOCKBUF_LOCK_INIT(&so->so_rcv, "so_rcv");
 	sx_init(&so->so_snd.sb_sx, "so_snd_sx");
 	sx_init(&so->so_rcv.sb_sx, "so_rcv_sx");
 	TAILQ_INIT(&so->so_snd.sb_aiojobq);
 	TAILQ_INIT(&so->so_rcv.sb_aiojobq);
 	TASK_INIT(&so->so_snd.sb_aiotask, 0, soaio_snd, so);
 	TASK_INIT(&so->so_rcv.sb_aiotask, 0, soaio_rcv, so);
 #ifdef VIMAGE
 	VNET_ASSERT(vnet != NULL, ("%s:%d vnet is NULL, so=%p",
 	    __func__, __LINE__, so));
 	so->so_vnet = vnet;
 #endif
 	/* We shouldn't need the so_global_mtx */
 	if (hhook_run_socket(so, NULL, HHOOK_SOCKET_CREATE)) {
 		/* Do we need more comprehensive error returns? */
 		uma_zfree(socket_zone, so);
 		return (NULL);
 	}
 	mtx_lock(&so_global_mtx);
 	so->so_gencnt = ++so_gencnt;
 	++numopensockets;
 #ifdef VIMAGE
 	vnet->vnet_sockcnt++;
 #endif
 	mtx_unlock(&so_global_mtx);
 
 	return (so);
 }
 
 /*
  * Free the storage associated with a socket at the socket layer, tear down
  * locks, labels, etc.  All protocol state is assumed already to have been
  * torn down (and possibly never set up) by the caller.
  */
 static void
 sodealloc(struct socket *so)
 {
 
 	KASSERT(so->so_count == 0, ("sodealloc(): so_count %d", so->so_count));
 	KASSERT(so->so_pcb == NULL, ("sodealloc(): so_pcb != NULL"));
 
 	mtx_lock(&so_global_mtx);
 	so->so_gencnt = ++so_gencnt;
 	--numopensockets;	/* Could be below, but faster here. */
 #ifdef VIMAGE
 	VNET_ASSERT(so->so_vnet != NULL, ("%s:%d so_vnet is NULL, so=%p",
 	    __func__, __LINE__, so));
 	so->so_vnet->vnet_sockcnt--;
 #endif
 	mtx_unlock(&so_global_mtx);
 	if (so->so_rcv.sb_hiwat)
 		(void)chgsbsize(so->so_cred->cr_uidinfo,
 		    &so->so_rcv.sb_hiwat, 0, RLIM_INFINITY);
 	if (so->so_snd.sb_hiwat)
 		(void)chgsbsize(so->so_cred->cr_uidinfo,
 		    &so->so_snd.sb_hiwat, 0, RLIM_INFINITY);
 	/* remove accept filter if one is present. */
 	if (so->so_accf != NULL)
 		do_setopt_accept_filter(so, NULL);
 #ifdef MAC
 	mac_socket_destroy(so);
 #endif
 	hhook_run_socket(so, NULL, HHOOK_SOCKET_CLOSE);
 
 	crfree(so->so_cred);
 	khelp_destroy_osd(&so->osd);
 	sx_destroy(&so->so_snd.sb_sx);
 	sx_destroy(&so->so_rcv.sb_sx);
 	SOCKBUF_LOCK_DESTROY(&so->so_snd);
 	SOCKBUF_LOCK_DESTROY(&so->so_rcv);
 	uma_zfree(socket_zone, so);
 }
 
 /*
  * socreate returns a socket with a ref count of 1.  The socket should be
  * closed with soclose().
  */
 int
 socreate(int dom, struct socket **aso, int type, int proto,
     struct ucred *cred, struct thread *td)
 {
 	struct protosw *prp;
 	struct socket *so;
 	int error;
 
 	if (proto)
 		prp = pffindproto(dom, proto, type);
 	else
 		prp = pffindtype(dom, type);
 
 	if (prp == NULL) {
 		/* No support for domain. */
 		if (pffinddomain(dom) == NULL)
 			return (EAFNOSUPPORT);
 		/* No support for socket type. */
 		if (proto == 0 && type != 0)
 			return (EPROTOTYPE);
 		return (EPROTONOSUPPORT);
 	}
 	if (prp->pr_usrreqs->pru_attach == NULL ||
 	    prp->pr_usrreqs->pru_attach == pru_attach_notsupp)
 		return (EPROTONOSUPPORT);
 
 	if (prison_check_af(cred, prp->pr_domain->dom_family) != 0)
 		return (EPROTONOSUPPORT);
 
 	if (prp->pr_type != type)
 		return (EPROTOTYPE);
 	so = soalloc(CRED_TO_VNET(cred));
 	if (so == NULL)
 		return (ENOBUFS);
 
 	TAILQ_INIT(&so->so_incomp);
 	TAILQ_INIT(&so->so_comp);
 	so->so_type = type;
 	so->so_cred = crhold(cred);
 	if ((prp->pr_domain->dom_family == PF_INET) ||
 	    (prp->pr_domain->dom_family == PF_INET6) ||
 	    (prp->pr_domain->dom_family == PF_ROUTE))
 		so->so_fibnum = td->td_proc->p_fibnum;
 	else
 		so->so_fibnum = 0;
 	so->so_proto = prp;
 #ifdef MAC
 	mac_socket_create(cred, so);
 #endif
 	knlist_init_mtx(&so->so_rcv.sb_sel.si_note, SOCKBUF_MTX(&so->so_rcv));
 	knlist_init_mtx(&so->so_snd.sb_sel.si_note, SOCKBUF_MTX(&so->so_snd));
 	so->so_count = 1;
 	/*
 	 * Auto-sizing of socket buffers is managed by the protocols and
 	 * the appropriate flags must be set in the pru_attach function.
 	 */
 	CURVNET_SET(so->so_vnet);
 	error = (*prp->pr_usrreqs->pru_attach)(so, proto, td);
 	CURVNET_RESTORE();
 	if (error) {
 		KASSERT(so->so_count == 1, ("socreate: so_count %d",
 		    so->so_count));
 		so->so_count = 0;
 		sodealloc(so);
 		return (error);
 	}
 	*aso = so;
 	return (0);
 }
 
 #ifdef REGRESSION
 static int regression_sonewconn_earlytest = 1;
 SYSCTL_INT(_regression, OID_AUTO, sonewconn_earlytest, CTLFLAG_RW,
     &regression_sonewconn_earlytest, 0, "Perform early sonewconn limit test");
 #endif
 
 /*
  * When an attempt at a new connection is noted on a socket which accepts
  * connections, sonewconn is called.  If the connection is possible (subject
  * to space constraints, etc.) then we allocate a new structure, properly
  * linked into the data structure of the original socket, and return this.
  * Connstatus may be 0, or SS_ISCONFIRMING, or SS_ISCONNECTED.
  *
  * Note: the ref count on the socket is 0 on return.
  */
 struct socket *
 sonewconn(struct socket *head, int connstatus)
 {
 	static struct timeval lastover;
 	static struct timeval overinterval = { 60, 0 };
 	static int overcount;
 
 	struct socket *so;
 	int over;
 
 	ACCEPT_LOCK();
 	over = (head->so_qlen > 3 * head->so_qlimit / 2);
 	ACCEPT_UNLOCK();
 #ifdef REGRESSION
 	if (regression_sonewconn_earlytest && over) {
 #else
 	if (over) {
 #endif
 		overcount++;
 
 		if (ratecheck(&lastover, &overinterval)) {
 			log(LOG_DEBUG, "%s: pcb %p: Listen queue overflow: "
 			    "%i already in queue awaiting acceptance "
 			    "(%d occurrences)\n",
 			    __func__, head->so_pcb, head->so_qlen, overcount);
 
 			overcount = 0;
 		}
 
 		return (NULL);
 	}
 	VNET_ASSERT(head->so_vnet != NULL, ("%s:%d so_vnet is NULL, head=%p",
 	    __func__, __LINE__, head));
 	so = soalloc(head->so_vnet);
 	if (so == NULL) {
 		log(LOG_DEBUG, "%s: pcb %p: New socket allocation failure: "
 		    "limit reached or out of memory\n",
 		    __func__, head->so_pcb);
 		return (NULL);
 	}
 	if ((head->so_options & SO_ACCEPTFILTER) != 0)
 		connstatus = 0;
 	so->so_head = head;
 	so->so_type = head->so_type;
 	so->so_options = head->so_options &~ SO_ACCEPTCONN;
 	so->so_linger = head->so_linger;
 	so->so_state = head->so_state | SS_NOFDREF;
 	so->so_fibnum = head->so_fibnum;
 	so->so_proto = head->so_proto;
 	so->so_cred = crhold(head->so_cred);
 #ifdef MAC
 	mac_socket_newconn(head, so);
 #endif
 	knlist_init_mtx(&so->so_rcv.sb_sel.si_note, SOCKBUF_MTX(&so->so_rcv));
 	knlist_init_mtx(&so->so_snd.sb_sel.si_note, SOCKBUF_MTX(&so->so_snd));
 	VNET_SO_ASSERT(head);
 	if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat)) {
 		sodealloc(so);
 		log(LOG_DEBUG, "%s: pcb %p: soreserve() failed\n",
 		    __func__, head->so_pcb);
 		return (NULL);
 	}
 	if ((*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) {
 		sodealloc(so);
 		log(LOG_DEBUG, "%s: pcb %p: pru_attach() failed\n",
 		    __func__, head->so_pcb);
 		return (NULL);
 	}
 	so->so_rcv.sb_lowat = head->so_rcv.sb_lowat;
 	so->so_snd.sb_lowat = head->so_snd.sb_lowat;
 	so->so_rcv.sb_timeo = head->so_rcv.sb_timeo;
 	so->so_snd.sb_timeo = head->so_snd.sb_timeo;
 	so->so_rcv.sb_flags |= head->so_rcv.sb_flags & SB_AUTOSIZE;
 	so->so_snd.sb_flags |= head->so_snd.sb_flags & SB_AUTOSIZE;
 	so->so_state |= connstatus;
 	ACCEPT_LOCK();
 	/*
 	 * The accept socket may be tearing down but we just
 	 * won a race on the ACCEPT_LOCK.
 	 * However, if sctp_peeloff() is called on a 1-to-many
 	 * style socket, the SO_ACCEPTCONN doesn't need to be set.
 	 */
 	if (!(head->so_options & SO_ACCEPTCONN) &&
 	    ((head->so_proto->pr_protocol != IPPROTO_SCTP) ||
 	     (head->so_type != SOCK_SEQPACKET))) {
 		SOCK_LOCK(so);
 		so->so_head = NULL;
 		sofree(so);		/* NB: returns ACCEPT_UNLOCK'ed. */
 		return (NULL);
 	}
 	if (connstatus) {
 		TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
 		so->so_qstate |= SQ_COMP;
 		head->so_qlen++;
 	} else {
 		/*
 		 * Keep removing sockets from the head until there's room for
 		 * us to insert on the tail.  In pre-locking revisions, this
 		 * was a simple if(), but as we could be racing with other
 		 * threads and soabort() requires dropping locks, we must
 		 * loop waiting for the condition to be true.
 		 */
 		while (head->so_incqlen > head->so_qlimit) {
 			struct socket *sp;
 			sp = TAILQ_FIRST(&head->so_incomp);
 			TAILQ_REMOVE(&head->so_incomp, sp, so_list);
 			head->so_incqlen--;
 			sp->so_qstate &= ~SQ_INCOMP;
 			sp->so_head = NULL;
 			ACCEPT_UNLOCK();
 			soabort(sp);
 			ACCEPT_LOCK();
 		}
 		TAILQ_INSERT_TAIL(&head->so_incomp, so, so_list);
 		so->so_qstate |= SQ_INCOMP;
 		head->so_incqlen++;
 	}
 	ACCEPT_UNLOCK();
 	if (connstatus) {
 		sorwakeup(head);
 		wakeup_one(&head->so_timeo);
 	}
 	return (so);
 }
 
 int
 sobind(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	int error;
 
 	CURVNET_SET(so->so_vnet);
 	error = (*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td);
 	CURVNET_RESTORE();
 	return (error);
 }
 
 int
 sobindat(int fd, struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	int error;
 
 	CURVNET_SET(so->so_vnet);
 	error = (*so->so_proto->pr_usrreqs->pru_bindat)(fd, so, nam, td);
 	CURVNET_RESTORE();
 	return (error);
 }
 
 /*
  * solisten() transitions a socket from a non-listening state to a listening
  * state, but can also be used to update the listen queue depth on an
  * existing listen socket.  The protocol will call back into the sockets
  * layer using solisten_proto_check() and solisten_proto() to check and set
  * socket-layer listen state.  Call backs are used so that the protocol can
  * acquire both protocol and socket layer locks in whatever order is required
  * by the protocol.
  *
  * Protocol implementors are advised to hold the socket lock across the
  * socket-layer test and set to avoid races at the socket layer.
  */
 int
 solisten(struct socket *so, int backlog, struct thread *td)
 {
 	int error;
 
 	CURVNET_SET(so->so_vnet);
 	error = (*so->so_proto->pr_usrreqs->pru_listen)(so, backlog, td);
 	CURVNET_RESTORE();
 	return (error);
 }
 
 int
 solisten_proto_check(struct socket *so)
 {
 
 	SOCK_LOCK_ASSERT(so);
 
 	if (so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING |
 	    SS_ISDISCONNECTING))
 		return (EINVAL);
 	return (0);
 }
 
 void
 solisten_proto(struct socket *so, int backlog)
 {
 
 	SOCK_LOCK_ASSERT(so);
 
 	if (backlog < 0 || backlog > somaxconn)
 		backlog = somaxconn;
 	so->so_qlimit = backlog;
 	so->so_options |= SO_ACCEPTCONN;
 }
 
 /*
  * Evaluate the reference count and named references on a socket; if no
  * references remain, free it.  This should be called whenever a reference is
  * released, such as in sorele(), but also when named reference flags are
  * cleared in socket or protocol code.
  *
  * sofree() will free the socket if:
  *
  * - There are no outstanding file descriptor references or related consumers
  *   (so_count == 0).
  *
  * - The socket has been closed by user space, if ever open (SS_NOFDREF).
  *
  * - The protocol does not have an outstanding strong reference on the socket
  *   (SS_PROTOREF).
  *
  * - The socket is not in a completed connection queue, so a process has been
  *   notified that it is present.  If it is removed, the user process may
  *   block in accept() despite select() saying the socket was ready.
  */
 void
 sofree(struct socket *so)
 {
 	struct protosw *pr = so->so_proto;
 	struct socket *head;
 
 	ACCEPT_LOCK_ASSERT();
 	SOCK_LOCK_ASSERT(so);
 
 	if ((so->so_state & SS_NOFDREF) == 0 || so->so_count != 0 ||
 	    (so->so_state & SS_PROTOREF) || (so->so_qstate & SQ_COMP)) {
 		SOCK_UNLOCK(so);
 		ACCEPT_UNLOCK();
 		return;
 	}
 
 	head = so->so_head;
 	if (head != NULL) {
 		KASSERT((so->so_qstate & SQ_COMP) != 0 ||
 		    (so->so_qstate & SQ_INCOMP) != 0,
 		    ("sofree: so_head != NULL, but neither SQ_COMP nor "
 		    "SQ_INCOMP"));
 		KASSERT((so->so_qstate & SQ_COMP) == 0 ||
 		    (so->so_qstate & SQ_INCOMP) == 0,
 		    ("sofree: so->so_qstate is SQ_COMP and also SQ_INCOMP"));
 		TAILQ_REMOVE(&head->so_incomp, so, so_list);
 		head->so_incqlen--;
 		so->so_qstate &= ~SQ_INCOMP;
 		so->so_head = NULL;
 	}
 	KASSERT((so->so_qstate & SQ_COMP) == 0 &&
 	    (so->so_qstate & SQ_INCOMP) == 0,
 	    ("sofree: so_head == NULL, but still SQ_COMP(%d) or SQ_INCOMP(%d)",
 	    so->so_qstate & SQ_COMP, so->so_qstate & SQ_INCOMP));
 	if (so->so_options & SO_ACCEPTCONN) {
 		KASSERT((TAILQ_EMPTY(&so->so_comp)),
 		    ("sofree: so_comp populated"));
 		KASSERT((TAILQ_EMPTY(&so->so_incomp)),
 		    ("sofree: so_incomp populated"));
 	}
 	SOCK_UNLOCK(so);
 	ACCEPT_UNLOCK();
 
 	VNET_SO_ASSERT(so);
 	if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL)
 		(*pr->pr_domain->dom_dispose)(so);
 	if (pr->pr_usrreqs->pru_detach != NULL)
 		(*pr->pr_usrreqs->pru_detach)(so);
 
 	/*
 	 * From this point on, we assume that no other references to this
 	 * socket exist anywhere else in the stack.  Therefore, no locks need
 	 * to be acquired or held.
 	 *
 	 * We used to do a lot of socket buffer and socket locking here, as
 	 * well as invoke sorflush() and perform wakeups.  The direct call to
 	 * dom_dispose() and sbrelease_internal() are an inlining of what was
 	 * necessary from sorflush().
 	 *
 	 * Notice that the socket buffer and kqueue state are torn down
 	 * before calling pru_detach.  This means that protocols shold not
 	 * assume they can perform socket wakeups, etc, in their detach code.
 	 */
 	sbdestroy(&so->so_snd, so);
 	sbdestroy(&so->so_rcv, so);
 	seldrain(&so->so_snd.sb_sel);
 	seldrain(&so->so_rcv.sb_sel);
 	knlist_destroy(&so->so_rcv.sb_sel.si_note);
 	knlist_destroy(&so->so_snd.sb_sel.si_note);
 	sodealloc(so);
 }
 
 /*
  * Close a socket on last file table reference removal.  Initiate disconnect
  * if connected.  Free socket when disconnect complete.
  *
  * This function will sorele() the socket.  Note that soclose() may be called
  * prior to the ref count reaching zero.  The actual socket structure will
  * not be freed until the ref count reaches zero.
  */
 int
 soclose(struct socket *so)
 {
 	int error = 0;
 
 	KASSERT(!(so->so_state & SS_NOFDREF), ("soclose: SS_NOFDREF on enter"));
 
 	CURVNET_SET(so->so_vnet);
 	funsetown(&so->so_sigio);
 	if (so->so_state & SS_ISCONNECTED) {
 		if ((so->so_state & SS_ISDISCONNECTING) == 0) {
 			error = sodisconnect(so);
 			if (error) {
 				if (error == ENOTCONN)
 					error = 0;
 				goto drop;
 			}
 		}
 		if (so->so_options & SO_LINGER) {
 			if ((so->so_state & SS_ISDISCONNECTING) &&
 			    (so->so_state & SS_NBIO))
 				goto drop;
 			while (so->so_state & SS_ISCONNECTED) {
 				error = tsleep(&so->so_timeo,
 				    PSOCK | PCATCH, "soclos",
 				    so->so_linger * hz);
 				if (error)
 					break;
 			}
 		}
 	}
 
 drop:
 	if (so->so_proto->pr_usrreqs->pru_close != NULL)
 		(*so->so_proto->pr_usrreqs->pru_close)(so);
 	ACCEPT_LOCK();
 	if (so->so_options & SO_ACCEPTCONN) {
 		struct socket *sp;
 		/*
 		 * Prevent new additions to the accept queues due
 		 * to ACCEPT_LOCK races while we are draining them.
 		 */
 		so->so_options &= ~SO_ACCEPTCONN;
 		while ((sp = TAILQ_FIRST(&so->so_incomp)) != NULL) {
 			TAILQ_REMOVE(&so->so_incomp, sp, so_list);
 			so->so_incqlen--;
 			sp->so_qstate &= ~SQ_INCOMP;
 			sp->so_head = NULL;
 			ACCEPT_UNLOCK();
 			soabort(sp);
 			ACCEPT_LOCK();
 		}
 		while ((sp = TAILQ_FIRST(&so->so_comp)) != NULL) {
 			TAILQ_REMOVE(&so->so_comp, sp, so_list);
 			so->so_qlen--;
 			sp->so_qstate &= ~SQ_COMP;
 			sp->so_head = NULL;
 			ACCEPT_UNLOCK();
 			soabort(sp);
 			ACCEPT_LOCK();
 		}
 		KASSERT((TAILQ_EMPTY(&so->so_comp)),
 		    ("%s: so_comp populated", __func__));
 		KASSERT((TAILQ_EMPTY(&so->so_incomp)),
 		    ("%s: so_incomp populated", __func__));
 	}
 	SOCK_LOCK(so);
 	KASSERT((so->so_state & SS_NOFDREF) == 0, ("soclose: NOFDREF"));
 	so->so_state |= SS_NOFDREF;
 	sorele(so);			/* NB: Returns with ACCEPT_UNLOCK(). */
 	CURVNET_RESTORE();
 	return (error);
 }
 
 /*
  * soabort() is used to abruptly tear down a connection, such as when a
  * resource limit is reached (listen queue depth exceeded), or if a listen
  * socket is closed while there are sockets waiting to be accepted.
  *
  * This interface is tricky, because it is called on an unreferenced socket,
  * and must be called only by a thread that has actually removed the socket
  * from the listen queue it was on, or races with other threads are risked.
  *
  * This interface will call into the protocol code, so must not be called
  * with any socket locks held.  Protocols do call it while holding their own
  * recursible protocol mutexes, but this is something that should be subject
  * to review in the future.
  */
 void
 soabort(struct socket *so)
 {
 
 	/*
 	 * In as much as is possible, assert that no references to this
 	 * socket are held.  This is not quite the same as asserting that the
 	 * current thread is responsible for arranging for no references, but
 	 * is as close as we can get for now.
 	 */
 	KASSERT(so->so_count == 0, ("soabort: so_count"));
 	KASSERT((so->so_state & SS_PROTOREF) == 0, ("soabort: SS_PROTOREF"));
 	KASSERT(so->so_state & SS_NOFDREF, ("soabort: !SS_NOFDREF"));
 	KASSERT((so->so_state & SQ_COMP) == 0, ("soabort: SQ_COMP"));
 	KASSERT((so->so_state & SQ_INCOMP) == 0, ("soabort: SQ_INCOMP"));
 	VNET_SO_ASSERT(so);
 
 	if (so->so_proto->pr_usrreqs->pru_abort != NULL)
 		(*so->so_proto->pr_usrreqs->pru_abort)(so);
 	ACCEPT_LOCK();
 	SOCK_LOCK(so);
 	sofree(so);
 }
 
 int
 soaccept(struct socket *so, struct sockaddr **nam)
 {
 	int error;
 
 	SOCK_LOCK(so);
 	KASSERT((so->so_state & SS_NOFDREF) != 0, ("soaccept: !NOFDREF"));
 	so->so_state &= ~SS_NOFDREF;
 	SOCK_UNLOCK(so);
 
 	CURVNET_SET(so->so_vnet);
 	error = (*so->so_proto->pr_usrreqs->pru_accept)(so, nam);
 	CURVNET_RESTORE();
 	return (error);
 }
 
 int
 soconnect(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 
 	return (soconnectat(AT_FDCWD, so, nam, td));
 }
 
 int
 soconnectat(int fd, struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	int error;
 
 	if (so->so_options & SO_ACCEPTCONN)
 		return (EOPNOTSUPP);
 
 	CURVNET_SET(so->so_vnet);
 	/*
 	 * If protocol is connection-based, can only connect once.
 	 * Otherwise, if connected, try to disconnect first.  This allows
 	 * user to disconnect by connecting to, e.g., a null address.
 	 */
 	if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING) &&
 	    ((so->so_proto->pr_flags & PR_CONNREQUIRED) ||
 	    (error = sodisconnect(so)))) {
 		error = EISCONN;
 	} else {
 		/*
 		 * Prevent accumulated error from previous connection from
 		 * biting us.
 		 */
 		so->so_error = 0;
 		if (fd == AT_FDCWD) {
 			error = (*so->so_proto->pr_usrreqs->pru_connect)(so,
 			    nam, td);
 		} else {
 			error = (*so->so_proto->pr_usrreqs->pru_connectat)(fd,
 			    so, nam, td);
 		}
 	}
 	CURVNET_RESTORE();
 
 	return (error);
 }
 
 int
 soconnect2(struct socket *so1, struct socket *so2)
 {
 	int error;
 
 	CURVNET_SET(so1->so_vnet);
 	error = (*so1->so_proto->pr_usrreqs->pru_connect2)(so1, so2);
 	CURVNET_RESTORE();
 	return (error);
 }
 
 int
 sodisconnect(struct socket *so)
 {
 	int error;
 
 	if ((so->so_state & SS_ISCONNECTED) == 0)
 		return (ENOTCONN);
 	if (so->so_state & SS_ISDISCONNECTING)
 		return (EALREADY);
 	VNET_SO_ASSERT(so);
 	error = (*so->so_proto->pr_usrreqs->pru_disconnect)(so);
 	return (error);
 }
 
 #define	SBLOCKWAIT(f)	(((f) & MSG_DONTWAIT) ? 0 : SBL_WAIT)
 
 int
 sosend_dgram(struct socket *so, struct sockaddr *addr, struct uio *uio,
     struct mbuf *top, struct mbuf *control, int flags, struct thread *td)
 {
 	long space;
 	ssize_t resid;
 	int clen = 0, error, dontroute;
 
 	KASSERT(so->so_type == SOCK_DGRAM, ("sosend_dgram: !SOCK_DGRAM"));
 	KASSERT(so->so_proto->pr_flags & PR_ATOMIC,
 	    ("sosend_dgram: !PR_ATOMIC"));
 
 	if (uio != NULL)
 		resid = uio->uio_resid;
 	else
 		resid = top->m_pkthdr.len;
 	/*
 	 * In theory resid should be unsigned.  However, space must be
 	 * signed, as it might be less than 0 if we over-committed, and we
 	 * must use a signed comparison of space and resid.  On the other
 	 * hand, a negative resid causes us to loop sending 0-length
 	 * segments to the protocol.
 	 */
 	if (resid < 0) {
 		error = EINVAL;
 		goto out;
 	}
 
 	dontroute =
 	    (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0;
 	if (td != NULL)
 		td->td_ru.ru_msgsnd++;
 	if (control != NULL)
 		clen = control->m_len;
 
 	SOCKBUF_LOCK(&so->so_snd);
 	if (so->so_snd.sb_state & SBS_CANTSENDMORE) {
 		SOCKBUF_UNLOCK(&so->so_snd);
 		error = EPIPE;
 		goto out;
 	}
 	if (so->so_error) {
 		error = so->so_error;
 		so->so_error = 0;
 		SOCKBUF_UNLOCK(&so->so_snd);
 		goto out;
 	}
 	if ((so->so_state & SS_ISCONNECTED) == 0) {
 		/*
 		 * `sendto' and `sendmsg' is allowed on a connection-based
 		 * socket if it supports implied connect.  Return ENOTCONN if
 		 * not connected and no address is supplied.
 		 */
 		if ((so->so_proto->pr_flags & PR_CONNREQUIRED) &&
 		    (so->so_proto->pr_flags & PR_IMPLOPCL) == 0) {
 			if ((so->so_state & SS_ISCONFIRMING) == 0 &&
 			    !(resid == 0 && clen != 0)) {
 				SOCKBUF_UNLOCK(&so->so_snd);
 				error = ENOTCONN;
 				goto out;
 			}
 		} else if (addr == NULL) {
 			if (so->so_proto->pr_flags & PR_CONNREQUIRED)
 				error = ENOTCONN;
 			else
 				error = EDESTADDRREQ;
 			SOCKBUF_UNLOCK(&so->so_snd);
 			goto out;
 		}
 	}
 
 	/*
 	 * Do we need MSG_OOB support in SOCK_DGRAM?  Signs here may be a
 	 * problem and need fixing.
 	 */
 	space = sbspace(&so->so_snd);
 	if (flags & MSG_OOB)
 		space += 1024;
 	space -= clen;
 	SOCKBUF_UNLOCK(&so->so_snd);
 	if (resid > space) {
 		error = EMSGSIZE;
 		goto out;
 	}
 	if (uio == NULL) {
 		resid = 0;
 		if (flags & MSG_EOR)
 			top->m_flags |= M_EOR;
 	} else {
 		/*
 		 * Copy the data from userland into a mbuf chain.
 		 * If no data is to be copied in, a single empty mbuf
 		 * is returned.
 		 */
 		top = m_uiotombuf(uio, M_WAITOK, space, max_hdr,
 		    (M_PKTHDR | ((flags & MSG_EOR) ? M_EOR : 0)));
 		if (top == NULL) {
 			error = EFAULT;	/* only possible error */
 			goto out;
 		}
 		space -= resid - uio->uio_resid;
 		resid = uio->uio_resid;
 	}
 	KASSERT(resid == 0, ("sosend_dgram: resid != 0"));
 	/*
 	 * XXXRW: Frobbing SO_DONTROUTE here is even worse without sblock
 	 * than with.
 	 */
 	if (dontroute) {
 		SOCK_LOCK(so);
 		so->so_options |= SO_DONTROUTE;
 		SOCK_UNLOCK(so);
 	}
 	/*
 	 * XXX all the SBS_CANTSENDMORE checks previously done could be out
 	 * of date.  We could have received a reset packet in an interrupt or
 	 * maybe we slept while doing page faults in uiomove() etc.  We could
 	 * probably recheck again inside the locking protection here, but
 	 * there are probably other places that this also happens.  We must
 	 * rethink this.
 	 */
 	VNET_SO_ASSERT(so);
 	error = (*so->so_proto->pr_usrreqs->pru_send)(so,
 	    (flags & MSG_OOB) ? PRUS_OOB :
 	/*
 	 * If the user set MSG_EOF, the protocol understands this flag and
 	 * nothing left to send then use PRU_SEND_EOF instead of PRU_SEND.
 	 */
 	    ((flags & MSG_EOF) &&
 	     (so->so_proto->pr_flags & PR_IMPLOPCL) &&
 	     (resid <= 0)) ?
 		PRUS_EOF :
 		/* If there is more to send set PRUS_MORETOCOME */
+		(flags & MSG_MORETOCOME) ||
 		(resid > 0 && space > 0) ? PRUS_MORETOCOME : 0,
 		top, addr, control, td);
 	if (dontroute) {
 		SOCK_LOCK(so);
 		so->so_options &= ~SO_DONTROUTE;
 		SOCK_UNLOCK(so);
 	}
 	clen = 0;
 	control = NULL;
 	top = NULL;
 out:
 	if (top != NULL)
 		m_freem(top);
 	if (control != NULL)
 		m_freem(control);
 	return (error);
 }
 
 /*
  * Send on a socket.  If send must go all at once and message is larger than
  * send buffering, then hard error.  Lock against other senders.  If must go
  * all at once and not enough room now, then inform user that this would
  * block and do nothing.  Otherwise, if nonblocking, send as much as
  * possible.  The data to be sent is described by "uio" if nonzero, otherwise
  * by the mbuf chain "top" (which must be null if uio is not).  Data provided
  * in mbuf chain must be small enough to send all at once.
  *
  * Returns nonzero on error, timeout or signal; callers must check for short
  * counts if EINTR/ERESTART are returned.  Data and control buffers are freed
  * on return.
  */
 int
 sosend_generic(struct socket *so, struct sockaddr *addr, struct uio *uio,
     struct mbuf *top, struct mbuf *control, int flags, struct thread *td)
 {
 	long space;
 	ssize_t resid;
 	int clen = 0, error, dontroute;
 	int atomic = sosendallatonce(so) || top;
 
 	if (uio != NULL)
 		resid = uio->uio_resid;
 	else
 		resid = top->m_pkthdr.len;
 	/*
 	 * In theory resid should be unsigned.  However, space must be
 	 * signed, as it might be less than 0 if we over-committed, and we
 	 * must use a signed comparison of space and resid.  On the other
 	 * hand, a negative resid causes us to loop sending 0-length
 	 * segments to the protocol.
 	 *
 	 * Also check to make sure that MSG_EOR isn't used on SOCK_STREAM
 	 * type sockets since that's an error.
 	 */
 	if (resid < 0 || (so->so_type == SOCK_STREAM && (flags & MSG_EOR))) {
 		error = EINVAL;
 		goto out;
 	}
 
 	dontroute =
 	    (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
 	    (so->so_proto->pr_flags & PR_ATOMIC);
 	if (td != NULL)
 		td->td_ru.ru_msgsnd++;
 	if (control != NULL)
 		clen = control->m_len;
 
 	error = sblock(&so->so_snd, SBLOCKWAIT(flags));
 	if (error)
 		goto out;
 
 restart:
 	do {
 		SOCKBUF_LOCK(&so->so_snd);
 		if (so->so_snd.sb_state & SBS_CANTSENDMORE) {
 			SOCKBUF_UNLOCK(&so->so_snd);
 			error = EPIPE;
 			goto release;
 		}
 		if (so->so_error) {
 			error = so->so_error;
 			so->so_error = 0;
 			SOCKBUF_UNLOCK(&so->so_snd);
 			goto release;
 		}
 		if ((so->so_state & SS_ISCONNECTED) == 0) {
 			/*
 			 * `sendto' and `sendmsg' is allowed on a connection-
 			 * based socket if it supports implied connect.
 			 * Return ENOTCONN if not connected and no address is
 			 * supplied.
 			 */
 			if ((so->so_proto->pr_flags & PR_CONNREQUIRED) &&
 			    (so->so_proto->pr_flags & PR_IMPLOPCL) == 0) {
 				if ((so->so_state & SS_ISCONFIRMING) == 0 &&
 				    !(resid == 0 && clen != 0)) {
 					SOCKBUF_UNLOCK(&so->so_snd);
 					error = ENOTCONN;
 					goto release;
 				}
 			} else if (addr == NULL) {
 				SOCKBUF_UNLOCK(&so->so_snd);
 				if (so->so_proto->pr_flags & PR_CONNREQUIRED)
 					error = ENOTCONN;
 				else
 					error = EDESTADDRREQ;
 				goto release;
 			}
 		}
 		space = sbspace(&so->so_snd);
 		if (flags & MSG_OOB)
 			space += 1024;
 		if ((atomic && resid > so->so_snd.sb_hiwat) ||
 		    clen > so->so_snd.sb_hiwat) {
 			SOCKBUF_UNLOCK(&so->so_snd);
 			error = EMSGSIZE;
 			goto release;
 		}
 		if (space < resid + clen &&
 		    (atomic || space < so->so_snd.sb_lowat || space < clen)) {
 			if ((so->so_state & SS_NBIO) || (flags & MSG_NBIO)) {
 				SOCKBUF_UNLOCK(&so->so_snd);
 				error = EWOULDBLOCK;
 				goto release;
 			}
 			error = sbwait(&so->so_snd);
 			SOCKBUF_UNLOCK(&so->so_snd);
 			if (error)
 				goto release;
 			goto restart;
 		}
 		SOCKBUF_UNLOCK(&so->so_snd);
 		space -= clen;
 		do {
 			if (uio == NULL) {
 				resid = 0;
 				if (flags & MSG_EOR)
 					top->m_flags |= M_EOR;
 			} else {
 				/*
 				 * Copy the data from userland into a mbuf
 				 * chain.  If resid is 0, which can happen
 				 * only if we have control to send, then
 				 * a single empty mbuf is returned.  This
 				 * is a workaround to prevent protocol send
 				 * methods to panic.
 				 */
 				top = m_uiotombuf(uio, M_WAITOK, space,
 				    (atomic ? max_hdr : 0),
 				    (atomic ? M_PKTHDR : 0) |
 				    ((flags & MSG_EOR) ? M_EOR : 0));
 				if (top == NULL) {
 					error = EFAULT; /* only possible error */
 					goto release;
 				}
 				space -= resid - uio->uio_resid;
 				resid = uio->uio_resid;
 			}
 			if (dontroute) {
 				SOCK_LOCK(so);
 				so->so_options |= SO_DONTROUTE;
 				SOCK_UNLOCK(so);
 			}
 			/*
 			 * XXX all the SBS_CANTSENDMORE checks previously
 			 * done could be out of date.  We could have received
 			 * a reset packet in an interrupt or maybe we slept
 			 * while doing page faults in uiomove() etc.  We
 			 * could probably recheck again inside the locking
 			 * protection here, but there are probably other
 			 * places that this also happens.  We must rethink
 			 * this.
 			 */
 			VNET_SO_ASSERT(so);
 			error = (*so->so_proto->pr_usrreqs->pru_send)(so,
 			    (flags & MSG_OOB) ? PRUS_OOB :
 			/*
 			 * If the user set MSG_EOF, the protocol understands
 			 * this flag and nothing left to send then use
 			 * PRU_SEND_EOF instead of PRU_SEND.
 			 */
 			    ((flags & MSG_EOF) &&
 			     (so->so_proto->pr_flags & PR_IMPLOPCL) &&
 			     (resid <= 0)) ?
 				PRUS_EOF :
 			/* If there is more to send set PRUS_MORETOCOME. */
+			    (flags & MSG_MORETOCOME) ||
 			    (resid > 0 && space > 0) ? PRUS_MORETOCOME : 0,
 			    top, addr, control, td);
 			if (dontroute) {
 				SOCK_LOCK(so);
 				so->so_options &= ~SO_DONTROUTE;
 				SOCK_UNLOCK(so);
 			}
 			clen = 0;
 			control = NULL;
 			top = NULL;
 			if (error)
 				goto release;
 		} while (resid && space > 0);
 	} while (resid);
 
 release:
 	sbunlock(&so->so_snd);
 out:
 	if (top != NULL)
 		m_freem(top);
 	if (control != NULL)
 		m_freem(control);
 	return (error);
 }
 
 int
 sosend(struct socket *so, struct sockaddr *addr, struct uio *uio,
     struct mbuf *top, struct mbuf *control, int flags, struct thread *td)
 {
 	int error;
 
 	CURVNET_SET(so->so_vnet);
 	error = so->so_proto->pr_usrreqs->pru_sosend(so, addr, uio, top,
 	    control, flags, td);
 	CURVNET_RESTORE();
 	return (error);
 }
 
 /*
  * The part of soreceive() that implements reading non-inline out-of-band
  * data from a socket.  For more complete comments, see soreceive(), from
  * which this code originated.
  *
  * Note that soreceive_rcvoob(), unlike the remainder of soreceive(), is
  * unable to return an mbuf chain to the caller.
  */
 static int
 soreceive_rcvoob(struct socket *so, struct uio *uio, int flags)
 {
 	struct protosw *pr = so->so_proto;
 	struct mbuf *m;
 	int error;
 
 	KASSERT(flags & MSG_OOB, ("soreceive_rcvoob: (flags & MSG_OOB) == 0"));
 	VNET_SO_ASSERT(so);
 
 	m = m_get(M_WAITOK, MT_DATA);
 	error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK);
 	if (error)
 		goto bad;
 	do {
 		error = uiomove(mtod(m, void *),
 		    (int) min(uio->uio_resid, m->m_len), uio);
 		m = m_free(m);
 	} while (uio->uio_resid && error == 0 && m);
 bad:
 	if (m != NULL)
 		m_freem(m);
 	return (error);
 }
 
 /*
  * Following replacement or removal of the first mbuf on the first mbuf chain
  * of a socket buffer, push necessary state changes back into the socket
  * buffer so that other consumers see the values consistently.  'nextrecord'
  * is the callers locally stored value of the original value of
  * sb->sb_mb->m_nextpkt which must be restored when the lead mbuf changes.
  * NOTE: 'nextrecord' may be NULL.
  */
 static __inline void
 sockbuf_pushsync(struct sockbuf *sb, struct mbuf *nextrecord)
 {
 
 	SOCKBUF_LOCK_ASSERT(sb);
 	/*
 	 * First, update for the new value of nextrecord.  If necessary, make
 	 * it the first record.
 	 */
 	if (sb->sb_mb != NULL)
 		sb->sb_mb->m_nextpkt = nextrecord;
 	else
 		sb->sb_mb = nextrecord;
 
 	/*
 	 * Now update any dependent socket buffer fields to reflect the new
 	 * state.  This is an expanded inline of SB_EMPTY_FIXUP(), with the
 	 * addition of a second clause that takes care of the case where
 	 * sb_mb has been updated, but remains the last record.
 	 */
 	if (sb->sb_mb == NULL) {
 		sb->sb_mbtail = NULL;
 		sb->sb_lastrecord = NULL;
 	} else if (sb->sb_mb->m_nextpkt == NULL)
 		sb->sb_lastrecord = sb->sb_mb;
 }
 
 /*
  * Implement receive operations on a socket.  We depend on the way that
  * records are added to the sockbuf by sbappend.  In particular, each record
  * (mbufs linked through m_next) must begin with an address if the protocol
  * so specifies, followed by an optional mbuf or mbufs containing ancillary
  * data, and then zero or more mbufs of data.  In order to allow parallelism
  * between network receive and copying to user space, as well as avoid
  * sleeping with a mutex held, we release the socket buffer mutex during the
  * user space copy.  Although the sockbuf is locked, new data may still be
  * appended, and thus we must maintain consistency of the sockbuf during that
  * time.
  *
  * The caller may receive the data as a single mbuf chain by supplying an
  * mbuf **mp0 for use in returning the chain.  The uio is then used only for
  * the count in uio_resid.
  */
 int
 soreceive_generic(struct socket *so, struct sockaddr **psa, struct uio *uio,
     struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
 {
 	struct mbuf *m, **mp;
 	int flags, error, offset;
 	ssize_t len;
 	struct protosw *pr = so->so_proto;
 	struct mbuf *nextrecord;
 	int moff, type = 0;
 	ssize_t orig_resid = uio->uio_resid;
 
 	mp = mp0;
 	if (psa != NULL)
 		*psa = NULL;
 	if (controlp != NULL)
 		*controlp = NULL;
 	if (flagsp != NULL)
 		flags = *flagsp &~ MSG_EOR;
 	else
 		flags = 0;
 	if (flags & MSG_OOB)
 		return (soreceive_rcvoob(so, uio, flags));
 	if (mp != NULL)
 		*mp = NULL;
 	if ((pr->pr_flags & PR_WANTRCVD) && (so->so_state & SS_ISCONFIRMING)
 	    && uio->uio_resid) {
 		VNET_SO_ASSERT(so);
 		(*pr->pr_usrreqs->pru_rcvd)(so, 0);
 	}
 
 	error = sblock(&so->so_rcv, SBLOCKWAIT(flags));
 	if (error)
 		return (error);
 
 restart:
 	SOCKBUF_LOCK(&so->so_rcv);
 	m = so->so_rcv.sb_mb;
 	/*
 	 * If we have less data than requested, block awaiting more (subject
 	 * to any timeout) if:
 	 *   1. the current count is less than the low water mark, or
 	 *   2. MSG_DONTWAIT is not set
 	 */
 	if (m == NULL || (((flags & MSG_DONTWAIT) == 0 &&
 	    sbavail(&so->so_rcv) < uio->uio_resid) &&
 	    sbavail(&so->so_rcv) < so->so_rcv.sb_lowat &&
 	    m->m_nextpkt == NULL && (pr->pr_flags & PR_ATOMIC) == 0)) {
 		KASSERT(m != NULL || !sbavail(&so->so_rcv),
 		    ("receive: m == %p sbavail == %u",
 		    m, sbavail(&so->so_rcv)));
 		if (so->so_error) {
 			if (m != NULL)
 				goto dontblock;
 			error = so->so_error;
 			if ((flags & MSG_PEEK) == 0)
 				so->so_error = 0;
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			goto release;
 		}
 		SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 		if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
 			if (m == NULL) {
 				SOCKBUF_UNLOCK(&so->so_rcv);
 				goto release;
 			} else
 				goto dontblock;
 		}
 		for (; m != NULL; m = m->m_next)
 			if (m->m_type == MT_OOBDATA  || (m->m_flags & M_EOR)) {
 				m = so->so_rcv.sb_mb;
 				goto dontblock;
 			}
 		if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 &&
 		    (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			error = ENOTCONN;
 			goto release;
 		}
 		if (uio->uio_resid == 0) {
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			goto release;
 		}
 		if ((so->so_state & SS_NBIO) ||
 		    (flags & (MSG_DONTWAIT|MSG_NBIO))) {
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			error = EWOULDBLOCK;
 			goto release;
 		}
 		SBLASTRECORDCHK(&so->so_rcv);
 		SBLASTMBUFCHK(&so->so_rcv);
 		error = sbwait(&so->so_rcv);
 		SOCKBUF_UNLOCK(&so->so_rcv);
 		if (error)
 			goto release;
 		goto restart;
 	}
 dontblock:
 	/*
 	 * From this point onward, we maintain 'nextrecord' as a cache of the
 	 * pointer to the next record in the socket buffer.  We must keep the
 	 * various socket buffer pointers and local stack versions of the
 	 * pointers in sync, pushing out modifications before dropping the
 	 * socket buffer mutex, and re-reading them when picking it up.
 	 *
 	 * Otherwise, we will race with the network stack appending new data
 	 * or records onto the socket buffer by using inconsistent/stale
 	 * versions of the field, possibly resulting in socket buffer
 	 * corruption.
 	 *
 	 * By holding the high-level sblock(), we prevent simultaneous
 	 * readers from pulling off the front of the socket buffer.
 	 */
 	SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 	if (uio->uio_td)
 		uio->uio_td->td_ru.ru_msgrcv++;
 	KASSERT(m == so->so_rcv.sb_mb, ("soreceive: m != so->so_rcv.sb_mb"));
 	SBLASTRECORDCHK(&so->so_rcv);
 	SBLASTMBUFCHK(&so->so_rcv);
 	nextrecord = m->m_nextpkt;
 	if (pr->pr_flags & PR_ADDR) {
 		KASSERT(m->m_type == MT_SONAME,
 		    ("m->m_type == %d", m->m_type));
 		orig_resid = 0;
 		if (psa != NULL)
 			*psa = sodupsockaddr(mtod(m, struct sockaddr *),
 			    M_NOWAIT);
 		if (flags & MSG_PEEK) {
 			m = m->m_next;
 		} else {
 			sbfree(&so->so_rcv, m);
 			so->so_rcv.sb_mb = m_free(m);
 			m = so->so_rcv.sb_mb;
 			sockbuf_pushsync(&so->so_rcv, nextrecord);
 		}
 	}
 
 	/*
 	 * Process one or more MT_CONTROL mbufs present before any data mbufs
 	 * in the first mbuf chain on the socket buffer.  If MSG_PEEK, we
 	 * just copy the data; if !MSG_PEEK, we call into the protocol to
 	 * perform externalization (or freeing if controlp == NULL).
 	 */
 	if (m != NULL && m->m_type == MT_CONTROL) {
 		struct mbuf *cm = NULL, *cmn;
 		struct mbuf **cme = &cm;
 
 		do {
 			if (flags & MSG_PEEK) {
 				if (controlp != NULL) {
 					*controlp = m_copym(m, 0, m->m_len,
 					    M_NOWAIT);
 					controlp = &(*controlp)->m_next;
 				}
 				m = m->m_next;
 			} else {
 				sbfree(&so->so_rcv, m);
 				so->so_rcv.sb_mb = m->m_next;
 				m->m_next = NULL;
 				*cme = m;
 				cme = &(*cme)->m_next;
 				m = so->so_rcv.sb_mb;
 			}
 		} while (m != NULL && m->m_type == MT_CONTROL);
 		if ((flags & MSG_PEEK) == 0)
 			sockbuf_pushsync(&so->so_rcv, nextrecord);
 		while (cm != NULL) {
 			cmn = cm->m_next;
 			cm->m_next = NULL;
 			if (pr->pr_domain->dom_externalize != NULL) {
 				SOCKBUF_UNLOCK(&so->so_rcv);
 				VNET_SO_ASSERT(so);
 				error = (*pr->pr_domain->dom_externalize)
 				    (cm, controlp, flags);
 				SOCKBUF_LOCK(&so->so_rcv);
 			} else if (controlp != NULL)
 				*controlp = cm;
 			else
 				m_freem(cm);
 			if (controlp != NULL) {
 				orig_resid = 0;
 				while (*controlp != NULL)
 					controlp = &(*controlp)->m_next;
 			}
 			cm = cmn;
 		}
 		if (m != NULL)
 			nextrecord = so->so_rcv.sb_mb->m_nextpkt;
 		else
 			nextrecord = so->so_rcv.sb_mb;
 		orig_resid = 0;
 	}
 	if (m != NULL) {
 		if ((flags & MSG_PEEK) == 0) {
 			KASSERT(m->m_nextpkt == nextrecord,
 			    ("soreceive: post-control, nextrecord !sync"));
 			if (nextrecord == NULL) {
 				KASSERT(so->so_rcv.sb_mb == m,
 				    ("soreceive: post-control, sb_mb!=m"));
 				KASSERT(so->so_rcv.sb_lastrecord == m,
 				    ("soreceive: post-control, lastrecord!=m"));
 			}
 		}
 		type = m->m_type;
 		if (type == MT_OOBDATA)
 			flags |= MSG_OOB;
 	} else {
 		if ((flags & MSG_PEEK) == 0) {
 			KASSERT(so->so_rcv.sb_mb == nextrecord,
 			    ("soreceive: sb_mb != nextrecord"));
 			if (so->so_rcv.sb_mb == NULL) {
 				KASSERT(so->so_rcv.sb_lastrecord == NULL,
 				    ("soreceive: sb_lastercord != NULL"));
 			}
 		}
 	}
 	SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 	SBLASTRECORDCHK(&so->so_rcv);
 	SBLASTMBUFCHK(&so->so_rcv);
 
 	/*
 	 * Now continue to read any data mbufs off of the head of the socket
 	 * buffer until the read request is satisfied.  Note that 'type' is
 	 * used to store the type of any mbuf reads that have happened so far
 	 * such that soreceive() can stop reading if the type changes, which
 	 * causes soreceive() to return only one of regular data and inline
 	 * out-of-band data in a single socket receive operation.
 	 */
 	moff = 0;
 	offset = 0;
 	while (m != NULL && !(m->m_flags & M_NOTAVAIL) && uio->uio_resid > 0
 	    && error == 0) {
 		/*
 		 * If the type of mbuf has changed since the last mbuf
 		 * examined ('type'), end the receive operation.
 		 */
 		SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 		if (m->m_type == MT_OOBDATA || m->m_type == MT_CONTROL) {
 			if (type != m->m_type)
 				break;
 		} else if (type == MT_OOBDATA)
 			break;
 		else
 		    KASSERT(m->m_type == MT_DATA,
 			("m->m_type == %d", m->m_type));
 		so->so_rcv.sb_state &= ~SBS_RCVATMARK;
 		len = uio->uio_resid;
 		if (so->so_oobmark && len > so->so_oobmark - offset)
 			len = so->so_oobmark - offset;
 		if (len > m->m_len - moff)
 			len = m->m_len - moff;
 		/*
 		 * If mp is set, just pass back the mbufs.  Otherwise copy
 		 * them out via the uio, then free.  Sockbuf must be
 		 * consistent here (points to current mbuf, it points to next
 		 * record) when we drop priority; we must note any additions
 		 * to the sockbuf when we block interrupts again.
 		 */
 		if (mp == NULL) {
 			SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 			SBLASTRECORDCHK(&so->so_rcv);
 			SBLASTMBUFCHK(&so->so_rcv);
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			error = uiomove(mtod(m, char *) + moff, (int)len, uio);
 			SOCKBUF_LOCK(&so->so_rcv);
 			if (error) {
 				/*
 				 * The MT_SONAME mbuf has already been removed
 				 * from the record, so it is necessary to
 				 * remove the data mbufs, if any, to preserve
 				 * the invariant in the case of PR_ADDR that
 				 * requires MT_SONAME mbufs at the head of
 				 * each record.
 				 */
 				if (m && pr->pr_flags & PR_ATOMIC &&
 				    ((flags & MSG_PEEK) == 0))
 					(void)sbdroprecord_locked(&so->so_rcv);
 				SOCKBUF_UNLOCK(&so->so_rcv);
 				goto release;
 			}
 		} else
 			uio->uio_resid -= len;
 		SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 		if (len == m->m_len - moff) {
 			if (m->m_flags & M_EOR)
 				flags |= MSG_EOR;
 			if (flags & MSG_PEEK) {
 				m = m->m_next;
 				moff = 0;
 			} else {
 				nextrecord = m->m_nextpkt;
 				sbfree(&so->so_rcv, m);
 				if (mp != NULL) {
 					m->m_nextpkt = NULL;
 					*mp = m;
 					mp = &m->m_next;
 					so->so_rcv.sb_mb = m = m->m_next;
 					*mp = NULL;
 				} else {
 					so->so_rcv.sb_mb = m_free(m);
 					m = so->so_rcv.sb_mb;
 				}
 				sockbuf_pushsync(&so->so_rcv, nextrecord);
 				SBLASTRECORDCHK(&so->so_rcv);
 				SBLASTMBUFCHK(&so->so_rcv);
 			}
 		} else {
 			if (flags & MSG_PEEK)
 				moff += len;
 			else {
 				if (mp != NULL) {
 					if (flags & MSG_DONTWAIT) {
 						*mp = m_copym(m, 0, len,
 						    M_NOWAIT);
 						if (*mp == NULL) {
 							/*
 							 * m_copym() couldn't
 							 * allocate an mbuf.
 							 * Adjust uio_resid back
 							 * (it was adjusted
 							 * down by len bytes,
 							 * which we didn't end
 							 * up "copying" over).
 							 */
 							uio->uio_resid += len;
 							break;
 						}
 					} else {
 						SOCKBUF_UNLOCK(&so->so_rcv);
 						*mp = m_copym(m, 0, len,
 						    M_WAITOK);
 						SOCKBUF_LOCK(&so->so_rcv);
 					}
 				}
 				sbcut_locked(&so->so_rcv, len);
 			}
 		}
 		SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 		if (so->so_oobmark) {
 			if ((flags & MSG_PEEK) == 0) {
 				so->so_oobmark -= len;
 				if (so->so_oobmark == 0) {
 					so->so_rcv.sb_state |= SBS_RCVATMARK;
 					break;
 				}
 			} else {
 				offset += len;
 				if (offset == so->so_oobmark)
 					break;
 			}
 		}
 		if (flags & MSG_EOR)
 			break;
 		/*
 		 * If the MSG_WAITALL flag is set (for non-atomic socket), we
 		 * must not quit until "uio->uio_resid == 0" or an error
 		 * termination.  If a signal/timeout occurs, return with a
 		 * short count but without error.  Keep sockbuf locked
 		 * against other readers.
 		 */
 		while (flags & MSG_WAITALL && m == NULL && uio->uio_resid > 0 &&
 		    !sosendallatonce(so) && nextrecord == NULL) {
 			SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 			if (so->so_error ||
 			    so->so_rcv.sb_state & SBS_CANTRCVMORE)
 				break;
 			/*
 			 * Notify the protocol that some data has been
 			 * drained before blocking.
 			 */
 			if (pr->pr_flags & PR_WANTRCVD) {
 				SOCKBUF_UNLOCK(&so->so_rcv);
 				VNET_SO_ASSERT(so);
 				(*pr->pr_usrreqs->pru_rcvd)(so, flags);
 				SOCKBUF_LOCK(&so->so_rcv);
 			}
 			SBLASTRECORDCHK(&so->so_rcv);
 			SBLASTMBUFCHK(&so->so_rcv);
 			/*
 			 * We could receive some data while was notifying
 			 * the protocol. Skip blocking in this case.
 			 */
 			if (so->so_rcv.sb_mb == NULL) {
 				error = sbwait(&so->so_rcv);
 				if (error) {
 					SOCKBUF_UNLOCK(&so->so_rcv);
 					goto release;
 				}
 			}
 			m = so->so_rcv.sb_mb;
 			if (m != NULL)
 				nextrecord = m->m_nextpkt;
 		}
 	}
 
 	SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 	if (m != NULL && pr->pr_flags & PR_ATOMIC) {
 		flags |= MSG_TRUNC;
 		if ((flags & MSG_PEEK) == 0)
 			(void) sbdroprecord_locked(&so->so_rcv);
 	}
 	if ((flags & MSG_PEEK) == 0) {
 		if (m == NULL) {
 			/*
 			 * First part is an inline SB_EMPTY_FIXUP().  Second
 			 * part makes sure sb_lastrecord is up-to-date if
 			 * there is still data in the socket buffer.
 			 */
 			so->so_rcv.sb_mb = nextrecord;
 			if (so->so_rcv.sb_mb == NULL) {
 				so->so_rcv.sb_mbtail = NULL;
 				so->so_rcv.sb_lastrecord = NULL;
 			} else if (nextrecord->m_nextpkt == NULL)
 				so->so_rcv.sb_lastrecord = nextrecord;
 		}
 		SBLASTRECORDCHK(&so->so_rcv);
 		SBLASTMBUFCHK(&so->so_rcv);
 		/*
 		 * If soreceive() is being done from the socket callback,
 		 * then don't need to generate ACK to peer to update window,
 		 * since ACK will be generated on return to TCP.
 		 */
 		if (!(flags & MSG_SOCALLBCK) &&
 		    (pr->pr_flags & PR_WANTRCVD)) {
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			VNET_SO_ASSERT(so);
 			(*pr->pr_usrreqs->pru_rcvd)(so, flags);
 			SOCKBUF_LOCK(&so->so_rcv);
 		}
 	}
 	SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 	if (orig_resid == uio->uio_resid && orig_resid &&
 	    (flags & MSG_EOR) == 0 && (so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0) {
 		SOCKBUF_UNLOCK(&so->so_rcv);
 		goto restart;
 	}
 	SOCKBUF_UNLOCK(&so->so_rcv);
 
 	if (flagsp != NULL)
 		*flagsp |= flags;
 release:
 	sbunlock(&so->so_rcv);
 	return (error);
 }
 
 /*
  * Optimized version of soreceive() for stream (TCP) sockets.
  * XXXAO: (MSG_WAITALL | MSG_PEEK) isn't properly handled.
  */
 int
 soreceive_stream(struct socket *so, struct sockaddr **psa, struct uio *uio,
     struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
 {
 	int len = 0, error = 0, flags, oresid;
 	struct sockbuf *sb;
 	struct mbuf *m, *n = NULL;
 
 	/* We only do stream sockets. */
 	if (so->so_type != SOCK_STREAM)
 		return (EINVAL);
 	if (psa != NULL)
 		*psa = NULL;
 	if (controlp != NULL)
 		return (EINVAL);
 	if (flagsp != NULL)
 		flags = *flagsp &~ MSG_EOR;
 	else
 		flags = 0;
 	if (flags & MSG_OOB)
 		return (soreceive_rcvoob(so, uio, flags));
 	if (mp0 != NULL)
 		*mp0 = NULL;
 
 	sb = &so->so_rcv;
 
 	/* Prevent other readers from entering the socket. */
 	error = sblock(sb, SBLOCKWAIT(flags));
 	if (error)
 		goto out;
 	SOCKBUF_LOCK(sb);
 
 	/* Easy one, no space to copyout anything. */
 	if (uio->uio_resid == 0) {
 		error = EINVAL;
 		goto out;
 	}
 	oresid = uio->uio_resid;
 
 	/* We will never ever get anything unless we are or were connected. */
 	if (!(so->so_state & (SS_ISCONNECTED|SS_ISDISCONNECTED))) {
 		error = ENOTCONN;
 		goto out;
 	}
 
 restart:
 	SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 
 	/* Abort if socket has reported problems. */
 	if (so->so_error) {
 		if (sbavail(sb) > 0)
 			goto deliver;
 		if (oresid > uio->uio_resid)
 			goto out;
 		error = so->so_error;
 		if (!(flags & MSG_PEEK))
 			so->so_error = 0;
 		goto out;
 	}
 
 	/* Door is closed.  Deliver what is left, if any. */
 	if (sb->sb_state & SBS_CANTRCVMORE) {
 		if (sbavail(sb) > 0)
 			goto deliver;
 		else
 			goto out;
 	}
 
 	/* Socket buffer is empty and we shall not block. */
 	if (sbavail(sb) == 0 &&
 	    ((so->so_state & SS_NBIO) || (flags & (MSG_DONTWAIT|MSG_NBIO)))) {
 		error = EAGAIN;
 		goto out;
 	}
 
 	/* Socket buffer got some data that we shall deliver now. */
 	if (sbavail(sb) > 0 && !(flags & MSG_WAITALL) &&
 	    ((so->so_state & SS_NBIO) ||
 	     (flags & (MSG_DONTWAIT|MSG_NBIO)) ||
 	     sbavail(sb) >= sb->sb_lowat ||
 	     sbavail(sb) >= uio->uio_resid ||
 	     sbavail(sb) >= sb->sb_hiwat) ) {
 		goto deliver;
 	}
 
 	/* On MSG_WAITALL we must wait until all data or error arrives. */
 	if ((flags & MSG_WAITALL) &&
 	    (sbavail(sb) >= uio->uio_resid || sbavail(sb) >= sb->sb_hiwat))
 		goto deliver;
 
 	/*
 	 * Wait and block until (more) data comes in.
 	 * NB: Drops the sockbuf lock during wait.
 	 */
 	error = sbwait(sb);
 	if (error)
 		goto out;
 	goto restart;
 
 deliver:
 	SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 	KASSERT(sbavail(sb) > 0, ("%s: sockbuf empty", __func__));
 	KASSERT(sb->sb_mb != NULL, ("%s: sb_mb == NULL", __func__));
 
 	/* Statistics. */
 	if (uio->uio_td)
 		uio->uio_td->td_ru.ru_msgrcv++;
 
 	/* Fill uio until full or current end of socket buffer is reached. */
 	len = min(uio->uio_resid, sbavail(sb));
 	if (mp0 != NULL) {
 		/* Dequeue as many mbufs as possible. */
 		if (!(flags & MSG_PEEK) && len >= sb->sb_mb->m_len) {
 			if (*mp0 == NULL)
 				*mp0 = sb->sb_mb;
 			else
 				m_cat(*mp0, sb->sb_mb);
 			for (m = sb->sb_mb;
 			     m != NULL && m->m_len <= len;
 			     m = m->m_next) {
 				KASSERT(!(m->m_flags & M_NOTAVAIL),
 				    ("%s: m %p not available", __func__, m));
 				len -= m->m_len;
 				uio->uio_resid -= m->m_len;
 				sbfree(sb, m);
 				n = m;
 			}
 			n->m_next = NULL;
 			sb->sb_mb = m;
 			sb->sb_lastrecord = sb->sb_mb;
 			if (sb->sb_mb == NULL)
 				SB_EMPTY_FIXUP(sb);
 		}
 		/* Copy the remainder. */
 		if (len > 0) {
 			KASSERT(sb->sb_mb != NULL,
 			    ("%s: len > 0 && sb->sb_mb empty", __func__));
 
 			m = m_copym(sb->sb_mb, 0, len, M_NOWAIT);
 			if (m == NULL)
 				len = 0;	/* Don't flush data from sockbuf. */
 			else
 				uio->uio_resid -= len;
 			if (*mp0 != NULL)
 				m_cat(*mp0, m);
 			else
 				*mp0 = m;
 			if (*mp0 == NULL) {
 				error = ENOBUFS;
 				goto out;
 			}
 		}
 	} else {
 		/* NB: Must unlock socket buffer as uiomove may sleep. */
 		SOCKBUF_UNLOCK(sb);
 		error = m_mbuftouio(uio, sb->sb_mb, len);
 		SOCKBUF_LOCK(sb);
 		if (error)
 			goto out;
 	}
 	SBLASTRECORDCHK(sb);
 	SBLASTMBUFCHK(sb);
 
 	/*
 	 * Remove the delivered data from the socket buffer unless we
 	 * were only peeking.
 	 */
 	if (!(flags & MSG_PEEK)) {
 		if (len > 0)
 			sbdrop_locked(sb, len);
 
 		/* Notify protocol that we drained some data. */
 		if ((so->so_proto->pr_flags & PR_WANTRCVD) &&
 		    (((flags & MSG_WAITALL) && uio->uio_resid > 0) ||
 		     !(flags & MSG_SOCALLBCK))) {
 			SOCKBUF_UNLOCK(sb);
 			VNET_SO_ASSERT(so);
 			(*so->so_proto->pr_usrreqs->pru_rcvd)(so, flags);
 			SOCKBUF_LOCK(sb);
 		}
 	}
 
 	/*
 	 * For MSG_WAITALL we may have to loop again and wait for
 	 * more data to come in.
 	 */
 	if ((flags & MSG_WAITALL) && uio->uio_resid > 0)
 		goto restart;
 out:
 	SOCKBUF_LOCK_ASSERT(sb);
 	SBLASTRECORDCHK(sb);
 	SBLASTMBUFCHK(sb);
 	SOCKBUF_UNLOCK(sb);
 	sbunlock(sb);
 	return (error);
 }
 
 /*
  * Optimized version of soreceive() for simple datagram cases from userspace.
  * Unlike in the stream case, we're able to drop a datagram if copyout()
  * fails, and because we handle datagrams atomically, we don't need to use a
  * sleep lock to prevent I/O interlacing.
  */
 int
 soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio,
     struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
 {
 	struct mbuf *m, *m2;
 	int flags, error;
 	ssize_t len;
 	struct protosw *pr = so->so_proto;
 	struct mbuf *nextrecord;
 
 	if (psa != NULL)
 		*psa = NULL;
 	if (controlp != NULL)
 		*controlp = NULL;
 	if (flagsp != NULL)
 		flags = *flagsp &~ MSG_EOR;
 	else
 		flags = 0;
 
 	/*
 	 * For any complicated cases, fall back to the full
 	 * soreceive_generic().
 	 */
 	if (mp0 != NULL || (flags & MSG_PEEK) || (flags & MSG_OOB))
 		return (soreceive_generic(so, psa, uio, mp0, controlp,
 		    flagsp));
 
 	/*
 	 * Enforce restrictions on use.
 	 */
 	KASSERT((pr->pr_flags & PR_WANTRCVD) == 0,
 	    ("soreceive_dgram: wantrcvd"));
 	KASSERT(pr->pr_flags & PR_ATOMIC, ("soreceive_dgram: !atomic"));
 	KASSERT((so->so_rcv.sb_state & SBS_RCVATMARK) == 0,
 	    ("soreceive_dgram: SBS_RCVATMARK"));
 	KASSERT((so->so_proto->pr_flags & PR_CONNREQUIRED) == 0,
 	    ("soreceive_dgram: P_CONNREQUIRED"));
 
 	/*
 	 * Loop blocking while waiting for a datagram.
 	 */
 	SOCKBUF_LOCK(&so->so_rcv);
 	while ((m = so->so_rcv.sb_mb) == NULL) {
 		KASSERT(sbavail(&so->so_rcv) == 0,
 		    ("soreceive_dgram: sb_mb NULL but sbavail %u",
 		    sbavail(&so->so_rcv)));
 		if (so->so_error) {
 			error = so->so_error;
 			so->so_error = 0;
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			return (error);
 		}
 		if (so->so_rcv.sb_state & SBS_CANTRCVMORE ||
 		    uio->uio_resid == 0) {
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			return (0);
 		}
 		if ((so->so_state & SS_NBIO) ||
 		    (flags & (MSG_DONTWAIT|MSG_NBIO))) {
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			return (EWOULDBLOCK);
 		}
 		SBLASTRECORDCHK(&so->so_rcv);
 		SBLASTMBUFCHK(&so->so_rcv);
 		error = sbwait(&so->so_rcv);
 		if (error) {
 			SOCKBUF_UNLOCK(&so->so_rcv);
 			return (error);
 		}
 	}
 	SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 
 	if (uio->uio_td)
 		uio->uio_td->td_ru.ru_msgrcv++;
 	SBLASTRECORDCHK(&so->so_rcv);
 	SBLASTMBUFCHK(&so->so_rcv);
 	nextrecord = m->m_nextpkt;
 	if (nextrecord == NULL) {
 		KASSERT(so->so_rcv.sb_lastrecord == m,
 		    ("soreceive_dgram: lastrecord != m"));
 	}
 
 	KASSERT(so->so_rcv.sb_mb->m_nextpkt == nextrecord,
 	    ("soreceive_dgram: m_nextpkt != nextrecord"));
 
 	/*
 	 * Pull 'm' and its chain off the front of the packet queue.
 	 */
 	so->so_rcv.sb_mb = NULL;
 	sockbuf_pushsync(&so->so_rcv, nextrecord);
 
 	/*
 	 * Walk 'm's chain and free that many bytes from the socket buffer.
 	 */
 	for (m2 = m; m2 != NULL; m2 = m2->m_next)
 		sbfree(&so->so_rcv, m2);
 
 	/*
 	 * Do a few last checks before we let go of the lock.
 	 */
 	SBLASTRECORDCHK(&so->so_rcv);
 	SBLASTMBUFCHK(&so->so_rcv);
 	SOCKBUF_UNLOCK(&so->so_rcv);
 
 	if (pr->pr_flags & PR_ADDR) {
 		KASSERT(m->m_type == MT_SONAME,
 		    ("m->m_type == %d", m->m_type));
 		if (psa != NULL)
 			*psa = sodupsockaddr(mtod(m, struct sockaddr *),
 			    M_NOWAIT);
 		m = m_free(m);
 	}
 	if (m == NULL) {
 		/* XXXRW: Can this happen? */
 		return (0);
 	}
 
 	/*
 	 * Packet to copyout() is now in 'm' and it is disconnected from the
 	 * queue.
 	 *
 	 * Process one or more MT_CONTROL mbufs present before any data mbufs
 	 * in the first mbuf chain on the socket buffer.  We call into the
 	 * protocol to perform externalization (or freeing if controlp ==
 	 * NULL). In some cases there can be only MT_CONTROL mbufs without
 	 * MT_DATA mbufs.
 	 */
 	if (m->m_type == MT_CONTROL) {
 		struct mbuf *cm = NULL, *cmn;
 		struct mbuf **cme = &cm;
 
 		do {
 			m2 = m->m_next;
 			m->m_next = NULL;
 			*cme = m;
 			cme = &(*cme)->m_next;
 			m = m2;
 		} while (m != NULL && m->m_type == MT_CONTROL);
 		while (cm != NULL) {
 			cmn = cm->m_next;
 			cm->m_next = NULL;
 			if (pr->pr_domain->dom_externalize != NULL) {
 				error = (*pr->pr_domain->dom_externalize)
 				    (cm, controlp, flags);
 			} else if (controlp != NULL)
 				*controlp = cm;
 			else
 				m_freem(cm);
 			if (controlp != NULL) {
 				while (*controlp != NULL)
 					controlp = &(*controlp)->m_next;
 			}
 			cm = cmn;
 		}
 	}
 	KASSERT(m == NULL || m->m_type == MT_DATA,
 	    ("soreceive_dgram: !data"));
 	while (m != NULL && uio->uio_resid > 0) {
 		len = uio->uio_resid;
 		if (len > m->m_len)
 			len = m->m_len;
 		error = uiomove(mtod(m, char *), (int)len, uio);
 		if (error) {
 			m_freem(m);
 			return (error);
 		}
 		if (len == m->m_len)
 			m = m_free(m);
 		else {
 			m->m_data += len;
 			m->m_len -= len;
 		}
 	}
 	if (m != NULL) {
 		flags |= MSG_TRUNC;
 		m_freem(m);
 	}
 	if (flagsp != NULL)
 		*flagsp |= flags;
 	return (0);
 }
 
 int
 soreceive(struct socket *so, struct sockaddr **psa, struct uio *uio,
     struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
 {
 	int error;
 
 	CURVNET_SET(so->so_vnet);
 	error = (so->so_proto->pr_usrreqs->pru_soreceive(so, psa, uio, mp0,
 	    controlp, flagsp));
 	CURVNET_RESTORE();
 	return (error);
 }
 
 int
 soshutdown(struct socket *so, int how)
 {
 	struct protosw *pr = so->so_proto;
 	int error;
 
 	if (!(how == SHUT_RD || how == SHUT_WR || how == SHUT_RDWR))
 		return (EINVAL);
 	if ((so->so_state &
 	    (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) == 0)
 		return (ENOTCONN);
 
 	CURVNET_SET(so->so_vnet);
 	if (pr->pr_usrreqs->pru_flush != NULL)
 		(*pr->pr_usrreqs->pru_flush)(so, how);
 	if (how != SHUT_WR)
 		sorflush(so);
 	if (how != SHUT_RD) {
 		error = (*pr->pr_usrreqs->pru_shutdown)(so);
 		wakeup(&so->so_timeo);
 		CURVNET_RESTORE();
 		return (error);
 	}
 	wakeup(&so->so_timeo);
 	CURVNET_RESTORE();
 	return (0);
 }
 
 void
 sorflush(struct socket *so)
 {
 	struct sockbuf *sb = &so->so_rcv;
 	struct protosw *pr = so->so_proto;
 	struct socket aso;
 
 	VNET_SO_ASSERT(so);
 
 	/*
 	 * In order to avoid calling dom_dispose with the socket buffer mutex
 	 * held, and in order to generally avoid holding the lock for a long
 	 * time, we make a copy of the socket buffer and clear the original
 	 * (except locks, state).  The new socket buffer copy won't have
 	 * initialized locks so we can only call routines that won't use or
 	 * assert those locks.
 	 *
 	 * Dislodge threads currently blocked in receive and wait to acquire
 	 * a lock against other simultaneous readers before clearing the
 	 * socket buffer.  Don't let our acquire be interrupted by a signal
 	 * despite any existing socket disposition on interruptable waiting.
 	 */
 	socantrcvmore(so);
 	(void) sblock(sb, SBL_WAIT | SBL_NOINTR);
 
 	/*
 	 * Invalidate/clear most of the sockbuf structure, but leave selinfo
 	 * and mutex data unchanged.
 	 */
 	SOCKBUF_LOCK(sb);
 	bzero(&aso, sizeof(aso));
 	aso.so_pcb = so->so_pcb;
 	bcopy(&sb->sb_startzero, &aso.so_rcv.sb_startzero,
 	    sizeof(*sb) - offsetof(struct sockbuf, sb_startzero));
 	bzero(&sb->sb_startzero,
 	    sizeof(*sb) - offsetof(struct sockbuf, sb_startzero));
 	SOCKBUF_UNLOCK(sb);
 	sbunlock(sb);
 
 	/*
 	 * Dispose of special rights and flush the copied socket.  Don't call
 	 * any unsafe routines (that rely on locks being initialized) on aso.
 	 */
 	if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL)
 		(*pr->pr_domain->dom_dispose)(&aso);
 	sbrelease_internal(&aso.so_rcv, so);
 }
 
 /*
  * Wrapper for Socket established helper hook.
  * Parameters: socket, context of the hook point, hook id.
  */
 static int inline
 hhook_run_socket(struct socket *so, void *hctx, int32_t h_id)
 {
 	struct socket_hhook_data hhook_data = {
 		.so = so,
 		.hctx = hctx,
 		.m = NULL,
 		.status = 0
 	};
 
 	CURVNET_SET(so->so_vnet);
 	HHOOKS_RUN_IF(V_socket_hhh[h_id], &hhook_data, &so->osd);
 	CURVNET_RESTORE();
 
 	/* Ugly but needed, since hhooks return void for now */
 	return (hhook_data.status);
 }
 
 /*
  * Perhaps this routine, and sooptcopyout(), below, ought to come in an
  * additional variant to handle the case where the option value needs to be
  * some kind of integer, but not a specific size.  In addition to their use
  * here, these functions are also called by the protocol-level pr_ctloutput()
  * routines.
  */
 int
 sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen)
 {
 	size_t	valsize;
 
 	/*
 	 * If the user gives us more than we wanted, we ignore it, but if we
 	 * don't get the minimum length the caller wants, we return EINVAL.
 	 * On success, sopt->sopt_valsize is set to however much we actually
 	 * retrieved.
 	 */
 	if ((valsize = sopt->sopt_valsize) < minlen)
 		return EINVAL;
 	if (valsize > len)
 		sopt->sopt_valsize = valsize = len;
 
 	if (sopt->sopt_td != NULL)
 		return (copyin(sopt->sopt_val, buf, valsize));
 
 	bcopy(sopt->sopt_val, buf, valsize);
 	return (0);
 }
 
 /*
  * Kernel version of setsockopt(2).
  *
  * XXX: optlen is size_t, not socklen_t
  */
 int
 so_setsockopt(struct socket *so, int level, int optname, void *optval,
     size_t optlen)
 {
 	struct sockopt sopt;
 
 	sopt.sopt_level = level;
 	sopt.sopt_name = optname;
 	sopt.sopt_dir = SOPT_SET;
 	sopt.sopt_val = optval;
 	sopt.sopt_valsize = optlen;
 	sopt.sopt_td = NULL;
 	return (sosetopt(so, &sopt));
 }
 
 int
 sosetopt(struct socket *so, struct sockopt *sopt)
 {
 	int	error, optval;
 	struct	linger l;
 	struct	timeval tv;
 	sbintime_t val;
 	uint32_t val32;
 #ifdef MAC
 	struct mac extmac;
 #endif
 
 	CURVNET_SET(so->so_vnet);
 	error = 0;
 	if (sopt->sopt_level != SOL_SOCKET) {
 		if (so->so_proto->pr_ctloutput != NULL) {
 			error = (*so->so_proto->pr_ctloutput)(so, sopt);
 			CURVNET_RESTORE();
 			return (error);
 		}
 		error = ENOPROTOOPT;
 	} else {
 		switch (sopt->sopt_name) {
 		case SO_ACCEPTFILTER:
 			error = do_setopt_accept_filter(so, sopt);
 			if (error)
 				goto bad;
 			break;
 
 		case SO_LINGER:
 			error = sooptcopyin(sopt, &l, sizeof l, sizeof l);
 			if (error)
 				goto bad;
 
 			SOCK_LOCK(so);
 			so->so_linger = l.l_linger;
 			if (l.l_onoff)
 				so->so_options |= SO_LINGER;
 			else
 				so->so_options &= ~SO_LINGER;
 			SOCK_UNLOCK(so);
 			break;
 
 		case SO_DEBUG:
 		case SO_KEEPALIVE:
 		case SO_DONTROUTE:
 		case SO_USELOOPBACK:
 		case SO_BROADCAST:
 		case SO_REUSEADDR:
 		case SO_REUSEPORT:
 		case SO_OOBINLINE:
 		case SO_TIMESTAMP:
 		case SO_BINTIME:
 		case SO_NOSIGPIPE:
 		case SO_NO_DDP:
 		case SO_NO_OFFLOAD:
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 			    sizeof optval);
 			if (error)
 				goto bad;
 			SOCK_LOCK(so);
 			if (optval)
 				so->so_options |= sopt->sopt_name;
 			else
 				so->so_options &= ~sopt->sopt_name;
 			SOCK_UNLOCK(so);
 			break;
 
 		case SO_SETFIB:
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 			    sizeof optval);
 			if (error)
 				goto bad;
 
 			if (optval < 0 || optval >= rt_numfibs) {
 				error = EINVAL;
 				goto bad;
 			}
 			if (((so->so_proto->pr_domain->dom_family == PF_INET) ||
 			   (so->so_proto->pr_domain->dom_family == PF_INET6) ||
 			   (so->so_proto->pr_domain->dom_family == PF_ROUTE)))
 				so->so_fibnum = optval;
 			else
 				so->so_fibnum = 0;
 			break;
 
 		case SO_USER_COOKIE:
 			error = sooptcopyin(sopt, &val32, sizeof val32,
 			    sizeof val32);
 			if (error)
 				goto bad;
 			so->so_user_cookie = val32;
 			break;
 
 		case SO_SNDBUF:
 		case SO_RCVBUF:
 		case SO_SNDLOWAT:
 		case SO_RCVLOWAT:
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 			    sizeof optval);
 			if (error)
 				goto bad;
 
 			/*
 			 * Values < 1 make no sense for any of these options,
 			 * so disallow them.
 			 */
 			if (optval < 1) {
 				error = EINVAL;
 				goto bad;
 			}
 
 			switch (sopt->sopt_name) {
 			case SO_SNDBUF:
 			case SO_RCVBUF:
 				if (sbreserve(sopt->sopt_name == SO_SNDBUF ?
 				    &so->so_snd : &so->so_rcv, (u_long)optval,
 				    so, curthread) == 0) {
 					error = ENOBUFS;
 					goto bad;
 				}
 				(sopt->sopt_name == SO_SNDBUF ? &so->so_snd :
 				    &so->so_rcv)->sb_flags &= ~SB_AUTOSIZE;
 				break;
 
 			/*
 			 * Make sure the low-water is never greater than the
 			 * high-water.
 			 */
 			case SO_SNDLOWAT:
 				SOCKBUF_LOCK(&so->so_snd);
 				so->so_snd.sb_lowat =
 				    (optval > so->so_snd.sb_hiwat) ?
 				    so->so_snd.sb_hiwat : optval;
 				SOCKBUF_UNLOCK(&so->so_snd);
 				break;
 			case SO_RCVLOWAT:
 				SOCKBUF_LOCK(&so->so_rcv);
 				so->so_rcv.sb_lowat =
 				    (optval > so->so_rcv.sb_hiwat) ?
 				    so->so_rcv.sb_hiwat : optval;
 				SOCKBUF_UNLOCK(&so->so_rcv);
 				break;
 			}
 			break;
 
 		case SO_SNDTIMEO:
 		case SO_RCVTIMEO:
 #ifdef COMPAT_FREEBSD32
 			if (SV_CURPROC_FLAG(SV_ILP32)) {
 				struct timeval32 tv32;
 
 				error = sooptcopyin(sopt, &tv32, sizeof tv32,
 				    sizeof tv32);
 				CP(tv32, tv, tv_sec);
 				CP(tv32, tv, tv_usec);
 			} else
 #endif
 				error = sooptcopyin(sopt, &tv, sizeof tv,
 				    sizeof tv);
 			if (error)
 				goto bad;
 			if (tv.tv_sec < 0 || tv.tv_usec < 0 ||
 			    tv.tv_usec >= 1000000) {
 				error = EDOM;
 				goto bad;
 			}
 			if (tv.tv_sec > INT32_MAX)
 				val = SBT_MAX;
 			else
 				val = tvtosbt(tv);
 			switch (sopt->sopt_name) {
 			case SO_SNDTIMEO:
 				so->so_snd.sb_timeo = val;
 				break;
 			case SO_RCVTIMEO:
 				so->so_rcv.sb_timeo = val;
 				break;
 			}
 			break;
 
 		case SO_LABEL:
 #ifdef MAC
 			error = sooptcopyin(sopt, &extmac, sizeof extmac,
 			    sizeof extmac);
 			if (error)
 				goto bad;
 			error = mac_setsockopt_label(sopt->sopt_td->td_ucred,
 			    so, &extmac);
 #else
 			error = EOPNOTSUPP;
 #endif
 			break;
 
 		default:
 			if (V_socket_hhh[HHOOK_SOCKET_OPT]->hhh_nhooks > 0)
 				error = hhook_run_socket(so, sopt,
 				    HHOOK_SOCKET_OPT);
 			else
 				error = ENOPROTOOPT;
 			break;
 		}
 		if (error == 0 && so->so_proto->pr_ctloutput != NULL)
 			(void)(*so->so_proto->pr_ctloutput)(so, sopt);
 	}
 bad:
 	CURVNET_RESTORE();
 	return (error);
 }
 
 /*
  * Helper routine for getsockopt.
  */
 int
 sooptcopyout(struct sockopt *sopt, const void *buf, size_t len)
 {
 	int	error;
 	size_t	valsize;
 
 	error = 0;
 
 	/*
 	 * Documented get behavior is that we always return a value, possibly
 	 * truncated to fit in the user's buffer.  Traditional behavior is
 	 * that we always tell the user precisely how much we copied, rather
 	 * than something useful like the total amount we had available for
 	 * her.  Note that this interface is not idempotent; the entire
 	 * answer must be generated ahead of time.
 	 */
 	valsize = min(len, sopt->sopt_valsize);
 	sopt->sopt_valsize = valsize;
 	if (sopt->sopt_val != NULL) {
 		if (sopt->sopt_td != NULL)
 			error = copyout(buf, sopt->sopt_val, valsize);
 		else
 			bcopy(buf, sopt->sopt_val, valsize);
 	}
 	return (error);
 }
 
 int
 sogetopt(struct socket *so, struct sockopt *sopt)
 {
 	int	error, optval;
 	struct	linger l;
 	struct	timeval tv;
 #ifdef MAC
 	struct mac extmac;
 #endif
 
 	CURVNET_SET(so->so_vnet);
 	error = 0;
 	if (sopt->sopt_level != SOL_SOCKET) {
 		if (so->so_proto->pr_ctloutput != NULL)
 			error = (*so->so_proto->pr_ctloutput)(so, sopt);
 		else
 			error = ENOPROTOOPT;
 		CURVNET_RESTORE();
 		return (error);
 	} else {
 		switch (sopt->sopt_name) {
 		case SO_ACCEPTFILTER:
 			error = do_getopt_accept_filter(so, sopt);
 			break;
 
 		case SO_LINGER:
 			SOCK_LOCK(so);
 			l.l_onoff = so->so_options & SO_LINGER;
 			l.l_linger = so->so_linger;
 			SOCK_UNLOCK(so);
 			error = sooptcopyout(sopt, &l, sizeof l);
 			break;
 
 		case SO_USELOOPBACK:
 		case SO_DONTROUTE:
 		case SO_DEBUG:
 		case SO_KEEPALIVE:
 		case SO_REUSEADDR:
 		case SO_REUSEPORT:
 		case SO_BROADCAST:
 		case SO_OOBINLINE:
 		case SO_ACCEPTCONN:
 		case SO_TIMESTAMP:
 		case SO_BINTIME:
 		case SO_NOSIGPIPE:
 			optval = so->so_options & sopt->sopt_name;
 integer:
 			error = sooptcopyout(sopt, &optval, sizeof optval);
 			break;
 
 		case SO_TYPE:
 			optval = so->so_type;
 			goto integer;
 
 		case SO_PROTOCOL:
 			optval = so->so_proto->pr_protocol;
 			goto integer;
 
 		case SO_ERROR:
 			SOCK_LOCK(so);
 			optval = so->so_error;
 			so->so_error = 0;
 			SOCK_UNLOCK(so);
 			goto integer;
 
 		case SO_SNDBUF:
 			optval = so->so_snd.sb_hiwat;
 			goto integer;
 
 		case SO_RCVBUF:
 			optval = so->so_rcv.sb_hiwat;
 			goto integer;
 
 		case SO_SNDLOWAT:
 			optval = so->so_snd.sb_lowat;
 			goto integer;
 
 		case SO_RCVLOWAT:
 			optval = so->so_rcv.sb_lowat;
 			goto integer;
 
 		case SO_SNDTIMEO:
 		case SO_RCVTIMEO:
 			tv = sbttotv(sopt->sopt_name == SO_SNDTIMEO ?
 			    so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
 #ifdef COMPAT_FREEBSD32
 			if (SV_CURPROC_FLAG(SV_ILP32)) {
 				struct timeval32 tv32;
 
 				CP(tv, tv32, tv_sec);
 				CP(tv, tv32, tv_usec);
 				error = sooptcopyout(sopt, &tv32, sizeof tv32);
 			} else
 #endif
 				error = sooptcopyout(sopt, &tv, sizeof tv);
 			break;
 
 		case SO_LABEL:
 #ifdef MAC
 			error = sooptcopyin(sopt, &extmac, sizeof(extmac),
 			    sizeof(extmac));
 			if (error)
 				goto bad;
 			error = mac_getsockopt_label(sopt->sopt_td->td_ucred,
 			    so, &extmac);
 			if (error)
 				goto bad;
 			error = sooptcopyout(sopt, &extmac, sizeof extmac);
 #else
 			error = EOPNOTSUPP;
 #endif
 			break;
 
 		case SO_PEERLABEL:
 #ifdef MAC
 			error = sooptcopyin(sopt, &extmac, sizeof(extmac),
 			    sizeof(extmac));
 			if (error)
 				goto bad;
 			error = mac_getsockopt_peerlabel(
 			    sopt->sopt_td->td_ucred, so, &extmac);
 			if (error)
 				goto bad;
 			error = sooptcopyout(sopt, &extmac, sizeof extmac);
 #else
 			error = EOPNOTSUPP;
 #endif
 			break;
 
 		case SO_LISTENQLIMIT:
 			optval = so->so_qlimit;
 			goto integer;
 
 		case SO_LISTENQLEN:
 			optval = so->so_qlen;
 			goto integer;
 
 		case SO_LISTENINCQLEN:
 			optval = so->so_incqlen;
 			goto integer;
 
 		default:
 			if (V_socket_hhh[HHOOK_SOCKET_OPT]->hhh_nhooks > 0)
 				error = hhook_run_socket(so, sopt,
 				    HHOOK_SOCKET_OPT);
 			else
 				error = ENOPROTOOPT;
 			break;
 		}
 	}
 #ifdef MAC
 bad:
 #endif
 	CURVNET_RESTORE();
 	return (error);
 }
 
 int
 soopt_getm(struct sockopt *sopt, struct mbuf **mp)
 {
 	struct mbuf *m, *m_prev;
 	int sopt_size = sopt->sopt_valsize;
 
 	MGET(m, sopt->sopt_td ? M_WAITOK : M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	if (sopt_size > MLEN) {
 		MCLGET(m, sopt->sopt_td ? M_WAITOK : M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ENOBUFS;
 		}
 		m->m_len = min(MCLBYTES, sopt_size);
 	} else {
 		m->m_len = min(MLEN, sopt_size);
 	}
 	sopt_size -= m->m_len;
 	*mp = m;
 	m_prev = m;
 
 	while (sopt_size) {
 		MGET(m, sopt->sopt_td ? M_WAITOK : M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			m_freem(*mp);
 			return ENOBUFS;
 		}
 		if (sopt_size > MLEN) {
 			MCLGET(m, sopt->sopt_td != NULL ? M_WAITOK :
 			    M_NOWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				m_freem(*mp);
 				return ENOBUFS;
 			}
 			m->m_len = min(MCLBYTES, sopt_size);
 		} else {
 			m->m_len = min(MLEN, sopt_size);
 		}
 		sopt_size -= m->m_len;
 		m_prev->m_next = m;
 		m_prev = m;
 	}
 	return (0);
 }
 
 int
 soopt_mcopyin(struct sockopt *sopt, struct mbuf *m)
 {
 	struct mbuf *m0 = m;
 
 	if (sopt->sopt_val == NULL)
 		return (0);
 	while (m != NULL && sopt->sopt_valsize >= m->m_len) {
 		if (sopt->sopt_td != NULL) {
 			int error;
 
 			error = copyin(sopt->sopt_val, mtod(m, char *),
 			    m->m_len);
 			if (error != 0) {
 				m_freem(m0);
 				return(error);
 			}
 		} else
 			bcopy(sopt->sopt_val, mtod(m, char *), m->m_len);
 		sopt->sopt_valsize -= m->m_len;
 		sopt->sopt_val = (char *)sopt->sopt_val + m->m_len;
 		m = m->m_next;
 	}
 	if (m != NULL) /* should be allocated enoughly at ip6_sooptmcopyin() */
 		panic("ip6_sooptmcopyin");
 	return (0);
 }
 
 int
 soopt_mcopyout(struct sockopt *sopt, struct mbuf *m)
 {
 	struct mbuf *m0 = m;
 	size_t valsize = 0;
 
 	if (sopt->sopt_val == NULL)
 		return (0);
 	while (m != NULL && sopt->sopt_valsize >= m->m_len) {
 		if (sopt->sopt_td != NULL) {
 			int error;
 
 			error = copyout(mtod(m, char *), sopt->sopt_val,
 			    m->m_len);
 			if (error != 0) {
 				m_freem(m0);
 				return(error);
 			}
 		} else
 			bcopy(mtod(m, char *), sopt->sopt_val, m->m_len);
 		sopt->sopt_valsize -= m->m_len;
 		sopt->sopt_val = (char *)sopt->sopt_val + m->m_len;
 		valsize += m->m_len;
 		m = m->m_next;
 	}
 	if (m != NULL) {
 		/* enough soopt buffer should be given from user-land */
 		m_freem(m0);
 		return(EINVAL);
 	}
 	sopt->sopt_valsize = valsize;
 	return (0);
 }
 
 /*
  * sohasoutofband(): protocol notifies socket layer of the arrival of new
  * out-of-band data, which will then notify socket consumers.
  */
 void
 sohasoutofband(struct socket *so)
 {
 
 	if (so->so_sigio != NULL)
 		pgsigio(&so->so_sigio, SIGURG, 0);
 	selwakeuppri(&so->so_rcv.sb_sel, PSOCK);
 }
 
 int
 sopoll(struct socket *so, int events, struct ucred *active_cred,
     struct thread *td)
 {
 
 	/*
 	 * We do not need to set or assert curvnet as long as everyone uses
 	 * sopoll_generic().
 	 */
 	return (so->so_proto->pr_usrreqs->pru_sopoll(so, events, active_cred,
 	    td));
 }
 
 int
 sopoll_generic(struct socket *so, int events, struct ucred *active_cred,
     struct thread *td)
 {
 	int revents = 0;
 
 	SOCKBUF_LOCK(&so->so_snd);
 	SOCKBUF_LOCK(&so->so_rcv);
 	if (events & (POLLIN | POLLRDNORM))
 		if (soreadabledata(so))
 			revents |= events & (POLLIN | POLLRDNORM);
 
 	if (events & (POLLOUT | POLLWRNORM))
 		if (sowriteable(so))
 			revents |= events & (POLLOUT | POLLWRNORM);
 
 	if (events & (POLLPRI | POLLRDBAND))
 		if (so->so_oobmark || (so->so_rcv.sb_state & SBS_RCVATMARK))
 			revents |= events & (POLLPRI | POLLRDBAND);
 
 	if ((events & POLLINIGNEOF) == 0) {
 		if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
 			revents |= events & (POLLIN | POLLRDNORM);
 			if (so->so_snd.sb_state & SBS_CANTSENDMORE)
 				revents |= POLLHUP;
 		}
 	}
 
 	if (revents == 0) {
 		if (events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {
 			selrecord(td, &so->so_rcv.sb_sel);
 			so->so_rcv.sb_flags |= SB_SEL;
 		}
 
 		if (events & (POLLOUT | POLLWRNORM)) {
 			selrecord(td, &so->so_snd.sb_sel);
 			so->so_snd.sb_flags |= SB_SEL;
 		}
 	}
 
 	SOCKBUF_UNLOCK(&so->so_rcv);
 	SOCKBUF_UNLOCK(&so->so_snd);
 	return (revents);
 }
 
 int
 soo_kqfilter(struct file *fp, struct knote *kn)
 {
 	struct socket *so = kn->kn_fp->f_data;
 	struct sockbuf *sb;
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
 		if (so->so_options & SO_ACCEPTCONN)
 			kn->kn_fop = &solisten_filtops;
 		else
 			kn->kn_fop = &soread_filtops;
 		sb = &so->so_rcv;
 		break;
 	case EVFILT_WRITE:
 		kn->kn_fop = &sowrite_filtops;
 		sb = &so->so_snd;
 		break;
 	default:
 		return (EINVAL);
 	}
 
 	SOCKBUF_LOCK(sb);
 	knlist_add(&sb->sb_sel.si_note, kn, 1);
 	sb->sb_flags |= SB_KNOTE;
 	SOCKBUF_UNLOCK(sb);
 	return (0);
 }
 
 /*
  * Some routines that return EOPNOTSUPP for entry points that are not
  * supported by a protocol.  Fill in as needed.
  */
 int
 pru_accept_notsupp(struct socket *so, struct sockaddr **nam)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_aio_queue_notsupp(struct socket *so, struct kaiocb *job)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_attach_notsupp(struct socket *so, int proto, struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_bind_notsupp(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_bindat_notsupp(int fd, struct socket *so, struct sockaddr *nam,
     struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_connect_notsupp(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_connectat_notsupp(int fd, struct socket *so, struct sockaddr *nam,
     struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_connect2_notsupp(struct socket *so1, struct socket *so2)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_control_notsupp(struct socket *so, u_long cmd, caddr_t data,
     struct ifnet *ifp, struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_disconnect_notsupp(struct socket *so)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_listen_notsupp(struct socket *so, int backlog, struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_peeraddr_notsupp(struct socket *so, struct sockaddr **nam)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_rcvd_notsupp(struct socket *so, int flags)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_rcvoob_notsupp(struct socket *so, struct mbuf *m, int flags)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_send_notsupp(struct socket *so, int flags, struct mbuf *m,
     struct sockaddr *addr, struct mbuf *control, struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_ready_notsupp(struct socket *so, struct mbuf *m, int count)
 {
 
 	return (EOPNOTSUPP);
 }
 
 /*
  * This isn't really a ``null'' operation, but it's the default one and
  * doesn't do anything destructive.
  */
 int
 pru_sense_null(struct socket *so, struct stat *sb)
 {
 
 	sb->st_blksize = so->so_snd.sb_hiwat;
 	return 0;
 }
 
 int
 pru_shutdown_notsupp(struct socket *so)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_sockaddr_notsupp(struct socket *so, struct sockaddr **nam)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_sosend_notsupp(struct socket *so, struct sockaddr *addr, struct uio *uio,
     struct mbuf *top, struct mbuf *control, int flags, struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_soreceive_notsupp(struct socket *so, struct sockaddr **paddr,
     struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
 {
 
 	return EOPNOTSUPP;
 }
 
 int
 pru_sopoll_notsupp(struct socket *so, int events, struct ucred *cred,
     struct thread *td)
 {
 
 	return EOPNOTSUPP;
 }
 
 static void
 filt_sordetach(struct knote *kn)
 {
 	struct socket *so = kn->kn_fp->f_data;
 
 	SOCKBUF_LOCK(&so->so_rcv);
 	knlist_remove(&so->so_rcv.sb_sel.si_note, kn, 1);
 	if (knlist_empty(&so->so_rcv.sb_sel.si_note))
 		so->so_rcv.sb_flags &= ~SB_KNOTE;
 	SOCKBUF_UNLOCK(&so->so_rcv);
 }
 
 /*ARGSUSED*/
 static int
 filt_soread(struct knote *kn, long hint)
 {
 	struct socket *so;
 
 	so = kn->kn_fp->f_data;
 	SOCKBUF_LOCK_ASSERT(&so->so_rcv);
 
 	kn->kn_data = sbavail(&so->so_rcv) - so->so_rcv.sb_ctl;
 	if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
 		kn->kn_flags |= EV_EOF;
 		kn->kn_fflags = so->so_error;
 		return (1);
 	} else if (so->so_error)	/* temporary udp error */
 		return (1);
 
 	if (kn->kn_sfflags & NOTE_LOWAT) {
 		if (kn->kn_data >= kn->kn_sdata)
 			return 1;
 	} else {
 		if (sbavail(&so->so_rcv) >= so->so_rcv.sb_lowat)
 			return 1;
 	}
 
 	/* This hook returning non-zero indicates an event, not error */
 	return (hhook_run_socket(so, NULL, HHOOK_FILT_SOREAD));
 }
 
 static void
 filt_sowdetach(struct knote *kn)
 {
 	struct socket *so = kn->kn_fp->f_data;
 
 	SOCKBUF_LOCK(&so->so_snd);
 	knlist_remove(&so->so_snd.sb_sel.si_note, kn, 1);
 	if (knlist_empty(&so->so_snd.sb_sel.si_note))
 		so->so_snd.sb_flags &= ~SB_KNOTE;
 	SOCKBUF_UNLOCK(&so->so_snd);
 }
 
 /*ARGSUSED*/
 static int
 filt_sowrite(struct knote *kn, long hint)
 {
 	struct socket *so;
 
 	so = kn->kn_fp->f_data;
 	SOCKBUF_LOCK_ASSERT(&so->so_snd);
 	kn->kn_data = sbspace(&so->so_snd);
 
 	hhook_run_socket(so, kn, HHOOK_FILT_SOWRITE);
 
 	if (so->so_snd.sb_state & SBS_CANTSENDMORE) {
 		kn->kn_flags |= EV_EOF;
 		kn->kn_fflags = so->so_error;
 		return (1);
 	} else if (so->so_error)	/* temporary udp error */
 		return (1);
 	else if (((so->so_state & SS_ISCONNECTED) == 0) &&
 	    (so->so_proto->pr_flags & PR_CONNREQUIRED))
 		return (0);
 	else if (kn->kn_sfflags & NOTE_LOWAT)
 		return (kn->kn_data >= kn->kn_sdata);
 	else
 		return (kn->kn_data >= so->so_snd.sb_lowat);
 }
 
 /*ARGSUSED*/
 static int
 filt_solisten(struct knote *kn, long hint)
 {
 	struct socket *so = kn->kn_fp->f_data;
 
 	kn->kn_data = so->so_qlen;
 	return (!TAILQ_EMPTY(&so->so_comp));
 }
 
 int
 socheckuid(struct socket *so, uid_t uid)
 {
 
 	if (so == NULL)
 		return (EPERM);
 	if (so->so_cred->cr_uid != uid)
 		return (EPERM);
 	return (0);
 }
 
 /*
  * These functions are used by protocols to notify the socket layer (and its
  * consumers) of state changes in the sockets driven by protocol-side events.
  */
 
 /*
  * Procedures to manipulate state flags of socket and do appropriate wakeups.
  *
  * Normal sequence from the active (originating) side is that
  * soisconnecting() is called during processing of connect() call, resulting
  * in an eventual call to soisconnected() if/when the connection is
  * established.  When the connection is torn down soisdisconnecting() is
  * called during processing of disconnect() call, and soisdisconnected() is
  * called when the connection to the peer is totally severed.  The semantics
  * of these routines are such that connectionless protocols can call
  * soisconnected() and soisdisconnected() only, bypassing the in-progress
  * calls when setting up a ``connection'' takes no time.
  *
  * From the passive side, a socket is created with two queues of sockets:
  * so_incomp for connections in progress and so_comp for connections already
  * made and awaiting user acceptance.  As a protocol is preparing incoming
  * connections, it creates a socket structure queued on so_incomp by calling
  * sonewconn().  When the connection is established, soisconnected() is
  * called, and transfers the socket structure to so_comp, making it available
  * to accept().
  *
  * If a socket is closed with sockets on either so_incomp or so_comp, these
  * sockets are dropped.
  *
  * If higher-level protocols are implemented in the kernel, the wakeups done
  * here will sometimes cause software-interrupt process scheduling.
  */
 void
 soisconnecting(struct socket *so)
 {
 
 	SOCK_LOCK(so);
 	so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING);
 	so->so_state |= SS_ISCONNECTING;
 	SOCK_UNLOCK(so);
 }
 
 void
 soisconnected(struct socket *so)
 {
 	struct socket *head;
 	int ret;
 
 restart:
 	ACCEPT_LOCK();
 	SOCK_LOCK(so);
 	so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING);
 	so->so_state |= SS_ISCONNECTED;
 	head = so->so_head;
 	if (head != NULL && (so->so_qstate & SQ_INCOMP)) {
 		if ((so->so_options & SO_ACCEPTFILTER) == 0) {
 			SOCK_UNLOCK(so);
 			TAILQ_REMOVE(&head->so_incomp, so, so_list);
 			head->so_incqlen--;
 			so->so_qstate &= ~SQ_INCOMP;
 			TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
 			head->so_qlen++;
 			so->so_qstate |= SQ_COMP;
 			ACCEPT_UNLOCK();
 			sorwakeup(head);
 			wakeup_one(&head->so_timeo);
 		} else {
 			ACCEPT_UNLOCK();
 			soupcall_set(so, SO_RCV,
 			    head->so_accf->so_accept_filter->accf_callback,
 			    head->so_accf->so_accept_filter_arg);
 			so->so_options &= ~SO_ACCEPTFILTER;
 			ret = head->so_accf->so_accept_filter->accf_callback(so,
 			    head->so_accf->so_accept_filter_arg, M_NOWAIT);
 			if (ret == SU_ISCONNECTED)
 				soupcall_clear(so, SO_RCV);
 			SOCK_UNLOCK(so);
 			if (ret == SU_ISCONNECTED)
 				goto restart;
 		}
 		return;
 	}
 	SOCK_UNLOCK(so);
 	ACCEPT_UNLOCK();
 	wakeup(&so->so_timeo);
 	sorwakeup(so);
 	sowwakeup(so);
 }
 
 void
 soisdisconnecting(struct socket *so)
 {
 
 	/*
 	 * Note: This code assumes that SOCK_LOCK(so) and
 	 * SOCKBUF_LOCK(&so->so_rcv) are the same.
 	 */
 	SOCKBUF_LOCK(&so->so_rcv);
 	so->so_state &= ~SS_ISCONNECTING;
 	so->so_state |= SS_ISDISCONNECTING;
 	socantrcvmore_locked(so);
 	SOCKBUF_LOCK(&so->so_snd);
 	socantsendmore_locked(so);
 	wakeup(&so->so_timeo);
 }
 
 void
 soisdisconnected(struct socket *so)
 {
 
 	/*
 	 * Note: This code assumes that SOCK_LOCK(so) and
 	 * SOCKBUF_LOCK(&so->so_rcv) are the same.
 	 */
 	SOCKBUF_LOCK(&so->so_rcv);
 	so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
 	so->so_state |= SS_ISDISCONNECTED;
 	socantrcvmore_locked(so);
 	SOCKBUF_LOCK(&so->so_snd);
 	sbdrop_locked(&so->so_snd, sbused(&so->so_snd));
 	socantsendmore_locked(so);
 	wakeup(&so->so_timeo);
 }
 
 /*
  * Make a copy of a sockaddr in a malloced buffer of type M_SONAME.
  */
 struct sockaddr *
 sodupsockaddr(const struct sockaddr *sa, int mflags)
 {
 	struct sockaddr *sa2;
 
 	sa2 = malloc(sa->sa_len, M_SONAME, mflags);
 	if (sa2)
 		bcopy(sa, sa2, sa->sa_len);
 	return sa2;
 }
 
 /*
  * Register per-socket buffer upcalls.
  */
 void
 soupcall_set(struct socket *so, int which,
     int (*func)(struct socket *, void *, int), void *arg)
 {
 	struct sockbuf *sb;
 
 	switch (which) {
 	case SO_RCV:
 		sb = &so->so_rcv;
 		break;
 	case SO_SND:
 		sb = &so->so_snd;
 		break;
 	default:
 		panic("soupcall_set: bad which");
 	}
 	SOCKBUF_LOCK_ASSERT(sb);
 #if 0
 	/* XXX: accf_http actually wants to do this on purpose. */
 	KASSERT(sb->sb_upcall == NULL, ("soupcall_set: overwriting upcall"));
 #endif
 	sb->sb_upcall = func;
 	sb->sb_upcallarg = arg;
 	sb->sb_flags |= SB_UPCALL;
 }
 
 void
 soupcall_clear(struct socket *so, int which)
 {
 	struct sockbuf *sb;
 
 	switch (which) {
 	case SO_RCV:
 		sb = &so->so_rcv;
 		break;
 	case SO_SND:
 		sb = &so->so_snd;
 		break;
 	default:
 		panic("soupcall_clear: bad which");
 	}
 	SOCKBUF_LOCK_ASSERT(sb);
 	KASSERT(sb->sb_upcall != NULL, ("soupcall_clear: no upcall to clear"));
 	sb->sb_upcall = NULL;
 	sb->sb_upcallarg = NULL;
 	sb->sb_flags &= ~SB_UPCALL;
 }
 
 /*
  * Create an external-format (``xsocket'') structure using the information in
  * the kernel-format socket structure pointed to by so.  This is done to
  * reduce the spew of irrelevant information over this interface, to isolate
  * user code from changes in the kernel structure, and potentially to provide
  * information-hiding if we decide that some of this information should be
  * hidden from users.
  */
 void
 sotoxsocket(struct socket *so, struct xsocket *xso)
 {
 
 	xso->xso_len = sizeof *xso;
 	xso->xso_so = so;
 	xso->so_type = so->so_type;
 	xso->so_options = so->so_options;
 	xso->so_linger = so->so_linger;
 	xso->so_state = so->so_state;
 	xso->so_pcb = so->so_pcb;
 	xso->xso_protocol = so->so_proto->pr_protocol;
 	xso->xso_family = so->so_proto->pr_domain->dom_family;
 	xso->so_qlen = so->so_qlen;
 	xso->so_incqlen = so->so_incqlen;
 	xso->so_qlimit = so->so_qlimit;
 	xso->so_timeo = so->so_timeo;
 	xso->so_error = so->so_error;
 	xso->so_pgid = so->so_sigio ? so->so_sigio->sio_pgid : 0;
 	xso->so_oobmark = so->so_oobmark;
 	sbtoxsockbuf(&so->so_snd, &xso->so_snd);
 	sbtoxsockbuf(&so->so_rcv, &xso->so_rcv);
 	xso->so_uid = so->so_cred->cr_uid;
 }
 
 
 /*
  * Socket accessor functions to provide external consumers with
  * a safe interface to socket state
  *
  */
 
 void
 so_listeners_apply_all(struct socket *so, void (*func)(struct socket *, void *),
     void *arg)
 {
 
 	TAILQ_FOREACH(so, &so->so_comp, so_list)
 		func(so, arg);
 }
 
 struct sockbuf *
 so_sockbuf_rcv(struct socket *so)
 {
 
 	return (&so->so_rcv);
 }
 
 struct sockbuf *
 so_sockbuf_snd(struct socket *so)
 {
 
 	return (&so->so_snd);
 }
 
 int
 so_state_get(const struct socket *so)
 {
 
 	return (so->so_state);
 }
 
 void
 so_state_set(struct socket *so, int val)
 {
 
 	so->so_state = val;
 }
 
 int
 so_options_get(const struct socket *so)
 {
 
 	return (so->so_options);
 }
 
 void
 so_options_set(struct socket *so, int val)
 {
 
 	so->so_options = val;
 }
 
 int
 so_error_get(const struct socket *so)
 {
 
 	return (so->so_error);
 }
 
 void
 so_error_set(struct socket *so, int val)
 {
 
 	so->so_error = val;
 }
 
 int
 so_linger_get(const struct socket *so)
 {
 
 	return (so->so_linger);
 }
 
 void
 so_linger_set(struct socket *so, int val)
 {
 
 	so->so_linger = val;
 }
 
 struct protosw *
 so_protosw_get(const struct socket *so)
 {
 
 	return (so->so_proto);
 }
 
 void
 so_protosw_set(struct socket *so, struct protosw *val)
 {
 
 	so->so_proto = val;
 }
 
 void
 so_sorwakeup(struct socket *so)
 {
 
 	sorwakeup(so);
 }
 
 void
 so_sowwakeup(struct socket *so)
 {
 
 	sowwakeup(so);
 }
 
 void
 so_sorwakeup_locked(struct socket *so)
 {
 
 	sorwakeup_locked(so);
 }
 
 void
 so_sowwakeup_locked(struct socket *so)
 {
 
 	sowwakeup_locked(so);
 }
 
 void
 so_lock(struct socket *so)
 {
 
 	SOCK_LOCK(so);
 }
 
 void
 so_unlock(struct socket *so)
 {
 
 	SOCK_UNLOCK(so);
 }
Index: projects/bsnmp-ipv6-mib/sys/mips/conf/MALTA64
===================================================================
--- projects/bsnmp-ipv6-mib/sys/mips/conf/MALTA64	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/mips/conf/MALTA64	(revision 311637)
@@ -1,13 +1,15 @@
 # MALTA64 -- 64-bit kernel config for MALTA endian-big boards
 #
 # $FreeBSD$
  
 ident		MALTA64
 
 include		"std.MALTA"
  
 machine		mips mips64
  
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
  
 makeoptions 	KERNLOADADDR=0xffffffff80100000
+
+options 	COMPAT_FREEBSD32	# Compatible with o32 binaries
Index: projects/bsnmp-ipv6-mib/sys/net80211/ieee80211.c
===================================================================
--- projects/bsnmp-ipv6-mib/sys/net80211/ieee80211.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/net80211/ieee80211.c	(revision 311637)
@@ -1,2144 +1,2198 @@
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 /*
  * IEEE 802.11 generic handler
  */
 #include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/sbuf.h>
 
 #include <machine/stdarg.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
 #include <net80211/ieee80211_superg.h>
 #endif
 #include <net80211/ieee80211_ratectl.h>
 
 #include <net/bpf.h>
 
 const char *ieee80211_phymode_name[IEEE80211_MODE_MAX] = {
 	[IEEE80211_MODE_AUTO]	  = "auto",
 	[IEEE80211_MODE_11A]	  = "11a",
 	[IEEE80211_MODE_11B]	  = "11b",
 	[IEEE80211_MODE_11G]	  = "11g",
 	[IEEE80211_MODE_FH]	  = "FH",
 	[IEEE80211_MODE_TURBO_A]  = "turboA",
 	[IEEE80211_MODE_TURBO_G]  = "turboG",
 	[IEEE80211_MODE_STURBO_A] = "sturboA",
 	[IEEE80211_MODE_HALF]	  = "half",
 	[IEEE80211_MODE_QUARTER]  = "quarter",
 	[IEEE80211_MODE_11NA]	  = "11na",
 	[IEEE80211_MODE_11NG]	  = "11ng",
 };
 /* map ieee80211_opmode to the corresponding capability bit */
 const int ieee80211_opcap[IEEE80211_OPMODE_MAX] = {
 	[IEEE80211_M_IBSS]	= IEEE80211_C_IBSS,
 	[IEEE80211_M_WDS]	= IEEE80211_C_WDS,
 	[IEEE80211_M_STA]	= IEEE80211_C_STA,
 	[IEEE80211_M_AHDEMO]	= IEEE80211_C_AHDEMO,
 	[IEEE80211_M_HOSTAP]	= IEEE80211_C_HOSTAP,
 	[IEEE80211_M_MONITOR]	= IEEE80211_C_MONITOR,
 #ifdef IEEE80211_SUPPORT_MESH
 	[IEEE80211_M_MBSS]	= IEEE80211_C_MBSS,
 #endif
 };
 
 const uint8_t ieee80211broadcastaddr[IEEE80211_ADDR_LEN] =
 	{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 static	void ieee80211_syncflag_locked(struct ieee80211com *ic, int flag);
 static	void ieee80211_syncflag_ht_locked(struct ieee80211com *ic, int flag);
 static	void ieee80211_syncflag_ext_locked(struct ieee80211com *ic, int flag);
+static	void ieee80211_syncflag_vht_locked(struct ieee80211com *ic, int flag);
 static	int ieee80211_media_setup(struct ieee80211com *ic,
 		struct ifmedia *media, int caps, int addsta,
 		ifm_change_cb_t media_change, ifm_stat_cb_t media_stat);
 static	int media_status(enum ieee80211_opmode,
 		const struct ieee80211_channel *);
 static uint64_t ieee80211_get_counter(struct ifnet *, ift_counter);
 
 MALLOC_DEFINE(M_80211_VAP, "80211vap", "802.11 vap state");
 
 /*
  * Default supported rates for 802.11 operation (in IEEE .5Mb units).
  */
 #define	B(r)	((r) | IEEE80211_RATE_BASIC)
 static const struct ieee80211_rateset ieee80211_rateset_11a =
 	{ 8, { B(12), 18, B(24), 36, B(48), 72, 96, 108 } };
 static const struct ieee80211_rateset ieee80211_rateset_half =
 	{ 8, { B(6), 9, B(12), 18, B(24), 36, 48, 54 } };
 static const struct ieee80211_rateset ieee80211_rateset_quarter =
 	{ 8, { B(3), 4, B(6), 9, B(12), 18, 24, 27 } };
 static const struct ieee80211_rateset ieee80211_rateset_11b =
 	{ 4, { B(2), B(4), B(11), B(22) } };
 /* NB: OFDM rates are handled specially based on mode */
 static const struct ieee80211_rateset ieee80211_rateset_11g =
 	{ 12, { B(2), B(4), B(11), B(22), 12, 18, 24, 36, 48, 72, 96, 108 } };
 #undef B
 
 /*
  * Fill in 802.11 available channel set, mark
  * all available channels as active, and pick
  * a default channel if not already specified.
  */
 void
 ieee80211_chan_init(struct ieee80211com *ic)
 {
 #define	DEFAULTRATES(m, def) do { \
 	if (ic->ic_sup_rates[m].rs_nrates == 0) \
 		ic->ic_sup_rates[m] = def; \
 } while (0)
 	struct ieee80211_channel *c;
 	int i;
 
 	KASSERT(0 < ic->ic_nchans && ic->ic_nchans <= IEEE80211_CHAN_MAX,
 		("invalid number of channels specified: %u", ic->ic_nchans));
 	memset(ic->ic_chan_avail, 0, sizeof(ic->ic_chan_avail));
 	memset(ic->ic_modecaps, 0, sizeof(ic->ic_modecaps));
 	setbit(ic->ic_modecaps, IEEE80211_MODE_AUTO);
 	for (i = 0; i < ic->ic_nchans; i++) {
 		c = &ic->ic_channels[i];
 		KASSERT(c->ic_flags != 0, ("channel with no flags"));
 		/*
 		 * Help drivers that work only with frequencies by filling
 		 * in IEEE channel #'s if not already calculated.  Note this
 		 * mimics similar work done in ieee80211_setregdomain when
 		 * changing regulatory state.
 		 */
 		if (c->ic_ieee == 0)
 			c->ic_ieee = ieee80211_mhz2ieee(c->ic_freq,c->ic_flags);
 		if (IEEE80211_IS_CHAN_HT40(c) && c->ic_extieee == 0)
 			c->ic_extieee = ieee80211_mhz2ieee(c->ic_freq +
 			    (IEEE80211_IS_CHAN_HT40U(c) ? 20 : -20),
 			    c->ic_flags);
 		/* default max tx power to max regulatory */
 		if (c->ic_maxpower == 0)
 			c->ic_maxpower = 2*c->ic_maxregpower;
 		setbit(ic->ic_chan_avail, c->ic_ieee);
 		/*
 		 * Identify mode capabilities.
 		 */
 		if (IEEE80211_IS_CHAN_A(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_11A);
 		if (IEEE80211_IS_CHAN_B(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_11B);
 		if (IEEE80211_IS_CHAN_ANYG(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_11G);
 		if (IEEE80211_IS_CHAN_FHSS(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_FH);
 		if (IEEE80211_IS_CHAN_108A(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_TURBO_A);
 		if (IEEE80211_IS_CHAN_108G(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_TURBO_G);
 		if (IEEE80211_IS_CHAN_ST(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_STURBO_A);
 		if (IEEE80211_IS_CHAN_HALF(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_HALF);
 		if (IEEE80211_IS_CHAN_QUARTER(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_QUARTER);
 		if (IEEE80211_IS_CHAN_HTA(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_11NA);
 		if (IEEE80211_IS_CHAN_HTG(c))
 			setbit(ic->ic_modecaps, IEEE80211_MODE_11NG);
 	}
 	/* initialize candidate channels to all available */
 	memcpy(ic->ic_chan_active, ic->ic_chan_avail,
 		sizeof(ic->ic_chan_avail));
 
 	/* sort channel table to allow lookup optimizations */
 	ieee80211_sort_channels(ic->ic_channels, ic->ic_nchans);
 
 	/* invalidate any previous state */
 	ic->ic_bsschan = IEEE80211_CHAN_ANYC;
 	ic->ic_prevchan = NULL;
 	ic->ic_csa_newchan = NULL;
 	/* arbitrarily pick the first channel */
 	ic->ic_curchan = &ic->ic_channels[0];
 	ic->ic_rt = ieee80211_get_ratetable(ic->ic_curchan);
 
 	/* fillin well-known rate sets if driver has not specified */
 	DEFAULTRATES(IEEE80211_MODE_11B,	 ieee80211_rateset_11b);
 	DEFAULTRATES(IEEE80211_MODE_11G,	 ieee80211_rateset_11g);
 	DEFAULTRATES(IEEE80211_MODE_11A,	 ieee80211_rateset_11a);
 	DEFAULTRATES(IEEE80211_MODE_TURBO_A,	 ieee80211_rateset_11a);
 	DEFAULTRATES(IEEE80211_MODE_TURBO_G,	 ieee80211_rateset_11g);
 	DEFAULTRATES(IEEE80211_MODE_STURBO_A,	 ieee80211_rateset_11a);
 	DEFAULTRATES(IEEE80211_MODE_HALF,	 ieee80211_rateset_half);
 	DEFAULTRATES(IEEE80211_MODE_QUARTER,	 ieee80211_rateset_quarter);
 	DEFAULTRATES(IEEE80211_MODE_11NA,	 ieee80211_rateset_11a);
 	DEFAULTRATES(IEEE80211_MODE_11NG,	 ieee80211_rateset_11g);
 
 	/*
 	 * Setup required information to fill the mcsset field, if driver did
 	 * not. Assume a 2T2R setup for historic reasons.
 	 */
 	if (ic->ic_rxstream == 0)
 		ic->ic_rxstream = 2;
 	if (ic->ic_txstream == 0)
 		ic->ic_txstream = 2;
 
 	/*
 	 * Set auto mode to reset active channel state and any desired channel.
 	 */
 	(void) ieee80211_setmode(ic, IEEE80211_MODE_AUTO);
 #undef DEFAULTRATES
 }
 
 static void
 null_update_mcast(struct ieee80211com *ic)
 {
 
 	ic_printf(ic, "need multicast update callback\n");
 }
 
 static void
 null_update_promisc(struct ieee80211com *ic)
 {
 
 	ic_printf(ic, "need promiscuous mode update callback\n");
 }
 
 static void
 null_update_chw(struct ieee80211com *ic)
 {
 
 	ic_printf(ic, "%s: need callback\n", __func__);
 }
 
 int
 ic_printf(struct ieee80211com *ic, const char * fmt, ...)
 { 
 	va_list ap;
 	int retval;
 
 	retval = printf("%s: ", ic->ic_name);
 	va_start(ap, fmt);
 	retval += vprintf(fmt, ap);
 	va_end(ap);  
 	return (retval);
 }
 
 static LIST_HEAD(, ieee80211com) ic_head = LIST_HEAD_INITIALIZER(ic_head);
 static struct mtx ic_list_mtx;
 MTX_SYSINIT(ic_list, &ic_list_mtx, "ieee80211com list", MTX_DEF);
 
 static int
 sysctl_ieee80211coms(SYSCTL_HANDLER_ARGS)
 {
 	struct ieee80211com *ic;
 	struct sbuf sb;
 	char *sp;
 	int error;
 
 	error = sysctl_wire_old_buffer(req, 0);
 	if (error)
 		return (error);
 	sbuf_new_for_sysctl(&sb, NULL, 8, req);
 	sbuf_clear_flags(&sb, SBUF_INCLUDENUL);
 	sp = "";
 	mtx_lock(&ic_list_mtx);
 	LIST_FOREACH(ic, &ic_head, ic_next) {
 		sbuf_printf(&sb, "%s%s", sp, ic->ic_name);
 		sp = " ";
 	}
 	mtx_unlock(&ic_list_mtx);
 	error = sbuf_finish(&sb);
 	sbuf_delete(&sb);
 	return (error);
 }
 
 SYSCTL_PROC(_net_wlan, OID_AUTO, devices,
     CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
     sysctl_ieee80211coms, "A", "names of available 802.11 devices");
 
 /*
  * Attach/setup the common net80211 state.  Called by
  * the driver on attach to prior to creating any vap's.
  */
 void
 ieee80211_ifattach(struct ieee80211com *ic)
 {
 
 	IEEE80211_LOCK_INIT(ic, ic->ic_name);
 	IEEE80211_TX_LOCK_INIT(ic, ic->ic_name);
 	TAILQ_INIT(&ic->ic_vaps);
 
 	/* Create a taskqueue for all state changes */
 	ic->ic_tq = taskqueue_create("ic_taskq", M_WAITOK | M_ZERO,
 	    taskqueue_thread_enqueue, &ic->ic_tq);
 	taskqueue_start_threads(&ic->ic_tq, 1, PI_NET, "%s net80211 taskq",
 	    ic->ic_name);
 	ic->ic_ierrors = counter_u64_alloc(M_WAITOK);
 	ic->ic_oerrors = counter_u64_alloc(M_WAITOK);
 	/*
 	 * Fill in 802.11 available channel set, mark all
 	 * available channels as active, and pick a default
 	 * channel if not already specified.
 	 */
 	ieee80211_chan_init(ic);
 
 	ic->ic_update_mcast = null_update_mcast;
 	ic->ic_update_promisc = null_update_promisc;
 	ic->ic_update_chw = null_update_chw;
 
 	ic->ic_hash_key = arc4random();
 	ic->ic_bintval = IEEE80211_BINTVAL_DEFAULT;
 	ic->ic_lintval = ic->ic_bintval;
 	ic->ic_txpowlimit = IEEE80211_TXPOWER_MAX;
 
 	ieee80211_crypto_attach(ic);
 	ieee80211_node_attach(ic);
 	ieee80211_power_attach(ic);
 	ieee80211_proto_attach(ic);
 #ifdef IEEE80211_SUPPORT_SUPERG
 	ieee80211_superg_attach(ic);
 #endif
 	ieee80211_ht_attach(ic);
 	ieee80211_scan_attach(ic);
 	ieee80211_regdomain_attach(ic);
 	ieee80211_dfs_attach(ic);
 
 	ieee80211_sysctl_attach(ic);
 
 	mtx_lock(&ic_list_mtx);
 	LIST_INSERT_HEAD(&ic_head, ic, ic_next);
 	mtx_unlock(&ic_list_mtx);
 }
 
 /*
  * Detach net80211 state on device detach.  Tear down
  * all vap's and reclaim all common state prior to the
  * device state going away.  Note we may call back into
  * driver; it must be prepared for this.
  */
 void
 ieee80211_ifdetach(struct ieee80211com *ic)
 {
 	struct ieee80211vap *vap;
 
 	mtx_lock(&ic_list_mtx);
 	LIST_REMOVE(ic, ic_next);
 	mtx_unlock(&ic_list_mtx);
 
 	taskqueue_drain(taskqueue_thread, &ic->ic_restart_task);
 
 	/*
 	 * The VAP is responsible for setting and clearing
 	 * the VIMAGE context.
 	 */
 	while ((vap = TAILQ_FIRST(&ic->ic_vaps)) != NULL)
 		ieee80211_vap_destroy(vap);
 	ieee80211_waitfor_parent(ic);
 
 	ieee80211_sysctl_detach(ic);
 	ieee80211_dfs_detach(ic);
 	ieee80211_regdomain_detach(ic);
 	ieee80211_scan_detach(ic);
 #ifdef IEEE80211_SUPPORT_SUPERG
 	ieee80211_superg_detach(ic);
 #endif
 	ieee80211_ht_detach(ic);
 	/* NB: must be called before ieee80211_node_detach */
 	ieee80211_proto_detach(ic);
 	ieee80211_crypto_detach(ic);
 	ieee80211_power_detach(ic);
 	ieee80211_node_detach(ic);
 
 	counter_u64_free(ic->ic_ierrors);
 	counter_u64_free(ic->ic_oerrors);
 
 	taskqueue_free(ic->ic_tq);
 	IEEE80211_TX_LOCK_DESTROY(ic);
 	IEEE80211_LOCK_DESTROY(ic);
 }
 
 struct ieee80211com *
 ieee80211_find_com(const char *name)
 {
 	struct ieee80211com *ic;
 
 	mtx_lock(&ic_list_mtx);
 	LIST_FOREACH(ic, &ic_head, ic_next)
 		if (strcmp(ic->ic_name, name) == 0)
 			break;
 	mtx_unlock(&ic_list_mtx);
 
 	return (ic);
 }
 
 void
 ieee80211_iterate_coms(ieee80211_com_iter_func *f, void *arg)
 {
 	struct ieee80211com *ic;
 
 	mtx_lock(&ic_list_mtx);
 	LIST_FOREACH(ic, &ic_head, ic_next)
 		(*f)(arg, ic);
 	mtx_unlock(&ic_list_mtx);
 }
 
 /*
  * Default reset method for use with the ioctl support.  This
  * method is invoked after any state change in the 802.11
  * layer that should be propagated to the hardware but not
  * require re-initialization of the 802.11 state machine (e.g
  * rescanning for an ap).  We always return ENETRESET which
  * should cause the driver to re-initialize the device. Drivers
  * can override this method to implement more optimized support.
  */
 static int
 default_reset(struct ieee80211vap *vap, u_long cmd)
 {
 	return ENETRESET;
 }
 
 /*
  * Default for updating the VAP default TX key index.
  *
  * Drivers that support TX offload as well as hardware encryption offload
  * may need to be informed of key index changes separate from the key
  * update.
  */
 static void
 default_update_deftxkey(struct ieee80211vap *vap, ieee80211_keyix kid)
 {
 
 	/* XXX assert validity */
 	/* XXX assert we're in a key update block */
 	vap->iv_def_txkey = kid;
 }
 
 /*
  * Add underlying device errors to vap errors.
  */
 static uint64_t
 ieee80211_get_counter(struct ifnet *ifp, ift_counter cnt)
 {
 	struct ieee80211vap *vap = ifp->if_softc;
 	struct ieee80211com *ic = vap->iv_ic;
 	uint64_t rv;
 
 	rv = if_get_counter_default(ifp, cnt);
 	switch (cnt) {
 	case IFCOUNTER_OERRORS:
 		rv += counter_u64_fetch(ic->ic_oerrors);
 		break;
 	case IFCOUNTER_IERRORS:
 		rv += counter_u64_fetch(ic->ic_ierrors);
 		break;
 	default:
 		break;
 	}
 
 	return (rv);
 }
 
 /*
  * Prepare a vap for use.  Drivers use this call to
  * setup net80211 state in new vap's prior attaching
  * them with ieee80211_vap_attach (below).
  */
 int
 ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap,
     const char name[IFNAMSIZ], int unit, enum ieee80211_opmode opmode,
     int flags, const uint8_t bssid[IEEE80211_ADDR_LEN])
 {
 	struct ifnet *ifp;
 
 	ifp = if_alloc(IFT_ETHER);
 	if (ifp == NULL) {
 		ic_printf(ic, "%s: unable to allocate ifnet\n",
 		    __func__);
 		return ENOMEM;
 	}
 	if_initname(ifp, name, unit);
 	ifp->if_softc = vap;			/* back pointer */
 	ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
 	ifp->if_transmit = ieee80211_vap_transmit;
 	ifp->if_qflush = ieee80211_vap_qflush;
 	ifp->if_ioctl = ieee80211_ioctl;
 	ifp->if_init = ieee80211_init;
 	ifp->if_get_counter = ieee80211_get_counter;
 
 	vap->iv_ifp = ifp;
 	vap->iv_ic = ic;
 	vap->iv_flags = ic->ic_flags;		/* propagate common flags */
 	vap->iv_flags_ext = ic->ic_flags_ext;
 	vap->iv_flags_ven = ic->ic_flags_ven;
 	vap->iv_caps = ic->ic_caps &~ IEEE80211_C_OPMODE;
 	vap->iv_htcaps = ic->ic_htcaps;
 	vap->iv_htextcaps = ic->ic_htextcaps;
 	vap->iv_opmode = opmode;
 	vap->iv_caps |= ieee80211_opcap[opmode];
 	IEEE80211_ADDR_COPY(vap->iv_myaddr, ic->ic_macaddr);
 	switch (opmode) {
 	case IEEE80211_M_WDS:
 		/*
 		 * WDS links must specify the bssid of the far end.
 		 * For legacy operation this is a static relationship.
 		 * For non-legacy operation the station must associate
 		 * and be authorized to pass traffic.  Plumbing the
 		 * vap to the proper node happens when the vap
 		 * transitions to RUN state.
 		 */
 		IEEE80211_ADDR_COPY(vap->iv_des_bssid, bssid);
 		vap->iv_flags |= IEEE80211_F_DESBSSID;
 		if (flags & IEEE80211_CLONE_WDSLEGACY)
 			vap->iv_flags_ext |= IEEE80211_FEXT_WDSLEGACY;
 		break;
 #ifdef IEEE80211_SUPPORT_TDMA
 	case IEEE80211_M_AHDEMO:
 		if (flags & IEEE80211_CLONE_TDMA) {
 			/* NB: checked before clone operation allowed */
 			KASSERT(ic->ic_caps & IEEE80211_C_TDMA,
 			    ("not TDMA capable, ic_caps 0x%x", ic->ic_caps));
 			/*
 			 * Propagate TDMA capability to mark vap; this
 			 * cannot be removed and is used to distinguish
 			 * regular ahdemo operation from ahdemo+tdma.
 			 */
 			vap->iv_caps |= IEEE80211_C_TDMA;
 		}
 		break;
 #endif
 	default:
 		break;
 	}
 	/* auto-enable s/w beacon miss support */
 	if (flags & IEEE80211_CLONE_NOBEACONS)
 		vap->iv_flags_ext |= IEEE80211_FEXT_SWBMISS;
 	/* auto-generated or user supplied MAC address */
 	if (flags & (IEEE80211_CLONE_BSSID|IEEE80211_CLONE_MACADDR))
 		vap->iv_flags_ext |= IEEE80211_FEXT_UNIQMAC;
 	/*
 	 * Enable various functionality by default if we're
 	 * capable; the driver can override us if it knows better.
 	 */
 	if (vap->iv_caps & IEEE80211_C_WME)
 		vap->iv_flags |= IEEE80211_F_WME;
 	if (vap->iv_caps & IEEE80211_C_BURST)
 		vap->iv_flags |= IEEE80211_F_BURST;
 	/* NB: bg scanning only makes sense for station mode right now */
 	if (vap->iv_opmode == IEEE80211_M_STA &&
 	    (vap->iv_caps & IEEE80211_C_BGSCAN))
 		vap->iv_flags |= IEEE80211_F_BGSCAN;
 	vap->iv_flags |= IEEE80211_F_DOTH;	/* XXX no cap, just ena */
 	/* NB: DFS support only makes sense for ap mode right now */
 	if (vap->iv_opmode == IEEE80211_M_HOSTAP &&
 	    (vap->iv_caps & IEEE80211_C_DFS))
 		vap->iv_flags_ext |= IEEE80211_FEXT_DFS;
 
 	vap->iv_des_chan = IEEE80211_CHAN_ANYC;		/* any channel is ok */
 	vap->iv_bmissthreshold = IEEE80211_HWBMISS_DEFAULT;
 	vap->iv_dtim_period = IEEE80211_DTIM_DEFAULT;
 	/*
 	 * Install a default reset method for the ioctl support;
 	 * the driver can override this.
 	 */
 	vap->iv_reset = default_reset;
 
 	/*
 	 * Install a default crypto key update method, the driver
 	 * can override this.
 	 */
 	vap->iv_update_deftxkey = default_update_deftxkey;
 
 	ieee80211_sysctl_vattach(vap);
 	ieee80211_crypto_vattach(vap);
 	ieee80211_node_vattach(vap);
 	ieee80211_power_vattach(vap);
 	ieee80211_proto_vattach(vap);
 #ifdef IEEE80211_SUPPORT_SUPERG
 	ieee80211_superg_vattach(vap);
 #endif
 	ieee80211_ht_vattach(vap);
 	ieee80211_scan_vattach(vap);
 	ieee80211_regdomain_vattach(vap);
 	ieee80211_radiotap_vattach(vap);
 	ieee80211_ratectl_set(vap, IEEE80211_RATECTL_NONE);
 
 	return 0;
 }
 
 /*
  * Activate a vap.  State should have been prepared with a
  * call to ieee80211_vap_setup and by the driver.  On return
  * from this call the vap is ready for use.
  */
 int
 ieee80211_vap_attach(struct ieee80211vap *vap, ifm_change_cb_t media_change,
     ifm_stat_cb_t media_stat, const uint8_t macaddr[IEEE80211_ADDR_LEN])
 {
 	struct ifnet *ifp = vap->iv_ifp;
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ifmediareq imr;
 	int maxrate;
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE,
 	    "%s: %s parent %s flags 0x%x flags_ext 0x%x\n",
 	    __func__, ieee80211_opmode_name[vap->iv_opmode],
 	    ic->ic_name, vap->iv_flags, vap->iv_flags_ext);
 
 	/*
 	 * Do late attach work that cannot happen until after
 	 * the driver has had a chance to override defaults.
 	 */
 	ieee80211_node_latevattach(vap);
 	ieee80211_power_latevattach(vap);
 
 	maxrate = ieee80211_media_setup(ic, &vap->iv_media, vap->iv_caps,
 	    vap->iv_opmode == IEEE80211_M_STA, media_change, media_stat);
 	ieee80211_media_status(ifp, &imr);
 	/* NB: strip explicit mode; we're actually in autoselect */
 	ifmedia_set(&vap->iv_media,
 	    imr.ifm_active &~ (IFM_MMASK | IFM_IEEE80211_TURBO));
 	if (maxrate)
 		ifp->if_baudrate = IF_Mbps(maxrate);
 
 	ether_ifattach(ifp, macaddr);
 	IEEE80211_ADDR_COPY(vap->iv_myaddr, IF_LLADDR(ifp));
 	/* hook output method setup by ether_ifattach */
 	vap->iv_output = ifp->if_output;
 	ifp->if_output = ieee80211_output;
 	/* NB: if_mtu set by ether_ifattach to ETHERMTU */
 
 	IEEE80211_LOCK(ic);
 	TAILQ_INSERT_TAIL(&ic->ic_vaps, vap, iv_next);
 	ieee80211_syncflag_locked(ic, IEEE80211_F_WME);
 #ifdef IEEE80211_SUPPORT_SUPERG
 	ieee80211_syncflag_locked(ic, IEEE80211_F_TURBOP);
 #endif
 	ieee80211_syncflag_locked(ic, IEEE80211_F_PCF);
 	ieee80211_syncflag_locked(ic, IEEE80211_F_BURST);
 	ieee80211_syncflag_ht_locked(ic, IEEE80211_FHT_HT);
 	ieee80211_syncflag_ht_locked(ic, IEEE80211_FHT_USEHT40);
+
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_VHT);
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT40);
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80);
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80P80);
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT160);
 	IEEE80211_UNLOCK(ic);
 
 	return 1;
 }
 
 /* 
  * Tear down vap state and reclaim the ifnet.
  * The driver is assumed to have prepared for
  * this; e.g. by turning off interrupts for the
  * underlying device.
  */
 void
 ieee80211_vap_detach(struct ieee80211vap *vap)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ifnet *ifp = vap->iv_ifp;
 
 	CURVNET_SET(ifp->if_vnet);
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s parent %s\n",
 	    __func__, ieee80211_opmode_name[vap->iv_opmode], ic->ic_name);
 
 	/* NB: bpfdetach is called by ether_ifdetach and claims all taps */
 	ether_ifdetach(ifp);
 
 	ieee80211_stop(vap);
 
 	/*
 	 * Flush any deferred vap tasks.
 	 */
 	ieee80211_draintask(ic, &vap->iv_nstate_task);
 	ieee80211_draintask(ic, &vap->iv_swbmiss_task);
 
 	/* XXX band-aid until ifnet handles this for us */
 	taskqueue_drain(taskqueue_swi, &ifp->if_linktask);
 
 	IEEE80211_LOCK(ic);
 	KASSERT(vap->iv_state == IEEE80211_S_INIT , ("vap still running"));
 	TAILQ_REMOVE(&ic->ic_vaps, vap, iv_next);
 	ieee80211_syncflag_locked(ic, IEEE80211_F_WME);
 #ifdef IEEE80211_SUPPORT_SUPERG
 	ieee80211_syncflag_locked(ic, IEEE80211_F_TURBOP);
 #endif
 	ieee80211_syncflag_locked(ic, IEEE80211_F_PCF);
 	ieee80211_syncflag_locked(ic, IEEE80211_F_BURST);
 	ieee80211_syncflag_ht_locked(ic, IEEE80211_FHT_HT);
 	ieee80211_syncflag_ht_locked(ic, IEEE80211_FHT_USEHT40);
+
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_VHT);
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT40);
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80);
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80P80);
+	ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT160);
+
 	/* NB: this handles the bpfdetach done below */
 	ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_BPF);
 	if (vap->iv_ifflags & IFF_PROMISC)
 		ieee80211_promisc(vap, false);
 	if (vap->iv_ifflags & IFF_ALLMULTI)
 		ieee80211_allmulti(vap, false);
 	IEEE80211_UNLOCK(ic);
 
 	ifmedia_removeall(&vap->iv_media);
 
 	ieee80211_radiotap_vdetach(vap);
 	ieee80211_regdomain_vdetach(vap);
 	ieee80211_scan_vdetach(vap);
 #ifdef IEEE80211_SUPPORT_SUPERG
 	ieee80211_superg_vdetach(vap);
 #endif
 	ieee80211_ht_vdetach(vap);
 	/* NB: must be before ieee80211_node_vdetach */
 	ieee80211_proto_vdetach(vap);
 	ieee80211_crypto_vdetach(vap);
 	ieee80211_power_vdetach(vap);
 	ieee80211_node_vdetach(vap);
 	ieee80211_sysctl_vdetach(vap);
 
 	if_free(ifp);
 
 	CURVNET_RESTORE();
 }
 
 /*
  * Count number of vaps in promisc, and issue promisc on
  * parent respectively.
  */
 void
 ieee80211_promisc(struct ieee80211vap *vap, bool on)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	if (on) {
 		if (++ic->ic_promisc == 1)
 			ieee80211_runtask(ic, &ic->ic_promisc_task);
 	} else {
 		KASSERT(ic->ic_promisc > 0, ("%s: ic %p not promisc",
 		    __func__, ic));
 		if (--ic->ic_promisc == 0)
 			ieee80211_runtask(ic, &ic->ic_promisc_task);
 	}
 }
 
 /*
  * Count number of vaps in allmulti, and issue allmulti on
  * parent respectively.
  */
 void
 ieee80211_allmulti(struct ieee80211vap *vap, bool on)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	if (on) {
 		if (++ic->ic_allmulti == 1)
 			ieee80211_runtask(ic, &ic->ic_mcast_task);
 	} else {
 		KASSERT(ic->ic_allmulti > 0, ("%s: ic %p not allmulti",
 		    __func__, ic));
 		if (--ic->ic_allmulti == 0)
 			ieee80211_runtask(ic, &ic->ic_mcast_task);
 	}
 }
 
 /*
  * Synchronize flag bit state in the com structure
  * according to the state of all vap's.  This is used,
  * for example, to handle state changes via ioctls.
  */
 static void
 ieee80211_syncflag_locked(struct ieee80211com *ic, int flag)
 {
 	struct ieee80211vap *vap;
 	int bit;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	bit = 0;
 	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
 		if (vap->iv_flags & flag) {
 			bit = 1;
 			break;
 		}
 	if (bit)
 		ic->ic_flags |= flag;
 	else
 		ic->ic_flags &= ~flag;
 }
 
 void
 ieee80211_syncflag(struct ieee80211vap *vap, int flag)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	IEEE80211_LOCK(ic);
 	if (flag < 0) {
 		flag = -flag;
 		vap->iv_flags &= ~flag;
 	} else
 		vap->iv_flags |= flag;
 	ieee80211_syncflag_locked(ic, flag);
 	IEEE80211_UNLOCK(ic);
 }
 
 /*
  * Synchronize flags_ht bit state in the com structure
  * according to the state of all vap's.  This is used,
  * for example, to handle state changes via ioctls.
  */
 static void
 ieee80211_syncflag_ht_locked(struct ieee80211com *ic, int flag)
 {
 	struct ieee80211vap *vap;
 	int bit;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	bit = 0;
 	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
 		if (vap->iv_flags_ht & flag) {
 			bit = 1;
 			break;
 		}
 	if (bit)
 		ic->ic_flags_ht |= flag;
 	else
 		ic->ic_flags_ht &= ~flag;
 }
 
 void
 ieee80211_syncflag_ht(struct ieee80211vap *vap, int flag)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	IEEE80211_LOCK(ic);
 	if (flag < 0) {
 		flag = -flag;
 		vap->iv_flags_ht &= ~flag;
 	} else
 		vap->iv_flags_ht |= flag;
 	ieee80211_syncflag_ht_locked(ic, flag);
+	IEEE80211_UNLOCK(ic);
+}
+
+/*
+ * Synchronize flags_vht bit state in the com structure
+ * according to the state of all vap's.  This is used,
+ * for example, to handle state changes via ioctls.
+ */
+static void
+ieee80211_syncflag_vht_locked(struct ieee80211com *ic, int flag)
+{
+	struct ieee80211vap *vap;
+	int bit;
+
+	IEEE80211_LOCK_ASSERT(ic);
+
+	bit = 0;
+	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
+		if (vap->iv_flags_vht & flag) {
+			bit = 1;
+			break;
+		}
+	if (bit)
+		ic->ic_flags_vht |= flag;
+	else
+		ic->ic_flags_vht &= ~flag;
+}
+
+void
+ieee80211_syncflag_vht(struct ieee80211vap *vap, int flag)
+{
+	struct ieee80211com *ic = vap->iv_ic;
+
+	IEEE80211_LOCK(ic);
+	if (flag < 0) {
+		flag = -flag;
+		vap->iv_flags_vht &= ~flag;
+	} else
+		vap->iv_flags_vht |= flag;
+	ieee80211_syncflag_vht_locked(ic, flag);
 	IEEE80211_UNLOCK(ic);
 }
 
 /*
  * Synchronize flags_ext bit state in the com structure
  * according to the state of all vap's.  This is used,
  * for example, to handle state changes via ioctls.
  */
 static void
 ieee80211_syncflag_ext_locked(struct ieee80211com *ic, int flag)
 {
 	struct ieee80211vap *vap;
 	int bit;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	bit = 0;
 	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
 		if (vap->iv_flags_ext & flag) {
 			bit = 1;
 			break;
 		}
 	if (bit)
 		ic->ic_flags_ext |= flag;
 	else
 		ic->ic_flags_ext &= ~flag;
 }
 
 void
 ieee80211_syncflag_ext(struct ieee80211vap *vap, int flag)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	IEEE80211_LOCK(ic);
 	if (flag < 0) {
 		flag = -flag;
 		vap->iv_flags_ext &= ~flag;
 	} else
 		vap->iv_flags_ext |= flag;
 	ieee80211_syncflag_ext_locked(ic, flag);
 	IEEE80211_UNLOCK(ic);
 }
 
 static __inline int
 mapgsm(u_int freq, u_int flags)
 {
 	freq *= 10;
 	if (flags & IEEE80211_CHAN_QUARTER)
 		freq += 5;
 	else if (flags & IEEE80211_CHAN_HALF)
 		freq += 10;
 	else
 		freq += 20;
 	/* NB: there is no 907/20 wide but leave room */
 	return (freq - 906*10) / 5;
 }
 
 static __inline int
 mappsb(u_int freq, u_int flags)
 {
 	return 37 + ((freq * 10) + ((freq % 5) == 2 ? 5 : 0) - 49400) / 5;
 }
 
 /*
  * Convert MHz frequency to IEEE channel number.
  */
 int
 ieee80211_mhz2ieee(u_int freq, u_int flags)
 {
 #define	IS_FREQ_IN_PSB(_freq) ((_freq) > 4940 && (_freq) < 4990)
 	if (flags & IEEE80211_CHAN_GSM)
 		return mapgsm(freq, flags);
 	if (flags & IEEE80211_CHAN_2GHZ) {	/* 2GHz band */
 		if (freq == 2484)
 			return 14;
 		if (freq < 2484)
 			return ((int) freq - 2407) / 5;
 		else
 			return 15 + ((freq - 2512) / 20);
 	} else if (flags & IEEE80211_CHAN_5GHZ) {	/* 5Ghz band */
 		if (freq <= 5000) {
 			/* XXX check regdomain? */
 			if (IS_FREQ_IN_PSB(freq))
 				return mappsb(freq, flags);
 			return (freq - 4000) / 5;
 		} else
 			return (freq - 5000) / 5;
 	} else {				/* either, guess */
 		if (freq == 2484)
 			return 14;
 		if (freq < 2484) {
 			if (907 <= freq && freq <= 922)
 				return mapgsm(freq, flags);
 			return ((int) freq - 2407) / 5;
 		}
 		if (freq < 5000) {
 			if (IS_FREQ_IN_PSB(freq))
 				return mappsb(freq, flags);
 			else if (freq > 4900)
 				return (freq - 4000) / 5;
 			else
 				return 15 + ((freq - 2512) / 20);
 		}
 		return (freq - 5000) / 5;
 	}
 #undef IS_FREQ_IN_PSB
 }
 
 /*
  * Convert channel to IEEE channel number.
  */
 int
 ieee80211_chan2ieee(struct ieee80211com *ic, const struct ieee80211_channel *c)
 {
 	if (c == NULL) {
 		ic_printf(ic, "invalid channel (NULL)\n");
 		return 0;		/* XXX */
 	}
 	return (c == IEEE80211_CHAN_ANYC ?  IEEE80211_CHAN_ANY : c->ic_ieee);
 }
 
 /*
  * Convert IEEE channel number to MHz frequency.
  */
 u_int
 ieee80211_ieee2mhz(u_int chan, u_int flags)
 {
 	if (flags & IEEE80211_CHAN_GSM)
 		return 907 + 5 * (chan / 10);
 	if (flags & IEEE80211_CHAN_2GHZ) {	/* 2GHz band */
 		if (chan == 14)
 			return 2484;
 		if (chan < 14)
 			return 2407 + chan*5;
 		else
 			return 2512 + ((chan-15)*20);
 	} else if (flags & IEEE80211_CHAN_5GHZ) {/* 5Ghz band */
 		if (flags & (IEEE80211_CHAN_HALF|IEEE80211_CHAN_QUARTER)) {
 			chan -= 37;
 			return 4940 + chan*5 + (chan % 5 ? 2 : 0);
 		}
 		return 5000 + (chan*5);
 	} else {				/* either, guess */
 		/* XXX can't distinguish PSB+GSM channels */
 		if (chan == 14)
 			return 2484;
 		if (chan < 14)			/* 0-13 */
 			return 2407 + chan*5;
 		if (chan < 27)			/* 15-26 */
 			return 2512 + ((chan-15)*20);
 		return 5000 + (chan*5);
 	}
 }
 
 static __inline void
 set_extchan(struct ieee80211_channel *c)
 {
 
 	/*
 	 * IEEE Std 802.11-2012, page 1738, subclause 20.3.15.4:
 	 * "the secondary channel number shall be 'N + [1,-1] * 4'
 	 */
 	if (c->ic_flags & IEEE80211_CHAN_HT40U)
 		c->ic_extieee = c->ic_ieee + 4;
 	else if (c->ic_flags & IEEE80211_CHAN_HT40D)
 		c->ic_extieee = c->ic_ieee - 4;
 	else
 		c->ic_extieee = 0;
 }
 
 static int
 addchan(struct ieee80211_channel chans[], int maxchans, int *nchans,
     uint8_t ieee, uint16_t freq, int8_t maxregpower, uint32_t flags)
 {
 	struct ieee80211_channel *c;
 
 	if (*nchans >= maxchans)
 		return (ENOBUFS);
 
 	c = &chans[(*nchans)++];
 	c->ic_ieee = ieee;
 	c->ic_freq = freq != 0 ? freq : ieee80211_ieee2mhz(ieee, flags);
 	c->ic_maxregpower = maxregpower;
 	c->ic_maxpower = 2 * maxregpower;
 	c->ic_flags = flags;
 	set_extchan(c);
 
 	return (0);
 }
 
 static int
 copychan_prev(struct ieee80211_channel chans[], int maxchans, int *nchans,
     uint32_t flags)
 {
 	struct ieee80211_channel *c;
 
 	KASSERT(*nchans > 0, ("channel list is empty\n"));
 
 	if (*nchans >= maxchans)
 		return (ENOBUFS);
 
 	c = &chans[(*nchans)++];
 	c[0] = c[-1];
 	c->ic_flags = flags;
 	set_extchan(c);
 
 	return (0);
 }
 
 static void
 getflags_2ghz(const uint8_t bands[], uint32_t flags[], int ht40)
 {
 	int nmodes;
 
 	nmodes = 0;
 	if (isset(bands, IEEE80211_MODE_11B))
 		flags[nmodes++] = IEEE80211_CHAN_B;
 	if (isset(bands, IEEE80211_MODE_11G))
 		flags[nmodes++] = IEEE80211_CHAN_G;
 	if (isset(bands, IEEE80211_MODE_11NG))
 		flags[nmodes++] = IEEE80211_CHAN_G | IEEE80211_CHAN_HT20;
 	if (ht40) {
 		flags[nmodes++] = IEEE80211_CHAN_G | IEEE80211_CHAN_HT40U;
 		flags[nmodes++] = IEEE80211_CHAN_G | IEEE80211_CHAN_HT40D;
 	}
 	flags[nmodes] = 0;
 }
 
 static void
 getflags_5ghz(const uint8_t bands[], uint32_t flags[], int ht40)
 {
 	int nmodes;
 
 	nmodes = 0;
 	if (isset(bands, IEEE80211_MODE_11A))
 		flags[nmodes++] = IEEE80211_CHAN_A;
 	if (isset(bands, IEEE80211_MODE_11NA))
 		flags[nmodes++] = IEEE80211_CHAN_A | IEEE80211_CHAN_HT20;
 	if (ht40) {
 		flags[nmodes++] = IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U;
 		flags[nmodes++] = IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D;
 	}
 	flags[nmodes] = 0;
 }
 
 static void
 getflags(const uint8_t bands[], uint32_t flags[], int ht40)
 {
 
 	flags[0] = 0;
 	if (isset(bands, IEEE80211_MODE_11A) ||
 	    isset(bands, IEEE80211_MODE_11NA)) {
 		if (isset(bands, IEEE80211_MODE_11B) ||
 		    isset(bands, IEEE80211_MODE_11G) ||
 		    isset(bands, IEEE80211_MODE_11NG))
 			return;
 
 		getflags_5ghz(bands, flags, ht40);
 	} else
 		getflags_2ghz(bands, flags, ht40);
 }
 
 /*
  * Add one 20 MHz channel into specified channel list.
  */
 int
 ieee80211_add_channel(struct ieee80211_channel chans[], int maxchans,
     int *nchans, uint8_t ieee, uint16_t freq, int8_t maxregpower,
     uint32_t chan_flags, const uint8_t bands[])
 {
 	uint32_t flags[IEEE80211_MODE_MAX];
 	int i, error;
 
 	getflags(bands, flags, 0);
 	KASSERT(flags[0] != 0, ("%s: no correct mode provided\n", __func__));
 
 	error = addchan(chans, maxchans, nchans, ieee, freq, maxregpower,
 	    flags[0] | chan_flags);
 	for (i = 1; flags[i] != 0 && error == 0; i++) {
 		error = copychan_prev(chans, maxchans, nchans,
 		    flags[i] | chan_flags);
 	}
 
 	return (error);
 }
 
 static struct ieee80211_channel *
 findchannel(struct ieee80211_channel chans[], int nchans, uint16_t freq,
     uint32_t flags)
 {
 	struct ieee80211_channel *c;
 	int i;
 
 	flags &= IEEE80211_CHAN_ALLTURBO;
 	/* brute force search */
 	for (i = 0; i < nchans; i++) {
 		c = &chans[i];
 		if (c->ic_freq == freq &&
 		    (c->ic_flags & IEEE80211_CHAN_ALLTURBO) == flags)
 			return c;
 	}
 	return NULL;
 }
 
 /*
  * Add 40 MHz channel pair into specified channel list.
  */
 int
 ieee80211_add_channel_ht40(struct ieee80211_channel chans[], int maxchans,
     int *nchans, uint8_t ieee, int8_t maxregpower, uint32_t flags)
 {
 	struct ieee80211_channel *cent, *extc;
 	uint16_t freq;
 	int error;
 
 	freq = ieee80211_ieee2mhz(ieee, flags);
 
 	/*
 	 * Each entry defines an HT40 channel pair; find the
 	 * center channel, then the extension channel above.
 	 */
 	flags |= IEEE80211_CHAN_HT20;
 	cent = findchannel(chans, *nchans, freq, flags);
 	if (cent == NULL)
 		return (EINVAL);
 
 	extc = findchannel(chans, *nchans, freq + 20, flags);
 	if (extc == NULL)
 		return (ENOENT);
 
 	flags &= ~IEEE80211_CHAN_HT;
 	error = addchan(chans, maxchans, nchans, cent->ic_ieee, cent->ic_freq,
 	    maxregpower, flags | IEEE80211_CHAN_HT40U);
 	if (error != 0)
 		return (error);
 
 	error = addchan(chans, maxchans, nchans, extc->ic_ieee, extc->ic_freq,
 	    maxregpower, flags | IEEE80211_CHAN_HT40D);
 
 	return (error);
 }
 
 /*
  * Fetch the center frequency for the primary channel.
  */
 uint32_t
 ieee80211_get_channel_center_freq(const struct ieee80211_channel *c)
 {
 
 	return (c->ic_freq);
 }
 
 /*
  * Fetch the center frequency for the primary BAND channel.
  *
  * For 5, 10, 20MHz channels it'll be the normally configured channel
  * frequency.
  *
  * For 40MHz, 80MHz, 160Mhz channels it'll the the centre of the
  * wide channel, not the centre of the primary channel (that's ic_freq).
  *
  * For 80+80MHz channels this will be the centre of the primary
  * 80MHz channel; the secondary 80MHz channel will be center_freq2().
  */
 
 uint32_t
 ieee80211_get_channel_center_freq1(const struct ieee80211_channel *c)
 {
 
 	if (IEEE80211_IS_CHAN_HT40U(c)) {
 		return (c->ic_freq + 10);
 	}
 	if (IEEE80211_IS_CHAN_HT40D(c)) {
 		return (c->ic_freq - 10);
 	}
 
 	return (c->ic_freq);
 }
 
 /*
  * For now, no 80+80 support; this is zero.
  */
 uint32_t
 ieee80211_get_channel_center_freq2(const struct ieee80211_channel *c)
 {
 
 	return (0);
 }
 
 /*
  * Adds channels into specified channel list (ieee[] array must be sorted).
  * Channels are already sorted.
  */
 static int
 add_chanlist(struct ieee80211_channel chans[], int maxchans, int *nchans,
     const uint8_t ieee[], int nieee, uint32_t flags[])
 {
 	uint16_t freq;
 	int i, j, error;
 
 	for (i = 0; i < nieee; i++) {
 		freq = ieee80211_ieee2mhz(ieee[i], flags[0]);
 		for (j = 0; flags[j] != 0; j++) {
 			if (flags[j] & IEEE80211_CHAN_HT40D)
 				if (i == 0 || ieee[i] < ieee[0] + 4 ||
 				    freq - 20 !=
 				    ieee80211_ieee2mhz(ieee[i] - 4, flags[j]))
 					continue;
 			if (flags[j] & IEEE80211_CHAN_HT40U)
 				if (i == nieee - 1 ||
 				    ieee[i] + 4 > ieee[nieee - 1] ||
 				    freq + 20 !=
 				    ieee80211_ieee2mhz(ieee[i] + 4, flags[j]))
 					continue;
 
 			if (j == 0) {
 				error = addchan(chans, maxchans, nchans,
 				    ieee[i], freq, 0, flags[j]);
 			} else {
 				error = copychan_prev(chans, maxchans, nchans,
 				    flags[j]);
 			}
 			if (error != 0)
 				return (error);
 		}
 	}
 
 	return (0);
 }
 
 int
 ieee80211_add_channel_list_2ghz(struct ieee80211_channel chans[], int maxchans,
     int *nchans, const uint8_t ieee[], int nieee, const uint8_t bands[],
     int ht40)
 {
 	uint32_t flags[IEEE80211_MODE_MAX];
 
 	getflags_2ghz(bands, flags, ht40);
 	KASSERT(flags[0] != 0, ("%s: no correct mode provided\n", __func__));
 
 	return (add_chanlist(chans, maxchans, nchans, ieee, nieee, flags));
 }
 
 int
 ieee80211_add_channel_list_5ghz(struct ieee80211_channel chans[], int maxchans,
     int *nchans, const uint8_t ieee[], int nieee, const uint8_t bands[],
     int ht40)
 {
 	uint32_t flags[IEEE80211_MODE_MAX];
 
 	getflags_5ghz(bands, flags, ht40);
 	KASSERT(flags[0] != 0, ("%s: no correct mode provided\n", __func__));
 
 	return (add_chanlist(chans, maxchans, nchans, ieee, nieee, flags));
 }
 
 /*
  * Locate a channel given a frequency+flags.  We cache
  * the previous lookup to optimize switching between two
  * channels--as happens with dynamic turbo.
  */
 struct ieee80211_channel *
 ieee80211_find_channel(struct ieee80211com *ic, int freq, int flags)
 {
 	struct ieee80211_channel *c;
 
 	flags &= IEEE80211_CHAN_ALLTURBO;
 	c = ic->ic_prevchan;
 	if (c != NULL && c->ic_freq == freq &&
 	    (c->ic_flags & IEEE80211_CHAN_ALLTURBO) == flags)
 		return c;
 	/* brute force search */
 	return (findchannel(ic->ic_channels, ic->ic_nchans, freq, flags));
 }
 
 /*
  * Locate a channel given a channel number+flags.  We cache
  * the previous lookup to optimize switching between two
  * channels--as happens with dynamic turbo.
  */
 struct ieee80211_channel *
 ieee80211_find_channel_byieee(struct ieee80211com *ic, int ieee, int flags)
 {
 	struct ieee80211_channel *c;
 	int i;
 
 	flags &= IEEE80211_CHAN_ALLTURBO;
 	c = ic->ic_prevchan;
 	if (c != NULL && c->ic_ieee == ieee &&
 	    (c->ic_flags & IEEE80211_CHAN_ALLTURBO) == flags)
 		return c;
 	/* brute force search */
 	for (i = 0; i < ic->ic_nchans; i++) {
 		c = &ic->ic_channels[i];
 		if (c->ic_ieee == ieee &&
 		    (c->ic_flags & IEEE80211_CHAN_ALLTURBO) == flags)
 			return c;
 	}
 	return NULL;
 }
 
 /*
  * Lookup a channel suitable for the given rx status.
  *
  * This is used to find a channel for a frame (eg beacon, probe
  * response) based purely on the received PHY information.
  *
  * For now it tries to do it based on R_FREQ / R_IEEE.
  * This is enough for 11bg and 11a (and thus 11ng/11na)
  * but it will not be enough for GSM, PSB channels and the
  * like.  It also doesn't know about legacy-turbog and
  * legacy-turbo modes, which some offload NICs actually
  * support in weird ways.
  *
  * Takes the ic and rxstatus; returns the channel or NULL
  * if not found.
  *
  * XXX TODO: Add support for that when the need arises.
  */
 struct ieee80211_channel *
 ieee80211_lookup_channel_rxstatus(struct ieee80211vap *vap,
     const struct ieee80211_rx_stats *rxs)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	uint32_t flags;
 	struct ieee80211_channel *c;
 
 	if (rxs == NULL)
 		return (NULL);
 
 	/*
 	 * Strictly speaking we only use freq for now,
 	 * however later on we may wish to just store
 	 * the ieee for verification.
 	 */
 	if ((rxs->r_flags & IEEE80211_R_FREQ) == 0)
 		return (NULL);
 	if ((rxs->r_flags & IEEE80211_R_IEEE) == 0)
 		return (NULL);
 
 	/*
 	 * If the rx status contains a valid ieee/freq, then
 	 * ensure we populate the correct channel information
 	 * in rxchan before passing it up to the scan infrastructure.
 	 * Offload NICs will pass up beacons from all channels
 	 * during background scans.
 	 */
 
 	/* Determine a band */
 	/* XXX should be done by the driver? */
 	if (rxs->c_freq < 3000) {
 		flags = IEEE80211_CHAN_G;
 	} else {
 		flags = IEEE80211_CHAN_A;
 	}
 
 	/* Channel lookup */
 	c = ieee80211_find_channel(ic, rxs->c_freq, flags);
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_INPUT,
 	    "%s: freq=%d, ieee=%d, flags=0x%08x; c=%p\n",
 	    __func__,
 	    (int) rxs->c_freq,
 	    (int) rxs->c_ieee,
 	    flags,
 	    c);
 
 	return (c);
 }
 
 static void
 addmedia(struct ifmedia *media, int caps, int addsta, int mode, int mword)
 {
 #define	ADD(_ic, _s, _o) \
 	ifmedia_add(media, \
 		IFM_MAKEWORD(IFM_IEEE80211, (_s), (_o), 0), 0, NULL)
 	static const u_int mopts[IEEE80211_MODE_MAX] = { 
 	    [IEEE80211_MODE_AUTO]	= IFM_AUTO,
 	    [IEEE80211_MODE_11A]	= IFM_IEEE80211_11A,
 	    [IEEE80211_MODE_11B]	= IFM_IEEE80211_11B,
 	    [IEEE80211_MODE_11G]	= IFM_IEEE80211_11G,
 	    [IEEE80211_MODE_FH]		= IFM_IEEE80211_FH,
 	    [IEEE80211_MODE_TURBO_A]	= IFM_IEEE80211_11A|IFM_IEEE80211_TURBO,
 	    [IEEE80211_MODE_TURBO_G]	= IFM_IEEE80211_11G|IFM_IEEE80211_TURBO,
 	    [IEEE80211_MODE_STURBO_A]	= IFM_IEEE80211_11A|IFM_IEEE80211_TURBO,
 	    [IEEE80211_MODE_HALF]	= IFM_IEEE80211_11A,	/* XXX */
 	    [IEEE80211_MODE_QUARTER]	= IFM_IEEE80211_11A,	/* XXX */
 	    [IEEE80211_MODE_11NA]	= IFM_IEEE80211_11NA,
 	    [IEEE80211_MODE_11NG]	= IFM_IEEE80211_11NG,
 	};
 	u_int mopt;
 
 	mopt = mopts[mode];
 	if (addsta)
 		ADD(ic, mword, mopt);	/* STA mode has no cap */
 	if (caps & IEEE80211_C_IBSS)
 		ADD(media, mword, mopt | IFM_IEEE80211_ADHOC);
 	if (caps & IEEE80211_C_HOSTAP)
 		ADD(media, mword, mopt | IFM_IEEE80211_HOSTAP);
 	if (caps & IEEE80211_C_AHDEMO)
 		ADD(media, mword, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0);
 	if (caps & IEEE80211_C_MONITOR)
 		ADD(media, mword, mopt | IFM_IEEE80211_MONITOR);
 	if (caps & IEEE80211_C_WDS)
 		ADD(media, mword, mopt | IFM_IEEE80211_WDS);
 	if (caps & IEEE80211_C_MBSS)
 		ADD(media, mword, mopt | IFM_IEEE80211_MBSS);
 #undef ADD
 }
 
 /*
  * Setup the media data structures according to the channel and
  * rate tables.
  */
 static int
 ieee80211_media_setup(struct ieee80211com *ic,
 	struct ifmedia *media, int caps, int addsta,
 	ifm_change_cb_t media_change, ifm_stat_cb_t media_stat)
 {
 	int i, j, rate, maxrate, mword, r;
 	enum ieee80211_phymode mode;
 	const struct ieee80211_rateset *rs;
 	struct ieee80211_rateset allrates;
 
 	/*
 	 * Fill in media characteristics.
 	 */
 	ifmedia_init(media, 0, media_change, media_stat);
 	maxrate = 0;
 	/*
 	 * Add media for legacy operating modes.
 	 */
 	memset(&allrates, 0, sizeof(allrates));
 	for (mode = IEEE80211_MODE_AUTO; mode < IEEE80211_MODE_11NA; mode++) {
 		if (isclr(ic->ic_modecaps, mode))
 			continue;
 		addmedia(media, caps, addsta, mode, IFM_AUTO);
 		if (mode == IEEE80211_MODE_AUTO)
 			continue;
 		rs = &ic->ic_sup_rates[mode];
 		for (i = 0; i < rs->rs_nrates; i++) {
 			rate = rs->rs_rates[i];
 			mword = ieee80211_rate2media(ic, rate, mode);
 			if (mword == 0)
 				continue;
 			addmedia(media, caps, addsta, mode, mword);
 			/*
 			 * Add legacy rate to the collection of all rates.
 			 */
 			r = rate & IEEE80211_RATE_VAL;
 			for (j = 0; j < allrates.rs_nrates; j++)
 				if (allrates.rs_rates[j] == r)
 					break;
 			if (j == allrates.rs_nrates) {
 				/* unique, add to the set */
 				allrates.rs_rates[j] = r;
 				allrates.rs_nrates++;
 			}
 			rate = (rate & IEEE80211_RATE_VAL) / 2;
 			if (rate > maxrate)
 				maxrate = rate;
 		}
 	}
 	for (i = 0; i < allrates.rs_nrates; i++) {
 		mword = ieee80211_rate2media(ic, allrates.rs_rates[i],
 				IEEE80211_MODE_AUTO);
 		if (mword == 0)
 			continue;
 		/* NB: remove media options from mword */
 		addmedia(media, caps, addsta,
 		    IEEE80211_MODE_AUTO, IFM_SUBTYPE(mword));
 	}
 	/*
 	 * Add HT/11n media.  Note that we do not have enough
 	 * bits in the media subtype to express the MCS so we
 	 * use a "placeholder" media subtype and any fixed MCS
 	 * must be specified with a different mechanism.
 	 */
 	for (; mode <= IEEE80211_MODE_11NG; mode++) {
 		if (isclr(ic->ic_modecaps, mode))
 			continue;
 		addmedia(media, caps, addsta, mode, IFM_AUTO);
 		addmedia(media, caps, addsta, mode, IFM_IEEE80211_MCS);
 	}
 	if (isset(ic->ic_modecaps, IEEE80211_MODE_11NA) ||
 	    isset(ic->ic_modecaps, IEEE80211_MODE_11NG)) {
 		addmedia(media, caps, addsta,
 		    IEEE80211_MODE_AUTO, IFM_IEEE80211_MCS);
 		i = ic->ic_txstream * 8 - 1;
 		if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) &&
 		    (ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI40))
 			rate = ieee80211_htrates[i].ht40_rate_400ns;
 		else if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40))
 			rate = ieee80211_htrates[i].ht40_rate_800ns;
 		else if ((ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI20))
 			rate = ieee80211_htrates[i].ht20_rate_400ns;
 		else
 			rate = ieee80211_htrates[i].ht20_rate_800ns;
 		if (rate > maxrate)
 			maxrate = rate;
 	}
 	return maxrate;
 }
 
 /* XXX inline or eliminate? */
 const struct ieee80211_rateset *
 ieee80211_get_suprates(struct ieee80211com *ic, const struct ieee80211_channel *c)
 {
 	/* XXX does this work for 11ng basic rates? */
 	return &ic->ic_sup_rates[ieee80211_chan2mode(c)];
 }
 
 void
 ieee80211_announce(struct ieee80211com *ic)
 {
 	int i, rate, mword;
 	enum ieee80211_phymode mode;
 	const struct ieee80211_rateset *rs;
 
 	/* NB: skip AUTO since it has no rates */
 	for (mode = IEEE80211_MODE_AUTO+1; mode < IEEE80211_MODE_11NA; mode++) {
 		if (isclr(ic->ic_modecaps, mode))
 			continue;
 		ic_printf(ic, "%s rates: ", ieee80211_phymode_name[mode]);
 		rs = &ic->ic_sup_rates[mode];
 		for (i = 0; i < rs->rs_nrates; i++) {
 			mword = ieee80211_rate2media(ic, rs->rs_rates[i], mode);
 			if (mword == 0)
 				continue;
 			rate = ieee80211_media2rate(mword);
 			printf("%s%d%sMbps", (i != 0 ? " " : ""),
 			    rate / 2, ((rate & 0x1) != 0 ? ".5" : ""));
 		}
 		printf("\n");
 	}
 	ieee80211_ht_announce(ic);
 }
 
 void
 ieee80211_announce_channels(struct ieee80211com *ic)
 {
 	const struct ieee80211_channel *c;
 	char type;
 	int i, cw;
 
 	printf("Chan  Freq  CW  RegPwr  MinPwr  MaxPwr\n");
 	for (i = 0; i < ic->ic_nchans; i++) {
 		c = &ic->ic_channels[i];
 		if (IEEE80211_IS_CHAN_ST(c))
 			type = 'S';
 		else if (IEEE80211_IS_CHAN_108A(c))
 			type = 'T';
 		else if (IEEE80211_IS_CHAN_108G(c))
 			type = 'G';
 		else if (IEEE80211_IS_CHAN_HT(c))
 			type = 'n';
 		else if (IEEE80211_IS_CHAN_A(c))
 			type = 'a';
 		else if (IEEE80211_IS_CHAN_ANYG(c))
 			type = 'g';
 		else if (IEEE80211_IS_CHAN_B(c))
 			type = 'b';
 		else
 			type = 'f';
 		if (IEEE80211_IS_CHAN_HT40(c) || IEEE80211_IS_CHAN_TURBO(c))
 			cw = 40;
 		else if (IEEE80211_IS_CHAN_HALF(c))
 			cw = 10;
 		else if (IEEE80211_IS_CHAN_QUARTER(c))
 			cw = 5;
 		else
 			cw = 20;
 		printf("%4d  %4d%c %2d%c %6d  %4d.%d  %4d.%d\n"
 			, c->ic_ieee, c->ic_freq, type
 			, cw
 			, IEEE80211_IS_CHAN_HT40U(c) ? '+' :
 			  IEEE80211_IS_CHAN_HT40D(c) ? '-' : ' '
 			, c->ic_maxregpower
 			, c->ic_minpower / 2, c->ic_minpower & 1 ? 5 : 0
 			, c->ic_maxpower / 2, c->ic_maxpower & 1 ? 5 : 0
 		);
 	}
 }
 
 static int
 media2mode(const struct ifmedia_entry *ime, uint32_t flags, uint16_t *mode)
 {
 	switch (IFM_MODE(ime->ifm_media)) {
 	case IFM_IEEE80211_11A:
 		*mode = IEEE80211_MODE_11A;
 		break;
 	case IFM_IEEE80211_11B:
 		*mode = IEEE80211_MODE_11B;
 		break;
 	case IFM_IEEE80211_11G:
 		*mode = IEEE80211_MODE_11G;
 		break;
 	case IFM_IEEE80211_FH:
 		*mode = IEEE80211_MODE_FH;
 		break;
 	case IFM_IEEE80211_11NA:
 		*mode = IEEE80211_MODE_11NA;
 		break;
 	case IFM_IEEE80211_11NG:
 		*mode = IEEE80211_MODE_11NG;
 		break;
 	case IFM_AUTO:
 		*mode = IEEE80211_MODE_AUTO;
 		break;
 	default:
 		return 0;
 	}
 	/*
 	 * Turbo mode is an ``option''.
 	 * XXX does not apply to AUTO
 	 */
 	if (ime->ifm_media & IFM_IEEE80211_TURBO) {
 		if (*mode == IEEE80211_MODE_11A) {
 			if (flags & IEEE80211_F_TURBOP)
 				*mode = IEEE80211_MODE_TURBO_A;
 			else
 				*mode = IEEE80211_MODE_STURBO_A;
 		} else if (*mode == IEEE80211_MODE_11G)
 			*mode = IEEE80211_MODE_TURBO_G;
 		else
 			return 0;
 	}
 	/* XXX HT40 +/- */
 	return 1;
 }
 
 /*
  * Handle a media change request on the vap interface.
  */
 int
 ieee80211_media_change(struct ifnet *ifp)
 {
 	struct ieee80211vap *vap = ifp->if_softc;
 	struct ifmedia_entry *ime = vap->iv_media.ifm_cur;
 	uint16_t newmode;
 
 	if (!media2mode(ime, vap->iv_flags, &newmode))
 		return EINVAL;
 	if (vap->iv_des_mode != newmode) {
 		vap->iv_des_mode = newmode;
 		/* XXX kick state machine if up+running */
 	}
 	return 0;
 }
 
 /*
  * Common code to calculate the media status word
  * from the operating mode and channel state.
  */
 static int
 media_status(enum ieee80211_opmode opmode, const struct ieee80211_channel *chan)
 {
 	int status;
 
 	status = IFM_IEEE80211;
 	switch (opmode) {
 	case IEEE80211_M_STA:
 		break;
 	case IEEE80211_M_IBSS:
 		status |= IFM_IEEE80211_ADHOC;
 		break;
 	case IEEE80211_M_HOSTAP:
 		status |= IFM_IEEE80211_HOSTAP;
 		break;
 	case IEEE80211_M_MONITOR:
 		status |= IFM_IEEE80211_MONITOR;
 		break;
 	case IEEE80211_M_AHDEMO:
 		status |= IFM_IEEE80211_ADHOC | IFM_FLAG0;
 		break;
 	case IEEE80211_M_WDS:
 		status |= IFM_IEEE80211_WDS;
 		break;
 	case IEEE80211_M_MBSS:
 		status |= IFM_IEEE80211_MBSS;
 		break;
 	}
 	if (IEEE80211_IS_CHAN_HTA(chan)) {
 		status |= IFM_IEEE80211_11NA;
 	} else if (IEEE80211_IS_CHAN_HTG(chan)) {
 		status |= IFM_IEEE80211_11NG;
 	} else if (IEEE80211_IS_CHAN_A(chan)) {
 		status |= IFM_IEEE80211_11A;
 	} else if (IEEE80211_IS_CHAN_B(chan)) {
 		status |= IFM_IEEE80211_11B;
 	} else if (IEEE80211_IS_CHAN_ANYG(chan)) {
 		status |= IFM_IEEE80211_11G;
 	} else if (IEEE80211_IS_CHAN_FHSS(chan)) {
 		status |= IFM_IEEE80211_FH;
 	}
 	/* XXX else complain? */
 
 	if (IEEE80211_IS_CHAN_TURBO(chan))
 		status |= IFM_IEEE80211_TURBO;
 #if 0
 	if (IEEE80211_IS_CHAN_HT20(chan))
 		status |= IFM_IEEE80211_HT20;
 	if (IEEE80211_IS_CHAN_HT40(chan))
 		status |= IFM_IEEE80211_HT40;
 #endif
 	return status;
 }
 
 void
 ieee80211_media_status(struct ifnet *ifp, struct ifmediareq *imr)
 {
 	struct ieee80211vap *vap = ifp->if_softc;
 	struct ieee80211com *ic = vap->iv_ic;
 	enum ieee80211_phymode mode;
 
 	imr->ifm_status = IFM_AVALID;
 	/*
 	 * NB: use the current channel's mode to lock down a xmit
 	 * rate only when running; otherwise we may have a mismatch
 	 * in which case the rate will not be convertible.
 	 */
 	if (vap->iv_state == IEEE80211_S_RUN ||
 	    vap->iv_state == IEEE80211_S_SLEEP) {
 		imr->ifm_status |= IFM_ACTIVE;
 		mode = ieee80211_chan2mode(ic->ic_curchan);
 	} else
 		mode = IEEE80211_MODE_AUTO;
 	imr->ifm_active = media_status(vap->iv_opmode, ic->ic_curchan);
 	/*
 	 * Calculate a current rate if possible.
 	 */
 	if (vap->iv_txparms[mode].ucastrate != IEEE80211_FIXED_RATE_NONE) {
 		/*
 		 * A fixed rate is set, report that.
 		 */
 		imr->ifm_active |= ieee80211_rate2media(ic,
 			vap->iv_txparms[mode].ucastrate, mode);
 	} else if (vap->iv_opmode == IEEE80211_M_STA) {
 		/*
 		 * In station mode report the current transmit rate.
 		 */
 		imr->ifm_active |= ieee80211_rate2media(ic,
 			vap->iv_bss->ni_txrate, mode);
 	} else
 		imr->ifm_active |= IFM_AUTO;
 	if (imr->ifm_status & IFM_ACTIVE)
 		imr->ifm_current = imr->ifm_active;
 }
 
 /*
  * Set the current phy mode and recalculate the active channel
  * set based on the available channels for this mode.  Also
  * select a new default/current channel if the current one is
  * inappropriate for this mode.
  */
 int
 ieee80211_setmode(struct ieee80211com *ic, enum ieee80211_phymode mode)
 {
 	/*
 	 * Adjust basic rates in 11b/11g supported rate set.
 	 * Note that if operating on a hal/quarter rate channel
 	 * this is a noop as those rates sets are different
 	 * and used instead.
 	 */
 	if (mode == IEEE80211_MODE_11G || mode == IEEE80211_MODE_11B)
 		ieee80211_setbasicrates(&ic->ic_sup_rates[mode], mode);
 
 	ic->ic_curmode = mode;
 	ieee80211_reset_erp(ic);	/* reset ERP state */
 
 	return 0;
 }
 
 /*
  * Return the phy mode for with the specified channel.
  */
 enum ieee80211_phymode
 ieee80211_chan2mode(const struct ieee80211_channel *chan)
 {
 
 	if (IEEE80211_IS_CHAN_HTA(chan))
 		return IEEE80211_MODE_11NA;
 	else if (IEEE80211_IS_CHAN_HTG(chan))
 		return IEEE80211_MODE_11NG;
 	else if (IEEE80211_IS_CHAN_108G(chan))
 		return IEEE80211_MODE_TURBO_G;
 	else if (IEEE80211_IS_CHAN_ST(chan))
 		return IEEE80211_MODE_STURBO_A;
 	else if (IEEE80211_IS_CHAN_TURBO(chan))
 		return IEEE80211_MODE_TURBO_A;
 	else if (IEEE80211_IS_CHAN_HALF(chan))
 		return IEEE80211_MODE_HALF;
 	else if (IEEE80211_IS_CHAN_QUARTER(chan))
 		return IEEE80211_MODE_QUARTER;
 	else if (IEEE80211_IS_CHAN_A(chan))
 		return IEEE80211_MODE_11A;
 	else if (IEEE80211_IS_CHAN_ANYG(chan))
 		return IEEE80211_MODE_11G;
 	else if (IEEE80211_IS_CHAN_B(chan))
 		return IEEE80211_MODE_11B;
 	else if (IEEE80211_IS_CHAN_FHSS(chan))
 		return IEEE80211_MODE_FH;
 
 	/* NB: should not get here */
 	printf("%s: cannot map channel to mode; freq %u flags 0x%x\n",
 		__func__, chan->ic_freq, chan->ic_flags);
 	return IEEE80211_MODE_11B;
 }
 
 struct ratemedia {
 	u_int	match;	/* rate + mode */
 	u_int	media;	/* if_media rate */
 };
 
 static int
 findmedia(const struct ratemedia rates[], int n, u_int match)
 {
 	int i;
 
 	for (i = 0; i < n; i++)
 		if (rates[i].match == match)
 			return rates[i].media;
 	return IFM_AUTO;
 }
 
 /*
  * Convert IEEE80211 rate value to ifmedia subtype.
  * Rate is either a legacy rate in units of 0.5Mbps
  * or an MCS index.
  */
 int
 ieee80211_rate2media(struct ieee80211com *ic, int rate, enum ieee80211_phymode mode)
 {
 	static const struct ratemedia rates[] = {
 		{   2 | IFM_IEEE80211_FH, IFM_IEEE80211_FH1 },
 		{   4 | IFM_IEEE80211_FH, IFM_IEEE80211_FH2 },
 		{   2 | IFM_IEEE80211_11B, IFM_IEEE80211_DS1 },
 		{   4 | IFM_IEEE80211_11B, IFM_IEEE80211_DS2 },
 		{  11 | IFM_IEEE80211_11B, IFM_IEEE80211_DS5 },
 		{  22 | IFM_IEEE80211_11B, IFM_IEEE80211_DS11 },
 		{  44 | IFM_IEEE80211_11B, IFM_IEEE80211_DS22 },
 		{  12 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM6 },
 		{  18 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM9 },
 		{  24 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM12 },
 		{  36 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM18 },
 		{  48 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM24 },
 		{  72 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM36 },
 		{  96 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM48 },
 		{ 108 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM54 },
 		{   2 | IFM_IEEE80211_11G, IFM_IEEE80211_DS1 },
 		{   4 | IFM_IEEE80211_11G, IFM_IEEE80211_DS2 },
 		{  11 | IFM_IEEE80211_11G, IFM_IEEE80211_DS5 },
 		{  22 | IFM_IEEE80211_11G, IFM_IEEE80211_DS11 },
 		{  12 | IFM_IEEE80211_11G, IFM_IEEE80211_OFDM6 },
 		{  18 | IFM_IEEE80211_11G, IFM_IEEE80211_OFDM9 },
 		{  24 | IFM_IEEE80211_11G, IFM_IEEE80211_OFDM12 },
 		{  36 | IFM_IEEE80211_11G, IFM_IEEE80211_OFDM18 },
 		{  48 | IFM_IEEE80211_11G, IFM_IEEE80211_OFDM24 },
 		{  72 | IFM_IEEE80211_11G, IFM_IEEE80211_OFDM36 },
 		{  96 | IFM_IEEE80211_11G, IFM_IEEE80211_OFDM48 },
 		{ 108 | IFM_IEEE80211_11G, IFM_IEEE80211_OFDM54 },
 		{   6 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM3 },
 		{   9 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM4 },
 		{  54 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM27 },
 		/* NB: OFDM72 doesn't really exist so we don't handle it */
 	};
 	static const struct ratemedia htrates[] = {
 		{   0, IFM_IEEE80211_MCS },
 		{   1, IFM_IEEE80211_MCS },
 		{   2, IFM_IEEE80211_MCS },
 		{   3, IFM_IEEE80211_MCS },
 		{   4, IFM_IEEE80211_MCS },
 		{   5, IFM_IEEE80211_MCS },
 		{   6, IFM_IEEE80211_MCS },
 		{   7, IFM_IEEE80211_MCS },
 		{   8, IFM_IEEE80211_MCS },
 		{   9, IFM_IEEE80211_MCS },
 		{  10, IFM_IEEE80211_MCS },
 		{  11, IFM_IEEE80211_MCS },
 		{  12, IFM_IEEE80211_MCS },
 		{  13, IFM_IEEE80211_MCS },
 		{  14, IFM_IEEE80211_MCS },
 		{  15, IFM_IEEE80211_MCS },
 		{  16, IFM_IEEE80211_MCS },
 		{  17, IFM_IEEE80211_MCS },
 		{  18, IFM_IEEE80211_MCS },
 		{  19, IFM_IEEE80211_MCS },
 		{  20, IFM_IEEE80211_MCS },
 		{  21, IFM_IEEE80211_MCS },
 		{  22, IFM_IEEE80211_MCS },
 		{  23, IFM_IEEE80211_MCS },
 		{  24, IFM_IEEE80211_MCS },
 		{  25, IFM_IEEE80211_MCS },
 		{  26, IFM_IEEE80211_MCS },
 		{  27, IFM_IEEE80211_MCS },
 		{  28, IFM_IEEE80211_MCS },
 		{  29, IFM_IEEE80211_MCS },
 		{  30, IFM_IEEE80211_MCS },
 		{  31, IFM_IEEE80211_MCS },
 		{  32, IFM_IEEE80211_MCS },
 		{  33, IFM_IEEE80211_MCS },
 		{  34, IFM_IEEE80211_MCS },
 		{  35, IFM_IEEE80211_MCS },
 		{  36, IFM_IEEE80211_MCS },
 		{  37, IFM_IEEE80211_MCS },
 		{  38, IFM_IEEE80211_MCS },
 		{  39, IFM_IEEE80211_MCS },
 		{  40, IFM_IEEE80211_MCS },
 		{  41, IFM_IEEE80211_MCS },
 		{  42, IFM_IEEE80211_MCS },
 		{  43, IFM_IEEE80211_MCS },
 		{  44, IFM_IEEE80211_MCS },
 		{  45, IFM_IEEE80211_MCS },
 		{  46, IFM_IEEE80211_MCS },
 		{  47, IFM_IEEE80211_MCS },
 		{  48, IFM_IEEE80211_MCS },
 		{  49, IFM_IEEE80211_MCS },
 		{  50, IFM_IEEE80211_MCS },
 		{  51, IFM_IEEE80211_MCS },
 		{  52, IFM_IEEE80211_MCS },
 		{  53, IFM_IEEE80211_MCS },
 		{  54, IFM_IEEE80211_MCS },
 		{  55, IFM_IEEE80211_MCS },
 		{  56, IFM_IEEE80211_MCS },
 		{  57, IFM_IEEE80211_MCS },
 		{  58, IFM_IEEE80211_MCS },
 		{  59, IFM_IEEE80211_MCS },
 		{  60, IFM_IEEE80211_MCS },
 		{  61, IFM_IEEE80211_MCS },
 		{  62, IFM_IEEE80211_MCS },
 		{  63, IFM_IEEE80211_MCS },
 		{  64, IFM_IEEE80211_MCS },
 		{  65, IFM_IEEE80211_MCS },
 		{  66, IFM_IEEE80211_MCS },
 		{  67, IFM_IEEE80211_MCS },
 		{  68, IFM_IEEE80211_MCS },
 		{  69, IFM_IEEE80211_MCS },
 		{  70, IFM_IEEE80211_MCS },
 		{  71, IFM_IEEE80211_MCS },
 		{  72, IFM_IEEE80211_MCS },
 		{  73, IFM_IEEE80211_MCS },
 		{  74, IFM_IEEE80211_MCS },
 		{  75, IFM_IEEE80211_MCS },
 		{  76, IFM_IEEE80211_MCS },
 	};
 	int m;
 
 	/*
 	 * Check 11n rates first for match as an MCS.
 	 */
 	if (mode == IEEE80211_MODE_11NA) {
 		if (rate & IEEE80211_RATE_MCS) {
 			rate &= ~IEEE80211_RATE_MCS;
 			m = findmedia(htrates, nitems(htrates), rate);
 			if (m != IFM_AUTO)
 				return m | IFM_IEEE80211_11NA;
 		}
 	} else if (mode == IEEE80211_MODE_11NG) {
 		/* NB: 12 is ambiguous, it will be treated as an MCS */
 		if (rate & IEEE80211_RATE_MCS) {
 			rate &= ~IEEE80211_RATE_MCS;
 			m = findmedia(htrates, nitems(htrates), rate);
 			if (m != IFM_AUTO)
 				return m | IFM_IEEE80211_11NG;
 		}
 	}
 	rate &= IEEE80211_RATE_VAL;
 	switch (mode) {
 	case IEEE80211_MODE_11A:
 	case IEEE80211_MODE_HALF:		/* XXX good 'nuf */
 	case IEEE80211_MODE_QUARTER:
 	case IEEE80211_MODE_11NA:
 	case IEEE80211_MODE_TURBO_A:
 	case IEEE80211_MODE_STURBO_A:
 		return findmedia(rates, nitems(rates), 
 		    rate | IFM_IEEE80211_11A);
 	case IEEE80211_MODE_11B:
 		return findmedia(rates, nitems(rates), 
 		    rate | IFM_IEEE80211_11B);
 	case IEEE80211_MODE_FH:
 		return findmedia(rates, nitems(rates), 
 		    rate | IFM_IEEE80211_FH);
 	case IEEE80211_MODE_AUTO:
 		/* NB: ic may be NULL for some drivers */
 		if (ic != NULL && ic->ic_phytype == IEEE80211_T_FH)
 			return findmedia(rates, nitems(rates),
 			    rate | IFM_IEEE80211_FH);
 		/* NB: hack, 11g matches both 11b+11a rates */
 		/* fall thru... */
 	case IEEE80211_MODE_11G:
 	case IEEE80211_MODE_11NG:
 	case IEEE80211_MODE_TURBO_G:
 		return findmedia(rates, nitems(rates), rate | IFM_IEEE80211_11G);
 	case IEEE80211_MODE_VHT_2GHZ:
 	case IEEE80211_MODE_VHT_5GHZ:
 		/* XXX TODO: need to figure out mapping for VHT rates */
 		return IFM_AUTO;
 	}
 	return IFM_AUTO;
 }
 
 int
 ieee80211_media2rate(int mword)
 {
 	static const int ieeerates[] = {
 		-1,		/* IFM_AUTO */
 		0,		/* IFM_MANUAL */
 		0,		/* IFM_NONE */
 		2,		/* IFM_IEEE80211_FH1 */
 		4,		/* IFM_IEEE80211_FH2 */
 		2,		/* IFM_IEEE80211_DS1 */
 		4,		/* IFM_IEEE80211_DS2 */
 		11,		/* IFM_IEEE80211_DS5 */
 		22,		/* IFM_IEEE80211_DS11 */
 		44,		/* IFM_IEEE80211_DS22 */
 		12,		/* IFM_IEEE80211_OFDM6 */
 		18,		/* IFM_IEEE80211_OFDM9 */
 		24,		/* IFM_IEEE80211_OFDM12 */
 		36,		/* IFM_IEEE80211_OFDM18 */
 		48,		/* IFM_IEEE80211_OFDM24 */
 		72,		/* IFM_IEEE80211_OFDM36 */
 		96,		/* IFM_IEEE80211_OFDM48 */
 		108,		/* IFM_IEEE80211_OFDM54 */
 		144,		/* IFM_IEEE80211_OFDM72 */
 		0,		/* IFM_IEEE80211_DS354k */
 		0,		/* IFM_IEEE80211_DS512k */
 		6,		/* IFM_IEEE80211_OFDM3 */
 		9,		/* IFM_IEEE80211_OFDM4 */
 		54,		/* IFM_IEEE80211_OFDM27 */
 		-1,		/* IFM_IEEE80211_MCS */
 		-1,		/* IFM_IEEE80211_VHT */
 	};
 	return IFM_SUBTYPE(mword) < nitems(ieeerates) ?
 		ieeerates[IFM_SUBTYPE(mword)] : 0;
 }
 
 /*
  * The following hash function is adapted from "Hash Functions" by Bob Jenkins
  * ("Algorithm Alley", Dr. Dobbs Journal, September 1997).
  */
 #define	mix(a, b, c)							\
 do {									\
 	a -= b; a -= c; a ^= (c >> 13);					\
 	b -= c; b -= a; b ^= (a << 8);					\
 	c -= a; c -= b; c ^= (b >> 13);					\
 	a -= b; a -= c; a ^= (c >> 12);					\
 	b -= c; b -= a; b ^= (a << 16);					\
 	c -= a; c -= b; c ^= (b >> 5);					\
 	a -= b; a -= c; a ^= (c >> 3);					\
 	b -= c; b -= a; b ^= (a << 10);					\
 	c -= a; c -= b; c ^= (b >> 15);					\
 } while (/*CONSTCOND*/0)
 
 uint32_t
 ieee80211_mac_hash(const struct ieee80211com *ic,
 	const uint8_t addr[IEEE80211_ADDR_LEN])
 {
 	uint32_t a = 0x9e3779b9, b = 0x9e3779b9, c = ic->ic_hash_key;
 
 	b += addr[5] << 8;
 	b += addr[4];
 	a += addr[3] << 24;
 	a += addr[2] << 16;
 	a += addr[1] << 8;
 	a += addr[0];
 
 	mix(a, b, c);
 
 	return c;
 }
 #undef mix
 
 char
 ieee80211_channel_type_char(const struct ieee80211_channel *c)
 {
 	if (IEEE80211_IS_CHAN_ST(c))
 		return 'S';
 	if (IEEE80211_IS_CHAN_108A(c))
 		return 'T';
 	if (IEEE80211_IS_CHAN_108G(c))
 		return 'G';
 	if (IEEE80211_IS_CHAN_VHT(c))
 		return 'v';
 	if (IEEE80211_IS_CHAN_HT(c))
 		return 'n';
 	if (IEEE80211_IS_CHAN_A(c))
 		return 'a';
 	if (IEEE80211_IS_CHAN_ANYG(c))
 		return 'g';
 	if (IEEE80211_IS_CHAN_B(c))
 		return 'b';
 	return 'f';
 }
Index: projects/bsnmp-ipv6-mib/sys/net80211/ieee80211.h
===================================================================
--- projects/bsnmp-ipv6-mib/sys/net80211/ieee80211.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/net80211/ieee80211.h	(revision 311637)
@@ -1,1405 +1,1404 @@
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 #ifndef _NET80211_IEEE80211_H_
 #define _NET80211_IEEE80211_H_
 
 /*
  * 802.11 protocol definitions.
  */
 
 #define	IEEE80211_ADDR_LEN	6		/* size of 802.11 address */
 /* is 802.11 address multicast/broadcast? */
 #define	IEEE80211_IS_MULTICAST(_a)	(*(_a) & 0x01)
 
 #ifdef _KERNEL
 extern const uint8_t ieee80211broadcastaddr[];
 #endif
 
 typedef uint16_t ieee80211_seq;
 
 /* IEEE 802.11 PLCP header */
 struct ieee80211_plcp_hdr {
 	uint16_t	i_sfd;
 	uint8_t		i_signal;
 	uint8_t		i_service;
 	uint16_t	i_length;
 	uint16_t	i_crc;
 } __packed;
 
 #define IEEE80211_PLCP_SFD      0xF3A0 
 #define IEEE80211_PLCP_SERVICE  0x00
 #define IEEE80211_PLCP_SERVICE_LOCKED	0x04
 #define IEEE80211_PLCL_SERVICE_PBCC	0x08
 #define IEEE80211_PLCP_SERVICE_LENEXT5	0x20
 #define IEEE80211_PLCP_SERVICE_LENEXT6	0x40
 #define IEEE80211_PLCP_SERVICE_LENEXT7	0x80
 
 /*
  * generic definitions for IEEE 802.11 frames
  */
 struct ieee80211_frame {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
 	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
 	uint8_t		i_addr3[IEEE80211_ADDR_LEN];
 	uint8_t		i_seq[2];
 	/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
 	/* see below */
 } __packed;
 
 struct ieee80211_qosframe {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
 	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
 	uint8_t		i_addr3[IEEE80211_ADDR_LEN];
 	uint8_t		i_seq[2];
 	uint8_t		i_qos[2];
 	/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
 	/* see below */
 } __packed;
 
 struct ieee80211_qoscntl {
 	uint8_t		i_qos[2];
 };
 
 struct ieee80211_frame_addr4 {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
 	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
 	uint8_t		i_addr3[IEEE80211_ADDR_LEN];
 	uint8_t		i_seq[2];
 	uint8_t		i_addr4[IEEE80211_ADDR_LEN];
 } __packed;
 
 
 struct ieee80211_qosframe_addr4 {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
 	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
 	uint8_t		i_addr3[IEEE80211_ADDR_LEN];
 	uint8_t		i_seq[2];
 	uint8_t		i_addr4[IEEE80211_ADDR_LEN];
 	uint8_t		i_qos[2];
 } __packed;
 
 #define	IEEE80211_FC0_VERSION_MASK		0x03
 #define	IEEE80211_FC0_VERSION_SHIFT		0
 #define	IEEE80211_FC0_VERSION_0			0x00
 #define	IEEE80211_FC0_TYPE_MASK			0x0c
 #define	IEEE80211_FC0_TYPE_SHIFT		2
 #define	IEEE80211_FC0_TYPE_MGT			0x00
 #define	IEEE80211_FC0_TYPE_CTL			0x04
 #define	IEEE80211_FC0_TYPE_DATA			0x08
 
 #define	IEEE80211_FC0_SUBTYPE_MASK		0xf0
 #define	IEEE80211_FC0_SUBTYPE_SHIFT		4
 /* for TYPE_MGT */
 #define	IEEE80211_FC0_SUBTYPE_ASSOC_REQ		0x00
 #define	IEEE80211_FC0_SUBTYPE_ASSOC_RESP	0x10
 #define	IEEE80211_FC0_SUBTYPE_REASSOC_REQ	0x20
 #define	IEEE80211_FC0_SUBTYPE_REASSOC_RESP	0x30
 #define	IEEE80211_FC0_SUBTYPE_PROBE_REQ		0x40
 #define	IEEE80211_FC0_SUBTYPE_PROBE_RESP	0x50
 #define	IEEE80211_FC0_SUBTYPE_TIMING_ADV	0x60
 #define	IEEE80211_FC0_SUBTYPE_BEACON		0x80
 #define	IEEE80211_FC0_SUBTYPE_ATIM		0x90
 #define	IEEE80211_FC0_SUBTYPE_DISASSOC		0xa0
 #define	IEEE80211_FC0_SUBTYPE_AUTH		0xb0
 #define	IEEE80211_FC0_SUBTYPE_DEAUTH		0xc0
 #define	IEEE80211_FC0_SUBTYPE_ACTION		0xd0
 #define	IEEE80211_FC0_SUBTYPE_ACTION_NOACK	0xe0
 /* for TYPE_CTL */
 #define	IEEE80211_FC0_SUBTYPE_CONTROL_WRAP	0x70
 #define	IEEE80211_FC0_SUBTYPE_BAR		0x80
 #define	IEEE80211_FC0_SUBTYPE_BA		0x90
 #define	IEEE80211_FC0_SUBTYPE_PS_POLL		0xa0
 #define	IEEE80211_FC0_SUBTYPE_RTS		0xb0
 #define	IEEE80211_FC0_SUBTYPE_CTS		0xc0
 #define	IEEE80211_FC0_SUBTYPE_ACK		0xd0
 #define	IEEE80211_FC0_SUBTYPE_CF_END		0xe0
 #define	IEEE80211_FC0_SUBTYPE_CF_END_ACK	0xf0
 /* for TYPE_DATA (bit combination) */
 #define	IEEE80211_FC0_SUBTYPE_DATA		0x00
 #define	IEEE80211_FC0_SUBTYPE_CF_ACK		0x10
 #define	IEEE80211_FC0_SUBTYPE_CF_POLL		0x20
 #define	IEEE80211_FC0_SUBTYPE_CF_ACPL		0x30
 #define	IEEE80211_FC0_SUBTYPE_NODATA		0x40
 #define	IEEE80211_FC0_SUBTYPE_CFACK		0x50
 #define	IEEE80211_FC0_SUBTYPE_CFPOLL		0x60
 #define	IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK	0x70
 #define	IEEE80211_FC0_SUBTYPE_QOS		0x80
 #define	IEEE80211_FC0_SUBTYPE_QOS_CFACK		0x90
 #define	IEEE80211_FC0_SUBTYPE_QOS_CFPOLL	0xa0
 #define	IEEE80211_FC0_SUBTYPE_QOS_CFACKPOLL	0xb0
 #define	IEEE80211_FC0_SUBTYPE_QOS_NULL		0xc0
 
 #define	IEEE80211_IS_MGMT(wh)					\
 	(!! (((wh)->i_fc[0] & IEEE80211_FC0_TYPE_MASK)		\
 	    == IEEE80211_FC0_TYPE_MGT))
 
 #define	IEEE80211_FC0_QOSDATA \
 	(IEEE80211_FC0_TYPE_DATA|IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_VERSION_0)
 
 #define	IEEE80211_IS_QOSDATA(wh) \
 	((wh)->i_fc[0] == IEEE80211_FC0_QOSDATA)
 
 #define	IEEE80211_FC1_DIR_MASK			0x03
 #define	IEEE80211_FC1_DIR_NODS			0x00	/* STA->STA */
 #define	IEEE80211_FC1_DIR_TODS			0x01	/* STA->AP  */
 #define	IEEE80211_FC1_DIR_FROMDS		0x02	/* AP ->STA */
 #define	IEEE80211_FC1_DIR_DSTODS		0x03	/* AP ->AP  */
 
 #define	IEEE80211_IS_DSTODS(wh) \
 	(((wh)->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
 
 #define	IEEE80211_FC1_MORE_FRAG			0x04
 #define	IEEE80211_FC1_RETRY			0x08
 #define	IEEE80211_FC1_PWR_MGT			0x10
 #define	IEEE80211_FC1_MORE_DATA			0x20
 #define	IEEE80211_FC1_PROTECTED			0x40
 #define	IEEE80211_FC1_ORDER			0x80
 
 #define IEEE80211_HAS_SEQ(type, subtype) \
 	((type) != IEEE80211_FC0_TYPE_CTL && \
 	!((type) == IEEE80211_FC0_TYPE_DATA && \
 	 ((subtype) & IEEE80211_FC0_SUBTYPE_QOS_NULL) == \
 		      IEEE80211_FC0_SUBTYPE_QOS_NULL))
 #define	IEEE80211_SEQ_FRAG_MASK			0x000f
 #define	IEEE80211_SEQ_FRAG_SHIFT		0
 #define	IEEE80211_SEQ_SEQ_MASK			0xfff0
 #define	IEEE80211_SEQ_SEQ_SHIFT			4
 #define	IEEE80211_SEQ_RANGE			4096
 
 #define	IEEE80211_SEQ_ADD(seq, incr) \
 	(((seq) + (incr)) & (IEEE80211_SEQ_RANGE-1))
 #define	IEEE80211_SEQ_INC(seq)	IEEE80211_SEQ_ADD(seq,1)
 #define	IEEE80211_SEQ_SUB(a, b) \
 	(((a) + IEEE80211_SEQ_RANGE - (b)) & (IEEE80211_SEQ_RANGE-1))
 
 #define	IEEE80211_SEQ_BA_RANGE			2048	/* 2^11 */
 #define	IEEE80211_SEQ_BA_BEFORE(a, b) \
 	(IEEE80211_SEQ_SUB(b, a+1) < IEEE80211_SEQ_BA_RANGE-1)
 
 #define	IEEE80211_NWID_LEN			32
 #define	IEEE80211_MESHID_LEN			32
 
 #define	IEEE80211_QOS_CTL_LEN			2
 
 #define	IEEE80211_QOS_TXOP			0x00ff
 /* bit 8 is reserved */
 #define	IEEE80211_QOS_AMSDU			0x80
 #define	IEEE80211_QOS_AMSDU_S			7
 #define	IEEE80211_QOS_ACKPOLICY			0x60
 #define	IEEE80211_QOS_ACKPOLICY_S		5
 #define	IEEE80211_QOS_ACKPOLICY_NOACK		0x20	/* No ACK required */
 #define	IEEE80211_QOS_ACKPOLICY_BA		0x60	/* Block ACK */
 #define	IEEE80211_QOS_EOSP			0x10	/* EndOfService Period*/
 #define	IEEE80211_QOS_EOSP_S			4
 #define	IEEE80211_QOS_TID			0x0f
 /* qos[1] byte used for all frames sent by mesh STAs in a mesh BSS */
 #define IEEE80211_QOS_MC			0x01	/* Mesh control */
 /* Mesh power save level*/
 #define IEEE80211_QOS_MESH_PSL			0x02
 /* Mesh Receiver Service Period Initiated */
 #define IEEE80211_QOS_RSPI			0x04
 /* bits 11 to 15 reserved */
 
 /* does frame have QoS sequence control data */
 #define	IEEE80211_QOS_HAS_SEQ(wh) \
 	(((wh)->i_fc[0] & \
 	  (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
 	  (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
 
 /*
  * WME/802.11e information element.
  */
 struct ieee80211_wme_info {
 	uint8_t		wme_id;		/* IEEE80211_ELEMID_VENDOR */
 	uint8_t		wme_len;	/* length in bytes */
 	uint8_t		wme_oui[3];	/* 0x00, 0x50, 0xf2 */
 	uint8_t		wme_type;	/* OUI type */
 	uint8_t		wme_subtype;	/* OUI subtype */
 	uint8_t		wme_version;	/* spec revision */
 	uint8_t		wme_info;	/* QoS info */
 } __packed;
 
 /*
  * WME/802.11e Tspec Element
  */
 struct ieee80211_wme_tspec {
 	uint8_t		ts_id;
 	uint8_t		ts_len;
 	uint8_t		ts_oui[3];
 	uint8_t		ts_oui_type;
 	uint8_t		ts_oui_subtype;
 	uint8_t		ts_version;
 	uint8_t		ts_tsinfo[3];
 	uint8_t		ts_nom_msdu[2];
 	uint8_t		ts_max_msdu[2];
 	uint8_t		ts_min_svc[4];
 	uint8_t		ts_max_svc[4];
 	uint8_t		ts_inactv_intv[4];
 	uint8_t		ts_susp_intv[4];
 	uint8_t		ts_start_svc[4];
 	uint8_t		ts_min_rate[4];
 	uint8_t		ts_mean_rate[4];
 	uint8_t		ts_max_burst[4];
 	uint8_t		ts_min_phy[4];
 	uint8_t		ts_peak_rate[4];
 	uint8_t		ts_delay[4];
 	uint8_t		ts_surplus[2];
 	uint8_t		ts_medium_time[2];
 } __packed;
 
 /*
  * WME AC parameter field
  */
 struct ieee80211_wme_acparams {
 	uint8_t		acp_aci_aifsn;
 	uint8_t		acp_logcwminmax;
 	uint16_t	acp_txop;
 } __packed;
 
 #define WME_NUM_AC		4	/* 4 AC categories */
 #define	WME_NUM_TID		16	/* 16 tids */
 
 #define WME_PARAM_ACI		0x60	/* Mask for ACI field */
 #define WME_PARAM_ACI_S		5	/* Shift for ACI field */
 #define WME_PARAM_ACM		0x10	/* Mask for ACM bit */
 #define WME_PARAM_ACM_S		4	/* Shift for ACM bit */
 #define WME_PARAM_AIFSN		0x0f	/* Mask for aifsn field */
 #define WME_PARAM_AIFSN_S	0	/* Shift for aifsn field */
 #define WME_PARAM_LOGCWMIN	0x0f	/* Mask for CwMin field (in log) */
 #define WME_PARAM_LOGCWMIN_S	0	/* Shift for CwMin field */
 #define WME_PARAM_LOGCWMAX	0xf0	/* Mask for CwMax field (in log) */
 #define WME_PARAM_LOGCWMAX_S	4	/* Shift for CwMax field */
 
 #define WME_AC_TO_TID(_ac) (       \
 	((_ac) == WME_AC_VO) ? 6 : \
 	((_ac) == WME_AC_VI) ? 5 : \
 	((_ac) == WME_AC_BK) ? 1 : \
 	0)
 
 #define TID_TO_WME_AC(_tid) (      \
 	((_tid) == 0 || (_tid) == 3) ? WME_AC_BE : \
 	((_tid) < 3) ? WME_AC_BK : \
 	((_tid) < 6) ? WME_AC_VI : \
 	WME_AC_VO)
 
 /*
  * WME Parameter Element
  */
 struct ieee80211_wme_param {
 	uint8_t		param_id;
 	uint8_t		param_len;
 	uint8_t		param_oui[3];
 	uint8_t		param_oui_type;
 	uint8_t		param_oui_subtype;
 	uint8_t		param_version;
 	uint8_t		param_qosInfo;
 #define	WME_QOSINFO_COUNT	0x0f	/* Mask for param count field */
 	uint8_t		param_reserved;
 	struct ieee80211_wme_acparams	params_acParams[WME_NUM_AC];
 } __packed;
 
 /*
  * WME U-APSD qos info field defines
  */
 #define	WME_CAPINFO_UAPSD_EN                    0x00000080
 #define	WME_CAPINFO_UAPSD_VO                    0x00000001
 #define	WME_CAPINFO_UAPSD_VI                    0x00000002
 #define	WME_CAPINFO_UAPSD_BK                    0x00000004
 #define	WME_CAPINFO_UAPSD_BE                    0x00000008
 #define	WME_CAPINFO_UAPSD_ACFLAGS_SHIFT         0
 #define	WME_CAPINFO_UAPSD_ACFLAGS_MASK          0xF
 #define	WME_CAPINFO_UAPSD_MAXSP_SHIFT           5
 #define	WME_CAPINFO_UAPSD_MAXSP_MASK            0x3
 #define	WME_CAPINFO_IE_OFFSET                   8
 #define	WME_UAPSD_MAXSP(_qosinfo)				\
 	    (((_qosinfo) >> WME_CAPINFO_UAPSD_MAXSP_SHIFT) &	\
 	    WME_CAPINFO_UAPSD_MAXSP_MASK)
 #define	WME_UAPSD_AC_ENABLED(_ac, _qosinfo)			\
 	    ((1 << (3 - (_ac))) & (				\
 	    ((_qosinfo) >> WME_CAPINFO_UAPSD_ACFLAGS_SHIFT) &	\
 	    WME_CAPINFO_UAPSD_ACFLAGS_MASK))
 
 /*
  * Management Notification Frame
  */
 struct ieee80211_mnf {
 	uint8_t		mnf_category;
 	uint8_t		mnf_action;
 	uint8_t		mnf_dialog;
 	uint8_t		mnf_status;
 } __packed;
 #define	MNF_SETUP_REQ	0
 #define	MNF_SETUP_RESP	1
 #define	MNF_TEARDOWN	2
 
 /* 
  * 802.11n Management Action Frames 
  */
 /* generic frame format */
 struct ieee80211_action {
 	uint8_t		ia_category;
 	uint8_t		ia_action;
 } __packed;
 
 #define	IEEE80211_ACTION_CAT_SM		0	/* Spectrum Management */
 #define	IEEE80211_ACTION_CAT_QOS	1	/* QoS */
 #define	IEEE80211_ACTION_CAT_DLS	2	/* DLS */
 #define	IEEE80211_ACTION_CAT_BA		3	/* BA */
 #define	IEEE80211_ACTION_CAT_HT		7	/* HT */
 #define	IEEE80211_ACTION_CAT_MESH	13	/* Mesh */
 #define	IEEE80211_ACTION_CAT_SELF_PROT	15	/* Self-protected */
 /* 16 - 125 reserved */
 #define	IEEE80211_ACTION_CAT_VHT	21
 #define	IEEE80211_ACTION_CAT_VENDOR	127	/* Vendor Specific */
 
 #define	IEEE80211_ACTION_HT_TXCHWIDTH	0	/* recommended xmit chan width*/
 #define	IEEE80211_ACTION_HT_MIMOPWRSAVE	1	/* MIMO power save */
 
 /* HT - recommended transmission channel width */
 struct ieee80211_action_ht_txchwidth {
 	struct ieee80211_action	at_header;
 	uint8_t		at_chwidth;	
 } __packed;
 
 #define	IEEE80211_A_HT_TXCHWIDTH_20	0
 #define	IEEE80211_A_HT_TXCHWIDTH_2040	1
 
 /* HT - MIMO Power Save (NB: D2.04) */
 struct ieee80211_action_ht_mimopowersave {
 	struct ieee80211_action am_header;
 	uint8_t		am_control;
 } __packed;
 
 #define	IEEE80211_A_HT_MIMOPWRSAVE_ENA		0x01	/* PS enabled */
 #define	IEEE80211_A_HT_MIMOPWRSAVE_MODE		0x02
 #define	IEEE80211_A_HT_MIMOPWRSAVE_MODE_S	1
 #define	IEEE80211_A_HT_MIMOPWRSAVE_DYNAMIC	0x02	/* Dynamic Mode */
 #define	IEEE80211_A_HT_MIMOPWRSAVE_STATIC	0x00	/* no SM packets */
 /* bits 2-7 reserved */
 
 /* Block Ack actions */
 #define IEEE80211_ACTION_BA_ADDBA_REQUEST       0   /* ADDBA request */
 #define IEEE80211_ACTION_BA_ADDBA_RESPONSE      1   /* ADDBA response */
 #define IEEE80211_ACTION_BA_DELBA	        2   /* DELBA */
 
 /* Block Ack Parameter Set */
 #define	IEEE80211_BAPS_BUFSIZ	0xffc0		/* buffer size */
 #define	IEEE80211_BAPS_BUFSIZ_S	6
 #define	IEEE80211_BAPS_TID	0x003c		/* TID */
 #define	IEEE80211_BAPS_TID_S	2
 #define	IEEE80211_BAPS_POLICY	0x0002		/* block ack policy */
 #define	IEEE80211_BAPS_POLICY_S	1
 
 #define	IEEE80211_BAPS_POLICY_DELAYED	(0<<IEEE80211_BAPS_POLICY_S)
 #define	IEEE80211_BAPS_POLICY_IMMEDIATE	(1<<IEEE80211_BAPS_POLICY_S)
 
 /* Block Ack Sequence Control */
 #define	IEEE80211_BASEQ_START	0xfff0		/* starting seqnum */
 #define	IEEE80211_BASEQ_START_S	4
 #define	IEEE80211_BASEQ_FRAG	0x000f		/* fragment number */
 #define	IEEE80211_BASEQ_FRAG_S	0
 
 /* Delayed Block Ack Parameter Set */
 #define	IEEE80211_DELBAPS_TID	0xf000		/* TID */
 #define	IEEE80211_DELBAPS_TID_S	12
 #define	IEEE80211_DELBAPS_INIT	0x0800		/* initiator */
 #define	IEEE80211_DELBAPS_INIT_S 11
 
 /* BA - ADDBA request */
 struct ieee80211_action_ba_addbarequest {
 	struct ieee80211_action rq_header;
 	uint8_t		rq_dialogtoken;
 	uint16_t	rq_baparamset;
 	uint16_t	rq_batimeout;		/* in TUs */
 	uint16_t	rq_baseqctl;
 } __packed;
 
 /* BA - ADDBA response */
 struct ieee80211_action_ba_addbaresponse {
 	struct ieee80211_action rs_header;
 	uint8_t		rs_dialogtoken;
 	uint16_t	rs_statuscode;
 	uint16_t	rs_baparamset; 
 	uint16_t	rs_batimeout;		/* in TUs */
 } __packed;
 
 /* BA - DELBA */
 struct ieee80211_action_ba_delba {
 	struct ieee80211_action dl_header;
 	uint16_t	dl_baparamset;
 	uint16_t	dl_reasoncode;
 } __packed;
 
 /* BAR Control */
 #define	IEEE80211_BAR_TID	0xf000		/* TID */
 #define	IEEE80211_BAR_TID_S	12
 #define	IEEE80211_BAR_COMP	0x0004		/* Compressed Bitmap */
 #define	IEEE80211_BAR_MTID	0x0002		/* Multi-TID */
 #define	IEEE80211_BAR_NOACK	0x0001		/* No-Ack policy */
 
 /* BAR Starting Sequence Control */
 #define	IEEE80211_BAR_SEQ_START	0xfff0		/* starting seqnum */
 #define	IEEE80211_BAR_SEQ_START_S	4
 
 struct ieee80211_ba_request {
 	uint16_t	rq_barctl;
 	uint16_t	rq_barseqctl;
 } __packed;
 
 /*
  * Control frames.
  */
 struct ieee80211_frame_min {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
 	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
 	/* FCS */
 } __packed;
 
 struct ieee80211_frame_rts {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_ra[IEEE80211_ADDR_LEN];
 	uint8_t		i_ta[IEEE80211_ADDR_LEN];
 	/* FCS */
 } __packed;
 
 struct ieee80211_frame_cts {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_ra[IEEE80211_ADDR_LEN];
 	/* FCS */
 } __packed;
 
 struct ieee80211_frame_ack {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_ra[IEEE80211_ADDR_LEN];
 	/* FCS */
 } __packed;
 
 struct ieee80211_frame_pspoll {
 	uint8_t		i_fc[2];
 	uint8_t		i_aid[2];
 	uint8_t		i_bssid[IEEE80211_ADDR_LEN];
 	uint8_t		i_ta[IEEE80211_ADDR_LEN];
 	/* FCS */
 } __packed;
 
 struct ieee80211_frame_cfend {		/* NB: also CF-End+CF-Ack */
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];	/* should be zero */
 	uint8_t		i_ra[IEEE80211_ADDR_LEN];
 	uint8_t		i_bssid[IEEE80211_ADDR_LEN];
 	/* FCS */
 } __packed;
 
 struct ieee80211_frame_bar {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_ra[IEEE80211_ADDR_LEN];
 	uint8_t		i_ta[IEEE80211_ADDR_LEN];
 	uint16_t	i_ctl;
 	uint16_t	i_seq;
 	/* FCS */
 } __packed;
 
 /*
  * BEACON management packets
  *
  *	octet timestamp[8]
  *	octet beacon interval[2]
  *	octet capability information[2]
  *	information element
  *		octet elemid
  *		octet length
  *		octet information[length]
  */
 
 #define	IEEE80211_BEACON_INTERVAL(beacon) \
 	((beacon)[8] | ((beacon)[9] << 8))
 #define	IEEE80211_BEACON_CAPABILITY(beacon) \
 	((beacon)[10] | ((beacon)[11] << 8))
 
 #define	IEEE80211_CAPINFO_ESS			0x0001
 #define	IEEE80211_CAPINFO_IBSS			0x0002
 #define	IEEE80211_CAPINFO_CF_POLLABLE		0x0004
 #define	IEEE80211_CAPINFO_CF_POLLREQ		0x0008
 #define	IEEE80211_CAPINFO_PRIVACY		0x0010
 #define	IEEE80211_CAPINFO_SHORT_PREAMBLE	0x0020
 #define	IEEE80211_CAPINFO_PBCC			0x0040
 #define	IEEE80211_CAPINFO_CHNL_AGILITY		0x0080
 #define	IEEE80211_CAPINFO_SPECTRUM_MGMT		0x0100
 /* bit 9 is reserved */
 #define	IEEE80211_CAPINFO_SHORT_SLOTTIME	0x0400
 #define	IEEE80211_CAPINFO_RSN			0x0800
 /* bit 12 is reserved */
 #define	IEEE80211_CAPINFO_DSSSOFDM		0x2000
 /* bits 14-15 are reserved */
 
 #define	IEEE80211_CAPINFO_BITS \
 	"\20\1ESS\2IBSS\3CF_POLLABLE\4CF_POLLREQ\5PRIVACY\6SHORT_PREAMBLE" \
 	"\7PBCC\10CHNL_AGILITY\11SPECTRUM_MGMT\13SHORT_SLOTTIME\14RSN" \
 	"\16DSSOFDM"
 
 /*
  * 802.11i/WPA information element (maximally sized).
  */
 struct ieee80211_ie_wpa {
 	uint8_t		wpa_id;		/* IEEE80211_ELEMID_VENDOR */
 	uint8_t		wpa_len;	/* length in bytes */
 	uint8_t		wpa_oui[3];	/* 0x00, 0x50, 0xf2 */
 	uint8_t		wpa_type;	/* OUI type */
 	uint16_t	wpa_version;	/* spec revision */
 	uint32_t	wpa_mcipher[1];	/* multicast/group key cipher */
 	uint16_t	wpa_uciphercnt;	/* # pairwise key ciphers */
 	uint32_t	wpa_uciphers[8];/* ciphers */
 	uint16_t	wpa_authselcnt;	/* authentication selector cnt*/
 	uint32_t	wpa_authsels[8];/* selectors */
 	uint16_t	wpa_caps;	/* 802.11i capabilities */
 	uint16_t	wpa_pmkidcnt;	/* 802.11i pmkid count */
 	uint16_t	wpa_pmkids[8];	/* 802.11i pmkids */
 } __packed;
 
 /*
  * 802.11n HT Capability IE
  * NB: these reflect D1.10 
  */
 struct ieee80211_ie_htcap {
 	uint8_t		hc_id;			/* element ID */
 	uint8_t		hc_len;			/* length in bytes */
 	uint16_t	hc_cap;			/* HT caps (see below) */
 	uint8_t		hc_param;		/* HT params (see below) */
 	uint8_t 	hc_mcsset[16]; 		/* supported MCS set */
 	uint16_t	hc_extcap;		/* extended HT capabilities */
 	uint32_t	hc_txbf;		/* txbf capabilities */
 	uint8_t		hc_antenna;		/* antenna capabilities */
 } __packed;
 
 /* HT capability flags (ht_cap) */
 #define	IEEE80211_HTCAP_LDPC		0x0001	/* LDPC supported */
 #define	IEEE80211_HTCAP_CHWIDTH40	0x0002	/* 20/40 supported */
 #define	IEEE80211_HTCAP_SMPS		0x000c	/* SM Power Save mode */
 #define	IEEE80211_HTCAP_SMPS_OFF	0x000c	/* disabled */
 #define	IEEE80211_HTCAP_SMPS_DYNAMIC	0x0004	/* send RTS first */
 /* NB: SMPS value 2 is reserved */
 #define	IEEE80211_HTCAP_SMPS_ENA	0x0000	/* enabled (static mode) */
 #define	IEEE80211_HTCAP_GREENFIELD	0x0010	/* Greenfield supported */
 #define	IEEE80211_HTCAP_SHORTGI20	0x0020	/* Short GI in 20MHz */
 #define	IEEE80211_HTCAP_SHORTGI40	0x0040	/* Short GI in 40MHz */
 #define	IEEE80211_HTCAP_TXSTBC		0x0080	/* STBC tx ok */
 #define	IEEE80211_HTCAP_RXSTBC		0x0300  /* STBC rx support */
 #define	IEEE80211_HTCAP_RXSTBC_S	8
 #define	IEEE80211_HTCAP_RXSTBC_1STREAM	0x0100  /* 1 spatial stream */
 #define	IEEE80211_HTCAP_RXSTBC_2STREAM	0x0200  /* 1-2 spatial streams*/
 #define	IEEE80211_HTCAP_RXSTBC_3STREAM	0x0300  /* 1-3 spatial streams*/
 #define	IEEE80211_HTCAP_DELBA		0x0400	/* HT DELBA supported */
 #define	IEEE80211_HTCAP_MAXAMSDU	0x0800	/* max A-MSDU length */
 #define	IEEE80211_HTCAP_MAXAMSDU_7935	0x0800	/* 7935 octets */
 #define	IEEE80211_HTCAP_MAXAMSDU_3839	0x0000	/* 3839 octets */
 #define	IEEE80211_HTCAP_DSSSCCK40	0x1000  /* DSSS/CCK in 40MHz */
 #define	IEEE80211_HTCAP_PSMP		0x2000  /* PSMP supported */
 #define	IEEE80211_HTCAP_40INTOLERANT	0x4000  /* 40MHz intolerant */
 #define	IEEE80211_HTCAP_LSIGTXOPPROT	0x8000  /* L-SIG TXOP prot */
 
 #define	IEEE80211_HTCAP_BITS \
 	"\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \
 	"\13DELBA\14AMSDU(7935)\15DSSSCCK40\16PSMP\1740INTOLERANT" \
 	"\20LSIGTXOPPROT"
 
 /* HT parameters (hc_param) */
 #define	IEEE80211_HTCAP_MAXRXAMPDU	0x03	/* max rx A-MPDU factor */
 #define	IEEE80211_HTCAP_MAXRXAMPDU_S	0
 #define	IEEE80211_HTCAP_MAXRXAMPDU_8K	0
 #define	IEEE80211_HTCAP_MAXRXAMPDU_16K	1
 #define	IEEE80211_HTCAP_MAXRXAMPDU_32K	2
 #define	IEEE80211_HTCAP_MAXRXAMPDU_64K	3
 #define	IEEE80211_HTCAP_MPDUDENSITY	0x1c	/* min MPDU start spacing */
 #define	IEEE80211_HTCAP_MPDUDENSITY_S	2
 #define	IEEE80211_HTCAP_MPDUDENSITY_NA	0	/* no time restriction */
 #define	IEEE80211_HTCAP_MPDUDENSITY_025	1	/* 1/4 us */
 #define	IEEE80211_HTCAP_MPDUDENSITY_05	2	/* 1/2 us */
 #define	IEEE80211_HTCAP_MPDUDENSITY_1	3	/* 1 us */
 #define	IEEE80211_HTCAP_MPDUDENSITY_2	4	/* 2 us */
 #define	IEEE80211_HTCAP_MPDUDENSITY_4	5	/* 4 us */
 #define	IEEE80211_HTCAP_MPDUDENSITY_8	6	/* 8 us */
 #define	IEEE80211_HTCAP_MPDUDENSITY_16	7	/* 16 us */
 
 /* HT extended capabilities (hc_extcap) */
 #define	IEEE80211_HTCAP_PCO		0x0001	/* PCO capable */
 #define	IEEE80211_HTCAP_PCOTRANS	0x0006	/* PCO transition time */
 #define	IEEE80211_HTCAP_PCOTRANS_S	1
 #define	IEEE80211_HTCAP_PCOTRANS_04	0x0002	/* 400 us */
 #define	IEEE80211_HTCAP_PCOTRANS_15	0x0004	/* 1.5 ms */
 #define	IEEE80211_HTCAP_PCOTRANS_5	0x0006	/* 5 ms */
 /* bits 3-7 reserved */
 #define	IEEE80211_HTCAP_MCSFBACK	0x0300	/* MCS feedback */
 #define	IEEE80211_HTCAP_MCSFBACK_S	8
 #define	IEEE80211_HTCAP_MCSFBACK_NONE	0x0000	/* nothing provided */
 #define	IEEE80211_HTCAP_MCSFBACK_UNSOL	0x0200	/* unsolicited feedback */
 #define	IEEE80211_HTCAP_MCSFBACK_MRQ	0x0300	/* " "+respond to MRQ */
 #define	IEEE80211_HTCAP_HTC		0x0400	/* +HTC support */
 #define	IEEE80211_HTCAP_RDR		0x0800	/* reverse direction responder*/
 /* bits 12-15 reserved */
 
 /*
  * 802.11n HT Information IE
  */
 struct ieee80211_ie_htinfo {
 	uint8_t		hi_id;			/* element ID */
 	uint8_t		hi_len;			/* length in bytes */
 	uint8_t		hi_ctrlchannel;		/* primary channel */
 	uint8_t		hi_byte1;		/* ht ie byte 1 */
 	uint8_t		hi_byte2;		/* ht ie byte 2 */
 	uint8_t		hi_byte3;		/* ht ie byte 3 */
 	uint16_t	hi_byte45;		/* ht ie bytes 4+5 */
 	uint8_t 	hi_basicmcsset[16]; 	/* basic MCS set */
 } __packed;
 
 /* byte1 */
 #define	IEEE80211_HTINFO_2NDCHAN	0x03	/* secondary/ext chan offset */
 #define	IEEE80211_HTINFO_2NDCHAN_S	0
 #define	IEEE80211_HTINFO_2NDCHAN_NONE	0x00	/* no secondary/ext channel */
 #define	IEEE80211_HTINFO_2NDCHAN_ABOVE	0x01	/* above private channel */
 /* NB: 2 is reserved */
 #define	IEEE80211_HTINFO_2NDCHAN_BELOW	0x03	/* below primary channel */ 
 #define	IEEE80211_HTINFO_TXWIDTH	0x04	/* tx channel width */
 #define	IEEE80211_HTINFO_TXWIDTH_20	0x00	/* 20MHz width */
 #define	IEEE80211_HTINFO_TXWIDTH_2040	0x04	/* any supported width */
 #define	IEEE80211_HTINFO_RIFSMODE	0x08	/* Reduced IFS (RIFS) use */
 #define	IEEE80211_HTINFO_RIFSMODE_PROH	0x00	/* RIFS use prohibited */
 #define	IEEE80211_HTINFO_RIFSMODE_PERM	0x08	/* RIFS use permitted */
 #define	IEEE80211_HTINFO_PMSPONLY	0x10	/* PSMP required to associate */
 #define	IEEE80211_HTINFO_SIGRAN		0xe0	/* shortest Service Interval */
 #define	IEEE80211_HTINFO_SIGRAN_S	5
 #define	IEEE80211_HTINFO_SIGRAN_5	0x00	/* 5 ms */
 /* XXX add rest */
 
 /* bytes 2+3 */
 #define	IEEE80211_HTINFO_OPMODE		0x03	/* operating mode */
 #define	IEEE80211_HTINFO_OPMODE_S	0
 #define	IEEE80211_HTINFO_OPMODE_PURE	0x00	/* no protection */
 #define	IEEE80211_HTINFO_OPMODE_PROTOPT	0x01	/* protection optional */
 #define	IEEE80211_HTINFO_OPMODE_HT20PR	0x02	/* protection for HT20 sta's */
 #define	IEEE80211_HTINFO_OPMODE_MIXED	0x03	/* protection for legacy sta's*/
 #define	IEEE80211_HTINFO_NONGF_PRESENT	0x04	/* non-GF sta's present */
 #define	IEEE80211_HTINFO_TXBL		0x08	/* transmit burst limit */
 #define	IEEE80211_HTINFO_NONHT_PRESENT	0x10	/* non-HT sta's present */
 /* bits 5-15 reserved */
 
 /* bytes 4+5 */
 #define	IEEE80211_HTINFO_2NDARYBEACON	0x01
 #define	IEEE80211_HTINFO_LSIGTXOPPROT	0x02
 #define	IEEE80211_HTINFO_PCO_ACTIVE	0x04
 #define	IEEE80211_HTINFO_40MHZPHASE	0x08
 
 /* byte5 */
 #define	IEEE80211_HTINFO_BASIC_STBCMCS	0x7f
 #define	IEEE80211_HTINFO_BASIC_STBCMCS_S 0
 #define	IEEE80211_HTINFO_DUALPROTECTED	0x80
 
 
 /*
  * 802.11ac definitions - 802.11ac-2013 .
  */
 
-/* VHT opmode bits */
-#define	IEEE80211_VHT_OPMODE_CHANWIDTH_MASK	3
-#define	IEEE80211_VHT_OPMODE_CHANWIDTH_20MHZ	0
-#define	IEEE80211_VHT_OPMODE_CHANWIDTH_40MHZ	1
-#define	IEEE80211_VHT_OPMODE_CHANWIDTH_80MHZ	2
-#define	IEEE80211_VHT_OPMODE_CHANWIDTH_160MHZ	3
-#define	IEEE80211_VHT_OPMODE_RX_NSS_MASK	0x70
-#define	IEEE80211_VHT_OPMODE_RX_NSS_SHIFT	4
-#define	IEEE80211_VHT_OPMODE_RX_NSS_TYPE_BF	0x80
-
 /*
  * Maximum length of A-MPDU that the STA can RX in VHT.
  * Length = 2 ^ (13 + max_ampdu_length_exp) - 1 (octets)
  */
 #define	IEEE80211_VHTCAP_MAX_AMPDU_8K		0
 #define	IEEE80211_VHTCAP_MAX_AMPDU_16K		1
 #define	IEEE80211_VHTCAP_MAX_AMPDU_32K		2
 #define	IEEE80211_VHTCAP_MAX_AMPDU_64K		3
 #define	IEEE80211_VHTCAP_MAX_AMPDU_128K		4
 #define	IEEE80211_VHTCAP_MAX_AMPDU_256K		5
 #define	IEEE80211_VHTCAP_MAX_AMPDU_512K		6
 #define	IEEE80211_VHTCAP_MAX_AMPDU_1024K	7
 
 /*
  * VHT MCS information.
  * + rx_highest/tx_highest: optional; maximum long GI VHT PPDU
  *    data rate.  1Mbit/sec units.
  * + rx_mcs_map/tx_mcs_map: bitmap of per-stream supported MCS;
  *    2 bits each.
  */
 #define	IEEE80211_VHT_MCS_SUPPORT_0_7		0	/* MCS0-7 */
 #define	IEEE80211_VHT_MCS_SUPPORT_0_8		1	/* MCS0-8 */
 #define	IEEE80211_VHT_MCS_SUPPORT_0_9		2	/* MCS0-9 */
 #define	IEEE80211_VHT_MCS_NOT_SUPPORTED		3	/* not supported */
 
 struct ieee80211_vht_mcs_info {
 	uint16_t rx_mcs_map;
 	uint16_t rx_highest;
 	uint16_t tx_mcs_map;
 	uint16_t tx_highest;
 } __packed;
 
 /* VHT capabilities element: 802.11ac-2013 8.4.2.160 */
 struct ieee80211_ie_vhtcap {
 	uint8_t ie;
 	uint8_t len;
 	uint32_t vht_cap_info;
 	struct ieee80211_vht_mcs_info supp_mcs;
 } __packed;
 
+/* VHT operation mode subfields - 802.11ac-2013 Table 8.183x */
 #define	IEEE80211_VHT_CHANWIDTH_USE_HT		0	/* Use HT IE for chw */
 #define	IEEE80211_VHT_CHANWIDTH_80MHZ		1	/* 80MHz */
 #define	IEEE80211_VHT_CHANWIDTH_160MHZ		2	/* 160MHz */
 #define	IEEE80211_VHT_CHANWIDTH_80P80MHZ	3	/* 80+80MHz */
 
 /* VHT operation IE - 802.11ac-2013 8.4.2.161 */
 struct ieee80211_ie_vht_operation {
 	uint8_t ie;
 	uint8_t len;
 	uint8_t chan_width;
 	uint8_t center_freq_seg1_idx;
 	uint8_t center_freq_seg2_idx;
 	uint16_t basic_mcs_set;
 } __packed;
 
 /* 802.11ac VHT Capabilities */
 #define	IEEE80211_VHTCAP_MAX_MPDU_LENGTH_3895	0x00000000
 #define	IEEE80211_VHTCAP_MAX_MPDU_LENGTH_7991	0x00000001
 #define	IEEE80211_VHTCAP_MAX_MPDU_LENGTH_11454	0x00000002
 #define	IEEE80211_VHTCAP_MAX_MPDU_MASK		0x00000003
 #define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160MHZ	0x00000004
 #define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ	0x00000008
 #define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK	0x0000000C
 #define	IEEE80211_VHTCAP_RXLDPC		0x00000010
 #define	IEEE80211_VHTCAP_SHORT_GI_80		0x00000020
 #define	IEEE80211_VHTCAP_SHORT_GI_160		0x00000040
 #define	IEEE80211_VHTCAP_TXSTBC		0x00000080
 #define	IEEE80211_VHTCAP_RXSTBC_1		0x00000100
 #define	IEEE80211_VHTCAP_RXSTBC_2		0x00000200
 #define	IEEE80211_VHTCAP_RXSTBC_3		0x00000300
 #define	IEEE80211_VHTCAP_RXSTBC_4		0x00000400
 #define	IEEE80211_VHTCAP_RXSTBC_MASK		0x00000700
 #define	IEEE80211_VHTCAP_SU_BEAMFORMER_CAPABLE	0x00000800
 #define	IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE	0x00001000
 #define	IEEE80211_VHTCAP_BEAMFORMEE_STS_SHIFT	13
 #define	IEEE80211_VHTCAP_BEAMFORMEE_STS_MASK \
 	    (7 << IEEE80211_VHTCAP_BEAMFORMEE_STS_SHIFT)
 #define	IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_SHIFT	16
 #define	IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_MASK \
 	    (7 << IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_SHIFT)
 #define	IEEE80211_VHTCAP_MU_BEAMFORMER_CAPABLE	0x00080000
 #define	IEEE80211_VHTCAP_MU_BEAMFORMEE_CAPABLE	0x00100000
 #define	IEEE80211_VHTCAP_VHT_TXOP_PS		0x00200000
 #define	IEEE80211_VHTCAP_HTC_VHT		0x00400000
 #define	IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT	23
 #define	IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK \
 	    (7 << IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT)
 #define	IEEE80211_VHTCAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB	0x08000000
 #define	IEEE80211_VHTCAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB	0x0c000000
 #define	IEEE80211_VHTCAP_RX_ANTENNA_PATTERN	0x10000000
 #define	IEEE80211_VHTCAP_TX_ANTENNA_PATTERN	0x20000000
+
+/*
+ * XXX TODO: add the rest of the bits
+ */
+#define	IEEE80211_VHTCAP_BITS \
+	"\20\1MPDU7991\2MPDU11454\3CHAN160\4CHAN8080\5RXLDPC\6SHORTGI80" \
+	"\7SHORTGI160\10RXSTBC1\11RXSTBC2\12RXSTBC3\13RXSTBC4\14BFERCAP" \
+	"\15BFEECAP\27VHT\37RXANTPTN\40TXANTPTN"
 
 /*
  * VHT Transmit Power Envelope element - 802.11ac-2013 8.4.2.164
  *
  * This defines the maximum transmit power for various bandwidths.
  */
 /*
  * Count is how many elements follow and what they're for:
  *
  * 0 - 20 MHz
  * 1 - 20+40 MHz
  * 2 - 20+40+80 MHz
  * 3 - 20+40+80+(160, 80+80) MHz
  */
 #define	IEEE80211_VHT_TXPWRENV_INFO_COUNT_SHIFT	0
 #define	IEEE80211_VHT_TXPWRENV_INFO_COUNT_MASK	0x07
 
 /*
  * Unit is the tx power representation.  It should be EIRP for now;
  * other values are reserved.
  */
 #define	IEEE80211_VHT_TXPWRENV_UNIT_MASK	0x38
 #define	IEEE80211_VHT_TXPWRENV_UNIT_SHIFT	3
 
 /* This value is within the unit mask/shift above */
 #define	IEEE80211_VHT_TXPWRENV_UNIT_EIRP	0
 
 struct ieee80211_ie_vht_txpwrenv {
 	uint8_t ie;
 	uint8_t len;
 	uint8_t tx_info;
 	int8_t tx_elem[0];	/* TX power elements, 1/2 dB, signed */
 };
 
 /* VHT action codes */
 #define	WLAN_ACTION_VHT_COMPRESSED_BF		0
 #define	WLAN_ACTION_VHT_GROUPID_MGMT		1
 #define	WLAN_ACTION_VHT_OPMODE_NOTIF		2
 
 /*
  * Management information element payloads.
  */
 
 enum {
 	IEEE80211_ELEMID_SSID		= 0,
 	IEEE80211_ELEMID_RATES		= 1,
 	IEEE80211_ELEMID_FHPARMS	= 2,
 	IEEE80211_ELEMID_DSPARMS	= 3,
 	IEEE80211_ELEMID_CFPARMS	= 4,
 	IEEE80211_ELEMID_TIM		= 5,
 	IEEE80211_ELEMID_IBSSPARMS	= 6,
 	IEEE80211_ELEMID_COUNTRY	= 7,
 	IEEE80211_ELEMID_BSSLOAD	= 11,
 	IEEE80211_ELEMID_TSPEC		= 13,
 	IEEE80211_ELEMID_TCLAS		= 14,
 	IEEE80211_ELEMID_CHALLENGE	= 16,
 	/* 17-31 reserved for challenge text extension */
 	IEEE80211_ELEMID_PWRCNSTR	= 32,
 	IEEE80211_ELEMID_PWRCAP		= 33,
 	IEEE80211_ELEMID_TPCREQ		= 34,
 	IEEE80211_ELEMID_TPCREP		= 35,
 	IEEE80211_ELEMID_SUPPCHAN	= 36,
 	IEEE80211_ELEMID_CSA		= 37,
 	IEEE80211_ELEMID_MEASREQ	= 38,
 	IEEE80211_ELEMID_MEASREP	= 39,
 	IEEE80211_ELEMID_QUIET		= 40,
 	IEEE80211_ELEMID_IBSSDFS	= 41,
 	IEEE80211_ELEMID_ERP		= 42,
 	IEEE80211_ELEMID_HTCAP		= 45,
 	IEEE80211_ELEMID_QOS		= 46,
 	IEEE80211_ELEMID_RSN		= 48,
 	IEEE80211_ELEMID_XRATES		= 50,
 	IEEE80211_ELEMID_APCHANREP	= 51,
 	IEEE80211_ELEMID_HTINFO		= 61,
 	IEEE80211_ELEMID_SECCHAN_OFFSET	= 62,
 	IEEE80211_ELEMID_RRM_ENACAPS	= 70,
 	IEEE80211_ELEMID_MULTIBSSID	= 71,
 	IEEE80211_ELEMID_COEX_2040	= 72,
 	IEEE80211_ELEMID_INTOL_CHN_REPORT	= 73,
 	IEEE80211_ELEMID_OVERLAP_BSS_SCAN_PARAM = 74,
 	IEEE80211_ELEMID_TSF_REQ	= 91,
 	IEEE80211_ELEMID_TSF_RESP	= 92,
 	IEEE80211_ELEMID_WNM_SLEEP_MODE	= 93,
 	IEEE80211_ELEMID_TIM_BCAST_REQ	= 94,
 	IEEE80211_ELEMID_TIM_BCAST_RESP	= 95,
 	IEEE80211_ELEMID_TPC		= 150,
 	IEEE80211_ELEMID_CCKM		= 156,
 	IEEE80211_ELEMID_VENDOR		= 221,	/* vendor private */
 
 	/*
 	 * 802.11s IEs
 	 * NB: On vanilla Linux still IEEE80211_ELEMID_MESHPEER = 55,
 	 * but they defined a new with id 117 called PEER_MGMT.
 	 * NB: complies with open80211
 	 */
 	IEEE80211_ELEMID_MESHCONF	= 113,
 	IEEE80211_ELEMID_MESHID		= 114,
 	IEEE80211_ELEMID_MESHLINK	= 115,
 	IEEE80211_ELEMID_MESHCNGST	= 116,
 	IEEE80211_ELEMID_MESHPEER	= 117,
 	IEEE80211_ELEMID_MESHCSA	= 118,
 	IEEE80211_ELEMID_MESHTIM	= 39, /* XXX: remove */
 	IEEE80211_ELEMID_MESHAWAKEW	= 119,
 	IEEE80211_ELEMID_MESHBEACONT	= 120,
 	/* 121-124 MMCAOP not implemented yet */
 	IEEE80211_ELEMID_MESHGANN	= 125,
 	IEEE80211_ELEMID_MESHRANN	= 126,
 	/* 127 Extended Capabilities */
 	IEEE80211_ELEMID_EXTCAP		= 127,
 	/* 128-129 reserved */
 	IEEE80211_ELEMID_MESHPREQ	= 130,
 	IEEE80211_ELEMID_MESHPREP	= 131,
 	IEEE80211_ELEMID_MESHPERR	= 132,
 	/* 133-136 reserved */
 	IEEE80211_ELEMID_MESHPXU	= 137,
 	IEEE80211_ELEMID_MESHPXUC	= 138,
 	IEEE80211_ELEMID_MESHAH		= 60, /* XXX: remove */
 
 	/* 802.11ac */
 	IEEE80211_ELEMID_VHT_CAP	= 191,
 	IEEE80211_ELEMID_VHT_OPMODE	= 192,
 	IEEE80211_ELEMID_VHT_PWR_ENV	= 195,
 };
 
 struct ieee80211_tim_ie {
 	uint8_t		tim_ie;			/* IEEE80211_ELEMID_TIM */
 	uint8_t		tim_len;
 	uint8_t		tim_count;		/* DTIM count */
 	uint8_t		tim_period;		/* DTIM period */
 	uint8_t		tim_bitctl;		/* bitmap control */
 	uint8_t		tim_bitmap[1];		/* variable-length bitmap */
 } __packed;
 
 struct ieee80211_country_ie {
 	uint8_t		ie;			/* IEEE80211_ELEMID_COUNTRY */
 	uint8_t		len;
 	uint8_t		cc[3];			/* ISO CC+(I)ndoor/(O)utdoor */
 	struct {
 		uint8_t schan;			/* starting channel */
 		uint8_t nchan;			/* number channels */
 		uint8_t maxtxpwr;		/* tx power cap */
 	} __packed band[1];			/* sub bands (NB: var size) */
 } __packed;
 
 #define	IEEE80211_COUNTRY_MAX_BANDS	84	/* max possible bands */
 #define	IEEE80211_COUNTRY_MAX_SIZE \
 	(sizeof(struct ieee80211_country_ie) + 3*(IEEE80211_COUNTRY_MAX_BANDS-1))
 
 struct ieee80211_bss_load_ie {
 	uint8_t		ie;
 	uint8_t		len;
 	uint16_t	sta_count;	/* station count */
 	uint8_t		chan_load;	/* channel utilization */
 	uint8_t		aac;		/* available admission capacity */
 } __packed;
 
 struct ieee80211_ap_chan_report_ie {
 	uint8_t		ie;
 	uint8_t		len;
 	uint8_t		i_class; /* operating class */
 	/* Annex E, E.1 Country information and operating classes */
 	uint8_t		chan_list[0];
 } __packed;
 
 #define IEEE80211_EXTCAP_CMS			(1ULL <<  0) /* 20/40 BSS coexistence management support */
 #define IEEE80211_EXTCAP_RSVD_1			(1ULL <<  1)
 #define IEEE80211_EXTCAP_ECS			(1ULL <<  2) /* extended channel switching */
 #define IEEE80211_EXTCAP_RSVD_3			(1ULL <<  3)
 #define IEEE80211_EXTCAP_PSMP_CAP		(1ULL <<  4) /* PSMP capability */
 #define IEEE80211_EXTCAP_RSVD_5			(1ULL <<  5)
 #define IEEE80211_EXTCAP_S_PSMP_SUPP		(1ULL <<  6)
 #define IEEE80211_EXTCAP_EVENT			(1ULL <<  7)
 #define IEEE80211_EXTCAP_DIAGNOSTICS		(1ULL <<  8)
 #define IEEE80211_EXTCAP_MCAST_DIAG		(1ULL <<  9)
 #define IEEE80211_EXTCAP_LOC_TRACKING		(1ULL << 10)
 #define IEEE80211_EXTCAP_FMS			(1ULL << 11)
 #define IEEE80211_EXTCAP_PROXY_ARP		(1ULL << 12)
 #define IEEE80211_EXTCAP_CIR			(1ULL << 13) /* collocated interference reporting */
 #define IEEE80211_EXTCAP_CIVIC_LOC		(1ULL << 14)
 #define IEEE80211_EXTCAP_GEOSPATIAL_LOC		(1ULL << 15)
 #define IEEE80211_EXTCAP_TFS			(1ULL << 16)
 #define IEEE80211_EXTCAP_WNM_SLEEPMODE		(1ULL << 17)
 #define IEEE80211_EXTCAP_TIM_BROADCAST		(1ULL << 18)
 #define IEEE80211_EXTCAP_BSS_TRANSITION		(1ULL << 19)
 #define IEEE80211_EXTCAP_QOS_TRAF_CAP		(1ULL << 20)
 #define IEEE80211_EXTCAP_AC_STA_COUNT		(1ULL << 21)
 #define IEEE80211_EXTCAP_M_BSSID		(1ULL << 22) /* multiple BSSID field */
 #define IEEE80211_EXTCAP_TIMING_MEAS		(1ULL << 23)
 #define IEEE80211_EXTCAP_CHAN_USAGE		(1ULL << 24)
 #define IEEE80211_EXTCAP_SSID_LIST		(1ULL << 25)
 #define IEEE80211_EXTCAP_DMS			(1ULL << 26)
 #define IEEE80211_EXTCAP_UTC_TSF_OFFSET		(1ULL << 27)
 #define IEEE80211_EXTCAP_TLDS_BUF_STA_SUPP	(1ULL << 28) /* TDLS peer U-APSP buffer STA support */
 #define IEEE80211_EXTCAP_TLDS_PPSM_SUPP		(1ULL << 29) /* TDLS peer PSM support */
 #define IEEE80211_EXTCAP_TLDS_CH_SW		(1ULL << 30) /* TDLS channel switching */
 #define IEEE80211_EXTCAP_INTERWORKING		(1ULL << 31)
 #define IEEE80211_EXTCAP_QOSMAP			(1ULL << 32)
 #define IEEE80211_EXTCAP_EBR			(1ULL << 33)
 #define IEEE80211_EXTCAP_SSPN_IF		(1ULL << 34)
 #define IEEE80211_EXTCAP_RSVD_35		(1ULL << 35)
 #define IEEE80211_EXTCAP_MSGCF_CAP		(1ULL << 36)
 #define IEEE80211_EXTCAP_TLDS_SUPP		(1ULL << 37)
 #define IEEE80211_EXTCAP_TLDS_PROHIB		(1ULL << 38)
 #define IEEE80211_EXTCAP_TLDS_CH_SW_PROHIB	(1ULL << 39) /* TDLS channel switching prohibited */
 #define IEEE80211_EXTCAP_RUF			(1ULL << 40) /* reject unadmitted frame */
 /* service interval granularity */
 #define IEEE80211_EXTCAP_SIG \
 				((1ULL << 41) | (1ULL << 42) | (1ULL << 43))
 #define IEEE80211_EXTCAP_ID_LOC			(1ULL << 44)
 #define IEEE80211_EXTCAP_U_APSD_COEX		(1ULL << 45)
 #define IEEE80211_EXTCAP_WNM_NOTIFICATION	(1ULL << 46)
 #define IEEE80211_EXTCAP_RSVD_47		(1ULL << 47)
 #define IEEE80211_EXTCAP_SSID			(1ULL << 48) /* UTF-8 SSID */
 /* bits 49-n are reserved */
 
 struct ieee80211_extcap_ie {
 	uint8_t		ie;
 	uint8_t		len;
 } __packed;
 
 /*
  * 802.11h Quiet Time Element.
  */
 struct ieee80211_quiet_ie {
 	uint8_t		quiet_ie;		/* IEEE80211_ELEMID_QUIET */
 	uint8_t		len;
 	uint8_t		tbttcount;		/* quiet start */
 	uint8_t		period;			/* beacon intervals between quiets */
 	uint16_t	duration;		/* TUs of each quiet*/
 	uint16_t	offset;			/* TUs of from TBTT of quiet start */
 } __packed;
 
 /*
  * 802.11h Channel Switch Announcement (CSA).
  */
 struct ieee80211_csa_ie {
 	uint8_t		csa_ie;		/* IEEE80211_ELEMID_CHANSWITCHANN */
 	uint8_t		csa_len;
 	uint8_t		csa_mode;		/* Channel Switch Mode */
 	uint8_t		csa_newchan;		/* New Channel Number */
 	uint8_t		csa_count;		/* Channel Switch Count */
 } __packed;
 
 /*
  * Note the min acceptable CSA count is used to guard against
  * malicious CSA injection in station mode.  Defining this value
  * as other than 0 violates the 11h spec.
  */
 #define	IEEE80211_CSA_COUNT_MIN	2
 #define	IEEE80211_CSA_COUNT_MAX	255
 
 /* rate set entries are in .5 Mb/s units, and potentially marked as basic */
 #define	IEEE80211_RATE_BASIC		0x80
 #define	IEEE80211_RATE_VAL		0x7f
 #define	IEEE80211_RV(v)			((v) & IEEE80211_RATE_VAL)
 
 /* ERP information element flags */
 #define	IEEE80211_ERP_NON_ERP_PRESENT	0x01
 #define	IEEE80211_ERP_USE_PROTECTION	0x02
 #define	IEEE80211_ERP_LONG_PREAMBLE	0x04
 
 #define	IEEE80211_ERP_BITS \
 	"\20\1NON_ERP_PRESENT\2USE_PROTECTION\3LONG_PREAMBLE"
 
 #define	ATH_OUI			0x7f0300	/* Atheros OUI */
 #define	ATH_OUI_TYPE		0x01		/* Atheros protocol ie */
 
 /* NB: Atheros allocated the OUI for this purpose ~2005 but beware ... */
 #define	TDMA_OUI		ATH_OUI
 #define	TDMA_OUI_TYPE		0x02		/* TDMA protocol ie */
 
 #define	BCM_OUI			0x4c9000	/* Broadcom OUI */
 #define	BCM_OUI_HTCAP		51		/* pre-draft HTCAP ie */
 #define	BCM_OUI_HTINFO		52		/* pre-draft HTINFO ie */
 
 #define	WPA_OUI			0xf25000
 #define	WPA_OUI_TYPE		0x01
 #define	WPA_VERSION		1		/* current supported version */
 
 #define	WPA_CSE_NULL		0x00
 #define	WPA_CSE_WEP40		0x01
 #define	WPA_CSE_TKIP		0x02
 #define	WPA_CSE_CCMP		0x04
 #define	WPA_CSE_WEP104		0x05
 
 #define	WPA_ASE_NONE		0x00
 #define	WPA_ASE_8021X_UNSPEC	0x01
 #define	WPA_ASE_8021X_PSK	0x02
 
 #define	WPS_OUI_TYPE		0x04
 
 #define	RSN_OUI			0xac0f00
 #define	RSN_VERSION		1		/* current supported version */
 
 #define	RSN_CSE_NULL		0x00
 #define	RSN_CSE_WEP40		0x01
 #define	RSN_CSE_TKIP		0x02
 #define	RSN_CSE_WRAP		0x03
 #define	RSN_CSE_CCMP		0x04
 #define	RSN_CSE_WEP104		0x05
 
 #define	RSN_ASE_NONE		0x00
 #define	RSN_ASE_8021X_UNSPEC	0x01
 #define	RSN_ASE_8021X_PSK	0x02
 
 #define	RSN_CAP_PREAUTH		0x01
 
 #define	WME_OUI			0xf25000
 #define	WME_OUI_TYPE		0x02
 #define	WME_INFO_OUI_SUBTYPE	0x00
 #define	WME_PARAM_OUI_SUBTYPE	0x01
 #define	WME_VERSION		1
 
 /* WME stream classes */
 #define	WME_AC_BE	0		/* best effort */
 #define	WME_AC_BK	1		/* background */
 #define	WME_AC_VI	2		/* video */
 #define	WME_AC_VO	3		/* voice */
 
 /*
  * AUTH management packets
  *
  *	octet algo[2]
  *	octet seq[2]
  *	octet status[2]
  *	octet chal.id
  *	octet chal.length
  *	octet chal.text[253]		NB: 1-253 bytes
  */
 
 /* challenge length for shared key auth */
 #define IEEE80211_CHALLENGE_LEN		128
 
 #define	IEEE80211_AUTH_ALG_OPEN		0x0000
 #define	IEEE80211_AUTH_ALG_SHARED	0x0001
 #define	IEEE80211_AUTH_ALG_LEAP		0x0080
 
 enum {
 	IEEE80211_AUTH_OPEN_REQUEST		= 1,
 	IEEE80211_AUTH_OPEN_RESPONSE		= 2,
 };
 
 enum {
 	IEEE80211_AUTH_SHARED_REQUEST		= 1,
 	IEEE80211_AUTH_SHARED_CHALLENGE		= 2,
 	IEEE80211_AUTH_SHARED_RESPONSE		= 3,
 	IEEE80211_AUTH_SHARED_PASS		= 4,
 };
 
 /*
  * Reason and status codes.
  *
  * Reason codes are used in management frames to indicate why an
  * action took place (e.g. on disassociation).  Status codes are
  * used in management frames to indicate the result of an operation.
  *
  * Unlisted codes are reserved
  */
 
 enum {
 	IEEE80211_REASON_UNSPECIFIED		= 1,
 	IEEE80211_REASON_AUTH_EXPIRE		= 2,
 	IEEE80211_REASON_AUTH_LEAVE		= 3,
 	IEEE80211_REASON_ASSOC_EXPIRE		= 4,
 	IEEE80211_REASON_ASSOC_TOOMANY		= 5,
 	IEEE80211_REASON_NOT_AUTHED		= 6,
 	IEEE80211_REASON_NOT_ASSOCED		= 7,
 	IEEE80211_REASON_ASSOC_LEAVE		= 8,
 	IEEE80211_REASON_ASSOC_NOT_AUTHED	= 9,
 	IEEE80211_REASON_DISASSOC_PWRCAP_BAD	= 10,	/* 11h */
 	IEEE80211_REASON_DISASSOC_SUPCHAN_BAD	= 11,	/* 11h */
 	IEEE80211_REASON_IE_INVALID		= 13,	/* 11i */
 	IEEE80211_REASON_MIC_FAILURE		= 14,	/* 11i */
 	IEEE80211_REASON_4WAY_HANDSHAKE_TIMEOUT	= 15,	/* 11i */
 	IEEE80211_REASON_GROUP_KEY_UPDATE_TIMEOUT = 16,	/* 11i */
 	IEEE80211_REASON_IE_IN_4WAY_DIFFERS	= 17,	/* 11i */
 	IEEE80211_REASON_GROUP_CIPHER_INVALID	= 18,	/* 11i */
 	IEEE80211_REASON_PAIRWISE_CIPHER_INVALID= 19,	/* 11i */
 	IEEE80211_REASON_AKMP_INVALID		= 20,	/* 11i */
 	IEEE80211_REASON_UNSUPP_RSN_IE_VERSION	= 21,	/* 11i */
 	IEEE80211_REASON_INVALID_RSN_IE_CAP	= 22,	/* 11i */
 	IEEE80211_REASON_802_1X_AUTH_FAILED	= 23,	/* 11i */
 	IEEE80211_REASON_CIPHER_SUITE_REJECTED	= 24,	/* 11i */
 	IEEE80211_REASON_UNSPECIFIED_QOS	= 32,	/* 11e */
 	IEEE80211_REASON_INSUFFICIENT_BW	= 33,	/* 11e */
 	IEEE80211_REASON_TOOMANY_FRAMES		= 34,	/* 11e */
 	IEEE80211_REASON_OUTSIDE_TXOP		= 35,	/* 11e */
 	IEEE80211_REASON_LEAVING_QBSS		= 36,	/* 11e */
 	IEEE80211_REASON_BAD_MECHANISM		= 37,	/* 11e */
 	IEEE80211_REASON_SETUP_NEEDED		= 38,	/* 11e */
 	IEEE80211_REASON_TIMEOUT		= 39,	/* 11e */
 
 	IEEE80211_REASON_PEER_LINK_CANCELED	= 52,	/* 11s */
 	IEEE80211_REASON_MESH_MAX_PEERS		= 53,	/* 11s */
 	IEEE80211_REASON_MESH_CPVIOLATION	= 54,	/* 11s */
 	IEEE80211_REASON_MESH_CLOSE_RCVD	= 55,	/* 11s */
 	IEEE80211_REASON_MESH_MAX_RETRIES	= 56,	/* 11s */
 	IEEE80211_REASON_MESH_CONFIRM_TIMEOUT	= 57,	/* 11s */
 	IEEE80211_REASON_MESH_INVALID_GTK	= 58,	/* 11s */
 	IEEE80211_REASON_MESH_INCONS_PARAMS	= 59,	/* 11s */
 	IEEE80211_REASON_MESH_INVALID_SECURITY	= 60,	/* 11s */
 	IEEE80211_REASON_MESH_PERR_NO_PROXY	= 61,	/* 11s */
 	IEEE80211_REASON_MESH_PERR_NO_FI	= 62,	/* 11s */
 	IEEE80211_REASON_MESH_PERR_DEST_UNREACH	= 63,	/* 11s */
 	IEEE80211_REASON_MESH_MAC_ALRDY_EXISTS_MBSS = 64, /* 11s */
 	IEEE80211_REASON_MESH_CHAN_SWITCH_REG	= 65,	/* 11s */
 	IEEE80211_REASON_MESH_CHAN_SWITCH_UNSPEC = 66,	/* 11s */
 
 	IEEE80211_STATUS_SUCCESS		= 0,
 	IEEE80211_STATUS_UNSPECIFIED		= 1,
 	IEEE80211_STATUS_CAPINFO		= 10,
 	IEEE80211_STATUS_NOT_ASSOCED		= 11,
 	IEEE80211_STATUS_OTHER			= 12,
 	IEEE80211_STATUS_ALG			= 13,
 	IEEE80211_STATUS_SEQUENCE		= 14,
 	IEEE80211_STATUS_CHALLENGE		= 15,
 	IEEE80211_STATUS_TIMEOUT		= 16,
 	IEEE80211_STATUS_TOOMANY		= 17,
 	IEEE80211_STATUS_BASIC_RATE		= 18,
 	IEEE80211_STATUS_SP_REQUIRED		= 19,	/* 11b */
 	IEEE80211_STATUS_PBCC_REQUIRED		= 20,	/* 11b */
 	IEEE80211_STATUS_CA_REQUIRED		= 21,	/* 11b */
 	IEEE80211_STATUS_SPECMGMT_REQUIRED	= 22,	/* 11h */
 	IEEE80211_STATUS_PWRCAP_REQUIRED	= 23,	/* 11h */
 	IEEE80211_STATUS_SUPCHAN_REQUIRED	= 24,	/* 11h */
 	IEEE80211_STATUS_SHORTSLOT_REQUIRED	= 25,	/* 11g */
 	IEEE80211_STATUS_DSSSOFDM_REQUIRED	= 26,	/* 11g */
 	IEEE80211_STATUS_MISSING_HT_CAPS	= 27,	/* 11n D3.0 */
 	IEEE80211_STATUS_INVALID_IE		= 40,	/* 11i */
 	IEEE80211_STATUS_GROUP_CIPHER_INVALID	= 41,	/* 11i */
 	IEEE80211_STATUS_PAIRWISE_CIPHER_INVALID = 42,	/* 11i */
 	IEEE80211_STATUS_AKMP_INVALID		= 43,	/* 11i */
 	IEEE80211_STATUS_UNSUPP_RSN_IE_VERSION	= 44,	/* 11i */
 	IEEE80211_STATUS_INVALID_RSN_IE_CAP	= 45,	/* 11i */
 	IEEE80211_STATUS_CIPHER_SUITE_REJECTED	= 46,	/* 11i */
 };
 
 #define	IEEE80211_WEP_KEYLEN		5	/* 40bit */
 #define	IEEE80211_WEP_IVLEN		3	/* 24bit */
 #define	IEEE80211_WEP_KIDLEN		1	/* 1 octet */
 #define	IEEE80211_WEP_CRCLEN		4	/* CRC-32 */
 #define	IEEE80211_WEP_TOTLEN		(IEEE80211_WEP_IVLEN + \
 					 IEEE80211_WEP_KIDLEN + \
 					 IEEE80211_WEP_CRCLEN)
 #define	IEEE80211_WEP_NKID		4	/* number of key ids */
 
 /*
  * 802.11i defines an extended IV for use with non-WEP ciphers.
  * When the EXTIV bit is set in the key id byte an additional
  * 4 bytes immediately follow the IV for TKIP.  For CCMP the
  * EXTIV bit is likewise set but the 8 bytes represent the
  * CCMP header rather than IV+extended-IV.
  */
 #define	IEEE80211_WEP_EXTIV		0x20
 #define	IEEE80211_WEP_EXTIVLEN		4	/* extended IV length */
 #define	IEEE80211_WEP_MICLEN		8	/* trailing MIC */
 
 #define	IEEE80211_CRC_LEN		4
 
 /*
  * Maximum acceptable MTU is:
  *	IEEE80211_MAX_LEN - WEP overhead - CRC -
  *		QoS overhead - RSN/WPA overhead
  * Min is arbitrarily chosen > IEEE80211_MIN_LEN.  The default
  * mtu is Ethernet-compatible; it's set by ether_ifattach.
  */
 #define	IEEE80211_MTU_MAX		2290
 #define	IEEE80211_MTU_MIN		32
 
 #define	IEEE80211_MAX_LEN		(2300 + IEEE80211_CRC_LEN + \
     (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN))
 #define	IEEE80211_ACK_LEN \
 	(sizeof(struct ieee80211_frame_ack) + IEEE80211_CRC_LEN)
 #define	IEEE80211_MIN_LEN \
 	(sizeof(struct ieee80211_frame_min) + IEEE80211_CRC_LEN)
 
 /*
  * The 802.11 spec says at most 2007 stations may be
  * associated at once.  For most AP's this is way more
  * than is feasible so we use a default of IEEE80211_AID_DEF.
  * This number may be overridden by the driver and/or by
  * user configuration but may not be less than IEEE80211_AID_MIN
  * (see _ieee80211.h for implementation-specific settings).
  */
 #define	IEEE80211_AID_MAX		2007
 
 #define	IEEE80211_AID(b)	((b) &~ 0xc000)
 
 /* 
  * RTS frame length parameters.  The default is specified in
  * the 802.11 spec as 512; we treat it as implementation-dependent
  * so it's defined in ieee80211_var.h.  The max may be wrong
  * for jumbo frames.
  */
 #define	IEEE80211_RTS_MIN		1
 #define	IEEE80211_RTS_MAX		2346
 
 /* 
  * TX fragmentation parameters.  As above for RTS, we treat
  * default as implementation-dependent so define it elsewhere.
  */
 #define	IEEE80211_FRAG_MIN		256
 #define	IEEE80211_FRAG_MAX		2346
 
 /*
  * Beacon interval (TU's).  Min+max come from WiFi requirements.
  * As above, we treat default as implementation-dependent so
  * define it elsewhere.
  */
 #define	IEEE80211_BINTVAL_MAX	1000	/* max beacon interval (TU's) */
 #define	IEEE80211_BINTVAL_MIN	25	/* min beacon interval (TU's) */
 
 /*
  * DTIM period (beacons).  Min+max are not really defined
  * by the protocol but we want them publicly visible so
  * define them here.
  */
 #define	IEEE80211_DTIM_MAX	15	/* max DTIM period */
 #define	IEEE80211_DTIM_MIN	1	/* min DTIM period */
 
 /*
  * Beacon miss threshold (beacons).  As for DTIM, we define
  * them here to be publicly visible.  Note the max may be
  * clamped depending on device capabilities.
  */
 #define	IEEE80211_HWBMISS_MIN 	1
 #define	IEEE80211_HWBMISS_MAX 	255
 
 /*
  * 802.11 frame duration definitions.
  */
 
 struct ieee80211_duration {
 	uint16_t	d_rts_dur;
 	uint16_t	d_data_dur;
 	uint16_t	d_plcp_len;
 	uint8_t		d_residue;	/* unused octets in time slot */
 };
 
 /* One Time Unit (TU) is 1Kus = 1024 microseconds. */
 #define IEEE80211_DUR_TU		1024
 
 /* IEEE 802.11b durations for DSSS PHY in microseconds */
 #define IEEE80211_DUR_DS_LONG_PREAMBLE	144
 #define IEEE80211_DUR_DS_SHORT_PREAMBLE	72
 
 #define IEEE80211_DUR_DS_SLOW_PLCPHDR	48
 #define IEEE80211_DUR_DS_FAST_PLCPHDR	24
 #define IEEE80211_DUR_DS_SLOW_ACK	112
 #define IEEE80211_DUR_DS_FAST_ACK	56
 #define IEEE80211_DUR_DS_SLOW_CTS	112
 #define IEEE80211_DUR_DS_FAST_CTS	56
 
 #define IEEE80211_DUR_DS_SLOT		20
 #define IEEE80211_DUR_DS_SIFS		10
 #define IEEE80211_DUR_DS_PIFS	(IEEE80211_DUR_DS_SIFS + IEEE80211_DUR_DS_SLOT)
 #define IEEE80211_DUR_DS_DIFS	(IEEE80211_DUR_DS_SIFS + \
 				 2 * IEEE80211_DUR_DS_SLOT)
 #define IEEE80211_DUR_DS_EIFS	(IEEE80211_DUR_DS_SIFS + \
 				 IEEE80211_DUR_DS_SLOW_ACK + \
 				 IEEE80211_DUR_DS_LONG_PREAMBLE + \
 				 IEEE80211_DUR_DS_SLOW_PLCPHDR + \
 				 IEEE80211_DUR_DIFS)
 
 #endif /* _NET80211_IEEE80211_H_ */
Index: projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_ioctl.c
===================================================================
--- projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_ioctl.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_ioctl.c	(revision 311637)
@@ -1,3494 +1,3576 @@
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 /*
  * IEEE 802.11 ioctl support (FreeBSD-specific)
  */
 
 #include "opt_inet.h"
 #include "opt_wlan.h"
 
 #include <sys/endian.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/priv.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
  
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ioctl.h>
 #include <net80211/ieee80211_regdomain.h>
 #include <net80211/ieee80211_input.h>
 
 #define	IS_UP_AUTO(_vap) \
 	(IFNET_IS_UP_RUNNING((_vap)->iv_ifp) && \
 	 (_vap)->iv_roaming == IEEE80211_ROAMING_AUTO)
 
 static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
 static struct ieee80211_channel *findchannel(struct ieee80211com *,
 		int ieee, int mode);
 static int ieee80211_scanreq(struct ieee80211vap *,
 		struct ieee80211_scan_req *);
 
 static int
 ieee80211_ioctl_getkey(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_node *ni;
 	struct ieee80211req_key ik;
 	struct ieee80211_key *wk;
 	const struct ieee80211_cipher *cip;
 	u_int kid;
 	int error;
 
 	if (ireq->i_len != sizeof(ik))
 		return EINVAL;
 	error = copyin(ireq->i_data, &ik, sizeof(ik));
 	if (error)
 		return error;
 	kid = ik.ik_keyix;
 	if (kid == IEEE80211_KEYIX_NONE) {
 		ni = ieee80211_find_vap_node(&ic->ic_sta, vap, ik.ik_macaddr);
 		if (ni == NULL)
 			return ENOENT;
 		wk = &ni->ni_ucastkey;
 	} else {
 		if (kid >= IEEE80211_WEP_NKID)
 			return EINVAL;
 		wk = &vap->iv_nw_keys[kid];
 		IEEE80211_ADDR_COPY(&ik.ik_macaddr, vap->iv_bss->ni_macaddr);
 		ni = NULL;
 	}
 	cip = wk->wk_cipher;
 	ik.ik_type = cip->ic_cipher;
 	ik.ik_keylen = wk->wk_keylen;
 	ik.ik_flags = wk->wk_flags & (IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV);
 	if (wk->wk_keyix == vap->iv_def_txkey)
 		ik.ik_flags |= IEEE80211_KEY_DEFAULT;
 	if (priv_check(curthread, PRIV_NET80211_GETKEY) == 0) {
 		/* NB: only root can read key data */
 		ik.ik_keyrsc = wk->wk_keyrsc[IEEE80211_NONQOS_TID];
 		ik.ik_keytsc = wk->wk_keytsc;
 		memcpy(ik.ik_keydata, wk->wk_key, wk->wk_keylen);
 		if (cip->ic_cipher == IEEE80211_CIPHER_TKIP) {
 			memcpy(ik.ik_keydata+wk->wk_keylen,
 				wk->wk_key + IEEE80211_KEYBUF_SIZE,
 				IEEE80211_MICBUF_SIZE);
 			ik.ik_keylen += IEEE80211_MICBUF_SIZE;
 		}
 	} else {
 		ik.ik_keyrsc = 0;
 		ik.ik_keytsc = 0;
 		memset(ik.ik_keydata, 0, sizeof(ik.ik_keydata));
 	}
 	if (ni != NULL)
 		ieee80211_free_node(ni);
 	return copyout(&ik, ireq->i_data, sizeof(ik));
 }
 
 static int
 ieee80211_ioctl_getchanlist(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	if (sizeof(ic->ic_chan_active) < ireq->i_len)
 		ireq->i_len = sizeof(ic->ic_chan_active);
 	return copyout(&ic->ic_chan_active, ireq->i_data, ireq->i_len);
 }
 
 static int
 ieee80211_ioctl_getchaninfo(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	uint32_t space;
 
 	space = __offsetof(struct ieee80211req_chaninfo,
 			ic_chans[ic->ic_nchans]);
 	if (space > ireq->i_len)
 		space = ireq->i_len;
 	/* XXX assumes compatible layout */
 	return copyout(&ic->ic_nchans, ireq->i_data, space);
 }
 
 static int
 ieee80211_ioctl_getwpaie(struct ieee80211vap *vap,
 	struct ieee80211req *ireq, int req)
 {
 	struct ieee80211_node *ni;
 	struct ieee80211req_wpaie2 *wpaie;
 	int error;
 
 	if (ireq->i_len < IEEE80211_ADDR_LEN)
 		return EINVAL;
 	wpaie = IEEE80211_MALLOC(sizeof(*wpaie), M_TEMP,
 	    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (wpaie == NULL)
 		return ENOMEM;
 	error = copyin(ireq->i_data, wpaie->wpa_macaddr, IEEE80211_ADDR_LEN);
 	if (error != 0)
 		goto bad;
 	ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, wpaie->wpa_macaddr);
 	if (ni == NULL) {
 		error = ENOENT;
 		goto bad;
 	}
 	if (ni->ni_ies.wpa_ie != NULL) {
 		int ielen = ni->ni_ies.wpa_ie[1] + 2;
 		if (ielen > sizeof(wpaie->wpa_ie))
 			ielen = sizeof(wpaie->wpa_ie);
 		memcpy(wpaie->wpa_ie, ni->ni_ies.wpa_ie, ielen);
 	}
 	if (req == IEEE80211_IOC_WPAIE2) {
 		if (ni->ni_ies.rsn_ie != NULL) {
 			int ielen = ni->ni_ies.rsn_ie[1] + 2;
 			if (ielen > sizeof(wpaie->rsn_ie))
 				ielen = sizeof(wpaie->rsn_ie);
 			memcpy(wpaie->rsn_ie, ni->ni_ies.rsn_ie, ielen);
 		}
 		if (ireq->i_len > sizeof(struct ieee80211req_wpaie2))
 			ireq->i_len = sizeof(struct ieee80211req_wpaie2);
 	} else {
 		/* compatibility op, may overwrite wpa ie */
 		/* XXX check ic_flags? */
 		if (ni->ni_ies.rsn_ie != NULL) {
 			int ielen = ni->ni_ies.rsn_ie[1] + 2;
 			if (ielen > sizeof(wpaie->wpa_ie))
 				ielen = sizeof(wpaie->wpa_ie);
 			memcpy(wpaie->wpa_ie, ni->ni_ies.rsn_ie, ielen);
 		}
 		if (ireq->i_len > sizeof(struct ieee80211req_wpaie))
 			ireq->i_len = sizeof(struct ieee80211req_wpaie);
 	}
 	ieee80211_free_node(ni);
 	error = copyout(wpaie, ireq->i_data, ireq->i_len);
 bad:
 	IEEE80211_FREE(wpaie, M_TEMP);
 	return error;
 }
 
 static int
 ieee80211_ioctl_getstastats(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211_node *ni;
 	uint8_t macaddr[IEEE80211_ADDR_LEN];
 	const size_t off = __offsetof(struct ieee80211req_sta_stats, is_stats);
 	int error;
 
 	if (ireq->i_len < off)
 		return EINVAL;
 	error = copyin(ireq->i_data, macaddr, IEEE80211_ADDR_LEN);
 	if (error != 0)
 		return error;
 	ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, macaddr);
 	if (ni == NULL)
 		return ENOENT;
 	if (ireq->i_len > sizeof(struct ieee80211req_sta_stats))
 		ireq->i_len = sizeof(struct ieee80211req_sta_stats);
 	/* NB: copy out only the statistics */
 	error = copyout(&ni->ni_stats, (uint8_t *) ireq->i_data + off,
 			ireq->i_len - off);
 	ieee80211_free_node(ni);
 	return error;
 }
 
 struct scanreq {
 	struct ieee80211req_scan_result *sr;
 	size_t space;
 };
 
 static size_t
 scan_space(const struct ieee80211_scan_entry *se, int *ielen)
 {
 	size_t len;
 
 	*ielen = se->se_ies.len;
 	/*
 	 * NB: ie's can be no more than 255 bytes and the max 802.11
 	 * packet is <3Kbytes so we are sure this doesn't overflow
 	 * 16-bits; if this is a concern we can drop the ie's.
 	 */
 	len = sizeof(struct ieee80211req_scan_result) + se->se_ssid[1] +
 	    se->se_meshid[1] + *ielen;
 	return roundup(len, sizeof(uint32_t));
 }
 
 static void
 get_scan_space(void *arg, const struct ieee80211_scan_entry *se)
 {
 	struct scanreq *req = arg;
 	int ielen;
 
 	req->space += scan_space(se, &ielen);
 }
 
 static void
 get_scan_result(void *arg, const struct ieee80211_scan_entry *se)
 {
 	struct scanreq *req = arg;
 	struct ieee80211req_scan_result *sr;
 	int ielen, len, nr, nxr;
 	uint8_t *cp;
 
 	len = scan_space(se, &ielen);
 	if (len > req->space)
 		return;
 
 	sr = req->sr;
 	KASSERT(len <= 65535 && ielen <= 65535,
 	    ("len %u ssid %u ie %u", len, se->se_ssid[1], ielen));
 	sr->isr_len = len;
 	sr->isr_ie_off = sizeof(struct ieee80211req_scan_result);
 	sr->isr_ie_len = ielen;
 	sr->isr_freq = se->se_chan->ic_freq;
 	sr->isr_flags = se->se_chan->ic_flags;
 	sr->isr_rssi = se->se_rssi;
 	sr->isr_noise = se->se_noise;
 	sr->isr_intval = se->se_intval;
 	sr->isr_capinfo = se->se_capinfo;
 	sr->isr_erp = se->se_erp;
 	IEEE80211_ADDR_COPY(sr->isr_bssid, se->se_bssid);
 	nr = min(se->se_rates[1], IEEE80211_RATE_MAXSIZE);
 	memcpy(sr->isr_rates, se->se_rates+2, nr);
 	nxr = min(se->se_xrates[1], IEEE80211_RATE_MAXSIZE - nr);
 	memcpy(sr->isr_rates+nr, se->se_xrates+2, nxr);
 	sr->isr_nrates = nr + nxr;
 
 	/* copy SSID */
 	sr->isr_ssid_len = se->se_ssid[1];
 	cp = ((uint8_t *)sr) + sr->isr_ie_off;
 	memcpy(cp, se->se_ssid+2, sr->isr_ssid_len);
 
 	/* copy mesh id */
 	cp += sr->isr_ssid_len;
 	sr->isr_meshid_len = se->se_meshid[1];
 	memcpy(cp, se->se_meshid+2, sr->isr_meshid_len);
 	cp += sr->isr_meshid_len;
 
 	if (ielen)
 		memcpy(cp, se->se_ies.data, ielen);
 
 	req->space -= len;
 	req->sr = (struct ieee80211req_scan_result *)(((uint8_t *)sr) + len);
 }
 
 static int
 ieee80211_ioctl_getscanresults(struct ieee80211vap *vap,
 	struct ieee80211req *ireq)
 {
 	struct scanreq req;
 	int error;
 
 	if (ireq->i_len < sizeof(struct scanreq))
 		return EFAULT;
 
 	error = 0;
 	req.space = 0;
 	ieee80211_scan_iterate(vap, get_scan_space, &req);
 	if (req.space > ireq->i_len)
 		req.space = ireq->i_len;
 	if (req.space > 0) {
 		uint32_t space;
 		void *p;
 
 		space = req.space;
 		/* XXX M_WAITOK after driver lock released */
 		p = IEEE80211_MALLOC(space, M_TEMP,
 		    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 		if (p == NULL)
 			return ENOMEM;
 		req.sr = p;
 		ieee80211_scan_iterate(vap, get_scan_result, &req);
 		ireq->i_len = space - req.space;
 		error = copyout(p, ireq->i_data, ireq->i_len);
 		IEEE80211_FREE(p, M_TEMP);
 	} else
 		ireq->i_len = 0;
 
 	return error;
 }
 
 struct stainforeq {
 	struct ieee80211req_sta_info *si;
 	size_t	space;
 };
 
 static size_t
 sta_space(const struct ieee80211_node *ni, size_t *ielen)
 {
 	*ielen = ni->ni_ies.len;
 	return roundup(sizeof(struct ieee80211req_sta_info) + *ielen,
 		      sizeof(uint32_t));
 }
 
 static void
 get_sta_space(void *arg, struct ieee80211_node *ni)
 {
 	struct stainforeq *req = arg;
 	size_t ielen;
 
 	if (ni->ni_vap->iv_opmode == IEEE80211_M_HOSTAP &&
 	    ni->ni_associd == 0)	/* only associated stations */
 		return;
 	req->space += sta_space(ni, &ielen);
 }
 
 static void
 get_sta_info(void *arg, struct ieee80211_node *ni)
 {
 	struct stainforeq *req = arg;
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211req_sta_info *si;
 	size_t ielen, len;
 	uint8_t *cp;
 
 	if (vap->iv_opmode == IEEE80211_M_HOSTAP &&
 	    ni->ni_associd == 0)	/* only associated stations */
 		return;
 	if (ni->ni_chan == IEEE80211_CHAN_ANYC)	/* XXX bogus entry */
 		return;
 	len = sta_space(ni, &ielen);
 	if (len > req->space)
 		return;
 	si = req->si;
 	si->isi_len = len;
 	si->isi_ie_off = sizeof(struct ieee80211req_sta_info);
 	si->isi_ie_len = ielen;
 	si->isi_freq = ni->ni_chan->ic_freq;
 	si->isi_flags = ni->ni_chan->ic_flags;
 	si->isi_state = ni->ni_flags;
 	si->isi_authmode = ni->ni_authmode;
 	vap->iv_ic->ic_node_getsignal(ni, &si->isi_rssi, &si->isi_noise);
 	vap->iv_ic->ic_node_getmimoinfo(ni, &si->isi_mimo);
 	si->isi_capinfo = ni->ni_capinfo;
 	si->isi_erp = ni->ni_erp;
 	IEEE80211_ADDR_COPY(si->isi_macaddr, ni->ni_macaddr);
 	si->isi_nrates = ni->ni_rates.rs_nrates;
 	if (si->isi_nrates > 15)
 		si->isi_nrates = 15;
 	memcpy(si->isi_rates, ni->ni_rates.rs_rates, si->isi_nrates);
 	si->isi_txrate = ni->ni_txrate;
 	if (si->isi_txrate & IEEE80211_RATE_MCS) {
 		const struct ieee80211_mcs_rates *mcs =
 		    &ieee80211_htrates[ni->ni_txrate &~ IEEE80211_RATE_MCS];
 		if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) {
 			if (ni->ni_flags & IEEE80211_NODE_SGI40)
 				si->isi_txmbps = mcs->ht40_rate_800ns;
 			else
 				si->isi_txmbps = mcs->ht40_rate_400ns;
 		} else {
 			if (ni->ni_flags & IEEE80211_NODE_SGI20)
 				si->isi_txmbps = mcs->ht20_rate_800ns;
 			else
 				si->isi_txmbps = mcs->ht20_rate_400ns;
 		}
 	} else
 		si->isi_txmbps = si->isi_txrate;
 	si->isi_associd = ni->ni_associd;
 	si->isi_txpower = ni->ni_txpower;
 	si->isi_vlan = ni->ni_vlan;
 	if (ni->ni_flags & IEEE80211_NODE_QOS) {
 		memcpy(si->isi_txseqs, ni->ni_txseqs, sizeof(ni->ni_txseqs));
 		memcpy(si->isi_rxseqs, ni->ni_rxseqs, sizeof(ni->ni_rxseqs));
 	} else {
 		si->isi_txseqs[0] = ni->ni_txseqs[IEEE80211_NONQOS_TID];
 		si->isi_rxseqs[0] = ni->ni_rxseqs[IEEE80211_NONQOS_TID];
 	}
 	/* NB: leave all cases in case we relax ni_associd == 0 check */
 	if (ieee80211_node_is_authorized(ni))
 		si->isi_inact = vap->iv_inact_run;
 	else if (ni->ni_associd != 0 ||
 	    (vap->iv_opmode == IEEE80211_M_WDS &&
 	     (vap->iv_flags_ext & IEEE80211_FEXT_WDSLEGACY)))
 		si->isi_inact = vap->iv_inact_auth;
 	else
 		si->isi_inact = vap->iv_inact_init;
 	si->isi_inact = (si->isi_inact - ni->ni_inact) * IEEE80211_INACT_WAIT;
 	si->isi_localid = ni->ni_mllid;
 	si->isi_peerid = ni->ni_mlpid;
 	si->isi_peerstate = ni->ni_mlstate;
 
 	if (ielen) {
 		cp = ((uint8_t *)si) + si->isi_ie_off;
 		memcpy(cp, ni->ni_ies.data, ielen);
 	}
 
 	req->si = (struct ieee80211req_sta_info *)(((uint8_t *)si) + len);
 	req->space -= len;
 }
 
 static int
 getstainfo_common(struct ieee80211vap *vap, struct ieee80211req *ireq,
 	struct ieee80211_node *ni, size_t off)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct stainforeq req;
 	size_t space;
 	void *p;
 	int error;
 
 	error = 0;
 	req.space = 0;
 	if (ni == NULL) {
 		ieee80211_iterate_nodes_vap(&ic->ic_sta, vap, get_sta_space,
 		    &req);
 	} else
 		get_sta_space(&req, ni);
 	if (req.space > ireq->i_len)
 		req.space = ireq->i_len;
 	if (req.space > 0) {
 		space = req.space;
 		/* XXX M_WAITOK after driver lock released */
 		p = IEEE80211_MALLOC(space, M_TEMP,
 		    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 		if (p == NULL) {
 			error = ENOMEM;
 			goto bad;
 		}
 		req.si = p;
 		if (ni == NULL) {
 			ieee80211_iterate_nodes_vap(&ic->ic_sta, vap,
 			    get_sta_info, &req);
 		} else
 			get_sta_info(&req, ni);
 		ireq->i_len = space - req.space;
 		error = copyout(p, (uint8_t *) ireq->i_data+off, ireq->i_len);
 		IEEE80211_FREE(p, M_TEMP);
 	} else
 		ireq->i_len = 0;
 bad:
 	if (ni != NULL)
 		ieee80211_free_node(ni);
 	return error;
 }
 
 static int
 ieee80211_ioctl_getstainfo(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	uint8_t macaddr[IEEE80211_ADDR_LEN];
 	const size_t off = __offsetof(struct ieee80211req_sta_req, info);
 	struct ieee80211_node *ni;
 	int error;
 
 	if (ireq->i_len < sizeof(struct ieee80211req_sta_req))
 		return EFAULT;
 	error = copyin(ireq->i_data, macaddr, IEEE80211_ADDR_LEN);
 	if (error != 0)
 		return error;
 	if (IEEE80211_ADDR_EQ(macaddr, vap->iv_ifp->if_broadcastaddr)) {
 		ni = NULL;
 	} else {
 		ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, macaddr);
 		if (ni == NULL)
 			return ENOENT;
 	}
 	return getstainfo_common(vap, ireq, ni, off);
 }
 
 static int
 ieee80211_ioctl_getstatxpow(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211_node *ni;
 	struct ieee80211req_sta_txpow txpow;
 	int error;
 
 	if (ireq->i_len != sizeof(txpow))
 		return EINVAL;
 	error = copyin(ireq->i_data, &txpow, sizeof(txpow));
 	if (error != 0)
 		return error;
 	ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, txpow.it_macaddr);
 	if (ni == NULL)
 		return ENOENT;
 	txpow.it_txpow = ni->ni_txpower;
 	error = copyout(&txpow, ireq->i_data, sizeof(txpow));
 	ieee80211_free_node(ni);
 	return error;
 }
 
 static int
 ieee80211_ioctl_getwmeparam(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_wme_state *wme = &ic->ic_wme;
 	struct wmeParams *wmep;
 	int ac;
 
 	if ((ic->ic_caps & IEEE80211_C_WME) == 0)
 		return EINVAL;
 
 	ac = (ireq->i_len & IEEE80211_WMEPARAM_VAL);
 	if (ac >= WME_NUM_AC)
 		ac = WME_AC_BE;
 	if (ireq->i_len & IEEE80211_WMEPARAM_BSS)
 		wmep = &wme->wme_wmeBssChanParams.cap_wmeParams[ac];
 	else
 		wmep = &wme->wme_wmeChanParams.cap_wmeParams[ac];
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_WME_CWMIN:		/* WME: CWmin */
 		ireq->i_val = wmep->wmep_logcwmin;
 		break;
 	case IEEE80211_IOC_WME_CWMAX:		/* WME: CWmax */
 		ireq->i_val = wmep->wmep_logcwmax;
 		break;
 	case IEEE80211_IOC_WME_AIFS:		/* WME: AIFS */
 		ireq->i_val = wmep->wmep_aifsn;
 		break;
 	case IEEE80211_IOC_WME_TXOPLIMIT:	/* WME: txops limit */
 		ireq->i_val = wmep->wmep_txopLimit;
 		break;
 	case IEEE80211_IOC_WME_ACM:		/* WME: ACM (bss only) */
 		wmep = &wme->wme_wmeBssChanParams.cap_wmeParams[ac];
 		ireq->i_val = wmep->wmep_acm;
 		break;
 	case IEEE80211_IOC_WME_ACKPOLICY:	/* WME: ACK policy (!bss only)*/
 		wmep = &wme->wme_wmeChanParams.cap_wmeParams[ac];
 		ireq->i_val = !wmep->wmep_noackPolicy;
 		break;
 	}
 	return 0;
 }
 
 static int
 ieee80211_ioctl_getmaccmd(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	const struct ieee80211_aclator *acl = vap->iv_acl;
 
 	return (acl == NULL ? EINVAL : acl->iac_getioctl(vap, ireq));
 }
 
 static int
 ieee80211_ioctl_getcurchan(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_channel *c;
 
 	if (ireq->i_len != sizeof(struct ieee80211_channel))
 		return EINVAL;
 	/*
 	 * vap's may have different operating channels when HT is
 	 * in use.  When in RUN state report the vap-specific channel.
 	 * Otherwise return curchan.
 	 */
 	if (vap->iv_state == IEEE80211_S_RUN || vap->iv_state == IEEE80211_S_SLEEP)
 		c = vap->iv_bss->ni_chan;
 	else
 		c = ic->ic_curchan;
 	return copyout(c, ireq->i_data, sizeof(*c));
 }
 
 static int
 getappie(const struct ieee80211_appie *aie, struct ieee80211req *ireq)
 {
 	if (aie == NULL)
 		return EINVAL;
 	/* NB: truncate, caller can check length */
 	if (ireq->i_len > aie->ie_len)
 		ireq->i_len = aie->ie_len;
 	return copyout(aie->ie_data, ireq->i_data, ireq->i_len);
 }
 
 static int
 ieee80211_ioctl_getappie(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	uint8_t fc0;
 
 	fc0 = ireq->i_val & 0xff;
 	if ((fc0 & IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_MGT)
 		return EINVAL;
 	/* NB: could check iv_opmode and reject but hardly worth the effort */
 	switch (fc0 & IEEE80211_FC0_SUBTYPE_MASK) {
 	case IEEE80211_FC0_SUBTYPE_BEACON:
 		return getappie(vap->iv_appie_beacon, ireq);
 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 		return getappie(vap->iv_appie_proberesp, ireq);
 	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
 		return getappie(vap->iv_appie_assocresp, ireq);
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 		return getappie(vap->iv_appie_probereq, ireq);
 	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
 		return getappie(vap->iv_appie_assocreq, ireq);
 	case IEEE80211_FC0_SUBTYPE_BEACON|IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 		return getappie(vap->iv_appie_wpa, ireq);
 	}
 	return EINVAL;
 }
 
 static int
 ieee80211_ioctl_getregdomain(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	if (ireq->i_len != sizeof(ic->ic_regdomain))
 		return EINVAL;
 	return copyout(&ic->ic_regdomain, ireq->i_data,
 	    sizeof(ic->ic_regdomain));
 }
 
 static int
 ieee80211_ioctl_getroam(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq)
 {
 	size_t len = ireq->i_len;
 	/* NB: accept short requests for backwards compat */
 	if (len > sizeof(vap->iv_roamparms))
 		len = sizeof(vap->iv_roamparms);
 	return copyout(vap->iv_roamparms, ireq->i_data, len);
 }
 
 static int
 ieee80211_ioctl_gettxparams(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq)
 {
 	size_t len = ireq->i_len;
 	/* NB: accept short requests for backwards compat */
 	if (len > sizeof(vap->iv_txparms))
 		len = sizeof(vap->iv_txparms);
 	return copyout(vap->iv_txparms, ireq->i_data, len);
 }
 
 static int
 ieee80211_ioctl_getdevcaps(struct ieee80211com *ic,
 	const struct ieee80211req *ireq)
 {
 	struct ieee80211_devcaps_req *dc;
 	struct ieee80211req_chaninfo *ci;
 	int maxchans, error;
 
 	maxchans = 1 + ((ireq->i_len - sizeof(struct ieee80211_devcaps_req)) /
 	    sizeof(struct ieee80211_channel));
 	/* NB: require 1 so we know ic_nchans is accessible */
 	if (maxchans < 1)
 		return EINVAL;
 	/* constrain max request size, 2K channels is ~24Kbytes */
 	if (maxchans > 2048)
 		maxchans = 2048;
 	dc = (struct ieee80211_devcaps_req *)
 	    IEEE80211_MALLOC(IEEE80211_DEVCAPS_SIZE(maxchans), M_TEMP,
 	    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (dc == NULL)
 		return ENOMEM;
 	dc->dc_drivercaps = ic->ic_caps;
 	dc->dc_cryptocaps = ic->ic_cryptocaps;
 	dc->dc_htcaps = ic->ic_htcaps;
+	dc->dc_vhtcaps = ic->ic_vhtcaps;
 	ci = &dc->dc_chaninfo;
 	ic->ic_getradiocaps(ic, maxchans, &ci->ic_nchans, ci->ic_chans);
 	KASSERT(ci->ic_nchans <= maxchans,
 	    ("nchans %d maxchans %d", ci->ic_nchans, maxchans));
 	ieee80211_sort_channels(ci->ic_chans, ci->ic_nchans);
 	error = copyout(dc, ireq->i_data, IEEE80211_DEVCAPS_SPACE(dc));
 	IEEE80211_FREE(dc, M_TEMP);
 	return error;
 }
 
 static int
 ieee80211_ioctl_getstavlan(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211_node *ni;
 	struct ieee80211req_sta_vlan vlan;
 	int error;
 
 	if (ireq->i_len != sizeof(vlan))
 		return EINVAL;
 	error = copyin(ireq->i_data, &vlan, sizeof(vlan));
 	if (error != 0)
 		return error;
 	if (!IEEE80211_ADDR_EQ(vlan.sv_macaddr, zerobssid)) {
 		ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap,
 		    vlan.sv_macaddr);
 		if (ni == NULL)
 			return ENOENT;
 	} else
 		ni = ieee80211_ref_node(vap->iv_bss);
 	vlan.sv_vlan = ni->ni_vlan;
 	error = copyout(&vlan, ireq->i_data, sizeof(vlan));
 	ieee80211_free_node(ni);
 	return error;
 }
 
 /*
  * Dummy ioctl get handler so the linker set is defined.
  */
 static int
 dummy_ioctl_get(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	return ENOSYS;
 }
 IEEE80211_IOCTL_GET(dummy, dummy_ioctl_get);
 
 static int
 ieee80211_ioctl_getdefault(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	ieee80211_ioctl_getfunc * const *get;
 	int error;
 
 	SET_FOREACH(get, ieee80211_ioctl_getset) {
 		error = (*get)(vap, ireq);
 		if (error != ENOSYS)
 			return error;
 	}
 	return EINVAL;
 }
 
 static int
 ieee80211_ioctl_get80211(struct ieee80211vap *vap, u_long cmd,
     struct ieee80211req *ireq)
 {
 #define	MS(_v, _f)	(((_v) & _f) >> _f##_S)
 	struct ieee80211com *ic = vap->iv_ic;
 	u_int kid, len;
 	uint8_t tmpkey[IEEE80211_KEYBUF_SIZE];
 	char tmpssid[IEEE80211_NWID_LEN];
 	int error = 0;
 
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_SSID:
 		switch (vap->iv_state) {
 		case IEEE80211_S_INIT:
 		case IEEE80211_S_SCAN:
 			ireq->i_len = vap->iv_des_ssid[0].len;
 			memcpy(tmpssid, vap->iv_des_ssid[0].ssid, ireq->i_len);
 			break;
 		default:
 			ireq->i_len = vap->iv_bss->ni_esslen;
 			memcpy(tmpssid, vap->iv_bss->ni_essid, ireq->i_len);
 			break;
 		}
 		error = copyout(tmpssid, ireq->i_data, ireq->i_len);
 		break;
 	case IEEE80211_IOC_NUMSSIDS:
 		ireq->i_val = 1;
 		break;
 	case IEEE80211_IOC_WEP:
 		if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0)
 			ireq->i_val = IEEE80211_WEP_OFF;
 		else if (vap->iv_flags & IEEE80211_F_DROPUNENC)
 			ireq->i_val = IEEE80211_WEP_ON;
 		else
 			ireq->i_val = IEEE80211_WEP_MIXED;
 		break;
 	case IEEE80211_IOC_WEPKEY:
 		kid = (u_int) ireq->i_val;
 		if (kid >= IEEE80211_WEP_NKID)
 			return EINVAL;
 		len = (u_int) vap->iv_nw_keys[kid].wk_keylen;
 		/* NB: only root can read WEP keys */
 		if (priv_check(curthread, PRIV_NET80211_GETKEY) == 0) {
 			bcopy(vap->iv_nw_keys[kid].wk_key, tmpkey, len);
 		} else {
 			bzero(tmpkey, len);
 		}
 		ireq->i_len = len;
 		error = copyout(tmpkey, ireq->i_data, len);
 		break;
 	case IEEE80211_IOC_NUMWEPKEYS:
 		ireq->i_val = IEEE80211_WEP_NKID;
 		break;
 	case IEEE80211_IOC_WEPTXKEY:
 		ireq->i_val = vap->iv_def_txkey;
 		break;
 	case IEEE80211_IOC_AUTHMODE:
 		if (vap->iv_flags & IEEE80211_F_WPA)
 			ireq->i_val = IEEE80211_AUTH_WPA;
 		else
 			ireq->i_val = vap->iv_bss->ni_authmode;
 		break;
 	case IEEE80211_IOC_CHANNEL:
 		ireq->i_val = ieee80211_chan2ieee(ic, ic->ic_curchan);
 		break;
 	case IEEE80211_IOC_POWERSAVE:
 		if (vap->iv_flags & IEEE80211_F_PMGTON)
 			ireq->i_val = IEEE80211_POWERSAVE_ON;
 		else
 			ireq->i_val = IEEE80211_POWERSAVE_OFF;
 		break;
 	case IEEE80211_IOC_POWERSAVESLEEP:
 		ireq->i_val = ic->ic_lintval;
 		break;
 	case IEEE80211_IOC_RTSTHRESHOLD:
 		ireq->i_val = vap->iv_rtsthreshold;
 		break;
 	case IEEE80211_IOC_PROTMODE:
 		ireq->i_val = ic->ic_protmode;
 		break;
 	case IEEE80211_IOC_TXPOWER:
 		/*
 		 * Tx power limit is the min of max regulatory
 		 * power, any user-set limit, and the max the
 		 * radio can do.
 		 *
 		 * TODO: methodize this
 		 */
 		ireq->i_val = 2*ic->ic_curchan->ic_maxregpower;
 		if (ireq->i_val > ic->ic_txpowlimit)
 			ireq->i_val = ic->ic_txpowlimit;
 		if (ireq->i_val > ic->ic_curchan->ic_maxpower)
 			ireq->i_val = ic->ic_curchan->ic_maxpower;
 		break;
 	case IEEE80211_IOC_WPA:
 		switch (vap->iv_flags & IEEE80211_F_WPA) {
 		case IEEE80211_F_WPA1:
 			ireq->i_val = 1;
 			break;
 		case IEEE80211_F_WPA2:
 			ireq->i_val = 2;
 			break;
 		case IEEE80211_F_WPA1 | IEEE80211_F_WPA2:
 			ireq->i_val = 3;
 			break;
 		default:
 			ireq->i_val = 0;
 			break;
 		}
 		break;
 	case IEEE80211_IOC_CHANLIST:
 		error = ieee80211_ioctl_getchanlist(vap, ireq);
 		break;
 	case IEEE80211_IOC_ROAMING:
 		ireq->i_val = vap->iv_roaming;
 		break;
 	case IEEE80211_IOC_PRIVACY:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_PRIVACY) != 0;
 		break;
 	case IEEE80211_IOC_DROPUNENCRYPTED:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_DROPUNENC) != 0;
 		break;
 	case IEEE80211_IOC_COUNTERMEASURES:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_COUNTERM) != 0;
 		break;
 	case IEEE80211_IOC_WME:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_WME) != 0;
 		break;
 	case IEEE80211_IOC_HIDESSID:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_HIDESSID) != 0;
 		break;
 	case IEEE80211_IOC_APBRIDGE:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0;
 		break;
 	case IEEE80211_IOC_WPAKEY:
 		error = ieee80211_ioctl_getkey(vap, ireq);
 		break;
 	case IEEE80211_IOC_CHANINFO:
 		error = ieee80211_ioctl_getchaninfo(vap, ireq);
 		break;
 	case IEEE80211_IOC_BSSID:
 		if (ireq->i_len != IEEE80211_ADDR_LEN)
 			return EINVAL;
 		if (vap->iv_state == IEEE80211_S_RUN || vap->iv_state == IEEE80211_S_SLEEP) {
 			error = copyout(vap->iv_opmode == IEEE80211_M_WDS ?
 			    vap->iv_bss->ni_macaddr : vap->iv_bss->ni_bssid,
 			    ireq->i_data, ireq->i_len);
 		} else
 			error = copyout(vap->iv_des_bssid, ireq->i_data,
 			    ireq->i_len);
 		break;
 	case IEEE80211_IOC_WPAIE:
 	case IEEE80211_IOC_WPAIE2:
 		error = ieee80211_ioctl_getwpaie(vap, ireq, ireq->i_type);
 		break;
 	case IEEE80211_IOC_SCAN_RESULTS:
 		error = ieee80211_ioctl_getscanresults(vap, ireq);
 		break;
 	case IEEE80211_IOC_STA_STATS:
 		error = ieee80211_ioctl_getstastats(vap, ireq);
 		break;
 	case IEEE80211_IOC_TXPOWMAX:
 		ireq->i_val = vap->iv_bss->ni_txpower;
 		break;
 	case IEEE80211_IOC_STA_TXPOW:
 		error = ieee80211_ioctl_getstatxpow(vap, ireq);
 		break;
 	case IEEE80211_IOC_STA_INFO:
 		error = ieee80211_ioctl_getstainfo(vap, ireq);
 		break;
 	case IEEE80211_IOC_WME_CWMIN:		/* WME: CWmin */
 	case IEEE80211_IOC_WME_CWMAX:		/* WME: CWmax */
 	case IEEE80211_IOC_WME_AIFS:		/* WME: AIFS */
 	case IEEE80211_IOC_WME_TXOPLIMIT:	/* WME: txops limit */
 	case IEEE80211_IOC_WME_ACM:		/* WME: ACM (bss only) */
 	case IEEE80211_IOC_WME_ACKPOLICY:	/* WME: ACK policy (!bss only) */
 		error = ieee80211_ioctl_getwmeparam(vap, ireq);
 		break;
 	case IEEE80211_IOC_DTIM_PERIOD:
 		ireq->i_val = vap->iv_dtim_period;
 		break;
 	case IEEE80211_IOC_BEACON_INTERVAL:
 		/* NB: get from ic_bss for station mode */
 		ireq->i_val = vap->iv_bss->ni_intval;
 		break;
 	case IEEE80211_IOC_PUREG:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_PUREG) != 0;
 		break;
 	case IEEE80211_IOC_QUIET:
 		ireq->i_val = vap->iv_quiet;
 		break;
 	case IEEE80211_IOC_QUIET_COUNT:
 		ireq->i_val = vap->iv_quiet_count;
 		break;
 	case IEEE80211_IOC_QUIET_PERIOD:
 		ireq->i_val = vap->iv_quiet_period;
 		break;
 	case IEEE80211_IOC_QUIET_DUR:
 		ireq->i_val = vap->iv_quiet_duration;
 		break;
 	case IEEE80211_IOC_QUIET_OFFSET:
 		ireq->i_val = vap->iv_quiet_offset;
 		break;
 	case IEEE80211_IOC_BGSCAN:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_BGSCAN) != 0;
 		break;
 	case IEEE80211_IOC_BGSCAN_IDLE:
 		ireq->i_val = vap->iv_bgscanidle*hz/1000;	/* ms */
 		break;
 	case IEEE80211_IOC_BGSCAN_INTERVAL:
 		ireq->i_val = vap->iv_bgscanintvl/hz;		/* seconds */
 		break;
 	case IEEE80211_IOC_SCANVALID:
 		ireq->i_val = vap->iv_scanvalid/hz;		/* seconds */
 		break;
 	case IEEE80211_IOC_FRAGTHRESHOLD:
 		ireq->i_val = vap->iv_fragthreshold;
 		break;
 	case IEEE80211_IOC_MACCMD:
 		error = ieee80211_ioctl_getmaccmd(vap, ireq);
 		break;
 	case IEEE80211_IOC_BURST:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_BURST) != 0;
 		break;
 	case IEEE80211_IOC_BMISSTHRESHOLD:
 		ireq->i_val = vap->iv_bmissthreshold;
 		break;
 	case IEEE80211_IOC_CURCHAN:
 		error = ieee80211_ioctl_getcurchan(vap, ireq);
 		break;
 	case IEEE80211_IOC_SHORTGI:
 		ireq->i_val = 0;
 		if (vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20)
 			ireq->i_val |= IEEE80211_HTCAP_SHORTGI20;
 		if (vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40)
 			ireq->i_val |= IEEE80211_HTCAP_SHORTGI40;
 		break;
 	case IEEE80211_IOC_AMPDU:
 		ireq->i_val = 0;
 		if (vap->iv_flags_ht & IEEE80211_FHT_AMPDU_TX)
 			ireq->i_val |= 1;
 		if (vap->iv_flags_ht & IEEE80211_FHT_AMPDU_RX)
 			ireq->i_val |= 2;
 		break;
 	case IEEE80211_IOC_AMPDU_LIMIT:
 		/* XXX TODO: make this a per-node thing; and leave this as global */
 		if (vap->iv_opmode == IEEE80211_M_HOSTAP)
 			ireq->i_val = vap->iv_ampdu_rxmax;
 		else if (vap->iv_state == IEEE80211_S_RUN || vap->iv_state == IEEE80211_S_SLEEP)
 			/*
 			 * XXX TODO: this isn't completely correct, as we've
 			 * negotiated the higher of the two.
 			 */
 			ireq->i_val = MS(vap->iv_bss->ni_htparam,
 			    IEEE80211_HTCAP_MAXRXAMPDU);
 		else
 			ireq->i_val = vap->iv_ampdu_limit;
 		break;
 	case IEEE80211_IOC_AMPDU_DENSITY:
 		/* XXX TODO: make this a per-node thing; and leave this as global */
 		if (vap->iv_opmode == IEEE80211_M_STA &&
 		    (vap->iv_state == IEEE80211_S_RUN || vap->iv_state == IEEE80211_S_SLEEP))
 			/*
 			 * XXX TODO: this isn't completely correct, as we've
 			 * negotiated the higher of the two.
 			 */
 			ireq->i_val = MS(vap->iv_bss->ni_htparam,
 			    IEEE80211_HTCAP_MPDUDENSITY);
 		else
 			ireq->i_val = vap->iv_ampdu_density;
 		break;
 	case IEEE80211_IOC_AMSDU:
 		ireq->i_val = 0;
 		if (vap->iv_flags_ht & IEEE80211_FHT_AMSDU_TX)
 			ireq->i_val |= 1;
 		if (vap->iv_flags_ht & IEEE80211_FHT_AMSDU_RX)
 			ireq->i_val |= 2;
 		break;
 	case IEEE80211_IOC_AMSDU_LIMIT:
 		ireq->i_val = vap->iv_amsdu_limit;	/* XXX truncation? */
 		break;
 	case IEEE80211_IOC_PUREN:
 		ireq->i_val = (vap->iv_flags_ht & IEEE80211_FHT_PUREN) != 0;
 		break;
 	case IEEE80211_IOC_DOTH:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_DOTH) != 0;
 		break;
 	case IEEE80211_IOC_REGDOMAIN:
 		error = ieee80211_ioctl_getregdomain(vap, ireq);
 		break;
 	case IEEE80211_IOC_ROAM:
 		error = ieee80211_ioctl_getroam(vap, ireq);
 		break;
 	case IEEE80211_IOC_TXPARAMS:
 		error = ieee80211_ioctl_gettxparams(vap, ireq);
 		break;
 	case IEEE80211_IOC_HTCOMPAT:
 		ireq->i_val = (vap->iv_flags_ht & IEEE80211_FHT_HTCOMPAT) != 0;
 		break;
 	case IEEE80211_IOC_DWDS:
 		ireq->i_val = (vap->iv_flags & IEEE80211_F_DWDS) != 0;
 		break;
 	case IEEE80211_IOC_INACTIVITY:
 		ireq->i_val = (vap->iv_flags_ext & IEEE80211_FEXT_INACT) != 0;
 		break;
 	case IEEE80211_IOC_APPIE:
 		error = ieee80211_ioctl_getappie(vap, ireq);
 		break;
 	case IEEE80211_IOC_WPS:
 		ireq->i_val = (vap->iv_flags_ext & IEEE80211_FEXT_WPS) != 0;
 		break;
 	case IEEE80211_IOC_TSN:
 		ireq->i_val = (vap->iv_flags_ext & IEEE80211_FEXT_TSN) != 0;
 		break;
 	case IEEE80211_IOC_DFS:
 		ireq->i_val = (vap->iv_flags_ext & IEEE80211_FEXT_DFS) != 0;
 		break;
 	case IEEE80211_IOC_DOTD:
 		ireq->i_val = (vap->iv_flags_ext & IEEE80211_FEXT_DOTD) != 0;
 		break;
 	case IEEE80211_IOC_DEVCAPS:
 		error = ieee80211_ioctl_getdevcaps(ic, ireq);
 		break;
 	case IEEE80211_IOC_HTPROTMODE:
 		ireq->i_val = ic->ic_htprotmode;
 		break;
 	case IEEE80211_IOC_HTCONF:
 		if (vap->iv_flags_ht & IEEE80211_FHT_HT) {
 			ireq->i_val = 1;
 			if (vap->iv_flags_ht & IEEE80211_FHT_USEHT40)
 				ireq->i_val |= 2;
 		} else
 			ireq->i_val = 0;
 		break;
 	case IEEE80211_IOC_STA_VLAN:
 		error = ieee80211_ioctl_getstavlan(vap, ireq);
 		break;
 	case IEEE80211_IOC_SMPS:
 		if (vap->iv_opmode == IEEE80211_M_STA &&
 		    (vap->iv_state == IEEE80211_S_RUN || vap->iv_state == IEEE80211_S_SLEEP)) {
 			if (vap->iv_bss->ni_flags & IEEE80211_NODE_MIMO_RTS)
 				ireq->i_val = IEEE80211_HTCAP_SMPS_DYNAMIC;
 			else if (vap->iv_bss->ni_flags & IEEE80211_NODE_MIMO_PS)
 				ireq->i_val = IEEE80211_HTCAP_SMPS_ENA;
 			else
 				ireq->i_val = IEEE80211_HTCAP_SMPS_OFF;
 		} else
 			ireq->i_val = vap->iv_htcaps & IEEE80211_HTCAP_SMPS;
 		break;
 	case IEEE80211_IOC_RIFS:
 		if (vap->iv_opmode == IEEE80211_M_STA &&
 		    (vap->iv_state == IEEE80211_S_RUN || vap->iv_state == IEEE80211_S_SLEEP))
 			ireq->i_val =
 			    (vap->iv_bss->ni_flags & IEEE80211_NODE_RIFS) != 0;
 		else
 			ireq->i_val =
 			    (vap->iv_flags_ht & IEEE80211_FHT_RIFS) != 0;
 		break;
 	case IEEE80211_IOC_STBC:
 		ireq->i_val = 0;
 		if (vap->iv_flags_ht & IEEE80211_FHT_STBC_TX)
 			ireq->i_val |= 1;
 		if (vap->iv_flags_ht & IEEE80211_FHT_STBC_RX)
 			ireq->i_val |= 2;
 		break;
+
+	/* VHT */
+	case IEEE80211_IOC_VHTCONF:
+		ireq->i_val = 0;
+		if (vap->iv_flags_vht & IEEE80211_FVHT_VHT)
+			ireq->i_val |= 1;
+		if (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT40)
+			ireq->i_val |= 2;
+		if (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80)
+			ireq->i_val |= 4;
+		if (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80)
+			ireq->i_val |= 8;
+		if (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT160)
+			ireq->i_val |= 16;
+		break;
+
 	default:
 		error = ieee80211_ioctl_getdefault(vap, ireq);
 		break;
 	}
 	return error;
 #undef MS
 }
 
 static int
 ieee80211_ioctl_setkey(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211req_key ik;
 	struct ieee80211_node *ni;
 	struct ieee80211_key *wk;
 	uint16_t kid;
 	int error, i;
 
 	if (ireq->i_len != sizeof(ik))
 		return EINVAL;
 	error = copyin(ireq->i_data, &ik, sizeof(ik));
 	if (error)
 		return error;
 	/* NB: cipher support is verified by ieee80211_crypt_newkey */
 	/* NB: this also checks ik->ik_keylen > sizeof(wk->wk_key) */
 	if (ik.ik_keylen > sizeof(ik.ik_keydata))
 		return E2BIG;
 	kid = ik.ik_keyix;
 	if (kid == IEEE80211_KEYIX_NONE) {
 		/* XXX unicast keys currently must be tx/rx */
 		if (ik.ik_flags != (IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV))
 			return EINVAL;
 		if (vap->iv_opmode == IEEE80211_M_STA) {
 			ni = ieee80211_ref_node(vap->iv_bss);
 			if (!IEEE80211_ADDR_EQ(ik.ik_macaddr, ni->ni_bssid)) {
 				ieee80211_free_node(ni);
 				return EADDRNOTAVAIL;
 			}
 		} else {
 			ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap,
 				ik.ik_macaddr);
 			if (ni == NULL)
 				return ENOENT;
 		}
 		wk = &ni->ni_ucastkey;
 	} else {
 		if (kid >= IEEE80211_WEP_NKID)
 			return EINVAL;
 		wk = &vap->iv_nw_keys[kid];
 		/*
 		 * Global slots start off w/o any assigned key index.
 		 * Force one here for consistency with IEEE80211_IOC_WEPKEY.
 		 */
 		if (wk->wk_keyix == IEEE80211_KEYIX_NONE)
 			wk->wk_keyix = kid;
 		ni = NULL;
 	}
 	error = 0;
 	ieee80211_key_update_begin(vap);
 	if (ieee80211_crypto_newkey(vap, ik.ik_type, ik.ik_flags, wk)) {
 		wk->wk_keylen = ik.ik_keylen;
 		/* NB: MIC presence is implied by cipher type */
 		if (wk->wk_keylen > IEEE80211_KEYBUF_SIZE)
 			wk->wk_keylen = IEEE80211_KEYBUF_SIZE;
 		for (i = 0; i < IEEE80211_TID_SIZE; i++)
 			wk->wk_keyrsc[i] = ik.ik_keyrsc;
 		wk->wk_keytsc = 0;			/* new key, reset */
 		memset(wk->wk_key, 0, sizeof(wk->wk_key));
 		memcpy(wk->wk_key, ik.ik_keydata, ik.ik_keylen);
 		IEEE80211_ADDR_COPY(wk->wk_macaddr,
 		    ni != NULL ?  ni->ni_macaddr : ik.ik_macaddr);
 		if (!ieee80211_crypto_setkey(vap, wk))
 			error = EIO;
 		else if ((ik.ik_flags & IEEE80211_KEY_DEFAULT))
 			/*
 			 * Inform the driver that this is the default
 			 * transmit key.  Now, ideally we'd just set
 			 * a flag in the key update that would
 			 * say "yes, we're the default key", but
 			 * that currently isn't the way the ioctl ->
 			 * key interface works.
 			 */
 			ieee80211_crypto_set_deftxkey(vap, kid);
 	} else
 		error = ENXIO;
 	ieee80211_key_update_end(vap);
 	if (ni != NULL)
 		ieee80211_free_node(ni);
 	return error;
 }
 
 static int
 ieee80211_ioctl_delkey(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211req_del_key dk;
 	int kid, error;
 
 	if (ireq->i_len != sizeof(dk))
 		return EINVAL;
 	error = copyin(ireq->i_data, &dk, sizeof(dk));
 	if (error)
 		return error;
 	kid = dk.idk_keyix;
 	/* XXX uint8_t -> uint16_t */
 	if (dk.idk_keyix == (uint8_t) IEEE80211_KEYIX_NONE) {
 		struct ieee80211_node *ni;
 
 		if (vap->iv_opmode == IEEE80211_M_STA) {
 			ni = ieee80211_ref_node(vap->iv_bss);
 			if (!IEEE80211_ADDR_EQ(dk.idk_macaddr, ni->ni_bssid)) {
 				ieee80211_free_node(ni);
 				return EADDRNOTAVAIL;
 			}
 		} else {
 			ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap,
 				dk.idk_macaddr);
 			if (ni == NULL)
 				return ENOENT;
 		}
 		/* XXX error return */
 		ieee80211_node_delucastkey(ni);
 		ieee80211_free_node(ni);
 	} else {
 		if (kid >= IEEE80211_WEP_NKID)
 			return EINVAL;
 		/* XXX error return */
 		ieee80211_crypto_delkey(vap, &vap->iv_nw_keys[kid]);
 	}
 	return 0;
 }
 
 struct mlmeop {
 	struct ieee80211vap *vap;
 	int	op;
 	int	reason;
 };
 
 static void
 mlmedebug(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN],
 	int op, int reason)
 {
 #ifdef IEEE80211_DEBUG
 	static const struct {
 		int mask;
 		const char *opstr;
 	} ops[] = {
 		{ 0, "op#0" },
 		{ IEEE80211_MSG_IOCTL | IEEE80211_MSG_STATE |
 		  IEEE80211_MSG_ASSOC, "assoc" },
 		{ IEEE80211_MSG_IOCTL | IEEE80211_MSG_STATE |
 		  IEEE80211_MSG_ASSOC, "disassoc" },
 		{ IEEE80211_MSG_IOCTL | IEEE80211_MSG_STATE |
 		  IEEE80211_MSG_AUTH, "deauth" },
 		{ IEEE80211_MSG_IOCTL | IEEE80211_MSG_STATE |
 		  IEEE80211_MSG_AUTH, "authorize" },
 		{ IEEE80211_MSG_IOCTL | IEEE80211_MSG_STATE |
 		  IEEE80211_MSG_AUTH, "unauthorize" },
 	};
 
 	if (op == IEEE80211_MLME_AUTH) {
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_IOCTL |
 		    IEEE80211_MSG_STATE | IEEE80211_MSG_AUTH, mac,
 		    "station authenticate %s via MLME (reason: %d (%s))",
 		    reason == IEEE80211_STATUS_SUCCESS ? "ACCEPT" : "REJECT",
 		    reason, ieee80211_reason_to_string(reason));
 	} else if (!(IEEE80211_MLME_ASSOC <= op && op <= IEEE80211_MLME_AUTH)) {
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, mac,
 		    "unknown MLME request %d (reason: %d (%s))", op, reason,
 		    ieee80211_reason_to_string(reason));
 	} else if (reason == IEEE80211_STATUS_SUCCESS) {
 		IEEE80211_NOTE_MAC(vap, ops[op].mask, mac,
 		    "station %s via MLME", ops[op].opstr);
 	} else {
 		IEEE80211_NOTE_MAC(vap, ops[op].mask, mac,
 		    "station %s via MLME (reason: %d (%s))", ops[op].opstr,
 		    reason, ieee80211_reason_to_string(reason));
 	}
 #endif /* IEEE80211_DEBUG */
 }
 
 static void
 domlme(void *arg, struct ieee80211_node *ni)
 {
 	struct mlmeop *mop = arg;
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	if (vap != mop->vap)
 		return;
 	/*
 	 * NB: if ni_associd is zero then the node is already cleaned
 	 * up and we don't need to do this (we're safely holding a
 	 * reference but should otherwise not modify it's state).
 	 */ 
 	if (ni->ni_associd == 0)
 		return;
 	mlmedebug(vap, ni->ni_macaddr, mop->op, mop->reason);
 	if (mop->op == IEEE80211_MLME_DEAUTH) {
 		IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH,
 		    mop->reason);
 	} else {
 		IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DISASSOC,
 		    mop->reason);
 	}
 	ieee80211_node_leave(ni);
 }
 
 static int
 setmlme_dropsta(struct ieee80211vap *vap,
 	const uint8_t mac[IEEE80211_ADDR_LEN], struct mlmeop *mlmeop)
 {
 	struct ieee80211_node_table *nt = &vap->iv_ic->ic_sta;
 	struct ieee80211_node *ni;
 	int error = 0;
 
 	/* NB: the broadcast address means do 'em all */
 	if (!IEEE80211_ADDR_EQ(mac, vap->iv_ifp->if_broadcastaddr)) {
 		IEEE80211_NODE_LOCK(nt);
 		ni = ieee80211_find_node_locked(nt, mac);
 		IEEE80211_NODE_UNLOCK(nt);
 		/*
 		 * Don't do the node update inside the node
 		 * table lock.  This unfortunately causes LORs
 		 * with drivers and their TX paths.
 		 */
 		if (ni != NULL) {
 			domlme(mlmeop, ni);
 			ieee80211_free_node(ni);
 		} else
 			error = ENOENT;
 	} else {
 		ieee80211_iterate_nodes(nt, domlme, mlmeop);
 	}
 	return error;
 }
 
 static int
 setmlme_common(struct ieee80211vap *vap, int op,
 	const uint8_t mac[IEEE80211_ADDR_LEN], int reason)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_node_table *nt = &ic->ic_sta;
 	struct ieee80211_node *ni;
 	struct mlmeop mlmeop;
 	int error;
 
 	error = 0;
 	switch (op) {
 	case IEEE80211_MLME_DISASSOC:
 	case IEEE80211_MLME_DEAUTH:
 		switch (vap->iv_opmode) {
 		case IEEE80211_M_STA:
 			mlmedebug(vap, vap->iv_bss->ni_macaddr, op, reason);
 			/* XXX not quite right */
 			ieee80211_new_state(vap, IEEE80211_S_INIT, reason);
 			break;
 		case IEEE80211_M_HOSTAP:
 			mlmeop.vap = vap;
 			mlmeop.op = op;
 			mlmeop.reason = reason;
 			error = setmlme_dropsta(vap, mac, &mlmeop);
 			break;
 		case IEEE80211_M_WDS:
 			/* XXX user app should send raw frame? */
 			if (op != IEEE80211_MLME_DEAUTH) {
 				error = EINVAL;
 				break;
 			}
 #if 0
 			/* XXX accept any address, simplifies user code */
 			if (!IEEE80211_ADDR_EQ(mac, vap->iv_bss->ni_macaddr)) {
 				error = EINVAL;
 				break;
 			}
 #endif
 			mlmedebug(vap, vap->iv_bss->ni_macaddr, op, reason);
 			ni = ieee80211_ref_node(vap->iv_bss);
 			IEEE80211_SEND_MGMT(ni,
 			    IEEE80211_FC0_SUBTYPE_DEAUTH, reason);
 			ieee80211_free_node(ni);
 			break;
 		case IEEE80211_M_MBSS:
 			IEEE80211_NODE_LOCK(nt);
 			ni = ieee80211_find_node_locked(nt, mac);
 			/*
 			 * Don't do the node update inside the node
 			 * table lock.  This unfortunately causes LORs
 			 * with drivers and their TX paths.
 			 */
 			IEEE80211_NODE_UNLOCK(nt);
 			if (ni != NULL) {
 				ieee80211_node_leave(ni);
 				ieee80211_free_node(ni);
 			} else {
 				error = ENOENT;
 			}
 			break;
 		default:
 			error = EINVAL;
 			break;
 		}
 		break;
 	case IEEE80211_MLME_AUTHORIZE:
 	case IEEE80211_MLME_UNAUTHORIZE:
 		if (vap->iv_opmode != IEEE80211_M_HOSTAP &&
 		    vap->iv_opmode != IEEE80211_M_WDS) {
 			error = EINVAL;
 			break;
 		}
 		IEEE80211_NODE_LOCK(nt);
 		ni = ieee80211_find_vap_node_locked(nt, vap, mac);
 		/*
 		 * Don't do the node update inside the node
 		 * table lock.  This unfortunately causes LORs
 		 * with drivers and their TX paths.
 		 */
 		IEEE80211_NODE_UNLOCK(nt);
 		if (ni != NULL) {
 			mlmedebug(vap, mac, op, reason);
 			if (op == IEEE80211_MLME_AUTHORIZE)
 				ieee80211_node_authorize(ni);
 			else
 				ieee80211_node_unauthorize(ni);
 			ieee80211_free_node(ni);
 		} else
 			error = ENOENT;
 		break;
 	case IEEE80211_MLME_AUTH:
 		if (vap->iv_opmode != IEEE80211_M_HOSTAP) {
 			error = EINVAL;
 			break;
 		}
 		IEEE80211_NODE_LOCK(nt);
 		ni = ieee80211_find_vap_node_locked(nt, vap, mac);
 		/*
 		 * Don't do the node update inside the node
 		 * table lock.  This unfortunately causes LORs
 		 * with drivers and their TX paths.
 		 */
 		IEEE80211_NODE_UNLOCK(nt);
 		if (ni != NULL) {
 			mlmedebug(vap, mac, op, reason);
 			if (reason == IEEE80211_STATUS_SUCCESS) {
 				IEEE80211_SEND_MGMT(ni,
 				    IEEE80211_FC0_SUBTYPE_AUTH, 2);
 				/*
 				 * For shared key auth, just continue the
 				 * exchange.  Otherwise when 802.1x is not in
 				 * use mark the port authorized at this point
 				 * so traffic can flow.
 				 */
 				if (ni->ni_authmode != IEEE80211_AUTH_8021X &&
 				    ni->ni_challenge == NULL)
 				      ieee80211_node_authorize(ni);
 			} else {
 				vap->iv_stats.is_rx_acl++;
 				ieee80211_send_error(ni, ni->ni_macaddr,
 				    IEEE80211_FC0_SUBTYPE_AUTH, 2|(reason<<16));
 				ieee80211_node_leave(ni);
 			}
 			ieee80211_free_node(ni);
 		} else
 			error = ENOENT;
 		break;
 	default:
 		error = EINVAL;
 		break;
 	}
 	return error;
 }
 
 struct scanlookup {
 	const uint8_t *mac;
 	int esslen;
 	const uint8_t *essid;
 	const struct ieee80211_scan_entry *se;
 };
 
 /*
  * Match mac address and any ssid.
  */
 static void
 mlmelookup(void *arg, const struct ieee80211_scan_entry *se)
 {
 	struct scanlookup *look = arg;
 
 	if (!IEEE80211_ADDR_EQ(look->mac, se->se_macaddr))
 		return;
 	if (look->esslen != 0) {
 		if (se->se_ssid[1] != look->esslen)
 			return;
 		if (memcmp(look->essid, se->se_ssid+2, look->esslen))
 			return;
 	}
 	look->se = se;
 }
 
 static int
 setmlme_assoc_sta(struct ieee80211vap *vap,
 	const uint8_t mac[IEEE80211_ADDR_LEN], int ssid_len,
 	const uint8_t ssid[IEEE80211_NWID_LEN])
 {
 	struct scanlookup lookup;
 
 	KASSERT(vap->iv_opmode == IEEE80211_M_STA,
 	    ("expected opmode STA not %s",
 	    ieee80211_opmode_name[vap->iv_opmode]));
 
 	/* NB: this is racey if roaming is !manual */
 	lookup.se = NULL;
 	lookup.mac = mac;
 	lookup.esslen = ssid_len;
 	lookup.essid = ssid;
 	ieee80211_scan_iterate(vap, mlmelookup, &lookup);
 	if (lookup.se == NULL)
 		return ENOENT;
 	mlmedebug(vap, mac, IEEE80211_MLME_ASSOC, 0);
 	if (!ieee80211_sta_join(vap, lookup.se->se_chan, lookup.se))
 		return EIO;		/* XXX unique but could be better */
 	return 0;
 }
 
 static int
 setmlme_assoc_adhoc(struct ieee80211vap *vap,
 	const uint8_t mac[IEEE80211_ADDR_LEN], int ssid_len,
 	const uint8_t ssid[IEEE80211_NWID_LEN])
 {
 	struct ieee80211_scan_req *sr;
 	int error;
 
 	KASSERT(vap->iv_opmode == IEEE80211_M_IBSS ||
 	    vap->iv_opmode == IEEE80211_M_AHDEMO,
 	    ("expected opmode IBSS or AHDEMO not %s",
 	    ieee80211_opmode_name[vap->iv_opmode]));
 
 	if (ssid_len == 0)
 		return EINVAL;
 
 	sr = IEEE80211_MALLOC(sizeof(*sr), M_TEMP,
 	     IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (sr == NULL)
 		return ENOMEM;
 
 	/* NB: IEEE80211_IOC_SSID call missing for ap_scan=2. */
 	memset(vap->iv_des_ssid[0].ssid, 0, IEEE80211_NWID_LEN);
 	vap->iv_des_ssid[0].len = ssid_len;
 	memcpy(vap->iv_des_ssid[0].ssid, ssid, ssid_len);
 	vap->iv_des_nssid = 1;
 
 	sr->sr_flags = IEEE80211_IOC_SCAN_ACTIVE | IEEE80211_IOC_SCAN_ONCE;
 	sr->sr_duration = IEEE80211_IOC_SCAN_FOREVER;
 	memcpy(sr->sr_ssid[0].ssid, ssid, ssid_len);
 	sr->sr_ssid[0].len = ssid_len;
 	sr->sr_nssid = 1;
 
 	error = ieee80211_scanreq(vap, sr);
 
 	IEEE80211_FREE(sr, M_TEMP);
 	return error;
 }
 
 static int
 ieee80211_ioctl_setmlme(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211req_mlme mlme;
 	int error;
 
 	if (ireq->i_len != sizeof(mlme))
 		return EINVAL;
 	error = copyin(ireq->i_data, &mlme, sizeof(mlme));
 	if (error)
 		return error;
 	if  (vap->iv_opmode == IEEE80211_M_STA &&
 	    mlme.im_op == IEEE80211_MLME_ASSOC)
 		return setmlme_assoc_sta(vap, mlme.im_macaddr,
 		    vap->iv_des_ssid[0].len, vap->iv_des_ssid[0].ssid);
 	else if ((vap->iv_opmode == IEEE80211_M_IBSS || 
 	    vap->iv_opmode == IEEE80211_M_AHDEMO) && 
 	    mlme.im_op == IEEE80211_MLME_ASSOC)
 		return setmlme_assoc_adhoc(vap, mlme.im_macaddr,
 		    mlme.im_ssid_len, mlme.im_ssid);
 	else
 		return setmlme_common(vap, mlme.im_op,
 		    mlme.im_macaddr, mlme.im_reason);
 }
 
 static int
 ieee80211_ioctl_macmac(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	uint8_t mac[IEEE80211_ADDR_LEN];
 	const struct ieee80211_aclator *acl = vap->iv_acl;
 	int error;
 
 	if (ireq->i_len != sizeof(mac))
 		return EINVAL;
 	error = copyin(ireq->i_data, mac, ireq->i_len);
 	if (error)
 		return error;
 	if (acl == NULL) {
 		acl = ieee80211_aclator_get("mac");
 		if (acl == NULL || !acl->iac_attach(vap))
 			return EINVAL;
 		vap->iv_acl = acl;
 	}
 	if (ireq->i_type == IEEE80211_IOC_ADDMAC)
 		acl->iac_add(vap, mac);
 	else
 		acl->iac_remove(vap, mac);
 	return 0;
 }
 
 static int
 ieee80211_ioctl_setmaccmd(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	const struct ieee80211_aclator *acl = vap->iv_acl;
 
 	switch (ireq->i_val) {
 	case IEEE80211_MACCMD_POLICY_OPEN:
 	case IEEE80211_MACCMD_POLICY_ALLOW:
 	case IEEE80211_MACCMD_POLICY_DENY:
 	case IEEE80211_MACCMD_POLICY_RADIUS:
 		if (acl == NULL) {
 			acl = ieee80211_aclator_get("mac");
 			if (acl == NULL || !acl->iac_attach(vap))
 				return EINVAL;
 			vap->iv_acl = acl;
 		}
 		acl->iac_setpolicy(vap, ireq->i_val);
 		break;
 	case IEEE80211_MACCMD_FLUSH:
 		if (acl != NULL)
 			acl->iac_flush(vap);
 		/* NB: silently ignore when not in use */
 		break;
 	case IEEE80211_MACCMD_DETACH:
 		if (acl != NULL) {
 			vap->iv_acl = NULL;
 			acl->iac_detach(vap);
 		}
 		break;
 	default:
 		if (acl == NULL)
 			return EINVAL;
 		else
 			return acl->iac_setioctl(vap, ireq);
 	}
 	return 0;
 }
 
 static int
 ieee80211_ioctl_setchanlist(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	uint8_t *chanlist, *list;
 	int i, nchan, maxchan, error;
 
 	if (ireq->i_len > sizeof(ic->ic_chan_active))
 		ireq->i_len = sizeof(ic->ic_chan_active);
 	list = IEEE80211_MALLOC(ireq->i_len + IEEE80211_CHAN_BYTES, M_TEMP,
 	    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (list == NULL)
 		return ENOMEM;
 	error = copyin(ireq->i_data, list, ireq->i_len);
 	if (error) {
 		IEEE80211_FREE(list, M_TEMP);
 		return error;
 	}
 	nchan = 0;
 	chanlist = list + ireq->i_len;		/* NB: zero'd already */
 	maxchan = ireq->i_len * NBBY;
 	for (i = 0; i < ic->ic_nchans; i++) {
 		const struct ieee80211_channel *c = &ic->ic_channels[i];
 		/*
 		 * Calculate the intersection of the user list and the
 		 * available channels so users can do things like specify
 		 * 1-255 to get all available channels.
 		 */
 		if (c->ic_ieee < maxchan && isset(list, c->ic_ieee)) {
 			setbit(chanlist, c->ic_ieee);
 			nchan++;
 		}
 	}
 	if (nchan == 0) {
 		IEEE80211_FREE(list, M_TEMP);
 		return EINVAL;
 	}
 	if (ic->ic_bsschan != IEEE80211_CHAN_ANYC &&	/* XXX */
 	    isclr(chanlist, ic->ic_bsschan->ic_ieee))
 		ic->ic_bsschan = IEEE80211_CHAN_ANYC;
 	memcpy(ic->ic_chan_active, chanlist, IEEE80211_CHAN_BYTES);
 	ieee80211_scan_flush(vap);
 	IEEE80211_FREE(list, M_TEMP);
 	return ENETRESET;
 }
 
 static int
 ieee80211_ioctl_setstastats(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211_node *ni;
 	uint8_t macaddr[IEEE80211_ADDR_LEN];
 	int error;
 
 	/*
 	 * NB: we could copyin ieee80211req_sta_stats so apps
 	 *     could make selective changes but that's overkill;
 	 *     just clear all stats for now.
 	 */
 	if (ireq->i_len < IEEE80211_ADDR_LEN)
 		return EINVAL;
 	error = copyin(ireq->i_data, macaddr, IEEE80211_ADDR_LEN);
 	if (error != 0)
 		return error;
 	ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, macaddr);
 	if (ni == NULL)
 		return ENOENT;
 	/* XXX require ni_vap == vap? */
 	memset(&ni->ni_stats, 0, sizeof(ni->ni_stats));
 	ieee80211_free_node(ni);
 	return 0;
 }
 
 static int
 ieee80211_ioctl_setstatxpow(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211_node *ni;
 	struct ieee80211req_sta_txpow txpow;
 	int error;
 
 	if (ireq->i_len != sizeof(txpow))
 		return EINVAL;
 	error = copyin(ireq->i_data, &txpow, sizeof(txpow));
 	if (error != 0)
 		return error;
 	ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, txpow.it_macaddr);
 	if (ni == NULL)
 		return ENOENT;
 	ni->ni_txpower = txpow.it_txpow;
 	ieee80211_free_node(ni);
 	return error;
 }
 
 static int
 ieee80211_ioctl_setwmeparam(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_wme_state *wme = &ic->ic_wme;
 	struct wmeParams *wmep, *chanp;
 	int isbss, ac, aggrmode;
 
 	if ((ic->ic_caps & IEEE80211_C_WME) == 0)
 		return EOPNOTSUPP;
 
 	isbss = (ireq->i_len & IEEE80211_WMEPARAM_BSS);
 	ac = (ireq->i_len & IEEE80211_WMEPARAM_VAL);
 	aggrmode = (wme->wme_flags & WME_F_AGGRMODE);
 	if (ac >= WME_NUM_AC)
 		ac = WME_AC_BE;
 	if (isbss) {
 		chanp = &wme->wme_bssChanParams.cap_wmeParams[ac];
 		wmep = &wme->wme_wmeBssChanParams.cap_wmeParams[ac];
 	} else {
 		chanp = &wme->wme_chanParams.cap_wmeParams[ac];
 		wmep = &wme->wme_wmeChanParams.cap_wmeParams[ac];
 	}
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_WME_CWMIN:		/* WME: CWmin */
 		wmep->wmep_logcwmin = ireq->i_val;
 		if (!isbss || !aggrmode)
 			chanp->wmep_logcwmin = ireq->i_val;
 		break;
 	case IEEE80211_IOC_WME_CWMAX:		/* WME: CWmax */
 		wmep->wmep_logcwmax = ireq->i_val;
 		if (!isbss || !aggrmode)
 			chanp->wmep_logcwmax = ireq->i_val;
 		break;
 	case IEEE80211_IOC_WME_AIFS:		/* WME: AIFS */
 		wmep->wmep_aifsn = ireq->i_val;
 		if (!isbss || !aggrmode)
 			chanp->wmep_aifsn = ireq->i_val;
 		break;
 	case IEEE80211_IOC_WME_TXOPLIMIT:	/* WME: txops limit */
 		wmep->wmep_txopLimit = ireq->i_val;
 		if (!isbss || !aggrmode)
 			chanp->wmep_txopLimit = ireq->i_val;
 		break;
 	case IEEE80211_IOC_WME_ACM:		/* WME: ACM (bss only) */
 		wmep->wmep_acm = ireq->i_val;
 		if (!aggrmode)
 			chanp->wmep_acm = ireq->i_val;
 		break;
 	case IEEE80211_IOC_WME_ACKPOLICY:	/* WME: ACK policy (!bss only)*/
 		wmep->wmep_noackPolicy = chanp->wmep_noackPolicy =
 			(ireq->i_val) == 0;
 		break;
 	}
 	ieee80211_wme_updateparams(vap);
 	return 0;
 }
 
 static int
 find11gchannel(struct ieee80211com *ic, int start, int freq)
 {
 	const struct ieee80211_channel *c;
 	int i;
 
 	for (i = start+1; i < ic->ic_nchans; i++) {
 		c = &ic->ic_channels[i];
 		if (c->ic_freq == freq && IEEE80211_IS_CHAN_ANYG(c))
 			return 1;
 	}
 	/* NB: should not be needed but in case things are mis-sorted */
 	for (i = 0; i < start; i++) {
 		c = &ic->ic_channels[i];
 		if (c->ic_freq == freq && IEEE80211_IS_CHAN_ANYG(c))
 			return 1;
 	}
 	return 0;
 }
 
 static struct ieee80211_channel *
 findchannel(struct ieee80211com *ic, int ieee, int mode)
 {
 	static const u_int chanflags[IEEE80211_MODE_MAX] = {
 	    [IEEE80211_MODE_AUTO]	= 0,
 	    [IEEE80211_MODE_11A]	= IEEE80211_CHAN_A,
 	    [IEEE80211_MODE_11B]	= IEEE80211_CHAN_B,
 	    [IEEE80211_MODE_11G]	= IEEE80211_CHAN_G,
 	    [IEEE80211_MODE_FH]		= IEEE80211_CHAN_FHSS,
 	    [IEEE80211_MODE_TURBO_A]	= IEEE80211_CHAN_108A,
 	    [IEEE80211_MODE_TURBO_G]	= IEEE80211_CHAN_108G,
 	    [IEEE80211_MODE_STURBO_A]	= IEEE80211_CHAN_STURBO,
 	    [IEEE80211_MODE_HALF]	= IEEE80211_CHAN_HALF,
 	    [IEEE80211_MODE_QUARTER]	= IEEE80211_CHAN_QUARTER,
 	    /* NB: handled specially below */
 	    [IEEE80211_MODE_11NA]	= IEEE80211_CHAN_A,
 	    [IEEE80211_MODE_11NG]	= IEEE80211_CHAN_G,
+	    [IEEE80211_MODE_VHT_5GHZ]	= IEEE80211_CHAN_A,
+	    [IEEE80211_MODE_VHT_2GHZ]	= IEEE80211_CHAN_G,
 	};
 	u_int modeflags;
 	int i;
 
 	modeflags = chanflags[mode];
 	for (i = 0; i < ic->ic_nchans; i++) {
 		struct ieee80211_channel *c = &ic->ic_channels[i];
 
 		if (c->ic_ieee != ieee)
 			continue;
 		if (mode == IEEE80211_MODE_AUTO) {
 			/* ignore turbo channels for autoselect */
 			if (IEEE80211_IS_CHAN_TURBO(c))
 				continue;
 			/*
 			 * XXX special-case 11b/g channels so we
 			 *     always select the g channel if both
 			 *     are present.
 			 * XXX prefer HT to non-HT?
 			 */
 			if (!IEEE80211_IS_CHAN_B(c) ||
 			    !find11gchannel(ic, i, c->ic_freq))
 				return c;
 		} else {
-			/* must check HT specially */
+			/* must check VHT specifically */
+			if ((mode == IEEE80211_MODE_VHT_5GHZ ||
+			    mode == IEEE80211_MODE_VHT_2GHZ) &&
+			    !IEEE80211_IS_CHAN_VHT(c))
+				continue;
+
+			/*
+			 * Must check HT specially - only match on HT,
+			 * not HT+VHT channels
+			 */
 			if ((mode == IEEE80211_MODE_11NA ||
 			    mode == IEEE80211_MODE_11NG) &&
 			    !IEEE80211_IS_CHAN_HT(c))
 				continue;
+
+			if ((mode == IEEE80211_MODE_11NA ||
+			    mode == IEEE80211_MODE_11NG) &&
+			    IEEE80211_IS_CHAN_VHT(c))
+				continue;
+
+			/* Check that the modeflags above match */
 			if ((c->ic_flags & modeflags) == modeflags)
 				return c;
 		}
 	}
 	return NULL;
 }
 
 /*
  * Check the specified against any desired mode (aka netband).
  * This is only used (presently) when operating in hostap mode
  * to enforce consistency.
  */
 static int
 check_mode_consistency(const struct ieee80211_channel *c, int mode)
 {
 	KASSERT(c != IEEE80211_CHAN_ANYC, ("oops, no channel"));
 
 	switch (mode) {
 	case IEEE80211_MODE_11B:
 		return (IEEE80211_IS_CHAN_B(c));
 	case IEEE80211_MODE_11G:
 		return (IEEE80211_IS_CHAN_ANYG(c) && !IEEE80211_IS_CHAN_HT(c));
 	case IEEE80211_MODE_11A:
 		return (IEEE80211_IS_CHAN_A(c) && !IEEE80211_IS_CHAN_HT(c));
 	case IEEE80211_MODE_STURBO_A:
 		return (IEEE80211_IS_CHAN_STURBO(c));
 	case IEEE80211_MODE_11NA:
 		return (IEEE80211_IS_CHAN_HTA(c));
 	case IEEE80211_MODE_11NG:
 		return (IEEE80211_IS_CHAN_HTG(c));
 	}
 	return 1;
 
 }
 
 /*
  * Common code to set the current channel.  If the device
  * is up and running this may result in an immediate channel
  * change or a kick of the state machine.
  */
 static int
 setcurchan(struct ieee80211vap *vap, struct ieee80211_channel *c)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	int error;
 
 	if (c != IEEE80211_CHAN_ANYC) {
 		if (IEEE80211_IS_CHAN_RADAR(c))
 			return EBUSY;	/* XXX better code? */
 		if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
 			if (IEEE80211_IS_CHAN_NOHOSTAP(c))
 				return EINVAL;
 			if (!check_mode_consistency(c, vap->iv_des_mode))
 				return EINVAL;
 		} else if (vap->iv_opmode == IEEE80211_M_IBSS) {
 			if (IEEE80211_IS_CHAN_NOADHOC(c))
 				return EINVAL;
 		}
 		if ((vap->iv_state == IEEE80211_S_RUN || vap->iv_state == IEEE80211_S_SLEEP) &&
 		    vap->iv_bss->ni_chan == c)
 			return 0;	/* NB: nothing to do */
 	}
 	vap->iv_des_chan = c;
 
 	error = 0;
 	if (vap->iv_opmode == IEEE80211_M_MONITOR &&
 	    vap->iv_des_chan != IEEE80211_CHAN_ANYC) {
 		/*
 		 * Monitor mode can switch directly.
 		 */
 		if (IFNET_IS_UP_RUNNING(vap->iv_ifp)) {
 			/* XXX need state machine for other vap's to follow */
 			ieee80211_setcurchan(ic, vap->iv_des_chan);
 			vap->iv_bss->ni_chan = ic->ic_curchan;
 		} else
 			ic->ic_curchan = vap->iv_des_chan;
 			ic->ic_rt = ieee80211_get_ratetable(ic->ic_curchan);
 	} else {
 		/*
 		 * Need to go through the state machine in case we
 		 * need to reassociate or the like.  The state machine
 		 * will pickup the desired channel and avoid scanning.
 		 */
 		if (IS_UP_AUTO(vap))
 			ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
 		else if (vap->iv_des_chan != IEEE80211_CHAN_ANYC) {
 			/*
 			 * When not up+running and a real channel has
 			 * been specified fix the current channel so
 			 * there is immediate feedback; e.g. via ifconfig.
 			 */
 			ic->ic_curchan = vap->iv_des_chan;
 			ic->ic_rt = ieee80211_get_ratetable(ic->ic_curchan);
 		}
 	}
 	return error;
 }
 
 /*
  * Old api for setting the current channel; this is
  * deprecated because channel numbers are ambiguous.
  */
 static int
 ieee80211_ioctl_setchannel(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_channel *c;
 
 	/* XXX 0xffff overflows 16-bit signed */
 	if (ireq->i_val == 0 ||
 	    ireq->i_val == (int16_t) IEEE80211_CHAN_ANY) {
 		c = IEEE80211_CHAN_ANYC;
 	} else {
 		struct ieee80211_channel *c2;
 
 		c = findchannel(ic, ireq->i_val, vap->iv_des_mode);
 		if (c == NULL) {
 			c = findchannel(ic, ireq->i_val,
 				IEEE80211_MODE_AUTO);
 			if (c == NULL)
 				return EINVAL;
 		}
+
 		/*
 		 * Fine tune channel selection based on desired mode:
 		 *   if 11b is requested, find the 11b version of any
 		 *      11g channel returned,
 		 *   if static turbo, find the turbo version of any
 		 *	11a channel return,
 		 *   if 11na is requested, find the ht version of any
 		 *      11a channel returned,
 		 *   if 11ng is requested, find the ht version of any
 		 *      11g channel returned,
+		 *   if 11ac is requested, find the 11ac version
+		 *      of any 11a/11na channel returned,
+		 *   (TBD) 11acg (2GHz VHT)
 		 *   otherwise we should be ok with what we've got.
 		 */
 		switch (vap->iv_des_mode) {
 		case IEEE80211_MODE_11B:
 			if (IEEE80211_IS_CHAN_ANYG(c)) {
 				c2 = findchannel(ic, ireq->i_val,
 					IEEE80211_MODE_11B);
 				/* NB: should not happen, =>'s 11g w/o 11b */
 				if (c2 != NULL)
 					c = c2;
 			}
 			break;
 		case IEEE80211_MODE_TURBO_A:
 			if (IEEE80211_IS_CHAN_A(c)) {
 				c2 = findchannel(ic, ireq->i_val,
 					IEEE80211_MODE_TURBO_A);
 				if (c2 != NULL)
 					c = c2;
 			}
 			break;
 		case IEEE80211_MODE_11NA:
 			if (IEEE80211_IS_CHAN_A(c)) {
 				c2 = findchannel(ic, ireq->i_val,
 					IEEE80211_MODE_11NA);
 				if (c2 != NULL)
 					c = c2;
 			}
 			break;
 		case IEEE80211_MODE_11NG:
 			if (IEEE80211_IS_CHAN_ANYG(c)) {
 				c2 = findchannel(ic, ireq->i_val,
 					IEEE80211_MODE_11NG);
 				if (c2 != NULL)
 					c = c2;
 			}
 			break;
+		case IEEE80211_MODE_VHT_2GHZ:
+			printf("%s: TBD\n", __func__);
+			break;
+		case IEEE80211_MODE_VHT_5GHZ:
+			if (IEEE80211_IS_CHAN_A(c)) {
+				c2 = findchannel(ic, ireq->i_val,
+					IEEE80211_MODE_VHT_5GHZ);
+				if (c2 != NULL)
+					c = c2;
+			}
+			break;
 		default:		/* NB: no static turboG */
 			break;
 		}
 	}
 	return setcurchan(vap, c);
 }
 
 /*
  * New/current api for setting the current channel; a complete
  * channel description is provide so there is no ambiguity in
  * identifying the channel.
  */
 static int
 ieee80211_ioctl_setcurchan(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_channel chan, *c;
 	int error;
 
 	if (ireq->i_len != sizeof(chan))
 		return EINVAL;
 	error = copyin(ireq->i_data, &chan, sizeof(chan));
 	if (error != 0)
 		return error;
+
 	/* XXX 0xffff overflows 16-bit signed */
 	if (chan.ic_freq == 0 || chan.ic_freq == IEEE80211_CHAN_ANY) {
 		c = IEEE80211_CHAN_ANYC;
 	} else {
 		c = ieee80211_find_channel(ic, chan.ic_freq, chan.ic_flags);
 		if (c == NULL)
 			return EINVAL;
 	}
 	return setcurchan(vap, c);
 }
 
 static int
 ieee80211_ioctl_setregdomain(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq)
 {
 	struct ieee80211_regdomain_req *reg;
 	int nchans, error;
 
 	nchans = 1 + ((ireq->i_len - sizeof(struct ieee80211_regdomain_req)) /
 	    sizeof(struct ieee80211_channel));
 	if (!(1 <= nchans && nchans <= IEEE80211_CHAN_MAX)) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL,
 		    "%s: bad # chans, i_len %d nchans %d\n", __func__,
 		    ireq->i_len, nchans);
 		return EINVAL;
 	}
 	reg = (struct ieee80211_regdomain_req *)
 	    IEEE80211_MALLOC(IEEE80211_REGDOMAIN_SIZE(nchans), M_TEMP,
 	      IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (reg == NULL) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL,
 		    "%s: no memory, nchans %d\n", __func__, nchans);
 		return ENOMEM;
 	}
 	error = copyin(ireq->i_data, reg, IEEE80211_REGDOMAIN_SIZE(nchans));
 	if (error == 0) {
 		/* NB: validate inline channel count against storage size */
 		if (reg->chaninfo.ic_nchans != nchans) {
 			IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL,
 			    "%s: chan cnt mismatch, %d != %d\n", __func__,
 				reg->chaninfo.ic_nchans, nchans);
 			error = EINVAL;
 		} else
 			error = ieee80211_setregdomain(vap, reg);
 	}
 	IEEE80211_FREE(reg, M_TEMP);
 
 	return (error == 0 ? ENETRESET : error);
 }
 
 static int
 ieee80211_ioctl_setroam(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq)
 {
 	if (ireq->i_len != sizeof(vap->iv_roamparms))
 		return EINVAL;
 	/* XXX validate params */
 	/* XXX? ENETRESET to push to device? */
 	return copyin(ireq->i_data, vap->iv_roamparms,
 	    sizeof(vap->iv_roamparms));
 }
 
 static int
 checkrate(const struct ieee80211_rateset *rs, int rate)
 {
 	int i;
 
 	if (rate == IEEE80211_FIXED_RATE_NONE)
 		return 1;
 	for (i = 0; i < rs->rs_nrates; i++)
 		if ((rs->rs_rates[i] & IEEE80211_RATE_VAL) == rate)
 			return 1;
 	return 0;
 }
 
 static int
 checkmcs(int mcs)
 {
 	if (mcs == IEEE80211_FIXED_RATE_NONE)
 		return 1;
 	if ((mcs & IEEE80211_RATE_MCS) == 0)	/* MCS always have 0x80 set */
 		return 0;
 	return (mcs & 0x7f) <= 15;	/* XXX could search ht rate set */
 }
 
 static int
 ieee80211_ioctl_settxparams(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_txparams_req parms;	/* XXX stack use? */
 	struct ieee80211_txparam *src, *dst;
 	const struct ieee80211_rateset *rs;
 	int error, mode, changed, is11n, nmodes;
 
 	/* NB: accept short requests for backwards compat */
 	if (ireq->i_len > sizeof(parms))
 		return EINVAL;
 	error = copyin(ireq->i_data, &parms, ireq->i_len);
 	if (error != 0)
 		return error;
 	nmodes = ireq->i_len / sizeof(struct ieee80211_txparam);
 	changed = 0;
 	/* validate parameters and check if anything changed */
 	for (mode = IEEE80211_MODE_11A; mode < nmodes; mode++) {
 		if (isclr(ic->ic_modecaps, mode))
 			continue;
 		src = &parms.params[mode];
 		dst = &vap->iv_txparms[mode];
 		rs = &ic->ic_sup_rates[mode];	/* NB: 11n maps to legacy */
 		is11n = (mode == IEEE80211_MODE_11NA ||
 			 mode == IEEE80211_MODE_11NG);
 		if (src->ucastrate != dst->ucastrate) {
 			if (!checkrate(rs, src->ucastrate) &&
 			    (!is11n || !checkmcs(src->ucastrate)))
 				return EINVAL;
 			changed++;
 		}
 		if (src->mcastrate != dst->mcastrate) {
 			if (!checkrate(rs, src->mcastrate) &&
 			    (!is11n || !checkmcs(src->mcastrate)))
 				return EINVAL;
 			changed++;
 		}
 		if (src->mgmtrate != dst->mgmtrate) {
 			if (!checkrate(rs, src->mgmtrate) &&
 			    (!is11n || !checkmcs(src->mgmtrate)))
 				return EINVAL;
 			changed++;
 		}
 		if (src->maxretry != dst->maxretry)	/* NB: no bounds */
 			changed++;
 	}
 	if (changed) {
 		/*
 		 * Copy new parameters in place and notify the
 		 * driver so it can push state to the device.
 		 */
 		for (mode = IEEE80211_MODE_11A; mode < nmodes; mode++) {
 			if (isset(ic->ic_modecaps, mode))
 				vap->iv_txparms[mode] = parms.params[mode];
 		}
 		/* XXX could be more intelligent,
 		   e.g. don't reset if setting not being used */
 		return ENETRESET;
 	}
 	return 0;
 }
 
 /*
  * Application Information Element support.
  */
 static int
 setappie(struct ieee80211_appie **aie, const struct ieee80211req *ireq)
 {
 	struct ieee80211_appie *app = *aie;
 	struct ieee80211_appie *napp;
 	int error;
 
 	if (ireq->i_len == 0) {		/* delete any existing ie */
 		if (app != NULL) {
 			*aie = NULL;	/* XXX racey */
 			IEEE80211_FREE(app, M_80211_NODE_IE);
 		}
 		return 0;
 	}
 	if (!(2 <= ireq->i_len && ireq->i_len <= IEEE80211_MAX_APPIE))
 		return EINVAL;
 	/*
 	 * Allocate a new appie structure and copy in the user data.
 	 * When done swap in the new structure.  Note that we do not
 	 * guard against users holding a ref to the old structure;
 	 * this must be handled outside this code.
 	 *
 	 * XXX bad bad bad
 	 */
 	napp = (struct ieee80211_appie *) IEEE80211_MALLOC(
 	    sizeof(struct ieee80211_appie) + ireq->i_len, M_80211_NODE_IE,
 	    IEEE80211_M_NOWAIT);
 	if (napp == NULL)
 		return ENOMEM;
 	/* XXX holding ic lock */
 	error = copyin(ireq->i_data, napp->ie_data, ireq->i_len);
 	if (error) {
 		IEEE80211_FREE(napp, M_80211_NODE_IE);
 		return error;
 	}
 	napp->ie_len = ireq->i_len;
 	*aie = napp;
 	if (app != NULL)
 		IEEE80211_FREE(app, M_80211_NODE_IE);
 	return 0;
 }
 
 static void
 setwparsnie(struct ieee80211vap *vap, uint8_t *ie, int space)
 {
 	/* validate data is present as best we can */
 	if (space == 0 || 2+ie[1] > space)
 		return;
 	if (ie[0] == IEEE80211_ELEMID_VENDOR)
 		vap->iv_wpa_ie = ie;
 	else if (ie[0] == IEEE80211_ELEMID_RSN)
 		vap->iv_rsn_ie = ie;
 }
 
 static int
 ieee80211_ioctl_setappie_locked(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq, int fc0)
 {
 	int error;
 
 	IEEE80211_LOCK_ASSERT(vap->iv_ic);
 
 	switch (fc0 & IEEE80211_FC0_SUBTYPE_MASK) {
 	case IEEE80211_FC0_SUBTYPE_BEACON:
 		if (vap->iv_opmode != IEEE80211_M_HOSTAP &&
 		    vap->iv_opmode != IEEE80211_M_IBSS) {
 			error = EINVAL;
 			break;
 		}
 		error = setappie(&vap->iv_appie_beacon, ireq);
 		if (error == 0)
 			ieee80211_beacon_notify(vap, IEEE80211_BEACON_APPIE);
 		break;
 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 		error = setappie(&vap->iv_appie_proberesp, ireq);
 		break;
 	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
 		if (vap->iv_opmode == IEEE80211_M_HOSTAP)
 			error = setappie(&vap->iv_appie_assocresp, ireq);
 		else
 			error = EINVAL;
 		break;
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 		error = setappie(&vap->iv_appie_probereq, ireq);
 		break;
 	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
 		if (vap->iv_opmode == IEEE80211_M_STA)
 			error = setappie(&vap->iv_appie_assocreq, ireq);
 		else
 			error = EINVAL;
 		break;
 	case (IEEE80211_APPIE_WPA & IEEE80211_FC0_SUBTYPE_MASK):
 		error = setappie(&vap->iv_appie_wpa, ireq);
 		if (error == 0) {
 			/*
 			 * Must split single blob of data into separate
 			 * WPA and RSN ie's because they go in different
 			 * locations in the mgt frames.
 			 * XXX use IEEE80211_IOC_WPA2 so user code does split
 			 */
 			vap->iv_wpa_ie = NULL;
 			vap->iv_rsn_ie = NULL;
 			if (vap->iv_appie_wpa != NULL) {
 				struct ieee80211_appie *appie =
 				    vap->iv_appie_wpa;
 				uint8_t *data = appie->ie_data;
 
 				/* XXX ie length validate is painful, cheat */
 				setwparsnie(vap, data, appie->ie_len);
 				setwparsnie(vap, data + 2 + data[1],
 				    appie->ie_len - (2 + data[1]));
 			}
 			if (vap->iv_opmode == IEEE80211_M_HOSTAP ||
 			    vap->iv_opmode == IEEE80211_M_IBSS) {
 				/*
 				 * Must rebuild beacon frame as the update
 				 * mechanism doesn't handle WPA/RSN ie's.
 				 * Could extend it but it doesn't normally
 				 * change; this is just to deal with hostapd
 				 * plumbing the ie after the interface is up.
 				 */
 				error = ENETRESET;
 			}
 		}
 		break;
 	default:
 		error = EINVAL;
 		break;
 	}
 	return error;
 }
 
 static int
 ieee80211_ioctl_setappie(struct ieee80211vap *vap,
 	const struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	int error;
 	uint8_t fc0;
 
 	fc0 = ireq->i_val & 0xff;
 	if ((fc0 & IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_MGT)
 		return EINVAL;
 	/* NB: could check iv_opmode and reject but hardly worth the effort */
 	IEEE80211_LOCK(ic);
 	error = ieee80211_ioctl_setappie_locked(vap, ireq, fc0);
 	IEEE80211_UNLOCK(ic);
 	return error;
 }
 
 static int
 ieee80211_ioctl_chanswitch(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_chanswitch_req csr;
 	struct ieee80211_channel *c;
 	int error;
 
 	if (ireq->i_len != sizeof(csr))
 		return EINVAL;
 	error = copyin(ireq->i_data, &csr, sizeof(csr));
 	if (error != 0)
 		return error;
 	/* XXX adhoc mode not supported */
 	if (vap->iv_opmode != IEEE80211_M_HOSTAP ||
 	    (vap->iv_flags & IEEE80211_F_DOTH) == 0)
 		return EOPNOTSUPP;
 	c = ieee80211_find_channel(ic,
 	    csr.csa_chan.ic_freq, csr.csa_chan.ic_flags);
 	if (c == NULL)
 		return ENOENT;
 	IEEE80211_LOCK(ic);
 	if ((ic->ic_flags & IEEE80211_F_CSAPENDING) == 0)
 		ieee80211_csa_startswitch(ic, c, csr.csa_mode, csr.csa_count);
 	else if (csr.csa_count == 0)
 		ieee80211_csa_cancelswitch(ic);
 	else
 		error = EBUSY;
 	IEEE80211_UNLOCK(ic);
 	return error;
 }
 
 static int
 ieee80211_scanreq(struct ieee80211vap *vap, struct ieee80211_scan_req *sr)
 {
 #define	IEEE80211_IOC_SCAN_FLAGS \
 	(IEEE80211_IOC_SCAN_NOPICK | IEEE80211_IOC_SCAN_ACTIVE | \
 	 IEEE80211_IOC_SCAN_PICK1ST | IEEE80211_IOC_SCAN_BGSCAN | \
 	 IEEE80211_IOC_SCAN_ONCE | IEEE80211_IOC_SCAN_NOBCAST | \
 	 IEEE80211_IOC_SCAN_NOJOIN | IEEE80211_IOC_SCAN_FLUSH | \
 	 IEEE80211_IOC_SCAN_CHECK)
 	struct ieee80211com *ic = vap->iv_ic;
 	int error, i;
 
 	/* convert duration */
 	if (sr->sr_duration == IEEE80211_IOC_SCAN_FOREVER)
 		sr->sr_duration = IEEE80211_SCAN_FOREVER;
 	else {
 		if (sr->sr_duration < IEEE80211_IOC_SCAN_DURATION_MIN ||
 		    sr->sr_duration > IEEE80211_IOC_SCAN_DURATION_MAX)
 			return EINVAL;
 		sr->sr_duration = msecs_to_ticks(sr->sr_duration);
 		if (sr->sr_duration < 1)
 			sr->sr_duration = 1;
 	}
 	/* convert min/max channel dwell */
 	if (sr->sr_mindwell != 0) {
 		sr->sr_mindwell = msecs_to_ticks(sr->sr_mindwell);
 		if (sr->sr_mindwell < 1)
 			sr->sr_mindwell = 1;
 	}
 	if (sr->sr_maxdwell != 0) {
 		sr->sr_maxdwell = msecs_to_ticks(sr->sr_maxdwell);
 		if (sr->sr_maxdwell < 1)
 			sr->sr_maxdwell = 1;
 	}
 	/* NB: silently reduce ssid count to what is supported */
 	if (sr->sr_nssid > IEEE80211_SCAN_MAX_SSID)
 		sr->sr_nssid = IEEE80211_SCAN_MAX_SSID;
 	for (i = 0; i < sr->sr_nssid; i++)
 		if (sr->sr_ssid[i].len > IEEE80211_NWID_LEN)
 			return EINVAL;
 	/* cleanse flags just in case, could reject if invalid flags */
 	sr->sr_flags &= IEEE80211_IOC_SCAN_FLAGS;
 	/*
 	 * Add an implicit NOPICK if the vap is not marked UP.  This
 	 * allows applications to scan without joining a bss (or picking
 	 * a channel and setting up a bss) and without forcing manual
 	 * roaming mode--you just need to mark the parent device UP.
 	 */
 	if ((vap->iv_ifp->if_flags & IFF_UP) == 0)
 		sr->sr_flags |= IEEE80211_IOC_SCAN_NOPICK;
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
 	    "%s: flags 0x%x%s duration 0x%x mindwell %u maxdwell %u nssid %d\n",
 	    __func__, sr->sr_flags,
 	    (vap->iv_ifp->if_flags & IFF_UP) == 0 ? " (!IFF_UP)" : "",
 	    sr->sr_duration, sr->sr_mindwell, sr->sr_maxdwell, sr->sr_nssid);
 	/*
 	 * If we are in INIT state then the driver has never had a chance
 	 * to setup hardware state to do a scan; we must use the state
 	 * machine to get us up to the SCAN state but once we reach SCAN
 	 * state we then want to use the supplied params.  Stash the
 	 * parameters in the vap and mark IEEE80211_FEXT_SCANREQ; the
 	 * state machines will recognize this and use the stashed params
 	 * to issue the scan request.
 	 *
 	 * Otherwise just invoke the scan machinery directly.
 	 */
 	IEEE80211_LOCK(ic);
 	if (ic->ic_nrunning == 0) {
 		IEEE80211_UNLOCK(ic);
 		return ENXIO;
 	}
 
 	if (vap->iv_state == IEEE80211_S_INIT) {
 		/* NB: clobbers previous settings */
 		vap->iv_scanreq_flags = sr->sr_flags;
 		vap->iv_scanreq_duration = sr->sr_duration;
 		vap->iv_scanreq_nssid = sr->sr_nssid;
 		for (i = 0; i < sr->sr_nssid; i++) {
 			vap->iv_scanreq_ssid[i].len = sr->sr_ssid[i].len;
 			memcpy(vap->iv_scanreq_ssid[i].ssid,
 			    sr->sr_ssid[i].ssid, sr->sr_ssid[i].len);
 		}
 		vap->iv_flags_ext |= IEEE80211_FEXT_SCANREQ;
 		IEEE80211_UNLOCK(ic);
 		ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
 	} else {
 		vap->iv_flags_ext &= ~IEEE80211_FEXT_SCANREQ;
 		IEEE80211_UNLOCK(ic);
 		if (sr->sr_flags & IEEE80211_IOC_SCAN_CHECK) {
 			error = ieee80211_check_scan(vap, sr->sr_flags,
 			    sr->sr_duration, sr->sr_mindwell, sr->sr_maxdwell,
 			    sr->sr_nssid,
 			    /* NB: cheat, we assume structures are compatible */
 			    (const struct ieee80211_scan_ssid *) &sr->sr_ssid[0]);
 		} else {
 			error = ieee80211_start_scan(vap, sr->sr_flags,
 			    sr->sr_duration, sr->sr_mindwell, sr->sr_maxdwell,
 			    sr->sr_nssid,
 			    /* NB: cheat, we assume structures are compatible */
 			    (const struct ieee80211_scan_ssid *) &sr->sr_ssid[0]);
 		}
 		if (error == 0)
 			return EINPROGRESS;
 	}
 	return 0;
 #undef IEEE80211_IOC_SCAN_FLAGS
 }
 
 static int
 ieee80211_ioctl_scanreq(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211_scan_req *sr;
 	int error;
 
 	if (ireq->i_len != sizeof(*sr))
 		return EINVAL;
 	sr = IEEE80211_MALLOC(sizeof(*sr), M_TEMP,
 	     IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (sr == NULL)
 		return ENOMEM;
 	error = copyin(ireq->i_data, sr, sizeof(*sr));
 	if (error != 0)
 		goto bad;
 	error = ieee80211_scanreq(vap, sr);
 bad:
 	IEEE80211_FREE(sr, M_TEMP);
 	return error;
 }
 
 static int
 ieee80211_ioctl_setstavlan(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211_node *ni;
 	struct ieee80211req_sta_vlan vlan;
 	int error;
 
 	if (ireq->i_len != sizeof(vlan))
 		return EINVAL;
 	error = copyin(ireq->i_data, &vlan, sizeof(vlan));
 	if (error != 0)
 		return error;
 	if (!IEEE80211_ADDR_EQ(vlan.sv_macaddr, zerobssid)) {
 		ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap,
 		    vlan.sv_macaddr);
 		if (ni == NULL)
 			return ENOENT;
 	} else
 		ni = ieee80211_ref_node(vap->iv_bss);
 	ni->ni_vlan = vlan.sv_vlan;
 	ieee80211_free_node(ni);
 	return error;
 }
 
 static int
 isvap11g(const struct ieee80211vap *vap)
 {
 	const struct ieee80211_node *bss = vap->iv_bss;
 	return bss->ni_chan != IEEE80211_CHAN_ANYC &&
 	    IEEE80211_IS_CHAN_ANYG(bss->ni_chan);
 }
 
 static int
 isvapht(const struct ieee80211vap *vap)
 {
 	const struct ieee80211_node *bss = vap->iv_bss;
 	return bss->ni_chan != IEEE80211_CHAN_ANYC &&
 	    IEEE80211_IS_CHAN_HT(bss->ni_chan);
 }
 
 /*
  * Dummy ioctl set handler so the linker set is defined.
  */
 static int
 dummy_ioctl_set(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	return ENOSYS;
 }
 IEEE80211_IOCTL_SET(dummy, dummy_ioctl_set);
 
 static int
 ieee80211_ioctl_setdefault(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	ieee80211_ioctl_setfunc * const *set;
 	int error;
 
 	SET_FOREACH(set, ieee80211_ioctl_setset) {
 		error = (*set)(vap, ireq);
 		if (error != ENOSYS)
 			return error;
 	}
 	return EINVAL;
 }
 
 static int
 ieee80211_ioctl_set80211(struct ieee80211vap *vap, u_long cmd, struct ieee80211req *ireq)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	int error;
 	const struct ieee80211_authenticator *auth;
 	uint8_t tmpkey[IEEE80211_KEYBUF_SIZE];
 	char tmpssid[IEEE80211_NWID_LEN];
 	uint8_t tmpbssid[IEEE80211_ADDR_LEN];
 	struct ieee80211_key *k;
 	u_int kid;
 	uint32_t flags;
 
 	error = 0;
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_SSID:
 		if (ireq->i_val != 0 ||
 		    ireq->i_len > IEEE80211_NWID_LEN)
 			return EINVAL;
 		error = copyin(ireq->i_data, tmpssid, ireq->i_len);
 		if (error)
 			break;
 		memset(vap->iv_des_ssid[0].ssid, 0, IEEE80211_NWID_LEN);
 		vap->iv_des_ssid[0].len = ireq->i_len;
 		memcpy(vap->iv_des_ssid[0].ssid, tmpssid, ireq->i_len);
 		vap->iv_des_nssid = (ireq->i_len > 0);
 		error = ENETRESET;
 		break;
 	case IEEE80211_IOC_WEP:
 		switch (ireq->i_val) {
 		case IEEE80211_WEP_OFF:
 			vap->iv_flags &= ~IEEE80211_F_PRIVACY;
 			vap->iv_flags &= ~IEEE80211_F_DROPUNENC;
 			break;
 		case IEEE80211_WEP_ON:
 			vap->iv_flags |= IEEE80211_F_PRIVACY;
 			vap->iv_flags |= IEEE80211_F_DROPUNENC;
 			break;
 		case IEEE80211_WEP_MIXED:
 			vap->iv_flags |= IEEE80211_F_PRIVACY;
 			vap->iv_flags &= ~IEEE80211_F_DROPUNENC;
 			break;
 		}
 		error = ENETRESET;
 		break;
 	case IEEE80211_IOC_WEPKEY:
 		kid = (u_int) ireq->i_val;
 		if (kid >= IEEE80211_WEP_NKID)
 			return EINVAL;
 		k = &vap->iv_nw_keys[kid];
 		if (ireq->i_len == 0) {
 			/* zero-len =>'s delete any existing key */
 			(void) ieee80211_crypto_delkey(vap, k);
 			break;
 		}
 		if (ireq->i_len > sizeof(tmpkey))
 			return EINVAL;
 		memset(tmpkey, 0, sizeof(tmpkey));
 		error = copyin(ireq->i_data, tmpkey, ireq->i_len);
 		if (error)
 			break;
 		ieee80211_key_update_begin(vap);
 		k->wk_keyix = kid;	/* NB: force fixed key id */
 		if (ieee80211_crypto_newkey(vap, IEEE80211_CIPHER_WEP,
 		    IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV, k)) {
 			k->wk_keylen = ireq->i_len;
 			memcpy(k->wk_key, tmpkey, sizeof(tmpkey));
 			IEEE80211_ADDR_COPY(k->wk_macaddr, vap->iv_myaddr);
 			if  (!ieee80211_crypto_setkey(vap, k))
 				error = EINVAL;
 		} else
 			error = EINVAL;
 		ieee80211_key_update_end(vap);
 		break;
 	case IEEE80211_IOC_WEPTXKEY:
 		kid = (u_int) ireq->i_val;
 		if (kid >= IEEE80211_WEP_NKID &&
 		    (uint16_t) kid != IEEE80211_KEYIX_NONE)
 			return EINVAL;
 		/*
 		 * Firmware devices may need to be told about an explicit
 		 * key index here, versus just inferring it from the
 		 * key set / change.  Since we may also need to pause
 		 * things like transmit before the key is updated,
 		 * give the driver a chance to flush things by tying
 		 * into key update begin/end.
 		 */
 		ieee80211_key_update_begin(vap);
 		ieee80211_crypto_set_deftxkey(vap, kid);
 		ieee80211_key_update_end(vap);
 		break;
 	case IEEE80211_IOC_AUTHMODE:
 		switch (ireq->i_val) {
 		case IEEE80211_AUTH_WPA:
 		case IEEE80211_AUTH_8021X:	/* 802.1x */
 		case IEEE80211_AUTH_OPEN:	/* open */
 		case IEEE80211_AUTH_SHARED:	/* shared-key */
 		case IEEE80211_AUTH_AUTO:	/* auto */
 			auth = ieee80211_authenticator_get(ireq->i_val);
 			if (auth == NULL)
 				return EINVAL;
 			break;
 		default:
 			return EINVAL;
 		}
 		switch (ireq->i_val) {
 		case IEEE80211_AUTH_WPA:	/* WPA w/ 802.1x */
 			vap->iv_flags |= IEEE80211_F_PRIVACY;
 			ireq->i_val = IEEE80211_AUTH_8021X;
 			break;
 		case IEEE80211_AUTH_OPEN:	/* open */
 			vap->iv_flags &= ~(IEEE80211_F_WPA|IEEE80211_F_PRIVACY);
 			break;
 		case IEEE80211_AUTH_SHARED:	/* shared-key */
 		case IEEE80211_AUTH_8021X:	/* 802.1x */
 			vap->iv_flags &= ~IEEE80211_F_WPA;
 			/* both require a key so mark the PRIVACY capability */
 			vap->iv_flags |= IEEE80211_F_PRIVACY;
 			break;
 		case IEEE80211_AUTH_AUTO:	/* auto */
 			vap->iv_flags &= ~IEEE80211_F_WPA;
 			/* XXX PRIVACY handling? */
 			/* XXX what's the right way to do this? */
 			break;
 		}
 		/* NB: authenticator attach/detach happens on state change */
 		vap->iv_bss->ni_authmode = ireq->i_val;
 		/* XXX mixed/mode/usage? */
 		vap->iv_auth = auth;
 		error = ENETRESET;
 		break;
 	case IEEE80211_IOC_CHANNEL:
 		error = ieee80211_ioctl_setchannel(vap, ireq);
 		break;
 	case IEEE80211_IOC_POWERSAVE:
 		switch (ireq->i_val) {
 		case IEEE80211_POWERSAVE_OFF:
 			if (vap->iv_flags & IEEE80211_F_PMGTON) {
 				ieee80211_syncflag(vap, -IEEE80211_F_PMGTON);
 				error = ERESTART;
 			}
 			break;
 		case IEEE80211_POWERSAVE_ON:
 			if ((vap->iv_caps & IEEE80211_C_PMGT) == 0)
 				error = EOPNOTSUPP;
 			else if ((vap->iv_flags & IEEE80211_F_PMGTON) == 0) {
 				ieee80211_syncflag(vap, IEEE80211_F_PMGTON);
 				error = ERESTART;
 			}
 			break;
 		default:
 			error = EINVAL;
 			break;
 		}
 		break;
 	case IEEE80211_IOC_POWERSAVESLEEP:
 		if (ireq->i_val < 0)
 			return EINVAL;
 		ic->ic_lintval = ireq->i_val;
 		error = ERESTART;
 		break;
 	case IEEE80211_IOC_RTSTHRESHOLD:
 		if (!(IEEE80211_RTS_MIN <= ireq->i_val &&
 		      ireq->i_val <= IEEE80211_RTS_MAX))
 			return EINVAL;
 		vap->iv_rtsthreshold = ireq->i_val;
 		error = ERESTART;
 		break;
 	case IEEE80211_IOC_PROTMODE:
 		if (ireq->i_val > IEEE80211_PROT_RTSCTS)
 			return EINVAL;
 		ic->ic_protmode = (enum ieee80211_protmode)ireq->i_val;
 		/* NB: if not operating in 11g this can wait */
 		if (ic->ic_bsschan != IEEE80211_CHAN_ANYC &&
 		    IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan))
 			error = ERESTART;
 		break;
 	case IEEE80211_IOC_TXPOWER:
 		if ((ic->ic_caps & IEEE80211_C_TXPMGT) == 0)
 			return EOPNOTSUPP;
 		if (!(IEEE80211_TXPOWER_MIN <= ireq->i_val &&
 		      ireq->i_val <= IEEE80211_TXPOWER_MAX))
 			return EINVAL;
 		ic->ic_txpowlimit = ireq->i_val;
 		error = ERESTART;
 		break;
 	case IEEE80211_IOC_ROAMING:
 		if (!(IEEE80211_ROAMING_DEVICE <= ireq->i_val &&
 		    ireq->i_val <= IEEE80211_ROAMING_MANUAL))
 			return EINVAL;
 		vap->iv_roaming = (enum ieee80211_roamingmode)ireq->i_val;
 		/* XXXX reset? */
 		break;
 	case IEEE80211_IOC_PRIVACY:
 		if (ireq->i_val) {
 			/* XXX check for key state? */
 			vap->iv_flags |= IEEE80211_F_PRIVACY;
 		} else
 			vap->iv_flags &= ~IEEE80211_F_PRIVACY;
 		/* XXX ERESTART? */
 		break;
 	case IEEE80211_IOC_DROPUNENCRYPTED:
 		if (ireq->i_val)
 			vap->iv_flags |= IEEE80211_F_DROPUNENC;
 		else
 			vap->iv_flags &= ~IEEE80211_F_DROPUNENC;
 		/* XXX ERESTART? */
 		break;
 	case IEEE80211_IOC_WPAKEY:
 		error = ieee80211_ioctl_setkey(vap, ireq);
 		break;
 	case IEEE80211_IOC_DELKEY:
 		error = ieee80211_ioctl_delkey(vap, ireq);
 		break;
 	case IEEE80211_IOC_MLME:
 		error = ieee80211_ioctl_setmlme(vap, ireq);
 		break;
 	case IEEE80211_IOC_COUNTERMEASURES:
 		if (ireq->i_val) {
 			if ((vap->iv_flags & IEEE80211_F_WPA) == 0)
 				return EOPNOTSUPP;
 			vap->iv_flags |= IEEE80211_F_COUNTERM;
 		} else
 			vap->iv_flags &= ~IEEE80211_F_COUNTERM;
 		/* XXX ERESTART? */
 		break;
 	case IEEE80211_IOC_WPA:
 		if (ireq->i_val > 3)
 			return EINVAL;
 		/* XXX verify ciphers available */
 		flags = vap->iv_flags & ~IEEE80211_F_WPA;
 		switch (ireq->i_val) {
 		case 0:
 			/* wpa_supplicant calls this to clear the WPA config */
 			break;
 		case 1:
 			if (!(vap->iv_caps & IEEE80211_C_WPA1))
 				return EOPNOTSUPP;
 			flags |= IEEE80211_F_WPA1;
 			break;
 		case 2:
 			if (!(vap->iv_caps & IEEE80211_C_WPA2))
 				return EOPNOTSUPP;
 			flags |= IEEE80211_F_WPA2;
 			break;
 		case 3:
 			if ((vap->iv_caps & IEEE80211_C_WPA) != IEEE80211_C_WPA)
 				return EOPNOTSUPP;
 			flags |= IEEE80211_F_WPA1 | IEEE80211_F_WPA2;
 			break;
 		default:	/*  Can't set any -> error */
 			return EOPNOTSUPP;
 		}
 		vap->iv_flags = flags;
 		error = ERESTART;	/* NB: can change beacon frame */
 		break;
 	case IEEE80211_IOC_WME:
 		if (ireq->i_val) {
 			if ((vap->iv_caps & IEEE80211_C_WME) == 0)
 				return EOPNOTSUPP;
 			ieee80211_syncflag(vap, IEEE80211_F_WME);
 		} else
 			ieee80211_syncflag(vap, -IEEE80211_F_WME);
 		error = ERESTART;	/* NB: can change beacon frame */
 		break;
 	case IEEE80211_IOC_HIDESSID:
 		if (ireq->i_val)
 			vap->iv_flags |= IEEE80211_F_HIDESSID;
 		else
 			vap->iv_flags &= ~IEEE80211_F_HIDESSID;
 		error = ERESTART;		/* XXX ENETRESET? */
 		break;
 	case IEEE80211_IOC_APBRIDGE:
 		if (ireq->i_val == 0)
 			vap->iv_flags |= IEEE80211_F_NOBRIDGE;
 		else
 			vap->iv_flags &= ~IEEE80211_F_NOBRIDGE;
 		break;
 	case IEEE80211_IOC_BSSID:
 		if (ireq->i_len != sizeof(tmpbssid))
 			return EINVAL;
 		error = copyin(ireq->i_data, tmpbssid, ireq->i_len);
 		if (error)
 			break;
 		IEEE80211_ADDR_COPY(vap->iv_des_bssid, tmpbssid);
 		if (IEEE80211_ADDR_EQ(vap->iv_des_bssid, zerobssid))
 			vap->iv_flags &= ~IEEE80211_F_DESBSSID;
 		else
 			vap->iv_flags |= IEEE80211_F_DESBSSID;
 		error = ENETRESET;
 		break;
 	case IEEE80211_IOC_CHANLIST:
 		error = ieee80211_ioctl_setchanlist(vap, ireq);
 		break;
 #define	OLD_IEEE80211_IOC_SCAN_REQ	23
 #ifdef OLD_IEEE80211_IOC_SCAN_REQ
 	case OLD_IEEE80211_IOC_SCAN_REQ:
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
 			"%s: active scan request\n", __func__);
 		/*
 		 * If we are in INIT state then the driver has never
 		 * had a chance to setup hardware state to do a scan;
 		 * use the state machine to get us up the SCAN state.
 		 * Otherwise just invoke the scan machinery to start
 		 * a one-time scan.
 		 */
 		if (vap->iv_state == IEEE80211_S_INIT)
 			ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
 		else
 			(void) ieee80211_start_scan(vap,
 				IEEE80211_SCAN_ACTIVE |
 				IEEE80211_SCAN_NOPICK |
 				IEEE80211_SCAN_ONCE,
 				IEEE80211_SCAN_FOREVER, 0, 0,
 				/* XXX use ioctl params */
 				vap->iv_des_nssid, vap->iv_des_ssid);
 		break;
 #endif /* OLD_IEEE80211_IOC_SCAN_REQ */
 	case IEEE80211_IOC_SCAN_REQ:
 		error = ieee80211_ioctl_scanreq(vap, ireq);
 		break;
 	case IEEE80211_IOC_SCAN_CANCEL:
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
 		    "%s: cancel scan\n", __func__);
 		ieee80211_cancel_scan(vap);
 		break;
 	case IEEE80211_IOC_HTCONF:
 		if (ireq->i_val & 1)
 			ieee80211_syncflag_ht(vap, IEEE80211_FHT_HT);
 		else
 			ieee80211_syncflag_ht(vap, -IEEE80211_FHT_HT);
 		if (ireq->i_val & 2)
 			ieee80211_syncflag_ht(vap, IEEE80211_FHT_USEHT40);
 		else
 			ieee80211_syncflag_ht(vap, -IEEE80211_FHT_USEHT40);
 		error = ENETRESET;
 		break;
 	case IEEE80211_IOC_ADDMAC:
 	case IEEE80211_IOC_DELMAC:
 		error = ieee80211_ioctl_macmac(vap, ireq);
 		break;
 	case IEEE80211_IOC_MACCMD:
 		error = ieee80211_ioctl_setmaccmd(vap, ireq);
 		break;
 	case IEEE80211_IOC_STA_STATS:
 		error = ieee80211_ioctl_setstastats(vap, ireq);
 		break;
 	case IEEE80211_IOC_STA_TXPOW:
 		error = ieee80211_ioctl_setstatxpow(vap, ireq);
 		break;
 	case IEEE80211_IOC_WME_CWMIN:		/* WME: CWmin */
 	case IEEE80211_IOC_WME_CWMAX:		/* WME: CWmax */
 	case IEEE80211_IOC_WME_AIFS:		/* WME: AIFS */
 	case IEEE80211_IOC_WME_TXOPLIMIT:	/* WME: txops limit */
 	case IEEE80211_IOC_WME_ACM:		/* WME: ACM (bss only) */
 	case IEEE80211_IOC_WME_ACKPOLICY:	/* WME: ACK policy (!bss only) */
 		error = ieee80211_ioctl_setwmeparam(vap, ireq);
 		break;
 	case IEEE80211_IOC_DTIM_PERIOD:
 		if (vap->iv_opmode != IEEE80211_M_HOSTAP &&
 		    vap->iv_opmode != IEEE80211_M_MBSS &&
 		    vap->iv_opmode != IEEE80211_M_IBSS)
 			return EINVAL;
 		if (IEEE80211_DTIM_MIN <= ireq->i_val &&
 		    ireq->i_val <= IEEE80211_DTIM_MAX) {
 			vap->iv_dtim_period = ireq->i_val;
 			error = ENETRESET;		/* requires restart */
 		} else
 			error = EINVAL;
 		break;
 	case IEEE80211_IOC_BEACON_INTERVAL:
 		if (vap->iv_opmode != IEEE80211_M_HOSTAP &&
 		    vap->iv_opmode != IEEE80211_M_MBSS &&
 		    vap->iv_opmode != IEEE80211_M_IBSS)
 			return EINVAL;
 		if (IEEE80211_BINTVAL_MIN <= ireq->i_val &&
 		    ireq->i_val <= IEEE80211_BINTVAL_MAX) {
 			ic->ic_bintval = ireq->i_val;
 			error = ENETRESET;		/* requires restart */
 		} else
 			error = EINVAL;
 		break;
 	case IEEE80211_IOC_PUREG:
 		if (ireq->i_val)
 			vap->iv_flags |= IEEE80211_F_PUREG;
 		else
 			vap->iv_flags &= ~IEEE80211_F_PUREG;
 		/* NB: reset only if we're operating on an 11g channel */
 		if (isvap11g(vap))
 			error = ENETRESET;
 		break;
 	case IEEE80211_IOC_QUIET:
 		vap->iv_quiet= ireq->i_val;
 		break;
 	case IEEE80211_IOC_QUIET_COUNT:
 		vap->iv_quiet_count=ireq->i_val;
 		break;
 	case IEEE80211_IOC_QUIET_PERIOD:
 		vap->iv_quiet_period=ireq->i_val;
 		break;
 	case IEEE80211_IOC_QUIET_OFFSET:
 		vap->iv_quiet_offset=ireq->i_val;
 		break;
 	case IEEE80211_IOC_QUIET_DUR:
 		if(ireq->i_val < vap->iv_bss->ni_intval)
 			vap->iv_quiet_duration = ireq->i_val;
 		else
 			error = EINVAL;
 		break;
 	case IEEE80211_IOC_BGSCAN:
 		if (ireq->i_val) {
 			if ((vap->iv_caps & IEEE80211_C_BGSCAN) == 0)
 				return EOPNOTSUPP;
 			vap->iv_flags |= IEEE80211_F_BGSCAN;
 		} else
 			vap->iv_flags &= ~IEEE80211_F_BGSCAN;
 		break;
 	case IEEE80211_IOC_BGSCAN_IDLE:
 		if (ireq->i_val >= IEEE80211_BGSCAN_IDLE_MIN)
 			vap->iv_bgscanidle = ireq->i_val*hz/1000;
 		else
 			error = EINVAL;
 		break;
 	case IEEE80211_IOC_BGSCAN_INTERVAL:
 		if (ireq->i_val >= IEEE80211_BGSCAN_INTVAL_MIN)
 			vap->iv_bgscanintvl = ireq->i_val*hz;
 		else
 			error = EINVAL;
 		break;
 	case IEEE80211_IOC_SCANVALID:
 		if (ireq->i_val >= IEEE80211_SCAN_VALID_MIN)
 			vap->iv_scanvalid = ireq->i_val*hz;
 		else
 			error = EINVAL;
 		break;
 	case IEEE80211_IOC_FRAGTHRESHOLD:
 		if ((vap->iv_caps & IEEE80211_C_TXFRAG) == 0 &&
 		    ireq->i_val != IEEE80211_FRAG_MAX)
 			return EOPNOTSUPP;
 		if (!(IEEE80211_FRAG_MIN <= ireq->i_val &&
 		      ireq->i_val <= IEEE80211_FRAG_MAX))
 			return EINVAL;
 		vap->iv_fragthreshold = ireq->i_val;
 		error = ERESTART;
 		break;
 	case IEEE80211_IOC_BURST:
 		if (ireq->i_val) {
 			if ((vap->iv_caps & IEEE80211_C_BURST) == 0)
 				return EOPNOTSUPP;
 			ieee80211_syncflag(vap, IEEE80211_F_BURST);
 		} else
 			ieee80211_syncflag(vap, -IEEE80211_F_BURST);
 		error = ERESTART;
 		break;
 	case IEEE80211_IOC_BMISSTHRESHOLD:
 		if (!(IEEE80211_HWBMISS_MIN <= ireq->i_val &&
 		      ireq->i_val <= IEEE80211_HWBMISS_MAX))
 			return EINVAL;
 		vap->iv_bmissthreshold = ireq->i_val;
 		error = ERESTART;
 		break;
 	case IEEE80211_IOC_CURCHAN:
 		error = ieee80211_ioctl_setcurchan(vap, ireq);
 		break;
 	case IEEE80211_IOC_SHORTGI:
 		if (ireq->i_val) {
 #define	IEEE80211_HTCAP_SHORTGI \
 	(IEEE80211_HTCAP_SHORTGI20 | IEEE80211_HTCAP_SHORTGI40)
 			if (((ireq->i_val ^ vap->iv_htcaps) & IEEE80211_HTCAP_SHORTGI) != 0)
 				return EINVAL;
 			if (ireq->i_val & IEEE80211_HTCAP_SHORTGI20)
 				vap->iv_flags_ht |= IEEE80211_FHT_SHORTGI20;
 			if (ireq->i_val & IEEE80211_HTCAP_SHORTGI40)
 				vap->iv_flags_ht |= IEEE80211_FHT_SHORTGI40;
 #undef IEEE80211_HTCAP_SHORTGI
 		} else
 			vap->iv_flags_ht &=
 			    ~(IEEE80211_FHT_SHORTGI20 | IEEE80211_FHT_SHORTGI40);
 		error = ERESTART;
 		break;
 	case IEEE80211_IOC_AMPDU:
 		if (ireq->i_val && (vap->iv_htcaps & IEEE80211_HTC_AMPDU) == 0)
 			return EINVAL;
 		if (ireq->i_val & 1)
 			vap->iv_flags_ht |= IEEE80211_FHT_AMPDU_TX;
 		else
 			vap->iv_flags_ht &= ~IEEE80211_FHT_AMPDU_TX;
 		if (ireq->i_val & 2)
 			vap->iv_flags_ht |= IEEE80211_FHT_AMPDU_RX;
 		else
 			vap->iv_flags_ht &= ~IEEE80211_FHT_AMPDU_RX;
 		/* NB: reset only if we're operating on an 11n channel */
 		if (isvapht(vap))
 			error = ERESTART;
 		break;
 	case IEEE80211_IOC_AMPDU_LIMIT:
 		/* XXX TODO: figure out ampdu_limit versus ampdu_rxmax */
 		if (!(IEEE80211_HTCAP_MAXRXAMPDU_8K <= ireq->i_val &&
 		      ireq->i_val <= IEEE80211_HTCAP_MAXRXAMPDU_64K))
 			return EINVAL;
 		if (vap->iv_opmode == IEEE80211_M_HOSTAP)
 			vap->iv_ampdu_rxmax = ireq->i_val;
 		else
 			vap->iv_ampdu_limit = ireq->i_val;
 		error = ERESTART;
 		break;
 	case IEEE80211_IOC_AMPDU_DENSITY:
 		if (!(IEEE80211_HTCAP_MPDUDENSITY_NA <= ireq->i_val &&
 		      ireq->i_val <= IEEE80211_HTCAP_MPDUDENSITY_16))
 			return EINVAL;
 		vap->iv_ampdu_density = ireq->i_val;
 		error = ERESTART;
 		break;
 	case IEEE80211_IOC_AMSDU:
 		if (ireq->i_val && (vap->iv_htcaps & IEEE80211_HTC_AMSDU) == 0)
 			return EINVAL;
 		if (ireq->i_val & 1)
 			vap->iv_flags_ht |= IEEE80211_FHT_AMSDU_TX;
 		else
 			vap->iv_flags_ht &= ~IEEE80211_FHT_AMSDU_TX;
 		if (ireq->i_val & 2)
 			vap->iv_flags_ht |= IEEE80211_FHT_AMSDU_RX;
 		else
 			vap->iv_flags_ht &= ~IEEE80211_FHT_AMSDU_RX;
 		/* NB: reset only if we're operating on an 11n channel */
 		if (isvapht(vap))
 			error = ERESTART;
 		break;
 	case IEEE80211_IOC_AMSDU_LIMIT:
 		/* XXX validate */
 		vap->iv_amsdu_limit = ireq->i_val;	/* XXX truncation? */
 		break;
 	case IEEE80211_IOC_PUREN:
 		if (ireq->i_val) {
 			if ((vap->iv_flags_ht & IEEE80211_FHT_HT) == 0)
 				return EINVAL;
 			vap->iv_flags_ht |= IEEE80211_FHT_PUREN;
 		} else
 			vap->iv_flags_ht &= ~IEEE80211_FHT_PUREN;
 		/* NB: reset only if we're operating on an 11n channel */
 		if (isvapht(vap))
 			error = ERESTART;
 		break;
 	case IEEE80211_IOC_DOTH:
 		if (ireq->i_val) {
 #if 0
 			/* XXX no capability */
 			if ((vap->iv_caps & IEEE80211_C_DOTH) == 0)
 				return EOPNOTSUPP;
 #endif
 			vap->iv_flags |= IEEE80211_F_DOTH;
 		} else
 			vap->iv_flags &= ~IEEE80211_F_DOTH;
 		error = ENETRESET;
 		break;
 	case IEEE80211_IOC_REGDOMAIN:
 		error = ieee80211_ioctl_setregdomain(vap, ireq);
 		break;
 	case IEEE80211_IOC_ROAM:
 		error = ieee80211_ioctl_setroam(vap, ireq);
 		break;
 	case IEEE80211_IOC_TXPARAMS:
 		error = ieee80211_ioctl_settxparams(vap, ireq);
 		break;
 	case IEEE80211_IOC_HTCOMPAT:
 		if (ireq->i_val) {
 			if ((vap->iv_flags_ht & IEEE80211_FHT_HT) == 0)
 				return EOPNOTSUPP;
 			vap->iv_flags_ht |= IEEE80211_FHT_HTCOMPAT;
 		} else
 			vap->iv_flags_ht &= ~IEEE80211_FHT_HTCOMPAT;
 		/* NB: reset only if we're operating on an 11n channel */
 		if (isvapht(vap))
 			error = ERESTART;
 		break;
 	case IEEE80211_IOC_DWDS:
 		if (ireq->i_val) {
 			/* NB: DWDS only makes sense for WDS-capable devices */
 			if ((ic->ic_caps & IEEE80211_C_WDS) == 0)
 				return EOPNOTSUPP;
 			/* NB: DWDS is used only with ap+sta vaps */
 			if (vap->iv_opmode != IEEE80211_M_HOSTAP &&
 			    vap->iv_opmode != IEEE80211_M_STA)
 				return EINVAL;
 			vap->iv_flags |= IEEE80211_F_DWDS;
 			if (vap->iv_opmode == IEEE80211_M_STA)
 				vap->iv_flags_ext |= IEEE80211_FEXT_4ADDR;
 		} else {
 			vap->iv_flags &= ~IEEE80211_F_DWDS;
 			if (vap->iv_opmode == IEEE80211_M_STA)
 				vap->iv_flags_ext &= ~IEEE80211_FEXT_4ADDR;
 		}
 		break;
 	case IEEE80211_IOC_INACTIVITY:
 		if (ireq->i_val)
 			vap->iv_flags_ext |= IEEE80211_FEXT_INACT;
 		else
 			vap->iv_flags_ext &= ~IEEE80211_FEXT_INACT;
 		break;
 	case IEEE80211_IOC_APPIE:
 		error = ieee80211_ioctl_setappie(vap, ireq);
 		break;
 	case IEEE80211_IOC_WPS:
 		if (ireq->i_val) {
 			if ((vap->iv_caps & IEEE80211_C_WPA) == 0)
 				return EOPNOTSUPP;
 			vap->iv_flags_ext |= IEEE80211_FEXT_WPS;
 		} else
 			vap->iv_flags_ext &= ~IEEE80211_FEXT_WPS;
 		break;
 	case IEEE80211_IOC_TSN:
 		if (ireq->i_val) {
 			if ((vap->iv_caps & IEEE80211_C_WPA) == 0)
 				return EOPNOTSUPP;
 			vap->iv_flags_ext |= IEEE80211_FEXT_TSN;
 		} else
 			vap->iv_flags_ext &= ~IEEE80211_FEXT_TSN;
 		break;
 	case IEEE80211_IOC_CHANSWITCH:
 		error = ieee80211_ioctl_chanswitch(vap, ireq);
 		break;
 	case IEEE80211_IOC_DFS:
 		if (ireq->i_val) {
 			if ((vap->iv_caps & IEEE80211_C_DFS) == 0)
 				return EOPNOTSUPP;
 			/* NB: DFS requires 11h support */
 			if ((vap->iv_flags & IEEE80211_F_DOTH) == 0)
 				return EINVAL;
 			vap->iv_flags_ext |= IEEE80211_FEXT_DFS;
 		} else
 			vap->iv_flags_ext &= ~IEEE80211_FEXT_DFS;
 		break;
 	case IEEE80211_IOC_DOTD:
 		if (ireq->i_val)
 			vap->iv_flags_ext |= IEEE80211_FEXT_DOTD;
 		else
 			vap->iv_flags_ext &= ~IEEE80211_FEXT_DOTD;
 		if (vap->iv_opmode == IEEE80211_M_STA)
 			error = ENETRESET;
 		break;
 	case IEEE80211_IOC_HTPROTMODE:
 		if (ireq->i_val > IEEE80211_PROT_RTSCTS)
 			return EINVAL;
 		ic->ic_htprotmode = ireq->i_val ?
 		    IEEE80211_PROT_RTSCTS : IEEE80211_PROT_NONE;
 		/* NB: if not operating in 11n this can wait */
 		if (isvapht(vap))
 			error = ERESTART;
 		break;
 	case IEEE80211_IOC_STA_VLAN:
 		error = ieee80211_ioctl_setstavlan(vap, ireq);
 		break;
 	case IEEE80211_IOC_SMPS:
 		if ((ireq->i_val &~ IEEE80211_HTCAP_SMPS) != 0 ||
 		    ireq->i_val == 0x0008)	/* value of 2 is reserved */
 			return EINVAL;
 		if (ireq->i_val != IEEE80211_HTCAP_SMPS_OFF &&
 		    (vap->iv_htcaps & IEEE80211_HTC_SMPS) == 0)
 			return EOPNOTSUPP;
 		vap->iv_htcaps = (vap->iv_htcaps &~ IEEE80211_HTCAP_SMPS) |
 			ireq->i_val;
 		/* NB: if not operating in 11n this can wait */
 		if (isvapht(vap))
 			error = ERESTART;
 		break;
 	case IEEE80211_IOC_RIFS:
 		if (ireq->i_val != 0) {
 			if ((vap->iv_htcaps & IEEE80211_HTC_RIFS) == 0)
 				return EOPNOTSUPP;
 			vap->iv_flags_ht |= IEEE80211_FHT_RIFS;
 		} else
 			vap->iv_flags_ht &= ~IEEE80211_FHT_RIFS;
 		/* NB: if not operating in 11n this can wait */
 		if (isvapht(vap))
 			error = ERESTART;
 		break;
 	case IEEE80211_IOC_STBC:
 		/* Check if we can do STBC TX/RX before changing the setting */
 		if ((ireq->i_val & 1) &&
 		    ((vap->iv_htcaps & IEEE80211_HTCAP_TXSTBC) == 0))
 			return EOPNOTSUPP;
 		if ((ireq->i_val & 2) &&
 		    ((vap->iv_htcaps & IEEE80211_HTCAP_RXSTBC) == 0))
 			return EOPNOTSUPP;
 
 		/* TX */
 		if (ireq->i_val & 1)
 			vap->iv_flags_ht |= IEEE80211_FHT_STBC_TX;
 		else
 			vap->iv_flags_ht &= ~IEEE80211_FHT_STBC_TX;
 
 		/* RX */
 		if (ireq->i_val & 2)
 			vap->iv_flags_ht |= IEEE80211_FHT_STBC_RX;
 		else
 			vap->iv_flags_ht &= ~IEEE80211_FHT_STBC_RX;
 
 		/* NB: reset only if we're operating on an 11n channel */
 		if (isvapht(vap))
 			error = ERESTART;
 		break;
+
+	/* VHT */
+	case IEEE80211_IOC_VHTCONF:
+		if (ireq->i_val & 1)
+			ieee80211_syncflag_vht(vap, IEEE80211_FVHT_VHT);
+		else
+			ieee80211_syncflag_vht(vap, -IEEE80211_FVHT_VHT);
+
+		if (ireq->i_val & 2)
+			ieee80211_syncflag_vht(vap, IEEE80211_FVHT_USEVHT40);
+		else
+			ieee80211_syncflag_vht(vap, -IEEE80211_FVHT_USEVHT40);
+
+		if (ireq->i_val & 4)
+			ieee80211_syncflag_vht(vap, IEEE80211_FVHT_USEVHT80);
+		else
+			ieee80211_syncflag_vht(vap, -IEEE80211_FVHT_USEVHT80);
+
+		if (ireq->i_val & 8)
+			ieee80211_syncflag_vht(vap, IEEE80211_FVHT_USEVHT80P80);
+		else
+			ieee80211_syncflag_vht(vap, -IEEE80211_FVHT_USEVHT80P80);
+
+		if (ireq->i_val & 16)
+			ieee80211_syncflag_vht(vap, IEEE80211_FVHT_USEVHT160);
+		else
+			ieee80211_syncflag_vht(vap, -IEEE80211_FVHT_USEVHT160);
+
+		error = ENETRESET;
+		break;
+
 	default:
 		error = ieee80211_ioctl_setdefault(vap, ireq);
 		break;
 	}
 	/*
 	 * The convention is that ENETRESET means an operation
 	 * requires a complete re-initialization of the device (e.g.
 	 * changing something that affects the association state).
 	 * ERESTART means the request may be handled with only a
 	 * reload of the hardware state.  We hand ERESTART requests
 	 * to the iv_reset callback so the driver can decide.  If
 	 * a device does not fillin iv_reset then it defaults to one
 	 * that returns ENETRESET.  Otherwise a driver may return
 	 * ENETRESET (in which case a full reset will be done) or
 	 * 0 to mean there's no need to do anything (e.g. when the
 	 * change has no effect on the driver/device).
 	 */
 	if (error == ERESTART)
 		error = IFNET_IS_UP_RUNNING(vap->iv_ifp) ?
 		    vap->iv_reset(vap, ireq->i_type) : 0;
 	if (error == ENETRESET) {
 		/* XXX need to re-think AUTO handling */
 		if (IS_UP_AUTO(vap))
 			ieee80211_init(vap);
 		error = 0;
 	}
 	return error;
 }
 
 int
 ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct ieee80211vap *vap = ifp->if_softc;
 	struct ieee80211com *ic = vap->iv_ic;
 	int error = 0, wait = 0;
 	struct ifreq *ifr;
 	struct ifaddr *ifa;			/* XXX */
 
 	switch (cmd) {
 	case SIOCSIFFLAGS:
 		IEEE80211_LOCK(ic);
 		if ((ifp->if_flags ^ vap->iv_ifflags) & IFF_PROMISC) {
 			/*
 			 * Enable promiscuous mode when:
 			 * 1. Interface is not a member of bridge, or
 			 * 2. Requested by user, or
 			 * 3. In monitor (or adhoc-demo) mode.
 			 */
 			if (ifp->if_bridge == NULL ||
 			    (ifp->if_flags & IFF_PPROMISC) != 0 ||
 			    vap->iv_opmode == IEEE80211_M_MONITOR ||
 			    (vap->iv_opmode == IEEE80211_M_AHDEMO &&
 			    (vap->iv_caps & IEEE80211_C_TDMA) == 0)) {
 				ieee80211_promisc(vap,
 				    ifp->if_flags & IFF_PROMISC);
 				vap->iv_ifflags ^= IFF_PROMISC;
 			}
 		}
 		if ((ifp->if_flags ^ vap->iv_ifflags) & IFF_ALLMULTI) {
 			ieee80211_allmulti(vap, ifp->if_flags & IFF_ALLMULTI);
 			vap->iv_ifflags ^= IFF_ALLMULTI;
 		}
 		if (ifp->if_flags & IFF_UP) {
 			/*
 			 * Bring ourself up unless we're already operational.
 			 * If we're the first vap and the parent is not up
 			 * then it will automatically be brought up as a
 			 * side-effect of bringing ourself up.
 			 */
 			if (vap->iv_state == IEEE80211_S_INIT) {
 				if (ic->ic_nrunning == 0)
 					wait = 1;
 				ieee80211_start_locked(vap);
 			}
 		} else if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
 			/*
 			 * Stop ourself.  If we are the last vap to be
 			 * marked down the parent will also be taken down.
 			 */
 			if (ic->ic_nrunning == 1)
 				wait = 1;
 			ieee80211_stop_locked(vap);
 		}
 		IEEE80211_UNLOCK(ic);
 		/* Wait for parent ioctl handler if it was queued */
 		if (wait) {
 			ieee80211_waitfor_parent(ic);
 
 			/*
 			 * Check if the MAC address was changed
 			 * via SIOCSIFLLADDR ioctl.
 			 */
 			if_addr_rlock(ifp);
 			if ((ifp->if_flags & IFF_UP) == 0 &&
 			    !IEEE80211_ADDR_EQ(vap->iv_myaddr, IF_LLADDR(ifp)))
 				IEEE80211_ADDR_COPY(vap->iv_myaddr,
 				    IF_LLADDR(ifp));
 			if_addr_runlock(ifp);
 		}
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		ieee80211_runtask(ic, &ic->ic_mcast_task);
 		break;
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
 		ifr = (struct ifreq *)data;
 		error = ifmedia_ioctl(ifp, ifr, &vap->iv_media, cmd);
 		break;
 	case SIOCG80211:
 		error = ieee80211_ioctl_get80211(vap, cmd,
 				(struct ieee80211req *) data);
 		break;
 	case SIOCS80211:
 		error = priv_check(curthread, PRIV_NET80211_MANAGE);
 		if (error == 0)
 			error = ieee80211_ioctl_set80211(vap, cmd,
 					(struct ieee80211req *) data);
 		break;
 	case SIOCG80211STATS:
 		ifr = (struct ifreq *)data;
 		copyout(&vap->iv_stats, ifr->ifr_data, sizeof (vap->iv_stats));
 		break;
 	case SIOCSIFMTU:
 		ifr = (struct ifreq *)data;
 		if (!(IEEE80211_MTU_MIN <= ifr->ifr_mtu &&
 		    ifr->ifr_mtu <= IEEE80211_MTU_MAX))
 			error = EINVAL;
 		else
 			ifp->if_mtu = ifr->ifr_mtu;
 		break;
 	case SIOCSIFADDR:
 		/*
 		 * XXX Handle this directly so we can suppress if_init calls.
 		 * XXX This should be done in ether_ioctl but for the moment
 		 * XXX there are too many other parts of the system that
 		 * XXX set IFF_UP and so suppress if_init being called when
 		 * XXX it should be.
 		 */
 		ifa = (struct ifaddr *) data;
 		switch (ifa->ifa_addr->sa_family) {
 #ifdef INET
 		case AF_INET:
 			if ((ifp->if_flags & IFF_UP) == 0) {
 				ifp->if_flags |= IFF_UP;
 				ifp->if_init(ifp->if_softc);
 			}
 			arp_ifinit(ifp, ifa);
 			break;
 #endif
 		default:
 			if ((ifp->if_flags & IFF_UP) == 0) {
 				ifp->if_flags |= IFF_UP;
 				ifp->if_init(ifp->if_softc);
 			}
 			break;
 		}
 		break;
 	default:
 		/*
 		 * Pass unknown ioctls first to the driver, and if it
 		 * returns ENOTTY, then to the generic Ethernet handler.
 		 */
 		if (ic->ic_ioctl != NULL &&
 		    (error = ic->ic_ioctl(ic, cmd, data)) != ENOTTY)
 			break;
 		error = ether_ioctl(ifp, cmd, data);
 		break;
 	}
 	return (error);
 }
Index: projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_ioctl.h
===================================================================
--- projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_ioctl.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_ioctl.h	(revision 311637)
@@ -1,865 +1,869 @@
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 #ifndef _NET80211_IEEE80211_IOCTL_H_
 #define _NET80211_IEEE80211_IOCTL_H_
 
 /*
  * IEEE 802.11 ioctls.
  */
 #include <net80211/_ieee80211.h>
 #include <net80211/ieee80211.h>
 #include <net80211/ieee80211_crypto.h>
 
 /*
  * Per/node (station) statistics.
  */
 struct ieee80211_nodestats {
 	uint32_t	ns_rx_data;		/* rx data frames */
 	uint32_t	ns_rx_mgmt;		/* rx management frames */
 	uint32_t	ns_rx_ctrl;		/* rx control frames */
 	uint32_t	ns_rx_ucast;		/* rx unicast frames */
 	uint32_t	ns_rx_mcast;		/* rx multi/broadcast frames */
 	uint64_t	ns_rx_bytes;		/* rx data count (bytes) */
 	uint64_t	ns_rx_beacons;		/* rx beacon frames */
 	uint32_t	ns_rx_proberesp;	/* rx probe response frames */
 
 	uint32_t	ns_rx_dup;		/* rx discard 'cuz dup */
 	uint32_t	ns_rx_noprivacy;	/* rx w/ wep but privacy off */
 	uint32_t	ns_rx_wepfail;		/* rx wep processing failed */
 	uint32_t	ns_rx_demicfail;	/* rx demic failed */
 	uint32_t	ns_rx_decap;		/* rx decapsulation failed */
 	uint32_t	ns_rx_defrag;		/* rx defragmentation failed */
 	uint32_t	ns_rx_disassoc;		/* rx disassociation */
 	uint32_t	ns_rx_deauth;		/* rx deauthentication */
 	uint32_t	ns_rx_action;		/* rx action */
 	uint32_t	ns_rx_decryptcrc;	/* rx decrypt failed on crc */
 	uint32_t	ns_rx_unauth;		/* rx on unauthorized port */
 	uint32_t	ns_rx_unencrypted;	/* rx unecrypted w/ privacy */
 	uint32_t	ns_rx_drop;		/* rx discard other reason */
 
 	uint32_t	ns_tx_data;		/* tx data frames */
 	uint32_t	ns_tx_mgmt;		/* tx management frames */
 	uint32_t	ns_tx_ctrl;		/* tx control frames */
 	uint32_t	ns_tx_ucast;		/* tx unicast frames */
 	uint32_t	ns_tx_mcast;		/* tx multi/broadcast frames */
 	uint64_t	ns_tx_bytes;		/* tx data count (bytes) */
 	uint32_t	ns_tx_probereq;		/* tx probe request frames */
 
 	uint32_t	ns_tx_novlantag;	/* tx discard 'cuz no tag */
 	uint32_t	ns_tx_vlanmismatch;	/* tx discard 'cuz bad tag */
 
 	uint32_t	ns_ps_discard;		/* ps discard 'cuz of age */
 
 	/* MIB-related state */
 	uint32_t	ns_tx_assoc;		/* [re]associations */
 	uint32_t	ns_tx_assoc_fail;	/* [re]association failures */
 	uint32_t	ns_tx_auth;		/* [re]authentications */
 	uint32_t	ns_tx_auth_fail;	/* [re]authentication failures*/
 	uint32_t	ns_tx_deauth;		/* deauthentications */
 	uint32_t	ns_tx_deauth_code;	/* last deauth reason */
 	uint32_t	ns_tx_disassoc;		/* disassociations */
 	uint32_t	ns_tx_disassoc_code;	/* last disassociation reason */
 	uint32_t	ns_spare[8];
 };
 
 /*
  * Summary statistics.
  */
 struct ieee80211_stats {
 	uint32_t	is_rx_badversion;	/* rx frame with bad version */
 	uint32_t	is_rx_tooshort;		/* rx frame too short */
 	uint32_t	is_rx_wrongbss;		/* rx from wrong bssid */
 	uint32_t	is_rx_dup;		/* rx discard 'cuz dup */
 	uint32_t	is_rx_wrongdir;		/* rx w/ wrong direction */
 	uint32_t	is_rx_mcastecho;	/* rx discard 'cuz mcast echo */
 	uint32_t	is_rx_notassoc;		/* rx discard 'cuz sta !assoc */
 	uint32_t	is_rx_noprivacy;	/* rx w/ wep but privacy off */
 	uint32_t	is_rx_unencrypted;	/* rx w/o wep and privacy on */
 	uint32_t	is_rx_wepfail;		/* rx wep processing failed */
 	uint32_t	is_rx_decap;		/* rx decapsulation failed */
 	uint32_t	is_rx_mgtdiscard;	/* rx discard mgt frames */
 	uint32_t	is_rx_ctl;		/* rx ctrl frames */
 	uint32_t	is_rx_beacon;		/* rx beacon frames */
 	uint32_t	is_rx_rstoobig;		/* rx rate set truncated */
 	uint32_t	is_rx_elem_missing;	/* rx required element missing*/
 	uint32_t	is_rx_elem_toobig;	/* rx element too big */
 	uint32_t	is_rx_elem_toosmall;	/* rx element too small */
 	uint32_t	is_rx_elem_unknown;	/* rx element unknown */
 	uint32_t	is_rx_badchan;		/* rx frame w/ invalid chan */
 	uint32_t	is_rx_chanmismatch;	/* rx frame chan mismatch */
 	uint32_t	is_rx_nodealloc;	/* rx frame dropped */
 	uint32_t	is_rx_ssidmismatch;	/* rx frame ssid mismatch  */
 	uint32_t	is_rx_auth_unsupported;	/* rx w/ unsupported auth alg */
 	uint32_t	is_rx_auth_fail;	/* rx sta auth failure */
 	uint32_t	is_rx_auth_countermeasures;/* rx auth discard 'cuz CM */
 	uint32_t	is_rx_assoc_bss;	/* rx assoc from wrong bssid */
 	uint32_t	is_rx_assoc_notauth;	/* rx assoc w/o auth */
 	uint32_t	is_rx_assoc_capmismatch;/* rx assoc w/ cap mismatch */
 	uint32_t	is_rx_assoc_norate;	/* rx assoc w/ no rate match */
 	uint32_t	is_rx_assoc_badwpaie;	/* rx assoc w/ bad WPA IE */
 	uint32_t	is_rx_deauth;		/* rx deauthentication */
 	uint32_t	is_rx_disassoc;		/* rx disassociation */
 	uint32_t	is_rx_badsubtype;	/* rx frame w/ unknown subtype*/
 	uint32_t	is_rx_nobuf;		/* rx failed for lack of buf */
 	uint32_t	is_rx_decryptcrc;	/* rx decrypt failed on crc */
 	uint32_t	is_rx_ahdemo_mgt;	/* rx discard ahdemo mgt frame*/
 	uint32_t	is_rx_bad_auth;		/* rx bad auth request */
 	uint32_t	is_rx_unauth;		/* rx on unauthorized port */
 	uint32_t	is_rx_badkeyid;		/* rx w/ incorrect keyid */
 	uint32_t	is_rx_ccmpreplay;	/* rx seq# violation (CCMP) */
 	uint32_t	is_rx_ccmpformat;	/* rx format bad (CCMP) */
 	uint32_t	is_rx_ccmpmic;		/* rx MIC check failed (CCMP) */
 	uint32_t	is_rx_tkipreplay;	/* rx seq# violation (TKIP) */
 	uint32_t	is_rx_tkipformat;	/* rx format bad (TKIP) */
 	uint32_t	is_rx_tkipmic;		/* rx MIC check failed (TKIP) */
 	uint32_t	is_rx_tkipicv;		/* rx ICV check failed (TKIP) */
 	uint32_t	is_rx_badcipher;	/* rx failed 'cuz key type */
 	uint32_t	is_rx_nocipherctx;	/* rx failed 'cuz key !setup */
 	uint32_t	is_rx_acl;		/* rx discard 'cuz acl policy */
 	uint32_t	is_tx_nobuf;		/* tx failed for lack of buf */
 	uint32_t	is_tx_nonode;		/* tx failed for no node */
 	uint32_t	is_tx_unknownmgt;	/* tx of unknown mgt frame */
 	uint32_t	is_tx_badcipher;	/* tx failed 'cuz key type */
 	uint32_t	is_tx_nodefkey;		/* tx failed 'cuz no defkey */
 	uint32_t	is_tx_noheadroom;	/* tx failed 'cuz no space */
 	uint32_t	is_tx_fragframes;	/* tx frames fragmented */
 	uint32_t	is_tx_frags;		/* tx fragments created */
 	uint32_t	is_scan_active;		/* active scans started */
 	uint32_t	is_scan_passive;	/* passive scans started */
 	uint32_t	is_node_timeout;	/* nodes timed out inactivity */
 	uint32_t	is_crypto_nomem;	/* no memory for crypto ctx */
 	uint32_t	is_crypto_tkip;		/* tkip crypto done in s/w */
 	uint32_t	is_crypto_tkipenmic;	/* tkip en-MIC done in s/w */
 	uint32_t	is_crypto_tkipdemic;	/* tkip de-MIC done in s/w */
 	uint32_t	is_crypto_tkipcm;	/* tkip counter measures */
 	uint32_t	is_crypto_ccmp;		/* ccmp crypto done in s/w */
 	uint32_t	is_crypto_wep;		/* wep crypto done in s/w */
 	uint32_t	is_crypto_setkey_cipher;/* cipher rejected key */
 	uint32_t	is_crypto_setkey_nokey;	/* no key index for setkey */
 	uint32_t	is_crypto_delkey;	/* driver key delete failed */
 	uint32_t	is_crypto_badcipher;	/* unknown cipher */
 	uint32_t	is_crypto_nocipher;	/* cipher not available */
 	uint32_t	is_crypto_attachfail;	/* cipher attach failed */
 	uint32_t	is_crypto_swfallback;	/* cipher fallback to s/w */
 	uint32_t	is_crypto_keyfail;	/* driver key alloc failed */
 	uint32_t	is_crypto_enmicfail;	/* en-MIC failed */
 	uint32_t	is_ibss_capmismatch;	/* merge failed-cap mismatch */
 	uint32_t	is_ibss_norate;		/* merge failed-rate mismatch */
 	uint32_t	is_ps_unassoc;		/* ps-poll for unassoc. sta */
 	uint32_t	is_ps_badaid;		/* ps-poll w/ incorrect aid */
 	uint32_t	is_ps_qempty;		/* ps-poll w/ nothing to send */
 	uint32_t	is_ff_badhdr;		/* fast frame rx'd w/ bad hdr */
 	uint32_t	is_ff_tooshort;		/* fast frame rx decap error */
 	uint32_t	is_ff_split;		/* fast frame rx split error */
 	uint32_t	is_ff_decap;		/* fast frames decap'd */
 	uint32_t	is_ff_encap;		/* fast frames encap'd for tx */
 	uint32_t	is_rx_badbintval;	/* rx frame w/ bogus bintval */
 	uint32_t	is_rx_demicfail;	/* rx demic failed */
 	uint32_t	is_rx_defrag;		/* rx defragmentation failed */
 	uint32_t	is_rx_mgmt;		/* rx management frames */
 	uint32_t	is_rx_action;		/* rx action mgt frames */
 	uint32_t	is_amsdu_tooshort;	/* A-MSDU rx decap error */
 	uint32_t	is_amsdu_split;		/* A-MSDU rx split error */
 	uint32_t	is_amsdu_decap;		/* A-MSDU decap'd */
 	uint32_t	is_amsdu_encap;		/* A-MSDU encap'd for tx */
 	uint32_t	is_ampdu_bar_bad;	/* A-MPDU BAR out of window */
 	uint32_t	is_ampdu_bar_oow;	/* A-MPDU BAR before ADDBA */
 	uint32_t	is_ampdu_bar_move;	/* A-MPDU BAR moved window */
 	uint32_t	is_ampdu_bar_rx;	/* A-MPDU BAR frames handled */
 	uint32_t	is_ampdu_rx_flush;	/* A-MPDU frames flushed */
 	uint32_t	is_ampdu_rx_oor;	/* A-MPDU frames out-of-order */
 	uint32_t	is_ampdu_rx_copy;	/* A-MPDU frames copied down */
 	uint32_t	is_ampdu_rx_drop;	/* A-MPDU frames dropped */
 	uint32_t	is_tx_badstate;		/* tx discard state != RUN */
 	uint32_t	is_tx_notassoc;		/* tx failed, sta not assoc */
 	uint32_t	is_tx_classify;		/* tx classification failed */
 	uint32_t	is_dwds_mcast;		/* discard mcast over dwds */
 	uint32_t	is_dwds_qdrop;		/* dwds pending frame q full */
 	uint32_t	is_ht_assoc_nohtcap;	/* non-HT sta rejected */
 	uint32_t	is_ht_assoc_downgrade;	/* HT sta forced to legacy */
 	uint32_t	is_ht_assoc_norate;	/* HT assoc w/ rate mismatch */
 	uint32_t	is_ampdu_rx_age;	/* A-MPDU sent up 'cuz of age */
 	uint32_t	is_ampdu_rx_move;	/* A-MPDU MSDU moved window */
 	uint32_t	is_addba_reject;	/* ADDBA reject 'cuz disabled */
 	uint32_t	is_addba_norequest;	/* ADDBA response w/o ADDBA */
 	uint32_t	is_addba_badtoken;	/* ADDBA response w/ wrong
 						   dialogtoken */
 	uint32_t	is_addba_badpolicy;	/* ADDBA resp w/ wrong policy */
 	uint32_t	is_ampdu_stop;		/* A-MPDU stream stopped */
 	uint32_t	is_ampdu_stop_failed;	/* A-MPDU stream not running */
 	uint32_t	is_ampdu_rx_reorder;	/* A-MPDU held for rx reorder */
 	uint32_t	is_scan_bg;		/* background scans started */
 	uint8_t		is_rx_deauth_code;	/* last rx'd deauth reason */
 	uint8_t		is_rx_disassoc_code;	/* last rx'd disassoc reason */
 	uint8_t		is_rx_authfail_code;	/* last rx'd auth fail reason */
 	uint32_t	is_beacon_miss;		/* beacon miss notification */
 	uint32_t	is_rx_badstate;		/* rx discard state != RUN */
 	uint32_t	is_ff_flush;		/* ff's flush'd from stageq */
 	uint32_t	is_tx_ctl;		/* tx ctrl frames */
 	uint32_t	is_ampdu_rexmt;		/* A-MPDU frames rexmt ok */
 	uint32_t	is_ampdu_rexmt_fail;	/* A-MPDU frames rexmt fail */
 
 	uint32_t	is_mesh_wrongmesh;	/* dropped 'cuz not mesh sta*/
 	uint32_t	is_mesh_nolink;		/* dropped 'cuz link not estab*/
 	uint32_t	is_mesh_fwd_ttl;	/* mesh not fwd'd 'cuz ttl 0 */
 	uint32_t	is_mesh_fwd_nobuf;	/* mesh not fwd'd 'cuz no mbuf*/
 	uint32_t	is_mesh_fwd_tooshort;	/* mesh not fwd'd 'cuz no hdr */
 	uint32_t	is_mesh_fwd_disabled;	/* mesh not fwd'd 'cuz disabled */
 	uint32_t	is_mesh_fwd_nopath;	/* mesh not fwd'd 'cuz path unknown */
 
 	uint32_t	is_hwmp_wrongseq;	/* wrong hwmp seq no. */
 	uint32_t	is_hwmp_rootreqs;	/* root PREQs sent */
 	uint32_t	is_hwmp_rootrann;	/* root RANNs sent */
 
 	uint32_t	is_mesh_badae;		/* dropped 'cuz invalid AE */
 	uint32_t	is_mesh_rtaddfailed;	/* route add failed */
 	uint32_t	is_mesh_notproxy;	/* dropped 'cuz not proxying */
 	uint32_t	is_rx_badalign;		/* dropped 'cuz misaligned */
 	uint32_t	is_hwmp_proxy;		/* PREP for proxy route */
 	uint32_t	is_beacon_bad;		/* Number of bad beacons */
 	uint32_t	is_ampdu_bar_tx;	/* A-MPDU BAR frames TXed */
 	uint32_t	is_ampdu_bar_tx_retry;	/* A-MPDU BAR frames TX rtry */
 	uint32_t	is_ampdu_bar_tx_fail;	/* A-MPDU BAR frames TX fail */
 
 	uint32_t	is_ff_encapfail;	/* failed FF encap */
 	uint32_t	is_amsdu_encapfail;	/* failed A-MSDU encap */
 
 	uint32_t	is_spare[5];
 };
 
 /*
  * Max size of optional information elements.  We artificially
  * constrain this; it's limited only by the max frame size (and
  * the max parameter size of the wireless extensions).
  */
 #define	IEEE80211_MAX_OPT_IE	256
 
 /*
  * WPA/RSN get/set key request.  Specify the key/cipher
  * type and whether the key is to be used for sending and/or
  * receiving.  The key index should be set only when working
  * with global keys (use IEEE80211_KEYIX_NONE for ``no index'').
  * Otherwise a unicast/pairwise key is specified by the bssid
  * (on a station) or mac address (on an ap).  They key length
  * must include any MIC key data; otherwise it should be no
  * more than IEEE80211_KEYBUF_SIZE.
  */
 struct ieee80211req_key {
 	uint8_t		ik_type;	/* key/cipher type */
 	uint8_t		ik_pad;
 	uint16_t	ik_keyix;	/* key index */
 	uint8_t		ik_keylen;	/* key length in bytes */
 	uint8_t		ik_flags;
 /* NB: IEEE80211_KEY_XMIT and IEEE80211_KEY_RECV defined elsewhere */
 #define	IEEE80211_KEY_DEFAULT	0x80	/* default xmit key */
 	uint8_t		ik_macaddr[IEEE80211_ADDR_LEN];
 	uint64_t	ik_keyrsc;	/* key receive sequence counter */
 	uint64_t	ik_keytsc;	/* key transmit sequence counter */
 	uint8_t		ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
 };
 
 /*
  * Delete a key either by index or address.  Set the index
  * to IEEE80211_KEYIX_NONE when deleting a unicast key.
  */
 struct ieee80211req_del_key {
 	uint8_t		idk_keyix;	/* key index */
 	uint8_t		idk_macaddr[IEEE80211_ADDR_LEN];
 };
 
 /*
  * MLME state manipulation request.  IEEE80211_MLME_ASSOC
  * only makes sense when operating as a station.  The other
  * requests can be used when operating as a station or an
  * ap (to effect a station).
  */
 struct ieee80211req_mlme {
 	uint8_t		im_op;		/* operation to perform */
 #define	IEEE80211_MLME_ASSOC		1	/* associate station */
 #define	IEEE80211_MLME_DISASSOC		2	/* disassociate station */
 #define	IEEE80211_MLME_DEAUTH		3	/* deauthenticate station */
 #define	IEEE80211_MLME_AUTHORIZE	4	/* authorize station */
 #define	IEEE80211_MLME_UNAUTHORIZE	5	/* unauthorize station */
 #define	IEEE80211_MLME_AUTH		6	/* authenticate station */
 	uint8_t		im_ssid_len;	/* length of optional ssid */
 	uint16_t	im_reason;	/* 802.11 reason code */
 	uint8_t		im_macaddr[IEEE80211_ADDR_LEN];
 	uint8_t		im_ssid[IEEE80211_NWID_LEN];
 };
 
 /* 
  * MAC ACL operations.
  */
 enum {
 	IEEE80211_MACCMD_POLICY_OPEN	= 0,	/* set policy: no ACL's */
 	IEEE80211_MACCMD_POLICY_ALLOW	= 1,	/* set policy: allow traffic */
 	IEEE80211_MACCMD_POLICY_DENY	= 2,	/* set policy: deny traffic */
 	IEEE80211_MACCMD_FLUSH		= 3,	/* flush ACL database */
 	IEEE80211_MACCMD_DETACH		= 4,	/* detach ACL policy */
 	IEEE80211_MACCMD_POLICY		= 5,	/* get ACL policy */
 	IEEE80211_MACCMD_LIST		= 6,	/* get ACL database */
 	IEEE80211_MACCMD_POLICY_RADIUS	= 7,	/* set policy: RADIUS managed */
 };
 
 struct ieee80211req_maclist {
 	uint8_t		ml_macaddr[IEEE80211_ADDR_LEN];
 } __packed;
 
 /*
  * Mesh Routing Table Operations.
  */
 enum {
 	IEEE80211_MESH_RTCMD_LIST   = 0, /* list HWMP routing table */
 	IEEE80211_MESH_RTCMD_FLUSH  = 1, /* flush HWMP routing table */
 	IEEE80211_MESH_RTCMD_ADD    = 2, /* add entry to the table */
 	IEEE80211_MESH_RTCMD_DELETE = 3, /* delete an entry from the table */
 };
 
 struct ieee80211req_mesh_route {
 	uint8_t		imr_flags;
 #define	IEEE80211_MESHRT_FLAGS_DISCOVER	0x01
 #define	IEEE80211_MESHRT_FLAGS_VALID	0x02
 #define	IEEE80211_MESHRT_FLAGS_PROXY	0x04
 #define	IEEE80211_MESHRT_FLAGS_GATE	0x08
 	uint8_t		imr_dest[IEEE80211_ADDR_LEN];
 	uint8_t		imr_nexthop[IEEE80211_ADDR_LEN];
 	uint16_t	imr_nhops;
 	uint8_t		imr_pad;
 	uint32_t	imr_metric;
 	uint32_t	imr_lifetime;
 	uint32_t	imr_lastmseq;
 };
 
 /*
  * HWMP root modes
  */
 enum {
 	IEEE80211_HWMP_ROOTMODE_DISABLED	= 0, 	/* disabled */
 	IEEE80211_HWMP_ROOTMODE_NORMAL		= 1,	/* normal PREPs */
 	IEEE80211_HWMP_ROOTMODE_PROACTIVE	= 2,	/* proactive PREPS */
 	IEEE80211_HWMP_ROOTMODE_RANN		= 3,	/* use RANN elemid */
 };
 
 
 /*
  * Set the active channel list by IEEE channel #: each channel
  * to be marked active is set in a bit vector.  Note this list is
  * intersected with the available channel list in calculating
  * the set of channels actually used in scanning.
  */
 struct ieee80211req_chanlist {
 	uint8_t		ic_channels[32];	/* NB: can be variable length */
 };
 
 /*
  * Get the active channel list info.
  */
 struct ieee80211req_chaninfo {
 	u_int	ic_nchans;
 	struct ieee80211_channel ic_chans[1];	/* NB: variable length */
 };
 #define	IEEE80211_CHANINFO_SIZE(_nchan) \
 	(sizeof(struct ieee80211req_chaninfo) + \
 	 (((_nchan)-1) * sizeof(struct ieee80211_channel)))
 #define	IEEE80211_CHANINFO_SPACE(_ci) \
 	IEEE80211_CHANINFO_SIZE((_ci)->ic_nchans)
 
 /*
  * Retrieve the WPA/RSN information element for an associated station.
  */
 struct ieee80211req_wpaie {	/* old version w/ only one ie */
 	uint8_t		wpa_macaddr[IEEE80211_ADDR_LEN];
 	uint8_t		wpa_ie[IEEE80211_MAX_OPT_IE];
 };
 struct ieee80211req_wpaie2 {
 	uint8_t		wpa_macaddr[IEEE80211_ADDR_LEN];
 	uint8_t		wpa_ie[IEEE80211_MAX_OPT_IE];
 	uint8_t		rsn_ie[IEEE80211_MAX_OPT_IE];
 };
 
 /*
  * Retrieve per-node statistics.
  */
 struct ieee80211req_sta_stats {
 	union {
 		/* NB: explicitly force 64-bit alignment */
 		uint8_t		macaddr[IEEE80211_ADDR_LEN];
 		uint64_t	pad;
 	} is_u;
 	struct ieee80211_nodestats is_stats;
 };
 
 /*
  * Station information block; the mac address is used
  * to retrieve other data like stats, unicast key, etc.
  */
 struct ieee80211req_sta_info {
 	uint16_t	isi_len;		/* total length (mult of 4) */
 	uint16_t	isi_ie_off;		/* offset to IE data */
 	uint16_t	isi_ie_len;		/* IE length */
 	uint16_t	isi_freq;		/* MHz */
 	uint32_t	isi_flags;		/* channel flags */
 	uint32_t	isi_state;		/* state flags */
 	uint8_t		isi_authmode;		/* authentication algorithm */
 	int8_t		isi_rssi;		/* receive signal strength */
 	int8_t		isi_noise;		/* noise floor */
 	uint8_t		isi_capinfo;		/* capabilities */
 	uint8_t		isi_erp;		/* ERP element */
 	uint8_t		isi_macaddr[IEEE80211_ADDR_LEN];
 	uint8_t		isi_nrates;
 						/* negotiated rates */
 	uint8_t		isi_rates[IEEE80211_RATE_MAXSIZE];
 	uint8_t		isi_txrate;		/* legacy/IEEE rate or MCS */
 	uint16_t	isi_associd;		/* assoc response */
 	uint16_t	isi_txpower;		/* current tx power */
 	uint16_t	isi_vlan;		/* vlan tag */
 	/* NB: [IEEE80211_NONQOS_TID] holds seq#'s for non-QoS stations */
 	uint16_t	isi_txseqs[IEEE80211_TID_SIZE];/* tx seq #/TID */
 	uint16_t	isi_rxseqs[IEEE80211_TID_SIZE];/* rx seq#/TID */
 	uint16_t	isi_inact;		/* inactivity timer */
 	uint16_t	isi_txmbps;		/* current tx rate in .5 Mb/s */
 	uint16_t	isi_pad;
 	uint32_t	isi_jointime;		/* time of assoc/join */
 	struct ieee80211_mimo_info isi_mimo;	/* MIMO info for 11n sta's */
 	/* 11s info */
 	uint16_t	isi_peerid;
 	uint16_t	isi_localid;
 	uint8_t		isi_peerstate;
 	/* XXX frag state? */
 	/* variable length IE data */
 };
 
 /*
  * Retrieve per-station information; to retrieve all
  * specify a mac address of ff:ff:ff:ff:ff:ff.
  */
 struct ieee80211req_sta_req {
 	union {
 		/* NB: explicitly force 64-bit alignment */
 		uint8_t		macaddr[IEEE80211_ADDR_LEN];
 		uint64_t	pad;
 	} is_u;
 	struct ieee80211req_sta_info info[1];	/* variable length */
 };
 
 /*
  * Get/set per-station tx power cap.
  */
 struct ieee80211req_sta_txpow {
 	uint8_t		it_macaddr[IEEE80211_ADDR_LEN];
 	uint8_t		it_txpow;
 };
 
 /*
  * WME parameters manipulated with IEEE80211_IOC_WME_CWMIN
  * through IEEE80211_IOC_WME_ACKPOLICY are set and return
  * using i_val and i_len.  i_val holds the value itself.
  * i_len specifies the AC and, as appropriate, then high bit
  * specifies whether the operation is to be applied to the
  * BSS or ourself.
  */
 #define	IEEE80211_WMEPARAM_SELF	0x0000		/* parameter applies to self */
 #define	IEEE80211_WMEPARAM_BSS	0x8000		/* parameter applies to BSS */
 #define	IEEE80211_WMEPARAM_VAL	0x7fff		/* parameter value */
 
 /*
  * Application Information Elements can be appended to a variety
  * of frames with the IEE80211_IOC_APPIE request.  This request
  * piggybacks on a normal ieee80211req; the frame type is passed
  * in i_val as the 802.11 FC0 bytes and the length of the IE data
  * is passed in i_len.  The data is referenced in i_data.  If i_len
  * is zero then any previously configured IE data is removed.  At
  * most IEEE80211_MAX_APPIE data be appened.  Note that multiple
  * IE's can be supplied; the data is treated opaquely.
  */
 #define	IEEE80211_MAX_APPIE	1024		/* max app IE data */
 /*
  * Hack: the WPA authenticator uses this mechanism to specify WPA
  * ie's that are used instead of the ones normally constructed using
  * the cipher state setup with separate ioctls.  This avoids issues
  * like the authenticator ordering ie data differently than the
  * net80211 layer and needing to keep separate state for WPA and RSN.
  */
 #define	IEEE80211_APPIE_WPA \
 	(IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_BEACON | \
 	 IEEE80211_FC0_SUBTYPE_PROBE_RESP)
 
 /*
  * Station mode roaming parameters.  These are maintained
  * per band/mode and control the roaming algorithm.
  */
 struct ieee80211_roamparams_req {
 	struct ieee80211_roamparam params[IEEE80211_MODE_MAX];
 };
 
 /*
  * Transmit parameters.  These can be used to set fixed transmit
  * rate for each operating mode when operating as client or on a
  * per-client basis according to the capabilities of the client
  * (e.g. an 11b client associated to an 11g ap) when operating as
  * an ap.
  *
  * MCS are distinguished from legacy rates by or'ing in 0x80.
  */
 struct ieee80211_txparams_req {
 	struct ieee80211_txparam params[IEEE80211_MODE_MAX];
 };
 
 /*
  * Set regulatory domain state with IEEE80211_IOC_REGDOMAIN.
  * Note this is both the regulatory description and the channel
  * list.  The get request for IEEE80211_IOC_REGDOMAIN returns
  * only the regdomain info; the channel list is obtained
  * separately with IEEE80211_IOC_CHANINFO.
  */
 struct ieee80211_regdomain_req {
 	struct ieee80211_regdomain	rd;
 	struct ieee80211req_chaninfo	chaninfo;
 };
 #define	IEEE80211_REGDOMAIN_SIZE(_nchan) \
 	(sizeof(struct ieee80211_regdomain_req) + \
 	 (((_nchan)-1) * sizeof(struct ieee80211_channel)))
 #define	IEEE80211_REGDOMAIN_SPACE(_req) \
 	IEEE80211_REGDOMAIN_SIZE((_req)->chaninfo.ic_nchans)
 
 /*
  * Get driver capabilities.  Driver, hardware crypto, and
  * HT/802.11n capabilities, and a table that describes what
  * the radio can do.
  */
 struct ieee80211_devcaps_req {
 	uint32_t	dc_drivercaps;		/* general driver caps */
 	uint32_t	dc_cryptocaps;		/* hardware crypto support */
 	uint32_t	dc_htcaps;		/* HT/802.11n support */
+	uint32_t	dc_vhtcaps;		/* VHT/802.11ac capabilities */
 	struct ieee80211req_chaninfo dc_chaninfo;
 };
 #define	IEEE80211_DEVCAPS_SIZE(_nchan) \
 	(sizeof(struct ieee80211_devcaps_req) + \
 	 (((_nchan)-1) * sizeof(struct ieee80211_channel)))
 #define	IEEE80211_DEVCAPS_SPACE(_dc) \
 	IEEE80211_DEVCAPS_SIZE((_dc)->dc_chaninfo.ic_nchans)
 
 struct ieee80211_chanswitch_req {
 	struct ieee80211_channel csa_chan;	/* new channel */
 	int		csa_mode;		/* CSA mode */
 	int		csa_count;		/* beacon count to switch */
 };
 
 /*
  * Get/set per-station vlan tag.
  */
 struct ieee80211req_sta_vlan {
 	uint8_t		sv_macaddr[IEEE80211_ADDR_LEN];
 	uint16_t	sv_vlan;
 };
 
 #ifdef __FreeBSD__
 /*
  * FreeBSD-style ioctls.
  */
 /* the first member must be matched with struct ifreq */
 struct ieee80211req {
 	char		i_name[IFNAMSIZ];	/* if_name, e.g. "wi0" */
 	uint16_t	i_type;			/* req type */
 	int16_t		i_val;			/* Index or simple value */
 	uint16_t	i_len;			/* Index or simple value */
 	void		*i_data;		/* Extra data */
 };
 #define	SIOCS80211		 _IOW('i', 234, struct ieee80211req)
 #define	SIOCG80211		_IOWR('i', 235, struct ieee80211req)
 #define	SIOCG80211STATS		_IOWR('i', 236, struct ifreq)
 
 #define IEEE80211_IOC_SSID		1
 #define IEEE80211_IOC_NUMSSIDS		2
 #define IEEE80211_IOC_WEP		3
 #define 	IEEE80211_WEP_NOSUP	-1
 #define 	IEEE80211_WEP_OFF	0
 #define 	IEEE80211_WEP_ON	1
 #define 	IEEE80211_WEP_MIXED	2
 #define IEEE80211_IOC_WEPKEY		4
 #define IEEE80211_IOC_NUMWEPKEYS	5
 #define IEEE80211_IOC_WEPTXKEY		6
 #define IEEE80211_IOC_AUTHMODE		7
 #define IEEE80211_IOC_STATIONNAME	8
 #define IEEE80211_IOC_CHANNEL		9
 #define IEEE80211_IOC_POWERSAVE		10
 #define 	IEEE80211_POWERSAVE_NOSUP	-1
 #define 	IEEE80211_POWERSAVE_OFF		0
 #define 	IEEE80211_POWERSAVE_CAM		1
 #define 	IEEE80211_POWERSAVE_PSP		2
 #define 	IEEE80211_POWERSAVE_PSP_CAM	3
 #define 	IEEE80211_POWERSAVE_ON		IEEE80211_POWERSAVE_CAM
 #define IEEE80211_IOC_POWERSAVESLEEP	11
 #define	IEEE80211_IOC_RTSTHRESHOLD	12
 #define IEEE80211_IOC_PROTMODE		13
 #define 	IEEE80211_PROTMODE_OFF		0
 #define 	IEEE80211_PROTMODE_CTS		1
 #define 	IEEE80211_PROTMODE_RTSCTS	2
 #define	IEEE80211_IOC_TXPOWER		14	/* global tx power limit */
 #define	IEEE80211_IOC_BSSID		15
 #define	IEEE80211_IOC_ROAMING		16	/* roaming mode */
 #define	IEEE80211_IOC_PRIVACY		17	/* privacy invoked */
 #define	IEEE80211_IOC_DROPUNENCRYPTED	18	/* discard unencrypted frames */
 #define	IEEE80211_IOC_WPAKEY		19
 #define	IEEE80211_IOC_DELKEY		20
 #define	IEEE80211_IOC_MLME		21
 /* 22 was IEEE80211_IOC_OPTIE, replaced by IEEE80211_IOC_APPIE */
 /* 23 was IEEE80211_IOC_SCAN_REQ */
 /* 24 was IEEE80211_IOC_SCAN_RESULTS */
 #define	IEEE80211_IOC_COUNTERMEASURES	25	/* WPA/TKIP countermeasures */
 #define	IEEE80211_IOC_WPA		26	/* WPA mode (0,1,2) */
 #define	IEEE80211_IOC_CHANLIST		27	/* channel list */
 #define	IEEE80211_IOC_WME		28	/* WME mode (on, off) */
 #define	IEEE80211_IOC_HIDESSID		29	/* hide SSID mode (on, off) */
 #define	IEEE80211_IOC_APBRIDGE		30	/* AP inter-sta bridging */
 /* 31-35,37-38 were for WPA authenticator settings */
 /* 36 was IEEE80211_IOC_DRIVER_CAPS */
 #define	IEEE80211_IOC_WPAIE		39	/* WPA information element */
 #define	IEEE80211_IOC_STA_STATS		40	/* per-station statistics */
 #define	IEEE80211_IOC_MACCMD		41	/* MAC ACL operation */
 #define	IEEE80211_IOC_CHANINFO		42	/* channel info list */
 #define	IEEE80211_IOC_TXPOWMAX		43	/* max tx power for channel */
 #define	IEEE80211_IOC_STA_TXPOW		44	/* per-station tx power limit */
 /* 45 was IEEE80211_IOC_STA_INFO */
 #define	IEEE80211_IOC_WME_CWMIN		46	/* WME: ECWmin */
 #define	IEEE80211_IOC_WME_CWMAX		47	/* WME: ECWmax */
 #define	IEEE80211_IOC_WME_AIFS		48	/* WME: AIFSN */
 #define	IEEE80211_IOC_WME_TXOPLIMIT	49	/* WME: txops limit */
 #define	IEEE80211_IOC_WME_ACM		50	/* WME: ACM (bss only) */
 #define	IEEE80211_IOC_WME_ACKPOLICY	51	/* WME: ACK policy (!bss only)*/
 #define	IEEE80211_IOC_DTIM_PERIOD	52	/* DTIM period (beacons) */
 #define	IEEE80211_IOC_BEACON_INTERVAL	53	/* beacon interval (ms) */
 #define	IEEE80211_IOC_ADDMAC		54	/* add sta to MAC ACL table */
 #define	IEEE80211_IOC_DELMAC		55	/* del sta from MAC ACL table */
 #define	IEEE80211_IOC_PUREG		56	/* pure 11g (no 11b stations) */
 #define	IEEE80211_IOC_FF		57	/* ATH fast frames (on, off) */
 #define	IEEE80211_IOC_TURBOP		58	/* ATH turbo' (on, off) */
 #define	IEEE80211_IOC_BGSCAN		59	/* bg scanning (on, off) */
 #define	IEEE80211_IOC_BGSCAN_IDLE	60	/* bg scan idle threshold */
 #define	IEEE80211_IOC_BGSCAN_INTERVAL	61	/* bg scan interval */
 #define	IEEE80211_IOC_SCANVALID		65	/* scan cache valid threshold */
 /* 66-72 were IEEE80211_IOC_ROAM_* and IEEE80211_IOC_MCAST_RATE */
 #define	IEEE80211_IOC_FRAGTHRESHOLD	73	/* tx fragmentation threshold */
 #define	IEEE80211_IOC_BURST		75	/* packet bursting */
 #define	IEEE80211_IOC_SCAN_RESULTS	76	/* get scan results */
 #define	IEEE80211_IOC_BMISSTHRESHOLD	77	/* beacon miss threshold */
 #define	IEEE80211_IOC_STA_INFO		78	/* station/neighbor info */
 #define	IEEE80211_IOC_WPAIE2		79	/* WPA+RSN info elements */
 #define	IEEE80211_IOC_CURCHAN		80	/* current channel */
 #define	IEEE80211_IOC_SHORTGI		81	/* 802.11n half GI */
 #define	IEEE80211_IOC_AMPDU		82	/* 802.11n A-MPDU (on, off) */
 #define	IEEE80211_IOC_AMPDU_LIMIT	83	/* A-MPDU length limit */
 #define	IEEE80211_IOC_AMPDU_DENSITY	84	/* A-MPDU density */
 #define	IEEE80211_IOC_AMSDU		85	/* 802.11n A-MSDU (on, off) */
 #define	IEEE80211_IOC_AMSDU_LIMIT	86	/* A-MSDU length limit */
 #define	IEEE80211_IOC_PUREN		87	/* pure 11n (no legacy sta's) */
 #define	IEEE80211_IOC_DOTH		88	/* 802.11h (on, off) */
 /* 89-91 were regulatory items */
 #define	IEEE80211_IOC_HTCOMPAT		92	/* support pre-D1.10 HT ie's */
 #define	IEEE80211_IOC_DWDS		93	/* DWDS/4-address handling */
 #define	IEEE80211_IOC_INACTIVITY	94	/* sta inactivity handling */
 #define	IEEE80211_IOC_APPIE		95	/* application IE's */
 #define	IEEE80211_IOC_WPS		96	/* WPS operation */
 #define	IEEE80211_IOC_TSN		97	/* TSN operation */
 #define	IEEE80211_IOC_DEVCAPS		98	/* driver+device capabilities */
 #define	IEEE80211_IOC_CHANSWITCH	99	/* start 11h channel switch */
 #define	IEEE80211_IOC_DFS		100	/* DFS (on, off) */
 #define	IEEE80211_IOC_DOTD		101	/* 802.11d (on, off) */
 #define IEEE80211_IOC_HTPROTMODE	102	/* HT protection (off, rts) */
 #define	IEEE80211_IOC_SCAN_REQ		103	/* scan w/ specified params */
 #define	IEEE80211_IOC_SCAN_CANCEL	104	/* cancel ongoing scan */
 #define	IEEE80211_IOC_HTCONF		105	/* HT config (off, HT20, HT40)*/
 #define	IEEE80211_IOC_REGDOMAIN		106	/* regulatory domain info */
 #define	IEEE80211_IOC_ROAM		107	/* roaming params en masse */
 #define	IEEE80211_IOC_TXPARAMS		108	/* tx parameters */
 #define	IEEE80211_IOC_STA_VLAN		109	/* per-station vlan tag */
 #define	IEEE80211_IOC_SMPS		110	/* MIMO power save */
 #define	IEEE80211_IOC_RIFS		111	/* RIFS config (on, off) */
 #define	IEEE80211_IOC_GREENFIELD	112	/* Greenfield (on, off) */
 #define	IEEE80211_IOC_STBC		113	/* STBC Tx/RX (on, off) */
 #define	IEEE80211_IOC_LDPC		114	/* LDPC Tx/RX (on, off) */
+
+/* VHT */
+#define	IEEE80211_IOC_VHTCONF		130	/* VHT config (off, on; widths) */
 
 #define	IEEE80211_IOC_MESH_ID		170	/* mesh identifier */
 #define	IEEE80211_IOC_MESH_AP		171	/* accepting peerings */
 #define	IEEE80211_IOC_MESH_FWRD		172	/* forward frames */
 #define	IEEE80211_IOC_MESH_PROTO	173	/* mesh protocols */
 #define	IEEE80211_IOC_MESH_TTL		174	/* mesh TTL */
 #define	IEEE80211_IOC_MESH_RTCMD	175	/* mesh routing table commands*/
 #define	IEEE80211_IOC_MESH_PR_METRIC	176	/* mesh metric protocol */
 #define	IEEE80211_IOC_MESH_PR_PATH	177	/* mesh path protocol */
 #define	IEEE80211_IOC_MESH_PR_SIG	178	/* mesh sig protocol */
 #define	IEEE80211_IOC_MESH_PR_CC	179	/* mesh congestion protocol */
 #define	IEEE80211_IOC_MESH_PR_AUTH	180	/* mesh auth protocol */
 #define	IEEE80211_IOC_MESH_GATE		181	/* mesh gate XXX: 173? */
 
 #define	IEEE80211_IOC_HWMP_ROOTMODE	190	/* HWMP root mode */
 #define	IEEE80211_IOC_HWMP_MAXHOPS	191	/* number of hops before drop */
 #define	IEEE80211_IOC_HWMP_TTL		192	/* HWMP TTL */
 
 #define	IEEE80211_IOC_TDMA_SLOT		201	/* TDMA: assigned slot */
 #define	IEEE80211_IOC_TDMA_SLOTCNT	202	/* TDMA: slots in bss */
 #define	IEEE80211_IOC_TDMA_SLOTLEN	203	/* TDMA: slot length (usecs) */
 #define	IEEE80211_IOC_TDMA_BINTERVAL	204	/* TDMA: beacon intvl (slots) */
 
 #define	IEEE80211_IOC_QUIET		205	/* Quiet Enable/Disable */
 #define	IEEE80211_IOC_QUIET_PERIOD	206	/* Quiet Period */
 #define	IEEE80211_IOC_QUIET_OFFSET	207	/* Quiet Offset */
 #define	IEEE80211_IOC_QUIET_DUR		208	/* Quiet Duration */
 #define	IEEE80211_IOC_QUIET_COUNT	209	/* Quiet Count */
 /*
  * Parameters for controlling a scan requested with
  * IEEE80211_IOC_SCAN_REQ.
  *
  * Active scans cause ProbeRequest frames to be issued for each
  * specified ssid and, by default, a broadcast ProbeRequest frame.
  * The set of ssid's is specified in the request.
  *
  * By default the scan will cause a BSS to be joined (in station/adhoc
  * mode) or a channel to be selected for operation (hostap mode).
  * To disable that specify IEEE80211_IOC_SCAN_NOPICK and if the
  *
  * If the station is currently associated to an AP then a scan request
  * will cause the station to leave the current channel and potentially
  * miss frames from the AP.  Alternatively the station may notify the
  * AP that it is going into power save mode before it leaves the channel.
  * This ensures frames for the station are buffered by the AP.  This is
  * termed a ``bg scan'' and is requested with the IEEE80211_IOC_SCAN_BGSCAN
  * flag.  Background scans may take longer than foreground scans and may
  * be preempted by traffic.  If a station is not associated to an AP
  * then a request for a background scan is automatically done in the
  * foreground.
  *
  * The results of the scan request are cached by the system.  This
  * information is aged out and/or invalidated based on events like not
  * being able to associated to an AP.  To flush the current cache
  * contents before doing a scan the IEEE80211_IOC_SCAN_FLUSH flag may
  * be specified.
  *
  * By default the scan will be done until a suitable AP is located
  * or a channel is found for use.  A scan can also be constrained
  * to be done once (IEEE80211_IOC_SCAN_ONCE) or to last for no more
  * than a specified duration.
  */
 struct ieee80211_scan_req {
 	int		sr_flags;
 #define	IEEE80211_IOC_SCAN_NOPICK	0x00001	/* scan only, no selection */
 #define	IEEE80211_IOC_SCAN_ACTIVE	0x00002	/* active scan (probe req) */
 #define	IEEE80211_IOC_SCAN_PICK1ST	0x00004	/* ``hey sailor'' mode */
 #define	IEEE80211_IOC_SCAN_BGSCAN	0x00008	/* bg scan, exit ps at end */
 #define	IEEE80211_IOC_SCAN_ONCE		0x00010	/* do one complete pass */
 #define	IEEE80211_IOC_SCAN_NOBCAST	0x00020	/* don't send bcast probe req */
 #define	IEEE80211_IOC_SCAN_NOJOIN	0x00040	/* no auto-sequencing */
 #define	IEEE80211_IOC_SCAN_FLUSH	0x10000	/* flush scan cache first */
 #define	IEEE80211_IOC_SCAN_CHECK	0x20000	/* check scan cache first */
 	u_int		sr_duration;		/* duration (ms) */
 #define	IEEE80211_IOC_SCAN_DURATION_MIN	1
 #define	IEEE80211_IOC_SCAN_DURATION_MAX	0x7fffffff
 #define	IEEE80211_IOC_SCAN_FOREVER	IEEE80211_IOC_SCAN_DURATION_MAX
 	u_int		sr_mindwell;		/* min channel dwelltime (ms) */
 	u_int		sr_maxdwell;		/* max channel dwelltime (ms) */
 	int		sr_nssid;
 #define	IEEE80211_IOC_SCAN_MAX_SSID	3
 	struct {
 		int	 len;				/* length in bytes */
 		uint8_t ssid[IEEE80211_NWID_LEN];	/* ssid contents */
 	} sr_ssid[IEEE80211_IOC_SCAN_MAX_SSID];
 };
 
 /*
  * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS.
  * Each result is a fixed size structure followed by a variable
  * length SSID and one or more variable length information elements.
  * The size of each variable length item is found in the fixed
  * size structure and the entire length of the record is specified
  * in isr_len.  Result records are rounded to a multiple of 4 bytes.
  */
 struct ieee80211req_scan_result {
 	uint16_t	isr_len;		/* total length (mult of 4) */
 	uint16_t	isr_ie_off;		/* offset to SSID+IE data */
 	uint16_t	isr_ie_len;		/* IE length */
 	uint16_t	isr_freq;		/* MHz */
 	uint16_t	isr_flags;		/* channel flags */
 	int8_t		isr_noise;
 	int8_t		isr_rssi;
 	uint16_t	isr_intval;		/* beacon interval */
 	uint8_t		isr_capinfo;		/* capabilities */
 	uint8_t		isr_erp;		/* ERP element */
 	uint8_t		isr_bssid[IEEE80211_ADDR_LEN];
 	uint8_t		isr_nrates;
 	uint8_t		isr_rates[IEEE80211_RATE_MAXSIZE];
 	uint8_t		isr_ssid_len;		/* SSID length */
 	uint8_t		isr_meshid_len;		/* MESH ID length */
 	/* variable length SSID, followed by variable length MESH ID,
 	  followed by IE data */
 };
 
 /*
  * Virtual AP cloning parameters.  The parent device must
  * be a vap-capable device.  All parameters specified with
  * the clone request are fixed for the lifetime of the vap.
  *
  * There are two flavors of WDS vaps: legacy and dynamic.
  * Legacy WDS operation implements a static binding between
  * two stations encapsulating traffic in 4-address frames.
  * Dynamic WDS vaps are created when a station associates to
  * an AP and sends a 4-address frame.  If the AP vap is
  * configured to support WDS then this will generate an
  * event to user programs listening on the routing socket
  * and a Dynamic WDS vap will be created to handle traffic
  * to/from that station.  In both cases the bssid of the
  * peer must be specified when creating the vap.
  *
  * By default a vap will inherit the mac address/bssid of
  * the underlying device.  To request a unique address the
  * IEEE80211_CLONE_BSSID flag should be supplied.  This is
  * meaningless for WDS vaps as they share the bssid of an
  * AP vap that must otherwise exist.  Note that some devices
  * may not be able to support multiple addresses.
  *
  * Station mode vap's normally depend on the device to notice
  * when the AP stops sending beacon frames.  If IEEE80211_CLONE_NOBEACONS
  * is specified the net80211 layer will do this in s/w.  This
  * is mostly useful when setting up a WDS repeater/extender where
  * an AP vap is combined with a sta vap and the device isn't able
  * to track beacon frames in hardware.
  */
 struct ieee80211_clone_params {
 	char	icp_parent[IFNAMSIZ];		/* parent device */
 	uint16_t icp_opmode;			/* operating mode */
 	uint16_t icp_flags;			/* see below */
 	uint8_t	icp_bssid[IEEE80211_ADDR_LEN];	/* for WDS links */
 	uint8_t	icp_macaddr[IEEE80211_ADDR_LEN];/* local address */
 };
 #define	IEEE80211_CLONE_BSSID		0x0001	/* allocate unique mac/bssid */
 #define	IEEE80211_CLONE_NOBEACONS	0x0002	/* don't setup beacon timers */
 #define	IEEE80211_CLONE_WDSLEGACY	0x0004	/* legacy WDS processing */
 #define	IEEE80211_CLONE_MACADDR		0x0008	/* use specified mac addr */
 #define	IEEE80211_CLONE_TDMA		0x0010	/* operate in TDMA mode */
 #endif /* __FreeBSD__ */
 
 #endif /* _NET80211_IEEE80211_IOCTL_H_ */
Index: projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_node.h
===================================================================
--- projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_node.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_node.h	(revision 311637)
@@ -1,485 +1,488 @@
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 #ifndef _NET80211_IEEE80211_NODE_H_
 #define _NET80211_IEEE80211_NODE_H_
 
 #include <net80211/ieee80211_ioctl.h>		/* for ieee80211_nodestats */
 #include <net80211/ieee80211_ht.h>		/* for aggregation state */
 
 /*
  * Each ieee80211com instance has a single timer that fires every
  * IEEE80211_INACT_WAIT seconds to handle "inactivity processing".
  * This is used to do node inactivity processing when operating
  * as an AP, adhoc or mesh mode.  For inactivity processing each node
  * has a timeout set in its ni_inact field that is decremented
  * on each timeout and the node is reclaimed when the counter goes
  * to zero.  We use different inactivity timeout values depending
  * on whether the node is associated and authorized (either by
  * 802.1x or open/shared key authentication) or associated but yet
  * to be authorized.  The latter timeout is shorter to more aggressively
  * reclaim nodes that leave part way through the 802.1x exchange.
  */
 #define	IEEE80211_INACT_WAIT	15		/* inactivity interval (secs) */
 #define	IEEE80211_INACT_INIT	(30/IEEE80211_INACT_WAIT)	/* initial */
 #define	IEEE80211_INACT_AUTH	(180/IEEE80211_INACT_WAIT)	/* associated but not authorized */
 #define	IEEE80211_INACT_RUN	(300/IEEE80211_INACT_WAIT)	/* authorized */
 #define	IEEE80211_INACT_PROBE	(30/IEEE80211_INACT_WAIT)	/* probe */
 #define	IEEE80211_INACT_SCAN	(300/IEEE80211_INACT_WAIT)	/* scanned */
 
 #define	IEEE80211_TRANS_WAIT 	2		/* mgt frame tx timer (secs) */
 
 /* threshold for aging overlapping non-ERP bss */
 #define	IEEE80211_NONERP_PRESENT_AGE	msecs_to_ticks(60*1000)
 
 #define	IEEE80211_NODE_HASHSIZE	32		/* NB: hash size must be pow2 */
 /* simple hash is enough for variation of macaddr */
 #define	IEEE80211_NODE_HASH(ic, addr)	\
 	(((const uint8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % \
 		IEEE80211_NODE_HASHSIZE)
 
 struct ieee80211_node_table;
 struct ieee80211com;
 struct ieee80211vap;
 struct ieee80211_scanparams;
 
 /*
  * Information element ``blob''.  We use this structure
  * to capture management frame payloads that need to be
  * retained.  Information elements within the payload that
  * we need to consult have references recorded.
  */
 struct ieee80211_ies {
 	/* the following are either NULL or point within data */
 	uint8_t	*wpa_ie;	/* captured WPA ie */
 	uint8_t	*rsn_ie;	/* captured RSN ie */
 	uint8_t	*wme_ie;	/* captured WME ie */
 	uint8_t	*ath_ie;	/* captured Atheros ie */
 	uint8_t	*htcap_ie;	/* captured HTCAP ie */
 	uint8_t	*htinfo_ie;	/* captured HTINFO ie */
 	uint8_t	*tdma_ie;	/* captured TDMA ie */
 	uint8_t *meshid_ie;	/* captured MESH ID ie */
 	uint8_t	*vhtcap_ie;	/* captured VHTCAP ie */
 	uint8_t	*vhtopmode_ie;	/* captured VHTOPMODE ie */
 	uint8_t	*vhtpwrenv_ie;	/* captured VHTPWRENV ie */
 	uint8_t	*apchanrep_ie;	/* captured APCHANREP ie */
 	uint8_t	*bssload_ie;	/* captured BSSLOAD ie */
 	uint8_t	*spare[4];
 	/* NB: these must be the last members of this structure */
 	uint8_t	*data;		/* frame data > 802.11 header */
 	int	len;		/* data size in bytes */
 };
 
 /*
  * 802.11s (Mesh) Peer Link FSM state.
  */
 enum ieee80211_mesh_mlstate {
 	IEEE80211_NODE_MESH_IDLE	= 0,
 	IEEE80211_NODE_MESH_OPENSNT	= 1,	/* open frame sent */
 	IEEE80211_NODE_MESH_OPENRCV	= 2,	/* open frame received */
 	IEEE80211_NODE_MESH_CONFIRMRCV	= 3,	/* confirm frame received */
 	IEEE80211_NODE_MESH_ESTABLISHED	= 4,	/* link established */
 	IEEE80211_NODE_MESH_HOLDING	= 5,	/* link closing */
 };
 #define	IEEE80211_MESH_MLSTATE_BITS \
 	"\20\1IDLE\2OPENSNT\2OPENRCV\3CONFIRMRCV\4ESTABLISHED\5HOLDING"
 
 /*
  * Node specific information.  Note that drivers are expected
  * to derive from this structure to add device-specific per-node
  * state.  This is done by overriding the ic_node_* methods in
  * the ieee80211com structure.
  */
 struct ieee80211_node {
 	struct ieee80211vap	*ni_vap;	/* associated vap */
 	struct ieee80211com	*ni_ic;		/* copy from vap to save deref*/
 	struct ieee80211_node_table *ni_table;	/* NB: may be NULL */
 	TAILQ_ENTRY(ieee80211_node) ni_list;	/* list of all nodes */
 	LIST_ENTRY(ieee80211_node) ni_hash;	/* hash collision list */
 	u_int			ni_refcnt;	/* count of held references */
 	u_int			ni_flags;
 #define	IEEE80211_NODE_AUTH	0x000001	/* authorized for data */
 #define	IEEE80211_NODE_QOS	0x000002	/* QoS enabled */
 #define	IEEE80211_NODE_ERP	0x000004	/* ERP enabled */
 /* NB: this must have the same value as IEEE80211_FC1_PWR_MGT */
 #define	IEEE80211_NODE_PWR_MGT	0x000010	/* power save mode enabled */
 #define	IEEE80211_NODE_AREF	0x000020	/* authentication ref held */
 #define	IEEE80211_NODE_HT	0x000040	/* HT enabled */
 #define	IEEE80211_NODE_HTCOMPAT	0x000080	/* HT setup w/ vendor OUI's */
 #define	IEEE80211_NODE_WPS	0x000100	/* WPS association */
 #define	IEEE80211_NODE_TSN	0x000200	/* TSN association */
 #define	IEEE80211_NODE_AMPDU_RX	0x000400	/* AMPDU rx enabled */
 #define	IEEE80211_NODE_AMPDU_TX	0x000800	/* AMPDU tx enabled */
 #define	IEEE80211_NODE_MIMO_PS	0x001000	/* MIMO power save enabled */
 #define	IEEE80211_NODE_MIMO_RTS	0x002000	/* send RTS in MIMO PS */
 #define	IEEE80211_NODE_RIFS	0x004000	/* RIFS enabled */
 #define	IEEE80211_NODE_SGI20	0x008000	/* Short GI in HT20 enabled */
 #define	IEEE80211_NODE_SGI40	0x010000	/* Short GI in HT40 enabled */
 #define	IEEE80211_NODE_ASSOCID	0x020000	/* xmit requires associd */
 #define	IEEE80211_NODE_AMSDU_RX	0x040000	/* AMSDU rx enabled */
 #define	IEEE80211_NODE_AMSDU_TX	0x080000	/* AMSDU tx enabled */
+#define	IEEE80211_NODE_VHT	0x100000	/* VHT enabled */
 	uint16_t		ni_associd;	/* association ID */
 	uint16_t		ni_vlan;	/* vlan tag */
 	uint16_t		ni_txpower;	/* current transmit power */
 	uint8_t			ni_authmode;	/* authentication algorithm */
 	uint8_t			ni_ath_flags;	/* Atheros feature flags */
 	/* NB: These must have the same values as IEEE80211_ATHC_* */
 #define IEEE80211_NODE_TURBOP	0x0001		/* Turbo prime enable */
 #define IEEE80211_NODE_COMP	0x0002		/* Compresssion enable */
 #define IEEE80211_NODE_FF	0x0004          /* Fast Frame capable */
 #define IEEE80211_NODE_XR	0x0008		/* Atheros WME enable */
 #define IEEE80211_NODE_AR	0x0010		/* AR capable */
 #define IEEE80211_NODE_BOOST	0x0080		/* Dynamic Turbo boosted */
 	uint16_t		ni_ath_defkeyix;/* Atheros def key index */
 	const struct ieee80211_txparam *ni_txparms;
 	uint32_t		ni_jointime;	/* time of join (secs) */
 	uint32_t		*ni_challenge;	/* shared-key challenge */
 	struct ieee80211_ies	ni_ies;		/* captured ie's */
 						/* tx seq per-tid */
 	ieee80211_seq		ni_txseqs[IEEE80211_TID_SIZE];
 						/* rx seq previous per-tid*/
 	ieee80211_seq		ni_rxseqs[IEEE80211_TID_SIZE];
 	uint32_t		ni_rxfragstamp;	/* time stamp of last rx frag */
 	struct mbuf		*ni_rxfrag[3];	/* rx frag reassembly */
 	struct ieee80211_key	ni_ucastkey;	/* unicast key */
 
 	/* hardware */
 	uint32_t		ni_avgrssi;	/* recv ssi state */
 	int8_t			ni_noise;	/* noise floor */
 
 	/* mimo statistics */
 	uint32_t		ni_mimo_rssi_ctl[IEEE80211_MAX_CHAINS];
 	uint32_t		ni_mimo_rssi_ext[IEEE80211_MAX_CHAINS];
 	uint8_t			ni_mimo_noise_ctl[IEEE80211_MAX_CHAINS];
 	uint8_t			ni_mimo_noise_ext[IEEE80211_MAX_CHAINS];
 	uint8_t			ni_mimo_chains;
 
 	/* header */
 	uint8_t			ni_macaddr[IEEE80211_ADDR_LEN];
 	uint8_t			ni_bssid[IEEE80211_ADDR_LEN];
 
 	/* beacon, probe response */
 	union {
 		uint8_t		data[8];
 		u_int64_t	tsf;
 	} ni_tstamp;				/* from last rcv'd beacon */
 	uint16_t		ni_intval;	/* beacon interval */
 	uint16_t		ni_capinfo;	/* capabilities */
 	uint8_t			ni_esslen;
 	uint8_t			ni_essid[IEEE80211_NWID_LEN];
 	struct ieee80211_rateset ni_rates;	/* negotiated rate set */
 	struct ieee80211_channel *ni_chan;
 	uint16_t		ni_fhdwell;	/* FH only */
 	uint8_t			ni_fhindex;	/* FH only */
 	uint16_t		ni_erp;		/* ERP from beacon/probe resp */
 	uint16_t		ni_timoff;	/* byte offset to TIM ie */
 	uint8_t			ni_dtim_period;	/* DTIM period */
 	uint8_t			ni_dtim_count;	/* DTIM count for last bcn */
 
 	/* 11s state */
 	uint8_t			ni_meshidlen;
 	uint8_t			ni_meshid[IEEE80211_MESHID_LEN];
 	enum ieee80211_mesh_mlstate ni_mlstate;	/* peering management state */
 	uint16_t		ni_mllid;	/* link local ID */
 	uint16_t		ni_mlpid;	/* link peer ID */
 	struct callout		ni_mltimer;	/* link mesh timer */
 	uint8_t			ni_mlrcnt;	/* link mesh retry counter */
 	uint8_t			ni_mltval;	/* link mesh timer value */
 	struct callout		ni_mlhtimer;	/* link mesh backoff timer */
 	uint8_t			ni_mlhcnt;	/* link mesh holding counter */
 
 	/* 11n state */
 	uint16_t		ni_htcap;	/* HT capabilities */
 	uint8_t			ni_htparam;	/* HT params */
 	uint8_t			ni_htctlchan;	/* HT control channel */
 	uint8_t			ni_ht2ndchan;	/* HT 2nd channel */
 	uint8_t			ni_htopmode;	/* HT operating mode */
 	uint8_t			ni_htstbc;	/* HT */
 	uint8_t			ni_chw;		/* negotiated channel width */
 	struct ieee80211_htrateset ni_htrates;	/* negotiated ht rate set */
 	struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_TID];
 	struct ieee80211_rx_ampdu ni_rx_ampdu[WME_NUM_TID];
 
 	/* VHT state */
 	uint32_t		ni_vhtcap;
-	uint32_t		ni_vhtinfo;
+	uint16_t		ni_vht_basicmcs;
+	uint16_t		ni_vht_pad2;
 	struct ieee80211_vht_mcs_info	ni_vht_mcsinfo;
 	uint8_t			ni_vht_chan1;	/* 20/40/80/160 - VHT chan1 */
 	uint8_t			ni_vht_chan2;	/* 80+80 - VHT chan2 */
-	uint16_t		ni_vht_pad1;
+	uint8_t			ni_vht_chanwidth;	/* IEEE80211_VHT_CHANWIDTH_ */
+	uint8_t			ni_vht_pad1;
 	uint32_t		ni_vht_spare[8];
 
 	/* fast-frames state */
 	struct mbuf *		ni_tx_superg[WME_NUM_TID];
 
 	/* others */
 	short			ni_inact;	/* inactivity mark count */
 	short			ni_inact_reload;/* inactivity reload value */
 	int			ni_txrate;	/* legacy rate/MCS */
 	struct ieee80211_psq	ni_psq;		/* power save queue */
 	struct ieee80211_nodestats ni_stats;	/* per-node statistics */
 
 	struct ieee80211vap	*ni_wdsvap;	/* associated WDS vap */
 	void			*ni_rctls;	/* private ratectl state */
 	uint64_t		ni_spare[3];
 };
 MALLOC_DECLARE(M_80211_NODE);
 MALLOC_DECLARE(M_80211_NODE_IE);
 
 #define	IEEE80211_NODE_ATH	(IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP)
 #define	IEEE80211_NODE_AMPDU \
 	(IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX)
 #define	IEEE80211_NODE_AMSDU \
 	(IEEE80211_NODE_AMSDU_RX | IEEE80211_NODE_AMSDU_TX)
 #define	IEEE80211_NODE_HT_ALL \
 	(IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT | \
 	 IEEE80211_NODE_AMPDU | IEEE80211_NODE_AMSDU | \
 	 IEEE80211_NODE_MIMO_PS | IEEE80211_NODE_MIMO_RTS | \
 	 IEEE80211_NODE_RIFS | IEEE80211_NODE_SGI20 | IEEE80211_NODE_SGI40)
 
 #define	IEEE80211_NODE_BITS \
 	"\20\1AUTH\2QOS\3ERP\5PWR_MGT\6AREF\7HT\10HTCOMPAT\11WPS\12TSN" \
 	"\13AMPDU_RX\14AMPDU_TX\15MIMO_PS\16MIMO_RTS\17RIFS\20SGI20\21SGI40" \
 	"\22ASSOCID"
 
 #define	IEEE80211_NODE_AID(ni)	IEEE80211_AID(ni->ni_associd)
 
 #define	IEEE80211_NODE_STAT(ni,stat)	(ni->ni_stats.ns_##stat++)
 #define	IEEE80211_NODE_STAT_ADD(ni,stat,v)	(ni->ni_stats.ns_##stat += v)
 #define	IEEE80211_NODE_STAT_SET(ni,stat,v)	(ni->ni_stats.ns_##stat = v)
 
 /*
  * Filtered rssi calculation support.  The receive rssi is maintained
  * as an average over the last 10 frames received using a low pass filter
  * (all frames for now, possibly need to be more selective).  Calculations
  * are designed such that a good compiler can optimize them.  The avg
  * rssi state should be initialized to IEEE80211_RSSI_DUMMY_MARKER and
  * each sample incorporated with IEEE80211_RSSI_LPF.  Use IEEE80211_RSSI_GET
  * to extract the current value.
  *
  * Note that we assume rssi data are in the range [-127..127] and we
  * discard values <-20.  This is consistent with assumptions throughout
  * net80211 that signal strength data are in .5 dBm units relative to
  * the current noise floor (linear, not log).
  */
 #define IEEE80211_RSSI_LPF_LEN		10
 #define	IEEE80211_RSSI_DUMMY_MARKER	127
 /* NB: pow2 to optimize out * and / */
 #define	IEEE80211_RSSI_EP_MULTIPLIER	(1<<7)
 #define IEEE80211_RSSI_IN(x)		((x) * IEEE80211_RSSI_EP_MULTIPLIER)
 #define _IEEE80211_RSSI_LPF(x, y, len) \
     (((x) != IEEE80211_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y))
 #define IEEE80211_RSSI_LPF(x, y) do {					\
     if ((y) >= -20) {							\
     	x = _IEEE80211_RSSI_LPF((x), IEEE80211_RSSI_IN((y)), 		\
 		IEEE80211_RSSI_LPF_LEN);				\
     }									\
 } while (0)
 #define	IEEE80211_RSSI_EP_RND(x, mul) \
 	((((x) % (mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))
 #define	IEEE80211_RSSI_GET(x) \
 	IEEE80211_RSSI_EP_RND(x, IEEE80211_RSSI_EP_MULTIPLIER)
 
 static __inline struct ieee80211_node *
 ieee80211_ref_node(struct ieee80211_node *ni)
 {
 	ieee80211_node_incref(ni);
 	return ni;
 }
 
 static __inline void
 ieee80211_unref_node(struct ieee80211_node **ni)
 {
 	ieee80211_node_decref(*ni);
 	*ni = NULL;			/* guard against use */
 }
 
 void	ieee80211_node_attach(struct ieee80211com *);
 void	ieee80211_node_lateattach(struct ieee80211com *);
 void	ieee80211_node_detach(struct ieee80211com *);
 void	ieee80211_node_vattach(struct ieee80211vap *);
 void	ieee80211_node_latevattach(struct ieee80211vap *);
 void	ieee80211_node_vdetach(struct ieee80211vap *);
 
 static __inline int
 ieee80211_node_is_authorized(const struct ieee80211_node *ni)
 {
 	return (ni->ni_flags & IEEE80211_NODE_AUTH);
 }
 
 void	ieee80211_node_authorize(struct ieee80211_node *);
 void	ieee80211_node_unauthorize(struct ieee80211_node *);
 
 void	ieee80211_node_setuptxparms(struct ieee80211_node *);
 void	ieee80211_node_set_chan(struct ieee80211_node *,
 		struct ieee80211_channel *);
 void	ieee80211_create_ibss(struct ieee80211vap*, struct ieee80211_channel *);
 void	ieee80211_reset_bss(struct ieee80211vap *);
 void	ieee80211_sync_curchan(struct ieee80211com *);
 void	ieee80211_setupcurchan(struct ieee80211com *,
 	    struct ieee80211_channel *);
 void	ieee80211_setcurchan(struct ieee80211com *, struct ieee80211_channel *);
 void	ieee80211_update_chw(struct ieee80211com *);
 int	ieee80211_ibss_merge_check(struct ieee80211_node *);
 int	ieee80211_ibss_node_check_new(struct ieee80211_node *ni,
 	    const struct ieee80211_scanparams *);
 int	ieee80211_ibss_merge(struct ieee80211_node *);
 struct ieee80211_scan_entry;
 int	ieee80211_sta_join(struct ieee80211vap *, struct ieee80211_channel *,
 		const struct ieee80211_scan_entry *);
 void	ieee80211_sta_leave(struct ieee80211_node *);
 void	ieee80211_node_deauth(struct ieee80211_node *, int);
 
 int	ieee80211_ies_init(struct ieee80211_ies *, const uint8_t *, int);
 void	ieee80211_ies_cleanup(struct ieee80211_ies *);
 void	ieee80211_ies_expand(struct ieee80211_ies *);
 #define	ieee80211_ies_setie(_ies, _ie, _off) do {		\
 	(_ies)._ie = (_ies).data + (_off);			\
 } while (0)
 
 /*
  * Table of ieee80211_node instances.  Each ieee80211com
  * has one that holds association stations (when operating
  * as an ap) or neighbors (in ibss mode).
  *
  * XXX embed this in ieee80211com instead of indirect?
  */
 struct ieee80211_node_table {
 	struct ieee80211com	*nt_ic;		/* back reference */
 	ieee80211_node_lock_t	nt_nodelock;	/* on node table */
 	TAILQ_HEAD(, ieee80211_node) nt_node;	/* information of all nodes */
 	LIST_HEAD(, ieee80211_node) nt_hash[IEEE80211_NODE_HASHSIZE];
 	int			nt_count;	/* number of nodes */
 	struct ieee80211_node	**nt_keyixmap;	/* key ix -> node map */
 	int			nt_keyixmax;	/* keyixmap size */
 	const char		*nt_name;	/* table name for debug msgs */
 	int			nt_inact_init;	/* initial node inact setting */
 };
 
 struct ieee80211_node *ieee80211_alloc_node(struct ieee80211_node_table *,
 		struct ieee80211vap *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_node *ieee80211_tmp_node(struct ieee80211vap *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_node *ieee80211_dup_bss(struct ieee80211vap *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_node *ieee80211_node_create_wds(struct ieee80211vap *,
 		const uint8_t bssid[IEEE80211_ADDR_LEN],
 		struct ieee80211_channel *);
 #ifdef IEEE80211_DEBUG_REFCNT
 void	ieee80211_free_node_debug(struct ieee80211_node *,
 		const char *func, int line);
 struct ieee80211_node *ieee80211_find_node_locked_debug(
 		struct ieee80211_node_table *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN],
 		const char *func, int line);
 struct ieee80211_node *ieee80211_find_node_debug(struct ieee80211_node_table *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN],
 		const char *func, int line);
 struct ieee80211_node *ieee80211_find_vap_node_locked_debug(
 		struct ieee80211_node_table *,
 		const struct ieee80211vap *vap,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN],
 		const char *func, int line);
 struct ieee80211_node *ieee80211_find_vap_node_debug(
 		struct ieee80211_node_table *,
 		const struct ieee80211vap *vap,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN],
 		const char *func, int line);
 struct ieee80211_node * ieee80211_find_rxnode_debug(struct ieee80211com *,
 		const struct ieee80211_frame_min *,
 		const char *func, int line);
 struct ieee80211_node * ieee80211_find_rxnode_withkey_debug(
 		struct ieee80211com *,
 		const struct ieee80211_frame_min *, uint16_t keyix,
 		const char *func, int line);
 struct ieee80211_node *ieee80211_find_txnode_debug(struct ieee80211vap *,
 		const uint8_t *,
 		const char *func, int line);
 #define	ieee80211_free_node(ni) \
 	ieee80211_free_node_debug(ni, __func__, __LINE__)
 #define	ieee80211_find_node_locked(nt, mac) \
 	ieee80211_find_node_locked_debug(nt, mac, __func__, __LINE__)
 #define	ieee80211_find_node(nt, mac) \
 	ieee80211_find_node_debug(nt, mac, __func__, __LINE__)
 #define	ieee80211_find_vap_node_locked(nt, vap, mac) \
 	ieee80211_find_vap_node_locked_debug(nt, vap, mac, __func__, __LINE__)
 #define	ieee80211_find_vap_node(nt, vap, mac) \
 	ieee80211_find_vap_node_debug(nt, vap, mac, __func__, __LINE__)
 #define	ieee80211_find_rxnode(ic, wh) \
 	ieee80211_find_rxnode_debug(ic, wh, __func__, __LINE__)
 #define	ieee80211_find_rxnode_withkey(ic, wh, keyix) \
 	ieee80211_find_rxnode_withkey_debug(ic, wh, keyix, __func__, __LINE__)
 #define	ieee80211_find_txnode(vap, mac) \
 	ieee80211_find_txnode_debug(vap, mac, __func__, __LINE__)
 #else
 void	ieee80211_free_node(struct ieee80211_node *);
 struct ieee80211_node *ieee80211_find_node_locked(struct ieee80211_node_table *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_node *ieee80211_find_node(struct ieee80211_node_table *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_node *ieee80211_find_vap_node_locked(
 		struct ieee80211_node_table *, const struct ieee80211vap *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_node *ieee80211_find_vap_node(
 		struct ieee80211_node_table *, const struct ieee80211vap *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_node * ieee80211_find_rxnode(struct ieee80211com *,
 		const struct ieee80211_frame_min *);
 struct ieee80211_node * ieee80211_find_rxnode_withkey(struct ieee80211com *,
 		const struct ieee80211_frame_min *, uint16_t keyix);
 struct ieee80211_node *ieee80211_find_txnode(struct ieee80211vap *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 #endif
 int	ieee80211_node_delucastkey(struct ieee80211_node *);
 void	ieee80211_node_timeout(void *arg);
 
 typedef void ieee80211_iter_func(void *, struct ieee80211_node *);
 int	ieee80211_iterate_nodes_vap(struct ieee80211_node_table *,
 		struct ieee80211vap *, ieee80211_iter_func *, void *);
 void	ieee80211_iterate_nodes(struct ieee80211_node_table *,
 		ieee80211_iter_func *, void *);
 
 void	ieee80211_notify_erp(struct ieee80211com *);
 void	ieee80211_dump_node(struct ieee80211_node_table *,
 		struct ieee80211_node *);
 void	ieee80211_dump_nodes(struct ieee80211_node_table *);
 
 struct ieee80211_node *ieee80211_fakeup_adhoc_node(struct ieee80211vap *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_scanparams;
 void	ieee80211_init_neighbor(struct ieee80211_node *,
 		const struct ieee80211_frame *,
 		const struct ieee80211_scanparams *);
 struct ieee80211_node *ieee80211_add_neighbor(struct ieee80211vap *,
 		const struct ieee80211_frame *,
 		const struct ieee80211_scanparams *);
 void	ieee80211_node_join(struct ieee80211_node *,int);
 void	ieee80211_node_leave(struct ieee80211_node *);
 int8_t	ieee80211_getrssi(struct ieee80211vap *);
 void	ieee80211_getsignal(struct ieee80211vap *, int8_t *, int8_t *);
 #endif /* _NET80211_IEEE80211_NODE_H_ */
Index: projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_proto.h
===================================================================
--- projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_proto.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_proto.h	(revision 311637)
@@ -1,429 +1,431 @@
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 #ifndef _NET80211_IEEE80211_PROTO_H_
 #define _NET80211_IEEE80211_PROTO_H_
 
 /*
  * 802.11 protocol implementation definitions.
  */
 
 enum ieee80211_state {
 	IEEE80211_S_INIT	= 0,	/* default state */
 	IEEE80211_S_SCAN	= 1,	/* scanning */
 	IEEE80211_S_AUTH	= 2,	/* try to authenticate */
 	IEEE80211_S_ASSOC	= 3,	/* try to assoc */
 	IEEE80211_S_CAC		= 4,	/* doing channel availability check */
 	IEEE80211_S_RUN		= 5,	/* operational (e.g. associated) */
 	IEEE80211_S_CSA		= 6,	/* channel switch announce pending */
 	IEEE80211_S_SLEEP	= 7,	/* power save */
 };
 #define	IEEE80211_S_MAX		(IEEE80211_S_SLEEP+1)
 
 #define	IEEE80211_SEND_MGMT(_ni,_type,_arg) \
 	((*(_ni)->ni_ic->ic_send_mgmt)(_ni, _type, _arg))
 
 extern	const char *mgt_subtype_name[];
 extern	const char *ctl_subtype_name[];
 extern	const char *ieee80211_phymode_name[IEEE80211_MODE_MAX];
 extern	const int ieee80211_opcap[IEEE80211_OPMODE_MAX];
 
 static __inline const char *
 ieee80211_mgt_subtype_name(uint8_t subtype)
 {
 	return mgt_subtype_name[(subtype & IEEE80211_FC0_SUBTYPE_MASK) >>
 		   IEEE80211_FC0_SUBTYPE_SHIFT];
 }
 
 static __inline const char *
 ieee80211_ctl_subtype_name(uint8_t subtype)
 {
 	return ctl_subtype_name[(subtype & IEEE80211_FC0_SUBTYPE_MASK) >>
 		   IEEE80211_FC0_SUBTYPE_SHIFT];
 }
 
 const char *ieee80211_reason_to_string(uint16_t);
 
 void	ieee80211_proto_attach(struct ieee80211com *);
 void	ieee80211_proto_detach(struct ieee80211com *);
 void	ieee80211_proto_vattach(struct ieee80211vap *);
 void	ieee80211_proto_vdetach(struct ieee80211vap *);
 
 void	ieee80211_promisc(struct ieee80211vap *, bool);
 void	ieee80211_allmulti(struct ieee80211vap *, bool);
 void	ieee80211_syncflag(struct ieee80211vap *, int flag);
 void	ieee80211_syncflag_ht(struct ieee80211vap *, int flag);
+void	ieee80211_syncflag_vht(struct ieee80211vap *, int flag);
 void	ieee80211_syncflag_ext(struct ieee80211vap *, int flag);
 
 #define	ieee80211_input(ni, m, rssi, nf) \
 	((ni)->ni_vap->iv_input(ni, m, NULL, rssi, nf))
 int	ieee80211_input_all(struct ieee80211com *, struct mbuf *, int, int);
 
 int	ieee80211_input_mimo(struct ieee80211_node *, struct mbuf *);
 int	ieee80211_input_mimo_all(struct ieee80211com *, struct mbuf *);
 
 struct ieee80211_bpf_params;
 int	ieee80211_mgmt_output(struct ieee80211_node *, struct mbuf *, int,
 		struct ieee80211_bpf_params *);
 int	ieee80211_raw_xmit(struct ieee80211_node *, struct mbuf *,
 		const struct ieee80211_bpf_params *);
 int	ieee80211_output(struct ifnet *, struct mbuf *,
                const struct sockaddr *, struct route *ro);
 int	ieee80211_vap_pkt_send_dest(struct ieee80211vap *, struct mbuf *,
 		struct ieee80211_node *);
 int	ieee80211_raw_output(struct ieee80211vap *, struct ieee80211_node *,
 		struct mbuf *, const struct ieee80211_bpf_params *);
 void	ieee80211_send_setup(struct ieee80211_node *, struct mbuf *, int, int,
         const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN],
         const uint8_t [IEEE80211_ADDR_LEN]);
 int	ieee80211_vap_transmit(struct ifnet *ifp, struct mbuf *m);
 void	ieee80211_vap_qflush(struct ifnet *ifp);
 int	ieee80211_send_nulldata(struct ieee80211_node *);
 int	ieee80211_classify(struct ieee80211_node *, struct mbuf *m);
 struct mbuf *ieee80211_mbuf_adjust(struct ieee80211vap *, int,
 		struct ieee80211_key *, struct mbuf *);
 struct mbuf *ieee80211_encap(struct ieee80211vap *, struct ieee80211_node *,
 		struct mbuf *);
 void	ieee80211_free_mbuf(struct mbuf *);
 int	ieee80211_send_mgmt(struct ieee80211_node *, int, int);
 struct ieee80211_appie;
 int	ieee80211_send_probereq(struct ieee80211_node *ni,
 		const uint8_t sa[IEEE80211_ADDR_LEN],
 		const uint8_t da[IEEE80211_ADDR_LEN],
 		const uint8_t bssid[IEEE80211_ADDR_LEN],
 		const uint8_t *ssid, size_t ssidlen);
 struct mbuf *	ieee80211_ff_encap1(struct ieee80211vap *, struct mbuf *,
 		const struct ether_header *);
 void	ieee80211_tx_complete(struct ieee80211_node *,
 		struct mbuf *, int);
 
 /*
  * The formation of ProbeResponse frames requires guidance to
  * deal with legacy clients.  When the client is identified as
  * "legacy 11b" ieee80211_send_proberesp is passed this token.
  */
 #define	IEEE80211_SEND_LEGACY_11B	0x1	/* legacy 11b client */
 #define	IEEE80211_SEND_LEGACY_11	0x2	/* other legacy client */
 #define	IEEE80211_SEND_LEGACY		0x3	/* any legacy client */
 struct mbuf *ieee80211_alloc_proberesp(struct ieee80211_node *, int);
 int	ieee80211_send_proberesp(struct ieee80211vap *,
 		const uint8_t da[IEEE80211_ADDR_LEN], int);
 struct mbuf *ieee80211_alloc_rts(struct ieee80211com *ic,
 		const uint8_t [IEEE80211_ADDR_LEN],
 		const uint8_t [IEEE80211_ADDR_LEN], uint16_t);
 struct mbuf *ieee80211_alloc_cts(struct ieee80211com *,
 		const uint8_t [IEEE80211_ADDR_LEN], uint16_t);
 
 uint8_t *ieee80211_add_rates(uint8_t *, const struct ieee80211_rateset *);
 uint8_t *ieee80211_add_xrates(uint8_t *, const struct ieee80211_rateset *);
 uint8_t *ieee80211_add_ssid(uint8_t *, const uint8_t *, u_int);
 uint8_t *ieee80211_add_wpa(uint8_t *, const struct ieee80211vap *);
 uint8_t *ieee80211_add_rsn(uint8_t *, const struct ieee80211vap *);
 uint8_t *ieee80211_add_qos(uint8_t *, const struct ieee80211_node *);
 uint16_t ieee80211_getcapinfo(struct ieee80211vap *,
 		struct ieee80211_channel *);
 struct ieee80211_wme_state;
 uint8_t * ieee80211_add_wme_info(uint8_t *frm, struct ieee80211_wme_state *wme);
 
 void	ieee80211_reset_erp(struct ieee80211com *);
 void	ieee80211_set_shortslottime(struct ieee80211com *, int onoff);
 int	ieee80211_iserp_rateset(const struct ieee80211_rateset *);
 void	ieee80211_setbasicrates(struct ieee80211_rateset *,
 		enum ieee80211_phymode);
 void	ieee80211_addbasicrates(struct ieee80211_rateset *,
 		enum ieee80211_phymode);
 
 /*
  * Return the size of the 802.11 header for a management or data frame.
  */
 static __inline int
 ieee80211_hdrsize(const void *data)
 {
 	const struct ieee80211_frame *wh = data;
 	int size = sizeof(struct ieee80211_frame);
 
 	/* NB: we don't handle control frames */
 	KASSERT((wh->i_fc[0]&IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_CTL,
 		("%s: control frame", __func__));
 	if (IEEE80211_IS_DSTODS(wh))
 		size += IEEE80211_ADDR_LEN;
 	if (IEEE80211_QOS_HAS_SEQ(wh))
 		size += sizeof(uint16_t);
 	return size;
 }
 
 /*
  * Like ieee80211_hdrsize, but handles any type of frame.
  */
 static __inline int
 ieee80211_anyhdrsize(const void *data)
 {
 	const struct ieee80211_frame *wh = data;
 
 	if ((wh->i_fc[0]&IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) {
 		switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
 		case IEEE80211_FC0_SUBTYPE_CTS:
 		case IEEE80211_FC0_SUBTYPE_ACK:
 			return sizeof(struct ieee80211_frame_ack);
 		case IEEE80211_FC0_SUBTYPE_BAR:
 			return sizeof(struct ieee80211_frame_bar);
 		}
 		return sizeof(struct ieee80211_frame_min);
 	} else
 		return ieee80211_hdrsize(data);
 }
 
 /*
  * Template for an in-kernel authenticator.  Authenticators
  * register with the protocol code and are typically loaded
  * as separate modules as needed.  One special authenticator
  * is xauth; it intercepts requests so that protocols like
  * WPA can be handled in user space.
  */
 struct ieee80211_authenticator {
 	const char *ia_name;		/* printable name */
 	int	(*ia_attach)(struct ieee80211vap *);
 	void	(*ia_detach)(struct ieee80211vap *);
 	void	(*ia_node_join)(struct ieee80211_node *);
 	void	(*ia_node_leave)(struct ieee80211_node *);
 };
 void	ieee80211_authenticator_register(int type,
 		const struct ieee80211_authenticator *);
 void	ieee80211_authenticator_unregister(int type);
 const struct ieee80211_authenticator *ieee80211_authenticator_get(int auth);
 
 struct ieee80211req;
 /*
  * Template for an MAC ACL policy module.  Such modules
  * register with the protocol code and are passed the sender's
  * address of each received auth frame for validation.
  */
 struct ieee80211_aclator {
 	const char *iac_name;		/* printable name */
 	int	(*iac_attach)(struct ieee80211vap *);
 	void	(*iac_detach)(struct ieee80211vap *);
 	int	(*iac_check)(struct ieee80211vap *,
 			const struct ieee80211_frame *wh);
 	int	(*iac_add)(struct ieee80211vap *,
 			const uint8_t mac[IEEE80211_ADDR_LEN]);
 	int	(*iac_remove)(struct ieee80211vap *,
 			const uint8_t mac[IEEE80211_ADDR_LEN]);
 	int	(*iac_flush)(struct ieee80211vap *);
 	int	(*iac_setpolicy)(struct ieee80211vap *, int);
 	int	(*iac_getpolicy)(struct ieee80211vap *);
 	int	(*iac_setioctl)(struct ieee80211vap *, struct ieee80211req *);
 	int	(*iac_getioctl)(struct ieee80211vap *, struct ieee80211req *);
 };
 void	ieee80211_aclator_register(const struct ieee80211_aclator *);
 void	ieee80211_aclator_unregister(const struct ieee80211_aclator *);
 const struct ieee80211_aclator *ieee80211_aclator_get(const char *name);
 
 /* flags for ieee80211_fix_rate() */
 #define	IEEE80211_F_DOSORT	0x00000001	/* sort rate list */
 #define	IEEE80211_F_DOFRATE	0x00000002	/* use fixed legacy rate */
 #define	IEEE80211_F_DONEGO	0x00000004	/* calc negotiated rate */
 #define	IEEE80211_F_DODEL	0x00000008	/* delete ignore rate */
 #define	IEEE80211_F_DOBRS	0x00000010	/* check basic rate set */
 #define	IEEE80211_F_JOIN	0x00000020	/* sta joining our bss */
 #define	IEEE80211_F_DOFMCS	0x00000040	/* use fixed HT rate */
 int	ieee80211_fix_rate(struct ieee80211_node *,
 		struct ieee80211_rateset *, int);
 
 /*
  * WME/WMM support.
  */
 struct wmeParams {
 	uint8_t		wmep_acm;
 	uint8_t		wmep_aifsn;
 	uint8_t		wmep_logcwmin;		/* log2(cwmin) */
 	uint8_t		wmep_logcwmax;		/* log2(cwmax) */
 	uint8_t		wmep_txopLimit;
 	uint8_t		wmep_noackPolicy;	/* 0 (ack), 1 (no ack) */
 };
 #define	IEEE80211_TXOP_TO_US(_txop)	((_txop)<<5)
 #define	IEEE80211_US_TO_TXOP(_us)	((_us)>>5)
 
 struct chanAccParams {
 	uint8_t		cap_info;		/* version of the current set */
 	struct wmeParams cap_wmeParams[WME_NUM_AC];
 };
 
 struct ieee80211_wme_state {
 	u_int	wme_flags;
 #define	WME_F_AGGRMODE	0x00000001	/* STATUS: WME aggressive mode */
 	u_int	wme_hipri_traffic;	/* VI/VO frames in beacon interval */
 	u_int	wme_hipri_switch_thresh;/* aggressive mode switch thresh */
 	u_int	wme_hipri_switch_hysteresis;/* aggressive mode switch hysteresis */
 
 	struct wmeParams wme_params[4];		/* from assoc resp for each AC*/
 	struct chanAccParams wme_wmeChanParams;	/* WME params applied to self */
 	struct chanAccParams wme_wmeBssChanParams;/* WME params bcast to stations */
 	struct chanAccParams wme_chanParams;	/* params applied to self */
 	struct chanAccParams wme_bssChanParams;	/* params bcast to stations */
 
 	int	(*wme_update)(struct ieee80211com *);
 };
 
 void	ieee80211_wme_initparams(struct ieee80211vap *);
 void	ieee80211_wme_updateparams(struct ieee80211vap *);
 void	ieee80211_wme_updateparams_locked(struct ieee80211vap *);
 
 /*
  * Return the WME TID from a QoS frame.  If no TID
  * is present return the index for the "non-QoS" entry.
  */
 static __inline uint8_t
 ieee80211_gettid(const struct ieee80211_frame *wh)
 {
 	uint8_t tid;
 
 	if (IEEE80211_QOS_HAS_SEQ(wh)) {
 		if (IEEE80211_IS_DSTODS(wh))
 			tid = ((const struct ieee80211_qosframe_addr4 *)wh)->
 				i_qos[0];
 		else
 			tid = ((const struct ieee80211_qosframe *)wh)->i_qos[0];
 		tid &= IEEE80211_QOS_TID;
 	} else
 		tid = IEEE80211_NONQOS_TID;
 	return tid;
 }
 
 void	ieee80211_waitfor_parent(struct ieee80211com *);
 void	ieee80211_start_locked(struct ieee80211vap *);
 void	ieee80211_init(void *);
 void	ieee80211_start_all(struct ieee80211com *);
 void	ieee80211_stop_locked(struct ieee80211vap *);
 void	ieee80211_stop(struct ieee80211vap *);
 void	ieee80211_stop_all(struct ieee80211com *);
 void	ieee80211_suspend_all(struct ieee80211com *);
 void	ieee80211_resume_all(struct ieee80211com *);
 void	ieee80211_restart_all(struct ieee80211com *);
 void	ieee80211_dturbo_switch(struct ieee80211vap *, int newflags);
 void	ieee80211_swbmiss(void *arg);
 void	ieee80211_beacon_miss(struct ieee80211com *);
 int	ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int);
 int	ieee80211_new_state_locked(struct ieee80211vap *, enum ieee80211_state,
 		int);
 void	ieee80211_print_essid(const uint8_t *, int);
 void	ieee80211_dump_pkt(struct ieee80211com *,
 		const uint8_t *, int, int, int);
 
 extern 	const char *ieee80211_opmode_name[];
 extern	const char *ieee80211_state_name[IEEE80211_S_MAX];
 extern	const char *ieee80211_wme_acnames[];
 
 /*
  * Beacon frames constructed by ieee80211_beacon_alloc
  * have the following structure filled in so drivers
  * can update the frame later w/ minimal overhead.
  */
 struct ieee80211_beacon_offsets {
 	uint8_t		bo_flags[4];	/* update/state flags */
 	uint16_t	*bo_caps;	/* capabilities */
 	uint8_t		*bo_cfp;	/* start of CFParms element */
 	uint8_t		*bo_tim;	/* start of atim/dtim */
 	uint8_t		*bo_wme;	/* start of WME parameters */
 	uint8_t		*bo_tdma;	/* start of TDMA parameters */
 	uint8_t		*bo_tim_trailer;/* start of fixed-size trailer */
 	uint16_t	bo_tim_len;	/* atim/dtim length in bytes */
 	uint16_t	bo_tim_trailer_len;/* tim trailer length in bytes */
 	uint8_t		*bo_erp;	/* start of ERP element */
 	uint8_t		*bo_htinfo;	/* start of HT info element */
 	uint8_t		*bo_ath;	/* start of ATH parameters */
 	uint8_t		*bo_appie;	/* start of AppIE element */
 	uint16_t	bo_appie_len;	/* AppIE length in bytes */
 	uint16_t	bo_csa_trailer_len;
 	uint8_t		*bo_csa;	/* start of CSA element */
 	uint8_t		*bo_quiet;	/* start of Quiet element */
 	uint8_t		*bo_meshconf;	/* start of MESHCONF element */
-	uint8_t		*bo_spare[3];
+	uint8_t		*bo_vhtinfo;	/* start of VHT info element (XXX VHTCAP?) */
+	uint8_t		*bo_spare[2];
 };
 struct mbuf *ieee80211_beacon_alloc(struct ieee80211_node *);
 
 /*
  * Beacon frame updates are signaled through calls to iv_update_beacon
  * with one of the IEEE80211_BEACON_* tokens defined below.  For devices
  * that construct beacon frames on the host this can trigger a rebuild
  * or defer the processing.  For devices that offload beacon frame
  * handling this callback can be used to signal a rebuild.  The bo_flags
  * array in the ieee80211_beacon_offsets structure is intended to record
  * deferred processing requirements; ieee80211_beacon_update uses the
  * state to optimize work.  Since this structure is owned by the driver
  * and not visible to the 802.11 layer drivers must supply an iv_update_beacon
  * callback that marks the flag bits and schedules (as necessary) an update.
  */
 enum {
 	IEEE80211_BEACON_CAPS	= 0,	/* capabilities */
 	IEEE80211_BEACON_TIM	= 1,	/* DTIM/ATIM */
 	IEEE80211_BEACON_WME	= 2,
 	IEEE80211_BEACON_ERP	= 3,	/* Extended Rate Phy */
 	IEEE80211_BEACON_HTINFO	= 4,	/* HT Information */
 	IEEE80211_BEACON_APPIE	= 5,	/* Application IE's */
 	IEEE80211_BEACON_CFP	= 6,	/* CFParms */
 	IEEE80211_BEACON_CSA	= 7,	/* Channel Switch Announcement */
 	IEEE80211_BEACON_TDMA	= 9,	/* TDMA Info */
 	IEEE80211_BEACON_ATH	= 10,	/* ATH parameters */
 	IEEE80211_BEACON_MESHCONF = 11,	/* Mesh Configuration */
 };
 int	ieee80211_beacon_update(struct ieee80211_node *,
 		struct mbuf *, int mcast);
 
 void	ieee80211_csa_startswitch(struct ieee80211com *,
 		struct ieee80211_channel *, int mode, int count);
 void	ieee80211_csa_completeswitch(struct ieee80211com *);
 void	ieee80211_csa_cancelswitch(struct ieee80211com *);
 void	ieee80211_cac_completeswitch(struct ieee80211vap *);
 
 /*
  * Notification methods called from the 802.11 state machine.
  * Note that while these are defined here, their implementation
  * is OS-specific.
  */
 void	ieee80211_notify_node_join(struct ieee80211_node *, int newassoc);
 void	ieee80211_notify_node_leave(struct ieee80211_node *);
 void	ieee80211_notify_scan_done(struct ieee80211vap *);
 void	ieee80211_notify_wds_discover(struct ieee80211_node *);
 void	ieee80211_notify_csa(struct ieee80211com *,
 		const struct ieee80211_channel *, int mode, int count);
 void	ieee80211_notify_radar(struct ieee80211com *,
 		const struct ieee80211_channel *);
 enum ieee80211_notify_cac_event {
 	IEEE80211_NOTIFY_CAC_START  = 0, /* CAC timer started */
 	IEEE80211_NOTIFY_CAC_STOP   = 1, /* CAC intentionally stopped */
 	IEEE80211_NOTIFY_CAC_RADAR  = 2, /* CAC stopped due to radar detectio */
 	IEEE80211_NOTIFY_CAC_EXPIRE = 3, /* CAC expired w/o radar */
 };
 void	ieee80211_notify_cac(struct ieee80211com *,
 		const struct ieee80211_channel *,
 		enum ieee80211_notify_cac_event);
 void	ieee80211_notify_node_deauth(struct ieee80211_node *);
 void	ieee80211_notify_node_auth(struct ieee80211_node *);
 void	ieee80211_notify_country(struct ieee80211vap *, const uint8_t [],
 		const uint8_t cc[2]);
 void	ieee80211_notify_radio(struct ieee80211com *, int);
 #endif /* _NET80211_IEEE80211_PROTO_H_ */
Index: projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_scan.h
===================================================================
--- projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_scan.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_scan.h	(revision 311637)
@@ -1,347 +1,349 @@
 /*-
  * Copyright (c) 2005-2009 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 #ifndef _NET80211_IEEE80211_SCAN_H_
 #define _NET80211_IEEE80211_SCAN_H_
 
 /*
  * 802.11 scanning support.
  *
  * Scanning is the procedure by which a station locates a bss to join
  * (infrastructure/ibss mode), or a channel to use (when operating as
  * an ap or ibss master).  Scans are either "active" or "passive".  An
  * active scan causes one or more probe request frames to be sent on
  * visiting each channel.  A passive request causes each channel in the
  * scan set to be visited but no frames to be transmitted; the station
  * only listens for traffic.  Note that active scanning may still need
  * to listen for traffic before sending probe request frames depending
  * on regulatory constraints; the 802.11 layer handles this by generating
  * a callback when scanning on a ``passive channel'' when the
  * IEEE80211_FEXT_PROBECHAN flag is set.
  *
  * A scan operation involves constructing a set of channels to inspect
  * (the scan set), visiting each channel and collecting information
  * (e.g. what bss are present), and then analyzing the results to make
  * decisions like which bss to join.  This process needs to be as fast
  * as possible so we do things like intelligently construct scan sets
  * and dwell on a channel only as long as necessary.  The scan code also
  * maintains a cache of recent scan results and uses it to bypass scanning
  * whenever possible.  The scan cache is also used to enable roaming
  * between access points when operating in infrastructure mode.
  *
  * Scanning is handled with pluggable modules that implement "policy"
  * per-operating mode.  The core scanning support provides an
  * instrastructure to support these modules and exports a common api
  * to the rest of the 802.11 layer.  Policy modules decide what
  * channels to visit, what state to record to make decisions (e.g. ap
  * mode scanning for auto channel selection keeps significantly less
  * state than sta mode scanning for an ap to associate to), and selects
  * the final station/channel to return as the result of a scan.
  *
  * Scanning is done synchronously when initially bringing a vap to an
  * operational state and optionally in the background to maintain the
  * scan cache for doing roaming and rogue ap monitoring.  Scanning is
  * not tied to the 802.11 state machine that governs vaps though there
  * is linkage to the IEEE80211_SCAN state.  Only one vap at a time may
  * be scanning; this scheduling policy is handled in ieee80211_new_state
  * and is invisible to the scanning code.
 */
 #define	IEEE80211_SCAN_MAX	IEEE80211_CHAN_MAX
 
 struct ieee80211_scanner;			/* scan policy state */
 
 struct ieee80211_scan_ssid {
 	int	 len;				/* length in bytes */
 	uint8_t ssid[IEEE80211_NWID_LEN];	/* ssid contents */
 };
 #define	IEEE80211_SCAN_MAX_SSID	1		/* max # ssid's to probe */
 
 /*
  * High-level implementation visible to ieee80211_scan.[ch].
  *
  * The default scanner (ieee80211_scan_sw.[ch]) implements a software
  * driven scanner.  Firmware driven scanning needs a different set of
  * behaviours.
  */
 struct ieee80211_scan_methods {
 	void (*sc_attach)(struct ieee80211com *);
 	void (*sc_detach)(struct ieee80211com *);
 	void (*sc_vattach)(struct ieee80211vap *);
 	void (*sc_vdetach)(struct ieee80211vap *);
 	void (*sc_set_scan_duration)(struct ieee80211vap *, u_int);
 	int (*sc_start_scan)(const struct ieee80211_scanner *,
 	    struct ieee80211vap *, int, u_int, u_int, u_int, u_int,
 	    const struct ieee80211_scan_ssid ssids[]);
 	int (*sc_check_scan)(const struct ieee80211_scanner *,
 	    struct ieee80211vap *, int, u_int, u_int, u_int, u_int,
 	    const struct ieee80211_scan_ssid ssids[]);
 	int (*sc_bg_scan)(const struct ieee80211_scanner *,
 	    struct ieee80211vap *, int);
 	void (*sc_cancel_scan)(struct ieee80211vap *);
 	void (*sc_cancel_anyscan)(struct ieee80211vap *);
 	void (*sc_scan_next)(struct ieee80211vap *);
 	void (*sc_scan_done)(struct ieee80211vap *);
 	void (*sc_scan_probe_curchan)(struct ieee80211vap *, int);
 	void (*sc_add_scan)(struct ieee80211vap *,
 	    struct ieee80211_channel *,
 	    const struct ieee80211_scanparams *,
 	    const struct ieee80211_frame *,
 	    int, int, int);
 };
 
 /*
  * Scan state visible to the 802.11 layer.  Scan parameters and
  * results are stored in this data structure.  The ieee80211_scan_state
  * structure is extended with space that is maintained private to
  * the core scanning support.  We allocate one instance and link it
  * to the ieee80211com structure; then share it between all associated
  * vaps.  We could allocate multiple of these, e.g. to hold multiple
  * scan results, but this is sufficient for current needs.
  */
 struct ieee80211_scan_state {
 	struct ieee80211vap *ss_vap;
 	struct ieee80211com *ss_ic;
 	const struct ieee80211_scanner *ss_ops;	/* policy hookup, see below */
 	void		*ss_priv;		/* scanner private state */
 	uint16_t	ss_flags;
 #define	IEEE80211_SCAN_NOPICK	0x0001		/* scan only, no selection */
 #define	IEEE80211_SCAN_ACTIVE	0x0002		/* active scan (probe req) */
 #define	IEEE80211_SCAN_PICK1ST	0x0004		/* ``hey sailor'' mode */
 #define	IEEE80211_SCAN_BGSCAN	0x0008		/* bg scan, exit ps at end */
 #define	IEEE80211_SCAN_ONCE	0x0010		/* do one complete pass */
 #define	IEEE80211_SCAN_NOBCAST	0x0020		/* no broadcast probe req */
 #define	IEEE80211_SCAN_NOJOIN	0x0040		/* no auto-sequencing */
 #define	IEEE80211_SCAN_GOTPICK	0x1000		/* got candidate, can stop */
 	uint8_t		ss_nssid;		/* # ssid's to probe/match */
 	struct ieee80211_scan_ssid ss_ssid[IEEE80211_SCAN_MAX_SSID];
 						/* ssid's to probe/match */
 						/* ordered channel set */
 	struct ieee80211_channel *ss_chans[IEEE80211_SCAN_MAX];
 	uint16_t	ss_next;		/* ix of next chan to scan */
 	uint16_t	ss_last;		/* ix+1 of last chan to scan */
 	unsigned long	ss_mindwell;		/* min dwell on channel */
 	unsigned long	ss_maxdwell;		/* max dwell on channel */
 };
 
 /*
  * The upper 16 bits of the flags word is used to communicate
  * information to the scanning code that is NOT recorded in
  * ss_flags.  It might be better to split this stuff out into
  * a separate variable to avoid confusion.
  */
 #define	IEEE80211_SCAN_FLUSH	0x00010000	/* flush candidate table */
 #define	IEEE80211_SCAN_NOSSID	0x80000000	/* don't update ssid list */
 
 struct ieee80211com;
 void	ieee80211_scan_attach(struct ieee80211com *);
 void	ieee80211_scan_detach(struct ieee80211com *);
 void	ieee80211_scan_vattach(struct ieee80211vap *);
 void	ieee80211_scan_vdetach(struct ieee80211vap *);
 
 void	ieee80211_scan_dump_channels(const struct ieee80211_scan_state *);
 
 #define	IEEE80211_SCAN_FOREVER	0x7fffffff
 int	ieee80211_start_scan(struct ieee80211vap *, int flags,
 		u_int duration, u_int mindwell, u_int maxdwell,
 		u_int nssid, const struct ieee80211_scan_ssid ssids[]);
 int	ieee80211_check_scan(struct ieee80211vap *, int flags,
 		u_int duration, u_int mindwell, u_int maxdwell,
 		u_int nssid, const struct ieee80211_scan_ssid ssids[]);
 int	ieee80211_check_scan_current(struct ieee80211vap *);
 int	ieee80211_bg_scan(struct ieee80211vap *, int);
 void	ieee80211_cancel_scan(struct ieee80211vap *);
 void	ieee80211_cancel_anyscan(struct ieee80211vap *);
 void	ieee80211_scan_next(struct ieee80211vap *);
 void	ieee80211_scan_done(struct ieee80211vap *);
 void	ieee80211_probe_curchan(struct ieee80211vap *, int);
 struct ieee80211_channel *ieee80211_scan_pickchannel(struct ieee80211com *, int);
 
 struct ieee80211_scanparams;
 void	ieee80211_add_scan(struct ieee80211vap *,
 		struct ieee80211_channel *,
 		const struct ieee80211_scanparams *,
 		const struct ieee80211_frame *,
 		int subtype, int rssi, int noise);
 void	ieee80211_scan_timeout(struct ieee80211com *);
 
 void	ieee80211_scan_assoc_success(struct ieee80211vap *,
 		const uint8_t mac[IEEE80211_ADDR_LEN]);
 enum {
 	IEEE80211_SCAN_FAIL_TIMEOUT	= 1,	/* no response to mgmt frame */
 	IEEE80211_SCAN_FAIL_STATUS	= 2	/* negative response to " " */
 };
 void	ieee80211_scan_assoc_fail(struct ieee80211vap *,
 		const uint8_t mac[IEEE80211_ADDR_LEN], int reason);
 void	ieee80211_scan_flush(struct ieee80211vap *);
 
 struct ieee80211_scan_entry;
 typedef void ieee80211_scan_iter_func(void *,
 		const struct ieee80211_scan_entry *);
 void	ieee80211_scan_iterate(struct ieee80211vap *,
 		ieee80211_scan_iter_func, void *);
 enum {
 	IEEE80211_BPARSE_BADIELEN	= 0x01,	/* ie len past end of frame */
 	IEEE80211_BPARSE_RATES_INVALID	= 0x02,	/* invalid RATES ie */
 	IEEE80211_BPARSE_XRATES_INVALID	= 0x04,	/* invalid XRATES ie */
 	IEEE80211_BPARSE_SSID_INVALID	= 0x08,	/* invalid SSID ie */
 	IEEE80211_BPARSE_CHAN_INVALID	= 0x10,	/* invalid FH/DSPARMS chan */
 	IEEE80211_BPARSE_OFFCHAN	= 0x20,	/* DSPARMS chan != curchan */
 	IEEE80211_BPARSE_BINTVAL_INVALID= 0x40,	/* invalid beacon interval */
 	IEEE80211_BPARSE_CSA_INVALID	= 0x80,	/* invalid CSA ie */
 };
 
 /*
  * Parameters supplied when adding/updating an entry in a
  * scan cache.  Pointer variables should be set to NULL
  * if no data is available.  Pointer references can be to
  * local data; any information that is saved will be copied.
  * All multi-byte values must be in host byte order.
  */
 struct ieee80211_scanparams {
 	uint8_t		status;		/* bitmask of IEEE80211_BPARSE_* */
 	uint8_t		chan;		/* channel # from FH/DSPARMS */
 	uint8_t		bchan;		/* curchan's channel # */
 	uint8_t		fhindex;
 	uint16_t	fhdwell;	/* FHSS dwell interval */
 	uint16_t	capinfo;	/* 802.11 capabilities */
 	uint16_t	erp;		/* NB: 0x100 indicates ie present */
 	uint16_t	bintval;
 	uint8_t		timoff;
 	uint8_t		*ies;		/* all captured ies */
 	size_t		ies_len;	/* length of all captured ies */
 	uint8_t		*tim;
 	uint8_t		*tstamp;
 	uint8_t		*country;
 	uint8_t		*ssid;
 	uint8_t		*rates;
 	uint8_t		*xrates;
 	uint8_t		*doth;
 	uint8_t		*wpa;
 	uint8_t		*rsn;
 	uint8_t		*wme;
 	uint8_t		*htcap;
 	uint8_t		*htinfo;
 	uint8_t		*ath;
 	uint8_t		*tdma;
 	uint8_t		*csa;
 	uint8_t		*quiet;
 	uint8_t		*meshid;
 	uint8_t		*meshconf;
-	uint8_t		*spare[3];
+	uint8_t		*vhtcap;
+	uint8_t		*vhtopmode;
+	uint8_t		*spare[1];
 };
 
 /*
  * Scan cache entry format used when exporting data from a policy
  * module; this data may be represented some other way internally.
  */
 struct ieee80211_scan_entry {
 	uint8_t		se_macaddr[IEEE80211_ADDR_LEN];
 	uint8_t		se_bssid[IEEE80211_ADDR_LEN];
 	/* XXX can point inside se_ies */
 	uint8_t		se_ssid[2+IEEE80211_NWID_LEN];
 	uint8_t		se_rates[2+IEEE80211_RATE_MAXSIZE];
 	uint8_t		se_xrates[2+IEEE80211_RATE_MAXSIZE];
 	union {
 		uint8_t		data[8];
 		u_int64_t	tsf;
 	} se_tstamp;			/* from last rcv'd beacon */
 	uint16_t	se_intval;	/* beacon interval (host byte order) */
 	uint16_t	se_capinfo;	/* capabilities (host byte order) */
 	struct ieee80211_channel *se_chan;/* channel where sta found */
 	uint16_t	se_timoff;	/* byte offset to TIM ie */
 	uint16_t	se_fhdwell;	/* FH only (host byte order) */
 	uint8_t		se_fhindex;	/* FH only */
 	uint8_t		se_dtimperiod;	/* DTIM period */
 	uint16_t	se_erp;		/* ERP from beacon/probe resp */
 	int8_t		se_rssi;	/* avg'd recv ssi */
 	int8_t		se_noise;	/* noise floor */
 	uint8_t		se_cc[2];	/* captured country code */
 	uint8_t		se_meshid[2+IEEE80211_MESHID_LEN];
 	struct ieee80211_ies se_ies;	/* captured ie's */
 	u_int		se_age;		/* age of entry (0 on create) */
 };
 MALLOC_DECLARE(M_80211_SCAN);
 
 /*
  * Template for an in-kernel scan policy module.
  * Modules register with the scanning code and are
  * typically loaded as needed.
  */
 struct ieee80211_scanner {
 	const char *scan_name;		/* printable name */
 	int	(*scan_attach)(struct ieee80211_scan_state *);
 	int	(*scan_detach)(struct ieee80211_scan_state *);
 	int	(*scan_start)(struct ieee80211_scan_state *,
 			struct ieee80211vap *);
 	int	(*scan_restart)(struct ieee80211_scan_state *,
 			struct ieee80211vap *);
 	int	(*scan_cancel)(struct ieee80211_scan_state *,
 			struct ieee80211vap *);
 	int	(*scan_end)(struct ieee80211_scan_state *,
 			struct ieee80211vap *);
 	int	(*scan_flush)(struct ieee80211_scan_state *);
 	struct ieee80211_channel *(*scan_pickchan)(
 			struct ieee80211_scan_state *, int);
 	/* add an entry to the cache */
 	int	(*scan_add)(struct ieee80211_scan_state *,
 			struct ieee80211_channel *,
 			const struct ieee80211_scanparams *,
 			const struct ieee80211_frame *,
 			int subtype, int rssi, int noise);
 	/* age and/or purge entries in the cache */
 	void	(*scan_age)(struct ieee80211_scan_state *);
 	/* note that association failed for an entry */
 	void	(*scan_assoc_fail)(struct ieee80211_scan_state *,
 			const uint8_t macaddr[IEEE80211_ADDR_LEN],
 			int reason);
 	/* note that association succeed for an entry */
 	void	(*scan_assoc_success)(struct ieee80211_scan_state *,
 			const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 	/* iterate over entries in the scan cache */
 	void	(*scan_iterate)(struct ieee80211_scan_state *,
 			ieee80211_scan_iter_func *, void *);
 	void	(*scan_spare0)(void);
 	void	(*scan_spare1)(void);
 	void	(*scan_spare2)(void);
 	void	(*scan_spare4)(void);
 };
 void	ieee80211_scanner_register(enum ieee80211_opmode,
 		const struct ieee80211_scanner *);
 void	ieee80211_scanner_unregister(enum ieee80211_opmode,
 		const struct ieee80211_scanner *);
 void	ieee80211_scanner_unregister_all(const struct ieee80211_scanner *);
 const struct ieee80211_scanner *ieee80211_scanner_get(enum ieee80211_opmode);
 void	ieee80211_scan_update_locked(struct ieee80211vap *vap,
 		const struct ieee80211_scanner *scan);
 void	ieee80211_scan_copy_ssid(struct ieee80211vap *vap,
 		struct ieee80211_scan_state *ss,
 		int nssid, const struct ieee80211_scan_ssid ssids[]);
 void	ieee80211_scan_dump_probe_beacon(uint8_t subtype, int isnew,
 		const uint8_t mac[IEEE80211_ADDR_LEN],
 		const struct ieee80211_scanparams *sp, int rssi);
 void	ieee80211_scan_dump(struct ieee80211_scan_state *ss);
 
 #endif /* _NET80211_IEEE80211_SCAN_H_ */
Index: projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_var.h
===================================================================
--- projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_var.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_var.h	(revision 311637)
@@ -1,983 +1,1008 @@
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 #ifndef _NET80211_IEEE80211_VAR_H_
 #define _NET80211_IEEE80211_VAR_H_
 
 /*
  * Definitions for IEEE 802.11 drivers.
  */
 /* NB: portability glue must go first */
 #if defined(__NetBSD__)
 #include <net80211/ieee80211_netbsd.h>
 #elif defined(__FreeBSD__)
 #include <net80211/ieee80211_freebsd.h>
 #elif defined(__linux__)
 #include <net80211/ieee80211_linux.h>
 #else
 #error	"No support for your operating system!"
 #endif
 
 #include <net80211/_ieee80211.h>
 #include <net80211/ieee80211.h>
 #include <net80211/ieee80211_ageq.h>
 #include <net80211/ieee80211_crypto.h>
 #include <net80211/ieee80211_dfs.h>
 #include <net80211/ieee80211_ioctl.h>		/* for ieee80211_stats */
 #include <net80211/ieee80211_phy.h>
 #include <net80211/ieee80211_power.h>
 #include <net80211/ieee80211_node.h>
 #include <net80211/ieee80211_proto.h>
 #include <net80211/ieee80211_radiotap.h>
 #include <net80211/ieee80211_scan.h>
 
 #define	IEEE80211_TXPOWER_MAX	100	/* .5 dBm (XXX units?) */
 #define	IEEE80211_TXPOWER_MIN	0	/* kill radio */
 
 #define	IEEE80211_DTIM_DEFAULT	1	/* default DTIM period */
 #define	IEEE80211_BINTVAL_DEFAULT 100	/* default beacon interval (TU's) */
 
 #define	IEEE80211_BMISS_MAX	2	/* maximum consecutive bmiss allowed */
 #define	IEEE80211_HWBMISS_DEFAULT 7	/* h/w bmiss threshold (beacons) */
 
 #define	IEEE80211_BGSCAN_INTVAL_MIN	15	/* min bg scan intvl (secs) */
 #define	IEEE80211_BGSCAN_INTVAL_DEFAULT	(5*60)	/* default bg scan intvl */
 
 #define	IEEE80211_BGSCAN_IDLE_MIN	100	/* min idle time (ms) */
 #define	IEEE80211_BGSCAN_IDLE_DEFAULT	250	/* default idle time (ms) */
 
 #define	IEEE80211_SCAN_VALID_MIN	10	/* min scan valid time (secs) */
 #define	IEEE80211_SCAN_VALID_DEFAULT	60	/* default scan valid time */
 
 #define	IEEE80211_PS_SLEEP	0x1	/* STA is in power saving mode */
 #define	IEEE80211_PS_MAX_QUEUE	50	/* maximum saved packets */
 
 #define	IEEE80211_FIXED_RATE_NONE	0xff
 #define	IEEE80211_TXMAX_DEFAULT		6	/* default ucast max retries */
 
 #define	IEEE80211_RTS_DEFAULT		IEEE80211_RTS_MAX
 #define	IEEE80211_FRAG_DEFAULT		IEEE80211_FRAG_MAX
 
 #define	IEEE80211_MS_TO_TU(x)	(((x) * 1000) / 1024)
 #define	IEEE80211_TU_TO_MS(x)	(((x) * 1024) / 1000)
 /* XXX TODO: cap this at 1, in case hz is not 1000 */
 #define	IEEE80211_TU_TO_TICKS(x)(((uint64_t)(x) * 1024 * hz) / (1000 * 1000))
 
 /*
  * 802.11 control state is split into a common portion that maps
  * 1-1 to a physical device and one or more "Virtual AP's" (VAP)
  * that are bound to an ieee80211com instance and share a single
  * underlying device.  Each VAP has a corresponding OS device
  * entity through which traffic flows and that applications use
  * for issuing ioctls, etc.
  */
 
 /*
  * Data common to one or more virtual AP's.  State shared by
  * the underlying device and the net80211 layer is exposed here;
  * e.g. device-specific callbacks.
  */
 struct ieee80211vap;
 typedef void (*ieee80211vap_attach)(struct ieee80211vap *);
 
 struct ieee80211_appie {
 	uint16_t		ie_len;		/* size of ie_data */
 	uint8_t			ie_data[];	/* user-specified IE's */
 };
 
 struct ieee80211_tdma_param;
 struct ieee80211_rate_table;
 struct ieee80211_tx_ampdu;
 struct ieee80211_rx_ampdu;
 struct ieee80211_superg;
 struct ieee80211_frame;
 
 struct ieee80211com {
 	void			*ic_softc;	/* driver softc */
 	const char		*ic_name;	/* usually device name */
 	ieee80211_com_lock_t	ic_comlock;	/* state update lock */
 	ieee80211_tx_lock_t	ic_txlock;	/* ic/vap TX lock */
 	ieee80211_ff_lock_t	ic_fflock;	/* stageq/ni_tx_superg lock */
 	LIST_ENTRY(ieee80211com)   ic_next;	/* on global list */
 	TAILQ_HEAD(, ieee80211vap) ic_vaps;	/* list of vap instances */
 	int			ic_headroom;	/* driver tx headroom needs */
 	enum ieee80211_phytype	ic_phytype;	/* XXX wrong for multi-mode */
 	enum ieee80211_opmode	ic_opmode;	/* operation mode */
 	struct callout		ic_inact;	/* inactivity processing */
 	struct taskqueue	*ic_tq;		/* deferred state thread */
 	struct task		ic_parent_task;	/* deferred parent processing */
 	struct task		ic_promisc_task;/* deferred promisc update */
 	struct task		ic_mcast_task;	/* deferred mcast update */
 	struct task		ic_chan_task;	/* deferred channel change */
 	struct task		ic_bmiss_task;	/* deferred beacon miss hndlr */
 	struct task		ic_chw_task;	/* deferred HT CHW update */
 	struct task		ic_wme_task;	/* deferred WME update */
 	struct task		ic_restart_task; /* deferred device restart */
 
 	counter_u64_t		ic_ierrors;	/* input errors */
 	counter_u64_t		ic_oerrors;	/* output errors */
 
 	uint32_t		ic_flags;	/* state flags */
 	uint32_t		ic_flags_ext;	/* extended state flags */
 	uint32_t		ic_flags_ht;	/* HT state flags */
 	uint32_t		ic_flags_ven;	/* vendor state flags */
 	uint32_t		ic_caps;	/* capabilities */
 	uint32_t		ic_htcaps;	/* HT capabilities */
 	uint32_t		ic_htextcaps;	/* HT extended capabilities */
 	uint32_t		ic_cryptocaps;	/* crypto capabilities */
 						/* set of mode capabilities */
 	uint8_t			ic_modecaps[IEEE80211_MODE_BYTES];
 	uint8_t			ic_promisc;	/* vap's needing promisc mode */
 	uint8_t			ic_allmulti;	/* vap's needing all multicast*/
 	uint8_t			ic_nrunning;	/* vap's marked running */
 	uint8_t			ic_curmode;	/* current mode */
 	uint8_t			ic_macaddr[IEEE80211_ADDR_LEN];
 	uint16_t		ic_bintval;	/* beacon interval */
 	uint16_t		ic_lintval;	/* listen interval */
 	uint16_t		ic_holdover;	/* PM hold over duration */
 	uint16_t		ic_txpowlimit;	/* global tx power limit */
 	struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX];
 
 	/*
 	 * Channel state:
 	 *
 	 * ic_channels is the set of available channels for the device;
 	 *    it is setup by the driver
 	 * ic_nchans is the number of valid entries in ic_channels
 	 * ic_chan_avail is a bit vector of these channels used to check
 	 *    whether a channel is available w/o searching the channel table.
 	 * ic_chan_active is a (potentially) constrained subset of
 	 *    ic_chan_avail that reflects any mode setting or user-specified
 	 *    limit on the set of channels to use/scan
 	 * ic_curchan is the current channel the device is set to; it may
 	 *    be different from ic_bsschan when we are off-channel scanning
 	 *    or otherwise doing background work
 	 * ic_bsschan is the channel selected for operation; it may
 	 *    be undefined (IEEE80211_CHAN_ANYC)
 	 * ic_prevchan is a cached ``previous channel'' used to optimize
 	 *    lookups when switching back+forth between two channels
 	 *    (e.g. for dynamic turbo)
 	 */
 	int			ic_nchans;	/* # entries in ic_channels */
 	struct ieee80211_channel ic_channels[IEEE80211_CHAN_MAX];
 	uint8_t			ic_chan_avail[IEEE80211_CHAN_BYTES];
 	uint8_t			ic_chan_active[IEEE80211_CHAN_BYTES];
 	uint8_t			ic_chan_scan[IEEE80211_CHAN_BYTES];
 	struct ieee80211_channel *ic_curchan;	/* current channel */
 	const struct ieee80211_rate_table *ic_rt; /* table for ic_curchan */
 	struct ieee80211_channel *ic_bsschan;	/* bss channel */
 	struct ieee80211_channel *ic_prevchan;	/* previous channel */
 	struct ieee80211_regdomain ic_regdomain;/* regulatory data */
 	struct ieee80211_appie	*ic_countryie;	/* calculated country ie */
 	struct ieee80211_channel *ic_countryie_chan;
 
 	/* 802.11h/DFS state */
 	struct ieee80211_channel *ic_csa_newchan;/* channel for doing CSA */
 	short			ic_csa_mode;	/* mode for doing CSA */
 	short			ic_csa_count;	/* count for doing CSA */
 	struct ieee80211_dfs_state ic_dfs;	/* DFS state */
 
 	struct ieee80211_scan_state *ic_scan;	/* scan state */
 	struct ieee80211_scan_methods *ic_scan_methods;	/* scan methods */
 	int			ic_lastdata;	/* time of last data frame */
 	int			ic_lastscan;	/* time last scan completed */
 
 	/* NB: this is the union of all vap stations/neighbors */
 	int			ic_max_keyix;	/* max h/w key index */
 	struct ieee80211_node_table ic_sta;	/* stations/neighbors */
 	struct ieee80211_ageq	ic_stageq;	/* frame staging queue */
 	uint32_t		ic_hash_key;	/* random key for mac hash */
 
 	/* XXX multi-bss: split out common/vap parts */
 	struct ieee80211_wme_state ic_wme;	/* WME/WMM state */
 
 	/* XXX multi-bss: can per-vap be done/make sense? */
 	enum ieee80211_protmode	ic_protmode;	/* 802.11g protection mode */
 	uint16_t		ic_nonerpsta;	/* # non-ERP stations */
 	uint16_t		ic_longslotsta;	/* # long slot time stations */
 	uint16_t		ic_sta_assoc;	/* stations associated */
 	uint16_t		ic_ht_sta_assoc;/* HT stations associated */
 	uint16_t		ic_ht40_sta_assoc;/* HT40 stations associated */
 	uint8_t			ic_curhtprotmode;/* HTINFO bss state */
 	enum ieee80211_protmode	ic_htprotmode;	/* HT protection mode */
 	int			ic_lastnonerp;	/* last time non-ERP sta noted*/
 	int			ic_lastnonht;	/* last time non-HT sta noted */
 	uint8_t			ic_rxstream;    /* # RX streams */
 	uint8_t			ic_txstream;    /* # TX streams */
 
 	/* VHT information */
 	uint32_t		ic_vhtcaps;	/* VHT capabilities */
 	uint32_t		ic_vhtextcaps;	/* VHT extended capabilities (TODO) */
 	struct ieee80211_vht_mcs_info	ic_vht_mcsinfo; /* Support TX/RX VHT MCS */
 	uint32_t		ic_flags_vht;	/* VHT state flags */
 	uint32_t		ic_vht_spare[3];
 
 	/* optional state for Atheros SuperG protocol extensions */
 	struct ieee80211_superg	*ic_superg;
 
 	/* radiotap handling */
 	struct ieee80211_radiotap_header *ic_th;/* tx radiotap headers */
 	void			*ic_txchan;	/* channel state in ic_th */
 	struct ieee80211_radiotap_header *ic_rh;/* rx radiotap headers */
 	void			*ic_rxchan;	/* channel state in ic_rh */
 	int			ic_montaps;	/* active monitor mode taps */
 
 	/* virtual ap create/delete */
 	struct ieee80211vap*	(*ic_vap_create)(struct ieee80211com *,
 				    const char [IFNAMSIZ], int,
 				    enum ieee80211_opmode, int,
 				    const uint8_t [IEEE80211_ADDR_LEN],
 				    const uint8_t [IEEE80211_ADDR_LEN]);
 	void			(*ic_vap_delete)(struct ieee80211vap *);
 	/* device specific ioctls */
 	int			(*ic_ioctl)(struct ieee80211com *,
 				    u_long, void *);
 	/* start/stop device */
 	void			(*ic_parent)(struct ieee80211com *);
 	/* operating mode attachment */
 	ieee80211vap_attach	ic_vattach[IEEE80211_OPMODE_MAX];
 	/* return hardware/radio capabilities */
 	void			(*ic_getradiocaps)(struct ieee80211com *,
 				    int, int *, struct ieee80211_channel []);
 	/* check and/or prepare regdomain state change */
 	int			(*ic_setregdomain)(struct ieee80211com *,
 				    struct ieee80211_regdomain *,
 				    int, struct ieee80211_channel []);
 
 	int			(*ic_set_quiet)(struct ieee80211_node *,
 				    u_int8_t *quiet_elm);
 
 	/* regular transmit */
 	int			(*ic_transmit)(struct ieee80211com *,
 				    struct mbuf *);
 	/* send/recv 802.11 management frame */
 	int			(*ic_send_mgmt)(struct ieee80211_node *,
 				     int, int);
 	/* send raw 802.11 frame */
 	int			(*ic_raw_xmit)(struct ieee80211_node *,
 				    struct mbuf *,
 				    const struct ieee80211_bpf_params *);
 	/* update device state for 802.11 slot time change */
 	void			(*ic_updateslot)(struct ieee80211com *);
 	/* handle multicast state changes */
 	void			(*ic_update_mcast)(struct ieee80211com *);
 	/* handle promiscuous mode changes */
 	void			(*ic_update_promisc)(struct ieee80211com *);
 	/* new station association callback/notification */
 	void			(*ic_newassoc)(struct ieee80211_node *, int);
 	/* TDMA update notification */
 	void			(*ic_tdma_update)(struct ieee80211_node *,
 				    const struct ieee80211_tdma_param *, int);
 	/* node state management */
 	struct ieee80211_node*	(*ic_node_alloc)(struct ieee80211vap *,
 				    const uint8_t [IEEE80211_ADDR_LEN]);
 	void			(*ic_node_free)(struct ieee80211_node *);
 	void			(*ic_node_cleanup)(struct ieee80211_node *);
 	void			(*ic_node_age)(struct ieee80211_node *);
 	void			(*ic_node_drain)(struct ieee80211_node *);
 	int8_t			(*ic_node_getrssi)(const struct ieee80211_node*);
 	void			(*ic_node_getsignal)(const struct ieee80211_node*,
 				    int8_t *, int8_t *);
 	void			(*ic_node_getmimoinfo)(
 				    const struct ieee80211_node*,
 				    struct ieee80211_mimo_info *);
 	/* scanning support */
 	void			(*ic_scan_start)(struct ieee80211com *);
 	void			(*ic_scan_end)(struct ieee80211com *);
 	void			(*ic_set_channel)(struct ieee80211com *);
 	void			(*ic_scan_curchan)(struct ieee80211_scan_state *,
 				    unsigned long);
 	void			(*ic_scan_mindwell)(struct ieee80211_scan_state *);
 
 	/*
 	 * 802.11n ADDBA support.  A simple/generic implementation
 	 * of A-MPDU tx aggregation is provided; the driver may
 	 * override these methods to provide their own support.
 	 * A-MPDU rx re-ordering happens automatically if the
 	 * driver passes out-of-order frames to ieee80211_input
 	 * from an assocated HT station.
 	 */
 	int			(*ic_recv_action)(struct ieee80211_node *,
 				    const struct ieee80211_frame *,
 				    const uint8_t *frm, const uint8_t *efrm);
 	int			(*ic_send_action)(struct ieee80211_node *,
 				    int category, int action, void *);
 	/* check if A-MPDU should be enabled this station+ac */
 	int			(*ic_ampdu_enable)(struct ieee80211_node *,
 				    struct ieee80211_tx_ampdu *);
 	/* start/stop doing A-MPDU tx aggregation for a station */
 	int			(*ic_addba_request)(struct ieee80211_node *,
 				    struct ieee80211_tx_ampdu *,
 				    int dialogtoken, int baparamset,
 				    int batimeout);
 	int			(*ic_addba_response)(struct ieee80211_node *,
 				    struct ieee80211_tx_ampdu *,
 				    int status, int baparamset, int batimeout);
 	void			(*ic_addba_stop)(struct ieee80211_node *,
 				    struct ieee80211_tx_ampdu *);
 	void			(*ic_addba_response_timeout)(struct ieee80211_node *,
 				    struct ieee80211_tx_ampdu *);
 	/* BAR response received */
 	void			(*ic_bar_response)(struct ieee80211_node *,
 				    struct ieee80211_tx_ampdu *, int status);
 	/* start/stop doing A-MPDU rx processing for a station */
 	int			(*ic_ampdu_rx_start)(struct ieee80211_node *,
 				    struct ieee80211_rx_ampdu *, int baparamset,
 				    int batimeout, int baseqctl);
 	void			(*ic_ampdu_rx_stop)(struct ieee80211_node *,
 				    struct ieee80211_rx_ampdu *);
 
 	/* The channel width has changed (20<->2040) */
 	void			(*ic_update_chw)(struct ieee80211com *);
 
 	uint64_t		ic_spare[7];
 };
 
 struct ieee80211_aclator;
 struct ieee80211_tdma_state;
 struct ieee80211_mesh_state;
 struct ieee80211_hwmp_state;
 
 struct ieee80211vap {
 	struct ifmedia		iv_media;	/* interface media config */
 	struct ifnet		*iv_ifp;	/* associated device */
 	struct bpf_if		*iv_rawbpf;	/* packet filter structure */
 	struct sysctl_ctx_list	*iv_sysctl;	/* dynamic sysctl context */
 	struct sysctl_oid	*iv_oid;	/* net.wlan.X sysctl oid */
 
 	TAILQ_ENTRY(ieee80211vap) iv_next;	/* list of vap instances */
 	struct ieee80211com	*iv_ic;		/* back ptr to common state */
 	/* MAC address: ifp or ic */
 	uint8_t			iv_myaddr[IEEE80211_ADDR_LEN];
 	uint32_t		iv_debug;	/* debug msg flags */
 	struct ieee80211_stats	iv_stats;	/* statistics */
 
 	uint32_t		iv_flags;	/* state flags */
 	uint32_t		iv_flags_ext;	/* extended state flags */
 	uint32_t		iv_flags_ht;	/* HT state flags */
 	uint32_t		iv_flags_ven;	/* vendor state flags */
 	uint32_t		iv_ifflags;	/* ifnet flags */
 	uint32_t		iv_caps;	/* capabilities */
 	uint32_t		iv_htcaps;	/* HT capabilities */
 	uint32_t		iv_htextcaps;	/* HT extended capabilities */
 	enum ieee80211_opmode	iv_opmode;	/* operation mode */
 	enum ieee80211_state	iv_state;	/* state machine state */
 	enum ieee80211_state	iv_nstate;	/* pending state */
 	int			iv_nstate_arg;	/* pending state arg */
 	struct task		iv_nstate_task;	/* deferred state processing */
 	struct task		iv_swbmiss_task;/* deferred iv_bmiss call */
 	struct callout		iv_mgtsend;	/* mgmt frame response timer */
 						/* inactivity timer settings */
 	int			iv_inact_init;	/* setting for new station */
 	int			iv_inact_auth;	/* auth but not assoc setting */
 	int			iv_inact_run;	/* authorized setting */
 	int			iv_inact_probe;	/* inactive probe time */
 
 	/* VHT flags */
 	uint32_t		iv_flags_vht;	/* VHT state flags */
 	uint32_t		iv_vhtcaps;	/* VHT capabilities */
 	uint32_t		iv_vhtextcaps;	/* VHT extended capabilities (TODO) */
 	struct ieee80211_vht_mcs_info	iv_vht_mcsinfo;
 	uint32_t		iv_vht_spare[4];
 
 	int			iv_des_nssid;	/* # desired ssids */
 	struct ieee80211_scan_ssid iv_des_ssid[1];/* desired ssid table */
 	uint8_t			iv_des_bssid[IEEE80211_ADDR_LEN];
 	struct ieee80211_channel *iv_des_chan;	/* desired channel */
 	uint16_t		iv_des_mode;	/* desired mode */
 	int			iv_nicknamelen;	/* XXX junk */
 	uint8_t			iv_nickname[IEEE80211_NWID_LEN];
 	u_int			iv_bgscanidle;	/* bg scan idle threshold */
 	u_int			iv_bgscanintvl;	/* bg scan min interval */
 	u_int			iv_scanvalid;	/* scan cache valid threshold */
 	u_int			iv_scanreq_duration;
 	u_int			iv_scanreq_mindwell;
 	u_int			iv_scanreq_maxdwell;
 	uint16_t		iv_scanreq_flags;/* held scan request params */
 	uint8_t			iv_scanreq_nssid;
 	struct ieee80211_scan_ssid iv_scanreq_ssid[IEEE80211_SCAN_MAX_SSID];
 	/* sta-mode roaming state */
 	enum ieee80211_roamingmode iv_roaming;	/* roaming mode */
 	struct ieee80211_roamparam iv_roamparms[IEEE80211_MODE_MAX];
 
 	uint8_t			iv_bmissthreshold;
 	uint8_t			iv_bmiss_count;	/* current beacon miss count */
 	int			iv_bmiss_max;	/* max bmiss before scan */
 	uint16_t		iv_swbmiss_count;/* beacons in last period */
 	uint16_t		iv_swbmiss_period;/* s/w bmiss period */
 	struct callout		iv_swbmiss;	/* s/w beacon miss timer */
 
 	int			iv_ampdu_rxmax;	/* A-MPDU rx limit (bytes) */
 	int			iv_ampdu_density;/* A-MPDU density */
 	int			iv_ampdu_limit;	/* A-MPDU tx limit (bytes) */
 	int			iv_amsdu_limit;	/* A-MSDU tx limit (bytes) */
 	u_int			iv_ampdu_mintraffic[WME_NUM_AC];
 
 	struct ieee80211_beacon_offsets iv_bcn_off;
 	uint32_t		*iv_aid_bitmap;	/* association id map */
 	uint16_t		iv_max_aid;
 	uint16_t		iv_sta_assoc;	/* stations associated */
 	uint16_t		iv_ps_sta;	/* stations in power save */
 	uint16_t		iv_ps_pending;	/* ps sta's w/ pending frames */
 	uint16_t		iv_txseq;	/* mcast xmit seq# space */
 	uint16_t		iv_tim_len;	/* ic_tim_bitmap size (bytes) */
 	uint8_t			*iv_tim_bitmap;	/* power-save stations w/ data*/
 	uint8_t			iv_dtim_period;	/* DTIM period */
 	uint8_t			iv_dtim_count;	/* DTIM count from last bcn */
 						/* set/unset aid pwrsav state */
 	uint8_t			iv_quiet;	/* Quiet Element */
 	uint8_t			iv_quiet_count;	/* constant count for Quiet Element */
 	uint8_t			iv_quiet_count_value;	/* variable count for Quiet Element */
 	uint8_t			iv_quiet_period;	/* period for Quiet Element */
 	uint16_t		iv_quiet_duration;	/* duration for Quiet Element */
 	uint16_t		iv_quiet_offset;	/* offset for Quiet Element */
 	int			iv_csa_count;	/* count for doing CSA */
 
 	struct ieee80211_node	*iv_bss;	/* information for this node */
 	struct ieee80211_txparam iv_txparms[IEEE80211_MODE_MAX];
 	uint16_t		iv_rtsthreshold;
 	uint16_t		iv_fragthreshold;
 	int			iv_inact_timer;	/* inactivity timer wait */
 	/* application-specified IE's to attach to mgt frames */
 	struct ieee80211_appie	*iv_appie_beacon;
 	struct ieee80211_appie	*iv_appie_probereq;
 	struct ieee80211_appie	*iv_appie_proberesp;
 	struct ieee80211_appie	*iv_appie_assocreq;
 	struct ieee80211_appie	*iv_appie_assocresp;
 	struct ieee80211_appie	*iv_appie_wpa;
 	uint8_t			*iv_wpa_ie;
 	uint8_t			*iv_rsn_ie;
 
 	/* Key management */
 	uint16_t		iv_max_keyix;	/* max h/w key index */
 	ieee80211_keyix		iv_def_txkey;	/* default/group tx key index */
 	struct ieee80211_key	iv_nw_keys[IEEE80211_WEP_NKID];
 	int			(*iv_key_alloc)(struct ieee80211vap *,
 				    struct ieee80211_key *,
 				    ieee80211_keyix *, ieee80211_keyix *);
 	int			(*iv_key_delete)(struct ieee80211vap *, 
 				    const struct ieee80211_key *);
 	int			(*iv_key_set)(struct ieee80211vap *,
 				    const struct ieee80211_key *);
 	void			(*iv_key_update_begin)(struct ieee80211vap *);
 	void			(*iv_key_update_end)(struct ieee80211vap *);
 	void			(*iv_update_deftxkey)(struct ieee80211vap *,
 				    ieee80211_keyix deftxkey);
 
 	const struct ieee80211_authenticator *iv_auth; /* authenticator glue */
 	void			*iv_ec;		/* private auth state */
 
 	const struct ieee80211_aclator *iv_acl;	/* acl glue */
 	void			*iv_as;		/* private aclator state */
 
 	const struct ieee80211_ratectl *iv_rate;
 	void			*iv_rs;		/* private ratectl state */
 
 	struct ieee80211_tdma_state *iv_tdma;	/* tdma state */
 	struct ieee80211_mesh_state *iv_mesh;	/* MBSS state */
 	struct ieee80211_hwmp_state *iv_hwmp;	/* HWMP state */
 
 	/* operate-mode detach hook */
 	void			(*iv_opdetach)(struct ieee80211vap *);
 	/* receive processing */
 	int			(*iv_input)(struct ieee80211_node *,
 				    struct mbuf *,
 				    const struct ieee80211_rx_stats *,
 				    int, int);
 	void			(*iv_recv_mgmt)(struct ieee80211_node *,
 				    struct mbuf *, int,
 				    const struct ieee80211_rx_stats *,
 				    int, int);
 	void			(*iv_recv_ctl)(struct ieee80211_node *,
 				    struct mbuf *, int);
 	void			(*iv_deliver_data)(struct ieee80211vap *,
 				    struct ieee80211_node *, struct mbuf *);
 #if 0
 	/* send processing */
 	int			(*iv_send_mgmt)(struct ieee80211_node *,
 				     int, int);
 #endif
 	/* beacon miss processing */
 	void			(*iv_bmiss)(struct ieee80211vap *);
 	/* reset device state after 802.11 parameter/state change */
 	int			(*iv_reset)(struct ieee80211vap *, u_long);
 	/* [schedule] beacon frame update */
 	void			(*iv_update_beacon)(struct ieee80211vap *, int);
 	/* power save handling */
 	void			(*iv_update_ps)(struct ieee80211vap *, int);
 	int			(*iv_set_tim)(struct ieee80211_node *, int);
 	void			(*iv_node_ps)(struct ieee80211_node *, int);
 	void			(*iv_sta_ps)(struct ieee80211vap *, int);
 	void			(*iv_recv_pspoll)(struct ieee80211_node *,
 				    struct mbuf *);
 
 	/* state machine processing */
 	int			(*iv_newstate)(struct ieee80211vap *,
 				    enum ieee80211_state, int);
 	/* 802.3 output method for raw frame xmit */
 	int			(*iv_output)(struct ifnet *, struct mbuf *,
 				    const struct sockaddr *, struct route *);
 
 	uint64_t		iv_spare[6];
 };
 MALLOC_DECLARE(M_80211_VAP);
 
 #define	IEEE80211_ADDR_EQ(a1,a2)	(memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0)
 #define	IEEE80211_ADDR_COPY(dst,src)	memcpy(dst,src,IEEE80211_ADDR_LEN)
 
 /* ic_flags/iv_flags */
 #define	IEEE80211_F_TURBOP	0x00000001	/* CONF: ATH Turbo enabled*/
 #define	IEEE80211_F_COMP	0x00000002	/* CONF: ATH comp enabled */
 #define	IEEE80211_F_FF		0x00000004	/* CONF: ATH FF enabled */
 #define	IEEE80211_F_BURST	0x00000008	/* CONF: bursting enabled */
 /* NB: this is intentionally setup to be IEEE80211_CAPINFO_PRIVACY */
 #define	IEEE80211_F_PRIVACY	0x00000010	/* CONF: privacy enabled */
 #define	IEEE80211_F_PUREG	0x00000020	/* CONF: 11g w/o 11b sta's */
 #define	IEEE80211_F_SCAN	0x00000080	/* STATUS: scanning */
 #define	IEEE80211_F_ASCAN	0x00000100	/* STATUS: active scan */
 #define	IEEE80211_F_SIBSS	0x00000200	/* STATUS: start IBSS */
 /* NB: this is intentionally setup to be IEEE80211_CAPINFO_SHORT_SLOTTIME */
 #define	IEEE80211_F_SHSLOT	0x00000400	/* STATUS: use short slot time*/
 #define	IEEE80211_F_PMGTON	0x00000800	/* CONF: Power mgmt enable */
 #define	IEEE80211_F_DESBSSID	0x00001000	/* CONF: des_bssid is set */
 #define	IEEE80211_F_WME		0x00002000	/* CONF: enable WME use */
 #define	IEEE80211_F_BGSCAN	0x00004000	/* CONF: bg scan enabled (???)*/
 #define	IEEE80211_F_SWRETRY	0x00008000	/* CONF: sw tx retry enabled */
 #define IEEE80211_F_TXPOW_FIXED	0x00010000	/* TX Power: fixed rate */
 #define	IEEE80211_F_IBSSON	0x00020000	/* CONF: IBSS creation enable */
 #define	IEEE80211_F_SHPREAMBLE	0x00040000	/* STATUS: use short preamble */
 #define	IEEE80211_F_DATAPAD	0x00080000	/* CONF: do alignment pad */
 #define	IEEE80211_F_USEPROT	0x00100000	/* STATUS: protection enabled */
 #define	IEEE80211_F_USEBARKER	0x00200000	/* STATUS: use barker preamble*/
 #define	IEEE80211_F_CSAPENDING	0x00400000	/* STATUS: chan switch pending*/
 #define	IEEE80211_F_WPA1	0x00800000	/* CONF: WPA enabled */
 #define	IEEE80211_F_WPA2	0x01000000	/* CONF: WPA2 enabled */
 #define	IEEE80211_F_WPA		0x01800000	/* CONF: WPA/WPA2 enabled */
 #define	IEEE80211_F_DROPUNENC	0x02000000	/* CONF: drop unencrypted */
 #define	IEEE80211_F_COUNTERM	0x04000000	/* CONF: TKIP countermeasures */
 #define	IEEE80211_F_HIDESSID	0x08000000	/* CONF: hide SSID in beacon */
 #define	IEEE80211_F_NOBRIDGE	0x10000000	/* CONF: dis. internal bridge */
 #define	IEEE80211_F_PCF		0x20000000	/* CONF: PCF enabled */
 #define	IEEE80211_F_DOTH	0x40000000	/* CONF: 11h enabled */
 #define	IEEE80211_F_DWDS	0x80000000	/* CONF: Dynamic WDS enabled */
 
 #define	IEEE80211_F_BITS \
 	"\20\1TURBOP\2COMP\3FF\4BURST\5PRIVACY\6PUREG\10SCAN\11ASCAN\12SIBSS" \
 	"\13SHSLOT\14PMGTON\15DESBSSID\16WME\17BGSCAN\20SWRETRY\21TXPOW_FIXED" \
 	"\22IBSSON\23SHPREAMBLE\24DATAPAD\25USEPROT\26USERBARKER\27CSAPENDING" \
 	"\30WPA1\31WPA2\32DROPUNENC\33COUNTERM\34HIDESSID\35NOBRIDG\36PCF" \
 	"\37DOTH\40DWDS"
 
 /* Atheros protocol-specific flags */
 #define	IEEE80211_F_ATHEROS \
 	(IEEE80211_F_FF | IEEE80211_F_COMP | IEEE80211_F_TURBOP)
 /* Check if an Atheros capability was negotiated for use */
 #define	IEEE80211_ATH_CAP(vap, ni, bit) \
 	((vap)->iv_flags & (ni)->ni_ath_flags & (bit))
 
 /* ic_flags_ext/iv_flags_ext */
 #define	IEEE80211_FEXT_INACT	 0x00000002	/* CONF: sta inact handling */
 #define	IEEE80211_FEXT_SCANWAIT	 0x00000004	/* STATUS: awaiting scan */
 /* 0x00000006 reserved */
 #define	IEEE80211_FEXT_BGSCAN	 0x00000008	/* STATUS: complete bgscan */
 #define	IEEE80211_FEXT_WPS	 0x00000010	/* CONF: WPS enabled */
 #define	IEEE80211_FEXT_TSN 	 0x00000020	/* CONF: TSN enabled */
 #define	IEEE80211_FEXT_SCANREQ	 0x00000040	/* STATUS: scan req params */
 #define	IEEE80211_FEXT_RESUME	 0x00000080	/* STATUS: start on resume */
 #define	IEEE80211_FEXT_4ADDR	 0x00000100	/* CONF: apply 4-addr encap */
 #define	IEEE80211_FEXT_NONERP_PR 0x00000200	/* STATUS: non-ERP sta present*/
 #define	IEEE80211_FEXT_SWBMISS	 0x00000400	/* CONF: do bmiss in s/w */
 #define	IEEE80211_FEXT_DFS	 0x00000800	/* CONF: DFS enabled */
 #define	IEEE80211_FEXT_DOTD	 0x00001000	/* CONF: 11d enabled */
 #define	IEEE80211_FEXT_STATEWAIT 0x00002000	/* STATUS: awaiting state chg */
 #define	IEEE80211_FEXT_REINIT	 0x00004000	/* STATUS: INIT state first */
 #define	IEEE80211_FEXT_BPF	 0x00008000	/* STATUS: BPF tap present */
 /* NB: immutable: should be set only when creating a vap */
 #define	IEEE80211_FEXT_WDSLEGACY 0x00010000	/* CONF: legacy WDS operation */
 #define	IEEE80211_FEXT_PROBECHAN 0x00020000	/* CONF: probe passive channel*/
 #define	IEEE80211_FEXT_UNIQMAC	 0x00040000	/* CONF: user or computed mac */
 #define	IEEE80211_FEXT_SCAN_OFFLOAD	0x00080000	/* CONF: scan is fully offloaded */
 
 #define	IEEE80211_FEXT_BITS \
 	"\20\2INACT\3SCANWAIT\4BGSCAN\5WPS\6TSN\7SCANREQ\10RESUME" \
 	"\0114ADDR\12NONEPR_PR\13SWBMISS\14DFS\15DOTD\16STATEWAIT\17REINIT" \
 	"\20BPF\21WDSLEGACY\22PROBECHAN\23UNIQMAC\24SCAN_OFFLOAD"
 
 /* ic_flags_ht/iv_flags_ht */
 #define	IEEE80211_FHT_NONHT_PR	 0x00000001	/* STATUS: non-HT sta present */
 #define	IEEE80211_FHT_GF  	 0x00040000	/* CONF: Greenfield enabled */
 #define	IEEE80211_FHT_HT	 0x00080000	/* CONF: HT supported */
 #define	IEEE80211_FHT_AMPDU_TX	 0x00100000	/* CONF: A-MPDU tx supported */
 #define	IEEE80211_FHT_AMPDU_RX	 0x00200000	/* CONF: A-MPDU rx supported */
 #define	IEEE80211_FHT_AMSDU_TX	 0x00400000	/* CONF: A-MSDU tx supported */
 #define	IEEE80211_FHT_AMSDU_RX	 0x00800000	/* CONF: A-MSDU rx supported */
 #define	IEEE80211_FHT_USEHT40	 0x01000000	/* CONF: 20/40 use enabled */
 #define	IEEE80211_FHT_PUREN	 0x02000000	/* CONF: 11n w/o legacy sta's */
 #define	IEEE80211_FHT_SHORTGI20	 0x04000000	/* CONF: short GI in HT20 */
 #define	IEEE80211_FHT_SHORTGI40	 0x08000000	/* CONF: short GI in HT40 */
 #define	IEEE80211_FHT_HTCOMPAT 	 0x10000000	/* CONF: HT vendor OUI's */
 #define	IEEE80211_FHT_RIFS  	 0x20000000	/* CONF: RIFS enabled */
 #define	IEEE80211_FHT_STBC_TX 	 0x40000000	/* CONF: STBC tx enabled */
 #define	IEEE80211_FHT_STBC_RX 	 0x80000000	/* CONF: STBC rx enabled */
 
 #define	IEEE80211_FHT_BITS \
 	"\20\1NONHT_PR" \
 	"\23GF\24HT\25AMPDU_TX\26AMPDU_TX" \
 	"\27AMSDU_TX\30AMSDU_RX\31USEHT40\32PUREN\33SHORTGI20\34SHORTGI40" \
 	"\35HTCOMPAT\36RIFS\37STBC_TX\40STBC_RX"
 
 #define	IEEE80211_FVEN_BITS	"\20"
 
 #define	IEEE80211_FVHT_VHT	0x000000001	/* CONF: VHT supported */
+#define	IEEE80211_FVHT_USEVHT40	0x000000002	/* CONF: Use VHT40 */
+#define	IEEE80211_FVHT_USEVHT80	0x000000004	/* CONF: Use VHT80 */
+#define	IEEE80211_FVHT_USEVHT80P80	0x000000008	/* CONF: Use VHT 80+80 */
+#define	IEEE80211_FVHT_USEVHT160	0x000000010	/* CONF: Use VHT160 */
 #define	IEEE80211_VFHT_BITS \
-	"\20\1VHT"
+	"\20\1VHT\2VHT40\3VHT80\4VHT80P80\5VHT160"
 
 int	ic_printf(struct ieee80211com *, const char *, ...) __printflike(2, 3);
 void	ieee80211_ifattach(struct ieee80211com *);
 void	ieee80211_ifdetach(struct ieee80211com *);
 int	ieee80211_vap_setup(struct ieee80211com *, struct ieee80211vap *,
 		const char name[IFNAMSIZ], int unit,
 		enum ieee80211_opmode opmode, int flags,
 		const uint8_t bssid[IEEE80211_ADDR_LEN]);
 int	ieee80211_vap_attach(struct ieee80211vap *,
 		ifm_change_cb_t, ifm_stat_cb_t,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 void	ieee80211_vap_detach(struct ieee80211vap *);
 const struct ieee80211_rateset *ieee80211_get_suprates(struct ieee80211com *ic,
 		const struct ieee80211_channel *);
 void	ieee80211_announce(struct ieee80211com *);
 void	ieee80211_announce_channels(struct ieee80211com *);
 void	ieee80211_drain(struct ieee80211com *);
 void	ieee80211_chan_init(struct ieee80211com *);
 struct ieee80211com *ieee80211_find_vap(const uint8_t mac[IEEE80211_ADDR_LEN]);
 struct ieee80211com *ieee80211_find_com(const char *name);
 typedef void ieee80211_com_iter_func(void *, struct ieee80211com *);
 void	ieee80211_iterate_coms(ieee80211_com_iter_func *, void *);
 int	ieee80211_media_change(struct ifnet *);
 void	ieee80211_media_status(struct ifnet *, struct ifmediareq *);
 int	ieee80211_ioctl(struct ifnet *, u_long, caddr_t);
 int	ieee80211_rate2media(struct ieee80211com *, int,
 		enum ieee80211_phymode);
 int	ieee80211_media2rate(int);
 int	ieee80211_mhz2ieee(u_int, u_int);
 int	ieee80211_chan2ieee(struct ieee80211com *,
 		const struct ieee80211_channel *);
 u_int	ieee80211_ieee2mhz(u_int, u_int);
 int	ieee80211_add_channel(struct ieee80211_channel[], int, int *,
 	    uint8_t, uint16_t, int8_t, uint32_t, const uint8_t[]);
 int	ieee80211_add_channel_ht40(struct ieee80211_channel[], int, int *,
 	    uint8_t, int8_t, uint32_t);
 uint32_t ieee80211_get_channel_center_freq(const struct ieee80211_channel *);
 uint32_t ieee80211_get_channel_center_freq1(const struct ieee80211_channel *);
 uint32_t ieee80211_get_channel_center_freq2(const struct ieee80211_channel *);
 int	ieee80211_add_channel_list_2ghz(struct ieee80211_channel[], int, int *,
 	    const uint8_t[], int, const uint8_t[], int);
 int	ieee80211_add_channel_list_5ghz(struct ieee80211_channel[], int, int *,
 	    const uint8_t[], int, const uint8_t[], int);
 struct ieee80211_channel *ieee80211_find_channel(struct ieee80211com *,
 		int freq, int flags);
 struct ieee80211_channel *ieee80211_find_channel_byieee(struct ieee80211com *,
 		int ieee, int flags);
 struct ieee80211_channel *ieee80211_lookup_channel_rxstatus(struct ieee80211vap *,
 		const struct ieee80211_rx_stats *);
 int	ieee80211_setmode(struct ieee80211com *, enum ieee80211_phymode);
 enum ieee80211_phymode ieee80211_chan2mode(const struct ieee80211_channel *);
 uint32_t ieee80211_mac_hash(const struct ieee80211com *,
 		const uint8_t addr[IEEE80211_ADDR_LEN]);
 char	ieee80211_channel_type_char(const struct ieee80211_channel *c);
 
 #define	ieee80211_get_current_channel(_ic)	((_ic)->ic_curchan)
 #define	ieee80211_get_home_channel(_ic)		((_ic)->ic_bsschan)
 #define	ieee80211_get_vap_desired_channel(_iv)	((_iv)->iv_des_chan)
 
 void	ieee80211_radiotap_attach(struct ieee80211com *,
 	    struct ieee80211_radiotap_header *th, int tlen,
 		uint32_t tx_radiotap,
 	    struct ieee80211_radiotap_header *rh, int rlen,
 		uint32_t rx_radiotap);
 void	ieee80211_radiotap_attachv(struct ieee80211com *,
 	    struct ieee80211_radiotap_header *th,
 	    int tlen, int n_tx_v, uint32_t tx_radiotap,
 	    struct ieee80211_radiotap_header *rh,
 	    int rlen, int n_rx_v, uint32_t rx_radiotap);
 void	ieee80211_radiotap_detach(struct ieee80211com *);
 void	ieee80211_radiotap_vattach(struct ieee80211vap *);
 void	ieee80211_radiotap_vdetach(struct ieee80211vap *);
 void	ieee80211_radiotap_chan_change(struct ieee80211com *);
 void	ieee80211_radiotap_tx(struct ieee80211vap *, struct mbuf *);
 void	ieee80211_radiotap_rx(struct ieee80211vap *, struct mbuf *);
 void	ieee80211_radiotap_rx_all(struct ieee80211com *, struct mbuf *);
 
 static __inline int
 ieee80211_radiotap_active(const struct ieee80211com *ic)
 {
 	return (ic->ic_flags_ext & IEEE80211_FEXT_BPF) != 0;
 }
 
 static __inline int
 ieee80211_radiotap_active_vap(const struct ieee80211vap *vap)
 {
 	return (vap->iv_flags_ext & IEEE80211_FEXT_BPF) ||
 	    vap->iv_ic->ic_montaps != 0;
 }
 
 /*
  * Enqueue a task on the state thread.
  */
 static __inline void
 ieee80211_runtask(struct ieee80211com *ic, struct task *task)
 {
 	taskqueue_enqueue(ic->ic_tq, task);
 }
 
 /*
  * Wait for a queued task to complete.
  */
 static __inline void
 ieee80211_draintask(struct ieee80211com *ic, struct task *task)
 {
 	taskqueue_drain(ic->ic_tq, task);
 }
 
 /* 
  * Key update synchronization methods.  XXX should not be visible.
  */
 static __inline void
 ieee80211_key_update_begin(struct ieee80211vap *vap)
 {
 	vap->iv_key_update_begin(vap);
 }
 static __inline void
 ieee80211_key_update_end(struct ieee80211vap *vap)
 {
 	vap->iv_key_update_end(vap);
 }
 
 /*
  * XXX these need to be here for IEEE80211_F_DATAPAD
  */
 
 /*
  * Return the space occupied by the 802.11 header and any
  * padding required by the driver.  This works for a
  * management or data frame.
  */
 static __inline int
 ieee80211_hdrspace(struct ieee80211com *ic, const void *data)
 {
 	int size = ieee80211_hdrsize(data);
 	if (ic->ic_flags & IEEE80211_F_DATAPAD)
 		size = roundup(size, sizeof(uint32_t));
 	return size;
 }
 
 /*
  * Like ieee80211_hdrspace, but handles any type of frame.
  */
 static __inline int
 ieee80211_anyhdrspace(struct ieee80211com *ic, const void *data)
 {
 	int size = ieee80211_anyhdrsize(data);
 	if (ic->ic_flags & IEEE80211_F_DATAPAD)
 		size = roundup(size, sizeof(uint32_t));
 	return size;
 }
 
 /*
  * Notify a vap that beacon state has been updated.
  */
 static __inline void
 ieee80211_beacon_notify(struct ieee80211vap *vap, int what)
 {
 	if (vap->iv_state == IEEE80211_S_RUN)
 		vap->iv_update_beacon(vap, what);
 }
 
 /*
  * Calculate HT channel promotion flags for a channel.
  * XXX belongs in ieee80211_ht.h but needs IEEE80211_FHT_*
  */
 static __inline int
 ieee80211_htchanflags(const struct ieee80211_channel *c)
 {
 	return IEEE80211_IS_CHAN_HT40(c) ?
 	    IEEE80211_FHT_HT | IEEE80211_FHT_USEHT40 :
 	    IEEE80211_IS_CHAN_HT(c) ?  IEEE80211_FHT_HT : 0;
+}
+
+/*
+ * Calculate VHT channel promotion flags for a channel.
+ * XXX belongs in ieee80211_vht.h but needs IEEE80211_FVHT_*
+ */
+static __inline int
+ieee80211_vhtchanflags(const struct ieee80211_channel *c)
+{
+
+	if (IEEE80211_IS_CHAN_VHT160(c))
+		return IEEE80211_FVHT_USEVHT160;
+	if (IEEE80211_IS_CHAN_VHT80_80(c))
+		return IEEE80211_FVHT_USEVHT80P80;
+	if (IEEE80211_IS_CHAN_VHT80(c))
+		return IEEE80211_FVHT_USEVHT80;
+	if (IEEE80211_IS_CHAN_VHT40(c))
+		return IEEE80211_FVHT_USEVHT40;
+	if (IEEE80211_IS_CHAN_VHT(c))
+		return IEEE80211_FVHT_VHT;
+	return (0);
 }
 
 /*
  * Fetch the current TX power (cap) for the given node.
  *
  * This includes the node and ic/vap TX power limit as needed,
  * but it doesn't take into account any per-rate limit.
  */
 static __inline uint16_t
 ieee80211_get_node_txpower(struct ieee80211_node *ni)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	uint16_t txpower;
 
 	txpower = ni->ni_txpower;
 	txpower = MIN(txpower, ic->ic_txpowlimit);
 	if (ic->ic_curchan != NULL) {
 		txpower = MIN(txpower, 2 * ic->ic_curchan->ic_maxregpower);
 		txpower = MIN(txpower, ic->ic_curchan->ic_maxpower);
 	}
 
 	return (txpower);
 }
 
 /*
  * Debugging facilities compiled in when IEEE80211_DEBUG is defined.
  *
  * The intent is that any problem in the net80211 layer can be
  * diagnosed by inspecting the statistics (dumped by the wlanstats
  * program) and/or the msgs generated by net80211.  Messages are
  * broken into functional classes and can be controlled with the
  * wlandebug program.  Certain of these msg groups are for facilities
  * that are no longer part of net80211 (e.g. IEEE80211_MSG_DOT1XSM).
  */
 #define	IEEE80211_MSG_11N	0x80000000	/* 11n mode debug */
 #define	IEEE80211_MSG_DEBUG	0x40000000	/* IFF_DEBUG equivalent */
 #define	IEEE80211_MSG_DUMPPKTS	0x20000000	/* IFF_LINK2 equivalant */
 #define	IEEE80211_MSG_CRYPTO	0x10000000	/* crypto work */
 #define	IEEE80211_MSG_INPUT	0x08000000	/* input handling */
 #define	IEEE80211_MSG_XRATE	0x04000000	/* rate set handling */
 #define	IEEE80211_MSG_ELEMID	0x02000000	/* element id parsing */
 #define	IEEE80211_MSG_NODE	0x01000000	/* node handling */
 #define	IEEE80211_MSG_ASSOC	0x00800000	/* association handling */
 #define	IEEE80211_MSG_AUTH	0x00400000	/* authentication handling */
 #define	IEEE80211_MSG_SCAN	0x00200000	/* scanning */
 #define	IEEE80211_MSG_OUTPUT	0x00100000	/* output handling */
 #define	IEEE80211_MSG_STATE	0x00080000	/* state machine */
 #define	IEEE80211_MSG_POWER	0x00040000	/* power save handling */
 #define	IEEE80211_MSG_HWMP	0x00020000	/* hybrid mesh protocol */
 #define	IEEE80211_MSG_DOT1XSM	0x00010000	/* 802.1x state machine */
 #define	IEEE80211_MSG_RADIUS	0x00008000	/* 802.1x radius client */
 #define	IEEE80211_MSG_RADDUMP	0x00004000	/* dump 802.1x radius packets */
 #define	IEEE80211_MSG_MESH	0x00002000	/* mesh networking */
 #define	IEEE80211_MSG_WPA	0x00001000	/* WPA/RSN protocol */
 #define	IEEE80211_MSG_ACL	0x00000800	/* ACL handling */
 #define	IEEE80211_MSG_WME	0x00000400	/* WME protocol */
 #define	IEEE80211_MSG_SUPERG	0x00000200	/* Atheros SuperG protocol */
 #define	IEEE80211_MSG_DOTH	0x00000100	/* 802.11h support */
 #define	IEEE80211_MSG_INACT	0x00000080	/* inactivity handling */
 #define	IEEE80211_MSG_ROAM	0x00000040	/* sta-mode roaming */
 #define	IEEE80211_MSG_RATECTL	0x00000020	/* tx rate control */
 #define	IEEE80211_MSG_ACTION	0x00000010	/* action frame handling */
 #define	IEEE80211_MSG_WDS	0x00000008	/* WDS handling */
 #define	IEEE80211_MSG_IOCTL	0x00000004	/* ioctl handling */
 #define	IEEE80211_MSG_TDMA	0x00000002	/* TDMA handling */
 
 #define	IEEE80211_MSG_ANY	0xffffffff	/* anything */
 
 #define	IEEE80211_MSG_BITS \
 	"\20\2TDMA\3IOCTL\4WDS\5ACTION\6RATECTL\7ROAM\10INACT\11DOTH\12SUPERG" \
 	"\13WME\14ACL\15WPA\16RADKEYS\17RADDUMP\20RADIUS\21DOT1XSM\22HWMP" \
 	"\23POWER\24STATE\25OUTPUT\26SCAN\27AUTH\30ASSOC\31NODE\32ELEMID" \
 	"\33XRATE\34INPUT\35CRYPTO\36DUPMPKTS\37DEBUG\04011N"
 
 #ifdef IEEE80211_DEBUG
 #define	ieee80211_msg(_vap, _m)	((_vap)->iv_debug & (_m))
 #define	IEEE80211_DPRINTF(_vap, _m, _fmt, ...) do {			\
 	if (ieee80211_msg(_vap, _m))					\
 		ieee80211_note(_vap, _fmt, __VA_ARGS__);		\
 } while (0)
 #define	IEEE80211_NOTE(_vap, _m, _ni, _fmt, ...) do {			\
 	if (ieee80211_msg(_vap, _m))					\
 		ieee80211_note_mac(_vap, (_ni)->ni_macaddr, _fmt, __VA_ARGS__);\
 } while (0)
 #define	IEEE80211_NOTE_MAC(_vap, _m, _mac, _fmt, ...) do {		\
 	if (ieee80211_msg(_vap, _m))					\
 		ieee80211_note_mac(_vap, _mac, _fmt, __VA_ARGS__);	\
 } while (0)
 #define	IEEE80211_NOTE_FRAME(_vap, _m, _wh, _fmt, ...) do {		\
 	if (ieee80211_msg(_vap, _m))					\
 		ieee80211_note_frame(_vap, _wh, _fmt, __VA_ARGS__);	\
 } while (0)
 void	ieee80211_note(const struct ieee80211vap *, const char *, ...);
 void	ieee80211_note_mac(const struct ieee80211vap *,
 		const uint8_t mac[IEEE80211_ADDR_LEN], const char *, ...);
 void	ieee80211_note_frame(const struct ieee80211vap *,
 		const struct ieee80211_frame *, const char *, ...);
 #define	ieee80211_msg_debug(_vap) \
 	((_vap)->iv_debug & IEEE80211_MSG_DEBUG)
 #define	ieee80211_msg_dumppkts(_vap) \
 	((_vap)->iv_debug & IEEE80211_MSG_DUMPPKTS)
 #define	ieee80211_msg_input(_vap) \
 	((_vap)->iv_debug & IEEE80211_MSG_INPUT)
 #define	ieee80211_msg_radius(_vap) \
 	((_vap)->iv_debug & IEEE80211_MSG_RADIUS)
 #define	ieee80211_msg_dumpradius(_vap) \
 	((_vap)->iv_debug & IEEE80211_MSG_RADDUMP)
 #define	ieee80211_msg_dumpradkeys(_vap) \
 	((_vap)->iv_debug & IEEE80211_MSG_RADKEYS)
 #define	ieee80211_msg_scan(_vap) \
 	((_vap)->iv_debug & IEEE80211_MSG_SCAN)
 #define	ieee80211_msg_assoc(_vap) \
 	((_vap)->iv_debug & IEEE80211_MSG_ASSOC)
 
 /*
  * Emit a debug message about discarding a frame or information
  * element.  One format is for extracting the mac address from
  * the frame header; the other is for when a header is not
  * available or otherwise appropriate.
  */
 #define	IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...) do {		\
 	if ((_vap)->iv_debug & (_m))					\
 		ieee80211_discard_frame(_vap, _wh, _type, _fmt, __VA_ARGS__);\
 } while (0)
 #define	IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...) do {	\
 	if ((_vap)->iv_debug & (_m))					\
 		ieee80211_discard_ie(_vap, _wh, _type, _fmt, __VA_ARGS__);\
 } while (0)
 #define	IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) do {	\
 	if ((_vap)->iv_debug & (_m))					\
 		ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\
 } while (0)
 
 void ieee80211_discard_frame(const struct ieee80211vap *,
 	const struct ieee80211_frame *, const char *type, const char *fmt, ...);
 void ieee80211_discard_ie(const struct ieee80211vap *,
 	const struct ieee80211_frame *, const char *type, const char *fmt, ...);
 void ieee80211_discard_mac(const struct ieee80211vap *,
 	const uint8_t mac[IEEE80211_ADDR_LEN], const char *type,
 	const char *fmt, ...);
 #else
 #define	IEEE80211_DPRINTF(_vap, _m, _fmt, ...)
 #define	IEEE80211_NOTE(_vap, _m, _ni, _fmt, ...)
 #define	IEEE80211_NOTE_FRAME(_vap, _m, _wh, _fmt, ...)
 #define	IEEE80211_NOTE_MAC(_vap, _m, _mac, _fmt, ...)
 #define	ieee80211_msg_dumppkts(_vap)	0
 #define	ieee80211_msg(_vap, _m)		0
 
 #define	IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...)
 #define	IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...)
 #define	IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...)
 #endif
 
 #endif /* _NET80211_IEEE80211_VAR_H_ */
Index: projects/bsnmp-ipv6-mib/sys/sys/socket.h
===================================================================
--- projects/bsnmp-ipv6-mib/sys/sys/socket.h	(revision 311636)
+++ projects/bsnmp-ipv6-mib/sys/sys/socket.h	(revision 311637)
@@ -1,690 +1,691 @@
 /*-
  * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
  * $FreeBSD$
  */
 
 #ifndef _SYS_SOCKET_H_
 #define	_SYS_SOCKET_H_
 
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 #include <sys/_iovec.h>
 #include <machine/_align.h>
 
 /*
  * Definitions related to sockets: types, address families, options.
  */
 
 /*
  * Data types.
  */
 #if __BSD_VISIBLE
 #ifndef _GID_T_DECLARED
 typedef	__gid_t		gid_t;
 #define	_GID_T_DECLARED
 #endif
 
 #ifndef _OFF_T_DECLARED
 typedef	__off_t		off_t;
 #define	_OFF_T_DECLARED
 #endif
 
 #ifndef _PID_T_DECLARED
 typedef	__pid_t		pid_t;
 #define	_PID_T_DECLARED
 #endif
 #endif
 
 #ifndef _SA_FAMILY_T_DECLARED
 typedef	__sa_family_t	sa_family_t;
 #define	_SA_FAMILY_T_DECLARED
 #endif
 
 #ifndef _SOCKLEN_T_DECLARED
 typedef	__socklen_t	socklen_t;
 #define	_SOCKLEN_T_DECLARED
 #endif
  
 #ifndef _SSIZE_T_DECLARED
 typedef	__ssize_t	ssize_t;
 #define	_SSIZE_T_DECLARED
 #endif
 
 #if __BSD_VISIBLE 
 #ifndef _UID_T_DECLARED
 typedef	__uid_t		uid_t;
 #define	_UID_T_DECLARED
 #endif
 #endif
 
 #ifndef _UINT32_T_DECLARED
 typedef	__uint32_t	uint32_t;
 #define	_UINT32_T_DECLARED
 #endif
 
 #ifndef _UINTPTR_T_DECLARED
 typedef	__uintptr_t	uintptr_t;
 #define	_UINTPTR_T_DECLARED
 #endif
 
 /*
  * Types
  */
 #define	SOCK_STREAM	1		/* stream socket */
 #define	SOCK_DGRAM	2		/* datagram socket */
 #define	SOCK_RAW	3		/* raw-protocol interface */
 #if __BSD_VISIBLE
 #define	SOCK_RDM	4		/* reliably-delivered message */
 #endif
 #define	SOCK_SEQPACKET	5		/* sequenced packet stream */
 
 #if __BSD_VISIBLE
 /*
  * Creation flags, OR'ed into socket() and socketpair() type argument.
  */
 #define	SOCK_CLOEXEC	0x10000000
 #define	SOCK_NONBLOCK	0x20000000
 #endif
 
 /*
  * Option flags per-socket.
  */
 #define	SO_DEBUG	0x0001		/* turn on debugging info recording */
 #define	SO_ACCEPTCONN	0x0002		/* socket has had listen() */
 #define	SO_REUSEADDR	0x0004		/* allow local address reuse */
 #define	SO_KEEPALIVE	0x0008		/* keep connections alive */
 #define	SO_DONTROUTE	0x0010		/* just use interface addresses */
 #define	SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
 #if __BSD_VISIBLE
 #define	SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
 #endif
 #define	SO_LINGER	0x0080		/* linger on close if data present */
 #define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
 #if __BSD_VISIBLE
 #define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
 #define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
 #define	SO_NOSIGPIPE	0x0800		/* no SIGPIPE from EPIPE */
 #define	SO_ACCEPTFILTER	0x1000		/* there is an accept filter */
 #define	SO_BINTIME	0x2000		/* timestamp received dgram traffic */
 #endif
 #define	SO_NO_OFFLOAD	0x4000		/* socket cannot be offloaded */
 #define	SO_NO_DDP	0x8000		/* disable direct data placement */
 
 /*
  * Additional options, not kept in so_options.
  */
 #define	SO_SNDBUF	0x1001		/* send buffer size */
 #define	SO_RCVBUF	0x1002		/* receive buffer size */
 #define	SO_SNDLOWAT	0x1003		/* send low-water mark */
 #define	SO_RCVLOWAT	0x1004		/* receive low-water mark */
 #define	SO_SNDTIMEO	0x1005		/* send timeout */
 #define	SO_RCVTIMEO	0x1006		/* receive timeout */
 #define	SO_ERROR	0x1007		/* get error status and clear */
 #define	SO_TYPE		0x1008		/* get socket type */
 #if __BSD_VISIBLE
 #define	SO_LABEL	0x1009		/* socket's MAC label */
 #define	SO_PEERLABEL	0x1010		/* socket's peer's MAC label */
 #define	SO_LISTENQLIMIT	0x1011		/* socket's backlog limit */
 #define	SO_LISTENQLEN	0x1012		/* socket's complete queue length */
 #define	SO_LISTENINCQLEN	0x1013	/* socket's incomplete queue length */
 #define	SO_SETFIB	0x1014		/* use this FIB to route */
 #define	SO_USER_COOKIE	0x1015		/* user cookie (dummynet etc.) */
 #define	SO_PROTOCOL	0x1016		/* get socket protocol (Linux name) */
 #define	SO_PROTOTYPE	SO_PROTOCOL	/* alias for SO_PROTOCOL (SunOS name) */
 #endif
 
 /*
  * Space reserved for new socket options added by third-party vendors.
  * This range applies to all socket option levels.  New socket options
  * in FreeBSD should always use an option value less than SO_VENDOR.
  */
 #if __BSD_VISIBLE
 #define	SO_VENDOR	0x80000000
 #endif
 
 /*
  * Structure used for manipulating linger option.
  */
 struct linger {
 	int	l_onoff;		/* option on/off */
 	int	l_linger;		/* linger time */
 };
 
 #if __BSD_VISIBLE
 struct accept_filter_arg {
 	char	af_name[16];
 	char	af_arg[256-16];
 };
 #endif
 
 /*
  * Level number for (get/set)sockopt() to apply to socket itself.
  */
 #define	SOL_SOCKET	0xffff		/* options for socket level */
 
 /*
  * Address families.
  */
 #define	AF_UNSPEC	0		/* unspecified */
 #if __BSD_VISIBLE
 #define	AF_LOCAL	AF_UNIX		/* local to host (pipes, portals) */
 #endif
 #define	AF_UNIX		1		/* standardized name for AF_LOCAL */
 #define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
 #if __BSD_VISIBLE
 #define	AF_IMPLINK	3		/* arpanet imp addresses */
 #define	AF_PUP		4		/* pup protocols: e.g. BSP */
 #define	AF_CHAOS	5		/* mit CHAOS protocols */
 #define	AF_NETBIOS	6		/* SMB protocols */
 #define	AF_ISO		7		/* ISO protocols */
 #define	AF_OSI		AF_ISO
 #define	AF_ECMA		8		/* European computer manufacturers */
 #define	AF_DATAKIT	9		/* datakit protocols */
 #define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
 #define	AF_SNA		11		/* IBM SNA */
 #define AF_DECnet	12		/* DECnet */
 #define AF_DLI		13		/* DEC Direct data link interface */
 #define AF_LAT		14		/* LAT */
 #define	AF_HYLINK	15		/* NSC Hyperchannel */
 #define	AF_APPLETALK	16		/* Apple Talk */
 #define	AF_ROUTE	17		/* Internal Routing Protocol */
 #define	AF_LINK		18		/* Link layer interface */
 #define	pseudo_AF_XTP	19		/* eXpress Transfer Protocol (no AF) */
 #define	AF_COIP		20		/* connection-oriented IP, aka ST II */
 #define	AF_CNT		21		/* Computer Network Technology */
 #define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
 #define	AF_IPX		23		/* Novell Internet Protocol */
 #define	AF_SIP		24		/* Simple Internet Protocol */
 #define	pseudo_AF_PIP	25		/* Help Identify PIP packets */
 #define	AF_ISDN		26		/* Integrated Services Digital Network*/
 #define	AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
 #define	pseudo_AF_KEY	27		/* Internal key-management function */
 #endif
 #define	AF_INET6	28		/* IPv6 */
 #if __BSD_VISIBLE
 #define	AF_NATM		29		/* native ATM access */
 #define	AF_ATM		30		/* ATM */
 #define pseudo_AF_HDRCMPLT 31		/* Used by BPF to not rewrite headers
 					 * in interface output routine
 					 */
 #define	AF_NETGRAPH	32		/* Netgraph sockets */
 #define	AF_SLOW		33		/* 802.3ad slow protocol */
 #define	AF_SCLUSTER	34		/* Sitara cluster protocol */
 #define	AF_ARP		35
 #define	AF_BLUETOOTH	36		/* Bluetooth sockets */
 #define	AF_IEEE80211	37		/* IEEE 802.11 protocol */
 #define	AF_INET_SDP	40		/* OFED Socket Direct Protocol ipv4 */
 #define	AF_INET6_SDP	42		/* OFED Socket Direct Protocol ipv6 */
 #define	AF_MAX		42
 /*
  * When allocating a new AF_ constant, please only allocate
  * even numbered constants for FreeBSD until 134 as odd numbered AF_
  * constants 39-133 are now reserved for vendors.
  */
 #define AF_VENDOR00 39
 #define AF_VENDOR01 41
 #define AF_VENDOR02 43
 #define AF_VENDOR03 45
 #define AF_VENDOR04 47
 #define AF_VENDOR05 49
 #define AF_VENDOR06 51
 #define AF_VENDOR07 53
 #define AF_VENDOR08 55
 #define AF_VENDOR09 57
 #define AF_VENDOR10 59
 #define AF_VENDOR11 61
 #define AF_VENDOR12 63
 #define AF_VENDOR13 65
 #define AF_VENDOR14 67
 #define AF_VENDOR15 69
 #define AF_VENDOR16 71
 #define AF_VENDOR17 73
 #define AF_VENDOR18 75
 #define AF_VENDOR19 77
 #define AF_VENDOR20 79
 #define AF_VENDOR21 81
 #define AF_VENDOR22 83
 #define AF_VENDOR23 85
 #define AF_VENDOR24 87
 #define AF_VENDOR25 89
 #define AF_VENDOR26 91
 #define AF_VENDOR27 93
 #define AF_VENDOR28 95
 #define AF_VENDOR29 97
 #define AF_VENDOR30 99
 #define AF_VENDOR31 101
 #define AF_VENDOR32 103
 #define AF_VENDOR33 105
 #define AF_VENDOR34 107
 #define AF_VENDOR35 109
 #define AF_VENDOR36 111
 #define AF_VENDOR37 113
 #define AF_VENDOR38 115
 #define AF_VENDOR39 117
 #define AF_VENDOR40 119
 #define AF_VENDOR41 121
 #define AF_VENDOR42 123
 #define AF_VENDOR43 125
 #define AF_VENDOR44 127
 #define AF_VENDOR45 129
 #define AF_VENDOR46 131
 #define AF_VENDOR47 133
 #endif
 
 /*
  * Structure used by kernel to store most
  * addresses.
  */
 struct sockaddr {
 	unsigned char	sa_len;		/* total length */
 	sa_family_t	sa_family;	/* address family */
 	char		sa_data[14];	/* actually longer; address value */
 };
 #if __BSD_VISIBLE
 #define	SOCK_MAXADDRLEN	255		/* longest possible addresses */
 
 /*
  * Structure used by kernel to pass protocol
  * information in raw sockets.
  */
 struct sockproto {
 	unsigned short	sp_family;		/* address family */
 	unsigned short	sp_protocol;		/* protocol */
 };
 #endif
 
 #include <sys/_sockaddr_storage.h>
 
 #if __BSD_VISIBLE
 /*
  * Protocol families, same as address families for now.
  */
 #define	PF_UNSPEC	AF_UNSPEC
 #define	PF_LOCAL	AF_LOCAL
 #define	PF_UNIX		PF_LOCAL	/* backward compatibility */
 #define	PF_INET		AF_INET
 #define	PF_IMPLINK	AF_IMPLINK
 #define	PF_PUP		AF_PUP
 #define	PF_CHAOS	AF_CHAOS
 #define	PF_NETBIOS	AF_NETBIOS
 #define	PF_ISO		AF_ISO
 #define	PF_OSI		AF_ISO
 #define	PF_ECMA		AF_ECMA
 #define	PF_DATAKIT	AF_DATAKIT
 #define	PF_CCITT	AF_CCITT
 #define	PF_SNA		AF_SNA
 #define PF_DECnet	AF_DECnet
 #define PF_DLI		AF_DLI
 #define PF_LAT		AF_LAT
 #define	PF_HYLINK	AF_HYLINK
 #define	PF_APPLETALK	AF_APPLETALK
 #define	PF_ROUTE	AF_ROUTE
 #define	PF_LINK		AF_LINK
 #define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
 #define	PF_COIP		AF_COIP
 #define	PF_CNT		AF_CNT
 #define	PF_SIP		AF_SIP
 #define	PF_IPX		AF_IPX
 #define PF_RTIP		pseudo_AF_RTIP	/* same format as AF_INET */
 #define PF_PIP		pseudo_AF_PIP
 #define	PF_ISDN		AF_ISDN
 #define	PF_KEY		pseudo_AF_KEY
 #define	PF_INET6	AF_INET6
 #define	PF_NATM		AF_NATM
 #define	PF_ATM		AF_ATM
 #define	PF_NETGRAPH	AF_NETGRAPH
 #define	PF_SLOW		AF_SLOW
 #define PF_SCLUSTER	AF_SCLUSTER
 #define	PF_ARP		AF_ARP
 #define	PF_BLUETOOTH	AF_BLUETOOTH
 #define	PF_IEEE80211	AF_IEEE80211
 #define	PF_INET_SDP	AF_INET_SDP
 #define	PF_INET6_SDP	AF_INET6_SDP
 
 #define	PF_MAX		AF_MAX
 
 /*
  * Definitions for network related sysctl, CTL_NET.
  *
  * Second level is protocol family.
  * Third level is protocol number.
  *
  * Further levels are defined by the individual families.
  */
 
 /*
  * PF_ROUTE - Routing table
  *
  * Three additional levels are defined:
  *	Fourth: address family, 0 is wildcard
  *	Fifth: type of info, defined below
  *	Sixth: flag(s) to mask with for NET_RT_FLAGS
  */
 #define NET_RT_DUMP	1		/* dump; may limit to a.f. */
 #define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
 #define NET_RT_IFLIST	3		/* survey interface list */
 #define	NET_RT_IFMALIST	4		/* return multicast address list */
 #define	NET_RT_IFLISTL	5		/* Survey interface list, using 'l'en
 					 * versions of msghdr structs. */
 #endif /* __BSD_VISIBLE */
 
 /*
  * Maximum queue length specifiable by listen.
  */
 #define	SOMAXCONN	128
 
 /*
  * Message header for recvmsg and sendmsg calls.
  * Used value-result for recvmsg, value only for sendmsg.
  */
 struct msghdr {
 	void		*msg_name;		/* optional address */
 	socklen_t	 msg_namelen;		/* size of address */
 	struct iovec	*msg_iov;		/* scatter/gather array */
 	int		 msg_iovlen;		/* # elements in msg_iov */
 	void		*msg_control;		/* ancillary data, see below */
 	socklen_t	 msg_controllen;	/* ancillary data buffer len */
 	int		 msg_flags;		/* flags on received message */
 };
 
 #define	MSG_OOB		0x1		/* process out-of-band data */
 #define	MSG_PEEK	0x2		/* peek at incoming message */
 #define	MSG_DONTROUTE	0x4		/* send without using routing tables */
 #define	MSG_EOR		0x8		/* data completes record */
 #define	MSG_TRUNC	0x10		/* data discarded before delivery */
 #define	MSG_CTRUNC	0x20		/* control data lost before delivery */
 #define	MSG_WAITALL	0x40		/* wait for full request or error */
 #if __POSIX_VISIBLE >= 200809
 #define	MSG_NOSIGNAL	0x20000		/* do not generate SIGPIPE on EOF */
 #endif
 #if __BSD_VISIBLE
 #define	MSG_DONTWAIT	0x80		/* this message should be nonblocking */
 #define	MSG_EOF		0x100		/* data completes connection */
 #define	MSG_NOTIFICATION 0x2000         /* SCTP notification */
 #define	MSG_NBIO	0x4000		/* FIONBIO mode, used by fifofs */
 #define	MSG_COMPAT      0x8000		/* used in sendit() */
 #define	MSG_CMSG_CLOEXEC 0x40000	/* make received fds close-on-exec */
 #define	MSG_WAITFORONE	0x80000		/* for recvmmsg() */
 #endif
 #ifdef _KERNEL
 #define	MSG_SOCALLBCK   0x10000		/* for use by socket callbacks - soreceive (TCP) */
+#define	MSG_MORETOCOME	0x20000		/* additional data pending */
 #endif
 
 /*
  * Header for ancillary data objects in msg_control buffer.
  * Used for additional information with/about a datagram
  * not expressible by flags.  The format is a sequence
  * of message elements headed by cmsghdr structures.
  */
 struct cmsghdr {
 	socklen_t	cmsg_len;		/* data byte count, including hdr */
 	int		cmsg_level;		/* originating protocol */
 	int		cmsg_type;		/* protocol-specific type */
 /* followed by	u_char  cmsg_data[]; */
 };
 
 #if __BSD_VISIBLE
 /*
  * While we may have more groups than this, the cmsgcred struct must
  * be able to fit in an mbuf and we have historically supported a
  * maximum of 16 groups.
 */
 #define CMGROUP_MAX 16
 
 /*
  * Credentials structure, used to verify the identity of a peer
  * process that has sent us a message. This is allocated by the
  * peer process but filled in by the kernel. This prevents the
  * peer from lying about its identity. (Note that cmcred_groups[0]
  * is the effective GID.)
  */
 struct cmsgcred {
 	pid_t	cmcred_pid;		/* PID of sending process */
 	uid_t	cmcred_uid;		/* real UID of sending process */
 	uid_t	cmcred_euid;		/* effective UID of sending process */
 	gid_t	cmcred_gid;		/* real GID of sending process */
 	short	cmcred_ngroups;		/* number or groups */
 	gid_t	cmcred_groups[CMGROUP_MAX];	/* groups */
 };
 
 /*
  * Socket credentials.
  */
 struct sockcred {
 	uid_t	sc_uid;			/* real user id */
 	uid_t	sc_euid;		/* effective user id */
 	gid_t	sc_gid;			/* real group id */
 	gid_t	sc_egid;		/* effective group id */
 	int	sc_ngroups;		/* number of supplemental groups */
 	gid_t	sc_groups[1];		/* variable length */
 };
 
 /*
  * Compute size of a sockcred structure with groups.
  */
 #define	SOCKCREDSIZE(ngrps) \
 	(sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1)))
 
 #endif /* __BSD_VISIBLE */
 
 /* given pointer to struct cmsghdr, return pointer to data */
 #define	CMSG_DATA(cmsg)		((unsigned char *)(cmsg) + \
 				 _ALIGN(sizeof(struct cmsghdr)))
 
 /* given pointer to struct cmsghdr, return pointer to next cmsghdr */
 #define	CMSG_NXTHDR(mhdr, cmsg)	\
 	((char *)(cmsg) == (char *)0 ? CMSG_FIRSTHDR(mhdr) : \
 	    ((char *)(cmsg) + _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len) + \
 	  _ALIGN(sizeof(struct cmsghdr)) > \
 	    (char *)(mhdr)->msg_control + (mhdr)->msg_controllen) ? \
 	    (struct cmsghdr *)0 : \
 	    (struct cmsghdr *)(void *)((char *)(cmsg) + \
 	    _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len)))
 
 /*
  * RFC 2292 requires to check msg_controllen, in case that the kernel returns
  * an empty list for some reasons.
  */
 #define	CMSG_FIRSTHDR(mhdr) \
 	((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
 	 (struct cmsghdr *)(mhdr)->msg_control : \
 	 (struct cmsghdr *)0)
 
 #if __BSD_VISIBLE
 /* RFC 2292 additions */
 #define	CMSG_SPACE(l)		(_ALIGN(sizeof(struct cmsghdr)) + _ALIGN(l))
 #define	CMSG_LEN(l)		(_ALIGN(sizeof(struct cmsghdr)) + (l))
 #endif
 
 #ifdef _KERNEL
 #define	CMSG_ALIGN(n)	_ALIGN(n)
 #endif
 
 /* "Socket"-level control message types: */
 #define	SCM_RIGHTS	0x01		/* access rights (array of int) */
 #if __BSD_VISIBLE
 #define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
 #define	SCM_CREDS	0x03		/* process creds (struct cmsgcred) */
 #define	SCM_BINTIME	0x04		/* timestamp (struct bintime) */
 #endif
 
 #if __BSD_VISIBLE
 /*
  * 4.3 compat sockaddr, move to compat file later
  */
 struct osockaddr {
 	unsigned short sa_family;	/* address family */
 	char	sa_data[14];		/* up to 14 bytes of direct address */
 };
 
 /*
  * 4.3-compat message header (move to compat file later).
  */
 struct omsghdr {
 	char	*msg_name;		/* optional address */
 	int	msg_namelen;		/* size of address */
 	struct	iovec *msg_iov;		/* scatter/gather array */
 	int	msg_iovlen;		/* # elements in msg_iov */
 	char	*msg_accrights;		/* access rights sent/received */
 	int	msg_accrightslen;
 };
 #endif
 
 /*
  * howto arguments for shutdown(2), specified by Posix.1g.
  */
 #define	SHUT_RD		0		/* shut down the reading side */
 #define	SHUT_WR		1		/* shut down the writing side */
 #define	SHUT_RDWR	2		/* shut down both sides */
 
 #if __BSD_VISIBLE
 /* for SCTP */
 /* we cheat and use the SHUT_XX defines for these */
 #define PRU_FLUSH_RD     SHUT_RD
 #define PRU_FLUSH_WR     SHUT_WR
 #define PRU_FLUSH_RDWR   SHUT_RDWR
 #endif
 
 
 #if __BSD_VISIBLE
 /*
  * sendfile(2) header/trailer struct
  */
 struct sf_hdtr {
 	struct iovec *headers;	/* pointer to an array of header struct iovec's */
 	int hdr_cnt;		/* number of header iovec's */
 	struct iovec *trailers;	/* pointer to an array of trailer struct iovec's */
 	int trl_cnt;		/* number of trailer iovec's */
 };
 
 /*
  * Sendfile-specific flag(s)
  */
 #define	SF_NODISKIO     0x00000001
 #define	SF_MNOWAIT	0x00000002	/* obsolete */
 #define	SF_SYNC		0x00000004
 #define	SF_USER_READAHEAD	0x00000008
 #define	SF_NOCACHE	0x00000010
 #define	SF_FLAGS(rh, flags)	(((rh) << 16) | (flags))
 
 #ifdef _KERNEL
 #define	SF_READAHEAD(flags)	((flags) >> 16)
 #endif /* _KERNEL */
 
 /*
  * Sendmmsg/recvmmsg specific structure(s)
  */
 struct mmsghdr {
 	struct msghdr	msg_hdr;		/* message header */
 	ssize_t		msg_len;		/* message length */
 };
 #endif /* __BSD_VISIBLE */
 
 #ifndef	_KERNEL
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
 int	accept(int, struct sockaddr * __restrict, socklen_t * __restrict);
 int	bind(int, const struct sockaddr *, socklen_t);
 int	connect(int, const struct sockaddr *, socklen_t);
 #if __BSD_VISIBLE
 int	accept4(int, struct sockaddr * __restrict, socklen_t * __restrict, int);
 int	bindat(int, int, const struct sockaddr *, socklen_t);
 int	connectat(int, int, const struct sockaddr *, socklen_t);
 #endif
 int	getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict);
 int	getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict);
 int	getsockopt(int, int, int, void * __restrict, socklen_t * __restrict);
 int	listen(int, int);
 ssize_t	recv(int, void *, size_t, int);
 ssize_t	recvfrom(int, void *, size_t, int, struct sockaddr * __restrict, socklen_t * __restrict);
 ssize_t	recvmsg(int, struct msghdr *, int);
 #if __BSD_VISIBLE
 struct timespec;
 ssize_t	recvmmsg(int, struct mmsghdr * __restrict, size_t, int,
     const struct timespec * __restrict);
 #endif
 ssize_t	send(int, const void *, size_t, int);
 ssize_t	sendto(int, const void *,
 	    size_t, int, const struct sockaddr *, socklen_t);
 ssize_t	sendmsg(int, const struct msghdr *, int);
 #if __BSD_VISIBLE
 int	sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int);
 ssize_t	sendmmsg(int, struct mmsghdr * __restrict, size_t, int);
 int	setfib(int);
 #endif
 int	setsockopt(int, int, int, const void *, socklen_t);
 int	shutdown(int, int);
 int	sockatmark(int);
 int	socket(int, int, int);
 int	socketpair(int, int, int, int *);
 __END_DECLS
 
 #endif /* !_KERNEL */
 
 #ifdef _KERNEL
 struct socket;
 
 struct tcpcb *so_sototcpcb(struct socket *so);
 struct inpcb *so_sotoinpcb(struct socket *so);
 struct sockbuf *so_sockbuf_snd(struct socket *);
 struct sockbuf *so_sockbuf_rcv(struct socket *);
 
 int so_state_get(const struct socket *);
 void so_state_set(struct socket *, int);
 
 int so_options_get(const struct socket *);
 void so_options_set(struct socket *, int);
 
 int so_error_get(const struct socket *);
 void so_error_set(struct socket *, int);
 
 int so_linger_get(const struct socket *);
 void so_linger_set(struct socket *, int);
 
 struct protosw *so_protosw_get(const struct socket *);
 void so_protosw_set(struct socket *, struct protosw *);
 
 void so_sorwakeup_locked(struct socket *so);
 void so_sowwakeup_locked(struct socket *so);
 
 void so_sorwakeup(struct socket *so);
 void so_sowwakeup(struct socket *so);
 
 void so_lock(struct socket *so);
 void so_unlock(struct socket *so);
 
 void so_listeners_apply_all(struct socket *so, void (*func)(struct socket *, void *), void *arg);
 
 #endif
 
 
 #endif /* !_SYS_SOCKET_H_ */
Index: projects/bsnmp-ipv6-mib/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- projects/bsnmp-ipv6-mib/tools/build/mk/OptionalObsoleteFiles.inc	(revision 311636)
+++ projects/bsnmp-ipv6-mib/tools/build/mk/OptionalObsoleteFiles.inc	(revision 311637)
@@ -1,9646 +1,9647 @@
 #
 # $FreeBSD$
 #
 # This file add support for the WITHOUT_* and WITH_* knobs in src.conf(5) to
 # the check-old and delete-old* targets.
 #
 
 .if ${MK_ACCT} == no
 OLD_FILES+=etc/rc.d/accounting
 OLD_FILES+=etc/periodic/daily/310.accounting
 OLD_FILES+=usr/sbin/accton
 OLD_FILES+=usr/sbin/sa
 OLD_FILES+=usr/share/man/man8/accton.8.gz
 OLD_FILES+=usr/share/man/man8/sa.8.gz
 OLD_FILES+=usr/tests/usr.sbin/sa/Kyuafile
 OLD_FILES+=usr/tests/usr.sbin/sa/legacy_test
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa
 .endif
 
 .if ${MK_ACPI} == no
 OLD_FILES+=etc/devd/asus.conf
 OLD_FILES+=etc/rc.d/power_profile
 OLD_FILES+=usr/sbin/acpiconf
 OLD_FILES+=usr/sbin/acpidb
 OLD_FILES+=usr/sbin/acpidump
 OLD_FILES+=usr/sbin/iasl
 OLD_FILES+=usr/share/man/man8/acpiconf.8.gz
 OLD_FILES+=usr/share/man/man8/acpidb.8.gz
 OLD_FILES+=usr/share/man/man8/acpidump.8.gz
 OLD_FILES+=usr/share/man/man8/iasl.8.gz
 .endif
 
 .if ${MK_AMD} == no
 OLD_FILES+=etc/amd.map
 OLD_FILES+=etc/rc.d/amd
 OLD_FILES+=usr/bin/pawd
 OLD_FILES+=usr/sbin/amd
 OLD_FILES+=usr/sbin/amq
 OLD_FILES+=usr/sbin/fixmount
 OLD_FILES+=usr/sbin/fsinfo
 OLD_FILES+=usr/sbin/hlfsd
 OLD_FILES+=usr/sbin/mk-amd-map
 OLD_FILES+=usr/sbin/wire-test
 OLD_FILES+=usr/share/examples/etc/amd.map
 OLD_FILES+=usr/share/info/am-utils.info.gz
 OLD_FILES+=usr/share/man/man1/pawd.1.gz
 OLD_FILES+=usr/share/man/man5/amd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/amd.8.gz
 OLD_FILES+=usr/share/man/man8/amq.8.gz
 OLD_FILES+=usr/share/man/man8/fixmount.8.gz
 OLD_FILES+=usr/share/man/man8/fsinfo.8.gz
 OLD_FILES+=usr/share/man/man8/hlfsd.8.gz
 OLD_FILES+=usr/share/man/man8/mk-amd-map.8.gz
 OLD_FILES+=usr/share/man/man8/wire-test.8.gz
 .endif
 
 .if ${MK_APM} == no
 OLD_FILES+=etc/rc.d/apm
 OLD_FILES+=etc/rc.d/apmd
 OLD_FILES+=etc/apmd.conf
 OLD_FILES+=usr/sbin/apm
 OLD_FILES+=usr/share/examples/etc/apmd.conf
 OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz
 OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
 .endif
 
 .if ${MK_AT} == no
 OLD_FILES+=etc/pam.d/atrun
 OLD_FILES+=usr/bin/at
 OLD_FILES+=usr/bin/atq
 OLD_FILES+=usr/bin/atrm
 OLD_FILES+=usr/bin/batch
 OLD_FILES+=usr/libexec/atrun
 OLD_FILES+=usr/share/man/man1/at.1.gz
 OLD_FILES+=usr/share/man/man1/atq.1.gz
 OLD_FILES+=usr/share/man/man1/atrm.1.gz
 OLD_FILES+=usr/share/man/man1/batch.1.gz
 OLD_FILES+=usr/share/man/man8/atrun.8.gz
 .endif
 
 .if ${MK_ATM} == no
 OLD_FILES+=etc/rc.d/atm1
 OLD_FILES+=etc/rc.d/atm2
 OLD_FILES+=etc/rc.d/atm3
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/bin/sscop
 OLD_FILES+=usr/include/bsnmp/snmp_atm.h
 OLD_FILES+=usr/include/netnatm/addr.h
 OLD_FILES+=usr/include/netnatm/api/atmapi.h
 OLD_FILES+=usr/include/netnatm/api/ccatm.h
 OLD_FILES+=usr/include/netnatm/api/unisap.h
 OLD_DIRS+=usr/include/netnatm/api
 OLD_FILES+=usr/include/netnatm/msg/uni_config.h
 OLD_FILES+=usr/include/netnatm/msg/uni_hdr.h
 OLD_FILES+=usr/include/netnatm/msg/uni_ie.h
 OLD_FILES+=usr/include/netnatm/msg/uni_msg.h
 OLD_FILES+=usr/include/netnatm/msg/unimsglib.h
 OLD_FILES+=usr/include/netnatm/msg/uniprint.h
 OLD_FILES+=usr/include/netnatm/msg/unistruct.h
 OLD_DIRS+=usr/include/netnatm/msg
 OLD_FILES+=usr/include/netnatm/saal/sscfu.h
 OLD_FILES+=usr/include/netnatm/saal/sscfudef.h
 OLD_FILES+=usr/include/netnatm/saal/sscop.h
 OLD_FILES+=usr/include/netnatm/saal/sscopdef.h
 OLD_DIRS+=usr/include/netnatm/saal
 OLD_FILES+=usr/include/netnatm/sig/uni.h
 OLD_FILES+=usr/include/netnatm/sig/unidef.h
 OLD_FILES+=usr/include/netnatm/sig/unisig.h
 OLD_DIRS+=usr/include/netnatm/sig
 OLD_FILES+=usr/include/netnatm/unimsg.h
 OLD_FILES+=usr/lib/libngatm.a
 OLD_FILES+=usr/lib/libngatm.so
 OLD_LIBS+=usr/lib/libngatm.so.4
 OLD_FILES+=usr/lib/libngatm_p.a
 OLD_FILES+=usr/lib/snmp_atm.so
 OLD_LIBS+=usr/lib/snmp_atm.so.6
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libngatm.a
 OLD_FILES+=usr/lib32/libngatm.so
 OLD_LIBS+=usr/lib32/libngatm.so.4
 OLD_FILES+=usr/lib32/libngatm_p.a
 .endif
 OLD_FILES+=usr/share/doc/atm/atmconfig.help
 OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
 OLD_DIRS+=usr/share/doc/atm
 OLD_FILES+=usr/share/man/man1/sscop.1.gz
 OLD_FILES+=usr/share/man/man3/libngatm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
 OLD_FILES+=usr/share/man/man3/uniaddr.3.gz
 OLD_FILES+=usr/share/man/man3/unifunc.3.gz
 OLD_FILES+=usr/share/man/man3/unimsg.3.gz
 OLD_FILES+=usr/share/man/man3/unisap.3.gz
 OLD_FILES+=usr/share/man/man3/unistruct.3.gz
 OLD_FILES+=usr/share/man/man8/atmconfig.8.gz
 OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
 OLD_FILES+=usr/share/snmp/defs/atm_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 .endif
 
 .if ${MK_AUDIT} == no
 OLD_FILES+=usr/sbin/audit
 OLD_FILES+=usr/sbin/auditd
 OLD_FILES+=usr/sbin/auditdistd
 OLD_FILES+=usr/sbin/auditreduce
 OLD_FILES+=usr/sbin/praudit
 OLD_FILES+=usr/share/man/man1/auditreduce.1.gz
 OLD_FILES+=usr/share/man/man1/praudit.1.gz
 OLD_FILES+=usr/share/man/man5/auditdistd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/audit.8.gz
 OLD_FILES+=usr/share/man/man8/auditd.8.gz
 OLD_FILES+=usr/share/man/man8/auditdistd.8.gz
 .endif
 
 .if ${MK_AUTHPF} == no
 OLD_FILES+=usr/sbin/authpf
 OLD_FILES+=usr/sbin/authpf-noip
 OLD_FILES+=usr/share/man/man8/authpf.8.gz
 OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz
 .endif
 
 .if ${MK_AUTOFS} == no
 OLD_FILES+=etc/autofs/include_ldap
 OLD_FILES+=etc/autofs/special_hosts
 OLD_FILES+=etc/autofs/special_media
 OLD_FILES+=etc/autofs/special_noauto
 OLD_FILES+=etc/autofs/special_null
 OLD_FILES+=etc/auto_master
 OLD_FILES+=etc/rc.d/automount
 OLD_FILES+=etc/rc.d/automountd
 OLD_FILES+=etc/rc.d/autounmountd
 OLD_FILES+=usr/sbin/automount
 OLD_FILES+=usr/sbin/automountd
 OLD_FILES+=usr/sbin/autounmountd
 OLD_FILES+=usr/share/man/man5/autofs.5.gz
 OLD_FILES+=usr/share/man/man5/auto_master.5.gz
 OLD_FILES+=usr/share/man/man8/automount.8.gz
 OLD_FILES+=usr/share/man/man8/automountd.8.gz
 OLD_FILES+=usr/share/man/man8/autounmountd.8.gz
 OLD_DIRS+=etc/autofs
 .endif
 
 .if ${MK_BHYVE} == no
 OLD_FILES+=usr/lib/libvmmapi.a
 OLD_FILES+=usr/lib/libvmmapi.so
 OLD_LIBS+=usr/lib/libvmmapi.so.5
 OLD_FILES+=usr/include/vmmapi.h
 OLD_FILES+=usr/sbin/bhyve
 OLD_FILES+=usr/sbin/bhyvectl
 OLD_FILES+=usr/sbin/bhyveload
 OLD_FILES+=usr/share/examples/bhyve/vmrun.sh
 OLD_FILES+=usr/share/man/man8/bhyve.8.gz
 OLD_FILES+=usr/share/man/man8/bhyveload.8.gz
 OLD_DIRS+=usr/share/examples/bhyve
 .endif
 
 .if ${MK_BINUTILS} == no
 OLD_FILES+=usr/bin/as
 .if ${MK_LLD_AS_LD} == no
 OLD_FILES+=usr/bin/ld
 .endif
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/bin/objdump
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
 OLD_FILES+=usr/share/man/man1/as.1.gz
 OLD_FILES+=usr/share/man/man1/ld.1.gz
 OLD_FILES+=usr/share/man/man1/objdump.1.gz
 OLD_FILES+=usr/share/man/man7/as.7.gz
 OLD_FILES+=usr/share/man/man7/ld.7.gz
 OLD_FILES+=usr/share/man/man7/ldint.7.gz
 OLD_FILES+=usr/share/man/man7/binutils.7.gz
 .endif
 
 .if ${MK_BLACKLIST} == no
 OLD_FILES+=etc/rc.d/blacklistd
 OLD_FILES+=usr/include/blacklist.h
 OLD_FILES+=usr/lib/libblacklist.a
 OLD_FILES+=usr/lib/libblacklist_p.a
 OLD_FILES+=usr/lib/libblacklist.so
 OLD_LIBS+=usr/lib/libblacklist.so.0
 OLD_FILES+=usr/libexec/blacklistd-helper
 OLD_FILES+=usr/sbin/blacklistctl
 OLD_FILES+=usr/sbin/blacklistd
 OLD_FILES+=usr/share/man/man3/blacklist.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_close.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_open.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_r.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_sa.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_sa_r.3.gz
 OLD_FILES+=usr/share/man/man5/blacklistd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/blacklistctl.8.gz
 OLD_FILES+=usr/share/man/man8/blacklistd.8.gz
 .endif
 
 .if ${MK_BLUETOOTH} == no
 OLD_FILES+=etc/bluetooth/hcsecd.conf
 OLD_FILES+=etc/bluetooth/hosts
 OLD_FILES+=etc/bluetooth/protocols
 OLD_FILES+=etc/defaults/bluetooth.device.conf
 OLD_DIRS+=etc/bluetooth
 OLD_FILES+=etc/rc.d/bluetooth
 OLD_FILES+=etc/rc.d/bthidd
 OLD_FILES+=etc/rc.d/hcsecd
 OLD_FILES+=etc/rc.d/rfcomm_pppd_server
 OLD_FILES+=etc/rc.d/sdpd
 OLD_FILES+=etc/rc.d/ubthidhci
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat
 OLD_FILES+=usr/bin/rfcomm_sppd
 OLD_FILES+=usr/include/bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bt3c.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_sco.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_h4.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_hci.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_ubt.h
 OLD_DIRS+=usr/include/netgraph/bluetooth/include
 OLD_DIRS+=usr/include/netgraph/bluetooth
 OLD_FILES+=usr/include/sdp.h
 OLD_FILES+=usr/lib/libbluetooth.a
 OLD_FILES+=usr/lib/libbluetooth.so
 OLD_LIBS+=usr/lib/libbluetooth.so.4
 OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libsdp.a
 OLD_FILES+=usr/lib/libsdp.so
 OLD_LIBS+=usr/lib/libsdp.so.4
 OLD_FILES+=usr/lib/libsdp_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libbluetooth.a
 OLD_FILES+=usr/lib32/libbluetooth.so
 OLD_LIBS+=usr/lib32/libbluetooth.so.4
 OLD_FILES+=usr/lib32/libbluetooth_p.a
 OLD_FILES+=usr/lib32/libsdp.a
 OLD_FILES+=usr/lib32/libsdp.so
 OLD_LIBS+=usr/lib32/libsdp.so.4
 OLD_FILES+=usr/lib32/libsdp_p.a
 .endif
 OLD_FILES+=usr/sbin/ath3kfw
 OLD_FILES+=usr/sbin/bcmfw
 OLD_FILES+=usr/sbin/bt3cfw
 OLD_FILES+=usr/sbin/bthidcontrol
 OLD_FILES+=usr/sbin/bthidd
 OLD_FILES+=usr/sbin/btpand
 OLD_FILES+=usr/sbin/hccontrol
 OLD_FILES+=usr/sbin/hcsecd
 OLD_FILES+=usr/sbin/hcseriald
 OLD_FILES+=usr/sbin/l2control
 OLD_FILES+=usr/sbin/l2ping
 OLD_FILES+=usr/sbin/rfcomm_pppd
 OLD_FILES+=usr/sbin/sdpcontrol
 OLD_FILES+=usr/sbin/sdpd
 OLD_FILES+=usr/share/examples/etc/defaults/bluetooth.device.conf
 OLD_FILES+=usr/share/man/man1/bthost.1.gz
 OLD_FILES+=usr/share/man/man1/btsockstat.1.gz
 OLD_FILES+=usr/share/man/man1/rfcomm_sppd.1.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET128.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET16.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET32.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET64.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET8.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT128.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT16.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT32.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT64.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT8.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_any.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_copy.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_same.3.gz
 OLD_FILES+=usr/share/man/man3/bluetooth.3.gz
 OLD_FILES+=usr/share/man/man3/bt_aton.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devaddr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devclose.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devenum.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_clr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_set.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_tst.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_clr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_set.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_tst.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devinfo.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devinquiry.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devopen.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devreq.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devsend.3.gz
 OLD_FILES+=usr/share/man/man3/bt_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_endprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostbyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobynumber.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_ntoa.3.gz
 OLD_FILES+=usr/share/man/man3/bt_sethostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_setprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/sdp.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_attr2desc.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_change_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_close.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_error.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_open.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_open_local.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_register_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_search.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz
 OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz
 OLD_FILES+=usr/share/man/man5/bluetooth.device.conf.5.gz
 OLD_FILES+=usr/share/man/man5/bluetooth.hosts.5.gz
 OLD_FILES+=usr/share/man/man5/bluetooth.protocols.5.gz
 OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ath3kfw.8.gz
 OLD_FILES+=usr/share/man/man8/bcmfw.8.gz
 OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
 OLD_FILES+=usr/share/man/man8/bthidcontrol.8.gz
 OLD_FILES+=usr/share/man/man8/bthidd.8.gz
 OLD_FILES+=usr/share/man/man8/btpand.8.gz
 OLD_FILES+=usr/share/man/man8/hccontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hcsecd.8.gz
 OLD_FILES+=usr/share/man/man8/hcseriald.8.gz
 OLD_FILES+=usr/share/man/man8/l2control.8.gz
 OLD_FILES+=usr/share/man/man8/l2ping.8.gz
 OLD_FILES+=usr/share/man/man8/rfcomm_pppd.8.gz
 OLD_FILES+=usr/share/man/man8/sdpcontrol.8.gz
 OLD_FILES+=usr/share/man/man8/sdpd.8.gz
 .endif
 
 .if ${MK_BOOT} == no
 OLD_FILES+=boot/beastie.4th
 OLD_FILES+=boot/boot
 OLD_FILES+=boot/boot0
 OLD_FILES+=boot/boot0sio
 OLD_FILES+=boot/boot1
 OLD_FILES+=boot/boot1.efi
 OLD_FILES+=boot/boot1.efifat
 OLD_FILES+=boot/boot2
 OLD_FILES+=boot/brand.4th
 OLD_FILES+=boot/cdboot
 OLD_FILES+=boot/check-password.4th
 OLD_FILES+=boot/color.4th
 OLD_FILES+=boot/defaults/loader.conf
 OLD_FILES+=boot/delay.4th
 OLD_FILES+=boot/device.hints
 OLD_FILES+=boot/frames.4th
 OLD_FILES+=boot/gptboot
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/loader
 OLD_FILES+=boot/loader.4th
 OLD_FILES+=boot/loader.efi
 OLD_FILES+=boot/loader.help
 OLD_FILES+=boot/loader.rc
 OLD_FILES+=boot/mbr
 OLD_FILES+=boot/menu-commands.4th
 OLD_FILES+=boot/menu.4th
 OLD_FILES+=boot/menu.rc
 OLD_FILES+=boot/menusets.4th
 OLD_FILES+=boot/pcibios.4th
 OLD_FILES+=boot/pmbr
 OLD_FILES+=boot/pxeboot
 OLD_FILES+=boot/screen.4th
 OLD_FILES+=boot/shortcuts.4th
 OLD_FILES+=boot/support.4th
 OLD_FILES+=boot/userboot.so
 OLD_FILES+=boot/version.4th
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
 OLD_FILES+=usr/lib/kgzldr.o
 OLD_FILES+=usr/share/man/man5/loader.conf.5.gz
 OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz
 OLD_FILES+=usr/share/man/man8/brand.4th.8.gz
 OLD_FILES+=usr/share/man/man8/check-password.4th.8.gz
 OLD_FILES+=usr/share/man/man8/color.4th.8.gz
 OLD_FILES+=usr/share/man/man8/delay.4th.8.gz
 OLD_FILES+=usr/share/man/man8/gptboot.8.gz
 OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/loader.4th.8.gz
 OLD_FILES+=usr/share/man/man8/loader.8.gz
 OLD_FILES+=usr/share/man/man8/menu.4th.8.gz
 OLD_FILES+=usr/share/man/man8/menusets.4th.8.gz
 OLD_FILES+=usr/share/man/man8/pxeboot.8.gz
 OLD_FILES+=usr/share/man/man8/version.4th.8.gz
 OLD_FILES+=usr/share/man/man8/zfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/zfsloader.8.gz
 .endif
 
 .if ${MK_BOOTPARAMD} == no
 OLD_FILES+=usr/sbin/bootparamd
 OLD_FILES+=usr/share/man/man5/bootparams.5.gz
 OLD_FILES+=usr/share/man/man8/bootparamd.8.gz
 OLD_FILES+=usr/sbin/callbootd
 .endif
 
 .if ${MK_BOOTPD} == no
 OLD_FILES+=usr/libexec/bootpd
 OLD_FILES+=usr/share/man/man5/bootptab.5.gz
 OLD_FILES+=usr/share/man/man8/bootpd.8.gz
 OLD_FILES+=usr/libexec/bootpgw
 OLD_FILES+=usr/sbin/bootpef
 OLD_FILES+=usr/share/man/man8/bootpef.8.gz
 OLD_FILES+=usr/sbin/bootptest
 OLD_FILES+=usr/share/man/man8/bootptest.8.gz
 .endif
 
 .if ${MK_BSD_CPIO} == no
 OLD_FILES+=usr/bin/bsdcpio
 OLD_FILES+=usr/bin/cpio
 OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz
 OLD_FILES+=usr/share/man/man1/cpio.1.gz
 .endif
 
 .if ${MK_BSD_GREP} == no
 OLD_FILES+=usr/bin/lzegrep
 OLD_FILES+=usr/bin/lzfgrep
 OLD_FILES+=usr/bin/lzgrep
 OLD_FILES+=usr/bin/xzegrep
 OLD_FILES+=usr/bin/xzfgrep
 OLD_FILES+=usr/bin/xzgrep
 OLD_FILES+=usr/share/man/man1/lzegrep.1.gz
 OLD_FILES+=usr/share/man/man1/lzfgrep.1.gz
 OLD_FILES+=usr/share/man/man1/lzgrep.1.gz
 OLD_FILES+=usr/share/man/man1/xzegrep.1.gz
 OLD_FILES+=usr/share/man/man1/xzfgrep.1.gz
 OLD_FILES+=usr/share/man/man1/xzgrep.1.gz
 .endif
 
 .if ${MK_BSDINSTALL} == no
 OLD_FILES+=usr/libexec/bsdinstall/adduser
 OLD_FILES+=usr/libexec/bsdinstall/auto
 OLD_FILES+=usr/libexec/bsdinstall/autopart
 OLD_FILES+=usr/libexec/bsdinstall/checksum
 OLD_FILES+=usr/libexec/bsdinstall/config
 OLD_FILES+=usr/libexec/bsdinstall/distextract
 OLD_FILES+=usr/libexec/bsdinstall/distfetch
 OLD_FILES+=usr/libexec/bsdinstall/docsinstall
 OLD_FILES+=usr/libexec/bsdinstall/entropy
 OLD_FILES+=usr/libexec/bsdinstall/hardening
 OLD_FILES+=usr/libexec/bsdinstall/hostname
 OLD_FILES+=usr/libexec/bsdinstall/jail
 OLD_FILES+=usr/libexec/bsdinstall/keymap
 OLD_FILES+=usr/libexec/bsdinstall/mirrorselect
 OLD_FILES+=usr/libexec/bsdinstall/mount
 OLD_FILES+=usr/libexec/bsdinstall/netconfig
 OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv4
 OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv6
 OLD_FILES+=usr/libexec/bsdinstall/partedit
 OLD_FILES+=usr/libexec/bsdinstall/rootpass
 OLD_FILES+=usr/libexec/bsdinstall/script
 OLD_FILES+=usr/libexec/bsdinstall/scriptedpart
 OLD_FILES+=usr/libexec/bsdinstall/services
 OLD_FILES+=usr/libexec/bsdinstall/time
 OLD_FILES+=usr/libexec/bsdinstall/umount
 OLD_FILES+=usr/libexec/bsdinstall/wlanconfig
 OLD_FILES+=usr/libexec/bsdinstall/zfsboot
 OLD_FILES+=usr/sbin/bsdinstall
 OLD_FILES+=usr/share/man/man8/bsdinstall.8.gz
 OLD_FILES+=usr/share/man/man8/sade.8.gz
 OLD_DIRS+=usr/libexec/bsdinstall
 .endif
 
 .if ${MK_BSNMP} == no
 OLD_FILES+=etc/snmpd.config
 OLD_FILES+=etc/rc.d/bsnmpd
 OLD_FILES+=usr/bin/bsnmpget
 OLD_FILES+=usr/bin/bsnmpset
 OLD_FILES+=usr/bin/bsnmpwalk
 OLD_FILES+=usr/include/bsnmp/asn1.h
 OLD_FILES+=usr/include/bsnmp/bridge_snmp.h
 OLD_FILES+=usr/include/bsnmp/snmp.h
 OLD_FILES+=usr/include/bsnmp/snmp_atm.h
 OLD_FILES+=usr/include/bsnmp/snmp_mibII.h
 OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h
 OLD_FILES+=usr/include/bsnmp/snmpagent.h
 OLD_FILES+=usr/include/bsnmp/snmpclient.h
 OLD_FILES+=usr/include/bsnmp/snmpmod.h
 OLD_FILES+=usr/lib/libbsnmp.a
 OLD_FILES+=usr/lib/libbsnmp.so
 OLD_LIBS+=usr/lib/libbsnmp.so.6
 OLD_FILES+=usr/lib/libbsnmp_p.a
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools.so
 OLD_LIBS+=usr/lib/libbsnmptools.so.0
 OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_FILES+=usr/lib/snmp_atm.so
 OLD_LIBS+=usr/lib/snmp_atm.so.6
 OLD_FILES+=usr/lib/snmp_bridge.so
 OLD_LIBS+=usr/lib/snmp_bridge.so.6
 OLD_FILES+=usr/lib/snmp_hast.so
 OLD_LIBS+=usr/lib/snmp_hast.so.6
 OLD_FILES+=usr/lib/snmp_hostres.so
 OLD_LIBS+=usr/lib/snmp_hostres.so.6
 OLD_FILES+=usr/lib/snmp_lm75.so
 OLD_LIBS+=usr/lib/snmp_lm75.so.6
 OLD_FILES+=usr/lib/snmp_mibII.so
 OLD_LIBS+=usr/lib/snmp_mibII.so.6
 OLD_FILES+=usr/lib/snmp_netgraph.so
 OLD_LIBS+=usr/lib/snmp_netgraph.so.6
 OLD_FILES+=usr/lib/snmp_pf.so
 OLD_LIBS+=usr/lib/snmp_pf.so.6
 OLD_FILES+=usr/lib/snmp_target.so
 OLD_LIBS+=usr/lib/snmp_target.so.6
 OLD_FILES+=usr/lib/snmp_usm.so
 OLD_LIBS+=usr/lib/snmp_usm.so.6
 OLD_FILES+=usr/lib/snmp_vacm.so
 OLD_LIBS+=usr/lib/snmp_vacm.so.6
 OLD_FILES+=usr/lib/snmp_wlan.so
 OLD_LIBS+=usr/lib/snmp_wlan.so.6
 OLD_FILES+=usr/lib32/libbsnmp.a
 OLD_FILES+=usr/lib32/libbsnmp.so
 OLD_LIBS+=usr/lib32/libbsnmp.so.6
 OLD_FILES+=usr/lib32/libbsnmp_p.a
 OLD_FILES+=usr/sbin/bsnmpd
 OLD_FILES+=usr/sbin/gensnmptree
 OLD_FILES+=usr/share/examples/etc/snmpd.config
 OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz
 OLD_FILES+=usr/share/man/man1/bsnmpget.1.gz
 OLD_FILES+=usr/share/man/man1/bsnmpset.1.gz
 OLD_FILES+=usr/share/man/man1/bsnmpwalk.1.gz
 OLD_FILES+=usr/share/man/man1/gensnmptree.1.gz
 # lib/libbsnmp/libbsnmp
 OLD_FILES+=usr/share/man/man3/TRUTH_GET.3.gz
 OLD_FILES+=usr/share/man/man3/TRUTH_MK.3.gz
 OLD_FILES+=usr/share/man/man3/TRUTH_OK.3.gz
 OLD_FILES+=usr/share/man/man3/asn1.3.gz
 OLD_FILES+=usr/share/man/man3/asn_append_oid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_commit_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_compare_oid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_counter64_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_integer.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_integer_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_ipaddress.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_ipaddress_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_null.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_null_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_objid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_objid_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_octetstring.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_octetstring_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_sequence.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_timeticks.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_uint32_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_is_suboid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_oid2str.3.gz
 OLD_FILES+=usr/share/man/man3/asn_oid2str_r.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_counter64.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_exception.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_integer.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_ipaddress.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_null.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_objid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_octetstring.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_temp_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_timeticks.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/asn_skip.3.gz
 OLD_FILES+=usr/share/man/man3/asn_slice_oid.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_add_binding.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_calc_keychange.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client_init.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client_set_host.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client_set_port.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_close.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_debug.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_commit.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_finish.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_lookup.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_depop_t.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dialog.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_discover_engine.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_get.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_get_local_keys.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_getbulk.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_getnext.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_init_context.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_make_errresp.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_oid_append.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_op_t.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_open.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_parse_server.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_passwd_to_keys.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_check.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_create.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_header.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_scoped.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_secmode.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_dump.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_encode.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_free.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_init_secparams.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_send.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_receive.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_send_cb_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_set.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_table_cb_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_table_fetch.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_table_fetch_async.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_timeout_cb_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_timeout_start_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_timeout_stop_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_trace.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_value_copy.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_value_free.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_value_parse.3.gz
 OLD_FILES+=usr/share/man/man3/tree.3.gz
 OLD_FILES+=usr/share/man/man3/tree_size.3.gz
 # usr.sbin/bsnmpd/bsnmpd
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/asn1.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpagent.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpclient.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpd_get_target_stats.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpd_get_usm_stats.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpd_reset_usm_stats.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmplib.3.gz
 OLD_FILES+=usr/share/man/man3/buf_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/buf_size.3.gz
 OLD_FILES+=usr/share/man/man3/comm_define.3.gz
 OLD_FILES+=usr/share/man/man3/community.3.gz
 OLD_FILES+=usr/share/man/man3/fd_deselect.3.gz
 OLD_FILES+=usr/share/man/man3/fd_resume.3.gz
 OLD_FILES+=usr/share/man/man3/fd_select.3.gz
 OLD_FILES+=usr/share/man/man3/fd_suspend.3.gz
 OLD_FILES+=usr/share/man/man3/get_ticks.3.gz
 OLD_FILES+=usr/share/man/man3/index_append.3.gz
 OLD_FILES+=usr/share/man/man3/index_append_off.3.gz
 OLD_FILES+=usr/share/man/man3/index_compare.3.gz
 OLD_FILES+=usr/share/man/man3/index_compare_off.3.gz
 OLD_FILES+=usr/share/man/man3/index_decode.3.gz
 OLD_FILES+=usr/share/man/man3/ip_commit.3.gz
 OLD_FILES+=usr/share/man/man3/ip_get.3.gz
 OLD_FILES+=usr/share/man/man3/ip_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/ip_save.3.gz
 OLD_FILES+=usr/share/man/man3/or_register.3.gz
 OLD_FILES+=usr/share/man/man3/or_unregister.3.gz
 OLD_FILES+=usr/share/man/man3/oid_commit.3.gz
 OLD_FILES+=usr/share/man/man3/oid_get.3.gz
 OLD_FILES+=usr/share/man/man3/oid_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/oid_save.3.gz
 OLD_FILES+=usr/share/man/man3/oid_usmNotInTimeWindows.3.gz
 OLD_FILES+=usr/share/man/man3/oid_usmUnknownEngineIDs.3.gz
 OLD_FILES+=usr/share/man/man3/oid_zeroDotZero.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_allocate.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_base.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_istype.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_next.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_type.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_input_finish.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_input_start.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_lm75.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_mibII.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_output.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_auth_access.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_send_port.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_send_trap.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_target.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_usm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_vacm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
 OLD_FILES+=usr/share/man/man3/snmpd_target_stat.3.gz
 OLD_FILES+=usr/share/man/man3/snmpd_usmstats.3.gz
 OLD_FILES+=usr/share/man/man3/snmpmod.3.gz
 OLD_FILES+=usr/share/man/man3/start_tick.3.gz
 OLD_FILES+=usr/share/man/man3/string_commit.3.gz
 OLD_FILES+=usr/share/man/man3/string_free.3.gz
 OLD_FILES+=usr/share/man/man3/string_get.3.gz
 OLD_FILES+=usr/share/man/man3/string_get_max.3.gz
 OLD_FILES+=usr/share/man/man3/string_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/string_save.3.gz
 OLD_FILES+=usr/share/man/man3/systemg.3.gz
 OLD_FILES+=usr/share/man/man3/this_tick.3.gz
 OLD_FILES+=usr/share/man/man3/timer_start.3.gz
 OLD_FILES+=usr/share/man/man3/timer_start_repeat.3.gz
 OLD_FILES+=usr/share/man/man3/timer_stop.3.gz
 OLD_FILES+=usr/share/man/man3/target_activate_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_delete_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_delete_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_delete_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_first_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_first_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_first_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_flush_all.3.gz
 OLD_FILES+=usr/share/man/man3/target_next_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_next_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_next_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_new_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_new_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_new_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_param.3.gz
 OLD_FILES+=usr/share/man/man3/usm_delete_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_find_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_first_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_flush_users.3.gz
 OLD_FILES+=usr/share/man/man3/usm_next_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_new_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_user.3.gz
 OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
 OLD_FILES+=usr/share/snmp/defs/atm_tree.def
 OLD_FILES+=usr/share/snmp/defs/bridge_tree.def
 OLD_FILES+=usr/share/snmp/defs/hast_tree.def
 OLD_FILES+=usr/share/snmp/defs/hostres_tree.def
 OLD_FILES+=usr/share/snmp/defs/lm75_tree.def
 OLD_FILES+=usr/share/snmp/defs/mibII_tree.def
 OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/snmp/defs/pf_tree.def
 OLD_FILES+=usr/share/snmp/defs/target_tree.def
 OLD_FILES+=usr/share/snmp/defs/tree.def
 OLD_FILES+=usr/share/snmp/defs/usm_tree.def
 OLD_FILES+=usr/share/snmp/defs/vacm_tree.def
 OLD_FILES+=usr/share/snmp/defs/wlan_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-BRIDGE-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HOSTRES-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-IP-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-LM75-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB2-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-SNMPD.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt
 OLD_DIRS+=usr/include/bsnmp
 OLD_DIRS+=usr/share/snmp
 OLD_DIRS+=usr/share/snmp/defs
 OLD_DIRS+=usr/share/snmp/mibs
 .endif
 
 .if ${MK_CALENDAR} == no
 OLD_FILES+=etc/periodic/daily/300.calendar
 OLD_FILES+=usr/bin/calendar
 OLD_FILES+=usr/share/calendar/calendar.all
 OLD_FILES+=usr/share/calendar/calendar.australia
 OLD_FILES+=usr/share/calendar/calendar.birthday
 OLD_FILES+=usr/share/calendar/calendar.brazilian
 OLD_FILES+=usr/share/calendar/calendar.christian
 OLD_FILES+=usr/share/calendar/calendar.computer
 OLD_FILES+=usr/share/calendar/calendar.croatian
 OLD_FILES+=usr/share/calendar/calendar.dutch
 OLD_FILES+=usr/share/calendar/calendar.freebsd
 OLD_FILES+=usr/share/calendar/calendar.french
 OLD_FILES+=usr/share/calendar/calendar.german
 OLD_FILES+=usr/share/calendar/calendar.history
 OLD_FILES+=usr/share/calendar/calendar.holiday
 OLD_FILES+=usr/share/calendar/calendar.hungarian
 OLD_FILES+=usr/share/calendar/calendar.judaic
 OLD_FILES+=usr/share/calendar/calendar.lotr
 OLD_FILES+=usr/share/calendar/calendar.music
 OLD_FILES+=usr/share/calendar/calendar.newzealand
 OLD_FILES+=usr/share/calendar/calendar.russian
 OLD_FILES+=usr/share/calendar/calendar.southafrica
 OLD_FILES+=usr/share/calendar/calendar.ukrainian
 OLD_FILES+=usr/share/calendar/calendar.usholiday
 OLD_FILES+=usr/share/calendar/calendar.world
 OLD_FILES+=usr/share/calendar/de_AT.ISO_8859-15/calendar.feiertag
 OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.geschichte
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.kirche
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.literatur
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.musik
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
 OLD_DIRS+=usr/share/calendar/de_DE.ISO8859-1
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-15
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.fetes
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.french
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.jferies
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.proverbes
 OLD_DIRS+=usr/share/calendar/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-15
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.praznici
 OLD_DIRS+=usr/share/calendar/hr_HR.ISO8859-2
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.unnepek
 OLD_DIRS+=usr/share/calendar/hu_HU.ISO8859-2
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
 OLD_DIRS+=usr/share/calendar/pt_BR.ISO8859-1
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.mcommemorative
 OLD_DIRS+=usr/share/calendar/pt_BR.UTF-8
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
 OLD_DIRS+=usr/share/calendar/ru_RU.KOI8-R
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.pagan
 OLD_DIRS+=usr/share/calendar/ru_RU.UTF-8
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
 OLD_DIRS+=usr/share/calendar/uk_UA.KOI8-U
 OLD_DIRS+=usr/share/calendar
 OLD_FILES+=usr/share/man/man1/calendar.1.gz
 OLD_FILES+=usr/tests/usr.bin/calendar/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/calendar/calendar.calibrate
 OLD_FILES+=usr/tests/usr.bin/calendar/legacy_test
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.sh
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-6.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-7.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-6.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-7.out
 OLD_DIRS+=usr/tests/usr.bin/calendar
 .endif
 
 .if ${MK_CASPER} == no
 OLD_FILES+=etc/casper/system.dns
 OLD_FILES+=etc/casper/system.grp
 OLD_FILES+=etc/casper/system.pwd
 OLD_FILES+=etc/casper/system.random
 OLD_FILES+=etc/casper/system.sysctl
 OLD_FILES+=etc/rc.d/casperd
 OLD_LIBS+=lib/libcapsicum.so.0
 OLD_LIBS+=lib/libcasper.so.0
 OLD_FILES+=libexec/casper/dns
 OLD_FILES+=libexec/casper/grp
 OLD_FILES+=libexec/casper/pwd
 OLD_FILES+=libexec/casper/random
 OLD_FILES+=libexec/casper/sysctl
 OLD_FILES+=sbin/casper
 OLD_FILES+=sbin/casperd
 OLD_FILES+=usr/include/libcapsicum.h
 OLD_FILES+=usr/include/libcapsicum_dns.h
 OLD_FILES+=usr/include/libcapsicum_grp.h
 OLD_FILES+=usr/include/libcapsicum_pwd.h
 OLD_FILES+=usr/include/libcapsicum_random.h
 OLD_FILES+=usr/include/libcapsicum_service.h
 OLD_FILES+=usr/include/libcapsicum_sysctl.h
 OLD_FILES+=usr/include/libcasper.h
 OLD_FILES+=usr/lib/libcapsicum.a
 OLD_FILES+=usr/lib/libcapsicum.so
 OLD_FILES+=usr/lib/libcapsicum_p.a
 OLD_FILES+=usr/lib/libcasper.a
 OLD_FILES+=usr/lib/libcasper.so
 OLD_FILES+=usr/lib/libcasper_p.a
 OLD_FILES+=usr/lib32/libcapsicum.a
 OLD_FILES+=usr/lib32/libcapsicum.so
 OLD_LIBS+=usr/lib32/libcapsicum.so.0
 OLD_FILES+=usr/lib32/libcapsicum_p.a
 OLD_FILES+=usr/lib32/libcasper.a
 OLD_FILES+=usr/lib32/libcasper.so
 OLD_LIBS+=usr/lib32/libcasper.so.0
 OLD_FILES+=usr/lib32/libcasper_p.a
 OLD_FILES+=usr/share/man/man3/cap_clone.3.gz
 OLD_FILES+=usr/share/man/man3/cap_close.3.gz
 OLD_FILES+=usr/share/man/man3/cap_init.3.gz
 OLD_FILES+=usr/share/man/man3/cap_limit_get.3.gz
 OLD_FILES+=usr/share/man/man3/cap_limit_set.3.gz
 OLD_FILES+=usr/share/man/man3/cap_recv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/cap_send_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/cap_service_open.3.gz
 OLD_FILES+=usr/share/man/man3/cap_sock.3.gz
 OLD_FILES+=usr/share/man/man3/cap_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/cap_wrap.3.gz
 OLD_FILES+=usr/share/man/man3/cap_xfer_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/libcapsicum.3.gz
 OLD_FILES+=usr/share/man/man8/casperd.8.gz
 .endif
 
 .if ${MK_CCD} == no
 OLD_FILES+=etc/rc.d/ccd
 OLD_FILES+=sbin/ccdconfig
 OLD_FILES+=usr/share/man/man4/ccd.4.gz
 OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
 .endif
 
 .if ${MK_CDDL} == no
 OLD_LIBS+=lib/libavl.so.2
 OLD_LIBS+=lib/libctf.so.2
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_LIBS+=lib/libnvpair.so.2
 OLD_LIBS+=lib/libumem.so.2
 OLD_LIBS+=lib/libuutil.so.2
 OLD_FILES+=usr/bin/ctfconvert
 OLD_FILES+=usr/bin/ctfdump
 OLD_FILES+=usr/bin/ctfmerge
 OLD_FILES+=usr/lib/dtrace/drti.o
 OLD_FILES+=usr/lib/dtrace/errno.d
 OLD_FILES+=usr/lib/dtrace/io.d
 OLD_FILES+=usr/lib/dtrace/ip.d
 OLD_FILES+=usr/lib/dtrace/psinfo.d
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/lib/dtrace/regs_x86.d
 .endif
 OLD_FILES+=usr/lib/dtrace/signal.d
 OLD_FILES+=usr/lib/dtrace/tcp.d
 OLD_FILES+=usr/lib/dtrace/udp.d
 OLD_FILES+=usr/lib/dtrace/unistd.d
 OLD_FILES+=usr/lib/libavl.a
 OLD_FILES+=usr/lib/libavl.so
 OLD_FILES+=usr/lib/libavl_p.a
 OLD_FILES+=usr/lib/libctf.a
 OLD_FILES+=usr/lib/libctf.so
 OLD_FILES+=usr/lib/libctf_p.a
 OLD_FILES+=usr/lib/libdtrace.a
 OLD_FILES+=usr/lib/libdtrace.so
 OLD_FILES+=usr/lib/libdtrace_p.a
 OLD_FILES+=usr/lib/libnvpair.a
 OLD_FILES+=usr/lib/libnvpair.so
 OLD_FILES+=usr/lib/libnvpair_p.a
 OLD_FILES+=usr/lib/libumem.a
 OLD_FILES+=usr/lib/libumem.so
 OLD_FILES+=usr/lib/libumem_p.a
 OLD_FILES+=usr/lib/libuutil.a
 OLD_FILES+=usr/lib/libuutil.so
 OLD_FILES+=usr/lib/libuutil_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/dtrace/drti.o
 OLD_FILES+=usr/lib32/libavl.a
 OLD_FILES+=usr/lib32/libavl.so
 OLD_LIBS+=usr/lib32/libavl.so.2
 OLD_FILES+=usr/lib32/libavl_p.a
 OLD_FILES+=usr/lib32/libctf.a
 OLD_FILES+=usr/lib32/libctf.so
 OLD_LIBS+=usr/lib32/libctf.so.2
 OLD_FILES+=usr/lib32/libctf_p.a
 OLD_FILES+=usr/lib32/libdtrace.a
 OLD_FILES+=usr/lib32/libdtrace.so
 OLD_LIBS+=usr/lib32/libdtrace.so.2
 OLD_FILES+=usr/lib32/libdtrace_p.a
 OLD_FILES+=usr/lib32/libnvpair.a
 OLD_FILES+=usr/lib32/libnvpair.so
 OLD_LIBS+=usr/lib32/libnvpair.so.2
 OLD_FILES+=usr/lib32/libnvpair_p.a
 OLD_FILES+=usr/lib32/libumem.a
 OLD_FILES+=usr/lib32/libumem.so
 OLD_LIBS+=usr/lib32/libumem.so.2
 OLD_FILES+=usr/lib32/libumem_p.a
 OLD_FILES+=usr/lib32/libuutil.a
 OLD_FILES+=usr/lib32/libuutil.so
 OLD_LIBS+=usr/lib32/libuutil.so.2
 OLD_FILES+=usr/lib32/libuutil_p.a
 .endif
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_FILES+=usr/sbin/dtrace
 OLD_FILES+=usr/sbin/lockstat
 OLD_FILES+=usr/sbin/plockstat
 OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 OLD_FILES+=usr/share/man/man1/dtruss.1.gz
 OLD_FILES+=usr/share/man/man1/lockstat.1.gz
 OLD_FILES+=usr/share/man/man1/plockstat.1.gz
 OLD_FILES+=usr/share/dtrace/disklatency
 OLD_FILES+=usr/share/dtrace/disklatencycmd
 OLD_FILES+=usr/share/dtrace/hotopen
 OLD_FILES+=usr/share/dtrace/nfsclienttime
 OLD_FILES+=usr/share/dtrace/toolkit/execsnoop
 OLD_FILES+=usr/share/dtrace/toolkit/hotkernel
 OLD_FILES+=usr/share/dtrace/toolkit/hotuser
 OLD_FILES+=usr/share/dtrace/toolkit/opensnoop
 OLD_FILES+=usr/share/dtrace/toolkit/procsystime
 OLD_FILES+=usr/share/dtrace/tcpconn
 OLD_FILES+=usr/share/dtrace/tcpstate
 OLD_FILES+=usr/share/dtrace/tcptrack
 OLD_FILES+=usr/share/dtrace/udptrack
 OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 OLD_DIRS+=usr/lib/dtrace
 OLD_DIRS+=usr/lib32/dtrace
 OLD_DIRS+=usr/share/dtrace/toolkit
 OLD_DIRS+=usr/share/dtrace
 .endif
 
 .if ${MK_ZFS} == no
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
 OLD_FILES+=etc/rc.d/zfs
 OLD_FILES+=etc/rc.d/zfsbe
 OLD_FILES+=etc/rc.d/zvol
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=lib/libzfs_core.so.2
 OLD_LIBS+=lib/libzpool.so.2
 OLD_FILES+=rescue/zfs
 OLD_FILES+=rescue/zpool
 OLD_FILES+=sbin/zfs
 OLD_FILES+=sbin/zpool
 OLD_FILES+=usr/bin/zinject
 OLD_FILES+=usr/bin/ztest
 OLD_FILES+=usr/lib/libzfs.a
 OLD_FILES+=usr/lib/libzfs.so
 OLD_FILES+=usr/lib/libzfs_core.a
 OLD_FILES+=usr/lib/libzfs_core.so
 OLD_FILES+=usr/lib/libzfs_core_p.a
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzpool.a
 OLD_FILES+=usr/lib/libzpool.so
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libzfs.a
 OLD_FILES+=usr/lib32/libzfs.so
 OLD_LIBS+=usr/lib32/libzfs.so.2
 OLD_FILES+=usr/lib32/libzfs_core.a
 OLD_FILES+=usr/lib32/libzfs_core.so
 OLD_LIBS+=usr/lib32/libzfs_core.so.2
 OLD_FILES+=usr/lib32/libzfs_core_p.a
 OLD_FILES+=usr/lib32/libzfs_p.a
 OLD_FILES+=usr/lib32/libzpool.a
 OLD_FILES+=usr/lib32/libzpool.so
 OLD_LIBS+=usr/lib32/libzpool.so.2
 .endif
 OLD_FILES+=usr/sbin/zdb
 OLD_FILES+=usr/share/man/man8/zdb.8.gz
 OLD_FILES+=usr/share/man/man8/zfs.8.gz
 OLD_FILES+=usr/share/man/man8/zpool.8.gz
 .endif
 
 .if ${MK_CLANG} == no
 OLD_FILES+=usr/bin/clang
 OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-tblgen
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.9.1/include/msa.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.9.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.9.1/lib
 OLD_DIRS+=usr/lib/clang/3.9.1
 OLD_DIRS+=usr/lib/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang
 OLD_FILES+=usr/share/doc/llvm/COPYRIGHT.regex
 OLD_FILES+=usr/share/doc/llvm/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm
 OLD_FILES+=usr/share/man/man1/clang.1.gz
 OLD_FILES+=usr/share/man/man1/clang++.1.gz
 OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz
 .endif
 
 .if ${MK_CLANG_EXTRAS} == no
 OLD_FILES+=usr/bin/bugpoint
 OLD_FILES+=usr/bin/clang-format
 OLD_FILES+=usr/bin/llc
 OLD_FILES+=usr/bin/lli
 OLD_FILES+=usr/bin/llvm-ar
 OLD_FILES+=usr/bin/llvm-as
 OLD_FILES+=usr/bin/llvm-bcanalyzer
 OLD_FILES+=usr/bin/llvm-cxxdump
 OLD_FILES+=usr/bin/llvm-diff
 OLD_FILES+=usr/bin/llvm-dis
 OLD_FILES+=usr/bin/llvm-dwarfdump
 OLD_FILES+=usr/bin/llvm-extract
 OLD_FILES+=usr/bin/llvm-link
 OLD_FILES+=usr/bin/llvm-lto
 OLD_FILES+=usr/bin/llvm-mc
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-pdbdump
+OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/opt
 OLD_FILES+=usr/share/man/man1/bugpoint.1.gz
 OLD_FILES+=usr/share/man/man1/llc.1.gz
 OLD_FILES+=usr/share/man/man1/lli.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-as.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-bcanalyzer.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-diff.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-dwarfdump.1
 OLD_FILES+=usr/share/man/man1/llvm-extract.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-link.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz
 OLD_FILES+=usr/share/man/man1/opt.1.gz
 .endif
 
 .if ${MK_CPP} == no
 OLD_FILES+=usr/bin/cpp
 OLD_FILES+=usr/share/man/man1/cpp.1.gz
 .endif
 
 #.if ${MK_CRYPT} == no
 # to be filled in
 #.endif
 
 .if ${MK_CTM} == no
 OLD_FILES+=usr/sbin/ctm
 OLD_FILES+=usr/sbin/ctm_dequeue
 OLD_FILES+=usr/sbin/ctm_rmail
 OLD_FILES+=usr/sbin/ctm_smail
 OLD_FILES+=usr/share/man/man1/ctm.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_dequeue.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_rmail.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_smail.1.gz
 OLD_FILES+=usr/share/man/man5/ctm.5.gz
 .endif
 
 .if ${MK_CUSE} == no
 OLD_FILES+=usr/include/fs/cuse/cuse_defs.h
 OLD_FILES+=usr/include/fs/cuse/cuse_ioctl.h
 OLD_FILES+=usr/include/cuse.h
 OLD_FILES+=usr/lib/libcuse.a
 OLD_LIBS+=usr/lib/libcuse.so.1
 OLD_FILES+=usr/lib/libcuse_p.a
 OLD_FILES+=usr/share/man/man3/cuse.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number_by_id.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_copy_in.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_copy_out.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_create.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_current.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_per_file_handle.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv0.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv1.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_set_per_file_handle.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv0.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv1.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_free_unit_number.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_free_unit_number_by_id.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_get_local.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_got_peer_signal.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_init.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_is_vmalloc_addr.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_poll_wakeup.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_set_local.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_uninit.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_vmalloc.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_vmfree.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_vmoffset.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_wait_and_process.3.gz
 OLD_DIRS+=usr/include/fs/cuse
 .endif
 
 # devd(8) not listed here on purpose
 .if ${MK_CXX} == no
 OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/c++
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
 .endif
 
 .if ${MK_DIALOG} == no
 OLD_FILES+=usr/bin/dialog
 OLD_FILES+=usr/bin/dpv
 OLD_FILES+=usr/lib/libdialog.a
 OLD_FILES+=usr/lib/libdialog.so
 OLD_FILES+=usr/lib/libdialog.so.8
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libdpv.a
 OLD_FILES+=usr/lib/libdpv.so
 OLD_FILES+=usr/lib/libdpv.so.1
 OLD_FILES+=usr/lib/libdpv_p.a
 OLD_FILES+=usr/sbin/bsdconfig
 OLD_FILES+=usr/share/man/man1/dialog.1.gz
 OLD_FILES+=usr/share/man/man1/dpv.1.gz
 OLD_FILES+=usr/share/man/man3/dialog.3.gz
 OLD_FILES+=usr/share/man/man3/dpv.3.gz
 OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz
 .endif
 
 .if ${MK_FMTREE} == no
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 .endif
 
 .if ${MK_FTP} == no
 OLD_FILES+=etc/ftpusers
 OLD_FILES+=etc/rc.d/ftpd
 OLD_FILES+=usr/bin/ftp
 OLD_FILES+=usr/bin/gate-ftp
 OLD_FILES+=usr/bin/pftp
 OLD_FILES+=usr/libexec/ftpd
 OLD_FILES+=usr/share/man/man1/ftp.1.gz
 OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz
 OLD_FILES+=usr/share/man/man1/pftp.1.gz
 OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz
 OLD_FILES+=usr/share/man/man8/ftpd.8.gz
 .endif
 
 .if ${MK_GNUCXX} == no
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/include/c++/4.2/algorithm
 OLD_FILES+=usr/include/c++/4.2/backward/algo.h
 OLD_FILES+=usr/include/c++/4.2/backward/algobase.h
 OLD_FILES+=usr/include/c++/4.2/backward/alloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/4.2/backward/bvector.h
 OLD_FILES+=usr/include/c++/4.2/backward/complex.h
 OLD_FILES+=usr/include/c++/4.2/backward/defalloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/deque.h
 OLD_FILES+=usr/include/c++/4.2/backward/fstream.h
 OLD_FILES+=usr/include/c++/4.2/backward/function.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/backward/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/backward/heap.h
 OLD_FILES+=usr/include/c++/4.2/backward/iomanip.h
 OLD_FILES+=usr/include/c++/4.2/backward/iostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/istream.h
 OLD_FILES+=usr/include/c++/4.2/backward/iterator.h
 OLD_FILES+=usr/include/c++/4.2/backward/list.h
 OLD_FILES+=usr/include/c++/4.2/backward/map.h
 OLD_FILES+=usr/include/c++/4.2/backward/multimap.h
 OLD_FILES+=usr/include/c++/4.2/backward/multiset.h
 OLD_FILES+=usr/include/c++/4.2/backward/new.h
 OLD_FILES+=usr/include/c++/4.2/backward/ostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/pair.h
 OLD_FILES+=usr/include/c++/4.2/backward/queue.h
 OLD_FILES+=usr/include/c++/4.2/backward/rope.h
 OLD_FILES+=usr/include/c++/4.2/backward/set.h
 OLD_FILES+=usr/include/c++/4.2/backward/slist.h
 OLD_FILES+=usr/include/c++/4.2/backward/stack.h
 OLD_FILES+=usr/include/c++/4.2/backward/stream.h
 OLD_FILES+=usr/include/c++/4.2/backward/streambuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/strstream
 OLD_FILES+=usr/include/c++/4.2/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/tree.h
 OLD_FILES+=usr/include/c++/4.2/backward/vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_file.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++config.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++io.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/4.2/bits/char_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/codecvt.h
 OLD_FILES+=usr/include/c++/4.2/bits/compatibility.h
 OLD_FILES+=usr/include/c++/4.2/bits/concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpu_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/4.2/bits/cxxabi_tweaks.h
 OLD_FILES+=usr/include/c++/4.2/bits/deque.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/functexcept.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-tpf.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr.h
 OLD_FILES+=usr/include/c++/4.2/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/ios_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/istream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/list.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/localefwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/mask_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/messages_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/os_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/ostream_insert.h
 OLD_FILES+=usr/include/c++/4.2/bits/postypes.h
 OLD_FILES+=usr/include/c++/4.2/bits/slice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_function.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_list.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_map.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_set.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/time_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/4.2/bits/vector.tcc
 OLD_FILES+=usr/include/c++/4.2/bitset
 OLD_FILES+=usr/include/c++/4.2/cassert
 OLD_FILES+=usr/include/c++/4.2/cctype
 OLD_FILES+=usr/include/c++/4.2/cerrno
 OLD_FILES+=usr/include/c++/4.2/cfloat
 OLD_FILES+=usr/include/c++/4.2/ciso646
 OLD_FILES+=usr/include/c++/4.2/climits
 OLD_FILES+=usr/include/c++/4.2/clocale
 OLD_FILES+=usr/include/c++/4.2/cmath
 OLD_FILES+=usr/include/c++/4.2/complex
 OLD_FILES+=usr/include/c++/4.2/csetjmp
 OLD_FILES+=usr/include/c++/4.2/csignal
 OLD_FILES+=usr/include/c++/4.2/cstdarg
 OLD_FILES+=usr/include/c++/4.2/cstddef
 OLD_FILES+=usr/include/c++/4.2/cstdio
 OLD_FILES+=usr/include/c++/4.2/cstdlib
 OLD_FILES+=usr/include/c++/4.2/cstring
 OLD_FILES+=usr/include/c++/4.2/ctime
 OLD_FILES+=usr/include/c++/4.2/cwchar
 OLD_FILES+=usr/include/c++/4.2/cwctype
 OLD_FILES+=usr/include/c++/4.2/cxxabi.h
 OLD_FILES+=usr/include/c++/4.2/debug/bitset
 OLD_FILES+=usr/include/c++/4.2/debug/debug.h
 OLD_FILES+=usr/include/c++/4.2/debug/deque
 OLD_FILES+=usr/include/c++/4.2/debug/formatter.h
 OLD_FILES+=usr/include/c++/4.2/debug/functions.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/debug/list
 OLD_FILES+=usr/include/c++/4.2/debug/macros.h
 OLD_FILES+=usr/include/c++/4.2/debug/map
 OLD_FILES+=usr/include/c++/4.2/debug/map.h
 OLD_FILES+=usr/include/c++/4.2/debug/multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_base.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/4.2/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/4.2/debug/set
 OLD_FILES+=usr/include/c++/4.2/debug/set.h
 OLD_FILES+=usr/include/c++/4.2/debug/string
 OLD_FILES+=usr/include/c++/4.2/debug/vector
 OLD_FILES+=usr/include/c++/4.2/deque
 OLD_FILES+=usr/include/c++/4.2/exception
 OLD_FILES+=usr/include/c++/4.2/exception_defines.h
 OLD_FILES+=usr/include/c++/4.2/ext/algorithm
 OLD_FILES+=usr/include/c++/4.2/ext/array_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/atomicity.h
 OLD_FILES+=usr/include/c++/4.2/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/4.2/ext/concurrence.h
 OLD_FILES+=usr/include/c++/4.2/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/functional
 OLD_FILES+=usr/include/c++/4.2/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/4.2/ext/hash_map
 OLD_FILES+=usr/include/c++/4.2/ext/hash_set
 OLD_FILES+=usr/include/c++/4.2/ext/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/ext/iterator
 OLD_FILES+=usr/include/c++/4.2/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/memory
 OLD_FILES+=usr/include/c++/4.2/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/numeric
 OLD_FILES+=usr/include/c++/4.2/ext/numeric_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/assoc_container.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_types.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cond_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/container_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/map_debug_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/head.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/internal_node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/leaf.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_trace_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/type_utils.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/types_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/exception.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/hash_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/list_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/priority_queue.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tag_and_trait.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tree_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/trie_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/rb_tree
 OLD_FILES+=usr/include/c++/4.2/ext/rc_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/rope
 OLD_FILES+=usr/include/c++/4.2/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/4.2/ext/slist
 OLD_FILES+=usr/include/c++/4.2/ext/sso_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/throw_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/type_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/typelist.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.tcc
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_fwd.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_util.h
 OLD_FILES+=usr/include/c++/4.2/fstream
 OLD_FILES+=usr/include/c++/4.2/functional
 OLD_FILES+=usr/include/c++/4.2/iomanip
 OLD_FILES+=usr/include/c++/4.2/ios
 OLD_FILES+=usr/include/c++/4.2/iosfwd
 OLD_FILES+=usr/include/c++/4.2/iostream
 OLD_FILES+=usr/include/c++/4.2/istream
 OLD_FILES+=usr/include/c++/4.2/iterator
 OLD_FILES+=usr/include/c++/4.2/limits
 OLD_FILES+=usr/include/c++/4.2/list
 OLD_FILES+=usr/include/c++/4.2/locale
 OLD_FILES+=usr/include/c++/4.2/map
 OLD_FILES+=usr/include/c++/4.2/memory
 OLD_FILES+=usr/include/c++/4.2/new
 OLD_FILES+=usr/include/c++/4.2/numeric
 OLD_FILES+=usr/include/c++/4.2/ostream
 OLD_FILES+=usr/include/c++/4.2/queue
 OLD_FILES+=usr/include/c++/4.2/set
 OLD_FILES+=usr/include/c++/4.2/sstream
 OLD_FILES+=usr/include/c++/4.2/stack
 OLD_FILES+=usr/include/c++/4.2/stdexcept
 OLD_FILES+=usr/include/c++/4.2/streambuf
 OLD_FILES+=usr/include/c++/4.2/string
 OLD_FILES+=usr/include/c++/4.2/tr1/array
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/boost_shared_ptr.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cctype
 OLD_FILES+=usr/include/c++/4.2/tr1/cfenv
 OLD_FILES+=usr/include/c++/4.2/tr1/cfloat
 OLD_FILES+=usr/include/c++/4.2/tr1/cinttypes
 OLD_FILES+=usr/include/c++/4.2/tr1/climits
 OLD_FILES+=usr/include/c++/4.2/tr1/cmath
 OLD_FILES+=usr/include/c++/4.2/tr1/common.h
 OLD_FILES+=usr/include/c++/4.2/tr1/complex
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdarg
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdbool
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdint
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdio
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdlib
 OLD_FILES+=usr/include/c++/4.2/tr1/ctgmath
 OLD_FILES+=usr/include/c++/4.2/tr1/ctime
 OLD_FILES+=usr/include/c++/4.2/tr1/ctype.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cwchar
 OLD_FILES+=usr/include/c++/4.2/tr1/cwctype
 OLD_FILES+=usr/include/c++/4.2/tr1/fenv.h
 OLD_FILES+=usr/include/c++/4.2/tr1/float.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_hash.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable_policy.h
 OLD_FILES+=usr/include/c++/4.2/tr1/inttypes.h
 OLD_FILES+=usr/include/c++/4.2/tr1/limits.h
 OLD_FILES+=usr/include/c++/4.2/tr1/math.h
 OLD_FILES+=usr/include/c++/4.2/tr1/memory
 OLD_FILES+=usr/include/c++/4.2/tr1/mu_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/random
 OLD_FILES+=usr/include/c++/4.2/tr1/random.tcc
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_wrap_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdarg.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdint.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdio.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_defs.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_map
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_set
 OLD_FILES+=usr/include/c++/4.2/tr1/utility
 OLD_FILES+=usr/include/c++/4.2/tr1/wchar.h
 OLD_FILES+=usr/include/c++/4.2/tr1/wctype.h
 OLD_FILES+=usr/include/c++/4.2/typeinfo
 OLD_FILES+=usr/include/c++/4.2/utility
 OLD_FILES+=usr/include/c++/4.2/valarray
 OLD_FILES+=usr/include/c++/4.2/vector
 OLD_FILES+=usr/lib/libstdc++.a
 OLD_FILES+=usr/lib/libstdc++.so
 OLD_LIBS+=usr/lib/libstdc++.so.6
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++.a
 OLD_FILES+=usr/lib/libsupc++.so
 OLD_LIBS+=usr/lib/libsupc++.so.1
 OLD_FILES+=usr/lib/libsupc++_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libstdc++.a
 OLD_FILES+=usr/lib32/libstdc++.so
 OLD_LIBS+=usr/lib32/libstdc++.so.6
 OLD_FILES+=usr/lib32/libstdc++_p.a
 OLD_FILES+=usr/lib32/libsupc++.a
 OLD_FILES+=usr/lib32/libsupc++.so
 OLD_LIBS+=usr/lib32/libsupc++.so.1
 OLD_FILES+=usr/lib32/libsupc++_p.a
 .endif
 OLD_FILES+=usr/libexec/cc1plus
 .endif
 
 .if ${MK_DICT} == no
 OLD_FILES+=usr/share/dict/README
 OLD_FILES+=usr/share/dict/eign
 OLD_FILES+=usr/share/dict/freebsd
 OLD_FILES+=usr/share/dict/propernames
 OLD_FILES+=usr/share/dict/web2
 OLD_FILES+=usr/share/dict/web2a
 OLD_FILES+=usr/share/dict/words
 OLD_DIRS+=usr/share/dict
 .endif
 
 .if ${MK_DMAGENT} == no
 OLD_FILES+=etc/dma/dma.conf
 OLD_FILES+=usr/libexec/dma
 OLD_FILES+=usr/libexec/dma-mbox-create
 OLD_FILES+=usr/share/man/man8/dma.8.gz
 OLD_FILES+=usr/share/examples/dma/mailer.conf
 .endif
 
 .if ${MK_EE} == no
 OLD_FILES+=usr/bin/edit
 OLD_FILES+=usr/bin/ee
 OLD_FILES+=usr/bin/ree
 OLD_FILES+=usr/share/man/man1/edit.1.gz
 OLD_FILES+=usr/share/man/man1/ee.1.gz
 OLD_FILES+=usr/share/man/man1/ree.1.gz
 OLD_FILES+=usr/share/nls/C/ee.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
 .endif
 
 #.if ${MK_EXAMPLES} == no
 # to be filled in
 #.endif
 
 .if ${MK_FINGER} == no
 OLD_FILES+=usr/bin/finger
 OLD_FILES+=usr/share/man/man1/finger.1.gz
 OLD_FILES+=usr/share/man/man5/finger.conf.5.gz
 OLD_FILES+=usr/libexec/fingerd
 OLD_FILES+=usr/share/man/man8/fingerd.8.gz
 .endif
 
 .if ${MK_FLOPPY} == no
 OLD_FILES+=usr/sbin/fdcontrol
 OLD_FILES+=usr/sbin/fdformat
 OLD_FILES+=usr/sbin/fdread
 OLD_FILES+=usr/sbin/fdwrite
 OLD_FILES+=usr/share/man/man1/fdformat.1.gz
 OLD_FILES+=usr/share/man/man1/fdread.1.gz
 OLD_FILES+=usr/share/man/man1/fdwrite.1.gz
 OLD_FILES+=usr/share/man/man8/fdcontrol.8.gz
 .endif
 
 .if ${MK_FORTH} == no
 OLD_FILES+=usr/share/man/man5/loader.conf.5.gz
 OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz
 OLD_FILES+=usr/share/man/man8/brand.4th.8.gz
 OLD_FILES+=usr/share/man/man8/check-password.4th.8.gz
 OLD_FILES+=usr/share/man/man8/color.4th.8.gz
 OLD_FILES+=usr/share/man/man8/delay.4th.8.gz
 OLD_FILES+=usr/share/man/man8/loader.4th.8.gz
 OLD_FILES+=usr/share/man/man8/menu.4th.8.gz
 OLD_FILES+=usr/share/man/man8/menusets.4th.8.gz
 OLD_FILES+=usr/share/man/man8/version.4th.8.gz
 .endif
 
 .if ${MK_FREEBSD_UPDATE} == no
 OLD_FILES+=etc/freebsd-update.conf
 OLD_FILES+=usr/sbin/freebsd-update
 OLD_FILES+=usr/share/examples/etc/freebsd-update.conf
 OLD_FILES+=usr/share/man/man5/freebsd-update.conf.5.gz
 OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz
 .endif
 
 .if ${MK_GAMES} == no
 OLD_FILES+=usr/bin/caesar
 OLD_FILES+=usr/bin/factor
 OLD_FILES+=usr/bin/fortune
 OLD_FILES+=usr/bin/grdc
 OLD_FILES+=usr/bin/morse
 OLD_FILES+=usr/bin/number
 OLD_FILES+=usr/bin/pom
 OLD_FILES+=usr/bin/primes
 OLD_FILES+=usr/bin/random
 OLD_FILES+=usr/bin/rot13
 OLD_FILES+=usr/bin/strfile
 OLD_FILES+=usr/bin/unstr
 OLD_FILES+=usr/share/games/fortune/fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes.dat
 OLD_FILES+=usr/share/games/fortune/freebsd-tips
 OLD_FILES+=usr/share/games/fortune/freebsd-tips.dat
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick.dat
 OLD_FILES+=usr/share/games/fortune/limerick
 OLD_FILES+=usr/share/games/fortune/limerick.dat
 OLD_FILES+=usr/share/games/fortune/murphy
 OLD_FILES+=usr/share/games/fortune/murphy-o
 OLD_FILES+=usr/share/games/fortune/murphy-o.dat
 OLD_FILES+=usr/share/games/fortune/murphy.dat
 OLD_FILES+=usr/share/games/fortune/startrek
 OLD_FILES+=usr/share/games/fortune/startrek.dat
 OLD_FILES+=usr/share/games/fortune/zippy
 OLD_FILES+=usr/share/games/fortune/zippy.dat
 OLD_DIRS+=usr/share/games/fortune
 OLD_DIRS+=usr/share/games
 OLD_FILES+=usr/share/man/man6/caesar.6.gz
 OLD_FILES+=usr/share/man/man6/factor.6.gz
 OLD_FILES+=usr/share/man/man6/fortune.6.gz
 OLD_FILES+=usr/share/man/man6/grdc.6.gz
 OLD_FILES+=usr/share/man/man6/morse.6.gz
 OLD_FILES+=usr/share/man/man6/number.6.gz
 OLD_FILES+=usr/share/man/man6/pom.6.gz
 OLD_FILES+=usr/share/man/man6/primes.6.gz
 OLD_FILES+=usr/share/man/man6/random.6.gz
 OLD_FILES+=usr/share/man/man6/rot13.6.gz
 OLD_FILES+=usr/share/man/man8/strfile.8.gz
 OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .endif
 
 .if ${MK_GCC} == no
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/bin/gcpp
 OLD_FILES+=usr/bin/gperf
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/gcc/4.2/ammintrin.h
 OLD_FILES+=usr/include/gcc/4.2/emmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/mm3dnow.h
 OLD_FILES+=usr/include/gcc/4.2/mm_malloc.h
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/pmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/tmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/wmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/xmmintrin.h
 .elif ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/include/gcc/4.2/altivec.h
 OLD_FILES+=usr/include/gcc/4.2/ppc-asm.h
 OLD_FILES+=usr/include/gcc/4.2/spe.h
 .endif
 OLD_FILES+=usr/include/omp.h
 OLD_FILES+=usr/lib/libgcov.a
 OLD_FILES+=usr/lib/libgomp.a
 OLD_FILES+=usr/lib/libgomp.so
 OLD_LIBS+=usr/lib/libgomp.so.1
 OLD_FILES+=usr/lib/libgomp_p.a
 OLD_FILES+=usr/lib32/libgcov.a
 OLD_FILES+=usr/lib32/libgomp.a
 OLD_FILES+=usr/lib32/libgomp.so
 OLD_LIBS+=usr/lib32/libgomp.so.1
 OLD_FILES+=usr/lib32/libgomp_p.a
 OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/info/cpp.info.gz
 OLD_FILES+=usr/share/info/cppinternals.info.gz
 OLD_FILES+=usr/share/info/gcc.info.gz
 OLD_FILES+=usr/share/info/gccint.info.gz
 OLD_FILES+=usr/share/info/gperf.info.gz
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.7.gz
 .endif
 
 .if ${MK_GCOV} == no
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif
 
 .if ${MK_GDB} == no
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver
 OLD_FILES+=usr/bin/gdbtui
 OLD_FILES+=usr/bin/kgdb
 OLD_FILES+=usr/share/info/gdb.info.gz
 OLD_FILES+=usr/share/info/gdbint.info.gz
 OLD_FILES+=usr/share/info/stabs.info.gz
 OLD_FILES+=usr/share/man/man1/gdb.1.gz
 OLD_FILES+=usr/share/man/man1/gdbserver.1.gz
 OLD_FILES+=usr/share/man/man1/kgdb.1.gz
 .endif
 
 .if ${MK_GPIO} == no
 OLD_FILES+=usr/include/libgpio.h
 OLD_FILES+=usr/lib/libgpio.a
 OLD_FILES+=usr/lib/libgpio.so
 OLD_LIBS+=usr/lib/libgpio.so.0
 OLD_FILES+=usr/lib/libgpio_p.a
 OLD_FILES+=usr/lib32/libgpio.a
 OLD_FILES+=usr/lib32/libgpio.so
 OLD_LIBS+=usr/lib32/libgpio.so.0
 OLD_FILES+=usr/lib32/libgpio_p.a
 OLD_FILES+=usr/sbin/gpioctl
 OLD_FILES+=usr/share/man/man3/gpio.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_close.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_open.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_open_device.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_config.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_get.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_high.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_input.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_invin.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_invout.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_list.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_low.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_opendrain.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_output.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pulldown.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pullup.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pulsate.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pushpull.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_set.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz
 OLD_FILES+=usr/share/man/man8/gpioctl.8.gz
 .endif
 
 .if ${MK_GNU_DIFF} == no
 OLD_FILES+=usr/bin/diff
 OLD_FILES+=usr/bin/diff3
 OLD_FILES+=usr/share/man/man1/diff.1.gz
 OLD_FILES+=usr/share/man/man1/diff3.1.gz
 OLD_FILES+=usr/share/man/man7/diff.7.gz
 .endif
 
 .if ${MK_GNU_GREP} == no
 OLD_FILES+=usr/bin/gnugrep
 OLD_FILES+=usr/share/man/man1/gnugrep.1.gz
 .if ${MK_BSD_GREP} == no
 OLD_FILES+=usr/bin/bzgrep
 OLD_FILES+=usr/bin/bzegrep
 OLD_FILES+=usr/bin/bzfgrep
 OLD_FILES+=usr/bin/egrep
 OLD_FILES+=usr/bin/fgrep
 OLD_FILES+=usr/bin/grep
 OLD_FILES+=usr/bin/zegrep
 OLD_FILES+=usr/bin/zfgrep
 OLD_FILES+=usr/bin/zgrep
 OLD_FILES+=usr/share/man/man1/bzegrep.1.gz
 OLD_FILES+=usr/share/man/man1/bzfgrep.1.gz
 OLD_FILES+=usr/share/man/man1/bzgrep.1.gz
 OLD_FILES+=usr/share/man/man1/egrep.1.gz
 OLD_FILES+=usr/share/man/man1/fgrep.1.gz
 OLD_FILES+=usr/share/man/man1/grep.1.gz
 OLD_FILES+=usr/share/man/man1/zegrep.1.gz
 OLD_FILES+=usr/share/man/man1/zfgrep.1.gz
 OLD_FILES+=usr/share/man/man1/zgrep.1.gz
 .endif
 .endif
 
 # Also includes vgrind(1)
 .if ${MK_GROFF} == no
 OLD_FILES+=usr/bin/addftinfo
 OLD_FILES+=usr/bin/afmtodit
 OLD_FILES+=usr/bin/eqn
 OLD_FILES+=usr/bin/grn
 OLD_FILES+=usr/bin/grodvi
 OLD_FILES+=usr/bin/groff
 OLD_FILES+=usr/bin/grog
 OLD_FILES+=usr/bin/grolbp
 OLD_FILES+=usr/bin/grolj4
 OLD_FILES+=usr/bin/grops
 OLD_FILES+=usr/bin/grotty
 OLD_FILES+=usr/bin/hpftodit
 OLD_FILES+=usr/bin/indxbib
 OLD_FILES+=usr/bin/lkbib
 OLD_FILES+=usr/bin/lookbib
 OLD_FILES+=usr/bin/mmroff
 OLD_FILES+=usr/bin/neqn
 OLD_FILES+=usr/bin/nroff
 OLD_FILES+=usr/bin/pfbtops
 OLD_FILES+=usr/bin/pic
 OLD_FILES+=usr/bin/post-grohtml
 OLD_FILES+=usr/bin/pre-grohtml
 OLD_FILES+=usr/bin/psroff
 OLD_FILES+=usr/bin/refer
 OLD_FILES+=usr/bin/tbl
 OLD_FILES+=usr/bin/tfmtodit
 OLD_FILES+=usr/bin/troff
 OLD_FILES+=usr/bin/vgrind
 OLD_FILES+=usr/libexec/vfontedpr
 OLD_FILES+=usr/share/dict/eign
 OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz
 OLD_FILES+=usr/share/doc/papers/bio.ascii.gz
 OLD_FILES+=usr/share/doc/papers/contents.ascii.gz
 OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz
 OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/jail.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz
 OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz
 OLD_FILES+=usr/share/doc/papers/releng.ascii.gz
 OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz
 OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
 OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/psd/contents.ascii.gz
 OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz
 OLD_FILES+=usr/share/doc/smm/Title.ascii.gz
 OLD_FILES+=usr/share/doc/smm/contents.ascii.gz
 OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
 OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz
 OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/usd/contents.ascii.gz
 OLD_FILES+=usr/share/groff_font/devX100-12/CB
 OLD_FILES+=usr/share/groff_font/devX100-12/CBI
 OLD_FILES+=usr/share/groff_font/devX100-12/CI
 OLD_FILES+=usr/share/groff_font/devX100-12/CR
 OLD_FILES+=usr/share/groff_font/devX100-12/DESC
 OLD_FILES+=usr/share/groff_font/devX100-12/HB
 OLD_FILES+=usr/share/groff_font/devX100-12/HBI
 OLD_FILES+=usr/share/groff_font/devX100-12/HI
 OLD_FILES+=usr/share/groff_font/devX100-12/HR
 OLD_FILES+=usr/share/groff_font/devX100-12/NB
 OLD_FILES+=usr/share/groff_font/devX100-12/NBI
 OLD_FILES+=usr/share/groff_font/devX100-12/NI
 OLD_FILES+=usr/share/groff_font/devX100-12/NR
 OLD_FILES+=usr/share/groff_font/devX100-12/S
 OLD_FILES+=usr/share/groff_font/devX100-12/TB
 OLD_FILES+=usr/share/groff_font/devX100-12/TBI
 OLD_FILES+=usr/share/groff_font/devX100-12/TI
 OLD_FILES+=usr/share/groff_font/devX100-12/TR
 OLD_DIRS+=usr/share/groff_font/devX100-12
 OLD_FILES+=usr/share/groff_font/devX100/CB
 OLD_FILES+=usr/share/groff_font/devX100/CBI
 OLD_FILES+=usr/share/groff_font/devX100/CI
 OLD_FILES+=usr/share/groff_font/devX100/CR
 OLD_FILES+=usr/share/groff_font/devX100/DESC
 OLD_FILES+=usr/share/groff_font/devX100/HB
 OLD_FILES+=usr/share/groff_font/devX100/HBI
 OLD_FILES+=usr/share/groff_font/devX100/HI
 OLD_FILES+=usr/share/groff_font/devX100/HR
 OLD_FILES+=usr/share/groff_font/devX100/NB
 OLD_FILES+=usr/share/groff_font/devX100/NBI
 OLD_FILES+=usr/share/groff_font/devX100/NI
 OLD_FILES+=usr/share/groff_font/devX100/NR
 OLD_FILES+=usr/share/groff_font/devX100/S
 OLD_FILES+=usr/share/groff_font/devX100/TB
 OLD_FILES+=usr/share/groff_font/devX100/TBI
 OLD_FILES+=usr/share/groff_font/devX100/TI
 OLD_FILES+=usr/share/groff_font/devX100/TR
 OLD_DIRS+=usr/share/groff_font/devX100
 OLD_FILES+=usr/share/groff_font/devX75-12/CB
 OLD_FILES+=usr/share/groff_font/devX75-12/CBI
 OLD_FILES+=usr/share/groff_font/devX75-12/CI
 OLD_FILES+=usr/share/groff_font/devX75-12/CR
 OLD_FILES+=usr/share/groff_font/devX75-12/DESC
 OLD_FILES+=usr/share/groff_font/devX75-12/HB
 OLD_FILES+=usr/share/groff_font/devX75-12/HBI
 OLD_FILES+=usr/share/groff_font/devX75-12/HI
 OLD_FILES+=usr/share/groff_font/devX75-12/HR
 OLD_FILES+=usr/share/groff_font/devX75-12/NB
 OLD_FILES+=usr/share/groff_font/devX75-12/NBI
 OLD_FILES+=usr/share/groff_font/devX75-12/NI
 OLD_FILES+=usr/share/groff_font/devX75-12/NR
 OLD_FILES+=usr/share/groff_font/devX75-12/S
 OLD_FILES+=usr/share/groff_font/devX75-12/TB
 OLD_FILES+=usr/share/groff_font/devX75-12/TBI
 OLD_FILES+=usr/share/groff_font/devX75-12/TI
 OLD_FILES+=usr/share/groff_font/devX75-12/TR
 OLD_DIRS+=usr/share/groff_font/devX75-12
 OLD_FILES+=usr/share/groff_font/devX75/CB
 OLD_FILES+=usr/share/groff_font/devX75/CBI
 OLD_FILES+=usr/share/groff_font/devX75/CI
 OLD_FILES+=usr/share/groff_font/devX75/CR
 OLD_FILES+=usr/share/groff_font/devX75/DESC
 OLD_FILES+=usr/share/groff_font/devX75/HB
 OLD_FILES+=usr/share/groff_font/devX75/HBI
 OLD_FILES+=usr/share/groff_font/devX75/HI
 OLD_FILES+=usr/share/groff_font/devX75/HR
 OLD_FILES+=usr/share/groff_font/devX75/NB
 OLD_FILES+=usr/share/groff_font/devX75/NBI
 OLD_FILES+=usr/share/groff_font/devX75/NI
 OLD_FILES+=usr/share/groff_font/devX75/NR
 OLD_FILES+=usr/share/groff_font/devX75/S
 OLD_FILES+=usr/share/groff_font/devX75/TB
 OLD_FILES+=usr/share/groff_font/devX75/TBI
 OLD_FILES+=usr/share/groff_font/devX75/TI
 OLD_FILES+=usr/share/groff_font/devX75/TR
 OLD_DIRS+=usr/share/groff_font/devX75
 OLD_FILES+=usr/share/groff_font/devascii/B
 OLD_FILES+=usr/share/groff_font/devascii/BI
 OLD_FILES+=usr/share/groff_font/devascii/CW
 OLD_FILES+=usr/share/groff_font/devascii/DESC
 OLD_FILES+=usr/share/groff_font/devascii/I
 OLD_FILES+=usr/share/groff_font/devascii/L
 OLD_FILES+=usr/share/groff_font/devascii/R
 OLD_FILES+=usr/share/groff_font/devascii/S
 OLD_DIRS+=usr/share/groff_font/devascii
 OLD_FILES+=usr/share/groff_font/devcp1047/B
 OLD_FILES+=usr/share/groff_font/devcp1047/BI
 OLD_FILES+=usr/share/groff_font/devcp1047/CW
 OLD_FILES+=usr/share/groff_font/devcp1047/DESC
 OLD_FILES+=usr/share/groff_font/devcp1047/I
 OLD_FILES+=usr/share/groff_font/devcp1047/L
 OLD_FILES+=usr/share/groff_font/devcp1047/R
 OLD_FILES+=usr/share/groff_font/devcp1047/S
 OLD_DIRS+=usr/share/groff_font/devcp1047
 OLD_FILES+=usr/share/groff_font/devdvi/CW
 OLD_FILES+=usr/share/groff_font/devdvi/CWEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWI
 OLD_FILES+=usr/share/groff_font/devdvi/CWIEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWITC
 OLD_FILES+=usr/share/groff_font/devdvi/CWTC
 OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts
 OLD_FILES+=usr/share/groff_font/devdvi/DESC
 OLD_FILES+=usr/share/groff_font/devdvi/EX
 OLD_FILES+=usr/share/groff_font/devdvi/HB
 OLD_FILES+=usr/share/groff_font/devdvi/HBEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBI
 OLD_FILES+=usr/share/groff_font/devdvi/HBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBITC
 OLD_FILES+=usr/share/groff_font/devdvi/HBTC
 OLD_FILES+=usr/share/groff_font/devdvi/HI
 OLD_FILES+=usr/share/groff_font/devdvi/HIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HITC
 OLD_FILES+=usr/share/groff_font/devdvi/HR
 OLD_FILES+=usr/share/groff_font/devdvi/HREC
 OLD_FILES+=usr/share/groff_font/devdvi/HRTC
 OLD_FILES+=usr/share/groff_font/devdvi/MI
 OLD_FILES+=usr/share/groff_font/devdvi/Makefile
 OLD_FILES+=usr/share/groff_font/devdvi/S
 OLD_FILES+=usr/share/groff_font/devdvi/SA
 OLD_FILES+=usr/share/groff_font/devdvi/SB
 OLD_FILES+=usr/share/groff_font/devdvi/SC
 OLD_FILES+=usr/share/groff_font/devdvi/TB
 OLD_FILES+=usr/share/groff_font/devdvi/TBEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBI
 OLD_FILES+=usr/share/groff_font/devdvi/TBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBITC
 OLD_FILES+=usr/share/groff_font/devdvi/TBTC
 OLD_FILES+=usr/share/groff_font/devdvi/TI
 OLD_FILES+=usr/share/groff_font/devdvi/TIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TITC
 OLD_FILES+=usr/share/groff_font/devdvi/TR
 OLD_FILES+=usr/share/groff_font/devdvi/TREC
 OLD_FILES+=usr/share/groff_font/devdvi/TRTC
 OLD_FILES+=usr/share/groff_font/devdvi/ec.map
 OLD_FILES+=usr/share/groff_font/devdvi/msam.map
 OLD_FILES+=usr/share/groff_font/devdvi/msbm.map
 OLD_FILES+=usr/share/groff_font/devdvi/tc.map
 OLD_FILES+=usr/share/groff_font/devdvi/texb.map
 OLD_FILES+=usr/share/groff_font/devdvi/texex.map
 OLD_FILES+=usr/share/groff_font/devdvi/texi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texmi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texr.map
 OLD_FILES+=usr/share/groff_font/devdvi/texsy.map
 OLD_FILES+=usr/share/groff_font/devdvi/textex.map
 OLD_FILES+=usr/share/groff_font/devdvi/textt.map
 OLD_DIRS+=usr/share/groff_font/devdvi
 OLD_FILES+=usr/share/groff_font/devhtml/B
 OLD_FILES+=usr/share/groff_font/devhtml/BI
 OLD_FILES+=usr/share/groff_font/devhtml/CB
 OLD_FILES+=usr/share/groff_font/devhtml/CBI
 OLD_FILES+=usr/share/groff_font/devhtml/CI
 OLD_FILES+=usr/share/groff_font/devhtml/CR
 OLD_FILES+=usr/share/groff_font/devhtml/DESC
 OLD_FILES+=usr/share/groff_font/devhtml/I
 OLD_FILES+=usr/share/groff_font/devhtml/R
 OLD_FILES+=usr/share/groff_font/devhtml/S
 OLD_DIRS+=usr/share/groff_font/devhtml
 OLD_FILES+=usr/share/groff_font/devkoi8-r/B
 OLD_FILES+=usr/share/groff_font/devkoi8-r/BI
 OLD_FILES+=usr/share/groff_font/devkoi8-r/CW
 OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC
 OLD_FILES+=usr/share/groff_font/devkoi8-r/I
 OLD_FILES+=usr/share/groff_font/devkoi8-r/L
 OLD_FILES+=usr/share/groff_font/devkoi8-r/R
 OLD_FILES+=usr/share/groff_font/devkoi8-r/S
 OLD_DIRS+=usr/share/groff_font/devkoi8-r
 OLD_FILES+=usr/share/groff_font/devlatin1/B
 OLD_FILES+=usr/share/groff_font/devlatin1/BI
 OLD_FILES+=usr/share/groff_font/devlatin1/CW
 OLD_FILES+=usr/share/groff_font/devlatin1/DESC
 OLD_FILES+=usr/share/groff_font/devlatin1/I
 OLD_FILES+=usr/share/groff_font/devlatin1/L
 OLD_FILES+=usr/share/groff_font/devlatin1/R
 OLD_FILES+=usr/share/groff_font/devlatin1/S
 OLD_DIRS+=usr/share/groff_font/devlatin1
 OLD_FILES+=usr/share/groff_font/devlbp/CB
 OLD_FILES+=usr/share/groff_font/devlbp/CI
 OLD_FILES+=usr/share/groff_font/devlbp/CR
 OLD_FILES+=usr/share/groff_font/devlbp/DESC
 OLD_FILES+=usr/share/groff_font/devlbp/EB
 OLD_FILES+=usr/share/groff_font/devlbp/EI
 OLD_FILES+=usr/share/groff_font/devlbp/ER
 OLD_FILES+=usr/share/groff_font/devlbp/HB
 OLD_FILES+=usr/share/groff_font/devlbp/HBI
 OLD_FILES+=usr/share/groff_font/devlbp/HI
 OLD_FILES+=usr/share/groff_font/devlbp/HNB
 OLD_FILES+=usr/share/groff_font/devlbp/HNBI
 OLD_FILES+=usr/share/groff_font/devlbp/HNI
 OLD_FILES+=usr/share/groff_font/devlbp/HNR
 OLD_FILES+=usr/share/groff_font/devlbp/HR
 OLD_FILES+=usr/share/groff_font/devlbp/TB
 OLD_FILES+=usr/share/groff_font/devlbp/TBI
 OLD_FILES+=usr/share/groff_font/devlbp/TI
 OLD_FILES+=usr/share/groff_font/devlbp/TR
 OLD_DIRS+=usr/share/groff_font/devlbp
 OLD_FILES+=usr/share/groff_font/devlj4/AB
 OLD_FILES+=usr/share/groff_font/devlj4/ABI
 OLD_FILES+=usr/share/groff_font/devlj4/AI
 OLD_FILES+=usr/share/groff_font/devlj4/ALBB
 OLD_FILES+=usr/share/groff_font/devlj4/ALBR
 OLD_FILES+=usr/share/groff_font/devlj4/AOB
 OLD_FILES+=usr/share/groff_font/devlj4/AOI
 OLD_FILES+=usr/share/groff_font/devlj4/AOR
 OLD_FILES+=usr/share/groff_font/devlj4/AR
 OLD_FILES+=usr/share/groff_font/devlj4/CB
 OLD_FILES+=usr/share/groff_font/devlj4/CBI
 OLD_FILES+=usr/share/groff_font/devlj4/CI
 OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON
 OLD_FILES+=usr/share/groff_font/devlj4/CORONET
 OLD_FILES+=usr/share/groff_font/devlj4/CR
 OLD_FILES+=usr/share/groff_font/devlj4/DESC
 OLD_FILES+=usr/share/groff_font/devlj4/GB
 OLD_FILES+=usr/share/groff_font/devlj4/GBI
 OLD_FILES+=usr/share/groff_font/devlj4/GI
 OLD_FILES+=usr/share/groff_font/devlj4/GR
 OLD_FILES+=usr/share/groff_font/devlj4/LGB
 OLD_FILES+=usr/share/groff_font/devlj4/LGI
 OLD_FILES+=usr/share/groff_font/devlj4/LGR
 OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD
 OLD_FILES+=usr/share/groff_font/devlj4/OB
 OLD_FILES+=usr/share/groff_font/devlj4/OBI
 OLD_FILES+=usr/share/groff_font/devlj4/OI
 OLD_FILES+=usr/share/groff_font/devlj4/OR
 OLD_FILES+=usr/share/groff_font/devlj4/S
 OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL
 OLD_FILES+=usr/share/groff_font/devlj4/TB
 OLD_FILES+=usr/share/groff_font/devlj4/TBI
 OLD_FILES+=usr/share/groff_font/devlj4/TI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRB
 OLD_FILES+=usr/share/groff_font/devlj4/TNRBI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRR
 OLD_FILES+=usr/share/groff_font/devlj4/TR
 OLD_FILES+=usr/share/groff_font/devlj4/UB
 OLD_FILES+=usr/share/groff_font/devlj4/UBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCB
 OLD_FILES+=usr/share/groff_font/devlj4/UCBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCI
 OLD_FILES+=usr/share/groff_font/devlj4/UCR
 OLD_FILES+=usr/share/groff_font/devlj4/UI
 OLD_FILES+=usr/share/groff_font/devlj4/UR
 OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS
 OLD_DIRS+=usr/share/groff_font/devlj4
 OLD_FILES+=usr/share/groff_font/devps/AB
 OLD_FILES+=usr/share/groff_font/devps/ABI
 OLD_FILES+=usr/share/groff_font/devps/AI
 OLD_FILES+=usr/share/groff_font/devps/AR
 OLD_FILES+=usr/share/groff_font/devps/BMB
 OLD_FILES+=usr/share/groff_font/devps/BMBI
 OLD_FILES+=usr/share/groff_font/devps/BMI
 OLD_FILES+=usr/share/groff_font/devps/BMR
 OLD_FILES+=usr/share/groff_font/devps/CB
 OLD_FILES+=usr/share/groff_font/devps/CBI
 OLD_FILES+=usr/share/groff_font/devps/CI
 OLD_FILES+=usr/share/groff_font/devps/CR
 OLD_FILES+=usr/share/groff_font/devps/DESC
 OLD_FILES+=usr/share/groff_font/devps/EURO
 OLD_FILES+=usr/share/groff_font/devps/HB
 OLD_FILES+=usr/share/groff_font/devps/HBI
 OLD_FILES+=usr/share/groff_font/devps/HI
 OLD_FILES+=usr/share/groff_font/devps/HNB
 OLD_FILES+=usr/share/groff_font/devps/HNBI
 OLD_FILES+=usr/share/groff_font/devps/HNI
 OLD_FILES+=usr/share/groff_font/devps/HNR
 OLD_FILES+=usr/share/groff_font/devps/HR
 OLD_FILES+=usr/share/groff_font/devps/Makefile
 OLD_FILES+=usr/share/groff_font/devps/NB
 OLD_FILES+=usr/share/groff_font/devps/NBI
 OLD_FILES+=usr/share/groff_font/devps/NI
 OLD_FILES+=usr/share/groff_font/devps/NR
 OLD_FILES+=usr/share/groff_font/devps/PB
 OLD_FILES+=usr/share/groff_font/devps/PBI
 OLD_FILES+=usr/share/groff_font/devps/PI
 OLD_FILES+=usr/share/groff_font/devps/PR
 OLD_FILES+=usr/share/groff_font/devps/S
 OLD_FILES+=usr/share/groff_font/devps/SS
 OLD_FILES+=usr/share/groff_font/devps/TB
 OLD_FILES+=usr/share/groff_font/devps/TBI
 OLD_FILES+=usr/share/groff_font/devps/TI
 OLD_FILES+=usr/share/groff_font/devps/TR
 OLD_FILES+=usr/share/groff_font/devps/ZCMI
 OLD_FILES+=usr/share/groff_font/devps/ZD
 OLD_FILES+=usr/share/groff_font/devps/ZDR
 OLD_FILES+=usr/share/groff_font/devps/afmname
 OLD_FILES+=usr/share/groff_font/devps/dingbats.map
 OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap
 OLD_FILES+=usr/share/groff_font/devps/download
 OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa
 OLD_FILES+=usr/share/groff_font/devps/lgreekmap
 OLD_FILES+=usr/share/groff_font/devps/prologue
 OLD_FILES+=usr/share/groff_font/devps/symbol.sed
 OLD_FILES+=usr/share/groff_font/devps/symbolchars
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa
 OLD_FILES+=usr/share/groff_font/devps/text.enc
 OLD_FILES+=usr/share/groff_font/devps/textmap
 OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa
 OLD_DIRS+=usr/share/groff_font/devps
 OLD_FILES+=usr/share/groff_font/devutf8/B
 OLD_FILES+=usr/share/groff_font/devutf8/BI
 OLD_FILES+=usr/share/groff_font/devutf8/CW
 OLD_FILES+=usr/share/groff_font/devutf8/DESC
 OLD_FILES+=usr/share/groff_font/devutf8/I
 OLD_FILES+=usr/share/groff_font/devutf8/L
 OLD_FILES+=usr/share/groff_font/devutf8/R
 OLD_FILES+=usr/share/groff_font/devutf8/S
 OLD_DIRS+=usr/share/groff_font/devutf8
 OLD_DIRS+=usr/share/groff_font
 OLD_FILES+=usr/share/info/groff.info.gz
 OLD_FILES+=usr/share/man/man1/addftinfo.1.gz
 OLD_FILES+=usr/share/man/man1/afmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/eqn.1.gz
 OLD_FILES+=usr/share/man/man1/grn.1.gz
 OLD_FILES+=usr/share/man/man1/grodvi.1.gz
 OLD_FILES+=usr/share/man/man1/groff.1.gz
 OLD_FILES+=usr/share/man/man1/grog.1.gz
 OLD_FILES+=usr/share/man/man1/grolbp.1.gz
 OLD_FILES+=usr/share/man/man1/grolj4.1.gz
 OLD_FILES+=usr/share/man/man1/grops.1.gz
 OLD_FILES+=usr/share/man/man1/grotty.1.gz
 OLD_FILES+=usr/share/man/man1/hpftodit.1.gz
 OLD_FILES+=usr/share/man/man1/indxbib.1.gz
 OLD_FILES+=usr/share/man/man1/lkbib.1.gz
 OLD_FILES+=usr/share/man/man1/lookbib.1.gz
 OLD_FILES+=usr/share/man/man1/mmroff.1.gz
 OLD_FILES+=usr/share/man/man1/neqn.1.gz
 OLD_FILES+=usr/share/man/man1/nroff.1.gz
 OLD_FILES+=usr/share/man/man1/pfbtops.1.gz
 OLD_FILES+=usr/share/man/man1/pic.1.gz
 OLD_FILES+=usr/share/man/man1/psroff.1.gz
 OLD_FILES+=usr/share/man/man1/refer.1.gz
 OLD_FILES+=usr/share/man/man1/tbl.1.gz
 OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/troff.1.gz
 OLD_FILES+=usr/share/man/man1/vgrind.1.gz
 OLD_FILES+=usr/share/man/man5/groff_font.5.gz
 OLD_FILES+=usr/share/man/man5/groff_out.5.gz
 OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz
 OLD_FILES+=usr/share/man/man5/lj4_font.5.gz
 OLD_FILES+=usr/share/man/man5/tmac.5.gz
 OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz
 OLD_FILES+=usr/share/man/man7/ditroff.7.gz
 OLD_FILES+=usr/share/man/man7/groff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_char.7.gz
 OLD_FILES+=usr/share/man/man7/groff_diff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_man.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz
 OLD_FILES+=usr/share/man/man7/groff_me.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mm.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz
 OLD_FILES+=usr/share/man/man7/groff_ms.7.gz
 OLD_FILES+=usr/share/man/man7/groff_trace.7.gz
 OLD_FILES+=usr/share/man/man7/groff_www.7.gz
 OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz
 OLD_FILES+=usr/share/man/man7/me.7.gz
 OLD_FILES+=usr/share/man/man7/mm.7.gz
 OLD_FILES+=usr/share/man/man7/mmse.7.gz
 OLD_FILES+=usr/share/man/man7/ms.7.gz
 OLD_FILES+=usr/share/man/man7/orig_me.7.gz
 OLD_FILES+=usr/share/man/man7/roff.7.gz
 OLD_FILES+=usr/share/me/acm.me
 OLD_FILES+=usr/share/me/chars.me
 OLD_FILES+=usr/share/me/deltext.me
 OLD_FILES+=usr/share/me/eqn.me
 OLD_FILES+=usr/share/me/float.me
 OLD_FILES+=usr/share/me/footnote.me
 OLD_FILES+=usr/share/me/index.me
 OLD_FILES+=usr/share/me/letterhead.me
 OLD_FILES+=usr/share/me/local.me
 OLD_FILES+=usr/share/me/null.me
 OLD_FILES+=usr/share/me/refer.me
 OLD_FILES+=usr/share/me/revisions
 OLD_FILES+=usr/share/me/sh.me
 OLD_FILES+=usr/share/me/tbl.me
 OLD_FILES+=usr/share/me/thesis.me
 OLD_DIRS+=usr/share/me
 OLD_FILES+=usr/share/misc/vgrindefs
 OLD_FILES+=usr/share/misc/vgrindefs.db
 OLD_FILES+=usr/share/tmac/X.tmac
 OLD_FILES+=usr/share/tmac/Xps.tmac
 OLD_FILES+=usr/share/tmac/a4.tmac
 OLD_FILES+=usr/share/tmac/an-old.tmac
 OLD_FILES+=usr/share/tmac/an.tmac
 OLD_FILES+=usr/share/tmac/andoc.tmac
 OLD_FILES+=usr/share/tmac/composite.tmac
 OLD_FILES+=usr/share/tmac/cp1047.tmac
 OLD_FILES+=usr/share/tmac/devtag.tmac
 OLD_FILES+=usr/share/tmac/doc.tmac
 OLD_FILES+=usr/share/tmac/dvi.tmac
 OLD_FILES+=usr/share/tmac/e.tmac
 OLD_FILES+=usr/share/tmac/ec.tmac
 OLD_FILES+=usr/share/tmac/eqnrc
 OLD_FILES+=usr/share/tmac/europs.tmac
 OLD_FILES+=usr/share/tmac/html-end.tmac
 OLD_FILES+=usr/share/tmac/html.tmac
 OLD_FILES+=usr/share/tmac/hyphen.ru
 OLD_FILES+=usr/share/tmac/hyphen.us
 OLD_FILES+=usr/share/tmac/hyphenex.us
 OLD_FILES+=usr/share/tmac/koi8-r.tmac
 OLD_FILES+=usr/share/tmac/latin1.tmac
 OLD_FILES+=usr/share/tmac/latin2.tmac
 OLD_FILES+=usr/share/tmac/latin9.tmac
 OLD_FILES+=usr/share/tmac/lbp.tmac
 OLD_FILES+=usr/share/tmac/lj4.tmac
 OLD_FILES+=usr/share/tmac/m.tmac
 OLD_FILES+=usr/share/tmac/man.local
 OLD_FILES+=usr/share/tmac/man.tmac
 OLD_FILES+=usr/share/tmac/mandoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc.local
 OLD_FILES+=usr/share/tmac/mdoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc/doc-common
 OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-nroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-syms
 OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1
 OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R
 OLD_DIRS+=usr/share/tmac/mdoc
 OLD_FILES+=usr/share/tmac/me.tmac
 OLD_FILES+=usr/share/tmac/mm/0.MT
 OLD_FILES+=usr/share/tmac/mm/4.MT
 OLD_FILES+=usr/share/tmac/mm/5.MT
 OLD_FILES+=usr/share/tmac/mm/locale
 OLD_FILES+=usr/share/tmac/mm/mm.tmac
 OLD_FILES+=usr/share/tmac/mm/mmse.tmac
 OLD_FILES+=usr/share/tmac/mm/ms.cov
 OLD_FILES+=usr/share/tmac/mm/se_locale
 OLD_FILES+=usr/share/tmac/mm/se_ms.cov
 OLD_DIRS+=usr/share/tmac/mm
 OLD_FILES+=usr/share/tmac/ms.tmac
 OLD_FILES+=usr/share/tmac/mse.tmac
 OLD_FILES+=usr/share/tmac/papersize.tmac
 OLD_FILES+=usr/share/tmac/pic.tmac
 OLD_FILES+=usr/share/tmac/ps.tmac
 OLD_FILES+=usr/share/tmac/psatk.tmac
 OLD_FILES+=usr/share/tmac/psold.tmac
 OLD_FILES+=usr/share/tmac/pspic.tmac
 OLD_FILES+=usr/share/tmac/s.tmac
 OLD_FILES+=usr/share/tmac/safer.tmac
 OLD_FILES+=usr/share/tmac/tmac.orig_me
 OLD_FILES+=usr/share/tmac/tmac.vgrind
 OLD_FILES+=usr/share/tmac/trace.tmac
 OLD_FILES+=usr/share/tmac/troffrc
 OLD_FILES+=usr/share/tmac/troffrc-end
 OLD_FILES+=usr/share/tmac/tty-char.tmac
 OLD_FILES+=usr/share/tmac/tty.tmac
 OLD_FILES+=usr/share/tmac/unicode.tmac
 OLD_FILES+=usr/share/tmac/www.tmac
 OLD_DIRS+=usr/share/tmac
 .endif
 
 .if ${MK_GSSAPI} == no
 OLD_FILES+=usr/include/gssapi/gssapi.h
 OLD_DIRS+=usr/include/gssapi
 OLD_FILES+=usr/include/gssapi.h
 OLD_FILES+=usr/lib/libgssapi.a
 OLD_FILES+=usr/lib/libgssapi.so
 OLD_LIBS+=usr/lib/libgssapi.so.10
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/librpcsec_gss.a
 OLD_FILES+=usr/lib/librpcsec_gss.so
 OLD_LIBS+=usr/lib/librpcsec_gss.so.1
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libgssapi.a
 OLD_FILES+=usr/lib32/libgssapi.so
 OLD_LIBS+=usr/lib32/libgssapi.so.10
 OLD_FILES+=usr/lib32/libgssapi_p.a
 OLD_FILES+=usr/lib32/librpcsec_gss.a
 OLD_FILES+=usr/lib32/librpcsec_gss.so
 OLD_LIBS+=usr/lib32/librpcsec_gss.so.1
 .endif
 OLD_FILES+=usr/sbin/gssd
 OLD_FILES+=usr/share/man/man3/gss_accept_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_acquire_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_add_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_add_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_canonicalize_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_compare_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_context_time.3.gz
 OLD_FILES+=usr/share/man/man3/gss_create_empty_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_delete_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_status.3.gz
 OLD_FILES+=usr/share/man/man3/gss_duplicate_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_get_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_indicate_mechs.3.gz
 OLD_FILES+=usr/share/man/man3/gss_init_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred_by_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_mechs_for_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_names_for_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_process_context_token.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_seal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_sign.3.gz
 OLD_FILES+=usr/share/man/man3/gss_test_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unseal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap_size_limit.3.gz
 OLD_FILES+=usr/share/man/man3/gssapi.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mech_info.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mechanisms.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_principal_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_versions.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_getcred.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_is_installed.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_mech_to_oid.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_oid_to_mech.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_qop_to_num.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_seccreate.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_callback.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_defaults.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_svc_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_svc_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpcsec_gss.3.gz
 OLD_FILES+=usr/share/man/man5/mech.5.gz
 OLD_FILES+=usr/share/man/man5/qop.5.gz
 OLD_FILES+=usr/share/man/man8/gssd.8.gz
 .endif
 
 .if ${MK_HAST} == no
 OLD_FILES+=sbin/hastctl
 OLD_FILES+=sbin/hastd
 OLD_FILES+=usr/share/examples/hast/ucarp.sh
 OLD_FILES+=usr/share/examples/hast/ucarp_down.sh
 OLD_FILES+=usr/share/examples/hast/ucarp_up.sh
 OLD_FILES+=usr/share/examples/hast/vip-down.sh
 OLD_FILES+=usr/share/examples/hast/vip-up.sh
 OLD_FILES+=usr/share/man/man5/hast.conf.5.gz
 OLD_FILES+=usr/share/man/man8/hastctl.8.gz
 OLD_FILES+=usr/share/man/man8/hastd.8.gz
 OLD_DIRS+=usr/share/examples/hast
 # bsnmp
 OLD_FILES+=usr/lib/snmp_hast.so
 OLD_LIBS+=usr/lib/snmp_hast.so.6
 OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
 OLD_FILES+=usr/share/snmp/defs/hast_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt
 .endif
 
 .if ${MK_HESIOD} == no
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/hesiod.h
 OLD_FILES+=usr/share/man/man1/hesinfo.1.gz
 OLD_FILES+=usr/share/man/man3/hesiod.3.gz
 OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz
 .endif
 
 .if ${MK_HTML} == no
 OLD_FILES+=usr/share/doc/ncurses/hackguide.html
 OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html
 OLD_FILES+=usr/share/doc/ntp/accopt.html
 OLD_FILES+=usr/share/doc/ntp/assoc.html
 OLD_FILES+=usr/share/doc/ntp/audio.html
 OLD_FILES+=usr/share/doc/ntp/authopt.html
 OLD_FILES+=usr/share/doc/ntp/build.html
 OLD_FILES+=usr/share/doc/ntp/clockopt.html
 OLD_FILES+=usr/share/doc/ntp/config.html
 OLD_FILES+=usr/share/doc/ntp/confopt.html
 OLD_FILES+=usr/share/doc/ntp/copyright.html
 OLD_FILES+=usr/share/doc/ntp/debug.html
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/extern.html
 OLD_FILES+=usr/share/doc/ntp/hints.html
 OLD_FILES+=usr/share/doc/ntp/howto.html
 OLD_FILES+=usr/share/doc/ntp/index.html
 OLD_FILES+=usr/share/doc/ntp/kern.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/miscopt.html
 OLD_FILES+=usr/share/doc/ntp/monopt.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/ntpd.html
 OLD_FILES+=usr/share/doc/ntp/ntpdate.html
 OLD_FILES+=usr/share/doc/ntp/ntpdc.html
 OLD_FILES+=usr/share/doc/ntp/ntpq.html
 OLD_FILES+=usr/share/doc/ntp/ntptime.html
 OLD_FILES+=usr/share/doc/ntp/ntptrace.html
 OLD_FILES+=usr/share/doc/ntp/parsedata.html
 OLD_FILES+=usr/share/doc/ntp/parsenew.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/doc/ntp/pps.html
 OLD_FILES+=usr/share/doc/ntp/prefer.html
 OLD_FILES+=usr/share/doc/ntp/quick.html
 OLD_FILES+=usr/share/doc/ntp/rdebug.html
 OLD_FILES+=usr/share/doc/ntp/refclock.html
 OLD_FILES+=usr/share/doc/ntp/release.html
 OLD_FILES+=usr/share/doc/ntp/tickadj.html
 .endif
 
 .if ${MK_ICONV} == no
 OLD_FILES+=usr/bin/iconv
 OLD_FILES+=usr/bin/mkcsmapper
 OLD_FILES+=usr/bin/mkesdb
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/include/iconv.h
 OLD_FILES+=usr/share/man/man1/iconv.1.gz
 OLD_FILES+=usr/share/man/man1/mkcsmapper.1.gz
 OLD_FILES+=usr/share/man/man1/mkesdb.1.gz
 OLD_FILES+=usr/share/man/man3/__iconv.3.gz
 OLD_FILES+=usr/share/man/man3/__iconv_free_list.3.gz
 OLD_FILES+=usr/share/man/man3/__iconv_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/iconv.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_canonicalize.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_close.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open_into.3.gz
 OLD_FILES+=usr/share/man/man3/iconvctl.3.gz
 OLD_FILES+=usr/share/man/man3/iconvlist.3.gz
 .endif
 
 .if ${MK_INET6} == no
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol
 OLD_FILES+=usr/sbin/ip6addrctl
 OLD_FILES+=usr/sbin/mld6query
 OLD_FILES+=usr/sbin/ndp
 OLD_FILES+=usr/sbin/rip6query
 OLD_FILES+=usr/sbin/route6d
 OLD_FILES+=usr/sbin/rrenumd
 OLD_FILES+=usr/sbin/rtadvctl
 OLD_FILES+=usr/sbin/rtadvd
 OLD_FILES+=usr/sbin/rtsold
 OLD_FILES+=usr/sbin/traceroute6
 OLD_FILES+=usr/share/doc/IPv6/IMPLEMENTATION
 OLD_FILES+=usr/share/man/man5/rrenumd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/rtadvd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ip6addrctl.8.gz
 OLD_FILES+=usr/share/man/man8/mld6query.8.gz
 OLD_FILES+=usr/share/man/man8/ndp.8.gz
 OLD_FILES+=usr/share/man/man8/ping6.8.gz
 OLD_FILES+=usr/share/man/man8/rip6query.8.gz
 OLD_FILES+=usr/share/man/man8/route6d.8.gz
 OLD_FILES+=usr/share/man/man8/rrenumd.8.gz
 OLD_FILES+=usr/share/man/man8/rtadvctl.8.gz
 OLD_FILES+=usr/share/man/man8/rtadvd.8.gz
 OLD_FILES+=usr/share/man/man8/rtsol.8.gz
 OLD_FILES+=usr/share/man/man8/rtsold.8.gz
 OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
 .endif
 
 .if ${MK_INET6_SUPPORT} == no
 OLD_FILES+=rescue/ping6
 .endif
 
 .if ${MK_INETD} == no
 OLD_FILES+=etc/rc.d/inetd
 OLD_FILES+=usr/sbin/inetd
 OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/inetd.8.gz
 .endif
 
 .if ${MK_IPFILTER} == no
 OLD_FILES+=etc/periodic/security/510.ipfdenied
 OLD_FILES+=etc/periodic/security/610.ipf6denied
 OLD_FILES+=rescue/ipf
 OLD_FILES+=sbin/ipf
 OLD_FILES+=sbin/ipfs
 OLD_FILES+=sbin/ipfstat
 OLD_FILES+=sbin/ipftest
 OLD_FILES+=sbin/ipmon
 OLD_FILES+=sbin/ipnat
 OLD_FILES+=sbin/ippool
 OLD_FILES+=sbin/ipresend
 OLD_FILES+=usr/include/netinet/ip_auth.h
 OLD_FILES+=usr/include/netinet/ip_compat.h
 OLD_FILES+=usr/include/netinet/ip_fil.h
 OLD_FILES+=usr/include/netinet/ip_frag.h
 OLD_FILES+=usr/include/netinet/ip_htable.h
 OLD_FILES+=usr/include/netinet/ip_lookup.h
 OLD_FILES+=usr/include/netinet/ip_nat.h
 OLD_FILES+=usr/include/netinet/ip_pool.h
 OLD_FILES+=usr/include/netinet/ip_proxy.h
 OLD_FILES+=usr/include/netinet/ip_rules.h
 OLD_FILES+=usr/include/netinet/ip_scan.h
 OLD_FILES+=usr/include/netinet/ip_state.h
 OLD_FILES+=usr/include/netinet/ip_sync.h
 OLD_FILES+=usr/include/netinet/ipl.h
 OLD_FILES+=usr/share/examples/ipfilter/README
 OLD_FILES+=usr/share/examples/ipfilter/BASIC.NAT
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_1.FW
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_2.FW
 OLD_FILES+=usr/share/examples/ipfilter/example.1
 OLD_FILES+=usr/share/examples/ipfilter/example.2
 OLD_FILES+=usr/share/examples/ipfilter/example.3
 OLD_FILES+=usr/share/examples/ipfilter/example.4
 OLD_FILES+=usr/share/examples/ipfilter/example.5
 OLD_FILES+=usr/share/examples/ipfilter/example.6
 OLD_FILES+=usr/share/examples/ipfilter/example.7
 OLD_FILES+=usr/share/examples/ipfilter/example.8
 OLD_FILES+=usr/share/examples/ipfilter/example.9
 OLD_FILES+=usr/share/examples/ipfilter/example.10
 OLD_FILES+=usr/share/examples/ipfilter/example.11
 OLD_FILES+=usr/share/examples/ipfilter/example.12
 OLD_FILES+=usr/share/examples/ipfilter/example.13
 OLD_FILES+=usr/share/examples/ipfilter/example.sr
 OLD_FILES+=usr/share/examples/ipfilter/firewall
 OLD_FILES+=usr/share/examples/ipfilter/ftp-proxy
 OLD_FILES+=usr/share/examples/ipfilter/ftppxy
 OLD_FILES+=usr/share/examples/ipfilter/nat-setup
 OLD_FILES+=usr/share/examples/ipfilter/nat.eg
 OLD_FILES+=usr/share/examples/ipfilter/server
 OLD_FILES+=usr/share/examples/ipfilter/tcpstate
 OLD_FILES+=usr/share/examples/ipfilter/example.14
 OLD_FILES+=usr/share/examples/ipfilter/firewall.1
 OLD_FILES+=usr/share/examples/ipfilter/firewall.2
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.permissive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.restrictive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipnat.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipf-howto.txt
 OLD_FILES+=usr/share/examples/ipfilter/examples.txt
 OLD_FILES+=usr/share/examples/ipfilter/rules.txt
 OLD_FILES+=usr/share/examples/ipfilter/mkfilters
 OLD_DIRS+=usr/share/examples/ipfilter
 OLD_FILES+=usr/share/man/man1/ipftest.1.gz
 OLD_FILES+=usr/share/man/man1/ipresend.1.gz
 OLD_FILES+=usr/share/man/man4/ipf.4.gz
 OLD_FILES+=usr/share/man/man4/ipl.4.gz
 OLD_FILES+=usr/share/man/man4/ipfilter.4.gz
 OLD_FILES+=usr/share/man/man4/ipnat.4.gz
 OLD_FILES+=usr/share/man/man5/ipf.5.gz
 OLD_FILES+=usr/share/man/man5/ipf.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipf6.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipnat.5.gz
 OLD_FILES+=usr/share/man/man5/ipnat.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ippool.5.gz
 OLD_FILES+=usr/share/man/man8/ipf.8.gz
 OLD_FILES+=usr/share/man/man8/ipfs.8.gz
 OLD_FILES+=usr/share/man/man8/ipfstat.8.gz
 OLD_FILES+=usr/share/man/man8/ipmon.8.gz
 OLD_FILES+=usr/share/man/man8/ipnat.8.gz
 OLD_FILES+=usr/share/man/man8/ippool.8.gz
 .endif
 
 .if ${MK_IPFW} == no
 OLD_FILES+=etc/periodic/security/500.ipfwdenied
 OLD_FILES+=etc/periodic/security/550.ipfwlimit
 OLD_FILES+=sbin/ipfw
 OLD_FILES+=sbin/natd
 OLD_FILES+=usr/sbin/ipfwpcap
 OLD_FILES+=usr/share/man/man8/ipfw.8.gz
 OLD_FILES+=usr/share/man/man8/ipfwpcap.8.gz
 OLD_FILES+=usr/share/man/man8/natd.8.gz
 .endif
 
 .if ${MK_ISCSI} == no
 OLD_FILES+=etc/rc.d/iscsictl
 OLD_FILES+=etc/rc.d/iscsid
 OLD_FILES+=sbin/iscontrol
 OLD_FILES+=usr/bin/iscsictl
 OLD_FILES+=usr/sbin/iscsid
 OLD_FILES+=usr/share/man/man4/iscsi.4.gz
 OLD_FILES+=usr/share/man/man4/iscsi_initiator.4.gz
 OLD_FILES+=usr/share/man/man5/iscsi.conf.5.gz
 OLD_FILES+=usr/share/man/man8/iscontrol.8.gz
 OLD_FILES+=usr/share/man/man8/iscsictl.8.gz
 OLD_FILES+=usr/share/man/man8/iscsid.8.gz
 .endif
 
 .if ${MK_JAIL} == no
 OLD_FILES+=etc/rc.d/jail
 OLD_FILES+=usr/sbin/jail
 OLD_FILES+=usr/sbin/jexec
 OLD_FILES+=usr/sbin/jls
 OLD_FILES+=usr/share/man/man5/jail.conf.5.gz
 OLD_FILES+=usr/share/man/man8/jail.8.gz
 OLD_FILES+=usr/share/man/man8/jexec.8.gz
 OLD_FILES+=usr/share/man/man8/jls.8.gz
 .endif
 
 .if ${MK_KDUMP} == no
 OLD_FILES+=usr/bin/kdump
 OLD_FILES+=usr/bin/truss
 OLD_FILES+=usr/share/man/man1/kdump.1.gz
 OLD_FILES+=usr/share/man/man1/truss.1.gz
 .endif
 
 .if ${MK_KERBEROS} == no
 OLD_FILES+=etc/rc.d/ipropd_master
 OLD_FILES+=etc/rc.d/ipropd_slave
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/bin/hxtool
 OLD_FILES+=usr/bin/kadmin
 OLD_FILES+=usr/bin/kdestroy
 OLD_FILES+=usr/bin/kf
 OLD_FILES+=usr/bin/kgetcred
 OLD_FILES+=usr/bin/kinit
 OLD_FILES+=usr/bin/klist
 OLD_FILES+=usr/bin/kpasswd
 OLD_FILES+=usr/bin/krb5-config
 OLD_FILES+=usr/bin/ksu
 OLD_FILES+=usr/bin/kswitch
 OLD_FILES+=usr/bin/string2key
 OLD_FILES+=usr/bin/verify_krb5_conf
 OLD_FILES+=usr/include/asn1-common.h
 OLD_FILES+=usr/include/asn1_err.h
 OLD_FILES+=usr/include/base64.h
 OLD_FILES+=usr/include/cms_asn1.h
 OLD_FILES+=usr/include/crmf_asn1.h
 OLD_FILES+=usr/include/der-private.h
 OLD_FILES+=usr/include/der-protos.h
 OLD_FILES+=usr/include/der.h
 OLD_FILES+=usr/include/digest_asn1.h
 OLD_FILES+=usr/include/getarg.h
 OLD_FILES+=usr/include/gssapi/gssapi_krb5.h
 OLD_FILES+=usr/include/hdb-protos.h
 OLD_FILES+=usr/include/hdb.h
 OLD_FILES+=usr/include/hdb_asn1.h
 OLD_FILES+=usr/include/hdb_err.h
 OLD_FILES+=usr/include/heim_asn1.h
 OLD_FILES+=usr/include/heim_err.h
 OLD_FILES+=usr/include/heim_threads.h
 OLD_FILES+=usr/include/heimbase.h
 OLD_FILES+=usr/include/heimntlm-protos.h
 OLD_FILES+=usr/include/heimntlm.h
 OLD_FILES+=usr/include/hex.h
 OLD_FILES+=usr/include/hx509-private.h
 OLD_FILES+=usr/include/hx509-protos.h
 OLD_FILES+=usr/include/hx509.h
 OLD_FILES+=usr/include/hx509_err.h
 OLD_FILES+=usr/include/k524_err.h
 OLD_FILES+=usr/include/kadm5/admin.h
 OLD_FILES+=usr/include/kadm5/kadm5-private.h
 OLD_FILES+=usr/include/kadm5/kadm5-protos.h
 OLD_FILES+=usr/include/kadm5/kadm5-pwcheck.h
 OLD_FILES+=usr/include/kadm5/kadm5_err.h
 OLD_FILES+=usr/include/kadm5/private.h
 OLD_DIRS+=usr/include/kadm5
 OLD_FILES+=usr/include/kafs.h
 OLD_FILES+=usr/include/kdc-protos.h
 OLD_FILES+=usr/include/kdc.h
 OLD_FILES+=usr/include/krb5-private.h
 OLD_FILES+=usr/include/krb5-protos.h
 OLD_FILES+=usr/include/krb5-types.h
 OLD_FILES+=usr/include/krb5.h
 OLD_FILES+=usr/include/krb5/ccache_plugin.h
 OLD_FILES+=usr/include/krb5/locate_plugin.h
 OLD_FILES+=usr/include/krb5/send_to_kdc_plugin.h
 OLD_FILES+=usr/include/krb5/windc_plugin.h
 OLD_DIRS+=usr/include/krb5
 OLD_FILES+=usr/include/krb5_asn1.h
 OLD_FILES+=usr/include/krb5_ccapi.h
 OLD_FILES+=usr/include/krb5_err.h
 OLD_FILES+=usr/include/kx509_asn1.h
 OLD_FILES+=usr/include/ntlm_err.h
 OLD_FILES+=usr/include/ocsp_asn1.h
 OLD_FILES+=usr/include/parse_bytes.h
 OLD_FILES+=usr/include/parse_time.h
 OLD_FILES+=usr/include/parse_units.h
 OLD_FILES+=usr/include/pkcs10_asn1.h
 OLD_FILES+=usr/include/pkcs12_asn1.h
 OLD_FILES+=usr/include/pkcs8_asn1.h
 OLD_FILES+=usr/include/pkcs9_asn1.h
 OLD_FILES+=usr/include/pkinit_asn1.h
 OLD_FILES+=usr/include/resolve.h
 OLD_FILES+=usr/include/rfc2459_asn1.h
 OLD_FILES+=usr/include/roken-common.h
 OLD_FILES+=usr/include/rtbl.h
 OLD_FILES+=usr/include/wind.h
 OLD_FILES+=usr/include/wind_err.h
 OLD_FILES+=usr/include/xdbm.h
 OLD_FILES+=usr/lib/libasn1.a
 OLD_FILES+=usr/lib/libasn1.so
 OLD_LIBS+=usr/lib/libasn1.so.11
 OLD_FILES+=usr/lib/libasn1_p.a
 OLD_FILES+=usr/lib/libcom_err.a
 OLD_FILES+=usr/lib/libcom_err.so
 OLD_LIBS+=usr/lib/libcom_err.so.5
 OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5.a
 OLD_FILES+=usr/lib/libgssapi_krb5.so
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.10
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_ntlm.a
 OLD_FILES+=usr/lib/libgssapi_ntlm.so
 OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10
 OLD_FILES+=usr/lib/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib/libgssapi_spnego.a
 OLD_FILES+=usr/lib/libgssapi_spnego.so
 OLD_LIBS+=usr/lib/libgssapi_spnego.so.10
 OLD_FILES+=usr/lib/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib/libhdb.a
 OLD_FILES+=usr/lib/libhdb.so
 OLD_LIBS+=usr/lib/libhdb.so.11
 OLD_FILES+=usr/lib/libhdb_p.a
 OLD_FILES+=usr/lib/libheimbase.a
 OLD_FILES+=usr/lib/libheimbase.so
 OLD_LIBS+=usr/lib/libheimbase.so.11
 OLD_FILES+=usr/lib/libheimbase_p.a
 OLD_FILES+=usr/lib/libheimntlm.a
 OLD_FILES+=usr/lib/libheimntlm.so
 OLD_LIBS+=usr/lib/libheimntlm.so.11
 OLD_FILES+=usr/lib/libheimntlm_p.a
 OLD_FILES+=usr/lib/libheimsqlite.a
 OLD_FILES+=usr/lib/libheimsqlite.so
 OLD_LIBS+=usr/lib/libheimsqlite.so.11
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 OLD_FILES+=usr/lib/libhx509.a
 OLD_FILES+=usr/lib/libhx509.so
 OLD_LIBS+=usr/lib/libhx509.so.11
 OLD_FILES+=usr/lib/libhx509_p.a
 OLD_FILES+=usr/lib/libkadm5clnt.a
 OLD_FILES+=usr/lib/libkadm5clnt.so
 OLD_LIBS+=usr/lib/libkadm5clnt.so.11
 OLD_FILES+=usr/lib/libkadm5clnt_p.a
 OLD_FILES+=usr/lib/libkadm5srv.a
 OLD_FILES+=usr/lib/libkadm5srv.so
 OLD_LIBS+=usr/lib/libkadm5srv.so.11
 OLD_FILES+=usr/lib/libkadm5srv_p.a
 OLD_FILES+=usr/lib/libkafs5.a
 OLD_FILES+=usr/lib/libkafs5.so
 OLD_LIBS+=usr/lib/libkafs5.so.11
 OLD_FILES+=usr/lib/libkafs5_p.a
 OLD_FILES+=usr/lib/libkdc.a
 OLD_FILES+=usr/lib/libkdc.so
 OLD_LIBS+=usr/lib/libkdc.so.11
 OLD_FILES+=usr/lib/libkdc_p.a
 OLD_FILES+=usr/lib/libkrb5.a
 OLD_FILES+=usr/lib/libkrb5.so
 OLD_LIBS+=usr/lib/libkrb5.so.11
 OLD_FILES+=usr/lib/libkrb5_p.a
 OLD_FILES+=usr/lib/libroken.a
 OLD_FILES+=usr/lib/libroken.so
 OLD_LIBS+=usr/lib/libroken.so.11
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/libwind.a
 OLD_FILES+=usr/lib/libwind.so
 OLD_LIBS+=usr/lib/libwind.so.11
 OLD_FILES+=usr/lib/libwind_p.a
 OLD_FILES+=usr/lib/pam_krb5.so
 OLD_LIBS+=usr/lib/pam_krb5.so.6
 OLD_FILES+=usr/lib/pam_ksu.so
 OLD_LIBS+=usr/lib/pam_ksu.so.6
 OLD_FILES+=usr/lib/private/libheimipcc.a
 OLD_FILES+=usr/lib/private/libheimipcc.so
 OLD_LIBS+=usr/lib/private/libheimipcc.so.11
 OLD_FILES+=usr/lib/private/libheimipcc_p.a
 OLD_FILES+=usr/lib/private/libheimipcs.a
 OLD_FILES+=usr/lib/private/libheimipcs.so
 OLD_LIBS+=usr/lib/private/libheimipcs.so.11
 OLD_FILES+=usr/lib/private/libheimipcs_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libasn1.a
 OLD_FILES+=usr/lib32/libasn1.so
 OLD_LIBS+=usr/lib32/libasn1.so.11
 OLD_FILES+=usr/lib32/libasn1_p.a
 OLD_FILES+=usr/lib32/libgssapi_krb5.a
 OLD_FILES+=usr/lib32/libgssapi_krb5.so
 OLD_LIBS+=usr/lib32/libgssapi_krb5.so.10
 OLD_FILES+=usr/lib32/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib32/libgssapi_ntlm.a
 OLD_FILES+=usr/lib32/libgssapi_ntlm.so
 OLD_LIBS+=usr/lib32/libgssapi_ntlm.so.10
 OLD_FILES+=usr/lib32/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib32/libgssapi_spnego.a
 OLD_FILES+=usr/lib32/libgssapi_spnego.so
 OLD_LIBS+=usr/lib32/libgssapi_spnego.so.10
 OLD_FILES+=usr/lib32/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib32/libhdb.a
 OLD_FILES+=usr/lib32/libhdb.so
 OLD_LIBS+=usr/lib32/libhdb.so.11
 OLD_FILES+=usr/lib32/libhdb_p.a
 OLD_FILES+=usr/lib32/libheimbase.a
 OLD_FILES+=usr/lib32/libheimbase.so
 OLD_LIBS+=usr/lib32/libheimbase.so.11
 OLD_FILES+=usr/lib32/libheimbase_p.a
 OLD_FILES+=usr/lib32/libheimntlm.a
 OLD_FILES+=usr/lib32/libheimntlm.so
 OLD_LIBS+=usr/lib32/libheimntlm.so.11
 OLD_FILES+=usr/lib32/libheimntlm_p.a
 OLD_FILES+=usr/lib32/libheimsqlite.a
 OLD_FILES+=usr/lib32/libheimsqlite.so
 OLD_LIBS+=usr/lib32/libheimsqlite.so.11
 OLD_FILES+=usr/lib32/libheimsqlite_p.a
 OLD_FILES+=usr/lib32/libhx509.a
 OLD_FILES+=usr/lib32/libhx509.so
 OLD_LIBS+=usr/lib32/libhx509.so.11
 OLD_FILES+=usr/lib32/libhx509_p.a
 OLD_FILES+=usr/lib32/libkadm5clnt.a
 OLD_FILES+=usr/lib32/libkadm5clnt.so
 OLD_LIBS+=usr/lib32/libkadm5clnt.so.11
 OLD_FILES+=usr/lib32/libkadm5clnt_p.a
 OLD_FILES+=usr/lib32/libkadm5srv.a
 OLD_FILES+=usr/lib32/libkadm5srv.so
 OLD_LIBS+=usr/lib32/libkadm5srv.so.11
 OLD_FILES+=usr/lib32/libkadm5srv_p.a
 OLD_FILES+=usr/lib32/libkafs5.a
 OLD_FILES+=usr/lib32/libkafs5.so
 OLD_LIBS+=usr/lib32/libkafs5.so.11
 OLD_FILES+=usr/lib32/libkafs5_p.a
 OLD_FILES+=usr/lib32/libkdc.a
 OLD_FILES+=usr/lib32/libkdc.so
 OLD_LIBS+=usr/lib32/libkdc.so.11
 OLD_FILES+=usr/lib32/libkdc_p.a
 OLD_FILES+=usr/lib32/libkrb5.a
 OLD_FILES+=usr/lib32/libkrb5.so
 OLD_LIBS+=usr/lib32/libkrb5.so.11
 OLD_FILES+=usr/lib32/libkrb5_p.a
 OLD_FILES+=usr/lib32/libroken.a
 OLD_FILES+=usr/lib32/libroken.so
 OLD_LIBS+=usr/lib32/libroken.so.11
 OLD_FILES+=usr/lib32/libroken_p.a
 OLD_FILES+=usr/lib32/libwind.a
 OLD_FILES+=usr/lib32/libwind.so
 OLD_LIBS+=usr/lib32/libwind.so.11
 OLD_FILES+=usr/lib32/libwind_p.a
 OLD_FILES+=usr/lib32/pam_krb5.so
 OLD_LIBS+=usr/lib32/pam_krb5.so.6
 OLD_FILES+=usr/lib32/pam_ksu.so
 OLD_LIBS+=usr/lib32/pam_ksu.so.6
 OLD_FILES+=usr/lib32/private/libheimipcc.a
 OLD_FILES+=usr/lib32/private/libheimipcc.so
 OLD_LIBS+=usr/lib32/private/libheimipcc.so.11
 OLD_FILES+=usr/lib32/private/libheimipcc_p.a
 OLD_FILES+=usr/lib32/private/libheimipcs.a
 OLD_FILES+=usr/lib32/private/libheimipcs.so
 OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
 OLD_FILES+=usr/lib32/private/libheimipcs_p.a
 .endif
 OLD_FILES+=usr/libexec/digest-service
 OLD_FILES+=usr/libexec/hprop
 OLD_FILES+=usr/libexec/hpropd
 OLD_FILES+=usr/libexec/ipropd-master
 OLD_FILES+=usr/libexec/ipropd-slave
 OLD_FILES+=usr/libexec/kadmind
 OLD_FILES+=usr/libexec/kcm
 OLD_FILES+=usr/libexec/kdc
 OLD_FILES+=usr/libexec/kdigest
 OLD_FILES+=usr/libexec/kfd
 OLD_FILES+=usr/libexec/kimpersonate
 OLD_FILES+=usr/libexec/kpasswdd
 OLD_FILES+=usr/sbin/kstash
 OLD_FILES+=usr/sbin/ktutil
 OLD_FILES+=usr/sbin/iprop-log
 OLD_FILES+=usr/share/info/heimdal.info.gz
 OLD_FILES+=usr/share/man/man1/kdestroy.1.gz
 OLD_FILES+=usr/share/man/man1/kf.1.gz
 OLD_FILES+=usr/share/man/man1/kinit.1.gz
 OLD_FILES+=usr/share/man/man1/klist.1.gz
 OLD_FILES+=usr/share/man/man1/kpasswd.1.gz
 OLD_FILES+=usr/share/man/man1/krb5-config.1.gz
 OLD_FILES+=usr/share/man/man1/kswitch.1.gz
 OLD_FILES+=usr/share/man/man3/HDB.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__del.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__get.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__put.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_auth_status.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_constrained_delegation.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_pkinit_ms_upn_match.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_s4u2self.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_close.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_entry_ex.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_fetch_kvno.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_firstkey.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_free.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_get_realms.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_lock.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_name.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_nextkey.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_open.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_password.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_remove.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_rename.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_store.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_unlock.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_build_ntlm1_master.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_build_ntlm2_master.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_lm2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_ntlm1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_ntlm2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_decode_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type3.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_buf.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type3.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_keyex_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_nt_key.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_ntlmv2_key.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_verify_ntlm2.3.gz
 OLD_FILES+=usr/share/man/man3/hx509.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_bitstring_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_sign.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_sign_self.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_crl_dp_uri.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_jid.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_ms_upn.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_otherName.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_pkinit.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_rfc822name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_ca.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_domaincontroller.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notAfter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notAfter_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notBefore.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_proxy.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_serialnumber.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_spki.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_template.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_unique.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_subject_expand.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_template_units.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_binary.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_check_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_find_subjectAltName_otherName.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_SPKI.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_SPKI_AlgorithmIdentifier.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_attribute.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_base_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_issuer.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_issuer_unique_id.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_notAfter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_notBefore.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_serialnumber.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_subject_unique_id.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_init_data.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_keyusage_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_ref.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_set_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_add.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_append.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_end_seq.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_filter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_find.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_info.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_iter_f.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_merge.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_next_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_start_seq.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_store.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ci_print_names.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_clear_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_create_signed_1.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_envelope_1.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_unenvelope.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_unwrap_ContentInfo.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_verify_signed.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_wrap_ContentInfo.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_set_missing_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_add_revoked_certs.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_sign.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_add.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_add_binding.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_find.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_find_binding.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_lfind.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_err.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_error.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_free_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_free_octet_string_list.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_general_name_unparse.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_get_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_get_one_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_keyset.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_lock.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_misc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_binary.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_copy.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_expand.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_is_null_p.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_to_Name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_to_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ocsp_request.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ocsp_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_oid_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_oid_sprint.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_parse_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_add_cms_alg.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_set_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_set_cms_algs.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print_stdout.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_cmp_func.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_issuer_serial.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_option.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_statistic_file.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_unparse_stats.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_add_crl.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_add_ocsp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_ocsp_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_set_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_set_error_stringv.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_unparse_der_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_add_flags.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_set_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_attach_anchors.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_attach_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_ctx_f_allow_default_trustanchors.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_destroy_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_init_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_path.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_max_depth.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_proxy_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_strict_rfc3280_verification.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_time.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_signature.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_xfree.3.gz
 OLD_FILES+=usr/share/man/man3/k_afs_cell_of_file.3.gz
 OLD_FILES+=usr/share/man/man3/k_hasafs.3.gz
 OLD_FILES+=usr/share/man/man3/k_pioctl.3.gz
 OLD_FILES+=usr/share/man/man3/k_setpag.3.gz
 OLD_FILES+=usr/share/man/man3/k_unlog.3.gz
 OLD_FILES+=usr/share/man/man3/kadm5_pwcheck.3.gz
 OLD_FILES+=usr/share/man/man3/kafs.3.gz
 OLD_FILES+=usr/share/man/man3/kafs5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_set_verbose.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken_rxkad.3.gz
 OLD_FILES+=usr/share/man/man3/krb5.3.gz
 OLD_FILES+=usr/share/man/man3/krb524_convert_creds_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb524_convert_creds_kdc_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_425_conv_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_425_conv_principal_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_524_conv_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acl_match_file.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acl_match_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_et_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addlog_dest.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addlog_func.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addr2sockaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_order.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_prefixlen_boundary.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_search.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_allow_weak_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_aname_to_localname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_anyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_boolean.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_append_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_genaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getflags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getlocalsubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getrcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getremotesubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getuserkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_initivector.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setaddrs_from_fd.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setflags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setivector.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setlocalsubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setrcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setremotesubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setuserkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getauthenticator.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getlocalseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getremoteseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setlocalseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setremoteseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_va.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_va_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_c_enctype_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_c_make_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_get_first.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_match.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_clear_mcred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_close.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_cache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_match_f.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_gen_new.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_config.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_full_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_kdc_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_prefix_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_initialize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_last_change_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_move.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_new_unique.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_next_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_remove_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_resolve.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_retrieve_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_config.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_kdc_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_start_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_store_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_support_switch.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_switch.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ccache_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_new.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_last_change_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_change_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_check_transited.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksum_is_collision_proof.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksum_is_keyed.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksumsize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cksumtype_to_enctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_clear_error_message.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_clear_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_closelog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_compare_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_file_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_free_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_bool.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_bool_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_string_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_time_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_parse_file_multi.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_parse_string_multi.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_bool.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_bool_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_string_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_time_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_creds_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_keyblock_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_create_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_create_checksum_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_credential.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_creds_get_ticket_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_fx_cf2.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getblocksize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getconfoundersize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getenctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getpadsize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_copy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_ct_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_realloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_zero.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt_EncryptedData.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt_iov_ivec.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_deprecated.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_digest.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_digest_probe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_eai_to_heim_errno.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt_EncryptedData.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt_iov_ivec.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_disable.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_enable.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_valid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctypes_compatible_keys.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_expand_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_expand_hostname_realms.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fcc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fileformats.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_find_padata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_cred_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_data_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_krbhst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_unparsed_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fwd_tgt_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_random_block.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_subkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_subkey_extended.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_all_client_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_all_server_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_cred_from_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_cred_from_kdc_opt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_credentials.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_in_tkt_etypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_realms.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_dns_canonicalize_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_fcache_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_forwarded_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_skey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_kdc_sec_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb524hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb_admin_hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb_changepw_hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krbhst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_max_time_skew.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_use_admin_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_validated_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_getportbyname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_addr2addr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_addr2sockaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_errno_to_heim_errno.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_service.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_step.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_ets.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_initlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_introduction.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_is_config_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_is_thread_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kerberos_enctypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_get_enctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_zero.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab_key_proc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_enctypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_enctypes_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_format_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_get_addrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next_as_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_reset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_add_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_close.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_copy_entry_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default_modify_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_free_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_full_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_have_content.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_next_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_read_service_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_remove_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_resolve.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_start_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kuserok.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_log.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_log_msg.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_make_addrport.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_make_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_max_sockaddr_size.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mcc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mk_req.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mk_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_openlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac_get_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac_verify.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_nametype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_password_key_proc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_plugin_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_prepend_config_files_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_compare_any_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_comp_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_num_comp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_is_krbtgt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_match.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_set_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_print_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_random_to_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_ctx_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_set_pac_check.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_out_ctx_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_out_get_server.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_realm_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_authdata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_creds_tag.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_stringz.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_times.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_default_in_tkt_etypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_default_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_dns_canonicalize_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_error_message.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_fcache_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_home_dir_access.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_kdc_sec_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_max_time_skew.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_real_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_use_admin_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sname_to_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sock_to_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr2address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr2port.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr_uninteresting.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_clear_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_emem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_fd.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_mem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_readonly_mem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_get_byteorder.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_get_eof_code.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_is_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_read.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_seek.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_byteorder.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_eof_code.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_max_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_to_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_truncate.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_write.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_authdata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_creds_tag.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_stringz.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_times.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_string_to_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_string_to_keytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_support.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_authorization_data_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_client.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_endtime.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_server.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_timeofday.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed_short.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_short.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_us_timeofday.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_v4compat.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_checksum_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_init_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_secure.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_service.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user_lrealm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user_opt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vlog_msg.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vset_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vwarn.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_buf.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_core.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type1.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type2.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type3.3.gz
 OLD_FILES+=usr/share/man/man5/krb5.conf.5.gz
 OLD_FILES+=usr/share/man/man8/hprop.8.gz
 OLD_FILES+=usr/share/man/man8/hpropd.8.gz
 OLD_FILES+=usr/share/man/man8/iprop-log.8.gz
 OLD_FILES+=usr/share/man/man8/iprop.8.gz
 OLD_FILES+=usr/share/man/man8/kadmin.8.gz
 OLD_FILES+=usr/share/man/man8/kadmind.8.gz
 OLD_FILES+=usr/share/man/man8/kcm.8.gz
 OLD_FILES+=usr/share/man/man8/kdc.8.gz
 OLD_FILES+=usr/share/man/man8/kdigest.8.gz
 OLD_FILES+=usr/share/man/man8/kerberos.8.gz
 OLD_FILES+=usr/share/man/man8/kimpersonate.8.gz
 OLD_FILES+=usr/share/man/man8/kpasswdd.8.gz
 OLD_FILES+=usr/share/man/man8/kstash.8.gz
 OLD_FILES+=usr/share/man/man8/ktutil.8.gz
 OLD_FILES+=usr/share/man/man8/pam_krb5.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz
 OLD_FILES+=usr/share/man/man8/string2key.8.gz
 OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} == no
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/include/com_err.h
 OLD_FILES+=usr/include/com_right.h
 OLD_FILES+=usr/lib/libcom_err.a
 OLD_FILES+=usr/lib/libcom_err.so
 OLD_LIBS+=usr/lib/libcom_err.so.5
 OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/lib32/libcom_err.a
 OLD_FILES+=usr/lib32/libcom_err.so
 OLD_LIBS+=usr/lib32/libcom_err.so.5
 OLD_FILES+=usr/lib32/libcom_err_p.a
 OLD_FILES+=usr/share/man/man1/compile_et.1.gz
 OLD_FILES+=usr/share/man/man3/com_err.3.gz
 .endif
 
 .if ${MK_LDNS} == no
 OLD_FILES+=usr/lib/private/libldns.a
 OLD_FILES+=usr/lib/private/libldns.so
 OLD_LIBS+=usr/lib/private/libldns.so.5
 OLD_FILES+=usr/lib/private/libldns_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libldns.a
 OLD_FILES+=usr/lib32/private/libldns.so
 OLD_LIBS+=usr/lib32/private/libldns.so.5
 OLD_FILES+=usr/lib32/private/libldns_p.a
 .endif
 .endif
 
 .if ${MK_LDNS_UTILS} == no
 OLD_FILES+=usr/bin/drill
 OLD_FILES+=usr/share/man/man1/drill.1.gz
 OLD_FILES+=usr/bin/host
 OLD_FILES+=usr/share/man/man1/host.1.gz
 .endif
 
 .if ${MK_LEGACY_CONSOLE} == no
 OLD_FILES+=usr/sbin/kbdcontrol
 OLD_FILES+=usr/sbin/kbdmap
 OLD_FILES+=usr/sbin/moused
 OLD_FILES+=usr/sbin/vidcontrol
 OLD_FILES+=usr/sbin/vidfont
 OLD_FILES+=usr/share/man/man1/kbdcontrol.1.gz
 OLD_FILES+=usr/share/man/man1/kbdmap.1.gz
 OLD_FILES+=usr/share/man/man1/vidcontrol.1.gz
 OLD_FILES+=usr/share/man/man1/vidfont.1.gz
 OLD_FILES+=usr/share/man/man5/kbdmap.5.gz
 OLD_FILES+=usr/share/man/man5/keymap.5.gz
 OLD_FILES+=usr/share/man/man8/moused.8.gz
 .endif
 
 .if ${MK_LIB32} == no
 OLD_FILES+=etc/mtree/BSD.lib32.dist
 OLD_FILES+=libexec/ld-elf32.so.1
 .  if exists(${DESTDIR}/usr/lib32)
 LIB32_DIRS!=find ${DESTDIR}/usr/lib32 -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 LIB32_FILES!=find ${DESTDIR}/usr/lib32 \! -type d \
     \! -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 LIB32_LIBS!=find ${DESTDIR}/usr/lib32 \! -type d \
     -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${LIB32_DIRS}
 OLD_FILES+=${LIB32_FILES}
 OLD_LIBS+=${LIB32_LIBS}
 .  endif
 .  if ${MK_DEBUG_FILES} == no
 .    if exists(${DESTDIR}/usr/lib/debug/usr/lib32)
 DEBUG_LIB32_DIRS!=find ${DESTDIR}/usr/lib/debug/usr/lib32 -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_LIB32_FILES!=find ${DESTDIR}/usr/lib/debug/usr/lib32 \! -type d \
     \! -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_LIB32_LIBS!=find ${DESTDIR}/usr/lib/debug/usr/lib32 \! -type d \
     -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${DEBUG_LIB32_DIRS}
 OLD_FILES+=${DEBUG_LIB32_FILES}
 OLD_LIBS+=${DEBUG_LIB32_LIBS}
 .    endif
 .  endif
 .endif
 
 .if ${MK_LIBCPLUSPLUS} == no
 OLD_LIBS+=lib/libcxxrt.so.1
 OLD_FILES+=usr/lib/libc++.a
 OLD_FILES+=usr/lib/libc++_p.a
 OLD_FILES+=usr/lib/libc++.so
 OLD_LIBS+=usr/lib/libc++.so.1
 OLD_FILES+=usr/lib/libcxxrt.a
 OLD_FILES+=usr/lib/libcxxrt.so
 OLD_FILES+=usr/lib/libcxxrt_p.a
 OLD_FILES+=usr/include/c++/v1/__bit_reference
 OLD_FILES+=usr/include/c++/v1/__config
 OLD_FILES+=usr/include/c++/v1/__debug
 OLD_FILES+=usr/include/c++/v1/__functional_03
 OLD_FILES+=usr/include/c++/v1/__functional_base
 OLD_FILES+=usr/include/c++/v1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/__hash_table
 OLD_FILES+=usr/include/c++/v1/__locale
 OLD_FILES+=usr/include/c++/v1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/__refstring
 OLD_FILES+=usr/include/c++/v1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/__std_stream
 OLD_FILES+=usr/include/c++/v1/__tree
 OLD_FILES+=usr/include/c++/v1/__tuple
 OLD_FILES+=usr/include/c++/v1/__undef___deallocate
 OLD_FILES+=usr/include/c++/v1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/algorithm
 OLD_FILES+=usr/include/c++/v1/array
 OLD_FILES+=usr/include/c++/v1/atomic
 OLD_FILES+=usr/include/c++/v1/bitset
 OLD_FILES+=usr/include/c++/v1/cassert
 OLD_FILES+=usr/include/c++/v1/ccomplex
 OLD_FILES+=usr/include/c++/v1/cctype
 OLD_FILES+=usr/include/c++/v1/cerrno
 OLD_FILES+=usr/include/c++/v1/cfenv
 OLD_FILES+=usr/include/c++/v1/cfloat
 OLD_FILES+=usr/include/c++/v1/chrono
 OLD_FILES+=usr/include/c++/v1/cinttypes
 OLD_FILES+=usr/include/c++/v1/ciso646
 OLD_FILES+=usr/include/c++/v1/climits
 OLD_FILES+=usr/include/c++/v1/clocale
 OLD_FILES+=usr/include/c++/v1/cmath
 OLD_FILES+=usr/include/c++/v1/codecvt
 OLD_FILES+=usr/include/c++/v1/complex
 OLD_FILES+=usr/include/c++/v1/complex.h
 OLD_FILES+=usr/include/c++/v1/condition_variable
 OLD_FILES+=usr/include/c++/v1/csetjmp
 OLD_FILES+=usr/include/c++/v1/csignal
 OLD_FILES+=usr/include/c++/v1/cstdarg
 OLD_FILES+=usr/include/c++/v1/cstdbool
 OLD_FILES+=usr/include/c++/v1/cstddef
 OLD_FILES+=usr/include/c++/v1/cstdint
 OLD_FILES+=usr/include/c++/v1/cstdio
 OLD_FILES+=usr/include/c++/v1/cstdlib
 OLD_FILES+=usr/include/c++/v1/cstring
 OLD_FILES+=usr/include/c++/v1/ctgmath
 OLD_FILES+=usr/include/c++/v1/ctime
 OLD_FILES+=usr/include/c++/v1/cwchar
 OLD_FILES+=usr/include/c++/v1/cwctype
 OLD_FILES+=usr/include/c++/v1/cxxabi.h
 OLD_FILES+=usr/include/c++/v1/deque
 OLD_FILES+=usr/include/c++/v1/exception
 OLD_FILES+=usr/include/c++/v1/experimental/__config
 OLD_FILES+=usr/include/c++/v1/experimental/chrono
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/experimental/ratio
 OLD_FILES+=usr/include/c++/v1/experimental/string_view
 OLD_FILES+=usr/include/c++/v1/experimental/system_error
 OLD_FILES+=usr/include/c++/v1/experimental/tuple
 OLD_FILES+=usr/include/c++/v1/experimental/type_traits
 OLD_FILES+=usr/include/c++/v1/experimental/utility
 OLD_FILES+=usr/include/c++/v1/ext/__hash
 OLD_FILES+=usr/include/c++/v1/ext/hash_map
 OLD_FILES+=usr/include/c++/v1/ext/hash_set
 OLD_FILES+=usr/include/c++/v1/forward_list
 OLD_FILES+=usr/include/c++/v1/fstream
 OLD_FILES+=usr/include/c++/v1/functional
 OLD_FILES+=usr/include/c++/v1/future
 OLD_FILES+=usr/include/c++/v1/initializer_list
 OLD_FILES+=usr/include/c++/v1/iomanip
 OLD_FILES+=usr/include/c++/v1/ios
 OLD_FILES+=usr/include/c++/v1/iosfwd
 OLD_FILES+=usr/include/c++/v1/iostream
 OLD_FILES+=usr/include/c++/v1/istream
 OLD_FILES+=usr/include/c++/v1/iterator
 OLD_FILES+=usr/include/c++/v1/limits
 OLD_FILES+=usr/include/c++/v1/list
 OLD_FILES+=usr/include/c++/v1/locale
 OLD_FILES+=usr/include/c++/v1/map
 OLD_FILES+=usr/include/c++/v1/memory
 OLD_FILES+=usr/include/c++/v1/mutex
 OLD_FILES+=usr/include/c++/v1/new
 OLD_FILES+=usr/include/c++/v1/numeric
 OLD_FILES+=usr/include/c++/v1/ostream
 OLD_FILES+=usr/include/c++/v1/queue
 OLD_FILES+=usr/include/c++/v1/random
 OLD_FILES+=usr/include/c++/v1/ratio
 OLD_FILES+=usr/include/c++/v1/regex
 OLD_FILES+=usr/include/c++/v1/scoped_allocator
 OLD_FILES+=usr/include/c++/v1/set
 OLD_FILES+=usr/include/c++/v1/shared_mutex
 OLD_FILES+=usr/include/c++/v1/sstream
 OLD_FILES+=usr/include/c++/v1/stack
 OLD_FILES+=usr/include/c++/v1/stdexcept
 OLD_FILES+=usr/include/c++/v1/streambuf
 OLD_FILES+=usr/include/c++/v1/string
 OLD_FILES+=usr/include/c++/v1/strstream
 OLD_FILES+=usr/include/c++/v1/system_error
 OLD_FILES+=usr/include/c++/v1/tgmath.h
 OLD_FILES+=usr/include/c++/v1/thread
 OLD_FILES+=usr/include/c++/v1/tr1/__bit_reference
 OLD_FILES+=usr/include/c++/v1/tr1/__config
 OLD_FILES+=usr/include/c++/v1/tr1/__debug
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_03
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/tr1/__hash_table
 OLD_FILES+=usr/include/c++/v1/tr1/__locale
 OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/tr1/__refstring
 OLD_FILES+=usr/include/c++/v1/tr1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/tr1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/__std_stream
 OLD_FILES+=usr/include/c++/v1/tr1/__tree
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple_03
 OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/tr1/algorithm
 OLD_FILES+=usr/include/c++/v1/tr1/array
 OLD_FILES+=usr/include/c++/v1/tr1/atomic
 OLD_FILES+=usr/include/c++/v1/tr1/bitset
 OLD_FILES+=usr/include/c++/v1/tr1/cassert
 OLD_FILES+=usr/include/c++/v1/tr1/ccomplex
 OLD_FILES+=usr/include/c++/v1/tr1/cctype
 OLD_FILES+=usr/include/c++/v1/tr1/cerrno
 OLD_FILES+=usr/include/c++/v1/tr1/cfenv
 OLD_FILES+=usr/include/c++/v1/tr1/cfloat
 OLD_FILES+=usr/include/c++/v1/tr1/chrono
 OLD_FILES+=usr/include/c++/v1/tr1/cinttypes
 OLD_FILES+=usr/include/c++/v1/tr1/ciso646
 OLD_FILES+=usr/include/c++/v1/tr1/climits
 OLD_FILES+=usr/include/c++/v1/tr1/clocale
 OLD_FILES+=usr/include/c++/v1/tr1/cmath
 OLD_FILES+=usr/include/c++/v1/tr1/codecvt
 OLD_FILES+=usr/include/c++/v1/tr1/complex
 OLD_FILES+=usr/include/c++/v1/tr1/complex.h
 OLD_FILES+=usr/include/c++/v1/tr1/condition_variable
 OLD_FILES+=usr/include/c++/v1/tr1/csetjmp
 OLD_FILES+=usr/include/c++/v1/tr1/csignal
 OLD_FILES+=usr/include/c++/v1/tr1/cstdarg
 OLD_FILES+=usr/include/c++/v1/tr1/cstdbool
 OLD_FILES+=usr/include/c++/v1/tr1/cstddef
 OLD_FILES+=usr/include/c++/v1/tr1/cstdint
 OLD_FILES+=usr/include/c++/v1/tr1/cstdio
 OLD_FILES+=usr/include/c++/v1/tr1/cstdlib
 OLD_FILES+=usr/include/c++/v1/tr1/cstring
 OLD_FILES+=usr/include/c++/v1/tr1/ctgmath
 OLD_FILES+=usr/include/c++/v1/tr1/ctime
 OLD_FILES+=usr/include/c++/v1/tr1/cwchar
 OLD_FILES+=usr/include/c++/v1/tr1/cwctype
 OLD_FILES+=usr/include/c++/v1/tr1/deque
 OLD_FILES+=usr/include/c++/v1/tr1/exception
 OLD_FILES+=usr/include/c++/v1/tr1/forward_list
 OLD_FILES+=usr/include/c++/v1/tr1/fstream
 OLD_FILES+=usr/include/c++/v1/tr1/functional
 OLD_FILES+=usr/include/c++/v1/tr1/future
 OLD_FILES+=usr/include/c++/v1/tr1/initializer_list
 OLD_FILES+=usr/include/c++/v1/tr1/iomanip
 OLD_FILES+=usr/include/c++/v1/tr1/ios
 OLD_FILES+=usr/include/c++/v1/tr1/iosfwd
 OLD_FILES+=usr/include/c++/v1/tr1/iostream
 OLD_FILES+=usr/include/c++/v1/tr1/istream
 OLD_FILES+=usr/include/c++/v1/tr1/iterator
 OLD_FILES+=usr/include/c++/v1/tr1/limits
 OLD_FILES+=usr/include/c++/v1/tr1/list
 OLD_FILES+=usr/include/c++/v1/tr1/locale
 OLD_FILES+=usr/include/c++/v1/tr1/map
 OLD_FILES+=usr/include/c++/v1/tr1/memory
 OLD_FILES+=usr/include/c++/v1/tr1/mutex
 OLD_FILES+=usr/include/c++/v1/tr1/new
 OLD_FILES+=usr/include/c++/v1/tr1/numeric
 OLD_FILES+=usr/include/c++/v1/tr1/ostream
 OLD_FILES+=usr/include/c++/v1/tr1/queue
 OLD_FILES+=usr/include/c++/v1/tr1/random
 OLD_FILES+=usr/include/c++/v1/tr1/ratio
 OLD_FILES+=usr/include/c++/v1/tr1/regex
 OLD_FILES+=usr/include/c++/v1/tr1/scoped_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/set
 OLD_FILES+=usr/include/c++/v1/tr1/shared_mutex
 OLD_FILES+=usr/include/c++/v1/tr1/sstream
 OLD_FILES+=usr/include/c++/v1/tr1/stack
 OLD_FILES+=usr/include/c++/v1/tr1/stdexcept
 OLD_FILES+=usr/include/c++/v1/tr1/streambuf
 OLD_FILES+=usr/include/c++/v1/tr1/string
 OLD_FILES+=usr/include/c++/v1/tr1/strstream
 OLD_FILES+=usr/include/c++/v1/tr1/system_error
 OLD_FILES+=usr/include/c++/v1/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/v1/tr1/thread
 OLD_FILES+=usr/include/c++/v1/tr1/tuple
 OLD_FILES+=usr/include/c++/v1/tr1/type_traits
 OLD_FILES+=usr/include/c++/v1/tr1/typeindex
 OLD_FILES+=usr/include/c++/v1/tr1/typeinfo
 OLD_FILES+=usr/include/c++/v1/tr1/unordered_map
 OLD_FILES+=usr/include/c++/v1/tr1/unordered_set
 OLD_FILES+=usr/include/c++/v1/tr1/utility
 OLD_FILES+=usr/include/c++/v1/tr1/valarray
 OLD_FILES+=usr/include/c++/v1/tr1/vector
 OLD_FILES+=usr/include/c++/v1/tuple
 OLD_FILES+=usr/include/c++/v1/type_traits
 OLD_FILES+=usr/include/c++/v1/typeindex
 OLD_FILES+=usr/include/c++/v1/typeinfo
 OLD_FILES+=usr/include/c++/v1/unordered_map
 OLD_FILES+=usr/include/c++/v1/unordered_set
 OLD_FILES+=usr/include/c++/v1/unwind-arm.h
 OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
 OLD_FILES+=usr/include/c++/v1/unwind.h
 OLD_FILES+=usr/include/c++/v1/utility
 OLD_FILES+=usr/include/c++/v1/valarray
 OLD_FILES+=usr/include/c++/v1/vector
 OLD_FILES+=usr/lib32/libc++.a
 OLD_FILES+=usr/lib32/libc++.so
 OLD_LIBS+=usr/lib32/libc++.so.1
 OLD_FILES+=usr/lib32/libc++_p.a
 OLD_FILES+=usr/lib32/libcxxrt.a
 OLD_FILES+=usr/lib32/libcxxrt.so
 OLD_LIBS+=usr/lib32/libcxxrt.so.1
 OLD_FILES+=usr/lib32/libcxxrt_p.a
 OLD_DIRS+=usr/include/c++/v1/tr1
 OLD_DIRS+=usr/include/c++/v1/experimental
 OLD_DIRS+=usr/include/c++/v1/ext
 OLD_DIRS+=usr/include/c++/v1
 .endif
 
 #.if ${MK_LIBTHR} == no
 # to be filled in
 #.endif
 
 .if ${MK_LLD} == no
 OLD_FILES+=usr/bin/ld.lld
 .endif
 
 .if ${MK_LLDB} == no
 OLD_FILES+=usr/bin/lldb
 OLD_FILES+=usr/share/man/man1/lldb.1.gz
 .endif
 
 .if ${MK_LOCALES} == no
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_TIME
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_TIME
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_TIME
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_TIME
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_COLLATE
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_CTYPE
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MESSAGES
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MONETARY
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_NUMERIC
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_TIME
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_TIME
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_TIME
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_TIME
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_TIME
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_TIME
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_TIME
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_COLLATE
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_CTYPE
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MONETARY
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_TIME
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_TIME
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MONETARY
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_TIME
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MONETARY
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_TIME
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_TIME
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_TIME
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_TIME
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_CTYPE
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MONETARY
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_TIME
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_TIME
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_TIME
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_TIME
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_TIME
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_TIME
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_TIME
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_COLLATE
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_CTYPE
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_MESSAGES
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_MONETARY
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_NUMERIC
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_TIME
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_TIME
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_TIME
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_TIME
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_TIME
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_TIME
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_TIME
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_TIME
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_TIME
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_TIME
 .endif
 
 .if ${MK_LOCATE} == no
 OLD_FILES+=etc/locate.rc
 OLD_FILES+=etc/periodic/weekly/310.locate
 OLD_FILES+=usr/bin/locate
 OLD_FILES+=usr/libexec/locate.bigram
 OLD_FILES+=usr/libexec/locate.code
 OLD_FILES+=usr/libexec/locate.concatdb
 OLD_FILES+=usr/libexec/locate.mklocatedb
 OLD_FILES+=usr/libexec/locate.updatedb
 OLD_FILES+=usr/share/man/man1/locate.1.gz
 OLD_FILES+=usr/share/man/man8/locate.updatedb.8.gz
 OLD_FILES+=usr/share/man/man8/updatedb.8.gz
 .endif
 
 .if ${MK_LPR} == no
 OLD_FILES+=etc/hosts.lpd
 OLD_FILES+=etc/printcap
 OLD_FILES+=etc/rc.d/lpd
 OLD_FILES+=usr/bin/lp
 OLD_FILES+=usr/bin/lpq
 OLD_FILES+=usr/bin/lpr
 OLD_FILES+=usr/bin/lprm
 OLD_FILES+=usr/libexec/lpr/ru/bjc-240.sh.sample
 OLD_FILES+=usr/libexec/lpr/ru/koi2alt
 OLD_FILES+=usr/libexec/lpr/ru/koi2855
 OLD_DIRS+=usr/libexec/lpr/ru
 OLD_FILES+=usr/libexec/lpr/lpf
 OLD_DIRS+=usr/libexec/lpr
 OLD_FILES+=usr/sbin/chkprintcap
 OLD_FILES+=usr/sbin/lpc
 OLD_FILES+=usr/sbin/lpd
 OLD_FILES+=usr/sbin/lptest
 OLD_FILES+=usr/sbin/pac
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/examples/etc/hosts.lpd
 OLD_FILES+=usr/share/examples/etc/printcap
 OLD_FILES+=usr/share/man/man1/lp.1.gz
 OLD_FILES+=usr/share/man/man1/lpq.1.gz
 OLD_FILES+=usr/share/man/man1/lpr.1.gz
 OLD_FILES+=usr/share/man/man1/lprm.1.gz
 OLD_FILES+=usr/share/man/man1/lptest.1.gz
 OLD_FILES+=usr/share/man/man5/printcap.5.gz
 OLD_FILES+=usr/share/man/man8/chkprintcap.8.gz
 OLD_FILES+=usr/share/man/man8/lpc.8.gz
 OLD_FILES+=usr/share/man/man8/lpd.8.gz
 OLD_FILES+=usr/share/man/man8/pac.8.gz
 .endif
 
 .if ${MK_MAIL} == no
 OLD_FILES+=etc/aliases
 OLD_FILES+=etc/mail.rc
 OLD_FILES+=etc/mail/aliases
 OLD_FILES+=etc/mail/mailer.conf
 OLD_FILES+=etc/periodic/daily/130.clean-msgs
 OLD_FILES+=usr/bin/Mail
 OLD_FILES+=usr/bin/biff
 OLD_FILES+=usr/bin/from
 OLD_FILES+=usr/bin/mail
 OLD_FILES+=usr/bin/mailx
 OLD_FILES+=usr/bin/msgs
 OLD_FILES+=usr/libexec/comsat
 OLD_FILES+=usr/share/examples/etc/mail.rc
 OLD_FILES+=usr/share/man/man1/Mail.1.gz
 OLD_FILES+=usr/share/man/man1/biff.1.gz
 OLD_FILES+=usr/share/man/man1/from.1.gz
 OLD_FILES+=usr/share/man/man1/mail.1.gz
 OLD_FILES+=usr/share/man/man1/mailx.1.gz
 OLD_FILES+=usr/share/man/man1/msgs.1.gz
 OLD_FILES+=usr/share/man/man8/comsat.8.gz
 OLD_FILES+=usr/share/misc/mail.help
 OLD_FILES+=usr/share/misc/mail.tildehelp
 .endif
 
 .if ${MK_MAILWRAPPER} == no
 OLD_FILES+=etc/mail/mailer.conf
 # Don't remove, for no mailwrapper case:
 # /usr/sbin/sendmail -> /usr/sbin/mailwrapper
 # /usr/sbin/mailwrapper -> /usr/libexec/sendmail/sendmail
 #OLD_FILES+=usr/sbin/mailwrapper
 OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz
 .endif
 
 .if ${MK_MAKE} == no
 OLD_FILES+=usr/bin/make
 OLD_FILES+=usr/share/man/man1/make.1.gz
 OLD_FILES+=usr/share/mk/atf.test.mk
 OLD_FILES+=usr/share/mk/bsd.README
 OLD_FILES+=usr/share/mk/bsd.arch.inc.mk
 OLD_FILES+=usr/share/mk/bsd.compiler.mk
 OLD_FILES+=usr/share/mk/bsd.cpu.mk
 OLD_FILES+=usr/share/mk/bsd.crunchgen.mk
 OLD_FILES+=usr/share/mk/bsd.dep.mk
 OLD_FILES+=usr/share/mk/bsd.doc.mk
 OLD_FILES+=usr/share/mk/bsd.dtb.mk
 OLD_FILES+=usr/share/mk/bsd.endian.mk
 OLD_FILES+=usr/share/mk/bsd.files.mk
 OLD_FILES+=usr/share/mk/bsd.incs.mk
 OLD_FILES+=usr/share/mk/bsd.info.mk
 OLD_FILES+=usr/share/mk/bsd.init.mk
 OLD_FILES+=usr/share/mk/bsd.kmod.mk
 OLD_FILES+=usr/share/mk/bsd.lib.mk
 OLD_FILES+=usr/share/mk/bsd.libnames.mk
 OLD_FILES+=usr/share/mk/bsd.links.mk
 OLD_FILES+=usr/share/mk/bsd.man.mk
 OLD_FILES+=usr/share/mk/bsd.mkopt.mk
 OLD_FILES+=usr/share/mk/bsd.nls.mk
 OLD_FILES+=usr/share/mk/bsd.obj.mk
 OLD_FILES+=usr/share/mk/bsd.opts.mk
 OLD_FILES+=usr/share/mk/bsd.own.mk
 OLD_FILES+=usr/share/mk/bsd.port.mk
 OLD_FILES+=usr/share/mk/bsd.port.options.mk
 OLD_FILES+=usr/share/mk/bsd.port.post.mk
 OLD_FILES+=usr/share/mk/bsd.port.pre.mk
 OLD_FILES+=usr/share/mk/bsd.port.subdir.mk
 OLD_FILES+=usr/share/mk/bsd.prog.mk
 OLD_FILES+=usr/share/mk/bsd.progs.mk
 OLD_FILES+=usr/share/mk/bsd.snmpmod.mk
 OLD_FILES+=usr/share/mk/bsd.subdir.mk
 OLD_FILES+=usr/share/mk/bsd.symver.mk
 OLD_FILES+=usr/share/mk/bsd.sys.mk
 OLD_FILES+=usr/share/mk/bsd.test.mk
 OLD_FILES+=usr/share/mk/plain.test.mk
 OLD_FILES+=usr/share/mk/suite.test.mk
 OLD_FILES+=usr/share/mk/sys.mk
 OLD_FILES+=usr/share/mk/tap.test.mk
 OLD_FILES+=usr/share/mk/version_gen.awk
 OLD_FILES+=usr/tests/usr.bin/bmake/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/libtest.a
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/common.sh
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/sh
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/sh
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/sh
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/shell
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/shell
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/test-new.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/legacy_test
 .endif
 
 .if ${MK_MAN} == no
 MAN_FILES!=find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man -type f | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${MAN_FILES}
 .endif
 
 .if ${MK_MAN_UTILS} == no
 OLD_FILES+=etc/periodic/weekly/320.whatis
 OLD_FILES+=etc/periodic/weekly/330.catman
 OLD_FILES+=usr/bin/apropos
 OLD_FILES+=usr/bin/catman
 OLD_FILES+=usr/bin/makewhatis
 OLD_FILES+=usr/bin/man
 OLD_FILES+=usr/bin/manpath
 OLD_FILES+=usr/bin/whatis
 OLD_FILES+=usr/libexec/catman.local
 OLD_FILES+=usr/libexec/makewhatis.local
 OLD_FILES+=usr/sbin/manctl
 OLD_FILES+=usr/share/man/man1/apropos.1.gz
 OLD_FILES+=usr/share/man/man1/catman.1.gz
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 OLD_FILES+=usr/share/man/man1/man.1.gz
 OLD_FILES+=usr/share/man/man1/manpath.1.gz
 OLD_FILES+=usr/share/man/man1/whatis.1.gz
 OLD_FILES+=usr/share/man/man5/man.conf.5.gz
 OLD_FILES+=usr/share/man/man8/catman.local.8.gz
 OLD_FILES+=usr/share/man/man8/makewhatis.local.8.gz
 OLD_FILES+=usr/share/man/man8/manctl.8.gz
 OLD_FILES+=usr/share/man/whatis
 OLD_FILES+=usr/share/openssl/man/whatis
 .endif
 
 .if ${MK_MANDOCDB} != no
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 .endif
 
 .if ${MK_NDIS} == no
 OLD_FILES+=usr/sbin/ndiscvt
 OLD_FILES+=usr/sbin/ndisgen
 OLD_FILES+=usr/share/man/man8/ndiscvt.8.gz
 OLD_FILES+=usr/share/man/man8/ndisgen.8.gz
 OLD_FILES+=usr/share/misc/windrv_stub.c
 .endif
 
 .if ${MK_NETCAT} == no
 OLD_FILES+=usr/bin/nc
 OLD_FILES+=usr/share/man/man1/nc.1.gz
 .endif
 
 .if ${MK_NETGRAPH} == no
 OLD_FILES+=usr/include/netgraph.h
 OLD_FILES+=usr/lib/libnetgraph.a
 OLD_FILES+=usr/lib/libnetgraph.so
 OLD_LIBS+=usr/lib/libnetgraph.so.4
 OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/lib32/libnetgraph.a
 OLD_FILES+=usr/lib32/libnetgraph.so
 OLD_LIBS+=usr/lib32/libnetgraph.so.4
 OLD_FILES+=usr/lib32/libnetgraph_p.a
 OLD_FILES+=usr/libexec/pppoed
 OLD_FILES+=usr/sbin/flowctl
 OLD_FILES+=usr/sbin/lmcconfig
 OLD_FILES+=usr/sbin/ngctl
 OLD_FILES+=usr/sbin/nghook
 OLD_FILES+=usr/share/man/man3/NgAllocRecvAsciiMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgAllocRecvData.3.gz
 OLD_FILES+=usr/share/man/man3/NgAllocRecvMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgMkSockNode.3.gz
 OLD_FILES+=usr/share/man/man3/NgNameNode.3.gz
 OLD_FILES+=usr/share/man/man3/NgRecvAsciiMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgRecvData.3.gz
 OLD_FILES+=usr/share/man/man3/NgRecvMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendAsciiMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendData.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendMsgReply.3.gz
 OLD_FILES+=usr/share/man/man3/NgSetDebug.3.gz
 OLD_FILES+=usr/share/man/man3/NgSetErrLog.3.gz
 OLD_FILES+=usr/share/man/man3/netgraph.3.gz
 OLD_FILES+=usr/share/man/man8/flowctl.8.gz
 OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz
 OLD_FILES+=usr/share/man/man8/ngctl.8.gz
 OLD_FILES+=usr/share/man/man8/nghook.8.gz
 OLD_FILES+=usr/share/man/man8/pppoed.8.gz
 .endif
 
 .if ${MK_NETGRAPH_SUPPORT} == no
 OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h
 OLD_FILES+=usr/lib/snmp_netgraph.so
 OLD_LIBS+=usr/lib/snmp_netgraph.so.6
 OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz
 OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt
 .endif
 
 .if ${MK_NIS} == no
 OLD_FILES+=etc/rc.d/ypbind
 OLD_FILES+=etc/rc.d/ypldap
 OLD_FILES+=etc/rc.d/yppasswdd
 OLD_FILES+=etc/rc.d/ypserv
 OLD_FILES+=etc/rc.d/ypset
 OLD_FILES+=etc/rc.d/ypupdated
 OLD_FILES+=etc/rc.d/ypxfrd
 OLD_FILES+=usr/bin/ypcat
 OLD_FILES+=usr/bin/ypchfn
 OLD_FILES+=usr/bin/ypchpass
 OLD_FILES+=usr/bin/ypchsh
 OLD_FILES+=usr/bin/ypmatch
 OLD_FILES+=usr/bin/yppasswd
 OLD_FILES+=usr/bin/ypwhich
 OLD_FILES+=usr/include/ypclnt.h
 OLD_FILES+=usr/lib/libypclnt.a
 OLD_FILES+=usr/lib/libypclnt.so
 OLD_LIBS+=usr/lib/libypclnt.so.4
 OLD_FILES+=usr/lib/libypclnt_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libypclnt.a
 OLD_FILES+=usr/lib32/libypclnt.so
 OLD_LIBS+=usr/lib32/libypclnt.so.4
 OLD_FILES+=usr/lib32/libypclnt_p.a
 .endif
 OLD_FILES+=usr/libexec/mknetid
 OLD_FILES+=usr/libexec/yppwupdate
 OLD_FILES+=usr/libexec/ypxfr
 OLD_FILES+=usr/sbin/rpc.yppasswdd
 OLD_FILES+=usr/sbin/rpc.ypupdated
 OLD_FILES+=usr/sbin/rpc.ypxfrd
 OLD_FILES+=usr/sbin/yp_mkdb
 OLD_FILES+=usr/sbin/ypbind
 OLD_FILES+=usr/sbin/ypinit
 OLD_FILES+=usr/sbin/yppoll
 OLD_FILES+=usr/sbin/yppush
 OLD_FILES+=usr/sbin/ypserv
 OLD_FILES+=usr/sbin/ypset
 OLD_FILES+=usr/share/man/man1/ypcat.1.gz
 OLD_FILES+=usr/share/man/man1/ypchfn.1.gz
 OLD_FILES+=usr/share/man/man1/ypchpass.1.gz
 OLD_FILES+=usr/share/man/man1/ypchsh.1.gz
 OLD_FILES+=usr/share/man/man1/ypmatch.1.gz
 OLD_FILES+=usr/share/man/man1/yppasswd.1.gz
 OLD_FILES+=usr/share/man/man1/ypwhich.1.gz
 OLD_FILES+=usr/share/man/man5/netid.5.gz
 OLD_FILES+=usr/share/man/man8/mknetid.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz
 OLD_FILES+=usr/share/man/man8/NIS.8.gz
 OLD_FILES+=usr/share/man/man8/YP.8.gz
 OLD_FILES+=usr/share/man/man8/yp.8.gz
 OLD_FILES+=usr/share/man/man8/nis.8.gz
 OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz
 OLD_FILES+=usr/share/man/man8/ypbind.8.gz
 OLD_FILES+=usr/share/man/man8/ypinit.8.gz
 OLD_FILES+=usr/share/man/man8/yppoll.8.gz
 OLD_FILES+=usr/share/man/man8/yppush.8.gz
 OLD_FILES+=usr/share/man/man8/ypserv.8.gz
 OLD_FILES+=usr/share/man/man8/ypset.8.gz
 OLD_FILES+=usr/share/man/man8/ypxfr.8.gz
 OLD_FILES+=var/yp/Makefile
 OLD_FILES+=var/yp/Makefile.dist
 .endif
 
 .if ${MK_NLS} == no
 OLD_FILES+=usr/share/nls/C/ee.cat
 OLD_FILES+=usr/share/nls/be_BY.UTF-8/libc.cat
 OLD_FILES+=usr/share/nls/ca_ES.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/libc.cat
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/en_US.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/en_US.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/grep.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/libc.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/libc.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/libc.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/libc.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat
 OLD_FILES+=usr/share/nls/ko_KR.UTF-8/libc.cat
 OLD_FILES+=usr/share/nls/ko_KR.eucKR/libc.cat
 OLD_FILES+=usr/share/nls/mn_MN.UTF-8/libc.cat
 OLD_FILES+=usr/share/nls/nl_NL.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/no_NO.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/libc.cat
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/pt_PT.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/grep.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/libc.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/sk_SK.ISO8859-2/libc.cat
 OLD_FILES+=usr/share/nls/sv_SE.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/libc.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/zh_CN.GB18030/libc.cat
 OLD_FILES+=usr/share/nls/zh_CN.GB2312/libc.cat
 OLD_FILES+=usr/share/nls/zh_CN.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/zh_CN.UTF-8/libc.cat
 OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0
 .endif
 
 .if ${MK_NLS_CATALOGS} == no
 OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 .endif
 
 .if ${MK_NS_CACHING} == no
 OLD_FILES+=etc/nscd.conf
 OLD_FILES+=etc/rc.d/nscd
 OLD_FILES+=usr/sbin/nscd
 OLD_FILES+=usr/share/examples/etc/nscd.conf
 OLD_FILES+=usr/share/man/man5/nscd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/nscd.8.gz
 .endif
 
 .if ${MK_NTP} == no
 OLD_FILES+=etc/ntp.conf
 OLD_FILES+=etc/periodic/daily/480.status-ntpd
 OLD_FILES+=usr/bin/ntpq
 OLD_FILES+=usr/sbin/ntp-keygen
 OLD_FILES+=usr/sbin/ntpd
 OLD_FILES+=usr/sbin/ntpdate
 OLD_FILES+=usr/sbin/ntpdc
 OLD_FILES+=usr/sbin/ntptime
 OLD_FILES+=usr/sbin/sntp
 OLD_FILES+=usr/share/doc/ntp/accopt.html
 OLD_FILES+=usr/share/doc/ntp/assoc.html
 OLD_FILES+=usr/share/doc/ntp/audio.html
 OLD_FILES+=usr/share/doc/ntp/authopt.html
 OLD_FILES+=usr/share/doc/ntp/build.html
 OLD_FILES+=usr/share/doc/ntp/clockopt.html
 OLD_FILES+=usr/share/doc/ntp/config.html
 OLD_FILES+=usr/share/doc/ntp/confopt.html
 OLD_FILES+=usr/share/doc/ntp/copyright.html
 OLD_FILES+=usr/share/doc/ntp/debug.html
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/extern.html
 OLD_FILES+=usr/share/doc/ntp/hints.html
 OLD_FILES+=usr/share/doc/ntp/howto.html
 OLD_FILES+=usr/share/doc/ntp/index.html
 OLD_FILES+=usr/share/doc/ntp/kern.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/miscopt.html
 OLD_FILES+=usr/share/doc/ntp/monopt.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/ntpd.html
 OLD_FILES+=usr/share/doc/ntp/ntpdate.html
 OLD_FILES+=usr/share/doc/ntp/ntpdc.html
 OLD_FILES+=usr/share/doc/ntp/ntpq.html
 OLD_FILES+=usr/share/doc/ntp/ntptime.html
 OLD_FILES+=usr/share/doc/ntp/ntptrace.html
 OLD_FILES+=usr/share/doc/ntp/parsedata.html
 OLD_FILES+=usr/share/doc/ntp/parsenew.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/doc/ntp/pps.html
 OLD_FILES+=usr/share/doc/ntp/prefer.html
 OLD_FILES+=usr/share/doc/ntp/quick.html
 OLD_FILES+=usr/share/doc/ntp/rdebug.html
 OLD_FILES+=usr/share/doc/ntp/refclock.html
 OLD_FILES+=usr/share/doc/ntp/release.html
 OLD_FILES+=usr/share/doc/ntp/tickadj.html
 OLD_DIRS+=usr/share/doc/ntp
 OLD_FILES+=usr/share/examples/etc/ntp.conf
 OLD_FILES+=usr/share/man/man1/sntp.1.gz
 OLD_FILES+=usr/share/man/man5/ntp.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ntp.keys.5.gz
 OLD_FILES+=usr/share/man/man8/ntp-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/ntpd.8.gz
 OLD_FILES+=usr/share/man/man8/ntpdate.8.gz
 OLD_FILES+=usr/share/man/man8/ntpdc.8.gz
 OLD_FILES+=usr/share/man/man8/ntpq.8.gz
 OLD_FILES+=usr/share/man/man8/ntptime.8.gz
 .endif
 
 #.if ${MK_OBJC} == no
 # to be filled in
 #.endif
 
 .if ${MK_OPENSSH} == no
 OLD_FILES+=etc/rc.d/sshd
 OLD_FILES+=etc/ssh/moduli
 OLD_FILES+=etc/ssh/ssh_config
 OLD_FILES+=etc/ssh/sshd_config
 OLD_FILES+=usr/bin/scp
 OLD_FILES+=usr/bin/sftp
 OLD_FILES+=usr/bin/slogin
 OLD_FILES+=usr/bin/ssh
 OLD_FILES+=usr/bin/ssh-add
 OLD_FILES+=usr/bin/ssh-agent
 OLD_FILES+=usr/bin/ssh-copy-id
 OLD_FILES+=usr/bin/ssh-keygen
 OLD_FILES+=usr/bin/ssh-keyscan
 OLD_FILES+=usr/lib/pam_ssh.so
 OLD_LIBS+=usr/lib/pam_ssh.so.6
 OLD_FILES+=usr/lib/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
 OLD_LIBS+=usr/lib/private/libssh.so.5
 OLD_FILES+=usr/lib/private/libssh_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/pam_ssh.so
 OLD_LIBS+=usr/lib32/pam_ssh.so.6
 OLD_FILES+=usr/lib32/private/libssh.a
 OLD_FILES+=usr/lib32/private/libssh.so
 OLD_LIBS+=usr/lib32/private/libssh.so.5
 OLD_FILES+=usr/lib32/private/libssh_p.a
 .endif
 OLD_FILES+=usr/libexec/sftp-server
 OLD_FILES+=usr/libexec/ssh-keysign
 OLD_FILES+=usr/libexec/ssh-pkcs11-helper
 OLD_FILES+=usr/sbin/sshd
 OLD_FILES+=usr/share/man/man1/scp.1.gz
 OLD_FILES+=usr/share/man/man1/sftp.1.gz
 OLD_FILES+=usr/share/man/man1/slogin.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-add.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-agent.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-copy-id.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-keygen.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-keyscan.1.gz
 OLD_FILES+=usr/share/man/man1/ssh.1.gz
 OLD_FILES+=usr/share/man/man5/ssh_config.5.gz
 OLD_FILES+=usr/share/man/man5/sshd_config.5.gz
 OLD_FILES+=usr/share/man/man8/pam_ssh.8.gz
 OLD_FILES+=usr/share/man/man8/sftp-server.8.gz
 OLD_FILES+=usr/share/man/man8/ssh-keysign.8.gz
 OLD_FILES+=usr/share/man/man8/ssh-pkcs11-helper.8.gz
 OLD_FILES+=usr/share/man/man8/sshd.8.gz
 .endif
 
 .if ${MK_OPENSSL} == no
 OLD_FILES+=etc/rc.d/keyserv
 .endif
 
 .if ${MK_PC_SYSINSTALL} == no
 # backend-partmanager
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh
 # backend-query
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-emulation.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-laptop.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-nics.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-info.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/enable-net.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/get-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-components.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-config.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-mirrors.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-rsync-backups.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-tzones.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/query-langs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/send-logs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/setup-ssh-keys.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/set-mirror.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/sys-mem.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-live.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-netup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/update-part-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-layouts.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-models.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-variants.sh
 # backend
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-bsdlabel.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-cleanup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-disk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-extractimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-ftp.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installcomponents.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installpackages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-localize.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountdisk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountoptical.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-networking.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-newfs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-parse.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-runcommands.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-unmount.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-upgrade.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-users.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/installimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/parseconfig.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/startautoinstall.sh
 # conf
 OLD_FILES+=usr/share/pc-sysinstall/conf/avail-langs
 OLD_FILES+=usr/share/pc-sysinstall/conf/exclude-from-upgrade
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/bsd-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/intel-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/nvidia-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/pc-sysinstall.conf
 # doc
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-list
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-size
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-index
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-start-autoinstall
 # examples
 OLD_FILES+=usr/share/examples/pc-sysinstall/README
 OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs
 # pc-sysinstall
 OLD_FILES+=usr/sbin/pc-sysinstall
 OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz
 OLD_DIRS+=usr/share/pc-sysinstall/backend
 OLD_DIRS+=usr/share/pc-sysinstall/backend-partmanager
 OLD_DIRS+=usr/share/pc-sysinstall/backend-query
 OLD_DIRS+=usr/share/pc-sysinstall/conf/license
 OLD_DIRS+=usr/share/pc-sysinstall/conf
 OLD_DIRS+=usr/share/pc-sysinstall/doc
 OLD_DIRS+=usr/share/pc-sysinstall
 OLD_DIRS+=usr/share/examples/pc-sysinstall
 .endif
 
 .if ${MK_PF} == no
 OLD_FILES+=etc/periodic/security/520.pfdenied
 OLD_FILES+=etc/pf.os
 OLD_FILES+=etc/rc.d/ftp-proxy
 OLD_FILES+=sbin/pfctl
 OLD_FILES+=sbin/pflogd
 OLD_FILES+=usr/include/netpfil/pf/pf.h
 OLD_FILES+=usr/include/netpfil/pf/pf_altq.h
 OLD_FILES+=usr/include/netpfil/pf/pf_mtag.h
 OLD_FILES+=usr/lib/snmp_pf.so
 OLD_LIBS+=usr/lib/snmp_pf.so.6
 OLD_FILES+=usr/libexec/tftp-proxy
 OLD_FILES+=usr/sbin/ftp-proxy
 OLD_FILES+=usr/share/examples/etc/pf.os
 OLD_FILES+=usr/share/examples/pf/ackpri
 OLD_FILES+=usr/share/examples/pf/faq-example1
 OLD_FILES+=usr/share/examples/pf/faq-example2
 OLD_FILES+=usr/share/examples/pf/faq-example3
 OLD_FILES+=usr/share/examples/pf/pf.conf
 OLD_FILES+=usr/share/examples/pf/queue1
 OLD_FILES+=usr/share/examples/pf/queue2
 OLD_FILES+=usr/share/examples/pf/queue3
 OLD_FILES+=usr/share/examples/pf/queue4
 OLD_FILES+=usr/share/examples/pf/spamd
 OLD_DIRS+=usr/share/examples/pf
 OLD_FILES+=usr/share/man/man4/pf.4.gz
 OLD_FILES+=usr/share/man/man4/pflog.4.gz
 OLD_FILES+=usr/share/man/man4/pfsync.4.gz
 OLD_FILES+=usr/share/man/man5/pf.conf.5.gz
 OLD_FILES+=usr/share/man/man5/pf.os.5.gz
 OLD_FILES+=usr/share/man/man8/ftp-proxy.8.gz
 OLD_FILES+=usr/share/man/man8/pfctl.8.gz
 OLD_FILES+=usr/share/man/man8/pflogd.8.gz
 OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz
 OLD_FILES+=usr/share/snmp/defs/pf_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt
 .endif
 
 .if ${MK_PKGBOOTSTRAP} == no
 OLD_FILES+=usr/sbin/pkg
 OLD_FILES+=usr/share/man/man7/pkg.7.gz
 .endif
 
 .if ${MK_PMC} == no
 OLD_FILES+=usr/bin/pmcstudy
 OLD_FILES+=usr/include/pmc.h
 OLD_FILES+=usr/include/pmclog.h
 OLD_FILES+=usr/lib/libpmc.a
 OLD_FILES+=usr/lib/libpmc.so
 OLD_LIBS+=usr/lib/libpmc.so.5
 OLD_FILES+=usr/lib/libpmc_p.a
 OLD_FILES+=usr/lib32/libpmc.a
 OLD_FILES+=usr/lib32/libpmc.so
 OLD_LIBS+=usr/lib32/libpmc.so.5
 OLD_FILES+=usr/lib32/libpmc_p.a
 OLD_FILES+=usr/sbin/pmcannotate
 OLD_FILES+=usr/sbin/pmccontrol
 OLD_FILES+=usr/sbin/pmcstat
 OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz
 OLD_FILES+=usr/share/man/man3/pmc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.core.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.core2.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.corei7.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.corei7uc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.haswell.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.haswelluc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.iaf.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.sandybridge.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.sandybridgeuc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.sandybridgexeon.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.soft.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.tsc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.ucf.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.westmere.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.westmereuc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.xscale.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_allocate.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_attach.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_capabilities.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_configure_logfile.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_cpuinfo.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_detach.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_disable.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_enable.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_event_names_of_class.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_flush_logfile.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_get_driver_stats.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_get_msr.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_init.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_capability.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_class.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_cputype.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_disposition.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_event.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_mode.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_state.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_ncpu.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_npmc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_pmcinfo.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_read.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_release.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_rw.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_set.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_start.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_stop.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_width.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_write.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_writelog.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog_close.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog_feed.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog_open.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog_read.3.gz
 OLD_FILES+=usr/share/man/man8/pmcannotate.8.gz
 OLD_FILES+=usr/share/man/man8/pmccontrol.8.gz
 OLD_FILES+=usr/share/man/man8/pmcstat.8.gz
 .endif
 
 .if ${MK_PORTSNAP} == no
 OLD_FILES+=etc/portsnap.conf
 OLD_FILES+=usr/libexec/make_index
 OLD_FILES+=usr/libexec/phttpget
 OLD_FILES+=usr/sbin/portsnap
 OLD_FILES+=usr/share/examples/etc/portsnap.conf
 OLD_FILES+=usr/share/man/man8/phttpget.8.gz
 OLD_FILES+=usr/share/man/man8/portsnap.8.gz
 .endif
 
 .if ${MK_PPP} == no
 OLD_FILES+=etc/ppp/ppp.conf
 OLD_DIRS+=etc/ppp
 OLD_FILES+=usr/sbin/ppp
 OLD_FILES+=usr/sbin/pppctl
 OLD_FILES+=usr/share/man/man8/ppp.8.gz
 OLD_FILES+=usr/share/man/man8/pppctl.8.gz
 .endif
 
 .if ${MK_PROFILE} == no
 OLD_FILES+=usr/lib/libalias_cuseeme_p.a
 OLD_FILES+=usr/lib/libalias_dummy_p.a
 OLD_FILES+=usr/lib/libalias_ftp_p.a
 OLD_FILES+=usr/lib/libalias_irc_p.a
 OLD_FILES+=usr/lib/libalias_nbt_p.a
 OLD_FILES+=usr/lib/libalias_p.a
 OLD_FILES+=usr/lib/libalias_pptp_p.a
 OLD_FILES+=usr/lib/libalias_skinny_p.a
 OLD_FILES+=usr/lib/libalias_smedia_p.a
 OLD_FILES+=usr/lib/libarchive_p.a
 OLD_FILES+=usr/lib/libasn1_p.a
 OLD_FILES+=usr/lib/libbegemot_p.a
 OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libbsdxml_p.a
 OLD_FILES+=usr/lib/libbsm_p.a
 OLD_FILES+=usr/lib/libbsnmp_p.a
 OLD_FILES+=usr/lib/libbz2_p.a
 OLD_FILES+=usr/lib/libc_p.a
 OLD_FILES+=usr/lib/libcalendar_p.a
 OLD_FILES+=usr/lib/libcam_p.a
 OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/lib/libcompat_p.a
 OLD_FILES+=usr/lib/libcrypt_p.a
 OLD_FILES+=usr/lib/libcrypto_p.a
 OLD_FILES+=usr/lib/libcurses_p.a
 OLD_FILES+=usr/lib/libcursesw_p.a
 OLD_FILES+=usr/lib/libdevinfo_p.a
 OLD_FILES+=usr/lib/libdevstat_p.a
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libedit_p.a
 OLD_FILES+=usr/lib/libelf_p.a
 OLD_FILES+=usr/lib/libfetch_p.a
 OLD_FILES+=usr/lib/libfl_p.a
 OLD_FILES+=usr/lib/libform_p.a
 OLD_FILES+=usr/lib/libformw_p.a
 OLD_FILES+=usr/lib/libgcc_p.a
 OLD_FILES+=usr/lib/libgeom_p.a
 OLD_FILES+=usr/lib/libgnuregex_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/libhdb_p.a
 OLD_FILES+=usr/lib/libheimbase_p.a
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libipsec_p.a
 OLD_FILES+=usr/lib/libjail_p.a
 OLD_FILES+=usr/lib/libkadm5clnt_p.a
 OLD_FILES+=usr/lib/libkadm5srv_p.a
 OLD_FILES+=usr/lib/libkafs5_p.a
 OLD_FILES+=usr/lib/libkdc_p.a
 OLD_FILES+=usr/lib/libkiconv_p.a
 OLD_FILES+=usr/lib/libkrb5_p.a
 OLD_FILES+=usr/lib/libkvm_p.a
 OLD_FILES+=usr/lib/libl_p.a
 OLD_FILES+=usr/lib/libln_p.a
 OLD_FILES+=usr/lib/libm_p.a
 OLD_FILES+=usr/lib/libmagic_p.a
 OLD_FILES+=usr/lib/libmd_p.a
 OLD_FILES+=usr/lib/libmemstat_p.a
 OLD_FILES+=usr/lib/libmenu_p.a
 OLD_FILES+=usr/lib/libmenuw_p.a
 OLD_FILES+=usr/lib/libmilter_p.a
 OLD_FILES+=usr/lib/libmp_p.a
 OLD_FILES+=usr/lib/libncurses_p.a
 OLD_FILES+=usr/lib/libncursesw_p.a
 OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/lib/libngatm_p.a
 OLD_FILES+=usr/lib/libopie_p.a
 OLD_FILES+=usr/lib/libpanel_p.a
 OLD_FILES+=usr/lib/libpanelw_p.a
 OLD_FILES+=usr/lib/libpcap_p.a
 OLD_FILES+=usr/lib/libpmc_p.a
 OLD_FILES+=usr/lib/libpthread_p.a
 OLD_FILES+=usr/lib/libradius_p.a
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/librpcsvc_p.a
 OLD_FILES+=usr/lib/librt_p.a
 OLD_FILES+=usr/lib/libsbuf_p.a
 OLD_FILES+=usr/lib/libsdp_p.a
 OLD_FILES+=usr/lib/libsmb_p.a
 OLD_FILES+=usr/lib/libssl_p.a
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++_p.a
 OLD_FILES+=usr/lib/libtacplus_p.a
 OLD_FILES+=usr/lib/libtermcap_p.a
 OLD_FILES+=usr/lib/libtermcapw_p.a
 OLD_FILES+=usr/lib/libtermlib_p.a
 OLD_FILES+=usr/lib/libtermlibw_p.a
 OLD_FILES+=usr/lib/libthr_p.a
 OLD_FILES+=usr/lib/libthread_db_p.a
 OLD_FILES+=usr/lib/libtinfo_p.a
 OLD_FILES+=usr/lib/libtinfow_p.a
 OLD_FILES+=usr/lib/libufs_p.a
 OLD_FILES+=usr/lib/libugidfw_p.a
 OLD_FILES+=usr/lib/libusbhid_p.a
 OLD_FILES+=usr/lib/libutil_p.a
 OLD_FILES+=usr/lib/libvgl_p.a
 OLD_FILES+=usr/lib/libwind_p.a
 OLD_FILES+=usr/lib/libwrap_p.a
 OLD_FILES+=usr/lib/liby_p.a
 OLD_FILES+=usr/lib/libypclnt_p.a
 OLD_FILES+=usr/lib/libz_p.a
 OLD_FILES+=usr/lib/private/libldns_p.a
 OLD_FILES+=usr/lib/private/libssh_p.a
 .endif
 
 .if ${MK_QUOTAS} == no
 OLD_FILES+=sbin/quotacheck
 OLD_FILES+=usr/bin/quota
 OLD_FILES+=usr/sbin/edquota
 OLD_FILES+=usr/sbin/quotaoff
 OLD_FILES+=usr/sbin/quotaon
 OLD_FILES+=usr/sbin/repquota
 OLD_FILES+=usr/share/man/man1/quota.1.gz
 OLD_FILES+=usr/share/man/man8/edquota.8.gz
 OLD_FILES+=usr/share/man/man8/quotacheck.8.gz
 OLD_FILES+=usr/share/man/man8/quotaoff.8.gz
 OLD_FILES+=usr/share/man/man8/quotaon.8.gz
 OLD_FILES+=usr/share/man/man8/repquota.8.gz
 .endif
 
 .if ${MK_RBOOTD} == no
 OLD_FILES+=usr/libexec/rbootd
 OLD_FILES+=usr/share/man/man8/rbootd.8.gz
 .endif
 
 .if ${MK_RCMDS} == no
 OLD_FILES+=bin/rcp
 OLD_FILES+=etc/rc.d/rwho
 OLD_FILES+=etc/periodic/daily/140.clean-rwho
 OLD_FILES+=rescue/rcp
 OLD_FILES+=usr/bin/rlogin
 OLD_FILES+=usr/bin/rsh
 OLD_FILES+=usr/bin/ruptime
 OLD_FILES+=usr/bin/rwho
 OLD_FILES+=usr/libexec/rlogind
 OLD_FILES+=usr/libexec/rshd
 OLD_FILES+=usr/sbin/rwhod
 OLD_FILES+=usr/share/man/man1/rcp.1.gz
 OLD_FILES+=usr/share/man/man1/rlogin.1.gz
 OLD_FILES+=usr/share/man/man1/rsh.1.gz
 OLD_FILES+=usr/share/man/man1/ruptime.1.gz
 OLD_FILES+=usr/share/man/man1/rwho.1.gz
 OLD_FILES+=usr/share/man/man8/rlogind.8.gz
 OLD_FILES+=usr/share/man/man8/rshd.8.gz
 OLD_FILES+=usr/share/man/man8/rwhod.8.gz
 .endif
 
 #.if ${MK_RESCUE} == no
 # to be filled in or replaced with a special target
 #.endif
 
 .if ${MK_ROUTED} == no
 OLD_FILES+=sbin/routed
 OLD_FILES+=sbin/rtquery
 OLD_FILES+=usr/share/man/man8/routed.8.gz
 OLD_FILES+=usr/share/man/man8/rtquery.8.gz
 .endif
 
 .if ${MK_SENDMAIL} == no
 OLD_FILES+=etc/periodic/daily/150.clean-hoststat
 OLD_FILES+=etc/periodic/daily/440.status-mailq
 OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
 OLD_FILES+=etc/periodic/daily/500.queuerun
 OLD_FILES+=bin/rmail
 OLD_FILES+=usr/bin/vacation
 OLD_FILES+=usr/include/libmilter/mfapi.h
 OLD_FILES+=usr/include/libmilter/mfdef.h
 OLD_DIRS+=usr/include/libmilter
 OLD_FILES+=usr/lib/libmilter.a
 OLD_FILES+=usr/lib/libmilter.so
 OLD_LIBS+=usr/lib/libmilter.so.5
 OLD_FILES+=usr/lib/libmilter_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libmilter.a
 OLD_FILES+=usr/lib32/libmilter.so
 OLD_LIBS+=usr/lib32/libmilter.so.5
 OLD_FILES+=usr/lib32/libmilter_p.a
 .endif
 OLD_FILES+=usr/libexec/mail.local
 OLD_FILES+=usr/libexec/sendmail/sendmail
 OLD_FILES+=usr/libexec/smrsh
 OLD_FILES+=usr/sbin/editmap
 OLD_FILES+=usr/sbin/mailstats
 OLD_FILES+=usr/sbin/makemap
 OLD_FILES+=usr/sbin/praliases
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/man/man1/mailq.1.gz
 OLD_FILES+=usr/share/man/man1/newaliases.1.gz
 OLD_FILES+=usr/share/man/man1/vacation.1.gz
 OLD_FILES+=usr/share/man/man5/aliases.5.gz
 OLD_FILES+=usr/share/man/man8/editmap.8.gz
 OLD_FILES+=usr/share/man/man8/hoststat.8.gz
 OLD_FILES+=usr/share/man/man8/mail.local.8.gz
 OLD_FILES+=usr/share/man/man8/mailstats.8.gz
 OLD_FILES+=usr/share/man/man8/makemap.8.gz
 OLD_FILES+=usr/share/man/man8/praliases.8.gz
 OLD_FILES+=usr/share/man/man8/purgestat.8.gz
 OLD_FILES+=usr/share/man/man8/rmail.8.gz
 OLD_FILES+=usr/share/man/man8/sendmail.8.gz
 OLD_FILES+=usr/share/man/man8/smrsh.8.gz
 OLD_FILES+=usr/share/sendmail/cf/README
 OLD_FILES+=usr/share/sendmail/cf/cf/Makefile
 OLD_FILES+=usr/share/sendmail/cf/cf/README
 OLD_FILES+=usr/share/sendmail/cf/cf/chez.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/clientproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux10.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux9.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-solaris2.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-sunos4.1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cyrusproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-bsd4.4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux10.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux9.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-linux.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-mpeix.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-nextstep3.3.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-solaris.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-sunos4.1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/huginn.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/knecht.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mail.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mail.eecs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mailspool.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/python.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/s2k-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/s2k-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/submit.cf
 OLD_FILES+=usr/share/sendmail/cf/cf/submit.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/tcpproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/ucbarpa.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/ucbvax.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/uucpproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/vangogh.cs.mc
 OLD_DIRS+=usr/share/sendmail/cf/cf
 OLD_FILES+=usr/share/sendmail/cf/domain/Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/CS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/EECS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/S2K.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/berkeley-only.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/generic.m4
 OLD_DIRS+=usr/share/sendmail/cf/domain
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unqualified_senders.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unresolvable_domains.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/access_db.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/allmasquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/always_add_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/authinfo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/badmx.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bcc.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/conncontrol.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/delay_checks.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/dnsbl.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/domaintable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/enhdnsbl.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/generics_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/genericstable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/greet_pause.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/ldap_routing.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/limited_masquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_lmtp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_no_masquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_procmail.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/lookupdotdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/loose_relay_check.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/mailertable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_envelope.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/msp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/mtamark.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/no_default_msa.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nocanonify.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nopercenthack.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/notsticky.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nouucp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nullclient.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/prefixmod.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/preserve_local_plus_detail.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/preserve_luser_host.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/promiscuous_relay.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/queuegroup.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/ratecontrol.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/redirect.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_based_on_MX.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_hosts_only.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_local_from.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_mail_from.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/require_rdns.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/smrsh.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/stickyhost.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/tls_session_features.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_client_ptr.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_ct_file.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_cw_file.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/uucpdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtuser_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtusertable.m4
 OLD_DIRS+=usr/share/sendmail/cf/feature
 OLD_FILES+=usr/share/sendmail/cf/hack/cssubdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/hack/xconnect.m4
 OLD_DIRS+=usr/share/sendmail/cf/hack
 OLD_FILES+=usr/share/sendmail/cf/m4/cf.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/cfhead.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/proto.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/version.m4
 OLD_DIRS+=usr/share/sendmail/cf/m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrus.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrusv2.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/fax.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/local.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/mail11.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/phquery.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/pop.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/procmail.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/qpage.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/smtp.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/usenet.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/uucp.m4
 OLD_DIRS+=usr/share/sendmail/cf/mailer
 OLD_FILES+=usr/share/sendmail/cf/ostype/a-ux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix3.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/altos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/amdahl-uts.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.3.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi1.0.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi2.0.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/darwin.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dgux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/domainos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dragonfly.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dynix3.2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd6.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/gnu.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux10.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux11.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux9.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix6.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/isc4.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/linux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/maxion.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/mklinux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/mpeix.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/nextstep.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/openbsd.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/osf1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/powerux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/ptx2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/qnx.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/riscos4.5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco-uw-2.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco3.2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sinix.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris11.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.ml.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.pre5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris8.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sunos3.5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sunos4.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/svr4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/ultrix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmk.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmp.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unixware7.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unknown.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/uxpds.m4
 OLD_DIRS+=usr/share/sendmail/cf/ostype
 OLD_FILES+=usr/share/sendmail/cf/sendmail.schema
 OLD_FILES+=usr/share/sendmail/cf/sh/makeinfo.sh
 OLD_DIRS+=usr/share/sendmail/cf/sh
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.cogsci.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.old.arpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbarpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbvax.m4
 OLD_DIRS+=usr/share/sendmail/cf/siteconfig
 OLD_DIRS+=usr/share/sendmail/cf
 OLD_DIRS+=usr/share/sendmail
 .endif
 
 .if ${MK_SHAREDOCS} == no
 OLD_FILES+=usr/share/doc/pjdfstest/README
 OLD_DIRS+=usr/share/doc/pjdfstest
 .endif
 
 .if ${MK_SSP} == no
 OLD_LIBS+=lib/libssp.so.0
 OLD_FILES+=usr/include/ssp/ssp.h
 OLD_FILES+=usr/include/ssp/stdio.h
 OLD_FILES+=usr/include/ssp/string.h
 OLD_FILES+=usr/include/ssp/unistd.h
 OLD_FILES+=usr/lib/libssp.a
 OLD_FILES+=usr/lib/libssp.so
 OLD_FILES+=usr/lib/libssp_nonshared.a
 OLD_FILES+=usr/lib32/libssp.a
 OLD_FILES+=usr/lib32/libssp.so
 OLD_LIBS+=usr/lib32/libssp.so.0
 OLD_FILES+=usr/lib32/libssp_nonshared.a
 OLD_FILES+=usr/tests/lib/libc/ssp/Kyuafile
 OLD_FILES+=usr/tests/lib/libc/ssp/h_fgets
 OLD_FILES+=usr/tests/lib/libc/ssp/h_getcwd
 OLD_FILES+=usr/tests/lib/libc/ssp/h_gets
 OLD_FILES+=usr/tests/lib/libc/ssp/h_memcpy
 OLD_FILES+=usr/tests/lib/libc/ssp/h_memmove
 OLD_FILES+=usr/tests/lib/libc/ssp/h_memset
 OLD_FILES+=usr/tests/lib/libc/ssp/h_read
 OLD_FILES+=usr/tests/lib/libc/ssp/h_readlink
 OLD_FILES+=usr/tests/lib/libc/ssp/h_snprintf
 OLD_FILES+=usr/tests/lib/libc/ssp/h_sprintf
 OLD_FILES+=usr/tests/lib/libc/ssp/h_stpcpy
 OLD_FILES+=usr/tests/lib/libc/ssp/h_stpncpy
 OLD_FILES+=usr/tests/lib/libc/ssp/h_strcat
 OLD_FILES+=usr/tests/lib/libc/ssp/h_strcpy
 OLD_FILES+=usr/tests/lib/libc/ssp/h_strncat
 OLD_FILES+=usr/tests/lib/libc/ssp/h_strncpy
 OLD_FILES+=usr/tests/lib/libc/ssp/h_vsnprintf
 OLD_FILES+=usr/tests/lib/libc/ssp/h_vsprintf
 OLD_FILES+=usr/tests/lib/libc/ssp/ssp_test
 .endif
 
 .if ${MK_SYSCONS} == no
 OLD_FILES+=usr/share/syscons/fonts/INDEX.fonts
 OLD_FILES+=usr/share/syscons/fonts/armscii8-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/armscii8-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/armscii8-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp1251-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp1251-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp1251-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866b-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866c-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866u-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866u-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866u-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/haik8-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/haik8-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/haik8-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso02-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso02-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso02-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-wide-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso05-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso05-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso05-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso07-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso07-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso07-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso08-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso08-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso08-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso09-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-rb-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-rc-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-1131-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-1251-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-8x8.fnt
 OLD_FILES+=usr/share/syscons/keymaps/INDEX.keymaps
 OLD_FILES+=usr/share/syscons/keymaps/be.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/be.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
 OLD_FILES+=usr/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
 OLD_FILES+=usr/share/syscons/keymaps/br275.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/br275.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/br275.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/by.cp1131.kbd
 OLD_FILES+=usr/share/syscons/keymaps/by.cp1251.kbd
 OLD_FILES+=usr/share/syscons/keymaps/by.iso5.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ce.iso2.kbd
 OLD_FILES+=usr/share/syscons/keymaps/colemak.iso15.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/cs.latin2.qwertz.kbd
 OLD_FILES+=usr/share/syscons/keymaps/cz.iso2.kbd
 OLD_FILES+=usr/share/syscons/keymaps/danish.cp865.kbd
 OLD_FILES+=usr/share/syscons/keymaps/danish.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/danish.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/danish.iso.macbook.kbd
 OLD_FILES+=usr/share/syscons/keymaps/dutch.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/eee_nordic.kbd
 OLD_FILES+=usr/share/syscons/keymaps/el.iso07.kbd
 OLD_FILES+=usr/share/syscons/keymaps/estonian.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/estonian.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/estonian.iso15.kbd
 OLD_FILES+=usr/share/syscons/keymaps/finnish.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/finnish.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.macbook.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr_CA.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/german.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/german.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/german.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/gr.elot.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/gr.us101.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/hr.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.101keys.kbd
 OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.102keys.kbd
 OLD_FILES+=usr/share/syscons/keymaps/hy.armscii-8.kbd
 OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/it.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/iw.iso8.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.106.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.106x.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
 OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.io.kbd
 OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.kst.kbd
 OLD_FILES+=usr/share/syscons/keymaps/latinamerican.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/latinamerican.kbd
 OLD_FILES+=usr/share/syscons/keymaps/lt.iso4.kbd
 OLD_FILES+=usr/share/syscons/keymaps/norwegian.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/norwegian.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
 OLD_FILES+=usr/share/syscons/keymaps/pl_PL.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/pt.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/pt.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.cp866.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.iso5.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.shift.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.win.kbd
 OLD_FILES+=usr/share/syscons/keymaps/si.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/sk.iso2.kbd
 OLD_FILES+=usr/share/syscons/keymaps/spanish.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/spanish.iso15.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swedish.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swedish.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissfrench.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissgerman.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissgerman.macbook.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/tr.iso9.q.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ua.iso5.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.cp850-ctrl.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.iso-ctrl.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorakl.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorakp.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorakr.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorakx.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.emacs.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.pc-ctrl.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.unix.kbd
 OLD_FILES+=usr/share/syscons/scrnmaps/armscii8-2haik8.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-1_to_cp437.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-4_for_vga9.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-7_to_cp437.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/koi8-r2cp866.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/koi8-u2cp866u.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/us-ascii_to_cp437.scm
 .endif
 
 .if ${MK_TALK} == no
 OLD_FILES+=usr/bin/talk
 OLD_FILES+=usr/libexec/ntalkd
 OLD_FILES+=usr/share/man/man1/talk.1.gz
 OLD_FILES+=usr/share/man/man8/talkd.8.gz
 .endif
 
 .if ${MK_TCSH} == no
 OLD_FILES+=.cshrc
 OLD_FILES+=etc/csh.cshrc
 OLD_FILES+=etc/csh.login
 OLD_FILES+=etc/csh.logout
 OLD_FILES+=bin/csh
 OLD_FILES+=bin/tcsh
 OLD_FILES+=rescue/csh
 OLD_FILES+=rescue/tcsh
 OLD_FILES+=root/.cshrc
 OLD_FILES+=root/.login
 OLD_FILES+=usr/share/examples/etc/csh.cshrc
 OLD_FILES+=usr/share/examples/etc/csh.login
 OLD_FILES+=usr/share/examples/etc/csh.logout
 OLD_FILES+=usr/share/examples/tcsh/complete.tcsh
 OLD_FILES+=usr/share/examples/tcsh/csh-mode.el
 OLD_DIRS+=usr/share/examples/tcsh
 OLD_FILES+=usr/share/man/man1/csh.1.gz
 OLD_FILES+=usr/share/man/man1/tcsh.1.gz
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 .endif
 
 .if ${MK_TELNET} == no
 OLD_FILES+=usr/bin/telnet
 OLD_FILES+=usr/libexec/telnetd
 OLD_FILES+=usr/share/man/man1/telnet.1.gz
 OLD_FILES+=usr/share/man/man8/telnetd.8.gz
 .endif
 
 .if ${MK_TESTS} == yes
 OLD_FILES+=usr/bin/atf-sh
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c/config.h
 OLD_LIBS+=usr/lib/libatf-c++.a
 OLD_LIBS+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_LIBS+=usr/lib/libatf-c++.so.2
 OLD_LIBS+=usr/lib/libatf-c++_p.a
 OLD_LIBS+=usr/lib/libatf-c.a
 OLD_LIBS+=usr/lib/libatf-c.so
 OLD_LIBS+=usr/lib/libatf-c.so.1
 OLD_LIBS+=usr/lib/libatf-c_p.a
 OLD_LIBS+=usr/lib/private/libatf-c.so.0
 OLD_LIBS+=usr/lib/private/libatf-c++.so.1
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_LIBS+=usr/lib32/libatf-c++.a
 OLD_LIBS+=usr/lib32/libatf-c++.so
 OLD_LIBS+=usr/lib32/libatf-c++.so.1
 OLD_LIBS+=usr/lib32/libatf-c++.so.2
 OLD_LIBS+=usr/lib32/libatf-c++_p.a
 OLD_LIBS+=usr/lib32/libatf-c.a
 OLD_LIBS+=usr/lib32/libatf-c.so
 OLD_LIBS+=usr/lib32/libatf-c.so.1
 OLD_LIBS+=usr/lib32/libatf-c_p.a
 OLD_LIBS+=usr/lib32/private/libatf-c.so.0
 OLD_LIBS+=usr/lib32/private/libatf-c++.so.1
 .endif
 OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-sh.pc
 OLD_FILES+=usr/share/aclocal/atf-c++.m4
 OLD_FILES+=usr/share/aclocal/atf-c.m4
 OLD_FILES+=usr/share/aclocal/atf-common.m4
 OLD_FILES+=usr/share/aclocal/atf-sh.m4
 OLD_DIRS+=usr/share/aclocal
 OLD_DIRS+=usr/tests/bin/chown
 OLD_FILES+=usr/tests/bin/chown/Kyuafile
 OLD_FILES+=usr/tests/bin/chown/chown-f_test
 OLD_FILES+=usr/tests/bin/chown/units_basics
 OLD_FILES+=usr/tests/bin/date/legacy_test
 OLD_FILES+=usr/tests/bin/sh/legacy_test
 OLD_FILES+=usr/tests/usr.bin/atf/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/atf_check_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/config_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/integration_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/misc_helpers
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/normalize_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tc_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tp_test
 OLD_DIRS+=usr/tests/usr.bin/atf/atf-sh
 OLD_DIRS+=usr/tests/usr.bin/atf
 OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/application_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/expand_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/parser_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/ui_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/exceptions_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/expand_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/parser_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/ui_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/dynstr_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/list_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/map_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_helpers
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
 .if ${MK_MAKE} == yes
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/shell
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/shell
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/common.sh
 OLD_FILES+=usr/tests/usr.bin/make/test-new.mk
 OLD_DIRS+=usr/tests/usr.bin/make/variables/t0
 OLD_DIRS+=usr/tests/usr.bin/make/variables/opt_V
 OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_t
 OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_M
 OLD_DIRS+=usr/tests/usr.bin/make/variables
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/semi
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/funny-targets
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/enl
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/directive-t0
 OLD_DIRS+=usr/tests/usr.bin/make/syntax
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild2
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild1
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/basic
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes
 OLD_DIRS+=usr/tests/usr.bin/make/shell/select
 OLD_DIRS+=usr/tests/usr.bin/make/shell/replace
 OLD_DIRS+=usr/tests/usr.bin/make/shell/path_select
 OLD_DIRS+=usr/tests/usr.bin/make/shell/path
 OLD_DIRS+=usr/tests/usr.bin/make/shell/meta
 OLD_DIRS+=usr/tests/usr.bin/make/shell/builtin
 OLD_DIRS+=usr/tests/usr.bin/make/shell
 OLD_DIRS+=usr/tests/usr.bin/make/execution/plus
 OLD_DIRS+=usr/tests/usr.bin/make/execution/joberr
 OLD_DIRS+=usr/tests/usr.bin/make/execution/empty
 OLD_DIRS+=usr/tests/usr.bin/make/execution/ellipsis
 OLD_DIRS+=usr/tests/usr.bin/make/execution
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t3
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t2
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t1
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t0
 OLD_DIRS+=usr/tests/usr.bin/make/basic
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_oldbsd
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd
 OLD_DIRS+=usr/tests/usr.bin/make/archives
 OLD_DIRS+=usr/tests/usr.bin/make
 OLD_FILES+=usr/tests/usr.bin/yacc/legacy_test
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.00.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.01.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.02.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.03.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.04.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.05.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.06.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.07.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.08.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.09.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.10.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.11.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.12.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.13.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.14.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.sh
 OLD_FILES+=usr/tests/usr.bin/yacc/undefined.y
 .endif
 .else
 # ATF libraries.
 OLD_FILES+=etc/mtree/BSD.tests.dist
 OLD_FILES+=usr/bin/atf-sh
 OLD_DIRS+=usr/include/atf-c
 OLD_FILES+=usr/include/atf-c/build.h
 OLD_FILES+=usr/include/atf-c/check.h
 OLD_FILES+=usr/include/atf-c/config.h
 OLD_FILES+=usr/include/atf-c/defs.h
 OLD_FILES+=usr/include/atf-c/error.h
 OLD_FILES+=usr/include/atf-c/error_fwd.h
 OLD_FILES+=usr/include/atf-c/macros.h
 OLD_FILES+=usr/include/atf-c/tc.h
 OLD_FILES+=usr/include/atf-c/tp.h
 OLD_FILES+=usr/include/atf-c/utils.h
 OLD_FILES+=usr/include/atf-c.h
 OLD_DIRS+=usr/include/atf-c++
 OLD_FILES+=usr/include/atf-c++/build.hpp
 OLD_FILES+=usr/include/atf-c++/check.hpp
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c++/macros.hpp
 OLD_FILES+=usr/include/atf-c++/tests.hpp
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c++.hpp
 OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_FILES+=usr/lib/libatf-c.so.1
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_FILES+=usr/lib/libatf-c++.a
 OLD_FILES+=usr/lib/libatf-c++_p.a
 OLD_FILES+=usr/lib/libatf-c++.so.1
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/libexec/atf-check
 OLD_FILES+=usr/libexec/atf-sh
 OLD_DIRS+=usr/share/atf
 OLD_FILES+=usr/share/atf/libatf-sh.subr
 OLD_DIRS+=usr/share/doc/atf
 OLD_FILES+=usr/share/doc/atf/AUTHORS
 OLD_FILES+=usr/share/doc/atf/COPYING
 OLD_FILES+=usr/share/doc/atf/NEWS
 OLD_FILES+=usr/share/doc/atf/README
 OLD_FILES+=usr/share/doc/pjdfstest/README
 OLD_FILES+=usr/share/man/man1/atf-check.1.gz
 OLD_FILES+=usr/share/man/man1/atf-sh.1.gz
 OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-sh.3.gz
 OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz
 OLD_FILES+=usr/share/man/man7/atf.7.gz
 OLD_FILES+=usr/share/mk/atf.test.mk
 OLD_FILES+=usr/share/mk/plain.test.mk
 OLD_FILES+=usr/share/mk/suite.test.mk
 OLD_FILES+=usr/share/mk/tap.test.mk
 
 # Test suite.
 . if exists(${DESTDIR}${TESTSBASE})
 TESTS_DIRS!=find ${DESTDIR}${TESTSBASE} -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${TESTS_DIRS}
 TESTS_FILES!=find ${DESTDIR}${TESTSBASE} \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${TESTS_FILES}
 . endif
 .endif	# Test suite.
 
 .if ${MK_TESTS_SUPPORT} == no
 OLD_FILES+=usr/include/atf-c++.hpp
 OLD_FILES+=usr/include/atf-c++/build.hpp
 OLD_FILES+=usr/include/atf-c++/check.hpp
 OLD_FILES+=usr/include/atf-c++/macros.hpp
 OLD_FILES+=usr/include/atf-c++/tests.hpp
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c.h
 OLD_FILES+=usr/include/atf-c/build.h
 OLD_FILES+=usr/include/atf-c/check.h
 OLD_FILES+=usr/include/atf-c/defs.h
 OLD_FILES+=usr/include/atf-c/error.h
 OLD_FILES+=usr/include/atf-c/error_fwd.h
 OLD_FILES+=usr/include/atf-c/macros.h
 OLD_FILES+=usr/include/atf-c/tc.h
 OLD_FILES+=usr/include/atf-c/tp.h
 OLD_FILES+=usr/include/atf-c/utils.h
 OLD_LIBS+=usr/lib/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib/private/libatf-c.so.1
 OLD_FILES+=usr/share/man/man3/atf-c++.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api++.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c.3.gz
 OLD_FILES+=usr/tests/lib/atf/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/atf_c++_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/build_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/check_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/application_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/exceptions_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/version_helper
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/macros_hpp_test.cpp
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/macros_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/tests_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/unused_test.cpp
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/utils_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c/atf_c_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/build_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/check_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/dynstr_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/list_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/map_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/process_helpers
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/user_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/version_helper
 OLD_FILES+=usr/tests/lib/atf/libatf-c/error_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/macros_h_test.c
 OLD_FILES+=usr/tests/lib/atf/libatf-c/macros_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/tc_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/tp_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/unused_test.c
 OLD_FILES+=usr/tests/lib/atf/libatf-c/utils_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/test-programs/c_helpers
 OLD_FILES+=usr/tests/lib/atf/test-programs/config_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/cpp_helpers
 OLD_FILES+=usr/tests/lib/atf/test-programs/expect_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/meta_data_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/result_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/sh_helpers
 OLD_FILES+=usr/tests/lib/atf/test-programs/srcdir_test
 .endif
 
 .if ${MK_TEXTPROC} == no
 OLD_FILES+=usr/bin/checknr
 OLD_FILES+=usr/bin/colcrt
 OLD_FILES+=usr/bin/ul
 OLD_FILES+=usr/share/man/man1/checknr.1.gz
 OLD_FILES+=usr/share/man/man1/colcrt.1.gz
 OLD_FILES+=usr/share/man/man1/ul.1.gz
 .endif
 
 .if ${MK_TIMED} == no
 OLD_FILES+=usr/sbin/timed
 OLD_FILES+=usr/sbin/timedc
 OLD_FILES+=usr/share/man/man8/timed.8.gz
 OLD_FILES+=usr/share/man/man8/timedc.8.gz
 .endif
 
 .if ${MK_TOOLCHAIN} == no
 OLD_FILES+=usr/bin/addr2line
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/byacc
 OLD_FILES+=usr/bin/cc
 OLD_FILES+=usr/bin/c88
 OLD_FILES+=usr/bin/c++
 OLD_FILES+=usr/bin/c++filt
 OLD_FILES+=usr/bin/ld
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/bin/nm
 OLD_FILES+=usr/bin/objcopy
 OLD_FILES+=usr/bin/readelf
 OLD_FILES+=usr/bin/size
 OLD_FILES+=usr/bin/strings
 OLD_FILES+=usr/bin/strip
 OLD_FILES+=usr/bin/yacc
 OLD_FILES+=usr/share/man/man1/addr2line.1.gz
 OLD_FILES+=usr/share/man/man1/c++filt.1.gz
 OLD_FILES+=usr/share/man/man1/nm.1.gz
 OLD_FILES+=usr/share/man/man1/readelf.1.gz
 OLD_FILES+=usr/share/man/man1/size.1.gz
 OLD_FILES+=usr/share/man/man1/strings.1.gz
 OLD_FILES+=usr/share/man/man1/strip.1.gz
 OLD_FILES+=usr/share/man/man1/objcopy.1.gz
 # lib/libelf
 OLD_FILES+=usr/share/man/man3/elf.3.gz
 OLD_FILES+=usr/share/man/man3/elf_begin.3.gz
 OLD_FILES+=usr/share/man/man3/elf_cntl.3.gz
 OLD_FILES+=usr/share/man/man3/elf_end.3.gz
 OLD_FILES+=usr/share/man/man3/elf_errmsg.3.gz
 OLD_FILES+=usr/share/man/man3/elf_fill.3.gz
 OLD_FILES+=usr/share/man/man3/elf_flagdata.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getarhdr.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getarsym.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getbase.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getdata.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getident.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getscn.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getphdrnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getphnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshdrnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshdrstrndx.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshstrndx.3.gz
 OLD_FILES+=usr/share/man/man3/elf_hash.3.gz
 OLD_FILES+=usr/share/man/man3/elf_kind.3.gz
 OLD_FILES+=usr/share/man/man3/elf_memory.3.gz
 OLD_FILES+=usr/share/man/man3/elf_next.3.gz
 OLD_FILES+=usr/share/man/man3/elf_open.3.gz
 OLD_FILES+=usr/share/man/man3/elf_rawfile.3.gz
 OLD_FILES+=usr/share/man/man3/elf_rand.3.gz
 OLD_FILES+=usr/share/man/man3/elf_strptr.3.gz
 OLD_FILES+=usr/share/man/man3/elf_update.3.gz
 OLD_FILES+=usr/share/man/man3/elf_version.3.gz
 OLD_FILES+=usr/share/man/man3/gelf.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_fsize.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getcap.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getclass.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getdyn.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getehdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getmove.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getphdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getrel.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getrela.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getshdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getsym.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getsyminfo.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getsymshndx.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_newehdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_newphdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_update_ehdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_xlatetof.3.gz
 # lib/libelftc
 OLD_FILES+=usr/share/man/man3/elftc.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_bfd_find_target.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_copyfile.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_demangle.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_reloc_type_str.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_set_timestamps.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_timestamp.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_string_table_create.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_version.3.gz
 OLD_FILES+=usr/tests/usr.bin/yacc/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/code_calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/code_debug.y
 OLD_FILES+=usr/tests/usr.bin/yacc/code_error.y
 OLD_FILES+=usr/tests/usr.bin/yacc/empty.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit5.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax10.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax11.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax12.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax13.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax14.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax15.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax16.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax17.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax18.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax19.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax20.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax21.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax22.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax23.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax24.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax25.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax26.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax27.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax5.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax6.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7a.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7b.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax8.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax8a.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax9.y
 OLD_FILES+=usr/tests/usr.bin/yacc/error.y
 OLD_FILES+=usr/tests/usr.bin/yacc/grammar.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit0.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/ok_syntax1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/pure_calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/pure_error.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/run_test
 OLD_FILES+=usr/tests/usr.bin/yacc/varsyntax_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_b.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_b.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_l.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_l.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.code.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.code.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.dot
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/help.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/help.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_code_c.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_code_c.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_defines.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_defines.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_graph.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_graph.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_include.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_include.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_opts.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_opts.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_verbose.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_verbose.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/nostdin.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/nostdin.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.i
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc_tests
 OLD_DIRS+=usr/tests/usr.bin/yacc
 .endif
 
 .if ${MK_UNBOUND} == no
 OLD_FILES+=etc/rc.d/local_unbound
 OLD_FILES+=etc/unbound
 OLD_FILES+=usr/lib/private/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_LIBS+=usr/lib/private/libunbound.so.5
 OLD_FILES+=usr/lib/private/libunbound_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libunbound.a
 OLD_FILES+=usr/lib32/private/libunbound.so
 OLD_LIBS+=usr/lib32/private/libunbound.so.5
 OLD_FILES+=usr/lib32/private/libunbound_p.a
 .endif
 OLD_FILES+=usr/sbin/local-unbound-setup
 OLD_FILES+=usr/sbin/unbound
 OLD_FILES+=usr/sbin/unbound-anchor
 OLD_FILES+=usr/sbin/unbound-checkconf
 OLD_FILES+=usr/sbin/unbound-control
 OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz
 OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
 OLD_FILES+=usr/share/man/man8/unbound.8.gz
 .endif
 
 .if ${MK_USB} == no
 OLD_FILES+=etc/devd/uath.conf
 OLD_FILES+=etc/devd/uauth.conf
 OLD_FILES+=etc/devd/ulpt.conf
 OLD_FILES+=etc/devd/usb.conf
 OLD_FILES+=usr/bin/usbhidaction
 OLD_FILES+=usr/bin/usbhidctl
 OLD_FILES+=usr/include/libusb.h
 OLD_FILES+=usr/include/libusb20.h
 OLD_FILES+=usr/include/libusb20_desc.h
 OLD_FILES+=usr/include/usb.h
 OLD_FILES+=usr/include/usbhid.h
 OLD_FILES+=usr/lib/libusb.a
 OLD_FILES+=usr/lib/libusb.so
 OLD_LIBS+=usr/lib/libusb.so.3
 OLD_FILES+=usr/lib/libusb_p.a
 OLD_FILES+=usr/lib/libusbhid.a
 OLD_FILES+=usr/lib/libusbhid.so
 OLD_LIBS+=usr/lib/libusbhid.so.4
 OLD_FILES+=usr/lib/libusbhid_p.a
 OLD_FILES+=usr/lib32/libusb.a
 OLD_FILES+=usr/lib32/libusb.so
 OLD_LIBS+=usr/lib32/libusb.so.3
 OLD_FILES+=usr/lib32/libusb_p.a
 OLD_FILES+=usr/lib32/libusbhid.a
 OLD_FILES+=usr/lib32/libusbhid.so
 OLD_LIBS+=usr/lib32/libusbhid.so.4
 OLD_FILES+=usr/lib32/libusbhid_p.a
 OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc
 OLD_FILES+=usr/sbin/uathload
 OLD_FILES+=usr/sbin/uhsoctl
 OLD_FILES+=usr/sbin/usbconfig
 OLD_FILES+=usr/sbin/usbdump
 OLD_FILES+=usr/share/examples/libusb20/Makefile
 OLD_FILES+=usr/share/examples/libusb20/README
 OLD_FILES+=usr/share/examples/libusb20/bulk.c
 OLD_FILES+=usr/share/examples/libusb20/control.c
 OLD_FILES+=usr/share/examples/libusb20/util.c
 OLD_FILES+=usr/share/examples/libusb20/util.h
 OLD_DIRS+=usr/share/examples/libusb20
 OLD_FILES+=usr/share/firmware/ar5523.bin
 OLD_FILES+=usr/share/man/man1/uhsoctl.1.gz
 OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz
 OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz
 OLD_FILES+=usr/share/man/man3/hid_dispose_report_desc.3.gz
 OLD_FILES+=usr/share/man/man3/hid_end_parse.3.gz
 OLD_FILES+=usr/share/man/man3/hid_get_data.3.gz
 OLD_FILES+=usr/share/man/man3/hid_get_item.3.gz
 OLD_FILES+=usr/share/man/man3/hid_get_report_desc.3.gz
 OLD_FILES+=usr/share/man/man3/hid_init.3.gz
 OLD_FILES+=usr/share/man/man3/hid_locate.3.gz
 OLD_FILES+=usr/share/man/man3/hid_report_size.3.gz
 OLD_FILES+=usr/share/man/man3/hid_set_data.3.gz
 OLD_FILES+=usr/share/man/man3/hid_start_parse.3.gz
 OLD_FILES+=usr/share/man/man3/hid_usage_in_page.3.gz
 OLD_FILES+=usr/share/man/man3/hid_usage_page.3.gz
 OLD_FILES+=usr/share/man/man3/libusb.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_add_dev_quirk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_alloc_default.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_dequeue_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_device_foreach.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_enqueue_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_free.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_get_dev_quirk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_get_quirk_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_get_template.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_remove_dev_quirk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_set_template.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_desc_foreach.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc_config.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_check_connected.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_close.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_detach_kernel_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_free.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_address.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_backend_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_bus_number.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_config_index.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_debug.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_desc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_device_desc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_fd.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_iface_desc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_info.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_mode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_address.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_port.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_port_path.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_mode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_usage.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_speed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_kernel_driver_active.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_open.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_process.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_simple_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_request_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_reset.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_alt_index.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_config_index.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_power_mode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_wait_process.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_error_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_decode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_encode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_get_1.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_get_2.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_bulk_intr_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_callback_wrapper.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_clear_stall_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_close.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_drain.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_frames.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_frames.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_packet_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_total_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_pointer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc0.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc1.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_status.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_time_complete.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_open.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_pending.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_callback.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc0.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc1.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_total_frames.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_bulk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_control.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_intr.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_isoc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_start.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_stop.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_submit.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_alloc_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_attach_kernel_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_bulk_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_cancel_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_check_connected.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_claim_interface.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_clear_halt.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_close.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_control_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver_np.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_error_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_event_handler_active.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_event_handling_ok.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_exit.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_bos_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_config_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_device_list.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_ss_endpoint_comp.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_active_config_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_bus_number.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor_by_value.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_address.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_list.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_speed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_driver_np.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_max_iso_packet_size.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_max_packet_size.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_next_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_pollfds.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor_ascii.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_completed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_locked.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout_completed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_init.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_interrupt_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_kernel_driver_active.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_lock_event_waiters.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_lock_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_open.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_open_device_with_vid_pid.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_parse_bos_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_parse_ss_endpoint_comp.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_ref_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_release_interface.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_reset_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_interface_alt_setting.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_pollfd_notifiers.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_submit_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_try_lock_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_unlock_event_waiters.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_unlock_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_unref_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_wait_for_event.3.gz
 OLD_FILES+=usr/share/man/man3/libusbhid.3.gz
 OLD_FILES+=usr/share/man/man3/usb.3.gz
 OLD_FILES+=usr/share/man/man3/usb_bulk_read.3.gz
 OLD_FILES+=usr/share/man/man3/usb_bulk_write.3.gz
 OLD_FILES+=usr/share/man/man3/usb_check_connected.3.gz
 OLD_FILES+=usr/share/man/man3/usb_claim_interface.3.gz
 OLD_FILES+=usr/share/man/man3/usb_clear_halt.3.gz
 OLD_FILES+=usr/share/man/man3/usb_close.3.gz
 OLD_FILES+=usr/share/man/man3/usb_control_msg.3.gz
 OLD_FILES+=usr/share/man/man3/usb_destroy_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_device.3.gz
 OLD_FILES+=usr/share/man/man3/usb_fetch_and_parse_descriptors.3.gz
 OLD_FILES+=usr/share/man/man3/usb_find_busses.3.gz
 OLD_FILES+=usr/share/man/man3/usb_find_devices.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_busses.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_descriptor_by_endpoint.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_string_simple.3.gz
 OLD_FILES+=usr/share/man/man3/usb_init.3.gz
 OLD_FILES+=usr/share/man/man3/usb_interrupt_read.3.gz
 OLD_FILES+=usr/share/man/man3/usb_interrupt_write.3.gz
 OLD_FILES+=usr/share/man/man3/usb_open.3.gz
 OLD_FILES+=usr/share/man/man3/usb_parse_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_parse_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/usb_release_interface.3.gz
 OLD_FILES+=usr/share/man/man3/usb_reset.3.gz
 OLD_FILES+=usr/share/man/man3/usb_resetep.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_altinterface.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/usbhid.3.gz
 OLD_FILES+=usr/share/man/man4/if_otus.4.gz
 OLD_FILES+=usr/share/man/man4/if_rsu.4.gz
 OLD_FILES+=usr/share/man/man4/if_rtwn_usb.4.gz
 OLD_FILES+=usr/share/man/man4/if_rum.4.gz
 OLD_FILES+=usr/share/man/man4/if_run.4.gz
 OLD_FILES+=usr/share/man/man4/if_zyd.4.gz
 OLD_FILES+=usr/share/man/man4/otus.4.gz
 OLD_FILES+=usr/share/man/man4/otusfw.4.gz
 OLD_FILES+=usr/share/man/man4/rsu.4.gz
 OLD_FILES+=usr/share/man/man4/rsufw.4.gz
 OLD_FILES+=usr/share/man/man4/rtwn_usb.4.gz
 OLD_FILES+=usr/share/man/man4/rum.4.gz
 OLD_FILES+=usr/share/man/man4/run.4.gz
 OLD_FILES+=usr/share/man/man4/runfw.4.gz
 OLD_FILES+=usr/share/man/man4/u3g.4.gz
 OLD_FILES+=usr/share/man/man4/u3gstub.4.gz
 OLD_FILES+=usr/share/man/man4/uark.4.gz
 OLD_FILES+=usr/share/man/man4/uart.4.gz
 OLD_FILES+=usr/share/man/man4/uath.4.gz
 OLD_FILES+=usr/share/man/man4/ubsa.4.gz
 OLD_FILES+=usr/share/man/man4/ubsec.4.gz
 OLD_FILES+=usr/share/man/man4/ubser.4.gz
 OLD_FILES+=usr/share/man/man4/ubtbcmfw.4.gz
 OLD_FILES+=usr/share/man/man4/uchcom.4.gz
 OLD_FILES+=usr/share/man/man4/ucom.4.gz
 OLD_FILES+=usr/share/man/man4/ucycom.4.gz
 OLD_FILES+=usr/share/man/man4/udav.4.gz
 OLD_FILES+=usr/share/man/man4/udbp.4.gz
 OLD_FILES+=usr/share/man/man4/udp.4.gz
 OLD_FILES+=usr/share/man/man4/udplite.4.gz
 OLD_FILES+=usr/share/man/man4/uep.4.gz
 OLD_FILES+=usr/share/man/man4/ufm.4.gz
 OLD_FILES+=usr/share/man/man4/ufoma.4.gz
 OLD_FILES+=usr/share/man/man4/uftdi.4.gz
 OLD_FILES+=usr/share/man/man4/ugen.4.gz
 OLD_FILES+=usr/share/man/man4/uhci.4.gz
 OLD_FILES+=usr/share/man/man4/uhid.4.gz
 OLD_FILES+=usr/share/man/man4/uhso.4.gz
 OLD_FILES+=usr/share/man/man4/uipaq.4.gz
 OLD_FILES+=usr/share/man/man4/ukbd.4.gz
 OLD_FILES+=usr/share/man/man4/uled.4.gz
 OLD_FILES+=usr/share/man/man4/ulpt.4.gz
 OLD_FILES+=usr/share/man/man4/umass.4.gz
 OLD_FILES+=usr/share/man/man4/umcs.4.gz
 OLD_FILES+=usr/share/man/man4/umct.4.gz
 OLD_FILES+=usr/share/man/man4/umodem.4.gz
 OLD_FILES+=usr/share/man/man4/umoscom.4.gz
 OLD_FILES+=usr/share/man/man4/ums.4.gz
 OLD_FILES+=usr/share/man/man4/unix.4.gz
 OLD_FILES+=usr/share/man/man4/upgt.4.gz
 OLD_FILES+=usr/share/man/man4/uplcom.4.gz
 OLD_FILES+=usr/share/man/man4/ural.4.gz
 OLD_FILES+=usr/share/man/man4/urio.4.gz
 OLD_FILES+=usr/share/man/man4/urndis.4.gz
 OLD_FILES+=usr/share/man/man4/urtw.4.gz
 OLD_FILES+=usr/share/man/man4/usb.4.gz
 OLD_FILES+=usr/share/man/man4/usb_quirk.4.gz
 OLD_FILES+=usr/share/man/man4/usb_template.4.gz
 OLD_FILES+=usr/share/man/man4/usfs.4.gz
 OLD_FILES+=usr/share/man/man4/uslcom.4.gz
 OLD_FILES+=usr/share/man/man4/utopia.4.gz
 OLD_FILES+=usr/share/man/man4/uvisor.4.gz
 OLD_FILES+=usr/share/man/man4/uvscom.4.gz
 OLD_FILES+=usr/share/man/man4/zyd.4.gz
 OLD_FILES+=usr/share/man/man8/uathload.8.gz
 OLD_FILES+=usr/share/man/man8/usbconfig.8.gz
 OLD_FILES+=usr/share/man/man8/usbdump.8.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_alloc_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_attach.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_detach.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_free_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_error.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_linear.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_bytes_max.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_error.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_linear.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_reset.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_softc.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_wakeup.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_flags.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_errstr.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_info.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_uaa.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_clear_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_drain.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_pending.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_poll.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_setup.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_start.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_stop.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_submit.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_unsetup.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_clr_flag.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_data.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_len.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_get_frame.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_get_priv.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_is_stalled.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_max_framelen.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_max_frames.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_max_len.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_flag.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_data.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_len.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_offset.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frames.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_interval.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_priv.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_timeout.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_softc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_state.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_status.9.gz
 OLD_FILES+=usr/share/man/man9/usbdi.9.gz
 OLD_FILES+=usr/share/misc/usb_hid_usages
 OLD_FILES+=usr/share/misc/usbdevs
 .endif
 
 .if ${MK_UTMPX} == no
 OLD_FILES+=etc/periodic/monthly/200.accounting
 OLD_FILES+=usr/bin/last
 OLD_FILES+=usr/bin/users
 OLD_FILES+=usr/bin/who
 OLD_FILES+=usr/sbin/ac
 OLD_FILES+=usr/sbin/lastlogin
 OLD_FILES+=usr/sbin/utx
 OLD_FILES+=usr/share/man/man1/last.1.gz
 OLD_FILES+=usr/share/man/man1/users.1.gz
 OLD_FILES+=usr/share/man/man1/who.1.gz
 OLD_FILES+=usr/share/man/man8/ac.8.gz
 OLD_FILES+=usr/share/man/man8/lastlogin.8.gz
 OLD_FILES+=usr/share/man/man8/utx.8.gz
 .endif
 
 .if ${MK_WIRELESS} == no
 OLD_FILES+=etc/regdomain.xml
 OLD_FILES+=etc/rc.d/hostapd
 OLD_FILES+=etc/rc.d/wpa_supplicant
 OLD_FILES+=usr/sbin/ancontrol
 OLD_FILES+=usr/sbin/hostapd
 OLD_FILES+=usr/sbin/hostapd_cli
 OLD_FILES+=usr/sbin/ndis_events
 OLD_FILES+=usr/sbin/wlandebug
 OLD_FILES+=usr/sbin/wpa_cli
 OLD_FILES+=usr/sbin/wpa_passphrase
 OLD_FILES+=usr/sbin/wpa_supplicant
 OLD_FILES+=usr/share/examples/etc/regdomain.xml
 OLD_FILES+=usr/share/examples/etc/wpa_supplicant.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.eap_user
 OLD_FILES+=usr/share/examples/hostapd/hostapd.wpa_psk
 OLD_DIRS+=usr/share/examples/hostapd
 OLD_FILES+=usr/share/man/man5/hostapd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/wpa_supplicant.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ancontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd_cli.8.gz
 OLD_FILES+=usr/share/man/man8/ndis_events.8.gz
 OLD_FILES+=usr/share/man/man8/wlandebug.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_cli.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_passphrase.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_supplicant.8.gz
 OLD_FILES+=usr/lib/snmp_wlan.so
 OLD_LIBS+=usr/lib/snmp_wlan.so.6
 # bsnmp module
 OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
 OLD_FILES+=usr/share/snmp/defs/wlan_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt
 .endif
 
 .if ${MK_SVNLITE} == no || ${MK_SVN} == yes
 OLD_FILES+=usr/bin/svnlite
 OLD_FILES+=usr/bin/svnliteadmin
 OLD_FILES+=usr/bin/svnlitebench
 OLD_FILES+=usr/bin/svnlitedumpfilter
 OLD_FILES+=usr/bin/svnlitefsfs
 OLD_FILES+=usr/bin/svnlitelook
 OLD_FILES+=usr/bin/svnlitemucc
 OLD_FILES+=usr/bin/svnliterdump
 OLD_FILES+=usr/bin/svnliteserve
 OLD_FILES+=usr/bin/svnlitesync
 OLD_FILES+=usr/bin/svnliteversion
 OLD_FILES+=usr/share/man/man1/svnlite.1.gz
 .endif
 
 .if ${MK_SVN} == no
 OLD_FILES+=usr/bin/svn
 OLD_FILES+=usr/bin/svnadmin
 OLD_FILES+=usr/bin/svnbench
 OLD_FILES+=usr/bin/svndumpfilter
 OLD_FILES+=usr/bin/svnfsfs
 OLD_FILES+=usr/bin/svnlook
 OLD_FILES+=usr/bin/svnmucc
 OLD_FILES+=usr/bin/svnrdump
 OLD_FILES+=usr/bin/svnserve
 OLD_FILES+=usr/bin/svnsync
 OLD_FILES+=usr/bin/svnversion
 .endif
 
 .if ${MK_HYPERV} == no
 OLD_FILES+=etc/devd/hyperv.conf
 OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig
 OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info
 OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info
 OLD_FILES+=usr/sbin/hv_kvp_daemon
 OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz
 .endif
 
 .if ${MK_ZONEINFO} == no
 OLD_FILES+=usr/share/zoneinfo/Africa/Abidjan
 OLD_FILES+=usr/share/zoneinfo/Africa/Accra
 OLD_FILES+=usr/share/zoneinfo/Africa/Addis_Ababa
 OLD_FILES+=usr/share/zoneinfo/Africa/Algiers
 OLD_FILES+=usr/share/zoneinfo/Africa/Asmara
 OLD_FILES+=usr/share/zoneinfo/Africa/Bamako
 OLD_FILES+=usr/share/zoneinfo/Africa/Bangui
 OLD_FILES+=usr/share/zoneinfo/Africa/Banjul
 OLD_FILES+=usr/share/zoneinfo/Africa/Bissau
 OLD_FILES+=usr/share/zoneinfo/Africa/Blantyre
 OLD_FILES+=usr/share/zoneinfo/Africa/Brazzaville
 OLD_FILES+=usr/share/zoneinfo/Africa/Bujumbura
 OLD_FILES+=usr/share/zoneinfo/Africa/Cairo
 OLD_FILES+=usr/share/zoneinfo/Africa/Casablanca
 OLD_FILES+=usr/share/zoneinfo/Africa/Ceuta
 OLD_FILES+=usr/share/zoneinfo/Africa/Conakry
 OLD_FILES+=usr/share/zoneinfo/Africa/Dakar
 OLD_FILES+=usr/share/zoneinfo/Africa/Dar_es_Salaam
 OLD_FILES+=usr/share/zoneinfo/Africa/Djibouti
 OLD_FILES+=usr/share/zoneinfo/Africa/Douala
 OLD_FILES+=usr/share/zoneinfo/Africa/El_Aaiun
 OLD_FILES+=usr/share/zoneinfo/Africa/Freetown
 OLD_FILES+=usr/share/zoneinfo/Africa/Gaborone
 OLD_FILES+=usr/share/zoneinfo/Africa/Harare
 OLD_FILES+=usr/share/zoneinfo/Africa/Johannesburg
 OLD_FILES+=usr/share/zoneinfo/Africa/Juba
 OLD_FILES+=usr/share/zoneinfo/Africa/Kampala
 OLD_FILES+=usr/share/zoneinfo/Africa/Khartoum
 OLD_FILES+=usr/share/zoneinfo/Africa/Kigali
 OLD_FILES+=usr/share/zoneinfo/Africa/Kinshasa
 OLD_FILES+=usr/share/zoneinfo/Africa/Lagos
 OLD_FILES+=usr/share/zoneinfo/Africa/Libreville
 OLD_FILES+=usr/share/zoneinfo/Africa/Lome
 OLD_FILES+=usr/share/zoneinfo/Africa/Luanda
 OLD_FILES+=usr/share/zoneinfo/Africa/Lubumbashi
 OLD_FILES+=usr/share/zoneinfo/Africa/Lusaka
 OLD_FILES+=usr/share/zoneinfo/Africa/Malabo
 OLD_FILES+=usr/share/zoneinfo/Africa/Maputo
 OLD_FILES+=usr/share/zoneinfo/Africa/Maseru
 OLD_FILES+=usr/share/zoneinfo/Africa/Mbabane
 OLD_FILES+=usr/share/zoneinfo/Africa/Mogadishu
 OLD_FILES+=usr/share/zoneinfo/Africa/Monrovia
 OLD_FILES+=usr/share/zoneinfo/Africa/Nairobi
 OLD_FILES+=usr/share/zoneinfo/Africa/Ndjamena
 OLD_FILES+=usr/share/zoneinfo/Africa/Niamey
 OLD_FILES+=usr/share/zoneinfo/Africa/Nouakchott
 OLD_FILES+=usr/share/zoneinfo/Africa/Ouagadougou
 OLD_FILES+=usr/share/zoneinfo/Africa/Porto-Novo
 OLD_FILES+=usr/share/zoneinfo/Africa/Sao_Tome
 OLD_FILES+=usr/share/zoneinfo/Africa/Tripoli
 OLD_FILES+=usr/share/zoneinfo/Africa/Tunis
 OLD_FILES+=usr/share/zoneinfo/Africa/Windhoek
 OLD_FILES+=usr/share/zoneinfo/America/Adak
 OLD_FILES+=usr/share/zoneinfo/America/Anchorage
 OLD_FILES+=usr/share/zoneinfo/America/Anguilla
 OLD_FILES+=usr/share/zoneinfo/America/Antigua
 OLD_FILES+=usr/share/zoneinfo/America/Araguaina
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Buenos_Aires
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Catamarca
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Cordoba
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Jujuy
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/La_Rioja
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Mendoza
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Rio_Gallegos
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Salta
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/San_Juan
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/San_Luis
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Tucuman
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Ushuaia
 OLD_FILES+=usr/share/zoneinfo/America/Aruba
 OLD_FILES+=usr/share/zoneinfo/America/Asuncion
 OLD_FILES+=usr/share/zoneinfo/America/Atikokan
 OLD_FILES+=usr/share/zoneinfo/America/Bahia
 OLD_FILES+=usr/share/zoneinfo/America/Bahia_Banderas
 OLD_FILES+=usr/share/zoneinfo/America/Barbados
 OLD_FILES+=usr/share/zoneinfo/America/Belem
 OLD_FILES+=usr/share/zoneinfo/America/Belize
 OLD_FILES+=usr/share/zoneinfo/America/Blanc-Sablon
 OLD_FILES+=usr/share/zoneinfo/America/Boa_Vista
 OLD_FILES+=usr/share/zoneinfo/America/Bogota
 OLD_FILES+=usr/share/zoneinfo/America/Boise
 OLD_FILES+=usr/share/zoneinfo/America/Cambridge_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Campo_Grande
 OLD_FILES+=usr/share/zoneinfo/America/Cancun
 OLD_FILES+=usr/share/zoneinfo/America/Caracas
 OLD_FILES+=usr/share/zoneinfo/America/Cayenne
 OLD_FILES+=usr/share/zoneinfo/America/Cayman
 OLD_FILES+=usr/share/zoneinfo/America/Chicago
 OLD_FILES+=usr/share/zoneinfo/America/Chihuahua
 OLD_FILES+=usr/share/zoneinfo/America/Costa_Rica
 OLD_FILES+=usr/share/zoneinfo/America/Creston
 OLD_FILES+=usr/share/zoneinfo/America/Cuiaba
 OLD_FILES+=usr/share/zoneinfo/America/Curacao
 OLD_FILES+=usr/share/zoneinfo/America/Danmarkshavn
 OLD_FILES+=usr/share/zoneinfo/America/Dawson
 OLD_FILES+=usr/share/zoneinfo/America/Dawson_Creek
 OLD_FILES+=usr/share/zoneinfo/America/Denver
 OLD_FILES+=usr/share/zoneinfo/America/Detroit
 OLD_FILES+=usr/share/zoneinfo/America/Dominica
 OLD_FILES+=usr/share/zoneinfo/America/Edmonton
 OLD_FILES+=usr/share/zoneinfo/America/Eirunepe
 OLD_FILES+=usr/share/zoneinfo/America/El_Salvador
 OLD_FILES+=usr/share/zoneinfo/America/Fortaleza
 OLD_FILES+=usr/share/zoneinfo/America/Glace_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Godthab
 OLD_FILES+=usr/share/zoneinfo/America/Goose_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Grand_Turk
 OLD_FILES+=usr/share/zoneinfo/America/Grenada
 OLD_FILES+=usr/share/zoneinfo/America/Guadeloupe
 OLD_FILES+=usr/share/zoneinfo/America/Guatemala
 OLD_FILES+=usr/share/zoneinfo/America/Guayaquil
 OLD_FILES+=usr/share/zoneinfo/America/Guyana
 OLD_FILES+=usr/share/zoneinfo/America/Halifax
 OLD_FILES+=usr/share/zoneinfo/America/Havana
 OLD_FILES+=usr/share/zoneinfo/America/Hermosillo
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Indianapolis
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Knox
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Marengo
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Petersburg
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Tell_City
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Vevay
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Vincennes
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Winamac
 OLD_FILES+=usr/share/zoneinfo/America/Inuvik
 OLD_FILES+=usr/share/zoneinfo/America/Iqaluit
 OLD_FILES+=usr/share/zoneinfo/America/Jamaica
 OLD_FILES+=usr/share/zoneinfo/America/Juneau
 OLD_FILES+=usr/share/zoneinfo/America/Kentucky/Louisville
 OLD_FILES+=usr/share/zoneinfo/America/Kentucky/Monticello
 OLD_FILES+=usr/share/zoneinfo/America/Kralendijk
 OLD_FILES+=usr/share/zoneinfo/America/La_Paz
 OLD_FILES+=usr/share/zoneinfo/America/Lima
 OLD_FILES+=usr/share/zoneinfo/America/Los_Angeles
 OLD_FILES+=usr/share/zoneinfo/America/Lower_Princes
 OLD_FILES+=usr/share/zoneinfo/America/Maceio
 OLD_FILES+=usr/share/zoneinfo/America/Managua
 OLD_FILES+=usr/share/zoneinfo/America/Manaus
 OLD_FILES+=usr/share/zoneinfo/America/Marigot
 OLD_FILES+=usr/share/zoneinfo/America/Martinique
 OLD_FILES+=usr/share/zoneinfo/America/Matamoros
 OLD_FILES+=usr/share/zoneinfo/America/Mazatlan
 OLD_FILES+=usr/share/zoneinfo/America/Menominee
 OLD_FILES+=usr/share/zoneinfo/America/Merida
 OLD_FILES+=usr/share/zoneinfo/America/Metlakatla
 OLD_FILES+=usr/share/zoneinfo/America/Mexico_City
 OLD_FILES+=usr/share/zoneinfo/America/Miquelon
 OLD_FILES+=usr/share/zoneinfo/America/Moncton
 OLD_FILES+=usr/share/zoneinfo/America/Monterrey
 OLD_FILES+=usr/share/zoneinfo/America/Montevideo
 OLD_FILES+=usr/share/zoneinfo/America/Montreal
 OLD_FILES+=usr/share/zoneinfo/America/Montserrat
 OLD_FILES+=usr/share/zoneinfo/America/Nassau
 OLD_FILES+=usr/share/zoneinfo/America/New_York
 OLD_FILES+=usr/share/zoneinfo/America/Nipigon
 OLD_FILES+=usr/share/zoneinfo/America/Nome
 OLD_FILES+=usr/share/zoneinfo/America/Noronha
 OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/Beulah
 OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/Center
 OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/New_Salem
 OLD_FILES+=usr/share/zoneinfo/America/Ojinaga
 OLD_FILES+=usr/share/zoneinfo/America/Panama
 OLD_FILES+=usr/share/zoneinfo/America/Pangnirtung
 OLD_FILES+=usr/share/zoneinfo/America/Paramaribo
 OLD_FILES+=usr/share/zoneinfo/America/Phoenix
 OLD_FILES+=usr/share/zoneinfo/America/Port-au-Prince
 OLD_FILES+=usr/share/zoneinfo/America/Port_of_Spain
 OLD_FILES+=usr/share/zoneinfo/America/Porto_Velho
 OLD_FILES+=usr/share/zoneinfo/America/Puerto_Rico
 OLD_FILES+=usr/share/zoneinfo/America/Rainy_River
 OLD_FILES+=usr/share/zoneinfo/America/Rankin_Inlet
 OLD_FILES+=usr/share/zoneinfo/America/Recife
 OLD_FILES+=usr/share/zoneinfo/America/Regina
 OLD_FILES+=usr/share/zoneinfo/America/Resolute
 OLD_FILES+=usr/share/zoneinfo/America/Rio_Branco
 OLD_FILES+=usr/share/zoneinfo/America/Santa_Isabel
 OLD_FILES+=usr/share/zoneinfo/America/Santarem
 OLD_FILES+=usr/share/zoneinfo/America/Santiago
 OLD_FILES+=usr/share/zoneinfo/America/Santo_Domingo
 OLD_FILES+=usr/share/zoneinfo/America/Sao_Paulo
 OLD_FILES+=usr/share/zoneinfo/America/Scoresbysund
 OLD_FILES+=usr/share/zoneinfo/America/Sitka
 OLD_FILES+=usr/share/zoneinfo/America/St_Barthelemy
 OLD_FILES+=usr/share/zoneinfo/America/St_Johns
 OLD_FILES+=usr/share/zoneinfo/America/St_Kitts
 OLD_FILES+=usr/share/zoneinfo/America/St_Lucia
 OLD_FILES+=usr/share/zoneinfo/America/St_Thomas
 OLD_FILES+=usr/share/zoneinfo/America/St_Vincent
 OLD_FILES+=usr/share/zoneinfo/America/Swift_Current
 OLD_FILES+=usr/share/zoneinfo/America/Tegucigalpa
 OLD_FILES+=usr/share/zoneinfo/America/Thule
 OLD_FILES+=usr/share/zoneinfo/America/Thunder_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Tijuana
 OLD_FILES+=usr/share/zoneinfo/America/Toronto
 OLD_FILES+=usr/share/zoneinfo/America/Tortola
 OLD_FILES+=usr/share/zoneinfo/America/Vancouver
 OLD_FILES+=usr/share/zoneinfo/America/Whitehorse
 OLD_FILES+=usr/share/zoneinfo/America/Winnipeg
 OLD_FILES+=usr/share/zoneinfo/America/Yakutat
 OLD_FILES+=usr/share/zoneinfo/America/Yellowknife
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Casey
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Davis
 OLD_FILES+=usr/share/zoneinfo/Antarctica/DumontDUrville
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Macquarie
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Mawson
 OLD_FILES+=usr/share/zoneinfo/Antarctica/McMurdo
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Palmer
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Rothera
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Syowa
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Troll
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Vostok
 OLD_FILES+=usr/share/zoneinfo/Arctic/Longyearbyen
 OLD_FILES+=usr/share/zoneinfo/Asia/Aden
 OLD_FILES+=usr/share/zoneinfo/Asia/Almaty
 OLD_FILES+=usr/share/zoneinfo/Asia/Amman
 OLD_FILES+=usr/share/zoneinfo/Asia/Anadyr
 OLD_FILES+=usr/share/zoneinfo/Asia/Aqtau
 OLD_FILES+=usr/share/zoneinfo/Asia/Aqtobe
 OLD_FILES+=usr/share/zoneinfo/Asia/Ashgabat
 OLD_FILES+=usr/share/zoneinfo/Asia/Baghdad
 OLD_FILES+=usr/share/zoneinfo/Asia/Bahrain
 OLD_FILES+=usr/share/zoneinfo/Asia/Baku
 OLD_FILES+=usr/share/zoneinfo/Asia/Bangkok
 OLD_FILES+=usr/share/zoneinfo/Asia/Beirut
 OLD_FILES+=usr/share/zoneinfo/Asia/Bishkek
 OLD_FILES+=usr/share/zoneinfo/Asia/Brunei
 OLD_FILES+=usr/share/zoneinfo/Asia/Chita
 OLD_FILES+=usr/share/zoneinfo/Asia/Choibalsan
 OLD_FILES+=usr/share/zoneinfo/Asia/Colombo
 OLD_FILES+=usr/share/zoneinfo/Asia/Damascus
 OLD_FILES+=usr/share/zoneinfo/Asia/Dhaka
 OLD_FILES+=usr/share/zoneinfo/Asia/Dili
 OLD_FILES+=usr/share/zoneinfo/Asia/Dubai
 OLD_FILES+=usr/share/zoneinfo/Asia/Dushanbe
 OLD_FILES+=usr/share/zoneinfo/Asia/Gaza
 OLD_FILES+=usr/share/zoneinfo/Asia/Hebron
 OLD_FILES+=usr/share/zoneinfo/Asia/Ho_Chi_Minh
 OLD_FILES+=usr/share/zoneinfo/Asia/Hong_Kong
 OLD_FILES+=usr/share/zoneinfo/Asia/Hovd
 OLD_FILES+=usr/share/zoneinfo/Asia/Irkutsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Istanbul
 OLD_FILES+=usr/share/zoneinfo/Asia/Jakarta
 OLD_FILES+=usr/share/zoneinfo/Asia/Jayapura
 OLD_FILES+=usr/share/zoneinfo/Asia/Jerusalem
 OLD_FILES+=usr/share/zoneinfo/Asia/Kabul
 OLD_FILES+=usr/share/zoneinfo/Asia/Kamchatka
 OLD_FILES+=usr/share/zoneinfo/Asia/Karachi
 OLD_FILES+=usr/share/zoneinfo/Asia/Kathmandu
 OLD_FILES+=usr/share/zoneinfo/Asia/Khandyga
 OLD_FILES+=usr/share/zoneinfo/Asia/Kolkata
 OLD_FILES+=usr/share/zoneinfo/Asia/Krasnoyarsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Kuala_Lumpur
 OLD_FILES+=usr/share/zoneinfo/Asia/Kuching
 OLD_FILES+=usr/share/zoneinfo/Asia/Kuwait
 OLD_FILES+=usr/share/zoneinfo/Asia/Macau
 OLD_FILES+=usr/share/zoneinfo/Asia/Magadan
 OLD_FILES+=usr/share/zoneinfo/Asia/Makassar
 OLD_FILES+=usr/share/zoneinfo/Asia/Manila
 OLD_FILES+=usr/share/zoneinfo/Asia/Muscat
 OLD_FILES+=usr/share/zoneinfo/Asia/Nicosia
 OLD_FILES+=usr/share/zoneinfo/Asia/Novokuznetsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Novosibirsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Omsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Oral
 OLD_FILES+=usr/share/zoneinfo/Asia/Phnom_Penh
 OLD_FILES+=usr/share/zoneinfo/Asia/Pontianak
 OLD_FILES+=usr/share/zoneinfo/Asia/Pyongyang
 OLD_FILES+=usr/share/zoneinfo/Asia/Qatar
 OLD_FILES+=usr/share/zoneinfo/Asia/Qyzylorda
 OLD_FILES+=usr/share/zoneinfo/Asia/Rangoon
 OLD_FILES+=usr/share/zoneinfo/Asia/Riyadh
 OLD_FILES+=usr/share/zoneinfo/Asia/Sakhalin
 OLD_FILES+=usr/share/zoneinfo/Asia/Samarkand
 OLD_FILES+=usr/share/zoneinfo/Asia/Seoul
 OLD_FILES+=usr/share/zoneinfo/Asia/Shanghai
 OLD_FILES+=usr/share/zoneinfo/Asia/Singapore
 OLD_FILES+=usr/share/zoneinfo/Asia/Srednekolymsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Taipei
 OLD_FILES+=usr/share/zoneinfo/Asia/Tashkent
 OLD_FILES+=usr/share/zoneinfo/Asia/Tbilisi
 OLD_FILES+=usr/share/zoneinfo/Asia/Tehran
 OLD_FILES+=usr/share/zoneinfo/Asia/Thimphu
 OLD_FILES+=usr/share/zoneinfo/Asia/Tokyo
 OLD_FILES+=usr/share/zoneinfo/Asia/Ulaanbaatar
 OLD_FILES+=usr/share/zoneinfo/Asia/Urumqi
 OLD_FILES+=usr/share/zoneinfo/Asia/Ust-Nera
 OLD_FILES+=usr/share/zoneinfo/Asia/Vientiane
 OLD_FILES+=usr/share/zoneinfo/Asia/Vladivostok
 OLD_FILES+=usr/share/zoneinfo/Asia/Yakutsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Yekaterinburg
 OLD_FILES+=usr/share/zoneinfo/Asia/Yerevan
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Azores
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Bermuda
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Canary
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Cape_Verde
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Faroe
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Madeira
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Reykjavik
 OLD_FILES+=usr/share/zoneinfo/Atlantic/South_Georgia
 OLD_FILES+=usr/share/zoneinfo/Atlantic/St_Helena
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Stanley
 OLD_FILES+=usr/share/zoneinfo/Australia/Adelaide
 OLD_FILES+=usr/share/zoneinfo/Australia/Brisbane
 OLD_FILES+=usr/share/zoneinfo/Australia/Broken_Hill
 OLD_FILES+=usr/share/zoneinfo/Australia/Currie
 OLD_FILES+=usr/share/zoneinfo/Australia/Darwin
 OLD_FILES+=usr/share/zoneinfo/Australia/Eucla
 OLD_FILES+=usr/share/zoneinfo/Australia/Hobart
 OLD_FILES+=usr/share/zoneinfo/Australia/Lindeman
 OLD_FILES+=usr/share/zoneinfo/Australia/Lord_Howe
 OLD_FILES+=usr/share/zoneinfo/Australia/Melbourne
 OLD_FILES+=usr/share/zoneinfo/Australia/Perth
 OLD_FILES+=usr/share/zoneinfo/Australia/Sydney
 OLD_FILES+=usr/share/zoneinfo/CET
 OLD_FILES+=usr/share/zoneinfo/CST6CDT
 OLD_FILES+=usr/share/zoneinfo/EET
 OLD_FILES+=usr/share/zoneinfo/EST
 OLD_FILES+=usr/share/zoneinfo/EST5EDT
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+0
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+1
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+10
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+11
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+12
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+2
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+3
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+4
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+5
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+6
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+7
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+8
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+9
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-0
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-1
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-10
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-11
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-12
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-13
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-14
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-2
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-3
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-4
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-5
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-6
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-7
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-8
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-9
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT0
 OLD_FILES+=usr/share/zoneinfo/Etc/Greenwich
 OLD_FILES+=usr/share/zoneinfo/Etc/UCT
 OLD_FILES+=usr/share/zoneinfo/Etc/UTC
 OLD_FILES+=usr/share/zoneinfo/Etc/Universal
 OLD_FILES+=usr/share/zoneinfo/Etc/Zulu
 OLD_FILES+=usr/share/zoneinfo/Europe/Amsterdam
 OLD_FILES+=usr/share/zoneinfo/Europe/Andorra
 OLD_FILES+=usr/share/zoneinfo/Europe/Athens
 OLD_FILES+=usr/share/zoneinfo/Europe/Belgrade
 OLD_FILES+=usr/share/zoneinfo/Europe/Berlin
 OLD_FILES+=usr/share/zoneinfo/Europe/Bratislava
 OLD_FILES+=usr/share/zoneinfo/Europe/Brussels
 OLD_FILES+=usr/share/zoneinfo/Europe/Bucharest
 OLD_FILES+=usr/share/zoneinfo/Europe/Budapest
 OLD_FILES+=usr/share/zoneinfo/Europe/Busingen
 OLD_FILES+=usr/share/zoneinfo/Europe/Chisinau
 OLD_FILES+=usr/share/zoneinfo/Europe/Copenhagen
 OLD_FILES+=usr/share/zoneinfo/Europe/Dublin
 OLD_FILES+=usr/share/zoneinfo/Europe/Gibraltar
 OLD_FILES+=usr/share/zoneinfo/Europe/Guernsey
 OLD_FILES+=usr/share/zoneinfo/Europe/Helsinki
 OLD_FILES+=usr/share/zoneinfo/Europe/Isle_of_Man
 OLD_FILES+=usr/share/zoneinfo/Europe/Istanbul
 OLD_FILES+=usr/share/zoneinfo/Europe/Jersey
 OLD_FILES+=usr/share/zoneinfo/Europe/Kaliningrad
 OLD_FILES+=usr/share/zoneinfo/Europe/Kiev
 OLD_FILES+=usr/share/zoneinfo/Europe/Lisbon
 OLD_FILES+=usr/share/zoneinfo/Europe/Ljubljana
 OLD_FILES+=usr/share/zoneinfo/Europe/London
 OLD_FILES+=usr/share/zoneinfo/Europe/Luxembourg
 OLD_FILES+=usr/share/zoneinfo/Europe/Madrid
 OLD_FILES+=usr/share/zoneinfo/Europe/Malta
 OLD_FILES+=usr/share/zoneinfo/Europe/Mariehamn
 OLD_FILES+=usr/share/zoneinfo/Europe/Minsk
 OLD_FILES+=usr/share/zoneinfo/Europe/Monaco
 OLD_FILES+=usr/share/zoneinfo/Europe/Moscow
 OLD_FILES+=usr/share/zoneinfo/Europe/Nicosia
 OLD_FILES+=usr/share/zoneinfo/Europe/Oslo
 OLD_FILES+=usr/share/zoneinfo/Europe/Paris
 OLD_FILES+=usr/share/zoneinfo/Europe/Podgorica
 OLD_FILES+=usr/share/zoneinfo/Europe/Prague
 OLD_FILES+=usr/share/zoneinfo/Europe/Riga
 OLD_FILES+=usr/share/zoneinfo/Europe/Rome
 OLD_FILES+=usr/share/zoneinfo/Europe/Samara
 OLD_FILES+=usr/share/zoneinfo/Europe/San_Marino
 OLD_FILES+=usr/share/zoneinfo/Europe/Sarajevo
 OLD_FILES+=usr/share/zoneinfo/Europe/Simferopol
 OLD_FILES+=usr/share/zoneinfo/Europe/Skopje
 OLD_FILES+=usr/share/zoneinfo/Europe/Sofia
 OLD_FILES+=usr/share/zoneinfo/Europe/Stockholm
 OLD_FILES+=usr/share/zoneinfo/Europe/Tallinn
 OLD_FILES+=usr/share/zoneinfo/Europe/Tirane
 OLD_FILES+=usr/share/zoneinfo/Europe/Uzhgorod
 OLD_FILES+=usr/share/zoneinfo/Europe/Vaduz
 OLD_FILES+=usr/share/zoneinfo/Europe/Vatican
 OLD_FILES+=usr/share/zoneinfo/Europe/Vienna
 OLD_FILES+=usr/share/zoneinfo/Europe/Vilnius
 OLD_FILES+=usr/share/zoneinfo/Europe/Volgograd
 OLD_FILES+=usr/share/zoneinfo/Europe/Warsaw
 OLD_FILES+=usr/share/zoneinfo/Europe/Zagreb
 OLD_FILES+=usr/share/zoneinfo/Europe/Zaporozhye
 OLD_FILES+=usr/share/zoneinfo/Europe/Zurich
 OLD_FILES+=usr/share/zoneinfo/Factory
 OLD_FILES+=usr/share/zoneinfo/HST
 OLD_FILES+=usr/share/zoneinfo/Indian/Antananarivo
 OLD_FILES+=usr/share/zoneinfo/Indian/Chagos
 OLD_FILES+=usr/share/zoneinfo/Indian/Christmas
 OLD_FILES+=usr/share/zoneinfo/Indian/Cocos
 OLD_FILES+=usr/share/zoneinfo/Indian/Comoro
 OLD_FILES+=usr/share/zoneinfo/Indian/Kerguelen
 OLD_FILES+=usr/share/zoneinfo/Indian/Mahe
 OLD_FILES+=usr/share/zoneinfo/Indian/Maldives
 OLD_FILES+=usr/share/zoneinfo/Indian/Mauritius
 OLD_FILES+=usr/share/zoneinfo/Indian/Mayotte
 OLD_FILES+=usr/share/zoneinfo/Indian/Reunion
 OLD_FILES+=usr/share/zoneinfo/MET
 OLD_FILES+=usr/share/zoneinfo/MST
 OLD_FILES+=usr/share/zoneinfo/MST7MDT
 OLD_FILES+=usr/share/zoneinfo/PST8PDT
 OLD_FILES+=usr/share/zoneinfo/Pacific/Apia
 OLD_FILES+=usr/share/zoneinfo/Pacific/Auckland
 OLD_FILES+=usr/share/zoneinfo/Pacific/Bougainville
 OLD_FILES+=usr/share/zoneinfo/Pacific/Chatham
 OLD_FILES+=usr/share/zoneinfo/Pacific/Chuuk
 OLD_FILES+=usr/share/zoneinfo/Pacific/Easter
 OLD_FILES+=usr/share/zoneinfo/Pacific/Efate
 OLD_FILES+=usr/share/zoneinfo/Pacific/Enderbury
 OLD_FILES+=usr/share/zoneinfo/Pacific/Fakaofo
 OLD_FILES+=usr/share/zoneinfo/Pacific/Fiji
 OLD_FILES+=usr/share/zoneinfo/Pacific/Funafuti
 OLD_FILES+=usr/share/zoneinfo/Pacific/Galapagos
 OLD_FILES+=usr/share/zoneinfo/Pacific/Gambier
 OLD_FILES+=usr/share/zoneinfo/Pacific/Guadalcanal
 OLD_FILES+=usr/share/zoneinfo/Pacific/Guam
 OLD_FILES+=usr/share/zoneinfo/Pacific/Honolulu
 OLD_FILES+=usr/share/zoneinfo/Pacific/Johnston
 OLD_FILES+=usr/share/zoneinfo/Pacific/Kiritimati
 OLD_FILES+=usr/share/zoneinfo/Pacific/Kosrae
 OLD_FILES+=usr/share/zoneinfo/Pacific/Kwajalein
 OLD_FILES+=usr/share/zoneinfo/Pacific/Majuro
 OLD_FILES+=usr/share/zoneinfo/Pacific/Marquesas
 OLD_FILES+=usr/share/zoneinfo/Pacific/Midway
 OLD_FILES+=usr/share/zoneinfo/Pacific/Nauru
 OLD_FILES+=usr/share/zoneinfo/Pacific/Niue
 OLD_FILES+=usr/share/zoneinfo/Pacific/Norfolk
 OLD_FILES+=usr/share/zoneinfo/Pacific/Noumea
 OLD_FILES+=usr/share/zoneinfo/Pacific/Pago_Pago
 OLD_FILES+=usr/share/zoneinfo/Pacific/Palau
 OLD_FILES+=usr/share/zoneinfo/Pacific/Pitcairn
 OLD_FILES+=usr/share/zoneinfo/Pacific/Pohnpei
 OLD_FILES+=usr/share/zoneinfo/Pacific/Port_Moresby
 OLD_FILES+=usr/share/zoneinfo/Pacific/Rarotonga
 OLD_FILES+=usr/share/zoneinfo/Pacific/Saipan
 OLD_FILES+=usr/share/zoneinfo/Pacific/Tahiti
 OLD_FILES+=usr/share/zoneinfo/Pacific/Tarawa
 OLD_FILES+=usr/share/zoneinfo/Pacific/Tongatapu
 OLD_FILES+=usr/share/zoneinfo/Pacific/Wake
 OLD_FILES+=usr/share/zoneinfo/Pacific/Wallis
 OLD_FILES+=usr/share/zoneinfo/UTC
 OLD_FILES+=usr/share/zoneinfo/WET
 OLD_FILES+=usr/share/zoneinfo/posixrules
 OLD_FILES+=usr/share/zoneinfo/zone.tab
 .endif
Index: projects/bsnmp-ipv6-mib/usr.bin/clang/llvm-ar/Makefile
===================================================================
--- projects/bsnmp-ipv6-mib/usr.bin/clang/llvm-ar/Makefile	(revision 311636)
+++ projects/bsnmp-ipv6-mib/usr.bin/clang/llvm-ar/Makefile	(revision 311637)
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-ar
 
 SRCDIR=		tools/llvm-ar
 SRCS+=		llvm-ar.cpp
 
 LIBADD+=	z
 
+LINKS+=		${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib
+
 .include "../llvm.prog.mk"
Index: projects/bsnmp-ipv6-mib/usr.bin/cmp/special.c
===================================================================
--- projects/bsnmp-ipv6-mib/usr.bin/cmp/special.c	(revision 311636)
+++ projects/bsnmp-ipv6-mib/usr.bin/cmp/special.c	(revision 311637)
@@ -1,104 +1,106 @@
 /*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)special.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
 #include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "extern.h"
 
 void
 c_special(int fd1, const char *file1, off_t skip1,
     int fd2, const char *file2, off_t skip2)
 {
 	int ch1, ch2;
 	off_t byte, line;
 	FILE *fp1, *fp2;
 	int dfound;
 
 	if ((fp1 = fdopen(fd1, "r")) == NULL)
 		err(ERR_EXIT, "%s", file1);
 	if ((fp2 = fdopen(fd2, "r")) == NULL)
 		err(ERR_EXIT, "%s", file2);
 
 	dfound = 0;
 	while (skip1--)
 		if (getc(fp1) == EOF)
 			goto eof;
 	while (skip2--)
 		if (getc(fp2) == EOF)
 			goto eof;
 
 	for (byte = line = 1;; ++byte) {
 		ch1 = getc(fp1);
 		ch2 = getc(fp2);
 		if (ch1 == EOF || ch2 == EOF)
 			break;
 		if (ch1 != ch2) {
 			if (xflag) {
 				dfound = 1;
 				(void)printf("%08llx %02x %02x\n",
 				    (long long)byte - 1, ch1, ch2);
 			} else if (lflag) {
 				dfound = 1;
 				(void)printf("%6lld %3o %3o\n",
 				    (long long)byte, ch1, ch2);
 			} else {
 				diffmsg(file1, file2, byte, line);
 				/* NOTREACHED */
 			}
 		}
 		if (ch1 == '\n')
 			++line;
 	}
 
 eof:	if (ferror(fp1))
 		err(ERR_EXIT, "%s", file1);
 	if (ferror(fp2))
 		err(ERR_EXIT, "%s", file2);
 	if (feof(fp1)) {
 		if (!feof(fp2))
 			eofmsg(file1);
 	} else
 		if (feof(fp2))
 			eofmsg(file2);
+	fclose(fp2);
+	fclose(fp1);
 	if (dfound)
 		exit(DIFF_EXIT);
 }
Index: projects/bsnmp-ipv6-mib/usr.bin/cmp/tests/Makefile
===================================================================
--- projects/bsnmp-ipv6-mib/usr.bin/cmp/tests/Makefile	(revision 311636)
+++ projects/bsnmp-ipv6-mib/usr.bin/cmp/tests/Makefile	(revision 311637)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
+ATF_TESTS_SH+=		cmp_test2
 NETBSD_ATF_TESTS_SH=	cmp_test
 
 .include <netbsd-tests.test.mk>
 
 .include <bsd.test.mk>
Index: projects/bsnmp-ipv6-mib/usr.bin/cmp/tests/cmp_test2.sh
===================================================================
--- projects/bsnmp-ipv6-mib/usr.bin/cmp/tests/cmp_test2.sh	(nonexistent)
+++ projects/bsnmp-ipv6-mib/usr.bin/cmp/tests/cmp_test2.sh	(revision 311637)
@@ -0,0 +1,67 @@
+# Copyright (c) 2017 Alan Somers
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# $FreeBSD$
+
+atf_test_case special
+special_head() {
+	atf_set "descr" "Test cmp(1)'s handling of non-regular files"
+}
+special_body() {
+	echo 0123456789abcdef > a
+	echo 0123456789abcdeg > b
+	cat a | atf_check -s exit:0 cmp a -
+	cat a | atf_check -s exit:0 cmp - a
+	cat b | atf_check -s not-exit:0 cmp a -
+	cat b | atf_check -s not-exit:0 cmp - a
+	true
+}
+
+atf_test_case symlink
+symlink_head() {
+	atf_set "descr" "Test cmp(1)'s handling of symlinks"
+}
+symlink_body() {
+	echo 0123456789abcdef > a
+	echo 0123456789abcdeg > b
+	ln -s a a.lnk
+	ln -s b b.lnk
+	ln -s a a2.lnk
+	cp a adup
+	ln -s adup adup.lnk
+	atf_check -s exit:0 cmp a a.lnk
+	atf_check -s exit:0 cmp a.lnk a
+	atf_check -s not-exit:0 -o ignore cmp a b.lnk
+	atf_check -s not-exit:0 -o ignore cmp b.lnk a
+	atf_check -s not-exit:0 -o ignore -e ignore cmp -h a a.lnk
+	atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk a
+	atf_check -s exit:0 cmp -h a.lnk a2.lnk
+	atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk adup.lnk
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case special
+	atf_add_test_case symlink
+}

Property changes on: projects/bsnmp-ipv6-mib/usr.bin/cmp/tests/cmp_test2.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: projects/bsnmp-ipv6-mib/usr.bin/users/users.cc
===================================================================
--- projects/bsnmp-ipv6-mib/usr.bin/users/users.cc	(revision 311636)
+++ projects/bsnmp-ipv6-mib/usr.bin/users/users.cc	(revision 311637)
@@ -1,65 +1,72 @@
 /*-
  * Copyright (c) 2014 Pietro Cerutti <gahr@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
+#include <sys/capsicum.h>
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <err.h>
+#include <errno.h>
 #include <utmpx.h>
 
 #include <algorithm>
 #include <iostream>
 #include <iterator>
 #include <set>
 #include <string>
 using namespace std;
 
 int
 main(int argc, char **)
 {
 	struct utmpx *ut;
 	set<string> names;
 
 	if (argc > 1) {
 		cerr << "usage: users" << endl;
 		return (1);
 	}
 
 	setutxent();
+
+	if (cap_enter() < 0 && errno != ENOSYS)
+		err(1, "Failed to enter capability mode.");
+
 	while ((ut = getutxent()) != NULL)
 		if (ut->ut_type == USER_PROCESS)
 			names.insert(ut->ut_user);
 	endutxent();
 
 	if (!names.empty()) {
 		set<string>::iterator last = names.end();
 		--last;
 		copy(names.begin(), last, ostream_iterator<string>(cout, " "));
 		cout << *last << endl;
 	}
 }
Index: projects/bsnmp-ipv6-mib
===================================================================
--- projects/bsnmp-ipv6-mib	(revision 311636)
+++ projects/bsnmp-ipv6-mib	(revision 311637)

Property changes on: projects/bsnmp-ipv6-mib
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r311550-311635