Index: projects/clang500-import/contrib/compiler-rt/lib/builtins/README.txt
===================================================================
--- projects/clang500-import/contrib/compiler-rt/lib/builtins/README.txt	(revision 318657)
+++ projects/clang500-import/contrib/compiler-rt/lib/builtins/README.txt	(revision 318658)
@@ -1,346 +1,346 @@
 Compiler-RT
 ================================
 
 This directory and its subdirectories contain source code for the compiler
 support routines.
 
 Compiler-RT is open source software. You may freely distribute it under the
 terms of the license agreement found in LICENSE.txt.
 
 ================================
 
 This is a replacement library for libgcc.  Each function is contained
 in its own file.  Each function has a corresponding unit test under
 test/Unit.
 
 A rudimentary script to test each file is in the file called
 test/Unit/test.
 
 Here is the specification for this library:
 
 http://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc
 
 Here is a synopsis of the contents of this library:
 
 typedef      int si_int;
 typedef unsigned su_int;
 
 typedef          long long di_int;
 typedef unsigned long long du_int;
 
 // Integral bit manipulation
 
 di_int __ashldi3(di_int a, si_int b);      // a << b
 ti_int __ashlti3(ti_int a, si_int b);      // a << b
 
 di_int __ashrdi3(di_int a, si_int b);      // a >> b  arithmetic (sign fill)
 ti_int __ashrti3(ti_int a, si_int b);      // a >> b  arithmetic (sign fill)
 di_int __lshrdi3(di_int a, si_int b);      // a >> b  logical    (zero fill)
 ti_int __lshrti3(ti_int a, si_int b);      // a >> b  logical    (zero fill)
 
 si_int __clzsi2(si_int a);  // count leading zeros
 si_int __clzdi2(di_int a);  // count leading zeros
 si_int __clzti2(ti_int a);  // count leading zeros
 si_int __ctzsi2(si_int a);  // count trailing zeros
 si_int __ctzdi2(di_int a);  // count trailing zeros
 si_int __ctzti2(ti_int a);  // count trailing zeros
 
 si_int __ffssi2(si_int a);  // find least significant 1 bit
 si_int __ffsdi2(di_int a);  // find least significant 1 bit
 si_int __ffsti2(ti_int a);  // find least significant 1 bit
 
 si_int __paritysi2(si_int a);  // bit parity
 si_int __paritydi2(di_int a);  // bit parity
 si_int __parityti2(ti_int a);  // bit parity
 
 si_int __popcountsi2(si_int a);  // bit population
 si_int __popcountdi2(di_int a);  // bit population
 si_int __popcountti2(ti_int a);  // bit population
 
-uint32_t __bswapsi2(uint32_t a);   // a byteswapped, arm only
-uint64_t __bswapdi2(uint64_t a);   // a byteswapped, arm only
+uint32_t __bswapsi2(uint32_t a);   // a byteswapped, arm/mips only
+uint64_t __bswapdi2(uint64_t a);   // a byteswapped, arm/mips only
 
 // Integral arithmetic
 
 di_int __negdi2    (di_int a);                         // -a
 ti_int __negti2    (ti_int a);                         // -a
 di_int __muldi3    (di_int a, di_int b);               // a * b
 ti_int __multi3    (ti_int a, ti_int b);               // a * b
 si_int __divsi3    (si_int a, si_int b);               // a / b   signed
 di_int __divdi3    (di_int a, di_int b);               // a / b   signed
 ti_int __divti3    (ti_int a, ti_int b);               // a / b   signed
 su_int __udivsi3   (su_int n, su_int d);               // a / b   unsigned
 du_int __udivdi3   (du_int a, du_int b);               // a / b   unsigned
 tu_int __udivti3   (tu_int a, tu_int b);               // a / b   unsigned
 si_int __modsi3    (si_int a, si_int b);               // a % b   signed
 di_int __moddi3    (di_int a, di_int b);               // a % b   signed
 ti_int __modti3    (ti_int a, ti_int b);               // a % b   signed
 su_int __umodsi3   (su_int a, su_int b);               // a % b   unsigned
 du_int __umoddi3   (du_int a, du_int b);               // a % b   unsigned
 tu_int __umodti3   (tu_int a, tu_int b);               // a % b   unsigned
 du_int __udivmoddi4(du_int a, du_int b, du_int* rem);  // a / b, *rem = a % b  unsigned
 tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem);  // a / b, *rem = a % b  unsigned
 su_int __udivmodsi4(su_int a, su_int b, su_int* rem);  // a / b, *rem = a % b  unsigned
 si_int __divmodsi4(si_int a, si_int b, si_int* rem);   // a / b, *rem = a % b  signed
 
 
 
 //  Integral arithmetic with trapping overflow
 
 si_int __absvsi2(si_int a);           // abs(a)
 di_int __absvdi2(di_int a);           // abs(a)
 ti_int __absvti2(ti_int a);           // abs(a)
 
 si_int __negvsi2(si_int a);           // -a
 di_int __negvdi2(di_int a);           // -a
 ti_int __negvti2(ti_int a);           // -a
 
 si_int __addvsi3(si_int a, si_int b);  // a + b
 di_int __addvdi3(di_int a, di_int b);  // a + b
 ti_int __addvti3(ti_int a, ti_int b);  // a + b
 
 si_int __subvsi3(si_int a, si_int b);  // a - b
 di_int __subvdi3(di_int a, di_int b);  // a - b
 ti_int __subvti3(ti_int a, ti_int b);  // a - b
 
 si_int __mulvsi3(si_int a, si_int b);  // a * b
 di_int __mulvdi3(di_int a, di_int b);  // a * b
 ti_int __mulvti3(ti_int a, ti_int b);  // a * b
 
 
 // Integral arithmetic which returns if overflow
 
 si_int __mulosi4(si_int a, si_int b, int* overflow);  // a * b, overflow set to one if result not in signed range
 di_int __mulodi4(di_int a, di_int b, int* overflow);  // a * b, overflow set to one if result not in signed range
 ti_int __muloti4(ti_int a, ti_int b, int* overflow);  // a * b, overflow set to
  one if result not in signed range
 
 
 //  Integral comparison: a  < b -> 0
 //                       a == b -> 1
 //                       a  > b -> 2
 
 si_int __cmpdi2 (di_int a, di_int b);
 si_int __cmpti2 (ti_int a, ti_int b);
 si_int __ucmpdi2(du_int a, du_int b);
 si_int __ucmpti2(tu_int a, tu_int b);
 
 //  Integral / floating point conversion
 
 di_int __fixsfdi(      float a);
 di_int __fixdfdi(     double a);
 di_int __fixxfdi(long double a);
 
 ti_int __fixsfti(      float a);
 ti_int __fixdfti(     double a);
 ti_int __fixxfti(long double a);
 uint64_t __fixtfdi(long double input);  // ppc only, doesn't match documentation
 
 su_int __fixunssfsi(      float a);
 su_int __fixunsdfsi(     double a);
 su_int __fixunsxfsi(long double a);
 
 du_int __fixunssfdi(      float a);
 du_int __fixunsdfdi(     double a);
 du_int __fixunsxfdi(long double a);
 
 tu_int __fixunssfti(      float a);
 tu_int __fixunsdfti(     double a);
 tu_int __fixunsxfti(long double a);
 uint64_t __fixunstfdi(long double input);  // ppc only
 
 float       __floatdisf(di_int a);
 double      __floatdidf(di_int a);
 long double __floatdixf(di_int a);
 long double __floatditf(int64_t a);        // ppc only
 
 float       __floattisf(ti_int a);
 double      __floattidf(ti_int a);
 long double __floattixf(ti_int a);
 
 float       __floatundisf(du_int a);
 double      __floatundidf(du_int a);
 long double __floatundixf(du_int a);
 long double __floatunditf(uint64_t a);     // ppc only
 
 float       __floatuntisf(tu_int a);
 double      __floatuntidf(tu_int a);
 long double __floatuntixf(tu_int a);
 
 //  Floating point raised to integer power
 
 float       __powisf2(      float a, si_int b);  // a ^ b
 double      __powidf2(     double a, si_int b);  // a ^ b
 long double __powixf2(long double a, si_int b);  // a ^ b
 long double __powitf2(long double a, si_int b);  // ppc only, a ^ b
 
 //  Complex arithmetic
 
 //  (a + ib) * (c + id)
 
       float _Complex __mulsc3( float a,  float b,  float c,  float d);
      double _Complex __muldc3(double a, double b, double c, double d);
 long double _Complex __mulxc3(long double a, long double b,
                               long double c, long double d);
 long double _Complex __multc3(long double a, long double b,
                               long double c, long double d); // ppc only
 
 //  (a + ib) / (c + id)
 
       float _Complex __divsc3( float a,  float b,  float c,  float d);
      double _Complex __divdc3(double a, double b, double c, double d);
 long double _Complex __divxc3(long double a, long double b,
                               long double c, long double d);
 long double _Complex __divtc3(long double a, long double b,
                               long double c, long double d);  // ppc only
 
 
 //         Runtime support
 
 // __clear_cache() is used to tell process that new instructions have been
 // written to an address range.  Necessary on processors that do not have
 // a unified instruction and data cache.
 void __clear_cache(void* start, void* end);
 
 // __enable_execute_stack() is used with nested functions when a trampoline
 // function is written onto the stack and that page range needs to be made
 // executable.
 void __enable_execute_stack(void* addr);
 
 // __gcc_personality_v0() is normally only called by the system unwinder.
 // C code (as opposed to C++) normally does not need a personality function
 // because there are no catch clauses or destructors to be run.  But there
 // is a C language extension __attribute__((cleanup(func))) which marks local
 // variables as needing the cleanup function "func" to be run when the
 // variable goes out of scope.  That includes when an exception is thrown,
 // so a personality handler is needed.  
 _Unwind_Reason_Code __gcc_personality_v0(int version, _Unwind_Action actions,
          uint64_t exceptionClass, struct _Unwind_Exception* exceptionObject,
          _Unwind_Context_t context);
 
 // for use with some implementations of assert() in <assert.h>
 void __eprintf(const char* format, const char* assertion_expression,
 				const char* line, const char* file);
 
 // for systems with emulated thread local storage
 void* __emutls_get_address(struct __emutls_control*);
 
 
 //   Power PC specific functions
 
 // There is no C interface to the saveFP/restFP functions.  They are helper
 // functions called by the prolog and epilog of functions that need to save
 // a number of non-volatile float point registers.  
 saveFP
 restFP
 
 // PowerPC has a standard template for trampoline functions.  This function
 // generates a custom trampoline function with the specific realFunc
 // and localsPtr values.
 void __trampoline_setup(uint32_t* trampOnStack, int trampSizeAllocated, 
                                 const void* realFunc, void* localsPtr);
 
 // adds two 128-bit double-double precision values ( x + y )
 long double __gcc_qadd(long double x, long double y);  
 
 // subtracts two 128-bit double-double precision values ( x - y )
 long double __gcc_qsub(long double x, long double y); 
 
 // multiples two 128-bit double-double precision values ( x * y )
 long double __gcc_qmul(long double x, long double y);  
 
 // divides two 128-bit double-double precision values ( x / y )
 long double __gcc_qdiv(long double a, long double b);  
 
 
 //    ARM specific functions
 
 // There is no C interface to the switch* functions.  These helper functions
 // are only needed by Thumb1 code for efficient switch table generation.
 switch16
 switch32
 switch8
 switchu8
 
 // There is no C interface to the *_vfp_d8_d15_regs functions.  There are
 // called in the prolog and epilog of Thumb1 functions.  When the C++ ABI use
 // SJLJ for exceptions, each function with a catch clause or destuctors needs
 // to save and restore all registers in it prolog and epliog.  But there is 
 // no way to access vector and high float registers from thumb1 code, so the 
 // compiler must add call outs to these helper functions in the prolog and 
 // epilog.
 restore_vfp_d8_d15_regs
 save_vfp_d8_d15_regs
 
 
 // Note: long ago ARM processors did not have floating point hardware support.
 // Floating point was done in software and floating point parameters were 
 // passed in integer registers.  When hardware support was added for floating
 // point, new *vfp functions were added to do the same operations but with 
 // floating point parameters in floating point registers.
 
 // Undocumented functions
 
 float  __addsf3vfp(float a, float b);   // Appears to return a + b
 double __adddf3vfp(double a, double b); // Appears to return a + b
 float  __divsf3vfp(float a, float b);   // Appears to return a / b
 double __divdf3vfp(double a, double b); // Appears to return a / b
 int    __eqsf2vfp(float a, float b);    // Appears to return  one
                                         //     iff a == b and neither is NaN.
 int    __eqdf2vfp(double a, double b);  // Appears to return  one
                                         //     iff a == b and neither is NaN.
 double __extendsfdf2vfp(float a);       // Appears to convert from
                                         //     float to double.
 int    __fixdfsivfp(double a);          // Appears to convert from
                                         //     double to int.
 int    __fixsfsivfp(float a);           // Appears to convert from
                                         //     float to int.
 unsigned int __fixunssfsivfp(float a);  // Appears to convert from
                                         //     float to unsigned int.
 unsigned int __fixunsdfsivfp(double a); // Appears to convert from
                                         //     double to unsigned int.
 double __floatsidfvfp(int a);           // Appears to convert from
                                         //     int to double.
 float __floatsisfvfp(int a);            // Appears to convert from
                                         //     int to float.
 double __floatunssidfvfp(unsigned int a); // Appears to convert from
                                         //     unisgned int to double.
 float __floatunssisfvfp(unsigned int a); // Appears to convert from
                                         //     unisgned int to float.
 int __gedf2vfp(double a, double b);     // Appears to return __gedf2
                                         //     (a >= b)
 int __gesf2vfp(float a, float b);       // Appears to return __gesf2
                                         //     (a >= b)
 int __gtdf2vfp(double a, double b);     // Appears to return __gtdf2
                                         //     (a > b)
 int __gtsf2vfp(float a, float b);       // Appears to return __gtsf2
                                         //     (a > b)
 int __ledf2vfp(double a, double b);     // Appears to return __ledf2
                                         //     (a <= b)
 int __lesf2vfp(float a, float b);       // Appears to return __lesf2
                                         //     (a <= b)
 int __ltdf2vfp(double a, double b);     // Appears to return __ltdf2
                                         //     (a < b)
 int __ltsf2vfp(float a, float b);       // Appears to return __ltsf2
                                         //     (a < b)
 double __muldf3vfp(double a, double b); // Appears to return a * b
 float __mulsf3vfp(float a, float b);    // Appears to return a * b
 int __nedf2vfp(double a, double b);     // Appears to return __nedf2
                                         //     (a != b)
 double __negdf2vfp(double a);           // Appears to return -a
 float __negsf2vfp(float a);             // Appears to return -a
 float __negsf2vfp(float a);             // Appears to return -a
 double __subdf3vfp(double a, double b); // Appears to return a - b
 float __subsf3vfp(float a, float b);    // Appears to return a - b
 float __truncdfsf2vfp(double a);        // Appears to convert from
                                         //     double to float.
 int __unorddf2vfp(double a, double b);  // Appears to return __unorddf2
 int __unordsf2vfp(float a, float b);    // Appears to return __unordsf2
 
 
 Preconditions are listed for each function at the definition when there are any.
 Any preconditions reflect the specification at
 http://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc.
 
 Assumptions are listed in "int_lib.h", and in individual files.  Where possible
 assumptions are checked at compile time.
Index: projects/clang500-import/contrib/compiler-rt/lib/builtins/bswapdi2.c
===================================================================
--- projects/clang500-import/contrib/compiler-rt/lib/builtins/bswapdi2.c	(nonexistent)
+++ projects/clang500-import/contrib/compiler-rt/lib/builtins/bswapdi2.c	(revision 318658)
@@ -0,0 +1,28 @@
+/* ===-- bswapdi2.c - Implement __bswapdi2 ---------------------------------===
+ *
+ *               The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===----------------------------------------------------------------------===
+ *
+ * This file implements __bswapdi2 for the compiler_rt library.
+ *
+ * ===----------------------------------------------------------------------===
+ */
+
+#include "int_lib.h"
+
+COMPILER_RT_ABI uint64_t
+__bswapdi2 (uint64_t u)
+{
+	return ((((u) & 0xff00000000000000ULL) >> 56)
+	    | (((u) & 0x00ff000000000000ULL) >> 40)
+	    | (((u) & 0x0000ff0000000000ULL) >> 24)
+	    | (((u) & 0x000000ff00000000ULL) >>  8)
+	    | (((u) & 0x00000000ff000000ULL) <<  8)
+	    | (((u) & 0x0000000000ff0000ULL) << 24)
+	    | (((u) & 0x000000000000ff00ULL) << 40)
+	    | (((u) & 0x00000000000000ffULL) << 56));
+}

Property changes on: projects/clang500-import/contrib/compiler-rt/lib/builtins/bswapdi2.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/contrib/compiler-rt/lib/builtins/bswapsi2.c
===================================================================
--- projects/clang500-import/contrib/compiler-rt/lib/builtins/bswapsi2.c	(nonexistent)
+++ projects/clang500-import/contrib/compiler-rt/lib/builtins/bswapsi2.c	(revision 318658)
@@ -0,0 +1,25 @@
+/* ===-- bswapsi2.c - Implement __bswapsi2 ---------------------------------===
+ *
+ *               The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===----------------------------------------------------------------------===
+ *
+ * This file implements __bswapsi2 for the compiler_rt library.
+ *
+ * ===----------------------------------------------------------------------===
+ */
+
+#include "int_lib.h"
+
+COMPILER_RT_ABI uint32_t
+__bswapsi2 (uint32_t u)
+{
+
+	return ((((u) & 0xff000000) >> 24)
+	    | (((u) & 0x00ff0000) >>  8)
+	    | (((u) & 0x0000ff00) <<  8)
+	    | (((u) & 0x000000ff) << 24));
+}

Property changes on: projects/clang500-import/contrib/compiler-rt/lib/builtins/bswapsi2.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/contrib/compiler-rt
===================================================================
--- projects/clang500-import/contrib/compiler-rt	(revision 318657)
+++ projects/clang500-import/contrib/compiler-rt	(revision 318658)

Property changes on: projects/clang500-import/contrib/compiler-rt
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/contrib/compiler-rt:r316992-318657
Index: projects/clang500-import/contrib/dma/dma.8
===================================================================
--- projects/clang500-import/contrib/dma/dma.8	(revision 318657)
+++ projects/clang500-import/contrib/dma/dma.8	(revision 318658)
@@ -1,364 +1,365 @@
 .\"
 .\" Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>.
 .\" Copyright (c) 2008
 .\"	The DragonFly Project.  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 DragonFly Project 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 COPYRIGHT HOLDERS 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
 .\" COPYRIGHT HOLDERS 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.
 .\"
-.Dd February 13, 2014
+.Dd May 20, 2017
 .Dt DMA 8
 .Os
 .Sh NAME
 .Nm dma
 .Nd DragonFly Mail Agent
 .Sh SYNOPSIS
 .Nm
 .Op Fl DiOt
 .Op Fl A Ns Ar mode
 .Op Fl b Ns Ar mode
 .Op Fl f Ar sender
 .Op Fl L Ar tag
 .Op Fl o Ns Ar option
 .Op Fl r Ar sender
 .Op Fl q Ns Op Ar arg
 .Op Ar recipient ...
 .Sh DESCRIPTION
 .Nm
 is a small Mail Transport Agent (MTA), designed for home and office use.
 It accepts mails from locally installed Mail User Agents (MUA) and
 delivers the mails either locally or to a remote destination.
 Remote delivery includes several features like TLS/SSL support and SMTP
 authentication.
 .Pp
 .Nm
 is not intended as a replacement for real, big MTAs like
 .Xr sendmail 8
 or
 .Xr postfix 1 .
 Consequently,
 .Nm
 does not listen on port 25 for incoming connections.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl A Ns Ar mode
 .Fl \&Ac
 acts as a compatibility option for sendmail.
 .It Fl b Ns Ar mode
 .Bl -tag -width indent
 .It Fl bp
 List all mails currently stored in the mail queue.
 .It Fl bq
-Queue the mail, but don't attempt to deliver it.
+Queue the mail, but do not attempt to deliver it.
 See also the
 .Sq DEFER
 config file setting below.
 .El
 .Pp
 All other
 .Ar mode Ns
-s are are ignored.
+s are ignored.
 .It Fl D
-Don't run in the background.
+Do not run in the background.
 Useful for debugging.
 .It Fl f Ar sender
 Set sender address (envelope-from) to
 .Ar sender .
 This overrides the value of the environment variable
 .Ev EMAIL .
 .It Fl i
 Ignore dots alone on lines by themselves in incoming messages.
 This should be set if you are reading data from a file.
 .It Fl L Ar tag
 Set the identifier used in syslog messages to the supplied
 .Ar tag .
 This is a compatibility option for sendmail.
 .It Fl O
 This is a compatibility option for sendmail.
 .It Fl o Ns Ar option
 Specifying
 .Fl oi
 is synonymous to
 .Fl i .
 All other options are ignored.
 .It Fl q Ns Op Ar arg
 Process saved messages in the queue.
 The argument is optional and ignored.
 .It Fl r Ar sender
 Same as
 .Fl f .
 .It Fl t
 Obtain recipient addresses from the message header.
 .Nm
 will parse the
 .Li To: ,
 .Li Cc: ,
 and
 .Li Bcc:
 headers.
 The
 .Li Bcc:
 header will be removed independent of whether
 .Fl t
 is specified or not.
 .El
 .Sh CONFIGURATION
 .Nm
 can be configured with two config files:
 .Pp
 .Bl -bullet -compact
 .It
 auth.conf
 .It
 dma.conf
 .El
 .Pp
 These two files are stored per default in
 .Pa /etc/dma .
 .Sh FILE FORMAT
 Every file contains parameters of the form
 .Sq name value .
 Lines containing boolean values are set to
 .Sq NO
 if the line is commented and to
 .Sq YES
 if the line is uncommented.
 Empty lines or lines beginning with a
 .Sq #
 are ignored.
 Parameter names and their values are case sensitive.
 .Sh PARAMETERS
 .Ss auth.conf
 SMTP authentication can be configured in
 .Pa auth.conf .
 Each line has the format
 .Dq Li user|smarthost:password .
 .Ss dma.conf
 Most of the behaviour of
 .Nm
 can be configured in
 .Pa dma.conf .
 .Bl -tag -width 4n
 .It Ic SMARTHOST Xo
 (string, default=empty)
 .Xc
 If you want to send outgoing mails via a smarthost, set this variable to
 your smarthosts address.
 .It Ic PORT Xo
 (numeric, default=25)
 .Xc
 Use this port to deliver remote emails.
 Only useful together with the
 .Sq SMARTHOST
 option, because
 .Nm
 will deliver all mails to this port, regardless of whether a smarthost is set
 or not.
 .It Ic ALIASES Xo
 (string, default=/etc/aliases)
 .Xc
 Path to the local aliases file.
 Just stick with the default.
 The aliases file is of the format
 .Dl nam: dest1 dest2 ...
 In this case, mails to
 .Li nam
 will instead be delivered to
 .Li dest1
 and
 .Li dest2 ,
 which in turn could be entries in
 .Pa /etc/aliases .
 The special name
 .Ql *
 can be used to create a catch-all alias, which gets used if no other
 matching alias is found.
-Use the catch-all alias only if you don't want any local mail to be
+Use the catch-all alias only if you do not want any local mail to be
 delivered.
 .It Ic SPOOLDIR Xo
 (string, default=/var/spool/dma)
 .Xc
 Path to
 .Nm Ap s
 spool directory.
 Just stick with the default.
 .It Ic AUTHPATH Xo
 (string, default=not set)
 .Xc
 Path to the
 .Sq auth.conf
 file.
-.It Ic SECURETRANS Xo
+.It Ic SECURETRANSFER Xo
 (boolean, default=commented)
 .Xc
 Uncomment if you want TLS/SSL secured transfer.
 .It Ic STARTTLS Xo
 (boolean, default=commented)
 .Xc
 Uncomment if you want to use STARTTLS.
 Only useful together with
-.Sq SECURETRANS .
+.Sq SECURETRANSFER .
 .It Ic OPPORTUNISTIC_TLS Xo
 (boolean, default=commented)
 .Xc
 Uncomment if you want to allow the STARTTLS negotiation to fail.
 Most useful when
 .Nm
 is used without a smarthost, delivering remote messages directly to
 the outside mail exchangers; in opportunistic TLS mode, the connection will
 be encrypted if the remote server supports STARTTLS, but an unencrypted
 delivery will still be made if the negotiation fails.
 Only useful together with
-.Sq SECURETRANS
+.Sq SECURETRANSFER
 and
 .Sq STARTTLS .
 .It Ic CERTFILE Xo
 (string, default=empty)
 .Xc
 Path to your SSL certificate file.
 .It Ic SECURE Xo
 (boolean, default=commented)
 .Xc
 Uncomment this entry and change it to
 .Sq INSECURE
 to use plain text SMTP login over an insecure connection.
 You have to rename this variable manually to prevent that you send your
 password accidentally over an insecure connection.
 .It Ic DEFER Xo
 (boolean, default=commented)
 .Xc
 Uncomment if you want that
 .Nm
 defers your mail.
 You have to flush your mail queue manually with the
 .Fl q
 option.
 This option is handy if you are behind a dialup line.
 .It Ic FULLBOUNCE Xo
 (boolean, default=commented)
 .Xc
 Uncomment if you want the bounce message to include the complete original
 message, not just the headers.
 .It Ic MAILNAME Xo
 (string, default=empty)
 .Xc
 The internet hostname
 .Nm
 uses to identify the host.
 If not set or empty, the result of
 .Xr gethostname 3
 is used.
 If
 .Sq MAILNAME
 is an absolute path to a file, the first line of this file will be used
 as the hostname.
 .It Ic MASQUERADE Xo
 (string, default=empty)
 .Xc
 Masquerade the envelope-from addresses with this address/hostname.
 Use this setting if mails are not accepted by destination mail servers
 because your sender domain is invalid.
 This setting is overridden by the
 .Fl f
 flag and the
 .Ev EMAIL
 environment variable.
 .Pp
 If
 .Sq MASQUERADE
 does not contain a
 .Li @
 sign, the string is interpreted as a host name.
 For example, setting
 .Sq MASQUERADE
 to
 .Ql john@
 on host
 .Ql hamlet
 will send all mails as
 .Ql john@hamlet ;
 setting it to
 .Ql percolator
 will send all mails as
-.Ql Sm off Va username @percolator .
+.Sm off
+.Ql Va username @percolator .
 .Sm on
 .It Ic NULLCLIENT Xo
 .Xc
 Bypass aliases and local delivery, and instead forward all mails to
 the defined
 .Sq SMARTHOST .
 .Sq NULLCLIENT
 requires
 .Sq SMARTHOST
 to be set.
 .El
 .Ss Environment variables
 The behavior of
 .Nm
 can be influenced by some environment variables.
 .Bl -tag -width 4n
 .It Ev EMAIL Xo
 .Xc
 Used to set the sender address (envelope-from).
 Use a plain address, in the form of
 .Li user@example.com .
 This value will be overridden when the
 .Fl f
 flag is used.
 .El
 .Sh SEE ALSO
 .Xr mailaddr 7 ,
 .Xr mailwrapper 8 ,
 .Xr sendmail 8
 .Rs
 .%A "J. B. Postel"
 .%T "Simple Mail Transfer Protocol"
 .%O RFC 821
 .Re
 .Rs
 .%A "J. Myers"
 .%T "SMTP Service Extension for Authentication"
 .%O RFC 2554
 .Re
 .Rs
 .%A "P. Hoffman"
 .%T "SMTP Service Extension for Secure SMTP over TLS"
 .%O RFC 2487
 .Re
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
 .Dx 1.11 .
 .Sh AUTHORS
 .An -nosplit
 .Nm
 was written by
 .An Matthias Schmidt Aq Mt matthias@dragonflybsd.org
 and
 .An Simon Schubert Aq Mt 2@0x2c.org .
Index: projects/clang500-import/contrib/dma
===================================================================
--- projects/clang500-import/contrib/dma	(revision 318657)
+++ projects/clang500-import/contrib/dma	(revision 318658)

Property changes on: projects/clang500-import/contrib/dma
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/contrib/dma:r316992-318657
Index: projects/clang500-import/contrib/elftoolchain/nm/nm.1
===================================================================
--- projects/clang500-import/contrib/elftoolchain/nm/nm.1	(revision 318657)
+++ projects/clang500-import/contrib/elftoolchain/nm/nm.1	(revision 318658)
@@ -1,338 +1,340 @@
 .\" Copyright (c) 2007 Hyogeol Lee <hyogeollee@gmail.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
 .\"    in this position and unchanged.
 .\" 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 AUTHORS ``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.
 .\"
 .\" $Id: nm.1 3195 2015-05-12 17:22:19Z emaste $
 .\"
-.Dd February 15, 2015
+.Dd May 21, 2017
 .Os
 .Dt NM 1
 .Sh NAME
 .Nm nm
 .Nd display symbolic information in object files
 .Sh SYNOPSIS
 .Nm
 .Op Fl -debug-syms
 .Op Fl -defined-only
 .Op Fl -demangle Ns Op = Ns style
 .Op Fl -dynamic
 .Op Fl -extern-only
 .Op Fl -help
 .Op Fl -line-numbers
 .Op Fl -no-demangle
 .Op Fl -no-sort
 .Op Fl -numeric-sort
 .Op Fl -print-armap
 .Op Fl -print-file-name
 .Op Fl -print-size
 .Op Fl -radix= Ns Ar format
 .Op Fl -reverse-sort
 .Op Fl -size-sort
 .Op Fl -undefined-only
 .Op Fl -version
 .Op Fl A
 .Op Fl B
 .Op Fl C Op Ar style
 .Op Fl D
 .Op Fl P
 .Op Fl V
 .Op Fl a
 .Op Fl e
 .Op Fl g
 .Op Fl h
 .Op Fl l
 .Op Fl n
 .Op Fl o
 .Op Fl p
 .Op Fl r
 .Op Fl S
 .Op Fl s
 .Op Fl t Ar format
 .Op Fl u
 .Op Fl x
 .Ar
 .Sh DESCRIPTION
 The
 .Nm
 utility displays symbolic information in the object files,
 executables, and object library files named by its arguments.
 Lack of symbolic information in an otherwise valid input
 file, is not considered to be an error.
 If no files are specified on the command line,
 .Nm
 will attempt to read
 .Pa a.out .
 .Pp
 The
 .Nm
 utility recognizes the following options:
 .Bl -tag -width ".Fl d Ar argument"
 .It Fl -debug-syms
 Display all symbols, including debugger-only symbols.
 .It Fl -defined-only
 Display only defined symbols.
 .It Fl -demangle Ns Op = Ns Ar style
 Decode (demangle) low-level symbol names into human-readable names.
 Supported values for argument
 .Ar style
 are
 .Sq auto ,
 .Sq gnu-v2 ,
 .Sq gnu-v3
 and
 .Sq arm.
 If argument
 .Ar style
 is not specified, it is taken to be
 .Sq auto .
 .It Fl -dynamic
 Only display dynamic symbols.
 This option is only meaningful for shared libraries.
 .It Fl -extern-only
 Only display information about global (external) symbols.
 .It Fl -help
 Display a help message and exit.
 .It Fl -format Ns = Ns Ar format
 Display output in the format specified by argument
 .Ar format .
 Supported values for the format argument are
 .Sq bsd ,
 .Sq sysv ,
 and
 .Sq posix .
 The default output format is
 .Sq bsd .
 .It Fl -line-numbers
 Display the filename and line number associated a symbol using
 any debugging information present in the input file.
 For defined symbols, look up the line number associated with
 the address of the symbol.
 For undefined symbols, look up the line number associated with
 a relocation entry that refers to the symbol.
 If line number information can be determined, it is displayed after
 other symbol information.
 .It Fl -no-demangle
 Do not demangle symbol names (default).
 .It Fl -no-sort
 Do not sort symbols.
 .It Fl -numeric-sort
 Sort symbols numerically by address instead of alphabetically by name.
 .It Fl -print-armap
 For
 .Xr ar 1
 archives, include the index of the archive's members.
 .It Fl -print-file-name
 Write the full pathname or library name of an object on each line,
 before the rest of the information for a symbol.
 If this option is not specified,
 .Nm
 will only identify an input file once, before its symbols are
 listed.
 .It Fl -print-size
 Print the size of each symbol instead of its value.
 .It Fl -radix Ns = Ns Ar radix
 Print numeric values using the specified radix.
 Supported values for argument
 .Ar radix
 are
 .Sq d
 for decimal,
 .Sq o
 for octal, and
 .Sq x
 for hexadecimal.
 .It Fl -reverse-sort
 Reverse the order of the sort.
 .It Fl -size-sort
 Sort symbols by size instead of alphabetically by name.
 .It Fl -undefined-only
 Display only undefined symbols.
 .It Fl -version
 Display the version identifier for
 .Nm
 and exit.
 .It Fl A
 Equivalent to specifying option
 .Fl -print-file-name .
 .It Fl B
 Equivalent to specifying option
 .Fl -format= Ns Ar bsd .
 .It Fl C Op Ar style
 Equivalent to specifying option
 .Fl -demangle Ns Op = Ns Ar style .
 .It Fl D
 Equivalent to specifying option
 .Fl -dynamic .
 .It Fl F Ar format
 Equivalent to specifying option
 .Fl -format Ns = Ns Ar format .
 .It Fl P
 Equivalent to specifying option
 .Fl -format Ns = Ns Ar posix .
 .It Fl S
 Equivalent to specifying option
 .Fl -print-size .
 .It Fl V
 Equivalent to specifying option
 .Fl -version .
 .It Fl a
 Equivalent to specifying option
 .Fl -debug-syms .
 .It Fl e
 Only display information for global and static symbols.
 .It Fl f
 Produce full output (default).
 .It Fl g
 Equivalent to specifying option
 .Fl -extern-only .
 .It Fl h
 Equivalent to specifying option
 .Fl -help .
 .It Fl l
 Equivalent to specifying option
 .Fl -line-numbers .
 .It Fl n
 Equivalent to specifying option
 .Fl -numeric-sort .
 .It Fl o
 If POSIX output was specified using the
 .Fl F Ar posix
 or
 .Fl P
 options, this option is equivalent to specifying
 .Fl -radix Ns = Ns Sq Ar o .
 If POSIX output was not specified, this option
 acts as a synonym for the
 .Fl -print-file-name
 option.
 .It Fl p
 Equivalent to specifying option
 .Fl -no-sort .
 .It Fl v
 Equivalent to option
 .Fl n .
 .It Fl r
 Equivalent to specifying option
 .Fl -reverse-sort
 .It Fl s
 Equivalent to specifying option
 .Fl -print-armap .
 .It Fl t Ar radix
 Equivalent to specifying option
 .Fl -radix= Ns Ar radix .
 .It Fl u
 Equivalent to specifying option
 .Fl -undefined-only .
 .It Fl x
 Write numeric values in hexadecimal (equivalent to -t x).
 .El
 .Sh OUTPUT FORMAT
 .Pp
 The
 .Nm
 utility can present its information in a number of formats, numeric
 radices and sort orders.
 By default
 .Nm
 uses BSD style output, a hexadecimal radix, without output sorted
 alphabetically by name and without demangling of names.
 .Pp
 For each symbol listed,
 .Nm
 presents the following information:
 .Bl -bullet -compact
 .It
 The library or object name, if options
 .Fl A
 or
 .Fl -print-file-name
 were specified.
 .It
 The symbol name.
 .It
 The type of the symbol denoted by a single character as below:
 .Bl -tag -compact -width indent
 .It A
 A global, absolute symbol.
 .It B
 A global
 .Dq bss
 (uninitialized data) symbol.
 .It C
 A
 .Dq common
 symbol, representing uninitialized data.
 .It D
 A global symbol naming initialized data.
 .It N
 A debugger symbol.
 .It R
 A read-only data symbol.
 .It T
 A global text symbol.
 .It U
 An undefined symbol.
 .It V
 A weak object.
 .It W
 A weak reference.
 .It a
 A local absolute symbol.
 .It b
 A local
 .Dq bss
 (uninitialized data) symbol.
 .It d
 A local data symbol.
+.It r
+A local read-only data symbol.
 .It t
 A local text symbol.
 .It v
 A weak object that is undefined.
 .It w
 A weak symbol that is undefined.
 .It ?
 None of the above.
 .El
 .It
 The value of the symbol.
 .It
 The size of the symbol if applicable.
 .It
 Line number information, if available and if options
 .Fl l
 or
 .Fl -line-numbers
 were specified.
 .El
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr ar 1 ,
 .Xr objdump 1 ,
 .Xr ranlib 1 ,
 .Xr elf 3
 .Sh AUTHORS
 The
 .Nm
 utility and this manual page were written by
 .An Hyogeol Lee Aq Mt hyogeollee@gmail.com .
Index: projects/clang500-import/contrib/elftoolchain
===================================================================
--- projects/clang500-import/contrib/elftoolchain	(revision 318657)
+++ projects/clang500-import/contrib/elftoolchain	(revision 318658)

Property changes on: projects/clang500-import/contrib/elftoolchain
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/contrib/elftoolchain:r317808-318657
Index: projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
===================================================================
--- projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	(revision 318657)
+++ projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	(revision 318658)
@@ -1,614 +1,669 @@
 # $NetBSD: t_grep.sh,v 1.3 2017/01/14 20:43:52 christos Exp $
 #
 # Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
 # 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.
 #
 
 atf_test_case basic
 basic_head()
 {
 	atf_set "descr" "Checks basic functionality"
 }
 basic_body()
 { 
 	atf_check -o file:"$(atf_get_srcdir)/d_basic.out" -x \
 	    'jot 10000 | grep 123'
 }
 
 atf_test_case binary
 binary_head()
 {
 	atf_set "descr" "Checks handling of binary files"
 }
 binary_body()
 {
 	dd if=/dev/zero count=1 of=test.file
 	echo -n "foobar" >> test.file
 	atf_check -o file:"$(atf_get_srcdir)/d_binary.out" grep foobar test.file
 }
 
 atf_test_case recurse
 recurse_head()
 {
 	atf_set "descr" "Checks recursive searching"
 }
 recurse_body()
 {
 	mkdir -p recurse/a/f recurse/d
 	echo -e "cod\ndover sole\nhaddock\nhalibut\npilchard" > recurse/d/fish
 	echo -e "cod\nhaddock\nplaice" > recurse/a/f/favourite-fish
 
 	atf_check -o file:"$(atf_get_srcdir)/d_recurse.out" -x "grep -r haddock recurse | sort"
 }
 
 atf_test_case recurse_symlink
 recurse_symlink_head()
 {
 	atf_set "descr" "Checks symbolic link recursion"
 }
 recurse_symlink_body()
 {
 	# Begin FreeBSD
 	grep_type
 	if [ $? -eq $GREP_TYPE_GNU ]; then
 		atf_expect_fail "this test doesn't pass with gnu grep from ports"
 	fi
 	# End FreeBSD
 	mkdir -p test/c/d
 	(cd test/c/d && ln -s ../d .)
 	echo "Test string" > test/c/match
 
 	atf_check -o file:"$(atf_get_srcdir)/d_recurse_symlink.out" \
 	    -e file:"$(atf_get_srcdir)/d_recurse_symlink.err" \
 	    grep -r string test
 }
 
 atf_test_case word_regexps
 word_regexps_head()
 {
 	atf_set "descr" "Checks word-regexps"
 }
 word_regexps_body()
 {
 	atf_check -o file:"$(atf_get_srcdir)/d_word_regexps.out" \
 	    grep -w separated $(atf_get_srcdir)/d_input
 
 	# Begin FreeBSD
 	printf "xmatch pmatch\n" > test1
 
 	atf_check -o inline:"pmatch\n" grep -Eow "(match )?pmatch" test1
 	# End FreeBSD
 }
 
 atf_test_case begin_end
 begin_end_head()
 {
 	atf_set "descr" "Checks handling of line beginnings and ends"
 }
 begin_end_body()
 {
 	atf_check -o file:"$(atf_get_srcdir)/d_begin_end_a.out" \
 	    grep ^Front "$(atf_get_srcdir)/d_input"
 
 	atf_check -o file:"$(atf_get_srcdir)/d_begin_end_b.out" \
 	    grep ending$ "$(atf_get_srcdir)/d_input"
 }
 
 atf_test_case ignore_case
 ignore_case_head()
 {
 	atf_set "descr" "Checks ignore-case option"
 }
 ignore_case_body()
 {
 	atf_check -o file:"$(atf_get_srcdir)/d_ignore_case.out" \
 	    grep -i Upper "$(atf_get_srcdir)/d_input"
 }
 
 atf_test_case invert
 invert_head()
 {
 	atf_set "descr" "Checks selecting non-matching lines with -v option"
 }
 invert_body()
 {
 	atf_check -o file:"$(atf_get_srcdir)/d_invert.out" \
 	    grep -v fish "$(atf_get_srcdir)/d_invert.in"
 }
 
 atf_test_case whole_line
 whole_line_head()
 {
 	atf_set "descr" "Checks whole-line matching with -x flag"
 }
 whole_line_body()
 {
 	atf_check -o file:"$(atf_get_srcdir)/d_whole_line.out" \
 	    grep -x matchme "$(atf_get_srcdir)/d_input"
 }
 
 atf_test_case negative
 negative_head()
 {
 	atf_set "descr" "Checks handling of files with no matches"
 }
 negative_body()
 {
 	atf_check -s ne:0 grep "not a hope in hell" "$(atf_get_srcdir)/d_input"
 }
 
 atf_test_case context
 context_head()
 {
 	atf_set "descr" "Checks displaying context with -A, -B and -C flags"
 }
 context_body()
 {
 	cp $(atf_get_srcdir)/d_context_*.* .
 
 	atf_check -o file:d_context_a.out grep -C2 bamboo d_context_a.in
 	atf_check -o file:d_context_b.out grep -A3 tilt d_context_a.in
 	atf_check -o file:d_context_c.out grep -B4 Whig d_context_a.in
 	atf_check -o file:d_context_d.out grep -C1 pig d_context_a.in d_context_b.in
 	atf_check -o file:d_context_e.out \
 	    grep -E -C1 '(banana|monkey)' d_context_e.in
 	atf_check -o file:d_context_f.out \
 	    grep -Ev -B2 '(banana|monkey|fruit)' d_context_e.in
 	atf_check -o file:d_context_g.out \
 	    grep -Ev -A1 '(banana|monkey|fruit)' d_context_e.in
 }
 
 atf_test_case file_exp
 file_exp_head()
 {
 	atf_set "descr" "Checks reading expressions from file"
 }
 file_exp_body()
 {
 	atf_check -o file:"$(atf_get_srcdir)/d_file_exp.out" -x \
 	    'jot 21 -1 1.00 | grep -f '"$(atf_get_srcdir)"'/d_file_exp.in'
 }
 
 atf_test_case egrep
 egrep_head()
 {
 	atf_set "descr" "Checks matching special characters with egrep"
 }
 egrep_body()
 {
 	atf_check -o file:"$(atf_get_srcdir)/d_egrep.out" \
 		egrep '\?|\*$$' "$(atf_get_srcdir)/d_input"
 }
 
 atf_test_case zgrep
 zgrep_head()
 {
 	atf_set "descr" "Checks handling of gzipped files with zgrep"
 }
 zgrep_body()
 {
 	cp "$(atf_get_srcdir)/d_input" .
 	gzip d_input || atf_fail "gzip failed"
 
 	atf_check -o file:"$(atf_get_srcdir)/d_zgrep.out" zgrep -h line d_input.gz
 }
 
 atf_test_case nonexistent
 nonexistent_head()
 {
 	atf_set "descr" "Checks that -s flag suppresses error" \
 	                "messages about nonexistent files"
 }
 nonexistent_body()
 {
 	atf_check -s ne:0 grep -s foobar nonexistent
 }
 
 atf_test_case context2
 context2_head()
 {
 	atf_set "descr" "Checks displaying context with -z flag"
 }
 context2_body()
 {
 	printf "haddock\000cod\000plaice\000" > test1
 	printf "mackeral\000cod\000crab\000" > test2
 
 	atf_check -o file:"$(atf_get_srcdir)/d_context2_a.out" \
 	    grep -z -A1 cod test1 test2
 
 	atf_check -o file:"$(atf_get_srcdir)/d_context2_b.out" \
 	    grep -z -B1 cod test1 test2
 
 	atf_check -o file:"$(atf_get_srcdir)/d_context2_c.out" \
 	    grep -z -C1 cod test1 test2
 }
 # Begin FreeBSD
 
 # What grep(1) are we working with?
 # - 0 : bsdgrep
 # - 1 : gnu grep 2.51 (base)
 # - 2 : gnu grep (ports)
 GREP_TYPE_BSD=0
 GREP_TYPE_GNU_FREEBSD=1
 GREP_TYPE_GNU=2
 GREP_TYPE_UNKNOWN=3
 
 grep_type()
 {
 	local grep_version=$(grep --version)
 
 	case "$grep_version" in
 	*"BSD grep"*)
 		return $GREP_TYPE_BSD
 		;;
 	*"GNU grep"*)
 		case "$grep_version" in
 		*2.5.1-FreeBSD*)
 			return $GREP_TYPE_GNU_FREEBSD
 			;;
 		*)
 			return $GREP_TYPE_GNU
 			;;
 		esac
 		;;
 	esac
 	atf_fail "unknown grep type: $grep_version"
 }
 
 atf_test_case oflag_zerolen
 oflag_zerolen_head()
 {
 	atf_set "descr" "Check behavior of zero-length matches with -o flag (PR 195763)"
 }
 oflag_zerolen_body()
 {
 	grep_type
 	if [ $? -eq $GREP_TYPE_GNU_FREEBSD ]; then
 		atf_expect_fail "this test doesn't pass with gnu grep in base"
 	fi
 
 	atf_check -o file:"$(atf_get_srcdir)/d_oflag_zerolen_a.out" \
 	    grep -Eo '(^|:)0*' "$(atf_get_srcdir)/d_oflag_zerolen_a.in"
 
 	atf_check -o file:"$(atf_get_srcdir)/d_oflag_zerolen_b.out" \
 	    grep -Eo '(^|:)0*' "$(atf_get_srcdir)/d_oflag_zerolen_b.in"
 
 	atf_check -o file:"$(atf_get_srcdir)/d_oflag_zerolen_c.out" \
 	    grep -Eo '[[:alnum:]]*' "$(atf_get_srcdir)/d_oflag_zerolen_c.in"
 
 	atf_check -o empty grep -Eo '' "$(atf_get_srcdir)/d_oflag_zerolen_d.in"
 
 	atf_check -o file:"$(atf_get_srcdir)/d_oflag_zerolen_e.out" \
 	    grep -o -e 'ab' -e 'bc' "$(atf_get_srcdir)/d_oflag_zerolen_e.in"
 
 	atf_check -o file:"$(atf_get_srcdir)/d_oflag_zerolen_e.out" \
 	    grep -o -e 'bc' -e 'ab' "$(atf_get_srcdir)/d_oflag_zerolen_e.in"
 }
 
 atf_test_case xflag
 xflag_head()
 {
 	atf_set "descr" "Check that we actually get a match with -x flag (PR 180990)"
 }
 xflag_body()
 {
 	echo 128 > match_file
 	seq 1 128 > pattern_file
 	grep -xf pattern_file match_file
 }
 
 atf_test_case color
 color_head()
 {
 	atf_set "descr" "Check --color support"
 }
 color_body()
 {
 	grep_type
 	if [ $? -eq $GREP_TYPE_GNU_FREEBSD ]; then
 		atf_expect_fail "this test doesn't pass with gnu grep in base"
 	fi
 
 	echo 'abcd*' > grepfile
 	echo 'abc$' >> grepfile
 	echo '^abc' >> grepfile
 
 	atf_check -o file:"$(atf_get_srcdir)/d_color_a.out" \
 	    grep --color=auto -e '.*' -e 'a' "$(atf_get_srcdir)/d_color_a.in"
 
 	atf_check -o file:"$(atf_get_srcdir)/d_color_b.out" \
 	    grep --color=auto -f grepfile "$(atf_get_srcdir)/d_color_b.in"
 
 	atf_check -o file:"$(atf_get_srcdir)/d_color_c.out" \
 	    grep --color=always -f grepfile "$(atf_get_srcdir)/d_color_b.in"
 }
 
 atf_test_case f_file_empty
 f_file_empty_head()
 {
 	atf_set "descr" "Check for handling of a null byte in empty file, specified by -f (PR 202022)"
 }
 f_file_empty_body()
 {
 	printf "\0\n" > nulpat
 
 	atf_check -s exit:1 grep -f nulpat "$(atf_get_srcdir)/d_f_file_empty.in"
 }
 
 atf_test_case escmap
 escmap_head()
 {
 	atf_set "descr" "Check proper handling of escaped vs. unescaped dot expressions (PR 175314)"
 }
 escmap_body()
 {
 	atf_check -s exit:1 grep -o 'f.o\.' "$(atf_get_srcdir)/d_escmap.in"
 	atf_check -o not-empty grep -o 'f.o.' "$(atf_get_srcdir)/d_escmap.in"
 }
 
 atf_test_case egrep_empty_invalid
 egrep_empty_invalid_head()
 {
 	atf_set "descr" "Check for handling of an invalid empty pattern (PR 194823)"
 }
 egrep_empty_invalid_body()
 {
 	atf_check -e ignore -s not-exit:0 egrep '{' /dev/null
 }
 
 atf_test_case zerolen
 zerolen_head()
 {
 	atf_set "descr" "Check for successful zero-length matches with ^$"
 }
 zerolen_body()
 {
 	printf "Eggs\n\nCheese" > test1
 
 	atf_check -o inline:"\n" grep -e "^$" test1
 
 	atf_check -o inline:"Eggs\nCheese\n" grep -v -e "^$" test1
 }
 
 atf_test_case wflag_emptypat
 wflag_emptypat_head()
 {
 	atf_set "descr" "Check for proper handling of -w with an empty pattern (PR 105221)"
 }
 wflag_emptypat_body()
 {
 	printf "" > test1
 	printf "\n" > test2
 	printf "qaz" > test3
 	printf " qaz\n" > test4
 
 	atf_check -s exit:1 -o empty grep -w -e "" test1
 
 	atf_check -o file:test2 grep -w -e "" test2
 
 	atf_check -s exit:1 -o empty grep -w -e "" test3
 
 	atf_check -o file:test4 grep -w -e "" test4
 }
 
+atf_test_case excessive_matches
+excessive_matches_head()
+{
+	atf_set "descr" "Check for proper handling of lines with excessive matches (PR 218811)"
+}
+excessive_matches_body()
+{
+	grep_type
+	if [ $? -eq $GREP_TYPE_GNU_FREEBSD ]; then
+		atf_expect_fail "this test does not pass with GNU grep in base"
+	fi
+
+	for i in $(jot 4096); do
+		printf "x" >> test.in
+	done
+
+	atf_check -s exit:0 -x '[ $(grep -o x test.in | wc -l) -eq 4096 ]'
+	atf_check -s exit:1 -x 'grep -on x test.in | grep -v "1:x"'
+}
+
 atf_test_case fgrep_sanity
 fgrep_sanity_head()
 {
 	atf_set "descr" "Check for fgrep sanity, literal expressions only"
 }
 fgrep_sanity_body()
 {
 	printf "Foo" > test1
 
 	atf_check -o inline:"Foo\n" fgrep -e "Foo" test1
 
 	atf_check -s exit:1 -o empty fgrep -e "Fo." test1
 }
 
 atf_test_case egrep_sanity
 egrep_sanity_head()
 {
 	atf_set "descr" "Check for egrep sanity, EREs only"
 }
 egrep_sanity_body()
 {
 	printf "Foobar(ed)" > test1
 	printf "M{1}" > test2
 
 	atf_check -o inline:"Foo\n" egrep -o -e "F.." test1
 
 	atf_check -o inline:"Foobar\n" egrep -o -e "F[a-z]*" test1
 
 	atf_check -o inline:"Fo\n" egrep -o -e "F(o|p)" test1
 
 	atf_check -o inline:"(ed)\n" egrep -o -e "\(ed\)" test1
 
 	atf_check -o inline:"M\n" egrep -o -e "M{1}" test2
 
 	atf_check -o inline:"M{1}\n" egrep -o -e "M\{1\}" test2
 }
 
 atf_test_case grep_sanity
 grep_sanity_head()
 {
 	atf_set "descr" "Check for basic grep sanity, BREs only"
 }
 grep_sanity_body()
 {
 	printf "Foobar(ed)" > test1
 	printf "M{1}" > test2
 
 	atf_check -o inline:"Foo\n" grep -o -e "F.." test1
 
 	atf_check -o inline:"Foobar\n" grep -o -e "F[a-z]*" test1
 
 	atf_check -o inline:"Fo\n" grep -o -e "F\(o\)" test1
 
 	atf_check -o inline:"(ed)\n" grep -o -e "(ed)" test1
 
 	atf_check -o inline:"M{1}\n" grep -o -e "M{1}" test2
 
 	atf_check -o inline:"M\n" grep -o -e "M\{1\}" test2
 }
 
 atf_test_case wv_combo_break
 wv_combo_break_head()
 {
 	atf_set "descr" "Check for incorrectly matching lines with both -w and -v flags (PR 218467)"
 }
 wv_combo_break_body()
 {
 	printf "x xx\n" > test1
 	printf "xx x\n" > test2
 
 	atf_check -o file:test1 grep -w "x" test1
 	atf_check -o file:test2 grep -w "x" test2
 
 	atf_check -s exit:1 grep -v -w "x" test1
 	atf_check -s exit:1 grep -v -w "x" test2
 }
 
+atf_test_case ocolor_metadata
+ocolor_metadata_head()
+{
+	atf_set "descr" "Check for -n/-b producing per-line metadata output"
+}
+ocolor_metadata_body()
+{
+	grep_type
+	if [ $? -eq $GREP_TYPE_GNU_FREEBSD ]; then
+		atf_expect_fail "this test does not pass with GNU grep in base"
+	fi
+
+	printf "xxx\nyyyy\nzzz\nfoobarbaz\n" > test1
+	check_expr="^[^:]*[0-9][^:]*:[^:]+$"
+
+	atf_check -o inline:"1:1:xx\n" grep -bon "xx$" test1
+
+	atf_check -o inline:"2:4:yyyy\n" grep -bn "yy" test1
+
+	atf_check -o inline:"2:6:yy\n" grep -bon "yy$" test1
+
+	# These checks ensure that grep isn't producing bogus line numbering
+	# in the middle of a line.
+	atf_check -s exit:1 -x \
+	    "grep -Eon 'x|y|z|f' test1 | grep -Ev '${check_expr}'"
+
+	atf_check -s exit:1 -x \
+	    "grep -En 'x|y|z|f' --color=always test1 | grep -Ev '${check_expr}'"
+
+	atf_check -s exit:1 -x \
+	    "grep -Eon 'x|y|z|f' --color=always test1 | grep -Ev '${check_expr}'"
+}
+
 atf_test_case grep_nomatch_flags
 grep_nomatch_flags_head()
 {
 	atf_set "descr" "Check for no match (-c, -l, -L, -q) flags not producing line matches or context (PR 219077)"
 }
 
 grep_nomatch_flags_body()
 {
 	printf "A\nB\nC\n" > test1
 
 	atf_check -o inline:"1\n" grep -c -C 1 -e "B" test1
 	atf_check -o inline:"1\n" grep -c -B 1 -e "B" test1
 	atf_check -o inline:"1\n" grep -c -A 1 -e "B" test1
 	atf_check -o inline:"1\n" grep -c -C 1 -e "B" test1
 
 	atf_check -o inline:"test1\n" grep -l -e "B" test1
 	atf_check -o inline:"test1\n" grep -l -B 1 -e "B" test1
 	atf_check -o inline:"test1\n" grep -l -A 1 -e "B" test1
 	atf_check -o inline:"test1\n" grep -l -C 1 -e "B" test1
 
 	atf_check -s exit:1 -o inline:"test1\n" grep -L -e "D" test1
 
 	atf_check -o empty grep -q -e "B" test1
 	atf_check -o empty grep -q -B 1 -e "B" test1
 	atf_check -o empty grep -q -A 1 -e "B" test1
 	atf_check -o empty grep -q -C 1 -e "B" test1
 }
 
 atf_test_case badcontext
 badcontext_head()
 {
 	atf_set "descr" "Check for handling of invalid context arguments"
 }
 badcontext_body()
 {
 	printf "A\nB\nC\n" > test1
 
 	atf_check -s not-exit:0 -e ignore grep -A "-1" "B" test1
 
 	atf_check -s not-exit:0 -e ignore grep -B "-1" "B" test1
 
 	atf_check -s not-exit:0 -e ignore grep -C "-1" "B" test1
 
 	atf_check -s not-exit:0 -e ignore grep -A "B" "B" test1
 
 	atf_check -s not-exit:0 -e ignore grep -B "B" "B" test1
 
 	atf_check -s not-exit:0 -e ignore grep -C "B" "B" test1
 }
 
 atf_test_case binary_flags
 binary_flags_head()
 {
 	atf_set "descr" "Check output for binary flags (-a, -I, -U, --binary-files)"
 }
 binary_flags_body()
 {
 	printf "A\000B\000C" > test1
 	printf "A\n\000B\n\000C" > test2
 	binmatchtext="Binary file test1 matches\n"
 
 	# Binaries not treated as text (default, -U)
 	atf_check -o inline:"${binmatchtext}" grep 'B' test1
 	atf_check -o inline:"${binmatchtext}" grep 'B' -C 1 test1
 
 	atf_check -o inline:"${binmatchtext}" grep -U 'B' test1
 	atf_check -o inline:"${binmatchtext}" grep -U 'B' -C 1 test1
 
 	# Binary, -a, no newlines
 	atf_check -o inline:"A\000B\000C\n" grep -a 'B' test1
 	atf_check -o inline:"A\000B\000C\n" grep -a 'B' -C 1 test1
 
 	# Binary, -a, newlines
 	atf_check -o inline:"\000B\n" grep -a 'B' test2
 	atf_check -o inline:"A\n\000B\n\000C\n" grep -a 'B' -C 1 test2
 
 	# Binary files ignored
 	atf_check -s exit:1 grep -I 'B' test2
 
 	# --binary-files equivalence
 	atf_check -o inline:"${binmatchtext}" grep --binary-files=binary 'B' test1
 	atf_check -o inline:"A\000B\000C\n" grep --binary-files=text 'B' test1
 	atf_check -s exit:1 grep --binary-files=without-match 'B' test2
 }
 # End FreeBSD
 
 atf_init_test_cases()
 {
 	atf_add_test_case basic
 	atf_add_test_case binary
 	atf_add_test_case recurse
 	atf_add_test_case recurse_symlink
 	atf_add_test_case word_regexps
 	atf_add_test_case begin_end
 	atf_add_test_case ignore_case
 	atf_add_test_case invert
 	atf_add_test_case whole_line
 	atf_add_test_case negative
 	atf_add_test_case context
 	atf_add_test_case file_exp
 	atf_add_test_case egrep
 	atf_add_test_case zgrep
 	atf_add_test_case nonexistent
 	atf_add_test_case context2
 # Begin FreeBSD
 	atf_add_test_case oflag_zerolen
 	atf_add_test_case xflag
 	atf_add_test_case color
 	atf_add_test_case f_file_empty
 	atf_add_test_case escmap
 	atf_add_test_case egrep_empty_invalid
 	atf_add_test_case zerolen
 	atf_add_test_case wflag_emptypat
+	atf_add_test_case excessive_matches
 	atf_add_test_case wv_combo_break
 	atf_add_test_case fgrep_sanity
 	atf_add_test_case egrep_sanity
 	atf_add_test_case grep_sanity
+	atf_add_test_case ocolor_metadata
 	atf_add_test_case grep_nomatch_flags
 	atf_add_test_case binary_flags
 	atf_add_test_case badcontext
 # End FreeBSD
 }
Index: projects/clang500-import/contrib/netbsd-tests
===================================================================
--- projects/clang500-import/contrib/netbsd-tests	(revision 318657)
+++ projects/clang500-import/contrib/netbsd-tests	(revision 318658)

Property changes on: projects/clang500-import/contrib/netbsd-tests
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/contrib/netbsd-tests:r318560-318657
Index: projects/clang500-import/contrib/top/top.c
===================================================================
--- projects/clang500-import/contrib/top/top.c	(revision 318657)
+++ projects/clang500-import/contrib/top/top.c	(revision 318658)
@@ -1,1240 +1,1240 @@
 char *copyright =
     "Copyright (c) 1984 through 1996, William LeFebvre";
 
 /*
  *  Top users/processes display for Unix
  *  Version 3
  *
  *  This program may be freely redistributed,
  *  but this entire comment MUST remain intact.
  *
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989 - 1994, William LeFebvre, Northwestern University
  *  Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
  *  Copyright (c) 1996, William LeFebvre, Group sys Consulting
  *
  * $FreeBSD$
  */
 
 /*
  *  See the file "Changes" for information on version-to-version changes.
  */
 
 /*
  *  This file contains "main" and other high-level routines.
  */
 
 /*
  * The following preprocessor variables, when defined, are used to
  * distinguish between different Unix implementations:
  *
  *	SIGHOLD  - use SVR4 sighold function when defined
  *	SIGRELSE - use SVR4 sigrelse function when defined
  *	FD_SET   - macros FD_SET and FD_ZERO are used when defined
  */
 
 #include "os.h"
 
 #include <sys/jail.h>
 #include <sys/time.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <jail.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <unistd.h>
 
 /* includes specific to top */
 #include "commands.h"
 #include "display.h"		/* interface to display package */
 #include "screen.h"		/* interface to screen package */
 #include "top.h"
 #include "top.local.h"
 #include "boolean.h"
 #include "machine.h"
 #include "utils.h"
 #include "username.h"
 
 /* Size of the stdio buffer given to stdout */
 #define Buffersize	2048
 
 /* The buffer that stdio will use */
 char stdoutbuf[Buffersize];
 
 /* build Signal masks */
 #define Smask(s)	(1 << ((s) - 1))
 
 /* for getopt: */
 extern int  optind;
 extern char *optarg;
 
 /* imported from screen.c */
 extern int overstrike;
 
 static int fmt_flags = 0;
 int pcpu_stats = No;
 
 /* signal handling routines */
 sigret_t leave();
 sigret_t tstop();
 #ifdef SIGWINCH
 sigret_t winch();
 #endif
 
 volatile sig_atomic_t leaveflag;
 volatile sig_atomic_t tstopflag;
 volatile sig_atomic_t winchflag;
 
 /* internal routines */
 void quit();
 
 /* values which need to be accessed by signal handlers */
 static int max_topn;		/* maximum displayable processes */
 
 /* miscellaneous things */
 struct process_select ps;
 char *myname = "top";
 jmp_buf jmp_int;
 
 /* routines that don't return int */
 
 char *username();
 char *ctime();
 char *kill_procs();
 char *renice_procs();
 
 #ifdef ORDER
 extern int (*compares[])();
 #else
 extern int proc_compare();
 extern int io_compare();
 #endif
 time_t time();
 
 caddr_t get_process_info(struct system_info *si, struct process_select *sel,
     int (*compare)(const void *, const void *));
 
 /* different routines for displaying the user's identification */
 /* (values assigned to get_userid) */
 char *username();
 char *itoa7();
 
 /* pointers to display routines */
 void (*d_loadave)(int mpid, double *avenrun) = i_loadave;
 void (*d_procstates)(int total, int *brkdn) = i_procstates;
 void (*d_cpustates)(int *states) = i_cpustates;
 void (*d_memory)(int *stats) = i_memory;
 void (*d_arc)(int *stats) = i_arc;
 void (*d_carc)(int *stats) = i_carc;
 void (*d_swap)(int *stats) = i_swap;
 void (*d_message)(void) = i_message;
 void (*d_header)(char *text) = i_header;
 void (*d_process)(int line, char *thisline) = i_process;
 
 void reset_display(void);
 
 
 int
 main(argc, argv)
 
 int  argc;
 char *argv[];
 
 {
     register int i;
     register int active_procs;
     register int change;
 
     struct system_info system_info;
     struct statics statics;
     caddr_t processes;
 
     static char tempbuf1[50];
     static char tempbuf2[50];
     int old_sigmask;		/* only used for BSD-style signals */
     int topn = Default_TOPN;
     int delay = Default_DELAY;
     int displays = 0;		/* indicates unspecified */
     int sel_ret = 0;
     time_t curr_time;
     char *(*get_userid)() = username;
     char *uname_field = "USERNAME";
     char *header_text;
     char *env_top;
     char **preset_argv;
     int  preset_argc = 0;
     char **av;
     int  ac;
     char dostates = No;
     char do_unames = Yes;
     char interactive = Maybe;
     char warnings = 0;
 #if Default_TOPN == Infinity
     char topn_specified = No;
 #endif
     char ch;
     char *iptr;
     char no_command = 1;
     struct timeval timeout;
 #ifdef ORDER
     char *order_name = NULL;
     int order_index = 0;
 #endif
 #ifndef FD_SET
     /* FD_SET and friends are not present:  fake it */
     typedef int fd_set;
 #define FD_ZERO(x)     (*(x) = 0)
 #define FD_SET(f, x)   (*(x) = 1<<f)
 #endif
     fd_set readfds;
 
 #ifdef ORDER
     static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJwo";
 #else
     static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJw";
 #endif
 /* these defines enumerate the "strchr"s of the commands in command_chars */
 #define CMD_redraw	0
 #define CMD_update	1
 #define CMD_quit	2
 #define CMD_help1	3
 #define CMD_help2	4
 #define CMD_OSLIMIT	4    /* terminals with OS can only handle commands */
 #define CMD_errors	5    /* less than or equal to CMD_OSLIMIT	   */
 #define CMD_number1	6
 #define CMD_number2	7
 #define CMD_delay	8
 #define CMD_displays	9
 #define CMD_kill	10
 #define CMD_renice	11
 #define CMD_idletog     12
 #define CMD_idletog2    13
 #define CMD_user	14
 #define CMD_selftog	15
 #define CMD_thrtog	16
 #define CMD_viewtog	17
 #define CMD_viewsys	18
 #define	CMD_wcputog	19
 #define	CMD_showargs	20
 #define	CMD_jidtog	21
 #define CMD_kidletog	22
 #define CMD_pcputog	23
 #define CMD_jail	24
 #define CMD_swaptog	25
 #ifdef ORDER
 #define CMD_order       26
 #endif
 
     /* set the buffer for stdout */
 #ifdef DEBUG
     extern FILE *debug;
     debug = fopen("debug.run", "w");
     setbuffer(stdout, NULL, 0);
 #else
     setbuffer(stdout, stdoutbuf, Buffersize);
 #endif
 
     /* get our name */
     if (argc > 0)
     {
 	if ((myname = strrchr(argv[0], '/')) == 0)
 	{
 	    myname = argv[0];
 	}
 	else
 	{
 	    myname++;
 	}
     }
 
     /* initialize some selection options */
     ps.idle    = Yes;
     ps.self    = -1;
     ps.system  = No;
     ps.uid     = -1;
     ps.thread  = No;
     ps.wcpu    = 1;
     ps.jid     = -1;
     ps.jail    = No;
     ps.swap    = No;
     ps.kidle   = Yes;
     ps.command = NULL;
 
     /* get preset options from the environment */
     if ((env_top = getenv("TOP")) != NULL)
     {
 	av = preset_argv = argparse(env_top, &preset_argc);
 	ac = preset_argc;
 
 	/* set the dummy argument to an explanatory message, in case
 	   getopt encounters a bad argument */
 	preset_argv[0] = "while processing environment";
     }
 
     /* process options */
     do {
 	/* if we're done doing the presets, then process the real arguments */
 	if (preset_argc == 0)
 	{
 	    ac = argc;
 	    av = argv;
 
 	    /* this should keep getopt happy... */
 	    optind = 1;
 	}
 
 	while ((i = getopt(ac, av, "CSIHPabijJ:nquvzs:d:U:m:o:tw")) != EOF)
 	{
 	    switch(i)
 	    {
 	      case 'v':			/* show version number */
 		fprintf(stderr, "%s: version %s\n",
 			myname, version_string());
 		exit(1);
 		break;
 
 	      case 'u':			/* toggle uid/username display */
 		do_unames = !do_unames;
 		break;
 
 	      case 'U':			/* display only username's processes */
 		if ((ps.uid = userid(optarg)) == -1)
 		{
 		    fprintf(stderr, "%s: unknown user\n", optarg);
 		    exit(1);
 		}
 		break;
 
 	      case 'S':			/* show system processes */
 		ps.system = !ps.system;
 		break;
 
 	      case 'I':                   /* show idle processes */
 		ps.idle = !ps.idle;
 		break;
 
 	      case 'i':			/* go interactive regardless */
 		interactive = Yes;
 		break;
 
 	      case 'n':			/* batch, or non-interactive */
 	      case 'b':
 		interactive = No;
 		break;
 
 	      case 'a':
 		fmt_flags ^= FMT_SHOWARGS;
 		break;
 
 	      case 'd':			/* number of displays to show */
 		if ((i = atoiwi(optarg)) == Invalid || i == 0)
 		{
 		    fprintf(stderr,
 			"%s: warning: display count should be positive -- option ignored\n",
 			myname);
 		    warnings++;
 		}
 		else
 		{
 		    displays = i;
 		}
 		break;
 
 	      case 's':
 		if ((delay = atoi(optarg)) < 0 || (delay == 0 && getuid() != 0))
 		{
 		    fprintf(stderr,
 			"%s: warning: seconds delay should be positive -- using default\n",
 			myname);
 		    delay = Default_DELAY;
 		    warnings++;
 		}
 		break;
 
 	      case 'q':		/* be quick about it */
 		/* only allow this if user is really root */
 		if (getuid() == 0)
 		{
 		    /* be very un-nice! */
 		    (void) nice(-20);
 		}
 		else
 		{
 		    fprintf(stderr,
 			"%s: warning: `-q' option can only be used by root\n",
 			myname);
 		    warnings++;
 		}
 		break;
 
 	      case 'm':		/* select display mode */
 		if (strcmp(optarg, "io") == 0) {
 			displaymode = DISP_IO;
 		} else if (strcmp(optarg, "cpu") == 0) {
 			displaymode = DISP_CPU;
 		} else {
 			fprintf(stderr,
 			"%s: warning: `-m' option can only take args "
 			"'io' or 'cpu'\n",
 			myname);
 			exit(1);
 		}
 		break;
 
 	      case 'o':		/* select sort order */
 #ifdef ORDER
 		order_name = optarg;
 #else
 		fprintf(stderr,
 			"%s: this platform does not support arbitrary ordering.  Sorry.\n",
 			myname);
 		warnings++;
 #endif
 		break;
 
 	      case 't':
 		ps.self = (ps.self == -1) ? getpid() : -1;
 		break;
 
 	      case 'C':
 		ps.wcpu = !ps.wcpu;
 		break;
 
 	      case 'H':
 		ps.thread = !ps.thread;
 		break;
 
 	      case 'j':
 		ps.jail = !ps.jail;
 		break;
 
 	      case 'J':			/* display only jail's processes */
 		if ((ps.jid = jail_getid(optarg)) == -1)
 		{
 		    fprintf(stderr, "%s: unknown jail\n", optarg);
 		    exit(1);
 		}
 		ps.jail = 1;
 		break;
 
 	      case 'P':
 		pcpu_stats = !pcpu_stats;
 		break;
 
 	      case 'w':
 		ps.swap = 1;
 		break;
 
 	      case 'z':
 		ps.kidle = !ps.kidle;
 		break;
 
 	      default:
 		fprintf(stderr,
 "Top version %s\n"
-"Usage: %s [-abCHIijnPqStuvz] [-d count] [-m io | cpu] [-o field] [-s time]\n"
+"Usage: %s [-abCHIijnPqStuvwz] [-d count] [-m io | cpu] [-o field] [-s time]\n"
 "       [-J jail] [-U username] [number]\n",
 			version_string(), myname);
 		exit(1);
 	    }
 	}
 
 	/* get count of top processes to display (if any) */
 	if (optind < ac)
 	{
 	    if ((topn = atoiwi(av[optind])) == Invalid)
 	    {
 		fprintf(stderr,
 			"%s: warning: process display count should be non-negative -- using default\n",
 			myname);
 		warnings++;
 	    }
 #if Default_TOPN == Infinity
             else
 	    {
 		topn_specified = Yes;
 	    }
 #endif
 	}
 
 	/* tricky:  remember old value of preset_argc & set preset_argc = 0 */
 	i = preset_argc;
 	preset_argc = 0;
 
     /* repeat only if we really did the preset arguments */
     } while (i != 0);
 
     /* set constants for username/uid display correctly */
     if (!do_unames)
     {
 	uname_field = "   UID  ";
 	get_userid = itoa7;
     }
 
     /* initialize the kernel memory interface */
     if (machine_init(&statics, do_unames) == -1)
     {
 	exit(1);
     }
 
 #ifdef ORDER
     /* determine sorting order index, if necessary */
     if (order_name != NULL)
     {
 	if ((order_index = string_index(order_name, statics.order_names)) == -1)
 	{
 	    char **pp;
 
 	    fprintf(stderr, "%s: '%s' is not a recognized sorting order.\n",
 		    myname, order_name);
 	    fprintf(stderr, "\tTry one of these:");
 	    pp = statics.order_names;
 	    while (*pp != NULL)
 	    {
 		fprintf(stderr, " %s", *pp++);
 	    }
 	    fputc('\n', stderr);
 	    exit(1);
 	}
     }
 #endif
 
 #ifdef no_initialization_needed
     /* initialize the hashing stuff */
     if (do_unames)
     {
 	init_hash();
     }
 #endif
 
     /* initialize termcap */
     init_termcap(interactive);
 
     /* get the string to use for the process area header */
     header_text = format_header(uname_field);
 
     /* initialize display interface */
     if ((max_topn = display_init(&statics)) == -1)
     {
 	fprintf(stderr, "%s: can't allocate sufficient memory\n", myname);
 	exit(4);
     }
     
     /* print warning if user requested more processes than we can display */
     if (topn > max_topn)
     {
 	fprintf(stderr,
 		"%s: warning: this terminal can only display %d processes.\n",
 		myname, max_topn);
 	warnings++;
     }
 
     /* adjust for topn == Infinity */
     if (topn == Infinity)
     {
 	/*
 	 *  For smart terminals, infinity really means everything that can
 	 *  be displayed, or Largest.
 	 *  On dumb terminals, infinity means every process in the system!
 	 *  We only really want to do that if it was explicitly specified.
 	 *  This is always the case when "Default_TOPN != Infinity".  But if
 	 *  topn wasn't explicitly specified and we are on a dumb terminal
 	 *  and the default is Infinity, then (and only then) we use
 	 *  "Nominal_TOPN" instead.
 	 */
 #if Default_TOPN == Infinity
 	topn = smart_terminal ? Largest :
 		    (topn_specified ? Largest : Nominal_TOPN);
 #else
 	topn = Largest;
 #endif
     }
 
     /* set header display accordingly */
     display_header(topn > 0);
 
     /* determine interactive state */
     if (interactive == Maybe)
     {
 	interactive = smart_terminal;
     }
 
     /* if # of displays not specified, fill it in */
     if (displays == 0)
     {
 	displays = smart_terminal ? Infinity : 1;
     }
 
     /* hold interrupt signals while setting up the screen and the handlers */
 #ifdef SIGHOLD
     sighold(SIGINT);
     sighold(SIGQUIT);
     sighold(SIGTSTP);
 #else
     old_sigmask = sigblock(Smask(SIGINT) | Smask(SIGQUIT) | Smask(SIGTSTP));
 #endif
     init_screen();
     (void) signal(SIGINT, leave);
     (void) signal(SIGQUIT, leave);
     (void) signal(SIGTSTP, tstop);
 #ifdef SIGWINCH
     (void) signal(SIGWINCH, winch);
 #endif
 #ifdef SIGRELSE
     sigrelse(SIGINT);
     sigrelse(SIGQUIT);
     sigrelse(SIGTSTP);
 #else
     (void) sigsetmask(old_sigmask);
 #endif
     if (warnings)
     {
 	fputs("....", stderr);
 	fflush(stderr);			/* why must I do this? */
 	sleep((unsigned)(3 * warnings));
 	fputc('\n', stderr);
     }
 
 restart:
 
     /*
      *  main loop -- repeat while display count is positive or while it
      *		indicates infinity (by being -1)
      */
 
     while ((displays == -1) || (displays-- > 0))
     {
 	int (*compare)();
 
 	    
 	/* get the current stats */
 	get_system_info(&system_info);
 
 #ifdef ORDER
 	compare = compares[order_index];
 #else
 	if (displaymode == DISP_CPU)
 		compare = proc_compare;
 	else
 		compare = io_compare;
 #endif
 
 	/* get the current set of processes */
 	processes =
 		get_process_info(&system_info, &ps, compare);
 
 	/* display the load averages */
 	(*d_loadave)(system_info.last_pid,
 		     system_info.load_avg);
 
 	/* display the current time */
 	/* this method of getting the time SHOULD be fairly portable */
 	time(&curr_time);
 	i_uptime(&system_info.boottime, &curr_time);
 	i_timeofday(&curr_time);
 
 	/* display process state breakdown */
 	(*d_procstates)(system_info.p_total,
 			system_info.procstates);
 
 	/* display the cpu state percentage breakdown */
 	if (dostates)	/* but not the first time */
 	{
 	    (*d_cpustates)(system_info.cpustates);
 	}
 	else
 	{
 	    /* we'll do it next time */
 	    if (smart_terminal)
 	    {
 		z_cpustates();
 	    }
 	    else
 	    {
 		putchar('\n');
 	    }
 	    dostates = Yes;
 	}
 
 	/* display memory stats */
 	(*d_memory)(system_info.memory);
 	(*d_arc)(system_info.arc);
 	(*d_carc)(system_info.carc);
 
 	/* display swap stats */
 	(*d_swap)(system_info.swap);
 
 	/* handle message area */
 	(*d_message)();
 
 	/* update the header area */
 	(*d_header)(header_text);
     
 	if (topn > 0)
 	{
 	    /* determine number of processes to actually display */
 	    /* this number will be the smallest of:  active processes,
 	       number user requested, number current screen accomodates */
 	    active_procs = system_info.P_ACTIVE;
 	    if (active_procs > topn)
 	    {
 		active_procs = topn;
 	    }
 	    if (active_procs > max_topn)
 	    {
 		active_procs = max_topn;
 	    }
 
 	    /* now show the top "n" processes. */
 	    for (i = 0; i < active_procs; i++)
 	    {
 		(*d_process)(i, format_next_process(processes, get_userid,
 			     fmt_flags));
 	    }
 	}
 	else
 	{
 	    i = 0;
 	}
 
 	/* do end-screen processing */
 	u_endscreen(i);
 
 	/* now, flush the output buffer */
 	if (fflush(stdout) != 0)
 	{
 	    new_message(MT_standout, " Write error on stdout");
 	    putchar('\r');
 	    quit(1);
 	    /*NOTREACHED*/
 	}
 
 	/* only do the rest if we have more displays to show */
 	if (displays)
 	{
 	    /* switch out for new display on smart terminals */
 	    if (smart_terminal)
 	    {
 		if (overstrike)
 		{
 		    reset_display();
 		}
 		else
 		{
 		    d_loadave = u_loadave;
 		    d_procstates = u_procstates;
 		    d_cpustates = u_cpustates;
 		    d_memory = u_memory;
 		    d_arc = u_arc;
 		    d_carc = u_carc;
 		    d_swap = u_swap;
 		    d_message = u_message;
 		    d_header = u_header;
 		    d_process = u_process;
 		}
 	    }
     
 	    no_command = Yes;
 	    if (!interactive)
 	    {
 		sleep(delay);
 		if (leaveflag) {
 		    end_screen();
 		    exit(0);
 		}
 	    }
 	    else while (no_command)
 	    {
 		/* assume valid command unless told otherwise */
 		no_command = No;
 
 		/* set up arguments for select with timeout */
 		FD_ZERO(&readfds);
 		FD_SET(0, &readfds);		/* for standard input */
 		timeout.tv_sec  = delay;
 		timeout.tv_usec = 0;
 
 		if (leaveflag) {
 		    end_screen();
 		    exit(0);
 		}
 
 		if (tstopflag) {
 		    /* move to the lower left */
 		    end_screen();
 		    fflush(stdout);
 
 		    /* default the signal handler action */
 		    (void) signal(SIGTSTP, SIG_DFL);
 
 		    /* unblock the signal and send ourselves one */
 #ifdef SIGRELSE
 		    sigrelse(SIGTSTP);
 #else
 		    (void) sigsetmask(sigblock(0) & ~(1 << (SIGTSTP - 1)));
 #endif
 		    (void) kill(0, SIGTSTP);
 
 		    /* reset the signal handler */
 		    (void) signal(SIGTSTP, tstop);
 
 		    /* reinit screen */
 		    reinit_screen();
 		    reset_display();
 		    tstopflag = 0;
 		    goto restart;
 		}
 
 		if (winchflag) {
 		    /* reascertain the screen dimensions */
 		    get_screensize();
 
 		    /* tell display to resize */
 		    max_topn = display_resize();
 
 		    /* reset the signal handler */
 		    (void) signal(SIGWINCH, winch);
 
 		    reset_display();
 		    winchflag = 0;
 		    goto restart;
 		}
 
 		/* wait for either input or the end of the delay period */
 		sel_ret = select(2, &readfds, NULL, NULL, &timeout);
 		if (sel_ret < 0 && errno != EINTR)
 		    quit(0);
 		if (sel_ret > 0)
 		{
 		    int newval;
 		    char *errmsg;
     
 		    /* something to read -- clear the message area first */
 		    clear_message();
 
 		    /* now read it and convert to command strchr */
 		    /* (use "change" as a temporary to hold strchr) */
 		    if (read(0, &ch, 1) != 1)
 		    {
 			/* read error: either 0 or -1 */
 			new_message(MT_standout, " Read error on stdin");
 			putchar('\r');
 			quit(1);
 			/*NOTREACHED*/
 		    }
 		    if ((iptr = strchr(command_chars, ch)) == NULL)
 		    {
 			if (ch != '\r' && ch != '\n')
 			{
 			    /* illegal command */
 			    new_message(MT_standout, " Command not understood");
 			}
 			putchar('\r');
 			no_command = Yes;
 		    }
 		    else
 		    {
 			change = iptr - command_chars;
 			if (overstrike && change > CMD_OSLIMIT)
 			{
 			    /* error */
 			    new_message(MT_standout,
 			    " Command cannot be handled by this terminal");
 			    putchar('\r');
 			    no_command = Yes;
 			}
 			else switch(change)
 			{
 			    case CMD_redraw:	/* redraw screen */
 				reset_display();
 				break;
     
 			    case CMD_update:	/* merely update display */
 				/* is the load average high? */
 				if (system_info.load_avg[0] > LoadMax)
 				{
 				    /* yes, go home for visual feedback */
 				    go_home();
 				    fflush(stdout);
 				}
 				break;
 	    
 			    case CMD_quit:	/* quit */
 				quit(0);
 				/*NOTREACHED*/
 				break;
 	    
 			    case CMD_help1:	/* help */
 			    case CMD_help2:
 				reset_display();
 				clear();
 				show_help();
 				standout("Hit any key to continue: ");
 				fflush(stdout);
 				(void) read(0, &ch, 1);
 				break;
 	
 			    case CMD_errors:	/* show errors */
 				if (error_count() == 0)
 				{
 				    new_message(MT_standout,
 					" Currently no errors to report.");
 				    putchar('\r');
 				    no_command = Yes;
 				}
 				else
 				{
 				    reset_display();
 				    clear();
 				    show_errors();
 				    standout("Hit any key to continue: ");
 				    fflush(stdout);
 				    (void) read(0, &ch, 1);
 				}
 				break;
 	
 			    case CMD_number1:	/* new number */
 			    case CMD_number2:
 				new_message(MT_standout,
 				    "Number of processes to show: ");
 				newval = readline(tempbuf1, 8, Yes);
 				if (newval > -1)
 				{
 				    if (newval > max_topn)
 				    {
 					new_message(MT_standout | MT_delayed,
 					  " This terminal can only display %d processes.",
 					  max_topn);
 					putchar('\r');
 				    }
 
 				    if (newval == 0)
 				    {
 					/* inhibit the header */
 					display_header(No);
 				    }
 				    else if (newval > topn && topn == 0)
 				    {
 					/* redraw the header */
 					display_header(Yes);
 					d_header = i_header;
 				    }
 				    topn = newval;
 				}
 				break;
 	    
 			    case CMD_delay:	/* new seconds delay */
 				new_message(MT_standout, "Seconds to delay: ");
 				if ((i = readline(tempbuf1, 8, Yes)) > -1)
 				{
 				    if ((delay = i) == 0 && getuid() != 0)
 				    {
 					delay = 1;
 				    }
 				}
 				clear_message();
 				break;
 	
 			    case CMD_displays:	/* change display count */
 				new_message(MT_standout,
 					"Displays to show (currently %s): ",
 					displays == -1 ? "infinite" :
 							 itoa(displays));
 				if ((i = readline(tempbuf1, 10, Yes)) > 0)
 				{
 				    displays = i;
 				}
 				else if (i == 0)
 				{
 				    quit(0);
 				}
 				clear_message();
 				break;
     
 			    case CMD_kill:	/* kill program */
 				new_message(0, "kill ");
 				if (readline(tempbuf2, sizeof(tempbuf2), No) > 0)
 				{
 				    if ((errmsg = kill_procs(tempbuf2)) != NULL)
 				    {
 					new_message(MT_standout, "%s", errmsg);
 					putchar('\r');
 					no_command = Yes;
 				    }
 				}
 				else
 				{
 				    clear_message();
 				}
 				break;
 	    
 			    case CMD_renice:	/* renice program */
 				new_message(0, "renice ");
 				if (readline(tempbuf2, sizeof(tempbuf2), No) > 0)
 				{
 				    if ((errmsg = renice_procs(tempbuf2)) != NULL)
 				    {
 					new_message(MT_standout, "%s", errmsg);
 					putchar('\r');
 					no_command = Yes;
 				    }
 				}
 				else
 				{
 				    clear_message();
 				}
 				break;
 
 			    case CMD_idletog:
 			    case CMD_idletog2:
 				ps.idle = !ps.idle;
 				new_message(MT_standout | MT_delayed,
 				    " %sisplaying idle processes.",
 				    ps.idle ? "D" : "Not d");
 				putchar('\r');
 				break;
 
 			    case CMD_selftog:
 				ps.self = (ps.self == -1) ? getpid() : -1;
 				new_message(MT_standout | MT_delayed,
 				    " %sisplaying self.",
 				    (ps.self == -1) ? "D" : "Not d");
 				putchar('\r');
 				break;
 
 			    case CMD_user:
 				new_message(MT_standout,
 				    "Username to show (+ for all): ");
 				if (readline(tempbuf2, sizeof(tempbuf2), No) > 0)
 				{
 				    if (tempbuf2[0] == '+' &&
 					tempbuf2[1] == '\0')
 				    {
 					ps.uid = -1;
 				    }
 				    else if ((i = userid(tempbuf2)) == -1)
 				    {
 					new_message(MT_standout,
 					    " %s: unknown user", tempbuf2);
 					no_command = Yes;
 				    }
 				    else
 				    {
 					ps.uid = i;
 				    }
 				    putchar('\r');
 				}
 				else
 				{
 				    clear_message();
 				}
 				break;
 	    
 			    case CMD_thrtog:
 				ps.thread = !ps.thread;
 				new_message(MT_standout | MT_delayed,
 				    " Displaying threads %s",
 				    ps.thread ? "separately" : "as a count");
 				header_text = format_header(uname_field);
 				reset_display();
 				putchar('\r');
 				break;
 			    case CMD_wcputog:
 				ps.wcpu = !ps.wcpu;
 				new_message(MT_standout | MT_delayed,
 				    " Displaying %s CPU",
 				    ps.wcpu ? "weighted" : "raw");
 				header_text = format_header(uname_field);
 				reset_display();
 				putchar('\r');
 				break;
 			    case CMD_viewtog:
 				if (++displaymode == DISP_MAX)
 					displaymode = 0;
 				header_text = format_header(uname_field);
 				display_header(Yes);
 				d_header = i_header;
 				reset_display();
 				break;
 			    case CMD_viewsys:
 				ps.system = !ps.system;
 				break;
 			    case CMD_showargs:
 				fmt_flags ^= FMT_SHOWARGS;
 				break;
 #ifdef ORDER
 			    case CMD_order:
 				new_message(MT_standout,
 				    "Order to sort: ");
 				if (readline(tempbuf2, sizeof(tempbuf2), No) > 0)
 				{
 				  if ((i = string_index(tempbuf2, statics.order_names)) == -1)
 					{
 					  new_message(MT_standout,
 					      " %s: unrecognized sorting order", tempbuf2);
 					  no_command = Yes;
 				    }
 				    else
 				    {
 					order_index = i;
 				    }
 				    putchar('\r');
 				}
 				else
 				{
 				    clear_message();
 				}
 				break;
 #endif
 			    case CMD_jidtog:
 				ps.jail = !ps.jail;
 				new_message(MT_standout | MT_delayed,
 				    " %sisplaying jail ID.",
 				    ps.jail ? "D" : "Not d");
 				header_text = format_header(uname_field);
 				reset_display();
 				putchar('\r');
 				break;
 
 			    case CMD_jail:
 				new_message(MT_standout,
 				    "Jail to show (+ for all): ");
 				if (readline(tempbuf2, sizeof(tempbuf2), No) > 0)
 				{
 				    if (tempbuf2[0] == '+' &&
 					tempbuf2[1] == '\0')
 				    {
 					ps.jid = -1;
 				    }
 				    else if ((i = jail_getid(tempbuf2)) == -1)
 				    {
 					new_message(MT_standout,
 					    " %s: unknown jail", tempbuf2);
 					no_command = Yes;
 				    }
 				    else
 				    {
 					ps.jid = i;
 				    }
 				    if (ps.jail == 0) {
 					    ps.jail = 1;
 					    new_message(MT_standout |
 						MT_delayed, " Displaying jail "
 						"ID.");
 					    header_text =
 						format_header(uname_field);
 					    reset_display();
 				    }
 				    putchar('\r');
 				}
 				else
 				{
 				    clear_message();
 				}
 				break;
 	    
 			    case CMD_kidletog:
 				ps.kidle = !ps.kidle;
 				new_message(MT_standout | MT_delayed,
 				    " %sisplaying system idle process.",
 				    ps.kidle ? "D" : "Not d");
 				putchar('\r');
 				break;
 			    case CMD_pcputog:
 				pcpu_stats = !pcpu_stats;
 				new_message(MT_standout | MT_delayed,
 				    " Displaying %sCPU statistics.",
 				    pcpu_stats ? "per-" : "global ");
 				toggle_pcpustats();
 				max_topn = display_updatecpus(&statics);
 				reset_display();
 				putchar('\r');
 				break;
 			    case CMD_swaptog:
 				ps.swap = !ps.swap;
 				new_message(MT_standout | MT_delayed,
 				    " %sisplaying per-process swap usage.",
 				    ps.swap ? "D" : "Not d");
 				header_text = format_header(uname_field);
 				reset_display();
 				putchar('\r');
 				break;
 			    default:
 				new_message(MT_standout, " BAD CASE IN SWITCH!");
 				putchar('\r');
 			}
 		    }
 
 		    /* flush out stuff that may have been written */
 		    fflush(stdout);
 		}
 	    }
 	}
     }
 
 #ifdef DEBUG
     fclose(debug);
 #endif
     quit(0);
     /*NOTREACHED*/
 }
 
 /*
  *  reset_display() - reset all the display routine pointers so that entire
  *	screen will get redrawn.
  */
 
 void
 reset_display()
 
 {
     d_loadave    = i_loadave;
     d_procstates = i_procstates;
     d_cpustates  = i_cpustates;
     d_memory     = i_memory;
     d_arc        = i_arc;
     d_carc       = i_carc;
     d_swap       = i_swap;
     d_message	 = i_message;
     d_header	 = i_header;
     d_process	 = i_process;
 }
 
 /*
  *  signal handlers
  */
 
 sigret_t leave()	/* exit under normal conditions -- INT handler */
 
 {
     leaveflag = 1;
 }
 
 sigret_t tstop(i)	/* SIGTSTP handler */
 
 int i;
 
 {
     tstopflag = 1;
 }
 
 #ifdef SIGWINCH
 sigret_t winch(i)		/* SIGWINCH handler */
 
 int i;
 
 {
     winchflag = 1;
 }
 #endif
 
 void quit(status)		/* exit under duress */
 
 int status;
 
 {
     end_screen();
     exit(status);
     /*NOTREACHED*/
 }
Index: projects/clang500-import/contrib/top
===================================================================
--- projects/clang500-import/contrib/top	(revision 318657)
+++ projects/clang500-import/contrib/top	(revision 318658)

Property changes on: projects/clang500-import/contrib/top
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/contrib/top:r316992-318657
Index: projects/clang500-import/etc/mtree/BSD.include.dist
===================================================================
--- projects/clang500-import/etc/mtree/BSD.include.dist	(revision 318657)
+++ projects/clang500-import/etc/mtree/BSD.include.dist	(revision 318658)
@@ -1,358 +1,356 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     arpa
     ..
     atf-c
     ..
     atf-c++
     ..
     bsm
     ..
     bsnmp
     ..
     c++
         4.2
             backward
             ..
             bits
             ..
             debug
             ..
             ext
                 pb_ds
                     detail
                         basic_tree_policy
                         ..
                         bin_search_tree_
                         ..
                         binary_heap_
                         ..
                         binomial_heap_
                         ..
                         binomial_heap_base_
                         ..
                         cc_hash_table_map_
                         ..
                         eq_fn
                         ..
                         gp_hash_table_map_
                         ..
                         hash_fn
                         ..
                         left_child_next_sibling_heap_
                         ..
                         list_update_map_
                         ..
                         list_update_policy
                         ..
                         ov_tree_map_
                         ..
                         pairing_heap_
                         ..
                         pat_trie_
                         ..
                         rb_tree_map_
                         ..
                         rc_binomial_heap_
                         ..
                         resize_policy
                         ..
                         splay_tree_
                         ..
                         thin_heap_
                         ..
                         tree_policy
                         ..
                         trie_policy
                         ..
                         unordered_iterator
                         ..
                     ..
                 ..
             ..
             tr1
             ..
         ..
         v1
             experimental
             ..
             ext
             ..
             tr1
             ..
         ..
     ..
     cam
         ata
         ..
         nvme
         ..
         scsi
         ..
     ..
     casper
     ..
     crypto
     ..
     dev
         acpica
         ..
         agp
         ..
         an
         ..
         bktr
         ..
         ciss
         ..
         evdev
         ..
         filemon
         ..
         firewire
         ..
         hwpmc
         ..
         hyperv
         ..
         ic
         ..
         iicbus
         ..
         io
         ..
         lmc
         ..
         mfi
         ..
         mmc
         ..
         mpt
             mpilib
             ..
         ..
         nand
         ..
         nvme
         ..
         ofw
         ..
         pbio
         ..
         pci
         ..
         powermac_nvram
         ..
         ppbus
         ..
         smbus
         ..
         speaker
         ..
         usb
         ..
-        utopia
-        ..
         vkbd
         ..
         wi
         ..
     ..
     devdctl
     ..
     edit
         readline
         ..
     ..
     fs
         cuse
         ..
         devfs
         ..
         fdescfs
         ..
         msdosfs
         ..
         nandfs
         ..
         nfs
         ..
         nullfs
         ..
         procfs
         ..
         smbfs
         ..
         udf
         ..
         unionfs
         ..
     ..
     gcc
         4.2
         ..
     ..
     geom
         cache
         ..
         concat
         ..
         eli
         ..
         gate
         ..
         journal
         ..
         label
         ..
         mirror
         ..
         mountver
         ..
         multipath
         ..
         nop
         ..
         raid
         ..
         raid3
         ..
         shsec
         ..
         stripe
         ..
         virstor
         ..
     ..
     gnu
         posix
         ..
     ..
     gssapi
     ..
     infiniband
         complib 
         ..
         iba
         ..
         opensm
         ..
         vendor
         ..
     ..
     isofs
         cd9660
         ..
     ..
     kadm5
     ..
     krb5
     ..
     lib80211
     ..
     libmilter
     ..
     libxo
     ..
     lzma
     ..
     machine
         pc
         ..
     ..
     net
         altq
         ..
     ..
     net80211
     ..
     netgraph
         atm
         ..
         bluetooth
             include
             ..
         ..
         netflow
         ..
     ..
     netinet
         cc
         ..
     ..
     netinet6
     ..
     netipsec
     ..
     netnatm
         api
         ..
         msg
         ..
         saal
         ..
         sig
         ..
     ..
     netpfil
         pf
         ..
     ..
     netsmb
     ..
     nfs
     ..
     nfsclient
     ..
     nfsserver
     ..
     openssl
     ..
     pcap
     ..
     protocols
     ..
     rdma
     ..
     rpc
     ..
     rpcsvc
     ..
     security
         audit
         ..
         mac_biba
         ..
         mac_bsdextended
         ..
         mac_lomac
         ..
         mac_mls
         ..
         mac_partition
         ..
     ..
     ssp
     ..
     sys
         disk
         ..
     ..
     teken
     ..
     ufs
         ffs
         ..
         ufs
         ..
     ..
     vm
     ..
     xlocale
     ..
 ..
Index: projects/clang500-import/etc/mtree/BSD.tests.dist
===================================================================
--- projects/clang500-import/etc/mtree/BSD.tests.dist	(revision 318657)
+++ projects/clang500-import/etc/mtree/BSD.tests.dist	(revision 318658)
@@ -1,718 +1,720 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     bin
         cat
         ..
         date
         ..
         dd
         ..
         expr
         ..
         ls
         ..
         mv
         ..
         pax
         ..
         pkill
         ..
         pwait
         ..
         sh
             builtins
             ..
             errors
             ..
             execution
             ..
             expansion
             ..
             parameters
             ..
             parser
             ..
             set-e
             ..
         ..
         sleep
         ..
         test
         ..
     ..
     cddl
         lib
         ..
         sbin
         ..
         usr.bin
         ..
         usr.sbin
             dtrace
                 common
                     aggs
                     ..
                     arithmetic
                     ..
                     arrays
                     ..
                     assocs
                     ..
                     begin
                     ..
                     bitfields
                     ..
                     buffering
                     ..
                     builtinvar
                     ..
                     cg
                     ..
                     clauses
                     ..
                     cpc
                     ..
                     decls
                     ..
                     drops
                     ..
                     dtraceUtil
                     ..
                     end
                     ..
                     enum
                     ..
                     error
                     ..
                     exit
                     ..
                     fbtprovider
                     ..
                     funcs
                     ..
                     grammar
                     ..
                     include
                     ..
                     inline
                     ..
                     io
                     ..
                     ip
                     ..
                     java_api
                     ..
                     json
                     ..
                     lexer
                     ..
                     llquantize
                     ..
                     mdb
                     ..
                     mib
                     ..
                     misc
                     ..
                     multiaggs
                     ..
                     offsetof
                     ..
                     operators
                     ..
                     pid
                     ..
                     plockstat
                     ..
                     pointers
                     ..
                     pragma
                     ..
                     predicates
                     ..
                     preprocessor
                     ..
                     print
                     ..
                     printa
                     ..
                     printf
                     ..
                     privs
                     ..
                     probes
                     ..
                     proc
                     ..
                     profile-n
                     ..
                     providers
                     ..
                     raise
                     ..
                     rates
                     ..
                     safety
                     ..
                     scalars
                     ..
                     sched
                     ..
                     scripting
                     ..
                     sdt
                     ..
                     sizeof
                     ..
                     speculation
                     ..
                     stability
                     ..
                     stack
                     ..
                     stackdepth
                     ..
                     stop
                     ..
                     strlen
                     ..
                     strtoll
                     ..
                     struct
                     ..
                     sugar
                     ..
                     syscall
                     ..
                     sysevent
                     ..
                     tick-n
                     ..
                     trace
                     ..
                     tracemem
                     ..
                     translators
                     ..
                     typedef
                     ..
                     types
                     ..
                     uctf
                     ..
                     union
                     ..
                     usdt
                     ..
                     ustack
                     ..
                     vars
                     ..
                     version
                     ..
                 ..
             ..
             zfsd
             ..
         ..
     ..
     etc
         rc.d
         ..
     ..
     games
     ..
     gnu
         lib
         ..
         usr.bin
             diff
             ..
         ..
     ..
     lib
         atf
             libatf-c
                 detail
                 ..
             ..
             libatf-c++
                 detail
                 ..
             ..
             test-programs
             ..
         ..
         libarchive
         ..
         libc
             c063
             ..
             db
             ..
             gen
                 execve
                 ..
                 posix_spawn
                 ..
             ..
             hash
                 data
                 ..
             ..
             iconv
             ..
             inet
             ..
             locale
             ..
             net
                 getaddrinfo
                     data
                     ..
                 ..
             ..
             nss
             ..
             regex
                 data
                 ..
             ..
             resolv
             ..
             rpc
             ..
             ssp
             ..
             setjmp
             ..
             stdio
             ..
             stdlib
             ..
             string
             ..
             sys
             ..
             time
             ..
             tls
                 dso
                 ..
             ..
             termios
             ..
             ttyio
             ..
         ..
         libcam
         ..
         libcasper
             services
                 cap_dns
                 ..
                 cap_grp
                 ..
                 cap_pwd
                 ..
                 cap_sysctl
                 ..
             ..
         ..
         libcrypt
         ..
         libdevdctl
         ..
         libkvm
         ..
         libmp
         ..
         libnv
         ..
         libproc
         ..
         librt
         ..
         libsbuf
         ..
         libthr
             dlopen
             ..
         ..
         libutil
         ..
         libxo
         ..
         msun
         ..
     ..
     libexec
         atf
             atf-check
             ..
             atf-sh
             ..
         ..
         rtld-elf
         ..
     ..
     sbin
         dhclient
         ..
         devd
         ..
         growfs
         ..
         ifconfig
         ..
         mdconfig
         ..
     ..
     secure
         lib
         ..
         libexec
         ..
         usr.bin
         ..
         usr.sbin
         ..
     ..
     share
         examples
             tests
                 atf
                 ..
                 plain
                 ..
             ..
         ..
     ..
     sys
         acl
         ..
         aio
         ..
         fifo
         ..
         file
         ..
         fs
             tmpfs
             ..
         ..
         geom
             class
                 concat
                 ..
                 eli
                 ..
                 gate
                 ..
                 gpt
                 ..
                 mirror
                 ..
                 nop
                 ..
                 raid3
                 ..
                 shsec
                 ..
                 stripe
                 ..
                 uzip
                     etalon
                     ..
                 ..
             ..
         ..
         kern
             acct
             ..
             execve
             ..
             pipe
             ..
         ..
         kqueue
             libkqueue
             ..
         ..
         mac
             bsdextended
             ..
             portacl
             ..
         ..
         mqueue
         ..
         netinet
         ..
         opencrypto
         ..
         pjdfstest
             chflags
             ..
             chmod
             ..
             chown
             ..
             ftruncate
             ..
             granular
             ..
             link
             ..
             mkdir
             ..
             mkfifo
             ..
             mknod
             ..
             open
             ..
             rename
             ..
             rmdir
             ..
             symlink
             ..
             truncate
             ..
             unlink
             ..
         ..
         posixshm
         ..
         sys
         ..
         vfs
         ..
         vm
         ..
     ..
     usr.bin
         apply
         ..
         basename
         ..
         bmake
             archives
                 fmt_44bsd
                 ..
                 fmt_44bsd_mod
                 ..
                 fmt_oldbsd
                 ..
             ..
             basic
                 t0
                 ..
                 t1
                 ..
                 t2
                 ..
                 t3
                 ..
             ..
             execution
                 ellipsis
                 ..
                 empty
                 ..
                 joberr
                 ..
                 plus
                 ..
             ..
             shell
                 builtin
                 ..
                 meta
                 ..
                 path
                 ..
                 path_select
                 ..
                 replace
                 ..
                 select
                 ..
             ..
             suffixes
                 basic
                 ..
                 src_wild1
                 ..
                 src_wild2
                 ..
             ..
             syntax
                 directive-t0
                 ..
                 enl
                 ..
                 funny-targets
                 ..
                 semi
                 ..
             ..
             sysmk
                 t0
                     2
                         1
                         ..
                     ..
                     mk
                     ..
                 ..
                 t1
                     2
                         1
                         ..
                     ..
                     mk
                     ..
                 ..
                 t2
                     2
                         1
                         ..
                     ..
                     mk
                     ..
                 ..
             ..
             variables
                 modifier_M
                 ..
                 modifier_t
                 ..
                 opt_V
                 ..
                 t0
                 ..
             ..
         ..
         bsdcat
         ..
         calendar
         ..
         cmp
         ..
+        compress
+        ..
         cpio
         ..
         col
         ..
         comm
         ..
         csplit
         ..
         cut
         ..
         diff
         ..
         dirname
         ..
         file2c
         ..
         getconf
         ..
         grep
         ..
         gzip
         ..
         ident
         ..
         indent
         ..
         join
         ..
         jot
         ..
         lastcomm
         ..
         limits
         ..
         m4
         ..
         mkimg
         ..
         ncal
         ..
         opensm
         ..
         pr
         ..
         printf
         ..
         procstat
         ..
         sdiff
         ..
         sed
             regress.multitest.out
             ..
         ..
         soelim
         ..
         tail
         ..
         tar
         ..
         timeout
         ..
         tr
         ..
         truncate
         ..
         units
         ..
         uudecode
         ..
         uuencode
         ..
         uniq
         ..
         xargs
         ..
         xinstall
         ..
         xo
         ..
         yacc
             yacc
             ..
         ..
     ..
     usr.sbin
         chown
         ..
         etcupdate
         ..
         extattr
         ..
         fstyp
         ..
         makefs
         ..
         newsyslog
         ..
         nmtree
         ..
         pw
         ..
         rpcbind
         ..
         sa
         ..
     ..
 ..
 
 # vim: set expandtab ts=4 sw=4:
Index: projects/clang500-import/etc/periodic/daily/800.scrub-zfs
===================================================================
--- projects/clang500-import/etc/periodic/daily/800.scrub-zfs	(revision 318657)
+++ projects/clang500-import/etc/periodic/daily/800.scrub-zfs	(revision 318658)
@@ -1,110 +1,110 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # If there is a global system configuration file, suck it in.
 #
 
 newline="
 " # A single newline
 
 if [ -r /etc/defaults/periodic.conf ]
 then
     . /etc/defaults/periodic.conf
     source_periodic_confs
 fi
 
 : ${daily_scrub_zfs_default_threshold=35}
 
 case "$daily_scrub_zfs_enable" in
     [Yy][Ee][Ss])
 	echo
 	echo 'Scrubbing of zfs pools:'
 
 	if [ -z "${daily_scrub_zfs_pools}" ]; then
 		daily_scrub_zfs_pools="$(zpool list -H -o name)"
 	fi
 
 	rc=0
 	for pool in ${daily_scrub_zfs_pools}; do
 		# sanity check
 		_status=$(zpool list "${pool}" 2> /dev/null)
 		if [ $? -ne 0 ]; then
 			rc=2
 			echo "   WARNING: pool '${pool}' specified in"
 			echo "            '/etc/periodic.conf:daily_scrub_zfs_pools'"
 			echo "            does not exist"
 			continue
 		fi
 		_status=${_status##*$newline}
 		case ${_status} in
 		*FAULTED*)
 			rc=3
 			echo "Skipping faulted pool: ${pool}"
 			continue ;;
 		*UNAVAIL*)
 			rc=4
 			echo "Skipping unavailable pool: ${pool}"
 			continue ;;
 		esac
 
 		# determine how many days shall be between scrubs
 		eval _pool_threshold=\${daily_scrub_zfs_$(echo "${pool}"|tr  ".:-" "_")_threshold}
 		if [ -z "${_pool_threshold}" ];then
 			_pool_threshold=${daily_scrub_zfs_default_threshold}
 		fi
 
 		_last_scrub=$(zpool history ${pool} | \
 		    egrep "^[0-9\.\:\-]{19} zpool scrub ${pool}\$" | tail -1 |\
 		    cut -d ' ' -f 1)
 		if [ -z "${_last_scrub}" ]; then
 			# creation time of the pool if no scrub was done
 			_last_scrub=$(zpool history ${pool} | \
 			    sed -ne '2s/ .*$//p')
 		fi
 		if [ -z "${_last_scrub}" ]; then
 			echo "   skipping scrubbing of pool '${pool}':"
 			echo "      can't get last scrubbing date"
 			continue
 		fi
 
 		# Now minus last scrub (both in seconds) converted to days.
 		_scrub_diff=$(expr -e \( $(date +%s) - \
-		    $(date -j -f %F.%T ${_last_scrub} +%s) \) / 60 / 60 / 24)
+		    $(date -j -v -70M -f %F.%T ${_last_scrub} +%s) \) / 60 / 60 / 24)
 		if [ ${_scrub_diff} -lt ${_pool_threshold} ]; then
 			echo "   skipping scrubbing of pool '${pool}':"
 			echo "      last scrubbing is ${_scrub_diff} days ago, threshold is set to ${_pool_threshold} days"
 			continue
 		fi
 
 		_status="$(zpool status ${pool} | grep scan:)"
 		case "${_status}" in
 			*"scrub in progress"*)
 				echo "   scrubbing of pool '${pool}' already in progress, skipping:"
 				;;
 			*"resilver in progress"*)
 				echo "   resilvering of pool '${pool}' is in progress, skipping:"
 				;;
 			*"none requested"*)
 				echo "   starting first scrub (since reboot) of pool '${pool}':"
 				zpool scrub ${pool}
 				[ $rc -eq 0 ] && rc=1
 				;;
 			*)
 				echo "   starting scrub of pool '${pool}':"
 				zpool scrub ${pool}
 				[ $rc -eq 0 ] && rc=1
 				;;
 		esac
 
 		echo "      consult 'zpool status ${pool}' for the result"
 	done
 	;;
 
     *)
 	rc=0
 	;;
 esac
 
 exit $rc
Index: projects/clang500-import/gnu/usr.bin/groff/tmac/mdoc.local.in
===================================================================
--- projects/clang500-import/gnu/usr.bin/groff/tmac/mdoc.local.in	(revision 318657)
+++ projects/clang500-import/gnu/usr.bin/groff/tmac/mdoc.local.in	(revision 318658)
@@ -1,83 +1,84 @@
 .\" Copyright (c) 2001-2004 Ruslan Ermilov <ru@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.
 .\"
 .\" 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$
 .\"
 .\"     %beginstrip%
 .
 .eo
 .
 .
 .ds doc-volume-operating-system FreeBSD
 .
 .\" FreeBSD .Lb values
 .ds doc-str-Lb-libarchive  Streaming Archive Library (libarchive, \-larchive)
 .ds doc-str-Lb-libbluetooth Bluetooth User Library (libbluetooth, \-lbluetooth)
 .ds doc-str-Lb-libcseper   Casper Library (libcapsicum, \-lcasper)
 .ds doc-str-Lb-libcuse     Userland Character Device Library (libcuse, \-lcuse)
 .ds doc-str-Lb-libedit     Line Editor and History Library (libedit, \-ledit)
 .ds doc-str-Lb-libefi      EFI Runtime Services Library (libefi, \-lefi)
 .ds doc-str-Lb-libelf      ELF Parsing Library (libelf, \-lelf)
 .ds doc-str-Lb-libexecinfo Backtrace Access Library (libexecinfo, \-lexecinfo)
 .ds doc-str-Lb-libfetch    File Transfer Library (libfetch, \-lfetch)
 .ds doc-str-Lb-libnv       Name/value pairs library (libnv, \-lnv)
 .ds doc-str-Lb-libpmc      Performance Monitoring Counters Interface Library (libpmc, \-lpmc)
 .ds doc-str-Lb-libproc     Processor Monitoring and Analysis Library (libproc, \-lproc)
 .ds doc-str-Lb-libprocstat Process and Files Information Retrieval (libprocstat, \-lprocstat)
 .ds doc-str-Lb-librtld_db  Run-time Linker Debugging Library (librtld_db, \-lrtld_db)
 .ds doc-str-Lb-libsbuf     Safe String Composition Library (libsbuf, \-lsbuf)
 .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
 .ds doc-default-operating-system FreeBSD\~12.0
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-2.2.9  2.2.9
 .ds doc-operating-system-FreeBSD-7.4    7.4
 .ds doc-operating-system-FreeBSD-8.3    8.3
 .ds doc-operating-system-FreeBSD-8.4    8.4
 .ds doc-operating-system-FreeBSD-9.1    9.1
 .ds doc-operating-system-FreeBSD-9.2    9.2
 .ds doc-operating-system-FreeBSD-9.3    9.3
 .ds doc-operating-system-FreeBSD-10.0   10.0
 .ds doc-operating-system-FreeBSD-10.1   10.1
 .ds doc-operating-system-FreeBSD-10.2   10.2
 .ds doc-operating-system-FreeBSD-10.3   10.3
 .ds doc-operating-system-FreeBSD-11.0   11.0
+.ds doc-operating-system-FreeBSD-11.1   11.1
 .ds doc-operating-system-FreeBSD-12.0   12.0
 .
 .\" Definitions for other *BSDs not (yet) in doc-common
 .ds doc-operating-system-NetBSD-7.0     7.0
 .
 .\" Definitions not (yet) in doc-syms
 .
 .ec
 .
 .\" Locale support
 .if d doc-locale \{\
 .  ie "\*[doc-locale]"ru.KOI8-R" \
 .    mso mdoc/ru.KOI8-R
 .  el \{ .if "\*[doc-locale]"fr.ISO8859-1" \
 .    mso mdoc/fr.ISO8859-1
 .\}\}
Index: projects/clang500-import/lib/Makefile
===================================================================
--- projects/clang500-import/lib/Makefile	(revision 318657)
+++ projects/clang500-import/lib/Makefile	(revision 318658)
@@ -1,197 +1,200 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 # The SUBDIR_BOOTSTRAP list is a small set of libraries which are used by many
 # of the other libraries.  These are built first with a .WAIT between them
 # and the main list to avoid needing a SUBDIR_DEPEND line on every library
 # naming just these few items.
 
 SUBDIR_BOOTSTRAP= \
 	csu \
 	.WAIT \
 	libc \
 	libc_nonshared \
 	libcompiler_rt \
 	${_libclang_rt} \
 	${_libcplusplus} \
 	${_libcxxrt} \
 	libelf \
 	msun
 
 # The main list; please keep these sorted alphabetically.
 
 SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	.WAIT \
 	libalias \
 	libarchive \
 	libauditd \
 	libbegemot \
 	libblocksruntime \
 	libbsdstat \
 	libbsm \
 	libbz2 \
 	libcalendar \
 	libcam \
 	libcapsicum \
 	libcompat \
 	libcrypt \
 	libdevctl \
 	libdevinfo \
 	libdevstat \
 	libdwarf \
 	libedit \
 	libevent \
 	libexecinfo \
 	libexpat \
 	libfetch \
 	libfigpar \
 	libgeom \
 	libifconfig \
 	libipsec \
 	libjail \
 	libkiconv \
 	libkvm \
 	liblzma \
 	libmemstat \
 	libmd \
 	libmt \
 	lib80211 \
 	libnetbsd \
 	libnv \
 	libopenbsd \
 	libopie \
 	libpam \
 	libpcap \
 	libpjdlog \
 	${_libproc} \
 	libprocstat \
 	librpcsvc \
 	librss \
 	librt \
 	${_librtld_db} \
 	libsbuf \
 	libsmb \
 	libsqlite3 \
 	libstand \
 	libstdbuf \
 	libstdthreads \
 	libsysdecode \
 	libtacplus \
 	libthread_db \
 	libucl \
 	libufs \
 	libugidfw \
 	libulog \
 	libutil \
 	${_libvgl} \
 	libwrap \
 	libxo \
 	liby \
 	libz \
 	libzstd \
 	ncurses
 
 # Inter-library dependencies.  When the makefile for a library contains LDADD
 # libraries, those libraries should be listed as build order dependencies here.
 
 SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd
 SUBDIR_DEPEND_libauditdm= libbsm
 SUBDIR_DEPEND_libbsnmp= ${_libnetgraph}
 SUBDIR_DEPEND_libc++:= libcxxrt
 SUBDIR_DEPEND_libc= libcompiler_rt
 SUBDIR_DEPEND_libcam= libsbuf
 SUBDIR_DEPEND_libcasper= libnv
 SUBDIR_DEPEND_libdevstat= libkvm
 SUBDIR_DEPEND_libdpv= libfigpar ncurses libutil
 SUBDIR_DEPEND_libedit= ncurses
 SUBDIR_DEPEND_libgeom= libexpat libsbuf
 SUBDIR_DEPEND_librpcsec_gss= libgssapi
 SUBDIR_DEPEND_libmagic= libz
 SUBDIR_DEPEND_libmemstat= libkvm
 SUBDIR_DEPEND_libopie= libmd
 SUBDIR_DEPEND_libpam= libcrypt libopie ${_libradius} librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} 
 SUBDIR_DEPEND_libpjdlog= libutil
 SUBDIR_DEPEND_libprocstat= libkvm libutil
 SUBDIR_DEPEND_libradius= libmd
 SUBDIR_DEPEND_libsmb= libkiconv
 SUBDIR_DEPEND_libtacplus= libmd
 SUBDIR_DEPEND_libulog= libmd
 SUBDIR_DEPEND_libunbound= ${_libldns}
 SUBDIR_DEPEND_liblzma= ${_libthr}
 
 # NB: keep these sorted by MK_* knobs
 
 SUBDIR.${MK_ATM}+=	libngatm
 SUBDIR.${MK_BLACKLIST}+=libblacklist
 SUBDIR.${MK_BLUETOOTH}+=libbluetooth libsdp
 SUBDIR.${MK_BSNMP}+=	libbsnmp
 SUBDIR.${MK_CASPER}+=	libcasper
 
 .if !defined(COMPAT_32BIT) && !defined(COMPAT_SOFTFP)
 SUBDIR.${MK_CLANG}+=	clang
 .endif
 
 SUBDIR.${MK_CUSE}+= 	libcuse
 SUBDIR.${MK_CXX}+=	libdevdctl
 SUBDIR.${MK_TOOLCHAIN}+=libelftc libpe
 SUBDIR.${MK_DIALOG}+=	libdpv
 SUBDIR.${MK_FILE}+=	libmagic
 SUBDIR.${MK_GPIO}+=	libgpio
 SUBDIR.${MK_GSSAPI}+=	libgssapi librpcsec_gss
 SUBDIR.${MK_ICONV}+=	libiconv_modules
 SUBDIR.${MK_KERBEROS_SUPPORT}+=	libcom_err
 SUBDIR.${MK_LDNS}+=	libldns
 
 # The libraries under libclang_rt can only be built by clang, and only make
 # sense to build when clang is enabled at all.  Furthermore, they can only be
 # built for certain architectures.
 .if ${MK_CLANG} != "no" && ${COMPILER_TYPE} == "clang" && \
     (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
     (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") || \
     (${MACHINE_CPUARCH} == "i386"))
 _libclang_rt=	libclang_rt
 .endif
 
 .if ${MK_LIBCPLUSPLUS} != "no"
 _libcxxrt=	libcxxrt
 _libcplusplus=	libc++
+.if ${MACHINE_CPUARCH} != "arm"
+_libcplusplus+=	libc++experimental
+.endif
 .endif
 
 SUBDIR.${MK_EFI}+=	libefivar
 SUBDIR.${MK_LIBTHR}+=	libthr
 SUBDIR.${MK_LLVM_LIBUNWIND}+=	libgcc_eh
 SUBDIR.${MK_LLVM_LIBUNWIND}+=	libgcc_s
 SUBDIR.${MK_NAND}+=	libnandfs
 SUBDIR.${MK_NETGRAPH}+=	libnetgraph
 SUBDIR.${MK_NIS}+=	libypclnt
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _libvgl=	libvgl
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SUBDIR.${MK_BHYVE}+=	libvmmapi
 .endif
 
 .if ${MACHINE_CPUARCH} != "sparc64"
 _libproc=	libproc
 _librtld_db=	librtld_db
 .endif
 
 SUBDIR.${MK_OPENSSL}+=	libmp
 SUBDIR.${MK_PMC}+=	libpmc
 SUBDIR.${MK_RADIUS_SUPPORT}+=	libradius
 SUBDIR.${MK_SENDMAIL}+=	libmilter libsm libsmdb libsmutil
 SUBDIR.${MK_TELNET}+=	libtelnet
 SUBDIR.${MK_TESTS_SUPPORT}+=	atf
 SUBDIR.${MK_TESTS}+=	tests
 SUBDIR.${MK_UNBOUND}+=	libunbound
 SUBDIR.${MK_USB}+=	libusbhid libusb
 
 .if !make(install)
 SUBDIR_PARALLEL=
 .endif
 
 .include <bsd.subdir.mk>
Index: projects/clang500-import/lib/libc/gen/Symbol.map
===================================================================
--- projects/clang500-import/lib/libc/gen/Symbol.map	(revision 318657)
+++ projects/clang500-import/lib/libc/gen/Symbol.map	(revision 318658)
@@ -1,548 +1,547 @@
 /*
  * $FreeBSD$
  */
 
 FBSD_1.0 {
 	__xuname;
 	pthread_atfork;
 	pthread_attr_destroy;
 	pthread_attr_getdetachstate;
 	pthread_attr_getguardsize;
 	pthread_attr_getinheritsched;
 	pthread_attr_getschedparam;
 	pthread_attr_getschedpolicy;
 	pthread_attr_getscope;
 	pthread_attr_getstackaddr;
 	pthread_attr_getstacksize;
 	pthread_attr_init;
 	pthread_attr_setdetachstate;
 	pthread_attr_setguardsize;
 	pthread_attr_setinheritsched;
 	pthread_attr_setschedparam;
 	pthread_attr_setschedpolicy;
 	pthread_attr_setscope;
 	pthread_attr_setstackaddr;
 	pthread_attr_setstacksize;
 	pthread_cancel;
 	pthread_cleanup_pop;
 	pthread_cleanup_push;
 	pthread_cond_broadcast;
 	pthread_cond_destroy;
 	pthread_cond_init;
 	pthread_cond_signal;
 	pthread_cond_timedwait;
 	pthread_cond_wait;
 	pthread_detach;
 	pthread_equal;
 	pthread_exit;
 	pthread_getspecific;
 	pthread_join;
 	pthread_key_create;
 	pthread_key_delete;
 	pthread_kill;
 	pthread_main_np;
 	pthread_mutex_destroy;
 	pthread_mutex_init;
 	pthread_mutex_lock;
 	pthread_mutex_trylock;
 	pthread_mutex_unlock;
 	pthread_mutexattr_destroy;
 	pthread_mutexattr_init;
 	pthread_mutexattr_settype;
 	pthread_once;
 	pthread_rwlock_destroy;
 	pthread_rwlock_init;
 	pthread_rwlock_rdlock;
 	pthread_rwlock_tryrdlock;
 	pthread_rwlock_trywrlock;
 	pthread_rwlock_unlock;
 	pthread_rwlock_wrlock;
 	pthread_self;
 	pthread_setcancelstate;
 	pthread_setcanceltype;
 	pthread_setspecific;
 	pthread_sigmask;
 	pthread_testcancel;
 	alarm;
 	arc4random;
 	arc4random_addrandom;
 	arc4random_stir;
 	__assert;
 	check_utility_compat;
 	clock;
 	closedir;
 	confstr;
 	ctermid;
 	ctermid_r;
 	daemon;
 	devname;
 	devname_r;
 	getdiskbyname;
 	dladdr;
 	dlclose;
 	dlerror;
 	dlfunc;
 	dllockinit;
 	dlopen;
 	dlsym;
 	dlvsym;
 	dlinfo;
 	dl_iterate_phdr;
 	drand48;
 	erand48;
 	err_set_file;
 	err_set_exit;
 	err;
 	verr;
 	errc;
 	verrc;
 	errx;
 	verrx;
 	warn;
 	vwarn;
 	warnc;
 	vwarnc;
 	warnx;
 	vwarnx;
 	sys_errlist;
 	sys_nerr;
 	errno;
 	execl;
 	execle;
 	execlp;
 	execv;
 	execvp;
 	execvP;
 	fmtcheck;
 	fmtmsg;
 	fnmatch;
 	__fpclassifyf;
 	__fpclassifyd;
 	__fpclassifyl;
 	frexp;
 	setfstab;
 	getfstab;
 	getfsent;
 	getfsspec;
 	getfsfile;
 	setfsent;
 	endfsent;
 	ftok;
 	ftw;
 	glob;
 	globfree;
 	getbootfile;
 	getbsize;
 	cgetset;
 	cgetcap;
 	cgetent;
 	cgetmatch;
 	cgetfirst;
 	cgetclose;
 	cgetnext;
 	cgetstr;
 	cgetustr;
 	cgetnum;
 	getcwd;
 	getdomainname;
 	setgrent;
 	setgroupent;
 	endgrent;
 	getgrent_r;
 	getgrnam_r;
 	getgrgid_r;
 	getgrnam;
 	getgrgid;
 	getgrent;
 	/*
 	 * Why are __gr_parse_entry() and __gr_match_entry() not static in
 	 * gen/getgrent.c?
 	 */
 	getgrouplist;
 	gethostname;
 	getloadavg;
 	getlogin;
 	getlogin_r;
 	getmntinfo;
 	setnetgrent;
 	getnetgrent;
 	endnetgrent;
 	innetgr;
 	getosreldate;
 	getpagesize;
 	getpeereid;
 	_getprogname;
 	getprogname;
 	setpwent;
 	setpassent;
 	endpwent;
 	getpwent_r;
 	getpwnam_r;
 	getpwuid_r;
 	getpwnam;
 	getpwuid;
 	getpwent;
 	getttynam;
 	getttyent;
 	setttyent;
 	endttyent;
 	isdialuptty;
 	isnettty;
 	getusershell;
 	endusershell;
 	setusershell;
 	getvfsbyname;
 	__isnan;
 	isnan;
 	__isnanf;
 	isnanf;
 	__isinf;
 	isinf;
 	__isinff;
 	__isinfl;
 	isatty;
 	initgroups;
 	jrand48;
 	lcong48;
 	ldexp;
 	lockf;
 	lrand48;
 	modf;
 	mrand48;
 	nftw;
 	nice;
 	nlist;
 	nrand48;
 	opendir;
 	pause;
 	posix_madvise;
 	popen;
 	pclose;
 	psignal;
 	raise;
 	readdir;
 	readdir_r;
 	readpassphrase;
 	getpass;
 	rewinddir;
 	scandir;
 	alphasort;
 	seed48;
 	seekdir;
 	user_from_uid;
 	group_from_gid;
 	setdomainname;
 	sethostname;
 	longjmperror;
 	getmode;
 	setmode;
 	setproctitle;
 	setprogname;
 	siginterrupt;
 	sys_signame;
 	sys_siglist;
 	sys_nsig;
 	signal;
 	sigaddset;
 	sigdelset;
 	sigemptyset;
 	sigfillset;
 	sigismember;
 	sleep;
 	srand48;
 	fstatvfs;
 	statvfs;
 	sl_init;
 	sl_add;
 	sl_free;
 	sl_find;
 	fflagstostr;
 	strtofflags;
 	sysconf;
 	sysctl;
 	sysctlbyname;
 	sysctlnametomib;
 	syslog;
 	vsyslog;
 	openlog;
 	closelog;
 	setlogmask;
 	ttyname_r;
 	ttyname;
 	timezone;
 	times;
 	time;
 	telldir;
 	tcgetattr;
 	tcsetattr;
 	tcsetpgrp;
 	tcgetpgrp;
 	cfgetospeed;
 	cfgetispeed;
 	cfsetospeed;
 	cfsetispeed;
 	cfsetspeed;
 	cfmakeraw;
 	tcsendbreak;
 	_init_tls;
 	__tls_get_addr;
 	tcdrain;
 	tcflush;
 	tcflow;
 	ualarm;
 	ulimit;
 	uname;
 	strunvis;
 	strunvisx;
 	usleep;
 	utime;
 	valloc;
 	vis;
 	strvis;
 	strvisx;
 	wait;
 	wait3;
 	waitpid;
 	wordexp;
 	wordfree;
 };
 
 FBSD_1.1 {
 	arc4random_buf;
 	arc4random_uniform;
 	fdevname;
 	fdevname_r;
 	fdopendir;
 	feature_present;
 	fts_children;
 	fts_close;
 	fts_get_clientptr;
 	fts_get_stream;
 	fts_open;
 	fts_read;
 	fts_set;
 	fts_set_clientptr;
 	posix_spawn;
 	posix_spawn_file_actions_addclose;
 	posix_spawn_file_actions_adddup2;
 	posix_spawn_file_actions_addopen;
 	posix_spawn_file_actions_destroy;
 	posix_spawn_file_actions_init;
 	posix_spawnattr_destroy;
 	posix_spawnattr_getflags;
 	posix_spawnattr_getpgroup;
 	posix_spawnattr_getschedparam;
 	posix_spawnattr_getschedpolicy;
 	posix_spawnattr_getsigdefault;
 	posix_spawnattr_getsigmask;
 	posix_spawnattr_init;
 	posix_spawnattr_setflags;
 	posix_spawnattr_setpgroup;
 	posix_spawnattr_setschedparam;
 	posix_spawnattr_setschedpolicy;
 	posix_spawnattr_setsigdefault;
 	posix_spawnattr_setsigmask;
 	posix_spawnp;
 	semctl;
 	tcgetsid;
 	tcsetsid;
 	__pthread_cleanup_pop_imp;
 	__pthread_cleanup_push_imp;
 };
 
 FBSD_1.2 {
 	basename_r;
 	cfmakesane;
 	endutxent;
 	getpagesizes;
 	getutxent;
 	getutxid;
 	getutxline;
 	getutxuser;
 	pututxline;
 	sem_close;
 	sem_destroy;
 	sem_getvalue;
 	sem_init;
 	sem_open;
 	sem_post;
 	sem_timedwait;
 	sem_trywait;
 	sem_unlink;
 	sem_wait;
 	setutxdb;
 	setutxent;
 };
 
 FBSD_1.3 {
 	clock_getcpuclockid;
 	dirfd;
 	dup3;
 	fdclosedir;
 	fdlopen;
 	__FreeBSD_libc_enter_restricted_mode;
 	getcontextx;
 	gid_from_group;
 	nvis;
 	pwcache_userdb;
 	pwcache_groupdb;
 	snvis;
 	strenvisx;
 	strnunvis;
 	strnunvisx;
 	strnvis;
 	strnvisx;
 	strsenvisx;
 	strsnvis;
 	strsnvisx;
 	strsvis;
 	strsvisx;
 	svis;
 	uid_from_user;
 	unvis;
 	waitid;
 };
 
 FBSD_1.4 {
 	getnetgrent_r;
 	pthread_mutex_consistent;
 	pthread_mutexattr_getrobust;
 	pthread_mutexattr_setrobust;
 	scandir_b;
 	stravis;
 };
 
 FBSD_1.5 {
 	basename;
 	dirname;
 	sem_clockwait_np;
 };
 
 FBSDprivate_1.0 {
 	/* needed by thread libraries */
 	__thr_jtable;
 
 	_pthread_atfork;
 	_pthread_attr_destroy;
 	_pthread_attr_getdetachstate;
 	_pthread_attr_getguardsize;
 	_pthread_attr_getinheritsched;
 	_pthread_attr_getschedparam;
 	_pthread_attr_getschedpolicy;
 	_pthread_attr_getscope;
 	_pthread_attr_getstackaddr;
 	_pthread_attr_getstacksize;
 	_pthread_attr_init;
 	_pthread_attr_setdetachstate;
 	_pthread_attr_setguardsize;
 	_pthread_attr_setinheritsched;
 	_pthread_attr_setschedparam;
 	_pthread_attr_setschedpolicy;
 	_pthread_attr_setscope;
 	_pthread_attr_setstackaddr;
 	_pthread_attr_setstacksize;
 	_pthread_cancel;
 	_pthread_cancel_enter;
 	_pthread_cancel_leave;
 	_pthread_cleanup_pop;
 	_pthread_cleanup_push;
 	_pthread_cond_broadcast;
 	_pthread_cond_destroy;
 	_pthread_cond_init;
 	_pthread_cond_signal;
 	_pthread_cond_timedwait;
 	_pthread_cond_wait;
 	_pthread_detach;
 	_pthread_equal;
 	_pthread_exit;
 	_pthread_getspecific;
 	_pthread_join;
 	_pthread_key_create;
 	_pthread_key_delete;
 	_pthread_kill;
 	_pthread_main_np;
 	_pthread_mutex_destroy;
 	_pthread_mutex_init_calloc_cb;
 	_pthread_mutex_init;
 	_pthread_mutex_lock;
 	_pthread_mutex_trylock;
 	_pthread_mutex_unlock;
 	_pthread_mutexattr_destroy;
 	_pthread_mutexattr_init;
 	_pthread_mutexattr_settype;
 	_pthread_once;
 	_pthread_rwlock_destroy;
 	_pthread_rwlock_init;
 	_pthread_rwlock_rdlock;
 	_pthread_rwlock_tryrdlock;
 	_pthread_rwlock_trywrlock;
 	_pthread_rwlock_unlock;
 	_pthread_rwlock_wrlock;
 	_pthread_self;
 	_pthread_setcancelstate;
 	_pthread_setcanceltype;
 	_pthread_setspecific;
 	_pthread_sigmask;
 	_pthread_testcancel;
 	_spinlock;
-	_spinlock_debug;
 	_spinunlock;
 	_rtld_addr_phdr;
 	_rtld_atfork_pre;
 	_rtld_atfork_post;
 	_rtld_error;		/* for private use */
 	_rtld_get_stack_prot;
 	_rtld_is_dlopened;
 	_rtld_thread_init;	/* for private use */
 	__elf_phdr_match_addr;
 	_err;
 	_warn;
 	__fmtcheck;
 	/* __pw_match_entry; */
 	/* __pw_parse_entry; */
 	__fdnlist;	/* used by libkvm */
 	/* __aout_fdnlist; */
 	/* __elf_is_okay__; */
 	/* __elf_fdnlist; */
 	__opendir2;
 	__pause;
 	_pause;
 	__pw_scan;	/* Used by (at least) libutil */
 	__raise;
 	_raise;
 	__sleep;
 	_sleep;
 	_rtld_allocate_tls;
 	_rtld_free_tls;
 #if defined(i386)
 	___libc_tls_get_addr;	/* x86 only */
 #endif
 	__libc_tls_get_addr;
 	__tcdrain;
 	_tcdrain;
 	__usleep;
 	_usleep;
 	__wait;
 	_wait;
 	__waitpid;
 	_waitpid;
 
 	_libc_sem_init_compat;
 	_libc_sem_destroy_compat;
 	_libc_sem_open_compat;
 	_libc_sem_close_compat;
 	_libc_sem_unlink_compat;
 	_libc_sem_wait_compat;
 	_libc_sem_trywait_compat;
 	_libc_sem_timedwait_compat;
 	_libc_sem_post_compat;
 	_libc_sem_getvalue_compat;
 
 	__libc_tcdrain;
 
 	__elf_aux_vector;
 	__pthread_map_stacks_exec;
 	__fillcontextx;
 	__fillcontextx2;
 	__getcontextx_size;
 };
Index: projects/clang500-import/lib/libc/gen/_spinlock_stub.c
===================================================================
--- projects/clang500-import/lib/libc/gen/_spinlock_stub.c	(revision 318657)
+++ projects/clang500-import/lib/libc/gen/_spinlock_stub.c	(revision 318658)
@@ -1,80 +1,78 @@
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
  * 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 author nor the names of any co-contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 
 #include "spinlock.h"
 #include "libc_private.h"
 
 long _atomic_lock_stub(volatile long *);
 void _spinlock_stub(spinlock_t *);
 void _spinunlock_stub(spinlock_t *);
-void _spinlock_debug_stub(spinlock_t *, char *, int);
 
 __weak_reference(_atomic_lock_stub, _atomic_lock);
 
 long
 _atomic_lock_stub(volatile long *lck __unused)
 {
 	return (0L);
 }
 
-__weak_reference(_spinlock, _spinlock_debug);
 #pragma weak _spinlock
 void
 _spinlock(spinlock_t *lck)
 {
 
 	((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinlock])
 	    (lck);
 
 }
 
 #pragma weak _spinunlock
 void
 _spinunlock(spinlock_t *lck)
 {
 
 	((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinunlock])
 	    (lck);
 
 }
 
 void
 __libc_spinlock_stub(spinlock_t *lck __unused)
 {
 }
 
 void
 __libc_spinunlock_stub(spinlock_t *lck __unused)
 {
 }
Index: projects/clang500-import/lib/libc/include/spinlock.h
===================================================================
--- projects/clang500-import/lib/libc/include/spinlock.h	(revision 318657)
+++ projects/clang500-import/lib/libc/include/spinlock.h	(revision 318658)
@@ -1,70 +1,65 @@
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
  * 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 author nor the names of any co-contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
  *
  * $FreeBSD$
  *
  * Lock definitions used in both libc and libpthread.
  *
  */
 
 #ifndef _SPINLOCK_H_
 #define _SPINLOCK_H_
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
 /*
  * Lock structure with room for debugging information.
  */
 struct _spinlock {
-	volatile long	access_lock;
-	volatile long	lock_owner;
-	volatile char	*fname;
-	volatile int	lineno;
+	long	spare1;
+	long	spare2;
+	void	*thr_extra;
+	int	spare3;
 };
 typedef struct _spinlock spinlock_t;
 
 #define	_SPINLOCK_INITIALIZER	{ 0, 0, 0, 0 }
 
 #define _SPINUNLOCK(_lck)	_spinunlock(_lck);
-#ifdef	_LOCK_DEBUG
-#define	_SPINLOCK(_lck)		_spinlock_debug(_lck, __FILE__, __LINE__)
-#else
 #define	_SPINLOCK(_lck)		_spinlock(_lck)
-#endif
 
 /*
  * Thread function prototype definitions:
  */
 __BEGIN_DECLS
 long	_atomic_lock(volatile long *);
 void	_spinlock(spinlock_t *);
 void	_spinunlock(spinlock_t *);
-void	_spinlock_debug(spinlock_t *, char *, int);
 __END_DECLS
 
 #endif /* _SPINLOCK_H_ */
Index: projects/clang500-import/lib/libc++experimental/Makefile
===================================================================
--- projects/clang500-import/lib/libc++experimental/Makefile	(nonexistent)
+++ projects/clang500-import/lib/libc++experimental/Makefile	(revision 318658)
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+PACKAGE=	clibs
+SRCDIR=		${SRCTOP}/contrib/libc++
+
+LIB=		c++experimental
+NO_PIC=
+MK_PROFILE=	no
+
+.PATH:		${SRCDIR}/src/experimental
+
+SRCS+=		filesystem/directory_iterator.cpp
+SRCS+=		filesystem/operations.cpp
+SRCS+=		filesystem/path.cpp
+SRCS+=		memory_resource.cpp
+
+WARNS?=		0
+CXXFLAGS+=	${PICFLAG}
+CXXFLAGS+=	-isystem ${SRCDIR}/include
+CXXFLAGS+=	-nostdinc++
+CXXFLAGS+=	-nostdlib
+CXXFLAGS+=	-D_LIBCPP_BUILDING_LIBRARY
+CXXFLAGS+=	-DLIBCXXRT
+.if empty(CXXFLAGS:M-std=*)
+CXXFLAGS+=	-std=c++14
+.endif
+
+.include <bsd.lib.mk>

Property changes on: projects/clang500-import/lib/libc++experimental/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/lib/libcompiler_rt/Makefile.inc
===================================================================
--- projects/clang500-import/lib/libcompiler_rt/Makefile.inc	(revision 318657)
+++ projects/clang500-import/lib/libcompiler_rt/Makefile.inc	(revision 318658)
@@ -1,226 +1,233 @@
 # $FreeBSD$
 
 CRTARCH=	${MACHINE_CPUARCH:C/amd64/x86_64/}
 
 CRTSRC=		${SRCTOP}/contrib/compiler-rt/lib/builtins
 
 .PATH:		${CRTSRC}/${CRTARCH}
 .PATH:		${CRTSRC}
 
 SRCF+=		absvdi2
 SRCF+=		absvsi2
 SRCF+=		absvti2
 SRCF+=		addvdi3
 SRCF+=		addvsi3
 SRCF+=		addvti3
 SRCF+=		apple_versioning
 SRCF+=		ashldi3
 SRCF+=		ashlti3
 SRCF+=		ashrdi3
 SRCF+=		ashrti3
 SRCF+=		clear_cache
 SRCF+=		clzdi2
 SRCF+=		clzsi2
 SRCF+=		clzti2
 SRCF+=		cmpdi2
 SRCF+=		cmpti2
 SRCF+=		ctzdi2
 SRCF+=		ctzsi2
 SRCF+=		ctzti2
 SRCF+=		divdc3
 SRCF+=		divdi3
 SRCF+=		divmoddi4
 SRCF+=		divmodsi4
 SRCF+=		divsc3
 SRCF+=		divtc3
 SRCF+=		divti3
 SRCF+=		divxc3
 SRCF+=		enable_execute_stack
 SRCF+=		eprintf
 SRCF+=		extendhfsf2
 SRCF+=		ffsdi2
 SRCF+=		ffssi2
 SRCF+=		ffsti2
 SRCF+=		fixdfdi
 SRCF+=		fixdfti
 SRCF+=		fixsfdi
 SRCF+=		fixsfti
 SRCF+=		fixunsdfdi
 SRCF+=		fixunsdfsi
 SRCF+=		fixunsdfti
 SRCF+=		fixunssfdi
 SRCF+=		fixunssfsi
 SRCF+=		fixunssfti
 SRCF+=		fixunsxfdi
 SRCF+=		fixunsxfsi
 SRCF+=		fixunsxfti
 SRCF+=		fixxfdi
 SRCF+=		fixxfti
 SRCF+=		floatdidf
 SRCF+=		floatdisf
 SRCF+=		floatditf
 SRCF+=		floatdixf
 SRCF+=		floatsitf
 SRCF+=		floattidf
 SRCF+=		floattisf
 SRCF+=		floattixf
 SRCF+=		floatundidf
 SRCF+=		floatundisf
 SRCF+=		floatunditf
 SRCF+=		floatundixf
 SRCF+=		floatunsidf
 SRCF+=		floatunsisf
 SRCF+=		floatuntidf
 SRCF+=		floatuntisf
 SRCF+=		floatuntixf
 SRCF+=		gcc_personality_v0
 SRCF+=		int_util
 SRCF+=		lshrdi3
 SRCF+=		lshrti3
 SRCF+=		moddi3
 SRCF+=		modti3
 SRCF+=		muldc3
 SRCF+=		muldi3
 SRCF+=		mulodi4
 SRCF+=		mulosi4
 SRCF+=		muloti4
 SRCF+=		mulsc3
 SRCF+=		multi3
 SRCF+=		mulvdi3
 SRCF+=		mulvsi3
 SRCF+=		mulvti3
 SRCF+=		multc3
 SRCF+=		mulxc3
 SRCF+=		negdf2
 SRCF+=		negdi2
 SRCF+=		negsf2
 SRCF+=		negti2
 SRCF+=		negvdi2
 SRCF+=		negvsi2
 SRCF+=		negvti2
 SRCF+=		paritydi2
 SRCF+=		paritysi2
 SRCF+=		parityti2
 SRCF+=		popcountdi2
 SRCF+=		popcountsi2
 SRCF+=		popcountti2
 SRCF+=		powidf2
 SRCF+=		powisf2
 SRCF+=		powitf2
 SRCF+=		powixf2
 SRCF+=		subvdi3
 SRCF+=		subvsi3
 SRCF+=		subvti3
 SRCF+=		trampoline_setup
 SRCF+=		truncdfhf2
 SRCF+=		truncsfhf2
 SRCF+=		ucmpdi2
 SRCF+=		ucmpti2
 SRCF+=		udivdi3
 SRCF+=		udivmoddi4
 SRCF+=		udivmodsi4
 SRCF+=		udivmodti4
 SRCF+=		udivti3
 SRCF+=		umoddi3
 SRCF+=		umodti3
 
 # __cpu_model support, only used on x86
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 SRCF+=		cpu_model
 .endif
 
 #
 # 128-bit quad precision long double support,
 # only used on some architectures.
 #
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv"
 SRCF+=		addtf3
 SRCF+=		comparetf2
 SRCF+=		divtf3
 SRCF+=		extenddftf2
 SRCF+=		extendsftf2
 SRCF+=		fixtfdi
 SRCF+=		fixtfsi
 SRCF+=		fixtfti
 SRCF+=		fixunstfdi
 SRCF+=		fixunstfsi
 SRCF+=		fixunstfti
 SRCF+=		floatunsitf
 SRCF+=		multf3
 SRCF+=		subtf3
 SRCF+=		trunctfdf2
 SRCF+=		trunctfsf2
 .endif
 
 # These are already shipped by libc.a on some architectures.
 .if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
     ${MACHINE_CPUARCH} != "riscv"
 SRCF+=		adddf3
 SRCF+=		addsf3
 SRCF+=		divdf3
 SRCF+=		divsf3
 SRCF+=		extendsfdf2
 SRCF+=		fixdfsi
 SRCF+=		fixsfsi
 SRCF+=		floatsidf
 SRCF+=		floatsisf
 SRCF+=		muldf3
 SRCF+=		mulsf3
 SRCF+=		subdf3
 SRCF+=		subsf3
 SRCF+=		truncdfsf2
 .endif
 
 .if ${MACHINE_CPUARCH} != "arm"
 SRCF+=		comparedf2
 SRCF+=		comparesf2
 .endif
 
 .if ${MACHINE_CPUARCH} != "mips"
 SRCF+=		divsi3
 SRCF+=		modsi3
 SRCF+=		udivsi3
 SRCF+=		umodsi3
 .endif
 
 # FreeBSD-specific atomic intrinsics.
 .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "armv6"
 .PATH:		${SRCTOP}/sys/arm/arm
 
 SRCF+=		stdatomic
 CFLAGS+=	-DEMIT_SYNC_ATOMICS
 .elif ${MACHINE_CPUARCH} == "mips"
 .PATH:		${SRCTOP}/sys/mips/mips
 
 SRCF+=		stdatomic
 .endif
 
 .for file in ${SRCF}
 .if ${MACHINE_ARCH:Marmv6*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") \
     && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S)
 SRCS+=		${file}vfp.S
 . elif exists(${CRTSRC}/${CRTARCH}/${file}.S)
 SRCS+=		${file}.S
 . else
 SRCS+=		${file}.c
 . endif
 .endfor
 
 .if ${MACHINE_CPUARCH} == "arm"
 SRCS+=		aeabi_div0.c
 SRCS+=		aeabi_idivmod.S
 SRCS+=		aeabi_ldivmod.S
 SRCS+=		aeabi_memcmp.S
 SRCS+=		aeabi_memcpy.S
 SRCS+=		aeabi_memmove.S
 SRCS+=		aeabi_memset.S
 SRCS+=		aeabi_uidivmod.S
 SRCS+=		aeabi_uldivmod.S
 SRCS+=		bswapdi2.S
 SRCS+=		bswapsi2.S
 SRCS+=		switch16.S
 SRCS+=		switch32.S
 SRCS+=		switch8.S
 SRCS+=		switchu8.S
 SRCS+=		sync_synchronize.S
 .endif
+
+# GCC-6.3 on mips32 requires bswap32 built-in.
+.if ${MACHINE_CPUARCH} == "mips"
+SRCS+=		bswapdi2.c
+SRCS+=		bswapsi2.c
+.endif
+
Index: projects/clang500-import/lib/libthr/Makefile
===================================================================
--- projects/clang500-import/lib/libthr/Makefile	(revision 318657)
+++ projects/clang500-import/lib/libthr/Makefile	(revision 318658)
@@ -1,69 +1,76 @@
 # $FreeBSD$
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
 # not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
 # below.  Note, there are no IDs for syscall stubs whose sources are generated.
 # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 
 PACKAGE=	clibs
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 MK_SSP=	no
 
 LIB=thr
 SHLIB_MAJOR= 3
 WARNS?=	3
+NO_WTHREAD_SAFETY=1
 CFLAGS+=-DPTHREAD_KERNEL
 CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}/thread \
 	-I${SRCTOP}/include
 CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
 CFLAGS+=-I${.CURDIR}/sys
 CFLAGS+=-I${SRCTOP}/libexec/rtld-elf
 CFLAGS+=-I${SRCTOP}/libexec/rtld-elf/${MACHINE_CPUARCH}
 CFLAGS+=-I${SRCTOP}/lib/libthread_db
 CFLAGS+=-Winline
+
+CFLAGS.thr_stack.c+=	-Wno-cast-align
+.include <bsd.compiler.mk>
+.if !(${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 40300)
+CFLAGS.thr_symbols.c+=	-Wno-missing-variable-declarations
+.endif
 
 .ifndef NO_THREAD_UNWIND_STACK
 CFLAGS+=-fexceptions
 CFLAGS+=-D_PTHREAD_FORCED_UNWIND
 .endif
 
 LDFLAGS+=-Wl,-znodelete
 
 VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=${.CURDIR}/pthread.map
 
 MAN=	libthr.3
 
 # enable extra internal consistency checks
 CFLAGS+=-D_PTHREADS_INVARIANTS
 
 PRECIOUSLIB=
 
 .PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
 
 .if exists(${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc)
 .include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"
 .endif
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
 .if ${MK_INSTALLLIB} != "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .endif
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
 .endif
 .if ${MK_PROFILE} != "no"
 SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
 .endif
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 
 .include <bsd.lib.mk>
Index: projects/clang500-import/lib/libthr/thread/thr_init.c
===================================================================
--- projects/clang500-import/lib/libthr/thread/thr_init.c	(revision 318657)
+++ projects/clang500-import/lib/libthr/thread/thr_init.c	(revision 318658)
@@ -1,495 +1,494 @@
 /*
  * Copyright (c) 2003 Daniel M. Eischen <deischen@freebsd.org>
  * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
  * 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 John Birrell.
  * 4. Neither the name of the author nor the names of any co-contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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 "namespace.h"
 #include <sys/types.h>
 #include <sys/signalvar.h>
 #include <sys/ioctl.h>
 #include <sys/link_elf.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/ttycom.h>
 #include <sys/mman.h>
 #include <sys/rtprio.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <pthread.h>
 #include <pthread_np.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include "un-namespace.h"
 
 #include "libc_private.h"
 #include "thr_private.h"
 
 char		*_usrstack;
 struct pthread	*_thr_initial;
 int		_libthr_debug;
 int		_thread_event_mask;
 struct pthread	*_thread_last_event;
 pthreadlist	_thread_list = TAILQ_HEAD_INITIALIZER(_thread_list);
 pthreadlist 	_thread_gc_list = TAILQ_HEAD_INITIALIZER(_thread_gc_list);
 int		_thread_active_threads = 1;
 atfork_head	_thr_atfork_list = TAILQ_HEAD_INITIALIZER(_thr_atfork_list);
 struct urwlock	_thr_atfork_lock = DEFAULT_URWLOCK;
 
 struct pthread_prio	_thr_priorities[3] = {
 	{RTP_PRIO_MIN,  RTP_PRIO_MAX, 0}, /* FIFO */
 	{0, 0, 63}, /* OTHER */
 	{RTP_PRIO_MIN, RTP_PRIO_MAX, 0}  /* RR */
 };
 
 struct pthread_attr _pthread_attr_default = {
 	.sched_policy = SCHED_OTHER,
 	.sched_inherit = PTHREAD_INHERIT_SCHED,
 	.prio = 0,
 	.suspend = THR_CREATE_RUNNING,
 	.flags = PTHREAD_SCOPE_SYSTEM,
 	.stackaddr_attr = NULL,
 	.stacksize_attr = THR_STACK_DEFAULT,
 	.guardsize_attr = 0,
 	.cpusetsize = 0,
 	.cpuset = NULL
 };
 
 struct pthread_mutex_attr _pthread_mutexattr_default = {
 	.m_type = PTHREAD_MUTEX_DEFAULT,
 	.m_protocol = PTHREAD_PRIO_NONE,
 	.m_ceiling = 0,
 	.m_pshared = PTHREAD_PROCESS_PRIVATE,
 	.m_robust = PTHREAD_MUTEX_STALLED,
 };
 
 struct pthread_mutex_attr _pthread_mutexattr_adaptive_default = {
 	.m_type = PTHREAD_MUTEX_ADAPTIVE_NP,
 	.m_protocol = PTHREAD_PRIO_NONE,
 	.m_ceiling = 0,
 	.m_pshared = PTHREAD_PROCESS_PRIVATE,
 	.m_robust = PTHREAD_MUTEX_STALLED,
 };
 
 /* Default condition variable attributes: */
 struct pthread_cond_attr _pthread_condattr_default = {
 	.c_pshared = PTHREAD_PROCESS_PRIVATE,
 	.c_clockid = CLOCK_REALTIME
 };
 
 int		_thr_is_smp = 0;
 size_t		_thr_guard_default;
 size_t		_thr_stack_default = THR_STACK_DEFAULT;
 size_t		_thr_stack_initial = THR_STACK_INITIAL;
 int		_thr_page_size;
 int		_thr_spinloops;
 int		_thr_yieldloops;
 int		_thr_queuefifo = 4;
 int		_gc_count;
 struct umutex	_mutex_static_lock = DEFAULT_UMUTEX;
 struct umutex	_cond_static_lock = DEFAULT_UMUTEX;
 struct umutex	_rwlock_static_lock = DEFAULT_UMUTEX;
 struct umutex	_keytable_lock = DEFAULT_UMUTEX;
 struct urwlock	_thr_list_lock = DEFAULT_URWLOCK;
 struct umutex	_thr_event_lock = DEFAULT_UMUTEX;
 struct umutex	_suspend_all_lock = DEFAULT_UMUTEX;
 struct pthread	*_single_thread;
 int		_suspend_all_cycle;
 int		_suspend_all_waiters;
 
 int	__pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
 int	__pthread_mutex_lock(pthread_mutex_t *);
 int	__pthread_mutex_trylock(pthread_mutex_t *);
 void	_thread_init_hack(void) __attribute__ ((constructor));
 
 static void init_private(void);
 static void init_main_thread(struct pthread *thread);
 
 /*
  * All weak references used within libc should be in this table.
  * This is so that static libraries will work.
  */
 
 STATIC_LIB_REQUIRE(_fork);
 STATIC_LIB_REQUIRE(_pthread_getspecific);
 STATIC_LIB_REQUIRE(_pthread_key_create);
 STATIC_LIB_REQUIRE(_pthread_key_delete);
 STATIC_LIB_REQUIRE(_pthread_mutex_destroy);
 STATIC_LIB_REQUIRE(_pthread_mutex_init);
 STATIC_LIB_REQUIRE(_pthread_mutex_lock);
 STATIC_LIB_REQUIRE(_pthread_mutex_trylock);
 STATIC_LIB_REQUIRE(_pthread_mutex_unlock);
 STATIC_LIB_REQUIRE(_pthread_mutexattr_init);
 STATIC_LIB_REQUIRE(_pthread_mutexattr_destroy);
 STATIC_LIB_REQUIRE(_pthread_mutexattr_settype);
 STATIC_LIB_REQUIRE(_pthread_once);
 STATIC_LIB_REQUIRE(_pthread_setspecific);
 STATIC_LIB_REQUIRE(_raise);
 STATIC_LIB_REQUIRE(_sem_destroy);
 STATIC_LIB_REQUIRE(_sem_getvalue);
 STATIC_LIB_REQUIRE(_sem_init);
 STATIC_LIB_REQUIRE(_sem_post);
 STATIC_LIB_REQUIRE(_sem_timedwait);
 STATIC_LIB_REQUIRE(_sem_trywait);
 STATIC_LIB_REQUIRE(_sem_wait);
 STATIC_LIB_REQUIRE(_sigaction);
 STATIC_LIB_REQUIRE(_sigprocmask);
 STATIC_LIB_REQUIRE(_sigsuspend);
 STATIC_LIB_REQUIRE(_sigtimedwait);
 STATIC_LIB_REQUIRE(_sigwait);
 STATIC_LIB_REQUIRE(_sigwaitinfo);
 STATIC_LIB_REQUIRE(_spinlock);
-STATIC_LIB_REQUIRE(_spinlock_debug);
 STATIC_LIB_REQUIRE(_spinunlock);
 STATIC_LIB_REQUIRE(_thread_init_hack);
 
 /*
  * These are needed when linking statically.  All references within
  * libgcc (and in the future libc) to these routines are weak, but
  * if they are not (strongly) referenced by the application or other
  * libraries, then the actual functions will not be loaded.
  */
 STATIC_LIB_REQUIRE(_pthread_once);
 STATIC_LIB_REQUIRE(_pthread_key_create);
 STATIC_LIB_REQUIRE(_pthread_key_delete);
 STATIC_LIB_REQUIRE(_pthread_getspecific);
 STATIC_LIB_REQUIRE(_pthread_setspecific);
 STATIC_LIB_REQUIRE(_pthread_mutex_init);
 STATIC_LIB_REQUIRE(_pthread_mutex_destroy);
 STATIC_LIB_REQUIRE(_pthread_mutex_lock);
 STATIC_LIB_REQUIRE(_pthread_mutex_trylock);
 STATIC_LIB_REQUIRE(_pthread_mutex_unlock);
 STATIC_LIB_REQUIRE(_pthread_create);
 
 /* Pull in all symbols required by libthread_db */
 STATIC_LIB_REQUIRE(_thread_state_running);
 
 #define	DUAL_ENTRY(entry)	\
 	(pthread_func_t)entry, (pthread_func_t)entry
 
 static pthread_func_t jmp_table[][2] = {
 	{DUAL_ENTRY(_pthread_atfork)},	/* PJT_ATFORK */
 	{DUAL_ENTRY(_pthread_attr_destroy)},	/* PJT_ATTR_DESTROY */
 	{DUAL_ENTRY(_pthread_attr_getdetachstate)},	/* PJT_ATTR_GETDETACHSTATE */
 	{DUAL_ENTRY(_pthread_attr_getguardsize)},	/* PJT_ATTR_GETGUARDSIZE */
 	{DUAL_ENTRY(_pthread_attr_getinheritsched)},	/* PJT_ATTR_GETINHERITSCHED */
 	{DUAL_ENTRY(_pthread_attr_getschedparam)},	/* PJT_ATTR_GETSCHEDPARAM */
 	{DUAL_ENTRY(_pthread_attr_getschedpolicy)},	/* PJT_ATTR_GETSCHEDPOLICY */
 	{DUAL_ENTRY(_pthread_attr_getscope)},	/* PJT_ATTR_GETSCOPE */
 	{DUAL_ENTRY(_pthread_attr_getstackaddr)},	/* PJT_ATTR_GETSTACKADDR */
 	{DUAL_ENTRY(_pthread_attr_getstacksize)},	/* PJT_ATTR_GETSTACKSIZE */
 	{DUAL_ENTRY(_pthread_attr_init)},	/* PJT_ATTR_INIT */
 	{DUAL_ENTRY(_pthread_attr_setdetachstate)},	/* PJT_ATTR_SETDETACHSTATE */
 	{DUAL_ENTRY(_pthread_attr_setguardsize)},	/* PJT_ATTR_SETGUARDSIZE */
 	{DUAL_ENTRY(_pthread_attr_setinheritsched)},	/* PJT_ATTR_SETINHERITSCHED */
 	{DUAL_ENTRY(_pthread_attr_setschedparam)},	/* PJT_ATTR_SETSCHEDPARAM */
 	{DUAL_ENTRY(_pthread_attr_setschedpolicy)},	/* PJT_ATTR_SETSCHEDPOLICY */
 	{DUAL_ENTRY(_pthread_attr_setscope)},	/* PJT_ATTR_SETSCOPE */
 	{DUAL_ENTRY(_pthread_attr_setstackaddr)},	/* PJT_ATTR_SETSTACKADDR */
 	{DUAL_ENTRY(_pthread_attr_setstacksize)},	/* PJT_ATTR_SETSTACKSIZE */
 	{DUAL_ENTRY(_pthread_cancel)},	/* PJT_CANCEL */
 	{DUAL_ENTRY(_pthread_cleanup_pop)},	/* PJT_CLEANUP_POP */
 	{DUAL_ENTRY(_pthread_cleanup_push)},	/* PJT_CLEANUP_PUSH */
 	{DUAL_ENTRY(_pthread_cond_broadcast)},	/* PJT_COND_BROADCAST */
 	{DUAL_ENTRY(_pthread_cond_destroy)},	/* PJT_COND_DESTROY */
 	{DUAL_ENTRY(_pthread_cond_init)},	/* PJT_COND_INIT */
 	{DUAL_ENTRY(_pthread_cond_signal)},	/* PJT_COND_SIGNAL */
 	{DUAL_ENTRY(_pthread_cond_timedwait)},	/* PJT_COND_TIMEDWAIT */
 	{(pthread_func_t)__pthread_cond_wait,
 	 (pthread_func_t)_pthread_cond_wait},	/* PJT_COND_WAIT */
 	{DUAL_ENTRY(_pthread_detach)},	/* PJT_DETACH */
 	{DUAL_ENTRY(_pthread_equal)},	/* PJT_EQUAL */
 	{DUAL_ENTRY(_pthread_exit)},	/* PJT_EXIT */
 	{DUAL_ENTRY(_pthread_getspecific)},	/* PJT_GETSPECIFIC */
 	{DUAL_ENTRY(_pthread_join)},	/* PJT_JOIN */
 	{DUAL_ENTRY(_pthread_key_create)},	/* PJT_KEY_CREATE */
 	{DUAL_ENTRY(_pthread_key_delete)},	/* PJT_KEY_DELETE*/
 	{DUAL_ENTRY(_pthread_kill)},	/* PJT_KILL */
 	{DUAL_ENTRY(_pthread_main_np)},		/* PJT_MAIN_NP */
 	{DUAL_ENTRY(_pthread_mutexattr_destroy)}, /* PJT_MUTEXATTR_DESTROY */
 	{DUAL_ENTRY(_pthread_mutexattr_init)},	/* PJT_MUTEXATTR_INIT */
 	{DUAL_ENTRY(_pthread_mutexattr_settype)}, /* PJT_MUTEXATTR_SETTYPE */
 	{DUAL_ENTRY(_pthread_mutex_destroy)},	/* PJT_MUTEX_DESTROY */
 	{DUAL_ENTRY(_pthread_mutex_init)},	/* PJT_MUTEX_INIT */
 	{(pthread_func_t)__pthread_mutex_lock,
 	 (pthread_func_t)_pthread_mutex_lock},	/* PJT_MUTEX_LOCK */
 	{(pthread_func_t)__pthread_mutex_trylock,
 	 (pthread_func_t)_pthread_mutex_trylock},/* PJT_MUTEX_TRYLOCK */
 	{DUAL_ENTRY(_pthread_mutex_unlock)},	/* PJT_MUTEX_UNLOCK */
 	{DUAL_ENTRY(_pthread_once)},		/* PJT_ONCE */
 	{DUAL_ENTRY(_pthread_rwlock_destroy)},	/* PJT_RWLOCK_DESTROY */
 	{DUAL_ENTRY(_pthread_rwlock_init)},	/* PJT_RWLOCK_INIT */
 	{DUAL_ENTRY(_pthread_rwlock_rdlock)},	/* PJT_RWLOCK_RDLOCK */
 	{DUAL_ENTRY(_pthread_rwlock_tryrdlock)},/* PJT_RWLOCK_TRYRDLOCK */
 	{DUAL_ENTRY(_pthread_rwlock_trywrlock)},/* PJT_RWLOCK_TRYWRLOCK */
 	{DUAL_ENTRY(_pthread_rwlock_unlock)},	/* PJT_RWLOCK_UNLOCK */
 	{DUAL_ENTRY(_pthread_rwlock_wrlock)},	/* PJT_RWLOCK_WRLOCK */
 	{DUAL_ENTRY(_pthread_self)},		/* PJT_SELF */
 	{DUAL_ENTRY(_pthread_setcancelstate)},	/* PJT_SETCANCELSTATE */
 	{DUAL_ENTRY(_pthread_setcanceltype)},	/* PJT_SETCANCELTYPE */
 	{DUAL_ENTRY(_pthread_setspecific)},	/* PJT_SETSPECIFIC */
 	{DUAL_ENTRY(_pthread_sigmask)},		/* PJT_SIGMASK */
 	{DUAL_ENTRY(_pthread_testcancel)},	/* PJT_TESTCANCEL */
 	{DUAL_ENTRY(__pthread_cleanup_pop_imp)},/* PJT_CLEANUP_POP_IMP */
 	{DUAL_ENTRY(__pthread_cleanup_push_imp)},/* PJT_CLEANUP_PUSH_IMP */
 	{DUAL_ENTRY(_pthread_cancel_enter)},	/* PJT_CANCEL_ENTER */
 	{DUAL_ENTRY(_pthread_cancel_leave)},	/* PJT_CANCEL_LEAVE */
 	{DUAL_ENTRY(_pthread_mutex_consistent)},/* PJT_MUTEX_CONSISTENT */
 	{DUAL_ENTRY(_pthread_mutexattr_getrobust)},/* PJT_MUTEXATTR_GETROBUST */
 	{DUAL_ENTRY(_pthread_mutexattr_setrobust)},/* PJT_MUTEXATTR_SETROBUST */
 };
 
 static int init_once = 0;
 
 /*
  * For the shared version of the threads library, the above is sufficient.
  * But for the archive version of the library, we need a little bit more.
  * Namely, we must arrange for this particular module to be pulled in from
  * the archive library at link time.  To accomplish that, we define and
  * initialize a variable, "_thread_autoinit_dummy_decl".  This variable is
  * referenced (as an extern) from libc/stdlib/exit.c. This will always
  * create a need for this module, ensuring that it is present in the
  * executable.
  */
 extern int _thread_autoinit_dummy_decl;
 int _thread_autoinit_dummy_decl = 0;
 
 void
 _thread_init_hack(void)
 {
 
 	_libpthread_init(NULL);
 }
 
 
 /*
  * Threaded process initialization.
  *
  * This is only called under two conditions:
  *
  *   1) Some thread routines have detected that the library hasn't yet
  *      been initialized (_thr_initial == NULL && curthread == NULL), or
  *
  *   2) An explicit call to reinitialize after a fork (indicated
  *      by curthread != NULL)
  */
 void
 _libpthread_init(struct pthread *curthread)
 {
 	int first, dlopened;
 
 	/* Check if this function has already been called: */
 	if (_thr_initial != NULL && curthread == NULL)
 		/* Only initialize the threaded application once. */
 		return;
 
 	/*
 	 * Check the size of the jump table to make sure it is preset
 	 * with the correct number of entries.
 	 */
 	if (sizeof(jmp_table) != sizeof(pthread_func_t) * PJT_MAX * 2)
 		PANIC("Thread jump table not properly initialized");
 	memcpy(__thr_jtable, jmp_table, sizeof(jmp_table));
 	__thr_interpose_libc();
 
 	/* Initialize pthread private data. */
 	init_private();
 
 	/* Set the initial thread. */
 	if (curthread == NULL) {
 		first = 1;
 		/* Create and initialize the initial thread. */
 		curthread = _thr_alloc(NULL);
 		if (curthread == NULL)
 			PANIC("Can't allocate initial thread");
 		init_main_thread(curthread);
 	} else {
 		first = 0;
 	}
 		
 	/*
 	 * Add the thread to the thread list queue.
 	 */
 	THR_LIST_ADD(curthread);
 	_thread_active_threads = 1;
 
 	/* Setup the thread specific data */
 	_tcb_set(curthread->tcb);
 
 	if (first) {
 		_thr_initial = curthread;
 		dlopened = _rtld_is_dlopened(&_thread_autoinit_dummy_decl) != 0;
 		_thr_signal_init(dlopened);
 		if (_thread_event_mask & TD_CREATE)
 			_thr_report_creation(curthread, curthread);
 		/*
 		 * Always use our rtld lock implementation.
 		 * It is faster because it postpones signal handlers
 		 * instead of calling sigprocmask(2).
 		 */
 		_thr_rtld_init();
 	}
 }
 
 /*
  * This function and pthread_create() do a lot of the same things.
  * It'd be nice to consolidate the common stuff in one place.
  */
 static void
 init_main_thread(struct pthread *thread)
 {
 	struct sched_param sched_param;
 	int i;
 
 	/* Setup the thread attributes. */
 	thr_self(&thread->tid);
 	thread->attr = _pthread_attr_default;
 	/*
 	 * Set up the thread stack.
 	 *
 	 * Create a red zone below the main stack.  All other stacks
 	 * are constrained to a maximum size by the parameters
 	 * passed to mmap(), but this stack is only limited by
 	 * resource limits, so this stack needs an explicitly mapped
 	 * red zone to protect the thread stack that is just beyond.
 	 */
 	if (mmap(_usrstack - _thr_stack_initial -
 	    _thr_guard_default, _thr_guard_default, 0, MAP_ANON,
 	    -1, 0) == MAP_FAILED)
 		PANIC("Cannot allocate red zone for initial thread");
 
 	/*
 	 * Mark the stack as an application supplied stack so that it
 	 * isn't deallocated.
 	 *
 	 * XXX - I'm not sure it would hurt anything to deallocate
 	 *       the main thread stack because deallocation doesn't
 	 *       actually free() it; it just puts it in the free
 	 *       stack queue for later reuse.
 	 */
 	thread->attr.stackaddr_attr = _usrstack - _thr_stack_initial;
 	thread->attr.stacksize_attr = _thr_stack_initial;
 	thread->attr.guardsize_attr = _thr_guard_default;
 	thread->attr.flags |= THR_STACK_USER;
 
 	/*
 	 * Write a magic value to the thread structure
 	 * to help identify valid ones:
 	 */
 	thread->magic = THR_MAGIC;
 
 	thread->cancel_enable = 1;
 	thread->cancel_async = 0;
 
 	/* Initialize the mutex queues */
 	for (i = 0; i < TMQ_NITEMS; i++)
 		TAILQ_INIT(&thread->mq[i]);
 
 	thread->state = PS_RUNNING;
 
 	_thr_getscheduler(thread->tid, &thread->attr.sched_policy,
 		 &sched_param);
 	thread->attr.prio = sched_param.sched_priority;
 
 #ifdef _PTHREAD_FORCED_UNWIND
 	thread->unwind_stackend = _usrstack;
 #endif
 
 	/* Others cleared to zero by thr_alloc() */
 }
 
 static void
 init_private(void)
 {
 	struct rlimit rlim;
 	size_t len;
 	int mib[2];
 	char *env, *env_bigstack, *env_splitstack;
 
 	_thr_umutex_init(&_mutex_static_lock);
 	_thr_umutex_init(&_cond_static_lock);
 	_thr_umutex_init(&_rwlock_static_lock);
 	_thr_umutex_init(&_keytable_lock);
 	_thr_urwlock_init(&_thr_atfork_lock);
 	_thr_umutex_init(&_thr_event_lock);
 	_thr_umutex_init(&_suspend_all_lock);
 	_thr_spinlock_init();
 	_thr_list_init();
 	_thr_wake_addr_init();
 	_sleepq_init();
 	_single_thread = NULL;
 	_suspend_all_waiters = 0;
 
 	/*
 	 * Avoid reinitializing some things if they don't need to be,
 	 * e.g. after a fork().
 	 */
 	if (init_once == 0) {
 		__thr_pshared_init();
 		/* Find the stack top */
 		mib[0] = CTL_KERN;
 		mib[1] = KERN_USRSTACK;
 		len = sizeof (_usrstack);
 		if (sysctl(mib, 2, &_usrstack, &len, NULL, 0) == -1)
 			PANIC("Cannot get kern.usrstack from sysctl");
 		env_bigstack = getenv("LIBPTHREAD_BIGSTACK_MAIN");
 		env_splitstack = getenv("LIBPTHREAD_SPLITSTACK_MAIN");
 		if (env_bigstack != NULL || env_splitstack == NULL) {
 			if (getrlimit(RLIMIT_STACK, &rlim) == -1)
 				PANIC("Cannot get stack rlimit");
 			_thr_stack_initial = rlim.rlim_cur;
 		}
 		len = sizeof(_thr_is_smp);
 		sysctlbyname("kern.smp.cpus", &_thr_is_smp, &len, NULL, 0);
 		_thr_is_smp = (_thr_is_smp > 1);
 		_thr_page_size = getpagesize();
 		_thr_guard_default = _thr_page_size;
 		_pthread_attr_default.guardsize_attr = _thr_guard_default;
 		_pthread_attr_default.stacksize_attr = _thr_stack_default;
 		env = getenv("LIBPTHREAD_SPINLOOPS");
 		if (env)
 			_thr_spinloops = atoi(env);
 		env = getenv("LIBPTHREAD_YIELDLOOPS");
 		if (env)
 			_thr_yieldloops = atoi(env);
 		env = getenv("LIBPTHREAD_QUEUE_FIFO");
 		if (env)
 			_thr_queuefifo = atoi(env);
 		TAILQ_INIT(&_thr_atfork_list);
 	}
 	init_once = 1;
 }
Index: projects/clang500-import/lib/libthr/thread/thr_rwlock.c
===================================================================
--- projects/clang500-import/lib/libthr/thread/thr_rwlock.c	(revision 318657)
+++ projects/clang500-import/lib/libthr/thread/thr_rwlock.c	(revision 318658)
@@ -1,352 +1,375 @@
 /*-
  * Copyright (c) 1998 Alex Nash
  * 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.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
 
 #include "namespace.h"
 #include <pthread.h>
 #include "un-namespace.h"
 #include "thr_private.h"
 
 _Static_assert(sizeof(struct pthread_rwlock) <= PAGE_SIZE,
     "pthread_rwlock is too large for off-page");
 
 __weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy);
 __weak_reference(_pthread_rwlock_init, pthread_rwlock_init);
 __weak_reference(_pthread_rwlock_rdlock, pthread_rwlock_rdlock);
 __weak_reference(_pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock);
 __weak_reference(_pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock);
 __weak_reference(_pthread_rwlock_trywrlock, pthread_rwlock_trywrlock);
 __weak_reference(_pthread_rwlock_unlock, pthread_rwlock_unlock);
 __weak_reference(_pthread_rwlock_wrlock, pthread_rwlock_wrlock);
 __weak_reference(_pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock);
 
-#define CHECK_AND_INIT_RWLOCK							\
-	if (*rwlock == THR_PSHARED_PTR) {					\
-		prwlock = __thr_pshared_offpage(rwlock, 0);			\
-		if (prwlock == NULL)						\
-			return (EINVAL);					\
-	} else if (__predict_false((prwlock = (*rwlock)) <=			\
-	    THR_RWLOCK_DESTROYED)) {						\
-		if (prwlock == THR_RWLOCK_INITIALIZER) {			\
-			int ret;						\
-			ret = init_static(_get_curthread(), rwlock);		\
-			if (ret)						\
-				return (ret);					\
-		} else if (prwlock == THR_RWLOCK_DESTROYED) {			\
-			return (EINVAL);					\
-		}								\
-		prwlock = *rwlock;						\
-	}
+static int init_static(struct pthread *thread, pthread_rwlock_t *rwlock);
+static int init_rwlock(pthread_rwlock_t *rwlock, pthread_rwlock_t *rwlock_out);
 
-/*
- * Prototypes
- */
+static int __always_inline
+check_and_init_rwlock(pthread_rwlock_t *rwlock, pthread_rwlock_t *rwlock_out)
+{
+	if (__predict_false(*rwlock == THR_PSHARED_PTR ||
+	    *rwlock <= THR_RWLOCK_DESTROYED))
+		return (init_rwlock(rwlock, rwlock_out));
+	*rwlock_out = *rwlock;
+	return (0);
+}
 
+static int __noinline
+init_rwlock(pthread_rwlock_t *rwlock, pthread_rwlock_t *rwlock_out)
+{
+	pthread_rwlock_t prwlock;
+	int ret;
+
+	if (*rwlock == THR_PSHARED_PTR) {
+		prwlock = __thr_pshared_offpage(rwlock, 0);
+		if (prwlock == NULL)
+			return (EINVAL);
+	} else if ((prwlock = *rwlock) <= THR_RWLOCK_DESTROYED) {
+		if (prwlock == THR_RWLOCK_INITIALIZER) {
+			ret = init_static(_get_curthread(), rwlock);
+			if (ret != 0)
+				return (ret);
+		} else if (prwlock == THR_RWLOCK_DESTROYED) {
+			return (EINVAL);
+		}
+		prwlock = *rwlock;
+	}
+	*rwlock_out = prwlock;
+	return (0);
+}
+
 static int
 rwlock_init(pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr)
 {
 	pthread_rwlock_t prwlock;
 
 	if (attr == NULL || *attr == NULL ||
 	    (*attr)->pshared == PTHREAD_PROCESS_PRIVATE) {
 		prwlock = calloc(1, sizeof(struct pthread_rwlock));
 		if (prwlock == NULL)
 			return (ENOMEM);
 		*rwlock = prwlock;
 	} else {
 		prwlock = __thr_pshared_offpage(rwlock, 1);
 		if (prwlock == NULL)
 			return (EFAULT);
 		prwlock->lock.rw_flags |= USYNC_PROCESS_SHARED;
 		*rwlock = THR_PSHARED_PTR;
 	}
 	return (0);
 }
 
 int
 _pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
 {
 	pthread_rwlock_t prwlock;
 	int ret;
 
 	prwlock = *rwlock;
 	if (prwlock == THR_RWLOCK_INITIALIZER)
 		ret = 0;
 	else if (prwlock == THR_RWLOCK_DESTROYED)
 		ret = EINVAL;
 	else if (prwlock == THR_PSHARED_PTR) {
 		*rwlock = THR_RWLOCK_DESTROYED;
 		__thr_pshared_destroy(rwlock);
 		ret = 0;
 	} else {
 		*rwlock = THR_RWLOCK_DESTROYED;
 		free(prwlock);
 		ret = 0;
 	}
 	return (ret);
 }
 
 static int
 init_static(struct pthread *thread, pthread_rwlock_t *rwlock)
 {
 	int ret;
 
 	THR_LOCK_ACQUIRE(thread, &_rwlock_static_lock);
 
 	if (*rwlock == THR_RWLOCK_INITIALIZER)
 		ret = rwlock_init(rwlock, NULL);
 	else
 		ret = 0;
 
 	THR_LOCK_RELEASE(thread, &_rwlock_static_lock);
 
 	return (ret);
 }
 
 int
 _pthread_rwlock_init(pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr)
 {
 
 	*rwlock = NULL;
 	return (rwlock_init(rwlock, attr));
 }
 
 static int
 rwlock_rdlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime)
 {
 	struct pthread *curthread = _get_curthread();
 	pthread_rwlock_t prwlock;
 	int flags;
 	int ret;
 
-	CHECK_AND_INIT_RWLOCK
+	ret = check_and_init_rwlock(rwlock, &prwlock);
+	if (ret != 0)
+		return (ret);
 
 	if (curthread->rdlock_count) {
 		/*
 		 * To avoid having to track all the rdlocks held by
 		 * a thread or all of the threads that hold a rdlock,
 		 * we keep a simple count of all the rdlocks held by
 		 * a thread.  If a thread holds any rdlocks it is
 		 * possible that it is attempting to take a recursive
 		 * rdlock.  If there are blocked writers and precedence
 		 * is given to them, then that would result in the thread
 		 * deadlocking.  So allowing a thread to take the rdlock
 		 * when it already has one or more rdlocks avoids the
 		 * deadlock.  I hope the reader can follow that logic ;-)
 		 */
 		flags = URWLOCK_PREFER_READER;
 	} else {
 		flags = 0;
 	}
 
 	/*
 	 * POSIX said the validity of the abstimeout parameter need
 	 * not be checked if the lock can be immediately acquired.
 	 */
 	ret = _thr_rwlock_tryrdlock(&prwlock->lock, flags);
 	if (ret == 0) {
 		curthread->rdlock_count++;
 		return (ret);
 	}
 
 	if (__predict_false(abstime && 
 		(abstime->tv_nsec >= 1000000000 || abstime->tv_nsec < 0)))
 		return (EINVAL);
 
 	for (;;) {
 		/* goto kernel and lock it */
 		ret = __thr_rwlock_rdlock(&prwlock->lock, flags, abstime);
 		if (ret != EINTR)
 			break;
 
 		/* if interrupted, try to lock it in userland again. */
 		if (_thr_rwlock_tryrdlock(&prwlock->lock, flags) == 0) {
 			ret = 0;
 			break;
 		}
 	}
 	if (ret == 0)
 		curthread->rdlock_count++;
 	return (ret);
 }
 
 int
 _pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
 {
 	return (rwlock_rdlock_common(rwlock, NULL));
 }
 
 int
 _pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
 	 const struct timespec *abstime)
 {
 	return (rwlock_rdlock_common(rwlock, abstime));
 }
 
 int
 _pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
 {
 	struct pthread *curthread = _get_curthread();
 	pthread_rwlock_t prwlock;
 	int flags;
 	int ret;
 
-	CHECK_AND_INIT_RWLOCK
+	ret = check_and_init_rwlock(rwlock, &prwlock);
+	if (ret != 0)
+		return (ret);
 
 	if (curthread->rdlock_count) {
 		/*
 		 * To avoid having to track all the rdlocks held by
 		 * a thread or all of the threads that hold a rdlock,
 		 * we keep a simple count of all the rdlocks held by
 		 * a thread.  If a thread holds any rdlocks it is
 		 * possible that it is attempting to take a recursive
 		 * rdlock.  If there are blocked writers and precedence
 		 * is given to them, then that would result in the thread
 		 * deadlocking.  So allowing a thread to take the rdlock
 		 * when it already has one or more rdlocks avoids the
 		 * deadlock.  I hope the reader can follow that logic ;-)
 		 */
 		flags = URWLOCK_PREFER_READER;
 	} else {
 		flags = 0;
 	}
 
 	ret = _thr_rwlock_tryrdlock(&prwlock->lock, flags);
 	if (ret == 0)
 		curthread->rdlock_count++;
 	return (ret);
 }
 
 int
 _pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
 {
 	struct pthread *curthread = _get_curthread();
 	pthread_rwlock_t prwlock;
 	int ret;
 
-	CHECK_AND_INIT_RWLOCK
+	ret = check_and_init_rwlock(rwlock, &prwlock);
+	if (ret != 0)
+		return (ret);
 
 	ret = _thr_rwlock_trywrlock(&prwlock->lock);
 	if (ret == 0)
 		prwlock->owner = TID(curthread);
 	return (ret);
 }
 
 static int
 rwlock_wrlock_common (pthread_rwlock_t *rwlock, const struct timespec *abstime)
 {
 	struct pthread *curthread = _get_curthread();
 	pthread_rwlock_t prwlock;
 	int ret;
 
-	CHECK_AND_INIT_RWLOCK
+	ret = check_and_init_rwlock(rwlock, &prwlock);
+	if (ret != 0)
+		return (ret);
 
 	/*
 	 * POSIX said the validity of the abstimeout parameter need
 	 * not be checked if the lock can be immediately acquired.
 	 */
 	ret = _thr_rwlock_trywrlock(&prwlock->lock);
 	if (ret == 0) {
 		prwlock->owner = TID(curthread);
 		return (ret);
 	}
 
 	if (__predict_false(abstime && 
 	    (abstime->tv_nsec >= 1000000000 || abstime->tv_nsec < 0)))
 		return (EINVAL);
 
 	for (;;) {
 		/* goto kernel and lock it */
 		ret = __thr_rwlock_wrlock(&prwlock->lock, abstime);
 		if (ret == 0) {
 			prwlock->owner = TID(curthread);
 			break;
 		}
 
 		if (ret != EINTR)
 			break;
 
 		/* if interrupted, try to lock it in userland again. */
 		if (_thr_rwlock_trywrlock(&prwlock->lock) == 0) {
 			ret = 0;
 			prwlock->owner = TID(curthread);
 			break;
 		}
 	}
 	return (ret);
 }
 
 int
 _pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
 {
 	return (rwlock_wrlock_common (rwlock, NULL));
 }
 
 int
 _pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
     const struct timespec *abstime)
 {
 	return (rwlock_wrlock_common (rwlock, abstime));
 }
 
 int
 _pthread_rwlock_unlock(pthread_rwlock_t *rwlock)
 {
 	struct pthread *curthread = _get_curthread();
 	pthread_rwlock_t prwlock;
 	int ret;
 	int32_t state;
 
 	if (*rwlock == THR_PSHARED_PTR) {
 		prwlock = __thr_pshared_offpage(rwlock, 0);
 		if (prwlock == NULL)
 			return (EINVAL);
 	} else {
 		prwlock = *rwlock;
 	}
 
 	if (__predict_false(prwlock <= THR_RWLOCK_DESTROYED))
 		return (EINVAL);
 
 	state = prwlock->lock.rw_state;
 	if (state & URWLOCK_WRITE_OWNER) {
 		if (__predict_false(prwlock->owner != TID(curthread)))
 			return (EPERM);
 		prwlock->owner = 0;
 	}
 
 	ret = _thr_rwlock_unlock(&prwlock->lock);
 	if (ret == 0 && (state & URWLOCK_WRITE_OWNER) == 0)
 		curthread->rdlock_count--;
 
 	return (ret);
 }
Index: projects/clang500-import/lib/libthr/thread/thr_spinlock.c
===================================================================
--- projects/clang500-import/lib/libthr/thread/thr_spinlock.c	(revision 318657)
+++ projects/clang500-import/lib/libthr/thread/thr_spinlock.c	(revision 318658)
@@ -1,124 +1,124 @@
 /*
  * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
  * 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 author nor the names of any co-contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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 <sys/types.h>
 #include <pthread.h>
 #include <libc_private.h>
 #include <spinlock.h>
 
 #include "thr_private.h"
 
 #define	MAX_SPINLOCKS	72
 
 /*
  * These data structures are used to trace all spinlocks
  * in libc.
  */
 struct spinlock_extra {
 	spinlock_t	*owner;
 	struct umutex	lock;
 };
 
 static struct umutex		spinlock_static_lock = DEFAULT_UMUTEX;
 static struct spinlock_extra	extra[MAX_SPINLOCKS];
 static int			spinlock_count;
 static int			initialized;
 
 static void	init_spinlock(spinlock_t *lck);
 
 /*
  * These are for compatability only.  Spinlocks of this type
  * are deprecated.
  */
 
 void
 __thr_spinunlock(spinlock_t *lck)
 {
 	struct spinlock_extra	*_extra;
 
-	_extra = (struct spinlock_extra *)lck->fname;
+	_extra = lck->thr_extra;
 	THR_UMUTEX_UNLOCK(_get_curthread(), &_extra->lock);
 }
 
 void
 __thr_spinlock(spinlock_t *lck)
 {
 	struct spinlock_extra *_extra;
 
 	if (!__isthreaded)
 		PANIC("Spinlock called when not threaded.");
 	if (!initialized)
 		PANIC("Spinlocks not initialized.");
-	if (lck->fname == NULL)
+	if (lck->thr_extra == NULL)
 		init_spinlock(lck);
-	_extra = (struct spinlock_extra *)lck->fname;
+	_extra = lck->thr_extra;
 	THR_UMUTEX_LOCK(_get_curthread(), &_extra->lock);
 }
 
 static void
 init_spinlock(spinlock_t *lck)
 {
 	struct pthread *curthread = _get_curthread();
 
 	THR_UMUTEX_LOCK(curthread, &spinlock_static_lock);
-	if ((lck->fname == NULL) && (spinlock_count < MAX_SPINLOCKS)) {
-		lck->fname = (char *)&extra[spinlock_count];
+	if ((lck->thr_extra == NULL) && (spinlock_count < MAX_SPINLOCKS)) {
+		lck->thr_extra = &extra[spinlock_count];
 		_thr_umutex_init(&extra[spinlock_count].lock);
 		extra[spinlock_count].owner = lck;
 		spinlock_count++;
 	}
 	THR_UMUTEX_UNLOCK(curthread, &spinlock_static_lock);
-	if (lck->fname == NULL)
+	if (lck->thr_extra == NULL)
 		PANIC("Warning: exceeded max spinlocks");
 }
 
 void
 _thr_spinlock_init(void)
 {
 	int i;
 
 	_thr_umutex_init(&spinlock_static_lock);
 	if (initialized != 0) {
 		/*
 		 * called after fork() to reset state of libc spin locks,
 		 * it is not quite right since libc may be in inconsistent
 		 * state, resetting the locks to allow current thread to be
 		 * able to hold them may not help things too much, but
 		 * anyway, we do our best.
 		 * it is better to do pthread_atfork in libc.
 		 */
 		for (i = 0; i < spinlock_count; i++)
 			_thr_umutex_init(&extra[i].lock);
 	} else {
 		initialized = 1;
 	}
 }
Index: projects/clang500-import/lib/libthr/thread/thr_stack.c
===================================================================
--- projects/clang500-import/lib/libthr/thread/thr_stack.c	(revision 318657)
+++ projects/clang500-import/lib/libthr/thread/thr_stack.c	(revision 318658)
@@ -1,335 +1,318 @@
 /*
  * Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
  * Copyright (c) 2000-2001 Jason Evans <jasone@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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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 <sys/types.h>
 #include <sys/mman.h>
 #include <sys/queue.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include <link.h>
 
 #include "thr_private.h"
 
 /* Spare thread stack. */
 struct stack {
 	LIST_ENTRY(stack)	qe;		/* Stack queue linkage. */
 	size_t			stacksize;	/* Stack size (rounded up). */
 	size_t			guardsize;	/* Guard size. */
 	void			*stackaddr;	/* Stack address. */
 };
 
 /*
  * Default sized (stack and guard) spare stack queue.  Stacks are cached
  * to avoid additional complexity managing mmap()ed stack regions.  Spare
  * stacks are used in LIFO order to increase cache locality.
  */
 static LIST_HEAD(, stack)	dstackq = LIST_HEAD_INITIALIZER(dstackq);
 
 /*
  * Miscellaneous sized (non-default stack and/or guard) spare stack queue.
  * Stacks are cached to avoid additional complexity managing mmap()ed
  * stack regions.  This list is unordered, since ordering on both stack
  * size and guard size would be more trouble than it's worth.  Stacks are
  * allocated from this cache on a first size match basis.
  */
 static LIST_HEAD(, stack)	mstackq = LIST_HEAD_INITIALIZER(mstackq);
 
 /**
  * Base address of the last stack allocated (including its red zone, if
  * there is one).  Stacks are allocated contiguously, starting beyond the
  * top of the main stack.  When a new stack is created, a red zone is
  * typically created (actually, the red zone is mapped with PROT_NONE) above
  * the top of the stack, such that the stack will not be able to grow all
  * the way to the bottom of the next stack.  This isn't fool-proof.  It is
  * possible for a stack to grow by a large amount, such that it grows into
  * the next stack, and as long as the memory within the red zone is never
  * accessed, nothing will prevent one thread stack from trouncing all over
  * the next.
  *
  * low memory
  *     . . . . . . . . . . . . . . . . . . 
  *    |                                   |
  *    |             stack 3               | start of 3rd thread stack
  *    +-----------------------------------+
  *    |                                   |
  *    |       Red Zone (guard page)       | red zone for 2nd thread
  *    |                                   |
  *    +-----------------------------------+
  *    |  stack 2 - _thr_stack_default     | top of 2nd thread stack
  *    |                                   |
  *    |                                   |
  *    |                                   |
  *    |                                   |
  *    |             stack 2               |
  *    +-----------------------------------+ <-- start of 2nd thread stack
  *    |                                   |
  *    |       Red Zone                    | red zone for 1st thread
  *    |                                   |
  *    +-----------------------------------+
  *    |  stack 1 - _thr_stack_default     | top of 1st thread stack
  *    |                                   |
  *    |                                   |
  *    |                                   |
  *    |                                   |
  *    |             stack 1               |
  *    +-----------------------------------+ <-- start of 1st thread stack
  *    |                                   |   (initial value of last_stack)
  *    |       Red Zone                    |
  *    |                                   | red zone for main thread
  *    +-----------------------------------+
  *    | USRSTACK - _thr_stack_initial     | top of main thread stack
  *    |                                   | ^
  *    |                                   | |
  *    |                                   | |
  *    |                                   | | stack growth
  *    |                                   |
  *    +-----------------------------------+ <-- start of main thread stack
  *                                              (USRSTACK)
  * high memory
  *
  */
 static char *last_stack = NULL;
 
 /*
  * Round size up to the nearest multiple of
  * _thr_page_size.
  */
 static inline size_t
 round_up(size_t size)
 {
 	if (size % _thr_page_size != 0)
 		size = ((size / _thr_page_size) + 1) *
 		    _thr_page_size;
 	return size;
 }
 
 void
 _thr_stack_fix_protection(struct pthread *thrd)
 {
 
 	mprotect((char *)thrd->attr.stackaddr_attr +
 	    round_up(thrd->attr.guardsize_attr),
 	    round_up(thrd->attr.stacksize_attr),
 	    _rtld_get_stack_prot());
 }
 
 static void
 singlethread_map_stacks_exec(void)
 {
 	int mib[2];
 	struct rlimit rlim;
 	u_long usrstack;
 	size_t len;
 
 	mib[0] = CTL_KERN;
 	mib[1] = KERN_USRSTACK;
 	len = sizeof(usrstack);
 	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), &usrstack, &len, NULL, 0)
 	    == -1)
 		return;
 	if (getrlimit(RLIMIT_STACK, &rlim) == -1)
 		return;
 	mprotect((void *)(uintptr_t)(usrstack - rlim.rlim_cur),
 	    rlim.rlim_cur, _rtld_get_stack_prot());
 }
 
 void
 __thr_map_stacks_exec(void)
 {
 	struct pthread *curthread, *thrd;
 	struct stack *st;
 
 	if (!_thr_is_inited()) {
 		singlethread_map_stacks_exec();
 		return;
 	}
 	curthread = _get_curthread();
 	THREAD_LIST_RDLOCK(curthread);
 	LIST_FOREACH(st, &mstackq, qe)
 		mprotect((char *)st->stackaddr + st->guardsize, st->stacksize,
 		    _rtld_get_stack_prot());
 	LIST_FOREACH(st, &dstackq, qe)
 		mprotect((char *)st->stackaddr + st->guardsize, st->stacksize,
 		    _rtld_get_stack_prot());
 	TAILQ_FOREACH(thrd, &_thread_gc_list, gcle)
 		_thr_stack_fix_protection(thrd);
 	TAILQ_FOREACH(thrd, &_thread_list, tle)
 		_thr_stack_fix_protection(thrd);
 	THREAD_LIST_UNLOCK(curthread);
 }
 
 int
 _thr_stack_alloc(struct pthread_attr *attr)
 {
 	struct pthread *curthread = _get_curthread();
 	struct stack *spare_stack;
 	size_t stacksize;
 	size_t guardsize;
 	char *stackaddr;
 
 	/*
 	 * Round up stack size to nearest multiple of _thr_page_size so
 	 * that mmap() * will work.  If the stack size is not an even
 	 * multiple, we end up initializing things such that there is
 	 * unused space above the beginning of the stack, so the stack
 	 * sits snugly against its guard.
 	 */
 	stacksize = round_up(attr->stacksize_attr);
 	guardsize = round_up(attr->guardsize_attr);
 
 	attr->stackaddr_attr = NULL;
 	attr->flags &= ~THR_STACK_USER;
 
 	/*
 	 * Use the garbage collector lock for synchronization of the
 	 * spare stack lists and allocations from usrstack.
 	 */
 	THREAD_LIST_WRLOCK(curthread);
 	/*
 	 * If the stack and guard sizes are default, try to allocate a stack
 	 * from the default-size stack cache:
 	 */
 	if ((stacksize == THR_STACK_DEFAULT) &&
 	    (guardsize == _thr_guard_default)) {
 		if ((spare_stack = LIST_FIRST(&dstackq)) != NULL) {
 			/* Use the spare stack. */
 			LIST_REMOVE(spare_stack, qe);
 			attr->stackaddr_attr = spare_stack->stackaddr;
 		}
 	}
 	/*
 	 * The user specified a non-default stack and/or guard size, so try to
 	 * allocate a stack from the non-default size stack cache, using the
 	 * rounded up stack size (stack_size) in the search:
 	 */
 	else {
 		LIST_FOREACH(spare_stack, &mstackq, qe) {
 			if (spare_stack->stacksize == stacksize &&
 			    spare_stack->guardsize == guardsize) {
 				LIST_REMOVE(spare_stack, qe);
 				attr->stackaddr_attr = spare_stack->stackaddr;
 				break;
 			}
 		}
 	}
 	if (attr->stackaddr_attr != NULL) {
 		/* A cached stack was found.  Release the lock. */
 		THREAD_LIST_UNLOCK(curthread);
 	}
 	else {
 		/*
 		 * Allocate a stack from or below usrstack, depending
 		 * on the LIBPTHREAD_BIGSTACK_MAIN env variable.
 		 */
 		if (last_stack == NULL)
 			last_stack = _usrstack - _thr_stack_initial -
 			    _thr_guard_default;
 
 		/* Allocate a new stack. */
 		stackaddr = last_stack - stacksize - guardsize;
 
 		/*
 		 * Even if stack allocation fails, we don't want to try to
 		 * use this location again, so unconditionally decrement
 		 * last_stack.  Under normal operating conditions, the most
 		 * likely reason for an mmap() error is a stack overflow of
 		 * the adjacent thread stack.
 		 */
 		last_stack -= (stacksize + guardsize);
 
 		/* Release the lock before mmap'ing it. */
 		THREAD_LIST_UNLOCK(curthread);
 
 		/* Map the stack and guard page together, and split guard
 		   page from allocated space: */
 		if ((stackaddr = mmap(stackaddr, stacksize + guardsize,
 		     _rtld_get_stack_prot(), MAP_STACK,
 		     -1, 0)) != MAP_FAILED &&
 		    (guardsize == 0 ||
 		     mprotect(stackaddr, guardsize, PROT_NONE) == 0)) {
 			stackaddr += guardsize;
 		} else {
 			if (stackaddr != MAP_FAILED)
 				munmap(stackaddr, stacksize + guardsize);
 			stackaddr = NULL;
 		}
 		attr->stackaddr_attr = stackaddr;
 	}
 	if (attr->stackaddr_attr != NULL)
 		return (0);
 	else
 		return (-1);
 }
 
-/*
- * Disable this warning from clang:
- *
- * cast from 'char *' to
- *    'struct stack *' increases required alignment from 1 to 8
- *    [-Werror,-Wcast-align]
- *                 spare_stack = (struct stack *)
- */
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#endif
-
 /* This function must be called with _thread_list_lock held. */
 void
 _thr_stack_free(struct pthread_attr *attr)
 {
 	struct stack *spare_stack;
 
 	if ((attr != NULL) && ((attr->flags & THR_STACK_USER) == 0)
 	    && (attr->stackaddr_attr != NULL)) {
 		spare_stack = (struct stack *)
 			((char *)attr->stackaddr_attr +
 			attr->stacksize_attr - sizeof(struct stack));
 		spare_stack->stacksize = round_up(attr->stacksize_attr);
 		spare_stack->guardsize = round_up(attr->guardsize_attr);
 		spare_stack->stackaddr = attr->stackaddr_attr;
 
 		if (spare_stack->stacksize == THR_STACK_DEFAULT &&
 		    spare_stack->guardsize == _thr_guard_default) {
 			/* Default stack/guard size. */
 			LIST_INSERT_HEAD(&dstackq, spare_stack, qe);
 		} else {
 			/* Non-default stack/guard size. */
 			LIST_INSERT_HEAD(&mstackq, spare_stack, qe);
 		}
 		attr->stackaddr_attr = NULL;
 	}
 }
-
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
Index: projects/clang500-import/lib/libthr/thread/thr_symbols.c
===================================================================
--- projects/clang500-import/lib/libthr/thread/thr_symbols.c	(revision 318657)
+++ projects/clang500-import/lib/libthr/thread/thr_symbols.c	(revision 318658)
@@ -1,63 +1,59 @@
 /*
  * Copyright (c) 2004 David Xu <davidxu@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.
  * 3. Neither the name of the author nor the names of any co-contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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 <sys/types.h>
 #include <stddef.h>
 #include <pthread.h>
 #include <rtld.h>
 
 #include "thr_private.h"
 
-#ifdef __clang__
-#pragma GCC diagnostic ignored "-Wmissing-variable-declarations"
-#endif
-
 /* A collection of symbols needed by debugger */
 
 /* int _libthr_debug */
 int _thread_off_tcb = offsetof(struct pthread, tcb);
 int _thread_off_tid = offsetof(struct pthread, tid);
 int _thread_off_next = offsetof(struct pthread, tle.tqe_next);
 int _thread_off_attr_flags = offsetof(struct pthread, attr.flags);
 int _thread_off_linkmap = offsetof(Obj_Entry, linkmap);
 int _thread_off_tlsindex = offsetof(Obj_Entry, tlsindex);
 int _thread_off_report_events = offsetof(struct pthread, report_events);
 int _thread_off_event_mask = offsetof(struct pthread, event_mask);
 int _thread_off_event_buf = offsetof(struct pthread, event_buf);
 int _thread_size_key = sizeof(struct pthread_key);
 int _thread_off_key_allocated = offsetof(struct pthread_key, allocated);
 int _thread_off_key_destructor = offsetof(struct pthread_key, destructor);
 int _thread_max_keys = PTHREAD_KEYS_MAX;
 int _thread_off_dtv = DTV_OFFSET;
 int _thread_off_state = offsetof(struct pthread, state);
 int _thread_state_running = PS_RUNNING;
 int _thread_state_zoombie = PS_DEAD;
Index: projects/clang500-import/release/Makefile
===================================================================
--- projects/clang500-import/release/Makefile	(revision 318657)
+++ projects/clang500-import/release/Makefile	(revision 318658)
@@ -1,315 +1,315 @@
 # $FreeBSD$
 #
 # Makefile for building releases and release media.
 #
 # User-driven targets:
 #  cdrom: Builds release CD-ROM media (disc1.iso)
 #  dvdrom: Builds release DVD-ROM media (dvd1.iso)
 #  memstick: Builds memory stick image (memstick.img)
 #  mini-memstick: Builds minimal memory stick image (mini-memstick.img)
 #  ftp: Sets up FTP distribution area (ftp)
 #  release: Invokes real-release, vm-release, and cloudware-release targets
 #  real-release: Build all media and FTP distribution area
 #  vm-release: Build all virtual machine image targets
 #  cloudware-release: Build all cloud hosting provider targets
 #  install: Invokes the release-install and vm-install targets
 #  release-install: Copies all release installation media into ${DESTDIR}
 #  vm-install: Copies all virtual machine images into ${DESTDIR}
 #
 # Variables affecting the build process:
 #  WORLDDIR: location of src tree -- must have built world and default kernel
 #            (by default, the directory above this one)
 #  PORTSDIR: location of ports tree to distribute (default: /usr/ports)
 #  DOCDIR:   location of doc tree (default: /usr/doc)
 #  XTRADIR:  xtra-bits-dir argument for <arch>/mkisoimages.sh
 #  NOPKG:    if set, do not distribute third-party packages
 #  NOPORTS:  if set, do not distribute ports tree
 #  NOSRC:    if set, do not distribute source tree
 #  NODOC:    if set, do not generate release documentation
 #  WITH_DVD: if set, generate dvd1.iso
 #  WITH_COMPRESSED_IMAGES: if set, compress installation images with xz(1)
 #		(uncompressed images are not removed)
 #  WITH_VMIMAGES: if set, build virtual machine images with the release
 #  WITH_COMPRESSED_VMIMAGES: if set, compress virtual machine disk images
 #  		with xz(1) (extremely time consuming)
 #  WITH_CLOUDWARE: if set, build cloud hosting disk images with the release
 #  TARGET/TARGET_ARCH: architecture of built release
 #
 
 WORLDDIR?=	${.CURDIR}/..
 PORTSDIR?=	/usr/ports
 DOCDIR?=	/usr/doc
 RELNOTES_LANG?= en_US.ISO8859-1
 
 .if !defined(TARGET) || empty(TARGET)
 TARGET=		${MACHINE}
 .endif
 .if !defined(TARGET_ARCH) || empty(TARGET_ARCH)
 .if ${TARGET} == ${MACHINE}
 TARGET_ARCH=	${MACHINE_ARCH}
 .else
 TARGET_ARCH=	${TARGET}
 .endif
 .endif
 IMAKE=		${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
 DISTDIR=	dist
 
 # Define OSRELEASE by using newvars.sh
 .if !defined(OSRELEASE) || empty(OSRELEASE)
 .for _V in TYPE BRANCH REVISION
 ${_V}!=	eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
 .endfor
 .for _V in ${TARGET_ARCH}
 .if !empty(TARGET:M${_V})
 OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}-${TARGET}
 VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET}
 .else
 OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
 VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH}
 .endif
 .endfor
 .endif
 
 .if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL)
 VOLUME_LABEL=	FreeBSD_Install
 .endif
 
 .if !exists(${DOCDIR})
 NODOC= true
 .endif
 .if !exists(${PORTSDIR})
 NOPORTS= true
 .endif
 
 EXTRA_PACKAGES=
 .if !defined(NOPORTS)
 EXTRA_PACKAGES+= ports.txz
 .endif
 .if !defined(NOSRC)
 EXTRA_PACKAGES+= src.txz
 .endif
 .if !defined(NODOC)
 EXTRA_PACKAGES+= reldoc
 .endif
 
 RELEASE_TARGETS= ftp
 IMAGES=
 .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
 RELEASE_TARGETS+= cdrom
 IMAGES+=	disc1.iso bootonly.iso
 . if defined(WITH_DVD) && !empty(WITH_DVD)
 RELEASE_TARGETS+= dvdrom
 IMAGES+=	dvd1.iso
 . endif
 .endif
 .if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
 RELEASE_TARGETS+= memstick.img
 RELEASE_TARGETS+= mini-memstick.img
 IMAGES+=	memstick.img
 IMAGES+=	mini-memstick.img
 .endif
 
 CLEANFILES=	packagesystem *.txz MANIFEST release ${IMAGES}
 .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
 . for I in ${IMAGES}
 CLEANFILES+=	${I}.xz
 . endfor
 .endif
 .if defined(WITH_DVD) && !empty(WITH_DVD)
 CLEANFILES+=	pkg-stage
 .endif
 CLEANDIRS=	dist ftp disc1 bootonly dvd
 .if !defined(NODOC)
 CLEANDIRS+=    reldoc rdoc
 .endif
 beforeclean:
 	chflags -R noschg .
 .include <bsd.obj.mk>
 clean: beforeclean
 
 base.txz:
 	mkdir -p ${DISTDIR}
 	cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR}
 # Set up mergemaster root database
 	sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \
 	    "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" -D "${.OBJDIR}/${DISTDIR}/base"
 	etcupdate extract -B -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
 	    -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate"
 # Package all components
 	cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR}
 	mv ${DISTDIR}/*.txz .
 
 kernel.txz:
 	mkdir -p ${DISTDIR}
 	cd ${WORLDDIR} && ${IMAKE} distributekernel packagekernel DISTDIR=${.OBJDIR}/${DISTDIR}
 	mv ${DISTDIR}/kernel*.txz .
 
 src.txz:
 	mkdir -p ${DISTDIR}/usr
 	ln -fs ${WORLDDIR} ${DISTDIR}/usr/src
 	cd ${DISTDIR} && tar cLvf - --exclude .svn --exclude .zfs \
 	    --exclude .git --exclude @ --exclude usr/src/release/dist usr/src | \
 	    ${XZ_CMD} > ${.OBJDIR}/src.txz
 
 ports.txz:
 	mkdir -p ${DISTDIR}/usr
 	ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports
 	cd ${DISTDIR} && tar cLvf - \
 	    --exclude .git --exclude .svn \
 	    --exclude usr/ports/distfiles --exclude usr/ports/packages \
 	    --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \
 	    ${XZ_CMD} > ${.OBJDIR}/ports.txz
 
 reldoc:
 	cd ${.CURDIR}/doc && ${MAKE} all install clean 'FORMATS=html txt' \
 	    INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc
 	mkdir -p reldoc
 .for i in hardware readme relnotes errata
 	ln -f rdoc/${RELNOTES_LANG}/${i}/article.txt reldoc/${i:tu}.TXT
 	ln -f rdoc/${RELNOTES_LANG}/${i}/article.html reldoc/${i:tu}.HTM
 .endfor
 	cp rdoc/${RELNOTES_LANG}/readme/docbook.css reldoc
 
 disc1: packagesystem
 # Install system
 	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
 	    DESTDIR=${.OBJDIR}/${.TARGET} MK_AMD=no MK_AT=no \
 	    MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
 	    MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
 	    MK_RESCUE=no MK_DICT=no \
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no
 # Copy distfiles
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \
 	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
 	done
 # Copy documentation, if generated
 .if !defined(NODOC)
 	cp reldoc/* ${.TARGET}
 .endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
 	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
 	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 	touch ${.TARGET}
 
 bootonly: packagesystem
 # Install system
 	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
 	    DESTDIR=${.OBJDIR}/${.TARGET} MK_AMD=no MK_AT=no \
 	    MK_GAMES=no MK_GROFF=no \
 	    MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
 	    MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
 	    MK_RESCUE=no MK_DICT=no \
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no
 # Copy manifest only (no distfiles) to get checksums
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	cp MANIFEST ${.TARGET}/usr/freebsd-dist
 # Copy documentation, if generated
 .if !defined(NODOC)
 	cp reldoc/* ${.TARGET}
 .endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
 	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
 	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 
 dvd: packagesystem
 # Install system
 	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
 		DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
 		MK_TESTS=no MK_DEBUG_FILES=no
 # Copy distfiles
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	for dist in MANIFEST $$(ls *.txz | grep -v -- '(base|lib32)-dbg'); \
 	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
 	done
 # Copy documentation, if generated
 .if !defined(NODOC)
 	cp reldoc/* ${.TARGET}
 .endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
 	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
 	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 	touch ${.TARGET}
 
 release.iso: disc1.iso
 disc1.iso: disc1
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_CD ${.TARGET} disc1 ${XTRADIR}
 
 dvd1.iso: dvd pkg-stage
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ${.TARGET} dvd ${XTRADIR}
 
 bootonly.iso: bootonly
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_BO ${.TARGET} bootonly ${XTRADIR}
 
 memstick: memstick.img
 memstick.img: disc1
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh disc1 ${.TARGET}
 
 mini-memstick: mini-memstick.img
 mini-memstick.img: bootonly
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET}
 
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
 	touch ${.TARGET}
 
 pkg-stage:
 .if !defined(NOPKG)
-	env REPOS_DIR=${.CURDIR}/pkg_repos/ \
+	env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \
 		sh ${.CURDIR}/scripts/pkg-stage.sh
 	mkdir -p ${.OBJDIR}/dvd/packages/repos/
 	cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \
 		${.OBJDIR}/dvd/packages/repos/
 .endif
 	touch ${.TARGET}
 
 cdrom: disc1.iso bootonly.iso
 dvdrom: dvd1.iso
 ftp: packagesystem
 	rm -rf ftp
 	mkdir -p ftp
 	cp *.txz MANIFEST ftp
 
 release:	real-release vm-release cloudware-release
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} release-done
 	true
 
 release-done:
 	touch release
 
 real-release:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
 
 install:	release-install vm-install
 
 release-install:
 .if defined(DESTDIR) && !empty(DESTDIR)
 	mkdir -p ${DESTDIR}
 .endif
 	cp -a ftp ${DESTDIR}/
 .for I in ${IMAGES}
 	cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I}
 . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
 	${XZ_CMD} -k ${DESTDIR}/${OSRELEASE}-${I}
 . endif
 .endfor
 	cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512
 	cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256
 
 .include "${.CURDIR}/Makefile.vm"
Index: projects/clang500-import/release/scripts/pkg-stage.sh
===================================================================
--- projects/clang500-import/release/scripts/pkg-stage.sh	(revision 318657)
+++ projects/clang500-import/release/scripts/pkg-stage.sh	(revision 318658)
@@ -1,91 +1,92 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 set -e
 
 export ASSUME_ALWAYS_YES="YES"
 export PKG_DBDIR="/tmp/pkg"
 export PERMISSIVE="YES"
 export REPO_AUTOUPDATE="NO"
 export PKGCMD="/usr/sbin/pkg -d"
+export PORTSDIR="${PORTSDIR:-/usr/ports}"
 
 _DVD_PACKAGES="archivers/unzip
 devel/subversion
 devel/subversion-static
 emulators/linux_base-c6
 misc/freebsd-doc-all
 net/mpd5
 net/rsync
 ports-mgmt/pkg
 ports-mgmt/portmaster
 shells/bash
 shells/zsh
 security/sudo
 sysutils/screen
 sysutils/tmux
 www/firefox
 www/links
 x11-drivers/xf86-video-vmware
 x11/gnome3
 x11/kde4
 x11/xorg"
 
 # If NOPORTS is set for the release, do not attempt to build pkg(8).
-if [ ! -f /usr/ports/Makefile ]; then
-	echo "*** /usr/ports is missing!    ***"
+if [ ! -f ${PORTSDIR}/Makefile ]; then
+	echo "*** ${PORTSDIR} is missing!    ***"
 	echo "*** Skipping pkg-stage.sh     ***"
 	echo "*** Unset NOPORTS to fix this ***"
 	exit 0
 fi
 
 if [ ! -x /usr/local/sbin/pkg ]; then
 	/etc/rc.d/ldconfig restart
-	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
+	/usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean
 fi
 
 export DVD_DIR="dvd/packages"
 export PKG_ABI=$(pkg config ABI)
 export PKG_ALTABI=$(pkg config ALTABI 2>/dev/null)
 export PKG_REPODIR="${DVD_DIR}/${PKG_ABI}"
 
 /bin/mkdir -p ${PKG_REPODIR}
 if [ ! -z "${PKG_ALTABI}" ]; then
 	(cd ${DVD_DIR} && ln -s ${PKG_ABI} ${PKG_ALTABI})
 fi
 
 # Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
 # final list.
 for _P in ${_DVD_PACKAGES}; do
-	if [ -d "/usr/ports/${_P}" ]; then
+	if [ -d "${PORTSDIR}/${_P}" ]; then
 		DVD_PACKAGES="${DVD_PACKAGES} ${_P}"
 	else
 		echo "*** Skipping nonexistent port: ${_P}"
 	fi
 done
 
 # Make sure the package list is not empty.
 if [ -z "${DVD_PACKAGES}" ]; then
 	echo "*** The package list is empty."
 	echo "*** Something is very wrong."
 	# Exit '0' so the rest of the build process continues
 	# so other issues (if any) can be addressed as well.
 	exit 0
 fi
 
 # Print pkg(8) information to make debugging easier.
 ${PKGCMD} -vv
 ${PKGCMD} update -f
 ${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES}
 
 # Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works
 # using the on-disc packages.
 mkdir -p ${PKG_REPODIR}/Latest
 (cd ${PKG_REPODIR}/Latest && \
 	ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).txz pkg.txz)
 
 ${PKGCMD} repo ${PKG_REPODIR}
 
 # Always exit '0', even if pkg(8) complains about conflicts.
 exit 0
Index: projects/clang500-import/share/man/man4/ena.4
===================================================================
--- projects/clang500-import/share/man/man4/ena.4	(nonexistent)
+++ projects/clang500-import/share/man/man4/ena.4	(revision 318658)
@@ -0,0 +1,255 @@
+.\" Copyright (c) 2015-2017 Amazon.com, Inc. or its affiliates.
+.\" 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+.\" OWNER 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$
+.\"
+.Dd May 04, 2017
+.Dt ENA 4
+.Os
+.Sh NAME
+.Nm ena
+.Nd "FreeBSD kernel driver for Elastic Network Adapter (ENA) family"
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following line in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device ena"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+if_ena_load="YES"
+.Ed
+.Sh DESCRIPTION
+The ENA is a networking interface designed to make good use of modern CPU
+features and system architectures.
+.Pp
+The ENA device exposes a lightweight management interface with a
+minimal set of memory mapped registers and extendable command set
+through an Admin Queue.
+.Pp
+The driver supports a range of ENA devices, is link-speed independent
+(i.e., the same driver is used for 10GbE, 25GbE, 40GbE, etc.), and has
+a negotiated and extendable feature set.
+.Pp
+Some ENA devices support SR-IOV. This driver is used for both the
+SR-IOV Physical Function (PF) and Virtual Function (VF) devices.
+.Pp
+The ENA devices enable high speed and low overhead network traffic
+processing by providing multiple Tx/Rx queue pairs (the maximum number
+is advertised by the device via the Admin Queue), a dedicated MSI-X
+interrupt vector per Tx/Rx queue pair, and CPU cacheline optimized
+data placement.
+.Pp
+The
+.Nm
+driver supports industry standard TCP/IP offload features such
+as checksum offload and TCP transmit segmentation offload (TSO).
+Receive-side scaling (RSS) is supported for multi-core scaling.
+.Pp
+The
+.Nm
+driver and its corresponding devices implement health
+monitoring mechanisms such as watchdog, enabling the device and driver
+to recover in a manner transparent to the application, as well as
+debug logs.
+.Pp
+Some of the ENA devices support a working mode called Low-latency
+Queue (LLQ), which saves several more microseconds. This feature will
+be implemented for driver in future releases.
+.Sh HARDWARE
+Supported PCI vendor ID/device IDs:
+.Pp
+.Bl -bullet -compact
+.It
+1d0f:0ec2 - ENA PF
+.It
+1d0f:1ec2 - ENA PF with LLQ support
+.It
+1d0f:ec20 - ENA VF
+.It
+1d0f:ec21 - ENA VF with LLQ support
+.El
+.Sh DIAGNOSTICS
+.Ss Device initialization phase:
+.Bl -diag
+.It ena%d: failed to init mmio read less
+.Pp
+Error occured during initialization of the mmio register read request.
+.It ena%d: Can not reset device
+.Pp
+Device could not be reset; device may not be responding or is already
+during reset.
+.It ena%d: device version is too low
+.Pp
+Version of the controller is too low and it is not supported by the driver.
+.It ena%d: Invalid dma width value %d
+.Pp
+The controller is able to request dma transcation width. Device stopped
+responding or it demanded invalid value.
+.It ena%d: Can not initialize ena admin queue with device
+.Pp
+Initialization of the Admin Queue failed; device may not be responding or there
+was a problem with initialization of the resources.
+.It ena%d: Cannot get attribute for ena device rc: %d
+.Pp
+Failed to get attributes of the device from the controller.
+.It ena%d: Cannot configure aenq groups rc: %d
+.Pp
+Errors occured when trying to configure AENQ groups.
+.El
+.Ss Driver initialisation/shutdown phase:
+.Bl -diag
+.It ena%d: PCI resource allocation failed!
+.It ena%d: allocating ena_dev failed
+.It ena%d: failed to pmap registers bar
+.It ena%d: Error while setting up bufring
+.It ena%d: Error with initialization of IO rings
+.It ena%d: can not allocate ifnet structure
+.It ena%d: Error with network interface setup
+.It ena%d: Failed to enable and set the admin interrupts
+.It ena%d: Failed to allocate %d, vectors %d
+.It ena%d: Failed to enable MSIX, vectors %d rc %d
+.It ena%d: Error with MSI-X enablement
+.It ena%d: could not allocate irq vector: %d
+.It ena%d: Unable to allocate bus resource: registers
+.Pp
+Resource allocation failed when initializing the device; driver will not
+be attached.
+.It ena%d: ENA device init failed (err: %d)
+.Pp
+Device initialization failed; driver will not be attached.
+.It ena%d: could not activate irq vector: %d
+.Pp
+Error occured when trying to activate interrupt vectors for Admin Queue.
+.It ena%d: failed to register interrupt handler for irq %ju: %d
+.Pp
+Error occured when trying to register Admin Queue interrupt handler.
+.It ena%d: Cannot setup mgmnt queue intr
+.Pp
+Error occured during configuration of the Admin Queue interrupts.
+.It ena%d: Enable MSI-X failed
+.Pp
+Configuration of the MSI-X for Admin Queue failed; there could be lack
+of resources or interrupts could not have been configured; driver will
+not be attached.
+.It ena%d: VLAN is in use, detach first
+.Pp
+VLANs are being used when trying to detach the driver; VLANs should be detached
+first and then detach routine should be called again.
+.It ena%d: Unmapped RX DMA tag associations
+.It ena%d: Unmapped TX DMA tag associations
+.Pp
+Error occured when trying to destroy RX/TX DMA tag.
+.It ena%d: Cannot init RSS
+.It ena%d: Cannot fill indirect table
+.It ena%d: Cannot fill indirect table
+.It ena%d: Cannot fill hash function
+.It ena%d: Cannot fill hash control
+.It ena%d: WARNING: RSS was not properly initialized, it will affect bandwidth
+.Pp
+Error occured during initialization of one of RSS resources; device is still
+going to work but it will affect performance because all RX packets will be
+passed to queue 0 and there will be no hash information.
+.It ena%d: failed to tear down irq: %d
+.It ena%d: dev has no parent while releasing res for irq: %d
+Release of the interrupts failed.
+.El
+.Ss Additional diagnostic:
+.Bl -diag
+.It ena%d: Cannot get attribute for ena device
+.Pp
+This message appears when trying to change MTU and driver is unable to get
+attributes from the device.
+.It ena%d: Invalid MTU setting. new_mtu: %d
+.Pp
+Requested MTU value is not supported and will not be set.
+.It ena%d: keep alive watchdog timeout
+.Pp
+Device stopped responding and will be reset.
+.It ena%d: Found a Tx that wasn't completed on time, qid %d, index %d.
+.Pp
+Packet was pushed to the NIC but not sent within given time limit; it may
+be caused by hang of the IO queue.
+.It ena%d: The number of lost tx completion is aboce the threshold (%d > %d). Reset the device
+.Pp
+If too many Tx wasn't completed on time the device is going to be reset; it may
+be caused by hanged queue or device.
+.It ena%d: trigger reset is on
+.Pp
+Device will be reset; reset is triggered either by watchdog or if too many TX
+packets were not completed on time.
+.It ena%d: invalid value recvd
+.Pp
+Link status received from the device in the AENQ handler is invalid.
+.It ena%d: Allocation for Tx Queue %u failed
+.It ena%d: Allocation for Rx Queue %u failed
+.It ena%d: Unable to create Rx DMA map for buffer %d
+.It ena%d: Failed to create io TX queue #%d rc: %d
+.It ena%d: Failed to get TX queue handlers. TX queue num %d rc: %d
+.It ena%d: Failed to create io RX queue[%d] rc: %d
+.It ena%d: Failed to get RX queue handlers. RX queue num %d rc: %d
+.It ena%d: failed to request irq
+.It ena%d: could not allocate irq vector: %d
+.It ena%d: failed to register interrupt handler for irq %ju: %d
+.Pp
+IO resources initialization failed. Interface will not be brought up.
+.It ena%d: LRO[%d] Initialization failed!
+.Pp
+Initialization of the LRO for the RX ring failed.
+.It ena%d: failed to alloc buffer for rx queue
+.It ena%d: failed to add buffer for rx queue %d
+.It ena%d: refilled rx queue %d with %d pages only
+.Pp
+Allocation of resources used on RX path failed; if happened during
+initialization of the IO queue, the interface will not be brought up.
+.It ena%d: ioctl promisc/allmulti
+.Pp
+IOCTL request for the device to work in promiscuous/allmulti mode; see
+.Xr ifconfig 8
+for more details.
+.It ena%d: too many fragments. Last fragment: %d!
+.Pp
+Packet with unsupported number of segments was queued for sending to the
+device; packet will be dropped.
+.Sh SUPPORT
+If an issue is identified with the released source code with a supported adapter
+email the specific information related to the issue to
+.Aq Mt mk@semihalf.com
+and
+.Aq Mt mw@semihalf.com .
+.Sh SEE ALSO
+.Xr vlan 4 ,
+.Xr ifconfig 8
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Semihalf.

Property changes on: projects/clang500-import/share/man/man4/ena.4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/sys/Makefile
===================================================================
--- projects/clang500-import/sys/Makefile	(revision 318657)
+++ projects/clang500-import/sys/Makefile	(revision 318658)
@@ -1,89 +1,77 @@
 # $FreeBSD$
 
 # Directories to include in cscope name file and TAGS.
 CSCOPEDIRS=	boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 		geom gnu isa kern libkern modules net net80211 \
 		netgraph netinet netinet6 netipsec netpfil \
 		netsmb nfs nfsclient nfsserver nlm ofed opencrypto \
 		rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
 .if !defined(CSCOPE_ARCHDIR)
 .if defined(ALL_ARCH)
 CSCOPE_ARCHDIR = amd64 arm arm64 i386 mips powerpc riscv sparc64 x86
 .else
 CSCOPE_ARCHDIR = ${MACHINE}
 .if ${MACHINE} != ${MACHINE_CPUARCH}
 CSCOPE_ARCHDIR += ${MACHINE_CPUARCH}
 .endif
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CSCOPE_ARCHDIR += x86
 .endif
 .endif
 .endif
 
 HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
 
 # You need the devel/cscope port for this.
 cscope: cscope.out
 cscope.out: ${.CURDIR}/cscope.files
 	cd ${.CURDIR}; cscope -k -buq -p4 -v
 
 ${.CURDIR}/cscope.files: .PHONY
 	cd ${.CURDIR}; \
 		find ${CSCOPEDIRS} -name "*.[chSsly]" -a -type f > ${.TARGET}
 
 cscope-clean:
 	cd ${.CURDIR}; \
 	    rm -f cscope.files cscope.out cscope.in.out cscope.po.out
 
 #
 # Installs SCM hooks to update the cscope database every time the source tree
 # is updated.
 # cscope understands incremental updates, so it's considerably faster when only
 # a few files have changed.
 #
 HG_DIR=${.CURDIR}/../.hg
 HG_HOOK=if [ \$$HG_ERROR -eq 0 ]; then cd sys && make -m ../share/mk cscope; fi
 cscope-hook:
 	@if [ -d ${HG_DIR} ]; then 					\
 		if [ "`grep hooks ${HG_DIR}/hgrc`" = "" ]; then		\
 			echo "[hooks]" >> ${HG_DIR}/hgrc;		\
 			echo "update = ${HG_HOOK}" >> ${HG_DIR}/hgrc;	\
 			echo "Hook installed in ${HG_DIR}/hgrc";	\
 		else 							\
 			echo "Mercurial update hook already exists.";	\
 		fi;							\
 	fi
 
 # You need the devel/global and one of editor/emacs* ports for that.
 TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscope.files
 	rm -f ${.CURDIR}/TAGS
 	cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files
 
-# You need the textproc/glimpse ports for this.
-glimpse:
-.if !exists(${.CURDIR}/.glimpse_exclude)
-	echo .svn > ${.CURDIR}/.glimpse_exclude
-	echo /compile/ >> ${.CURDIR}/.glimpse_exclude
-.endif
-	cd ${.CURDIR}; glimpseindex -H . -B -f -o .
-
-glimpse-clean:
-	cd ${.CURDIR}; rm -f .glimpse_*
-
-.if !(make(cscope) || make(cscope-clean) || make(cscope-hook) || make(TAGS) || \
-    make(glimpse) || make(glimpse-clean))
+.if !(make(cscope) || make(cscope-clean) || make(cscope-hook) || make(TAGS))
 .include <src.opts.mk>
 
 # The boot loader
 .if ${MK_BOOT} != "no"
 SUBDIR=	boot
 .endif
 
 # Loadable kernel modules
 
 .if defined(MODULES_WITH_WORLD)
 SUBDIR+=modules
 .endif
 
 .include <bsd.subdir.mk>
 .endif
Index: projects/clang500-import/sys/arm/conf/NOTES
===================================================================
--- projects/clang500-import/sys/arm/conf/NOTES	(revision 318657)
+++ projects/clang500-import/sys/arm/conf/NOTES	(revision 318658)
@@ -1,106 +1,107 @@
 # $FreeBSD$
 
 machine	arm
 
 cpu	CPU_ARM9
 cpu	CPU_ARM9E
 cpu	CPU_FA526
 cpu 	CPU_XSCALE_81342
 cpu 	CPU_XSCALE_IXP425
 cpu 	CPU_XSCALE_IXP435
 cpu	CPU_XSCALE_PXA2X0
 
 files	"../at91/files.at91"
 files	"../cavium/cns11xx/files.econa"
 files	"../mv/files.mv"
 files	"../mv/discovery/files.db78xxx"
 files	"../mv/kirkwood/files.kirkwood"
 files	"../mv/orion/files.db88f5xxx"
 files	"../mv/orion/files.ts7800"
 files	"../xscale/i8134x/files.crb"
 files	"../xscale/i8134x/files.i81342"
 files	"../xscale/ixp425/files.avila"
 files	"../xscale/ixp425/files.ixp425"
 files	"../xscale/pxa/files.pxa"
 
 options 	PHYSADDR=0x00000000
 options 	KERNVIRTADDR=0xc0000000
 
 makeoptions	LDFLAGS="-zmuldefs"
 makeoptions	KERNPHYSADDR=0x00000000
 makeoptions	KERNVIRTADDR=0xc0000000
 
 options 	FDT
 
 options 	SOC_MV_DISCOVERY
 options 	SOC_MV_KIRKWOOD
 options 	SOC_MV_ORION
 
 device		at91_board_bwct
 device		at91_board_ethernut5
 device		at91_board_hl200
 device		at91_board_hl201
 device		at91_board_kb920x
 device		at91_board_qila9g20
 device		at91_board_sam9260ek
 device		at91_board_sam9g20ek
 device		at91_board_sam9x25ek
 device		at91_board_tsc4370
 device		at91rm9200
 device		nand
 
 # IIC
 device		twsi
 
 nooptions	SMP
 nooptions	MAXCPU
 
 nooptions	COMPAT_FREEBSD4
 nooptions	COMPAT_FREEBSD5
 nooptions	COMPAT_FREEBSD6
 nooptions	COMPAT_FREEBSD7
 nooptions	COMPAT_FREEBSD9
 nooption	PPC_PROBE_CHIPSET
 
 nodevice	fdc
 nodevice	sym
 nodevice	ukbd
 
 nodevice	sc
 nodevice	blank_saver
 nodevice	daemon_saver
 nodevice	dragon_saver
 nodevice	fade_saver
 nodevice	fire_saver
 nodevice	green_saver
 nodevice	logo_saver
 nodevice	rain_saver
 nodevice	snake_saver
 nodevice	star_saver
 nodevice	warp_saver
 
+nodevice	ccr
 nodevice	cxgbe
 nodevice	cxgbev
 nodevice	snd_cmi
 
 #
 # Enable the kernel DTrace hooks which are required to load the DTrace
 # kernel modules.
 #
 options 	KDTRACE_HOOKS
 
 # DTrace core
 # NOTE: introduces CDDL-licensed components into the kernel
 #device		dtrace
 
 # DTrace modules
 #device		dtrace_profile
 #device		dtrace_sdt
 #device		dtrace_fbt
 #device		dtrace_systrace
 #device		dtrace_prototype
 #device		dtnfscl
 #device		dtmalloc
 
 # Alternatively include all the DTrace modules
 #device		dtraceall
Index: projects/clang500-import/sys/compat/freebsd32/capabilities.conf
===================================================================
--- projects/clang500-import/sys/compat/freebsd32/capabilities.conf	(revision 318657)
+++ projects/clang500-import/sys/compat/freebsd32/capabilities.conf	(revision 318658)
@@ -1,284 +1,283 @@
 ##
 ## Copyright (c) 2008-2010 Robert N. M. Watson
 ## Copyright (c) 2016 The FreeBSD Foundation
 ## All rights reserved.
 ##
 ## This software was developed at the University of Cambridge Computer
 ## Laboratory with support from a grant from Google, Inc.
 ##
 ## Portions of this software were developed by Konstantin Belousov
 ## under sponsorship from the FreeBSD Foundation.
 ##
 ## 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.
 ##
 ## List of system calls enabled in freebsd32 capability mode, one name
 ## per line.  See the original list in the sys/kern/capabilities.conf.
 ## Position of the compat syscall in this file must be identical to
 ## the master, to facilitate comparision and diagnostic.
 ##
 ## $FreeBSD$
 ##
 
 __acl_aclcheck_fd
 __acl_delete_fd
 __acl_get_fd
 __acl_set_fd
 __mac_get_fd
 #__mac_get_pid
 __mac_get_proc
 __mac_set_fd
 __mac_set_proc
 freebsd32_sysctl
 freebsd32_umtx_op
 abort2
 accept
 accept4
 aio_cancel
 freebsd32_aio_error
 aio_fsync
 freebsd32_aio_read
 freebsd32_aio_return
 freebsd32_aio_suspend
 freebsd32_aio_waitcomplete
 freebsd32_aio_write
 #audit
 bindat
 cap_enter
 cap_fcntls_get
 cap_fcntls_limit
 cap_getmode
 freebsd32_cap_ioctls_get
 freebsd32_cap_ioctls_limit
 __cap_rights_get
 cap_rights_limit
 freebsd32_clock_getres
 freebsd32_clock_gettime
 close
 closefrom
 connectat
 #cpuset
 #freebsd32_cpuset_getaffinity
 #freebsd32_cpuset_getid
 #freebsd32_cpuset_setaffinity
 #freebsd32_cpuset_setid
 dup
 dup2
 extattr_delete_fd
 extattr_get_fd
 extattr_list_fd
 extattr_set_fd
 fchflags
 fchmod
 fchown
 freebsd32_fcntl
 freebsd32_fexecve
 flock
 fork
 fpathconf
 freebsd6_freebsd32_ftruncate
 freebsd6_freebsd32_lseek
 freebsd6_freebsd32_mmap
 freebsd6_freebsd32_pread
 freebsd6_freebsd32_pwrite
 freebsd32_fstat
 fstatfs
 fsync
 ftruncate
 freebsd32_futimens
 freebsd32_futimes
 getaudit
 getaudit_addr
 getauid
 freebsd32_getcontext
 getdents
 freebsd32_getdirentries
 getdomainname
 getdtablesize
 getegid
 geteuid
 gethostid
 gethostname
 freebsd32_getitimer
 getgid
 getgroups
 getlogin
 freebsd32_getpagesize
 getpeername
 getpgid
 getpgrp
 getpid
 getppid
 getpriority
 getresgid
 getresuid
 getrlimit
 freebsd32_getrusage
 getsid
 getsockname
 getsockopt
 freebsd32_gettimeofday
 getuid
 freebsd32_ioctl
 issetugid
 freebsd32_kevent
 kill
 freebsd32_kmq_notify
 freebsd32_kmq_setattr
 freebsd32_kmq_timedreceive
 freebsd32_kmq_timedsend
 kqueue
 freebsd32_ktimer_create
 ktimer_delete
 ktimer_getoverrun
 freebsd32_ktimer_gettime
 freebsd32_ktimer_settime
 #ktrace
 freebsd32_lio_listio
 listen
 freebsd32_lseek
 madvise
 mincore
 minherit
 mlock
 mlockall
 freebsd32_mmap
 freebsd32_mprotect
 msync
 munlock
 munlockall
 munmap
 freebsd32_nanosleep
 ntp_gettime
 freebsd6_freebsd32_aio_read
 freebsd6_freebsd32_aio_write
 obreak
 freebsd6_freebsd32_lio_listio
 chflagsat
 faccessat
 fchmodat
 fchownat
 freebsd32_fstatat
 freebsd32_futimesat
 linkat
 mkdirat
 mkfifoat
 mknodat
 openat
 readlinkat
 renameat
 symlinkat
 unlinkat
 freebsd32_utimensat
-open
 pdfork
 pdgetpid
 pdkill
 #pdwait4	# not yet implemented
 freebsd32_pipe
 pipe2
 poll
 freebsd32_pread
 freebsd32_preadv
 profil
 #ptrace
 freebsd32_pwrite
 freebsd32_pwritev
 read
 freebsd32_readv
 freebsd6_freebsd32_recv
 freebsd32_recvfrom
 freebsd32_recvmsg
 rtprio
 rtprio_thread
 sbrk
 sched_get_priority_max
 sched_get_priority_min
 sched_getparam
 sched_getscheduler
 sched_rr_get_interval
 sched_setparam
 sched_setscheduler
 sched_yield
 sctp_generic_recvmsg
 sctp_generic_sendmsg
 sctp_generic_sendmsg_iov
 sctp_peeloff
 freebsd32_pselect
 freebsd32_select
 freebsd6_freebsd32_send
 freebsd32_sendfile
 freebsd32_sendmsg
 sendto
 setaudit
 setaudit_addr
 setauid
 freebsd32_setcontext
 setegid
 seteuid
 setgid
 freebsd32_setitimer
 setpriority
 setregid
 setresgid
 setresuid
 setreuid
 setrlimit
 setsid
 setsockopt
 setuid
 shm_open
 shutdown
 freebsd32_sigaction
 freebsd32_sigaltstack
 freebsd32_sigblock
 freebsd32_sigpending
 sigprocmask
 sigqueue
 freebsd32_sigreturn
 freebsd32_sigsetmask
 ofreebsd32_sigstack
 sigsuspend
 freebsd32_sigtimedwait
 freebsd32_sigvec
 freebsd32_sigwaitinfo
 sigwait
 socket
 socketpair
 sstk
 sync
 sys_exit
 freebsd32_sysarch
 thr_create
 thr_exit
 thr_kill
 #thr_kill2
 freebsd32_thr_new
 thr_self
 thr_set_name
 freebsd32_thr_suspend
 thr_wake
 umask
 utrace
 uuidgen
 write
 freebsd32_writev
 yield
Index: projects/clang500-import/sys/compat/freebsd32/freebsd32_sysent.c
===================================================================
--- projects/clang500-import/sys/compat/freebsd32/freebsd32_sysent.c	(revision 318657)
+++ projects/clang500-import/sys/compat/freebsd32/freebsd32_sysent.c	(revision 318658)
@@ -1,629 +1,629 @@
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
  */
 
 #include "opt_compat.h"
 
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <compat/freebsd32/freebsd32.h>
 #include <compat/freebsd32/freebsd32_proto.h>
 
 #define AS(name) (sizeof(struct name) / sizeof(register_t))
 
 #ifdef COMPAT_43
 #define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)
 #else
 #define compat(n, name) 0, (sy_call_t *)nosys
 #endif
 
 #ifdef COMPAT_FREEBSD4
 #define compat4(n, name) n, (sy_call_t *)__CONCAT(freebsd4_,name)
 #else
 #define compat4(n, name) 0, (sy_call_t *)nosys
 #endif
 
 #ifdef COMPAT_FREEBSD6
 #define compat6(n, name) n, (sy_call_t *)__CONCAT(freebsd6_,name)
 #else
 #define compat6(n, name) 0, (sy_call_t *)nosys
 #endif
 
 #ifdef COMPAT_FREEBSD7
 #define compat7(n, name) n, (sy_call_t *)__CONCAT(freebsd7_,name)
 #else
 #define compat7(n, name) 0, (sy_call_t *)nosys
 #endif
 
 #ifdef COMPAT_FREEBSD10
 #define compat10(n, name) n, (sy_call_t *)__CONCAT(freebsd10_,name)
 #else
 #define compat10(n, name) 0, (sy_call_t *)nosys
 #endif
 
 /* The casts are bogus but will do for now. */
 struct sysent freebsd32_sysent[] = {
 #if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__))
 #define PAD64_REQUIRED
 #endif
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },		/* 0 = syscall */
 	{ AS(sys_exit_args), (sy_call_t *)sys_sys_exit, AUE_EXIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 1 = exit */
 	{ 0, (sy_call_t *)sys_fork, AUE_FORK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 2 = fork */
 	{ AS(read_args), (sy_call_t *)sys_read, AUE_READ, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 3 = read */
 	{ AS(write_args), (sy_call_t *)sys_write, AUE_WRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 4 = write */
-	{ AS(open_args), (sy_call_t *)sys_open, AUE_OPEN_RWTC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 5 = open */
+	{ AS(open_args), (sy_call_t *)sys_open, AUE_OPEN_RWTC, NULL, 0, 0, 0, SY_THR_STATIC },	/* 5 = open */
 	{ AS(close_args), (sy_call_t *)sys_close, AUE_CLOSE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 6 = close */
 	{ AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4, NULL, 0, 0, 0, SY_THR_STATIC },	/* 7 = freebsd32_wait4 */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 8 = obsolete old creat */
 	{ AS(link_args), (sy_call_t *)sys_link, AUE_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 9 = link */
 	{ AS(unlink_args), (sy_call_t *)sys_unlink, AUE_UNLINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 10 = unlink */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 11 = obsolete execv */
 	{ AS(chdir_args), (sy_call_t *)sys_chdir, AUE_CHDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 12 = chdir */
 	{ AS(fchdir_args), (sy_call_t *)sys_fchdir, AUE_FCHDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 13 = fchdir */
 	{ AS(mknod_args), (sy_call_t *)sys_mknod, AUE_MKNOD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 14 = mknod */
 	{ AS(chmod_args), (sy_call_t *)sys_chmod, AUE_CHMOD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 15 = chmod */
 	{ AS(chown_args), (sy_call_t *)sys_chown, AUE_CHOWN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 16 = chown */
 	{ AS(obreak_args), (sy_call_t *)sys_obreak, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 17 = break */
 	{ compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 18 = freebsd4 freebsd32_getfsstat */
 	{ compat(AS(ofreebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 19 = old freebsd32_lseek */
 	{ 0, (sy_call_t *)sys_getpid, AUE_GETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 20 = getpid */
 	{ AS(mount_args), (sy_call_t *)sys_mount, AUE_MOUNT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 21 = mount */
 	{ AS(unmount_args), (sy_call_t *)sys_unmount, AUE_UMOUNT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 22 = unmount */
 	{ AS(setuid_args), (sy_call_t *)sys_setuid, AUE_SETUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 23 = setuid */
 	{ 0, (sy_call_t *)sys_getuid, AUE_GETUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 24 = getuid */
 	{ 0, (sy_call_t *)sys_geteuid, AUE_GETEUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 25 = geteuid */
 	{ AS(ptrace_args), (sy_call_t *)sys_ptrace, AUE_PTRACE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 26 = ptrace */
 	{ AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 27 = freebsd32_recvmsg */
 	{ AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 28 = freebsd32_sendmsg */
 	{ AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 29 = freebsd32_recvfrom */
 	{ AS(accept_args), (sy_call_t *)sys_accept, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 30 = accept */
 	{ AS(getpeername_args), (sy_call_t *)sys_getpeername, AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 31 = getpeername */
 	{ AS(getsockname_args), (sy_call_t *)sys_getsockname, AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 32 = getsockname */
 	{ AS(access_args), (sy_call_t *)sys_access, AUE_ACCESS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 33 = access */
 	{ AS(chflags_args), (sy_call_t *)sys_chflags, AUE_CHFLAGS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 34 = chflags */
 	{ AS(fchflags_args), (sy_call_t *)sys_fchflags, AUE_FCHFLAGS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 35 = fchflags */
 	{ 0, (sy_call_t *)sys_sync, AUE_SYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 36 = sync */
 	{ AS(kill_args), (sy_call_t *)sys_kill, AUE_KILL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 37 = kill */
 	{ compat(AS(ofreebsd32_stat_args),freebsd32_stat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 38 = old freebsd32_stat */
 	{ 0, (sy_call_t *)sys_getppid, AUE_GETPPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 39 = getppid */
 	{ compat(AS(ofreebsd32_lstat_args),freebsd32_lstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 40 = old freebsd32_lstat */
 	{ AS(dup_args), (sy_call_t *)sys_dup, AUE_DUP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 41 = dup */
 	{ compat10(0,freebsd32_pipe), AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 42 = freebsd10 freebsd32_pipe */
 	{ 0, (sy_call_t *)sys_getegid, AUE_GETEGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 43 = getegid */
 	{ AS(profil_args), (sy_call_t *)sys_profil, AUE_PROFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 44 = profil */
 	{ AS(ktrace_args), (sy_call_t *)sys_ktrace, AUE_KTRACE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 45 = ktrace */
 	{ compat(AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 46 = old freebsd32_sigaction */
 	{ 0, (sy_call_t *)sys_getgid, AUE_GETGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 47 = getgid */
 	{ compat(AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 48 = old freebsd32_sigprocmask */
 	{ AS(getlogin_args), (sy_call_t *)sys_getlogin, AUE_GETLOGIN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 49 = getlogin */
 	{ AS(setlogin_args), (sy_call_t *)sys_setlogin, AUE_SETLOGIN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 50 = setlogin */
 	{ AS(acct_args), (sy_call_t *)sys_acct, AUE_ACCT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 51 = acct */
 	{ compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 52 = old freebsd32_sigpending */
 	{ AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 53 = freebsd32_sigaltstack */
 	{ AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_IOCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 54 = freebsd32_ioctl */
 	{ AS(reboot_args), (sy_call_t *)sys_reboot, AUE_REBOOT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 55 = reboot */
 	{ AS(revoke_args), (sy_call_t *)sys_revoke, AUE_REVOKE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 56 = revoke */
 	{ AS(symlink_args), (sy_call_t *)sys_symlink, AUE_SYMLINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 57 = symlink */
 	{ AS(readlink_args), (sy_call_t *)sys_readlink, AUE_READLINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 58 = readlink */
 	{ AS(freebsd32_execve_args), (sy_call_t *)freebsd32_execve, AUE_EXECVE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 59 = freebsd32_execve */
 	{ AS(umask_args), (sy_call_t *)sys_umask, AUE_UMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 60 = umask */
 	{ AS(chroot_args), (sy_call_t *)sys_chroot, AUE_CHROOT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 61 = chroot */
 	{ compat(AS(ofreebsd32_fstat_args),freebsd32_fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 62 = old freebsd32_fstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 63 = obsolete ogetkerninfo */
 	{ compat(AS(ofreebsd32_getpagesize_args),freebsd32_getpagesize), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 64 = old freebsd32_getpagesize */
 	{ AS(msync_args), (sy_call_t *)sys_msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 65 = msync */
 	{ 0, (sy_call_t *)sys_vfork, AUE_VFORK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 66 = vfork */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 67 = obsolete vread */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 68 = obsolete vwrite */
 	{ AS(sbrk_args), (sy_call_t *)sys_sbrk, AUE_SBRK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 69 = sbrk */
 	{ AS(sstk_args), (sy_call_t *)sys_sstk, AUE_SSTK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 70 = sstk */
 	{ compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, 0, SY_THR_STATIC },	/* 71 = old mmap */
 	{ AS(ovadvise_args), (sy_call_t *)sys_ovadvise, AUE_O_VADVISE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 72 = vadvise */
 	{ AS(munmap_args), (sy_call_t *)sys_munmap, AUE_MUNMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 73 = munmap */
 	{ AS(freebsd32_mprotect_args), (sy_call_t *)freebsd32_mprotect, AUE_MPROTECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 74 = freebsd32_mprotect */
 	{ AS(madvise_args), (sy_call_t *)sys_madvise, AUE_MADVISE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 75 = madvise */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 76 = obsolete vhangup */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 77 = obsolete vlimit */
 	{ AS(mincore_args), (sy_call_t *)sys_mincore, AUE_MINCORE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 78 = mincore */
 	{ AS(getgroups_args), (sy_call_t *)sys_getgroups, AUE_GETGROUPS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 79 = getgroups */
 	{ AS(setgroups_args), (sy_call_t *)sys_setgroups, AUE_SETGROUPS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 80 = setgroups */
 	{ 0, (sy_call_t *)sys_getpgrp, AUE_GETPGRP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 81 = getpgrp */
 	{ AS(setpgid_args), (sy_call_t *)sys_setpgid, AUE_SETPGRP, NULL, 0, 0, 0, SY_THR_STATIC },	/* 82 = setpgid */
 	{ AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer, AUE_SETITIMER, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 83 = freebsd32_setitimer */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 84 = obsolete owait */
 	{ AS(swapon_args), (sy_call_t *)sys_swapon, AUE_SWAPON, NULL, 0, 0, 0, SY_THR_STATIC },	/* 85 = swapon */
 	{ AS(freebsd32_getitimer_args), (sy_call_t *)freebsd32_getitimer, AUE_GETITIMER, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 86 = freebsd32_getitimer */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 87 = obsolete ogethostname */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 88 = obsolete osethostname */
 	{ 0, (sy_call_t *)sys_getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 89 = getdtablesize */
 	{ AS(dup2_args), (sy_call_t *)sys_dup2, AUE_DUP2, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 90 = dup2 */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 91 = getdopt */
 	{ AS(freebsd32_fcntl_args), (sy_call_t *)freebsd32_fcntl, AUE_FCNTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 92 = freebsd32_fcntl */
 	{ AS(freebsd32_select_args), (sy_call_t *)freebsd32_select, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 93 = freebsd32_select */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 94 = setdopt */
 	{ AS(fsync_args), (sy_call_t *)sys_fsync, AUE_FSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 95 = fsync */
 	{ AS(setpriority_args), (sy_call_t *)sys_setpriority, AUE_SETPRIORITY, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 96 = setpriority */
 	{ AS(socket_args), (sy_call_t *)sys_socket, AUE_SOCKET, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 97 = socket */
 	{ AS(connect_args), (sy_call_t *)sys_connect, AUE_CONNECT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 98 = connect */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 99 = obsolete oaccept */
 	{ AS(getpriority_args), (sy_call_t *)sys_getpriority, AUE_GETPRIORITY, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 100 = getpriority */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 101 = obsolete osend */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 102 = obsolete orecv */
 	{ compat(AS(ofreebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 103 = old freebsd32_sigreturn */
 	{ AS(bind_args), (sy_call_t *)sys_bind, AUE_BIND, NULL, 0, 0, 0, SY_THR_STATIC },	/* 104 = bind */
 	{ AS(setsockopt_args), (sy_call_t *)sys_setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 105 = setsockopt */
 	{ AS(listen_args), (sy_call_t *)sys_listen, AUE_LISTEN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 106 = listen */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 107 = obsolete vtimes */
 	{ compat(AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_O_SIGVEC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 108 = old freebsd32_sigvec */
 	{ compat(AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_O_SIGBLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 109 = old freebsd32_sigblock */
 	{ compat(AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_O_SIGSETMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 110 = old freebsd32_sigsetmask */
 	{ compat(AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_SIGSUSPEND, NULL, 0, 0, 0, SY_THR_STATIC },	/* 111 = old freebsd32_sigsuspend */
 	{ compat(AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_O_SIGSTACK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 112 = old freebsd32_sigstack */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 113 = obsolete orecvmsg */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 114 = obsolete osendmsg */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 115 = obsolete vtrace */
 	{ AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 116 = freebsd32_gettimeofday */
 	{ AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage, AUE_GETRUSAGE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 117 = freebsd32_getrusage */
 	{ AS(getsockopt_args), (sy_call_t *)sys_getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 118 = getsockopt */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 119 = resuba */
 	{ AS(freebsd32_readv_args), (sy_call_t *)freebsd32_readv, AUE_READV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 120 = freebsd32_readv */
 	{ AS(freebsd32_writev_args), (sy_call_t *)freebsd32_writev, AUE_WRITEV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 121 = freebsd32_writev */
 	{ AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0, SY_THR_STATIC },	/* 122 = freebsd32_settimeofday */
 	{ AS(fchown_args), (sy_call_t *)sys_fchown, AUE_FCHOWN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 123 = fchown */
 	{ AS(fchmod_args), (sy_call_t *)sys_fchmod, AUE_FCHMOD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 124 = fchmod */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 125 = obsolete orecvfrom */
 	{ AS(setreuid_args), (sy_call_t *)sys_setreuid, AUE_SETREUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 126 = setreuid */
 	{ AS(setregid_args), (sy_call_t *)sys_setregid, AUE_SETREGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 127 = setregid */
 	{ AS(rename_args), (sy_call_t *)sys_rename, AUE_RENAME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 128 = rename */
 	{ compat(AS(otruncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 129 = old truncate */
 	{ compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 130 = old ftruncate */
 	{ AS(flock_args), (sy_call_t *)sys_flock, AUE_FLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 131 = flock */
 	{ AS(mkfifo_args), (sy_call_t *)sys_mkfifo, AUE_MKFIFO, NULL, 0, 0, 0, SY_THR_STATIC },	/* 132 = mkfifo */
 	{ AS(sendto_args), (sy_call_t *)sys_sendto, AUE_SENDTO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 133 = sendto */
 	{ AS(shutdown_args), (sy_call_t *)sys_shutdown, AUE_SHUTDOWN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 134 = shutdown */
 	{ AS(socketpair_args), (sy_call_t *)sys_socketpair, AUE_SOCKETPAIR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 135 = socketpair */
 	{ AS(mkdir_args), (sy_call_t *)sys_mkdir, AUE_MKDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 136 = mkdir */
 	{ AS(rmdir_args), (sy_call_t *)sys_rmdir, AUE_RMDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 137 = rmdir */
 	{ AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES, NULL, 0, 0, 0, SY_THR_STATIC },	/* 138 = freebsd32_utimes */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 139 = obsolete 4.2 sigreturn */
 	{ AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime, AUE_ADJTIME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 140 = freebsd32_adjtime */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 141 = obsolete ogetpeername */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 142 = obsolete ogethostid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 143 = obsolete sethostid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 144 = obsolete getrlimit */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 145 = obsolete setrlimit */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 146 = obsolete killpg */
 	{ 0, (sy_call_t *)sys_setsid, AUE_SETSID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 147 = setsid */
 	{ AS(quotactl_args), (sy_call_t *)sys_quotactl, AUE_QUOTACTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 148 = quotactl */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 149 = obsolete oquota */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 150 = obsolete ogetsockname */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 151 = sem_lock */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 152 = sem_wakeup */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 153 = asyncdaemon */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 154 = nlm_syscall */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 155 = nfssvc */
 	{ compat(AS(ofreebsd32_getdirentries_args),freebsd32_getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 156 = old freebsd32_getdirentries */
 	{ compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 157 = freebsd4 freebsd32_statfs */
 	{ compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 158 = freebsd4 freebsd32_fstatfs */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 159 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 160 = lgetfh */
 	{ AS(getfh_args), (sy_call_t *)sys_getfh, AUE_NFS_GETFH, NULL, 0, 0, 0, SY_THR_STATIC },	/* 161 = getfh */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 162 = obsolete getdomainname */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 163 = obsolete setdomainname */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 164 = obsolete uname */
 	{ AS(freebsd32_sysarch_args), (sy_call_t *)freebsd32_sysarch, AUE_SYSARCH, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 165 = freebsd32_sysarch */
 	{ AS(rtprio_args), (sy_call_t *)sys_rtprio, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 166 = rtprio */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 167 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 168 = nosys */
 	{ AS(freebsd32_semsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 169 = freebsd32_semsys */
 	{ AS(freebsd32_msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 170 = freebsd32_msgsys */
 	{ AS(freebsd32_shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 171 = freebsd32_shmsys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 172 = nosys */
 	{ compat6(AS(freebsd6_freebsd32_pread_args),freebsd32_pread), AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 173 = freebsd6 freebsd32_pread */
 	{ compat6(AS(freebsd6_freebsd32_pwrite_args),freebsd32_pwrite), AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 174 = freebsd6 freebsd32_pwrite */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 175 = nosys */
 	{ AS(ntp_adjtime_args), (sy_call_t *)sys_ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 176 = ntp_adjtime */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 177 = sfork */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 178 = getdescriptor */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 179 = setdescriptor */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 180 = nosys */
 	{ AS(setgid_args), (sy_call_t *)sys_setgid, AUE_SETGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 181 = setgid */
 	{ AS(setegid_args), (sy_call_t *)sys_setegid, AUE_SETEGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 182 = setegid */
 	{ AS(seteuid_args), (sy_call_t *)sys_seteuid, AUE_SETEUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 183 = seteuid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 184 = lfs_bmapv */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 185 = lfs_markv */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 186 = lfs_segclean */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 187 = lfs_segwait */
 	{ AS(freebsd32_stat_args), (sy_call_t *)freebsd32_stat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 188 = freebsd32_stat */
 	{ AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 189 = freebsd32_fstat */
 	{ AS(freebsd32_lstat_args), (sy_call_t *)freebsd32_lstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 190 = freebsd32_lstat */
 	{ AS(pathconf_args), (sy_call_t *)sys_pathconf, AUE_PATHCONF, NULL, 0, 0, 0, SY_THR_STATIC },	/* 191 = pathconf */
 	{ AS(fpathconf_args), (sy_call_t *)sys_fpathconf, AUE_FPATHCONF, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 192 = fpathconf */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 193 = nosys */
 	{ AS(__getrlimit_args), (sy_call_t *)sys_getrlimit, AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 194 = getrlimit */
 	{ AS(__setrlimit_args), (sy_call_t *)sys_setrlimit, AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 195 = setrlimit */
 	{ AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 196 = freebsd32_getdirentries */
 	{ compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 197 = freebsd6 freebsd32_mmap */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },		/* 198 = __syscall */
 	{ compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 199 = freebsd6 freebsd32_lseek */
 	{ compat6(AS(freebsd6_freebsd32_truncate_args),freebsd32_truncate), AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 200 = freebsd6 freebsd32_truncate */
 	{ compat6(AS(freebsd6_freebsd32_ftruncate_args),freebsd32_ftruncate), AUE_FTRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 201 = freebsd6 freebsd32_ftruncate */
 	{ AS(freebsd32_sysctl_args), (sy_call_t *)freebsd32_sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 202 = freebsd32_sysctl */
 	{ AS(mlock_args), (sy_call_t *)sys_mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 203 = mlock */
 	{ AS(munlock_args), (sy_call_t *)sys_munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 204 = munlock */
 	{ AS(undelete_args), (sy_call_t *)sys_undelete, AUE_UNDELETE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 205 = undelete */
 	{ AS(freebsd32_futimes_args), (sy_call_t *)freebsd32_futimes, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 206 = freebsd32_futimes */
 	{ AS(getpgid_args), (sy_call_t *)sys_getpgid, AUE_GETPGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 207 = getpgid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 208 = newreboot */
 	{ AS(poll_args), (sy_call_t *)sys_poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 209 = poll */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 210 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 211 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 212 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 213 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 214 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 215 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 216 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 217 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 218 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 219 = lkmnosys */
 	{ 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },		/* 220 = freebsd7 freebsd32_semctl */
 	{ AS(semget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 221 = semget */
 	{ AS(semop_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 222 = semop */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 223 = semconfig */
 	{ 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },		/* 224 = freebsd7 freebsd32_msgctl */
 	{ AS(msgget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 225 = msgget */
 	{ AS(freebsd32_msgsnd_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 226 = freebsd32_msgsnd */
 	{ AS(freebsd32_msgrcv_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 227 = freebsd32_msgrcv */
 	{ AS(shmat_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 228 = shmat */
 	{ 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },		/* 229 = freebsd7 freebsd32_shmctl */
 	{ AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 230 = shmdt */
 	{ AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 231 = shmget */
 	{ AS(freebsd32_clock_gettime_args), (sy_call_t *)freebsd32_clock_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 232 = freebsd32_clock_gettime */
 	{ AS(freebsd32_clock_settime_args), (sy_call_t *)freebsd32_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 233 = freebsd32_clock_settime */
 	{ AS(freebsd32_clock_getres_args), (sy_call_t *)freebsd32_clock_getres, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 234 = freebsd32_clock_getres */
 	{ AS(freebsd32_ktimer_create_args), (sy_call_t *)freebsd32_ktimer_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 235 = freebsd32_ktimer_create */
 	{ AS(ktimer_delete_args), (sy_call_t *)sys_ktimer_delete, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 236 = ktimer_delete */
 	{ AS(freebsd32_ktimer_settime_args), (sy_call_t *)freebsd32_ktimer_settime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 237 = freebsd32_ktimer_settime */
 	{ AS(freebsd32_ktimer_gettime_args), (sy_call_t *)freebsd32_ktimer_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 238 = freebsd32_ktimer_gettime */
 	{ AS(ktimer_getoverrun_args), (sy_call_t *)sys_ktimer_getoverrun, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 239 = ktimer_getoverrun */
 	{ AS(freebsd32_nanosleep_args), (sy_call_t *)freebsd32_nanosleep, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 240 = freebsd32_nanosleep */
 	{ AS(ffclock_getcounter_args), (sy_call_t *)sys_ffclock_getcounter, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 241 = ffclock_getcounter */
 	{ AS(ffclock_setestimate_args), (sy_call_t *)sys_ffclock_setestimate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 242 = ffclock_setestimate */
 	{ AS(ffclock_getestimate_args), (sy_call_t *)sys_ffclock_getestimate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 243 = ffclock_getestimate */
 	{ AS(freebsd32_clock_nanosleep_args), (sy_call_t *)freebsd32_clock_nanosleep, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 244 = freebsd32_clock_nanosleep */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 245 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 246 = nosys */
 	{ AS(freebsd32_clock_getcpuclockid2_args), (sy_call_t *)freebsd32_clock_getcpuclockid2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 247 = freebsd32_clock_getcpuclockid2 */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 248 = ntp_gettime */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 249 = nosys */
 	{ AS(minherit_args), (sy_call_t *)sys_minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 250 = minherit */
 	{ AS(rfork_args), (sy_call_t *)sys_rfork, AUE_RFORK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 251 = rfork */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 252 = obsolete openbsd_poll */
 	{ 0, (sy_call_t *)sys_issetugid, AUE_ISSETUGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 253 = issetugid */
 	{ AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 254 = lchown */
 	{ AS(freebsd32_aio_read_args), (sy_call_t *)freebsd32_aio_read, AUE_AIO_READ, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 255 = freebsd32_aio_read */
 	{ AS(freebsd32_aio_write_args), (sy_call_t *)freebsd32_aio_write, AUE_AIO_WRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 256 = freebsd32_aio_write */
 	{ AS(freebsd32_lio_listio_args), (sy_call_t *)freebsd32_lio_listio, AUE_LIO_LISTIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 257 = freebsd32_lio_listio */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 258 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 259 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 260 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 261 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 262 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 263 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 264 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 265 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 266 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 267 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 268 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 269 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 270 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 271 = nosys */
 	{ AS(getdents_args), (sy_call_t *)sys_getdents, AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 272 = getdents */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 273 = nosys */
 	{ AS(lchmod_args), (sy_call_t *)sys_lchmod, AUE_LCHMOD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 274 = lchmod */
 	{ AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 275 = netbsd_lchown */
 	{ AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes, AUE_LUTIMES, NULL, 0, 0, 0, SY_THR_STATIC },	/* 276 = freebsd32_lutimes */
 	{ AS(msync_args), (sy_call_t *)sys_msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 277 = netbsd_msync */
 	{ AS(nstat_args), (sy_call_t *)sys_nstat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 278 = nstat */
 	{ AS(nfstat_args), (sy_call_t *)sys_nfstat, AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 279 = nfstat */
 	{ AS(nlstat_args), (sy_call_t *)sys_nlstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 280 = nlstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 281 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 282 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 283 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 284 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 285 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 286 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 287 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 288 = nosys */
 	{ AS(freebsd32_preadv_args), (sy_call_t *)freebsd32_preadv, AUE_PREADV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 289 = freebsd32_preadv */
 	{ AS(freebsd32_pwritev_args), (sy_call_t *)freebsd32_pwritev, AUE_PWRITEV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 290 = freebsd32_pwritev */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 291 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 292 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 293 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 294 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 295 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 296 = nosys */
 	{ compat4(AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs), AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 297 = freebsd4 freebsd32_fhstatfs */
 	{ AS(fhopen_args), (sy_call_t *)sys_fhopen, AUE_FHOPEN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 298 = fhopen */
 	{ AS(fhstat_args), (sy_call_t *)sys_fhstat, AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 299 = fhstat */
 	{ AS(modnext_args), (sy_call_t *)sys_modnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 300 = modnext */
 	{ AS(freebsd32_modstat_args), (sy_call_t *)freebsd32_modstat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 301 = freebsd32_modstat */
 	{ AS(modfnext_args), (sy_call_t *)sys_modfnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 302 = modfnext */
 	{ AS(modfind_args), (sy_call_t *)sys_modfind, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 303 = modfind */
 	{ AS(kldload_args), (sy_call_t *)sys_kldload, AUE_MODLOAD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 304 = kldload */
 	{ AS(kldunload_args), (sy_call_t *)sys_kldunload, AUE_MODUNLOAD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 305 = kldunload */
 	{ AS(kldfind_args), (sy_call_t *)sys_kldfind, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 306 = kldfind */
 	{ AS(kldnext_args), (sy_call_t *)sys_kldnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 307 = kldnext */
 	{ AS(freebsd32_kldstat_args), (sy_call_t *)freebsd32_kldstat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 308 = freebsd32_kldstat */
 	{ AS(kldfirstmod_args), (sy_call_t *)sys_kldfirstmod, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 309 = kldfirstmod */
 	{ AS(getsid_args), (sy_call_t *)sys_getsid, AUE_GETSID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 310 = getsid */
 	{ AS(setresuid_args), (sy_call_t *)sys_setresuid, AUE_SETRESUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 311 = setresuid */
 	{ AS(setresgid_args), (sy_call_t *)sys_setresgid, AUE_SETRESGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 312 = setresgid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 313 = obsolete signanosleep */
 	{ AS(freebsd32_aio_return_args), (sy_call_t *)freebsd32_aio_return, AUE_AIO_RETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 314 = freebsd32_aio_return */
 	{ AS(freebsd32_aio_suspend_args), (sy_call_t *)freebsd32_aio_suspend, AUE_AIO_SUSPEND, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 315 = freebsd32_aio_suspend */
 	{ AS(aio_cancel_args), (sy_call_t *)sys_aio_cancel, AUE_AIO_CANCEL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 316 = aio_cancel */
 	{ AS(freebsd32_aio_error_args), (sy_call_t *)freebsd32_aio_error, AUE_AIO_ERROR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 317 = freebsd32_aio_error */
 	{ compat6(AS(freebsd6_freebsd32_aio_read_args),freebsd32_aio_read), AUE_AIO_READ, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 318 = freebsd6 freebsd32_aio_read */
 	{ compat6(AS(freebsd6_freebsd32_aio_write_args),freebsd32_aio_write), AUE_AIO_WRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 319 = freebsd6 freebsd32_aio_write */
 	{ compat6(AS(freebsd6_freebsd32_lio_listio_args),freebsd32_lio_listio), AUE_LIO_LISTIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 320 = freebsd6 freebsd32_lio_listio */
 	{ 0, (sy_call_t *)sys_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 321 = yield */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 322 = obsolete thr_sleep */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 323 = obsolete thr_wakeup */
 	{ AS(mlockall_args), (sy_call_t *)sys_mlockall, AUE_MLOCKALL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 324 = mlockall */
 	{ 0, (sy_call_t *)sys_munlockall, AUE_MUNLOCKALL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 325 = munlockall */
 	{ AS(__getcwd_args), (sy_call_t *)sys___getcwd, AUE_GETCWD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 326 = __getcwd */
 	{ AS(sched_setparam_args), (sy_call_t *)sys_sched_setparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 327 = sched_setparam */
 	{ AS(sched_getparam_args), (sy_call_t *)sys_sched_getparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 328 = sched_getparam */
 	{ AS(sched_setscheduler_args), (sy_call_t *)sys_sched_setscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 329 = sched_setscheduler */
 	{ AS(sched_getscheduler_args), (sy_call_t *)sys_sched_getscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 330 = sched_getscheduler */
 	{ 0, (sy_call_t *)sys_sched_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 331 = sched_yield */
 	{ AS(sched_get_priority_max_args), (sy_call_t *)sys_sched_get_priority_max, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 332 = sched_get_priority_max */
 	{ AS(sched_get_priority_min_args), (sy_call_t *)sys_sched_get_priority_min, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 333 = sched_get_priority_min */
 	{ AS(sched_rr_get_interval_args), (sy_call_t *)sys_sched_rr_get_interval, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 334 = sched_rr_get_interval */
 	{ AS(utrace_args), (sy_call_t *)sys_utrace, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 335 = utrace */
 	{ compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 336 = freebsd4 freebsd32_sendfile */
 	{ AS(kldsym_args), (sy_call_t *)sys_kldsym, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 337 = kldsym */
 	{ AS(freebsd32_jail_args), (sy_call_t *)freebsd32_jail, AUE_JAIL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 338 = freebsd32_jail */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 339 = pioctl */
 	{ AS(sigprocmask_args), (sy_call_t *)sys_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 340 = sigprocmask */
 	{ AS(sigsuspend_args), (sy_call_t *)sys_sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 341 = sigsuspend */
 	{ compat4(AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 342 = freebsd4 freebsd32_sigaction */
 	{ AS(sigpending_args), (sy_call_t *)sys_sigpending, AUE_SIGPENDING, NULL, 0, 0, 0, SY_THR_STATIC },	/* 343 = sigpending */
 	{ compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 344 = freebsd4 freebsd32_sigreturn */
 	{ AS(freebsd32_sigtimedwait_args), (sy_call_t *)freebsd32_sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 345 = freebsd32_sigtimedwait */
 	{ AS(freebsd32_sigwaitinfo_args), (sy_call_t *)freebsd32_sigwaitinfo, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 346 = freebsd32_sigwaitinfo */
 	{ AS(__acl_get_file_args), (sy_call_t *)sys___acl_get_file, AUE_ACL_GET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 347 = __acl_get_file */
 	{ AS(__acl_set_file_args), (sy_call_t *)sys___acl_set_file, AUE_ACL_SET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 348 = __acl_set_file */
 	{ AS(__acl_get_fd_args), (sy_call_t *)sys___acl_get_fd, AUE_ACL_GET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 349 = __acl_get_fd */
 	{ AS(__acl_set_fd_args), (sy_call_t *)sys___acl_set_fd, AUE_ACL_SET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 350 = __acl_set_fd */
 	{ AS(__acl_delete_file_args), (sy_call_t *)sys___acl_delete_file, AUE_ACL_DELETE_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 351 = __acl_delete_file */
 	{ AS(__acl_delete_fd_args), (sy_call_t *)sys___acl_delete_fd, AUE_ACL_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 352 = __acl_delete_fd */
 	{ AS(__acl_aclcheck_file_args), (sy_call_t *)sys___acl_aclcheck_file, AUE_ACL_CHECK_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 353 = __acl_aclcheck_file */
 	{ AS(__acl_aclcheck_fd_args), (sy_call_t *)sys___acl_aclcheck_fd, AUE_ACL_CHECK_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 354 = __acl_aclcheck_fd */
 	{ AS(extattrctl_args), (sy_call_t *)sys_extattrctl, AUE_EXTATTRCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 355 = extattrctl */
 	{ AS(extattr_set_file_args), (sy_call_t *)sys_extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 356 = extattr_set_file */
 	{ AS(extattr_get_file_args), (sy_call_t *)sys_extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 357 = extattr_get_file */
 	{ AS(extattr_delete_file_args), (sy_call_t *)sys_extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 358 = extattr_delete_file */
 	{ AS(freebsd32_aio_waitcomplete_args), (sy_call_t *)freebsd32_aio_waitcomplete, AUE_AIO_WAITCOMPLETE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 359 = freebsd32_aio_waitcomplete */
 	{ AS(getresuid_args), (sy_call_t *)sys_getresuid, AUE_GETRESUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 360 = getresuid */
 	{ AS(getresgid_args), (sy_call_t *)sys_getresgid, AUE_GETRESGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 361 = getresgid */
 	{ 0, (sy_call_t *)sys_kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 362 = kqueue */
 	{ AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_KEVENT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 363 = freebsd32_kevent */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 364 = __cap_get_proc */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 365 = __cap_set_proc */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 366 = __cap_get_fd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 367 = __cap_get_file */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 368 = __cap_set_fd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 369 = __cap_set_file */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 370 = nosys */
 	{ AS(extattr_set_fd_args), (sy_call_t *)sys_extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 371 = extattr_set_fd */
 	{ AS(extattr_get_fd_args), (sy_call_t *)sys_extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 372 = extattr_get_fd */
 	{ AS(extattr_delete_fd_args), (sy_call_t *)sys_extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 373 = extattr_delete_fd */
 	{ AS(__setugid_args), (sy_call_t *)sys___setugid, AUE_SETUGID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 374 = __setugid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 375 = nfsclnt */
 	{ AS(eaccess_args), (sy_call_t *)sys_eaccess, AUE_EACCESS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 376 = eaccess */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 377 = afs_syscall */
 	{ AS(freebsd32_nmount_args), (sy_call_t *)freebsd32_nmount, AUE_NMOUNT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 378 = freebsd32_nmount */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 379 = kse_exit */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 380 = kse_wakeup */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 381 = kse_create */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 382 = kse_thr_interrupt */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 383 = kse_release */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 384 = __mac_get_proc */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 385 = __mac_set_proc */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 386 = __mac_get_fd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 387 = __mac_get_file */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 388 = __mac_set_fd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 389 = __mac_set_file */
 	{ AS(kenv_args), (sy_call_t *)sys_kenv, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 390 = kenv */
 	{ AS(lchflags_args), (sy_call_t *)sys_lchflags, AUE_LCHFLAGS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 391 = lchflags */
 	{ AS(uuidgen_args), (sy_call_t *)sys_uuidgen, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 392 = uuidgen */
 	{ AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 393 = freebsd32_sendfile */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 394 = mac_syscall */
 	{ AS(getfsstat_args), (sy_call_t *)sys_getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 395 = getfsstat */
 	{ AS(statfs_args), (sy_call_t *)sys_statfs, AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 396 = statfs */
 	{ AS(fstatfs_args), (sy_call_t *)sys_fstatfs, AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 397 = fstatfs */
 	{ AS(fhstatfs_args), (sy_call_t *)sys_fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 398 = fhstatfs */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 399 = nosys */
 	{ AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 400 = ksem_close */
 	{ AS(ksem_post_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 401 = ksem_post */
 	{ AS(ksem_wait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 402 = ksem_wait */
 	{ AS(ksem_trywait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 403 = ksem_trywait */
 	{ AS(freebsd32_ksem_init_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 404 = freebsd32_ksem_init */
 	{ AS(freebsd32_ksem_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 405 = freebsd32_ksem_open */
 	{ AS(ksem_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 406 = ksem_unlink */
 	{ AS(ksem_getvalue_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 407 = ksem_getvalue */
 	{ AS(ksem_destroy_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 408 = ksem_destroy */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 409 = __mac_get_pid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 410 = __mac_get_link */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 411 = __mac_set_link */
 	{ AS(extattr_set_link_args), (sy_call_t *)sys_extattr_set_link, AUE_EXTATTR_SET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 412 = extattr_set_link */
 	{ AS(extattr_get_link_args), (sy_call_t *)sys_extattr_get_link, AUE_EXTATTR_GET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 413 = extattr_get_link */
 	{ AS(extattr_delete_link_args), (sy_call_t *)sys_extattr_delete_link, AUE_EXTATTR_DELETE_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 414 = extattr_delete_link */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 415 = __mac_execve */
 	{ AS(freebsd32_sigaction_args), (sy_call_t *)freebsd32_sigaction, AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 416 = freebsd32_sigaction */
 	{ AS(freebsd32_sigreturn_args), (sy_call_t *)freebsd32_sigreturn, AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 417 = freebsd32_sigreturn */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 418 = __xstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 419 = __xfstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 420 = __xlstat */
 	{ AS(freebsd32_getcontext_args), (sy_call_t *)freebsd32_getcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 421 = freebsd32_getcontext */
 	{ AS(freebsd32_setcontext_args), (sy_call_t *)freebsd32_setcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 422 = freebsd32_setcontext */
 	{ AS(freebsd32_swapcontext_args), (sy_call_t *)freebsd32_swapcontext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 423 = freebsd32_swapcontext */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 424 = swapoff */
 	{ AS(__acl_get_link_args), (sy_call_t *)sys___acl_get_link, AUE_ACL_GET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 425 = __acl_get_link */
 	{ AS(__acl_set_link_args), (sy_call_t *)sys___acl_set_link, AUE_ACL_SET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 426 = __acl_set_link */
 	{ AS(__acl_delete_link_args), (sy_call_t *)sys___acl_delete_link, AUE_ACL_DELETE_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 427 = __acl_delete_link */
 	{ AS(__acl_aclcheck_link_args), (sy_call_t *)sys___acl_aclcheck_link, AUE_ACL_CHECK_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 428 = __acl_aclcheck_link */
 	{ AS(sigwait_args), (sy_call_t *)sys_sigwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 429 = sigwait */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 430 = thr_create; */
 	{ AS(thr_exit_args), (sy_call_t *)sys_thr_exit, AUE_THR_EXIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 431 = thr_exit */
 	{ AS(thr_self_args), (sy_call_t *)sys_thr_self, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 432 = thr_self */
 	{ AS(thr_kill_args), (sy_call_t *)sys_thr_kill, AUE_THR_KILL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 433 = thr_kill */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 434 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 435 = nosys */
 	{ AS(jail_attach_args), (sy_call_t *)sys_jail_attach, AUE_JAIL_ATTACH, NULL, 0, 0, 0, SY_THR_STATIC },	/* 436 = jail_attach */
 	{ AS(extattr_list_fd_args), (sy_call_t *)sys_extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 437 = extattr_list_fd */
 	{ AS(extattr_list_file_args), (sy_call_t *)sys_extattr_list_file, AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 438 = extattr_list_file */
 	{ AS(extattr_list_link_args), (sy_call_t *)sys_extattr_list_link, AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 439 = extattr_list_link */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 440 = kse_switchin */
 	{ AS(freebsd32_ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 441 = freebsd32_ksem_timedwait */
 	{ AS(freebsd32_thr_suspend_args), (sy_call_t *)freebsd32_thr_suspend, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 442 = freebsd32_thr_suspend */
 	{ AS(thr_wake_args), (sy_call_t *)sys_thr_wake, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 443 = thr_wake */
 	{ AS(kldunloadf_args), (sy_call_t *)sys_kldunloadf, AUE_MODUNLOAD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 444 = kldunloadf */
 	{ AS(audit_args), (sy_call_t *)sys_audit, AUE_AUDIT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 445 = audit */
 	{ AS(auditon_args), (sy_call_t *)sys_auditon, AUE_AUDITON, NULL, 0, 0, 0, SY_THR_STATIC },	/* 446 = auditon */
 	{ AS(getauid_args), (sy_call_t *)sys_getauid, AUE_GETAUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 447 = getauid */
 	{ AS(setauid_args), (sy_call_t *)sys_setauid, AUE_SETAUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 448 = setauid */
 	{ AS(getaudit_args), (sy_call_t *)sys_getaudit, AUE_GETAUDIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 449 = getaudit */
 	{ AS(setaudit_args), (sy_call_t *)sys_setaudit, AUE_SETAUDIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 450 = setaudit */
 	{ AS(getaudit_addr_args), (sy_call_t *)sys_getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 451 = getaudit_addr */
 	{ AS(setaudit_addr_args), (sy_call_t *)sys_setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 452 = setaudit_addr */
 	{ AS(auditctl_args), (sy_call_t *)sys_auditctl, AUE_AUDITCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 453 = auditctl */
 	{ AS(freebsd32_umtx_op_args), (sy_call_t *)freebsd32_umtx_op, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 454 = freebsd32_umtx_op */
 	{ AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, AUE_THR_NEW, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 455 = freebsd32_thr_new */
 	{ AS(freebsd32_sigqueue_args), (sy_call_t *)freebsd32_sigqueue, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 456 = freebsd32_sigqueue */
 	{ AS(freebsd32_kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 457 = freebsd32_kmq_open */
 	{ AS(freebsd32_kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 458 = freebsd32_kmq_setattr */
 	{ AS(freebsd32_kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 459 = freebsd32_kmq_timedreceive */
 	{ AS(freebsd32_kmq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 460 = freebsd32_kmq_timedsend */
 	{ AS(freebsd32_kmq_notify_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 461 = freebsd32_kmq_notify */
 	{ AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 462 = kmq_unlink */
 	{ AS(abort2_args), (sy_call_t *)sys_abort2, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 463 = abort2 */
 	{ AS(thr_set_name_args), (sy_call_t *)sys_thr_set_name, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 464 = thr_set_name */
 	{ AS(freebsd32_aio_fsync_args), (sy_call_t *)freebsd32_aio_fsync, AUE_AIO_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC },	/* 465 = freebsd32_aio_fsync */
 	{ AS(rtprio_thread_args), (sy_call_t *)sys_rtprio_thread, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 466 = rtprio_thread */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 467 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 468 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 469 = __getpath_fromfd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 470 = __getpath_fromaddr */
 	{ AS(sctp_peeloff_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 471 = sctp_peeloff */
 	{ AS(sctp_generic_sendmsg_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 472 = sctp_generic_sendmsg */
 	{ AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 473 = sctp_generic_sendmsg_iov */
 	{ AS(sctp_generic_recvmsg_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 474 = sctp_generic_recvmsg */
 #ifdef PAD64_REQUIRED
 	{ AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 475 = freebsd32_pread */
 	{ AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 476 = freebsd32_pwrite */
 	{ AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 477 = freebsd32_mmap */
 	{ AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 478 = freebsd32_lseek */
 	{ AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 479 = freebsd32_truncate */
 	{ AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 480 = freebsd32_ftruncate */
 #else
 	{ AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 475 = freebsd32_pread */
 	{ AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 476 = freebsd32_pwrite */
 	{ AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 477 = freebsd32_mmap */
 	{ AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 478 = freebsd32_lseek */
 	{ AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 479 = freebsd32_truncate */
 	{ AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 480 = freebsd32_ftruncate */
 #endif
 	{ AS(thr_kill2_args), (sy_call_t *)sys_thr_kill2, AUE_THR_KILL2, NULL, 0, 0, 0, SY_THR_STATIC },	/* 481 = thr_kill2 */
 	{ AS(shm_open_args), (sy_call_t *)sys_shm_open, AUE_SHMOPEN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 482 = shm_open */
 	{ AS(shm_unlink_args), (sy_call_t *)sys_shm_unlink, AUE_SHMUNLINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 483 = shm_unlink */
 	{ AS(cpuset_args), (sy_call_t *)sys_cpuset, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 484 = cpuset */
 #ifdef PAD64_REQUIRED
 	{ AS(freebsd32_cpuset_setid_args), (sy_call_t *)freebsd32_cpuset_setid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 485 = freebsd32_cpuset_setid */
 #else
 	{ AS(freebsd32_cpuset_setid_args), (sy_call_t *)freebsd32_cpuset_setid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 485 = freebsd32_cpuset_setid */
 #endif
 	{ AS(freebsd32_cpuset_getid_args), (sy_call_t *)freebsd32_cpuset_getid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 486 = freebsd32_cpuset_getid */
 	{ AS(freebsd32_cpuset_getaffinity_args), (sy_call_t *)freebsd32_cpuset_getaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 487 = freebsd32_cpuset_getaffinity */
 	{ AS(freebsd32_cpuset_setaffinity_args), (sy_call_t *)freebsd32_cpuset_setaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 488 = freebsd32_cpuset_setaffinity */
 	{ AS(faccessat_args), (sy_call_t *)sys_faccessat, AUE_FACCESSAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 489 = faccessat */
 	{ AS(fchmodat_args), (sy_call_t *)sys_fchmodat, AUE_FCHMODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 490 = fchmodat */
 	{ AS(fchownat_args), (sy_call_t *)sys_fchownat, AUE_FCHOWNAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 491 = fchownat */
 	{ AS(freebsd32_fexecve_args), (sy_call_t *)freebsd32_fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 492 = freebsd32_fexecve */
 	{ AS(freebsd32_fstatat_args), (sy_call_t *)freebsd32_fstatat, AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 493 = freebsd32_fstatat */
 	{ AS(freebsd32_futimesat_args), (sy_call_t *)freebsd32_futimesat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 494 = freebsd32_futimesat */
 	{ AS(linkat_args), (sy_call_t *)sys_linkat, AUE_LINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 495 = linkat */
 	{ AS(mkdirat_args), (sy_call_t *)sys_mkdirat, AUE_MKDIRAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 496 = mkdirat */
 	{ AS(mkfifoat_args), (sy_call_t *)sys_mkfifoat, AUE_MKFIFOAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 497 = mkfifoat */
 	{ AS(mknodat_args), (sy_call_t *)sys_mknodat, AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 498 = mknodat */
 	{ AS(openat_args), (sy_call_t *)sys_openat, AUE_OPENAT_RWTC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 499 = openat */
 	{ AS(readlinkat_args), (sy_call_t *)sys_readlinkat, AUE_READLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 500 = readlinkat */
 	{ AS(renameat_args), (sy_call_t *)sys_renameat, AUE_RENAMEAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 501 = renameat */
 	{ AS(symlinkat_args), (sy_call_t *)sys_symlinkat, AUE_SYMLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 502 = symlinkat */
 	{ AS(unlinkat_args), (sy_call_t *)sys_unlinkat, AUE_UNLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 503 = unlinkat */
 	{ AS(posix_openpt_args), (sy_call_t *)sys_posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 504 = posix_openpt */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 505 = gssd_syscall */
 	{ AS(freebsd32_jail_get_args), (sy_call_t *)freebsd32_jail_get, AUE_JAIL_GET, NULL, 0, 0, 0, SY_THR_STATIC },	/* 506 = freebsd32_jail_get */
 	{ AS(freebsd32_jail_set_args), (sy_call_t *)freebsd32_jail_set, AUE_JAIL_SET, NULL, 0, 0, 0, SY_THR_STATIC },	/* 507 = freebsd32_jail_set */
 	{ AS(jail_remove_args), (sy_call_t *)sys_jail_remove, AUE_JAIL_REMOVE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 508 = jail_remove */
 	{ AS(closefrom_args), (sy_call_t *)sys_closefrom, AUE_CLOSEFROM, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 509 = closefrom */
 	{ AS(freebsd32_semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 510 = freebsd32_semctl */
 	{ AS(freebsd32_msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 511 = freebsd32_msgctl */
 	{ AS(freebsd32_shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 512 = freebsd32_shmctl */
 	{ AS(lpathconf_args), (sy_call_t *)sys_lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0, SY_THR_STATIC },	/* 513 = lpathconf */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 514 = obsolete cap_new */
 	{ AS(__cap_rights_get_args), (sy_call_t *)sys___cap_rights_get, AUE_CAP_RIGHTS_GET, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 515 = __cap_rights_get */
 	{ 0, (sy_call_t *)sys_cap_enter, AUE_CAP_ENTER, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 516 = cap_enter */
 	{ AS(cap_getmode_args), (sy_call_t *)sys_cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 517 = cap_getmode */
 	{ AS(pdfork_args), (sy_call_t *)sys_pdfork, AUE_PDFORK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 518 = pdfork */
 	{ AS(pdkill_args), (sy_call_t *)sys_pdkill, AUE_PDKILL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 519 = pdkill */
 	{ AS(pdgetpid_args), (sy_call_t *)sys_pdgetpid, AUE_PDGETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 520 = pdgetpid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 521 = pdwait4 */
 	{ AS(freebsd32_pselect_args), (sy_call_t *)freebsd32_pselect, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 522 = freebsd32_pselect */
 	{ AS(getloginclass_args), (sy_call_t *)sys_getloginclass, AUE_GETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 523 = getloginclass */
 	{ AS(setloginclass_args), (sy_call_t *)sys_setloginclass, AUE_SETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 524 = setloginclass */
 	{ AS(rctl_get_racct_args), (sy_call_t *)sys_rctl_get_racct, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 525 = rctl_get_racct */
 	{ AS(rctl_get_rules_args), (sy_call_t *)sys_rctl_get_rules, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 526 = rctl_get_rules */
 	{ AS(rctl_get_limits_args), (sy_call_t *)sys_rctl_get_limits, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 527 = rctl_get_limits */
 	{ AS(rctl_add_rule_args), (sy_call_t *)sys_rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 528 = rctl_add_rule */
 	{ AS(rctl_remove_rule_args), (sy_call_t *)sys_rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 529 = rctl_remove_rule */
 #ifdef PAD64_REQUIRED
 	{ AS(freebsd32_posix_fallocate_args), (sy_call_t *)freebsd32_posix_fallocate, AUE_POSIX_FALLOCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 530 = freebsd32_posix_fallocate */
 	{ AS(freebsd32_posix_fadvise_args), (sy_call_t *)freebsd32_posix_fadvise, AUE_POSIX_FADVISE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 531 = freebsd32_posix_fadvise */
 	{ AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC },	/* 532 = freebsd32_wait6 */
 #else
 	{ AS(freebsd32_posix_fallocate_args), (sy_call_t *)freebsd32_posix_fallocate, AUE_POSIX_FALLOCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 530 = freebsd32_posix_fallocate */
 	{ AS(freebsd32_posix_fadvise_args), (sy_call_t *)freebsd32_posix_fadvise, AUE_POSIX_FADVISE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 531 = freebsd32_posix_fadvise */
 	{ AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC },	/* 532 = freebsd32_wait6 */
 #endif
 	{ AS(cap_rights_limit_args), (sy_call_t *)sys_cap_rights_limit, AUE_CAP_RIGHTS_LIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 533 = cap_rights_limit */
 	{ AS(freebsd32_cap_ioctls_limit_args), (sy_call_t *)freebsd32_cap_ioctls_limit, AUE_CAP_IOCTLS_LIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 534 = freebsd32_cap_ioctls_limit */
 	{ AS(freebsd32_cap_ioctls_get_args), (sy_call_t *)freebsd32_cap_ioctls_get, AUE_CAP_IOCTLS_GET, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 535 = freebsd32_cap_ioctls_get */
 	{ AS(cap_fcntls_limit_args), (sy_call_t *)sys_cap_fcntls_limit, AUE_CAP_FCNTLS_LIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 536 = cap_fcntls_limit */
 	{ AS(cap_fcntls_get_args), (sy_call_t *)sys_cap_fcntls_get, AUE_CAP_FCNTLS_GET, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 537 = cap_fcntls_get */
 	{ AS(bindat_args), (sy_call_t *)sys_bindat, AUE_BINDAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 538 = bindat */
 	{ AS(connectat_args), (sy_call_t *)sys_connectat, AUE_CONNECTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 539 = connectat */
 	{ AS(chflagsat_args), (sy_call_t *)sys_chflagsat, AUE_CHFLAGSAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 540 = chflagsat */
 	{ AS(accept4_args), (sy_call_t *)sys_accept4, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 541 = accept4 */
 	{ AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 542 = pipe2 */
 	{ AS(freebsd32_aio_mlock_args), (sy_call_t *)freebsd32_aio_mlock, AUE_AIO_MLOCK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 543 = freebsd32_aio_mlock */
 #ifdef PAD64_REQUIRED
 	{ AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_PROCCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 544 = freebsd32_procctl */
 #else
 	{ AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_PROCCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 544 = freebsd32_procctl */
 #endif
 	{ AS(freebsd32_ppoll_args), (sy_call_t *)freebsd32_ppoll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 545 = freebsd32_ppoll */
 	{ AS(freebsd32_futimens_args), (sy_call_t *)freebsd32_futimens, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 546 = freebsd32_futimens */
 	{ AS(freebsd32_utimensat_args), (sy_call_t *)freebsd32_utimensat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 547 = freebsd32_utimensat */
 	{ AS(numa_getaffinity_args), (sy_call_t *)sys_numa_getaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 548 = numa_getaffinity */
 	{ AS(numa_setaffinity_args), (sy_call_t *)sys_numa_setaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 549 = numa_setaffinity */
 	{ AS(fdatasync_args), (sy_call_t *)sys_fdatasync, AUE_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC },	/* 550 = fdatasync */
 };
Index: projects/clang500-import/sys/compat/linuxkpi/common/include/asm/smp.h
===================================================================
--- projects/clang500-import/sys/compat/linuxkpi/common/include/asm/smp.h	(revision 318657)
+++ projects/clang500-import/sys/compat/linuxkpi/common/include/asm/smp.h	(revision 318658)
@@ -1,40 +1,48 @@
 /*-
  * Copyright (c) 2017 Mark Johnston <markj@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.
  *
  * $FreeBSD$
  */
 
 #ifndef _ASM_SMP_H_
 #define	_ASM_SMP_H_
 
 #if defined(__i386__) || defined(__amd64__)
 
 #define	wbinvd_on_all_cpus()	linux_wbinvd_on_all_cpus()
 
 int	linux_wbinvd_on_all_cpus(void);
 
 #endif
 
+#define	get_cpu() ({			\
+	sched_pin();			\
+	PCPU_GET(cpuid);		\
+})
+
+#define	put_cpu()			\
+	sched_unpin()
+
 #endif /* _ASM_SMP_H_ */
Index: projects/clang500-import/sys/conf/files
===================================================================
--- projects/clang500-import/sys/conf/files	(revision 318657)
+++ projects/clang500-import/sys/conf/files	(revision 318658)
@@ -1,4687 +1,4693 @@
 # $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
 acpi_quirks.h			optional acpi				   \
 	dependency	"$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
 	compile-with	"${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"acpi_quirks.h"
 bhnd_nvram_map.h		optional bhnd				   \
 	dependency	"$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
 	compile-with	"sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"bhnd_nvram_map.h"
 bhnd_nvram_map_data.h		optional bhnd				   \
 	dependency	"$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
 	compile-with	"sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -d" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"bhnd_nvram_map_data.h"
 #
 # The 'fdt_dtb_file' target covers an actual DTB file name, which is derived
 # from the specified source (DTS) file: <platform>.dts -> <platform>.dtb
 #
 fdt_dtb_file			optional fdt fdt_dtb_static \
 	compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtb.sh $S ${FDT_DTS_FILE} ${.CURDIR}'" \
 	no-obj no-implicit-rule before-depend	\
 	clean		"${FDT_DTS_FILE:R}.dtb"
 fdt_static_dtb.h		optional fdt fdt_dtb_static \
 	compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ${.CURDIR}'" \
 	dependency	"fdt_dtb_file" \
 	no-obj no-implicit-rule before-depend \
 	clean		"fdt_static_dtb.h"
 feeder_eq_gen.h			optional sound				   \
 	dependency	"$S/tools/sound/feeder_eq_mkfilter.awk"		   \
 	compile-with	"${AWK} -f $S/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"feeder_eq_gen.h"
 feeder_rate_gen.h		optional sound				   \
 	dependency	"$S/tools/sound/feeder_rate_mkfilter.awk"	   \
 	compile-with	"${AWK} -f $S/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"feeder_rate_gen.h"
 snd_fxdiv_gen.h			optional sound				   \
 	dependency	"$S/tools/sound/snd_fxdiv_gen.awk"		   \
 	compile-with	"${AWK} -f $S/tools/sound/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"snd_fxdiv_gen.h"
 miidevs.h			optional miibus | mii			   \
 	dependency	"$S/tools/miidevs2h.awk $S/dev/mii/miidevs"	   \
 	compile-with	"${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"miidevs.h"
 pccarddevs.h			standard				   \
 	dependency	"$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
 	compile-with	"${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"pccarddevs.h"
 kbdmuxmap.h			optional	kbdmux_dflt_keymap 	   \
 	compile-with	"kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P ${S:S/sys$/share/}/syscons/keymaps -L ${KBDMUX_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > kbdmuxmap.h" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"kbdmuxmap.h"
 teken_state.h		optional sc | vt				   \
 	dependency	"$S/teken/gensequences $S/teken/sequences" \
 	compile-with	"${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"teken_state.h"
 usbdevs.h			optional usb				   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"usbdevs.h"
 usbdevs_data.h			optional usb				   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"usbdevs_data.h"
 cam/cam.c			optional scbus
 cam/cam_compat.c		optional scbus
 cam/cam_iosched.c		optional scbus
 cam/cam_periph.c		optional scbus
 cam/cam_queue.c			optional scbus
 cam/cam_sim.c			optional scbus
 cam/cam_xpt.c			optional scbus
 cam/ata/ata_all.c		optional scbus
 cam/ata/ata_xpt.c		optional scbus
 cam/ata/ata_pmp.c		optional scbus
 cam/nvme/nvme_all.c		optional scbus nvme !nvd
 cam/nvme/nvme_da.c		optional scbus nvme da !nvd
 cam/nvme/nvme_xpt.c		optional scbus nvme !nvd
 cam/scsi/scsi_xpt.c		optional scbus
 cam/scsi/scsi_all.c		optional scbus
 cam/scsi/scsi_cd.c		optional cd
 cam/scsi/scsi_ch.c		optional ch
 cam/ata/ata_da.c		optional ada | da
 cam/ctl/ctl.c			optional ctl
 cam/ctl/ctl_backend.c		optional ctl
 cam/ctl/ctl_backend_block.c	optional ctl
 cam/ctl/ctl_backend_ramdisk.c	optional ctl
 cam/ctl/ctl_cmd_table.c		optional ctl
 cam/ctl/ctl_frontend.c		optional ctl
 cam/ctl/ctl_frontend_cam_sim.c	optional ctl
 cam/ctl/ctl_frontend_ioctl.c	optional ctl
 cam/ctl/ctl_frontend_iscsi.c	optional ctl cfiscsi
 cam/ctl/ctl_ha.c		optional ctl
 cam/ctl/ctl_scsi_all.c		optional ctl
 cam/ctl/ctl_tpc.c		optional ctl
 cam/ctl/ctl_tpc_local.c		optional ctl
 cam/ctl/ctl_error.c		optional ctl
 cam/ctl/ctl_util.c		optional ctl
 cam/ctl/scsi_ctl.c		optional ctl
 cam/scsi/scsi_da.c		optional da
 cam/scsi/scsi_low.c		optional ncv | nsp | stg
 cam/scsi/scsi_pass.c		optional pass
 cam/scsi/scsi_pt.c		optional pt
 cam/scsi/scsi_sa.c		optional sa
 cam/scsi/scsi_enc.c		optional ses
 cam/scsi/scsi_enc_ses.c		optional ses
 cam/scsi/scsi_enc_safte.c	optional ses
 cam/scsi/scsi_sg.c		optional sg
 cam/scsi/scsi_targ_bh.c		optional targbh
 cam/scsi/scsi_target.c		optional targ
 cam/scsi/smp_all.c		optional scbus
 # shared between zfs and dtrace
 cddl/compat/opensolaris/kern/opensolaris.c		optional zfs | dtrace compile-with "${CDDL_C}"
 cddl/compat/opensolaris/kern/opensolaris_cmn_err.c	optional zfs | dtrace compile-with "${CDDL_C}"
 cddl/compat/opensolaris/kern/opensolaris_kmem.c		optional zfs | dtrace compile-with "${CDDL_C}"
 cddl/compat/opensolaris/kern/opensolaris_misc.c		optional zfs | dtrace compile-with "${CDDL_C}"
 cddl/compat/opensolaris/kern/opensolaris_proc.c		optional zfs | dtrace compile-with "${CDDL_C}"
 cddl/compat/opensolaris/kern/opensolaris_sunddi.c	optional zfs | dtrace compile-with "${CDDL_C}"
 cddl/compat/opensolaris/kern/opensolaris_taskq.c	optional zfs | dtrace compile-with "${CDDL_C}"
 # zfs specific
 cddl/compat/opensolaris/kern/opensolaris_acl.c				optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_dtrace.c			optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_kobj.c				optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_kstat.c			optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_lookup.c			optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_policy.c			optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_string.c			optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_sysevent.c			optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_uio.c				optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_vfs.c				optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_vm.c				optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_zone.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/acl/acl_common.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/avl/avl.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/nvpair/opensolaris_fnvpair.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair_alloc_fixed.c	optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/unicode/u8_textprep.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/zfs/zfeature_common.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/zfs/zfs_comutil.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/zfs/zfs_deleg.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/zfs/zfs_prop.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/zfs/zpool_prop.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/zfs/zprop_common.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/vnode.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/bqueue.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c			optional zfs compile-with "${ZFS_C}" \
 	warning "kernel contains CDDL licensed ZFS filesystem"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/multilist.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/skein_zfs.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/space_reftree.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zle.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/os/callb.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/os/fm.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/os/list.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/adler32.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/deflate.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/inffast.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/inflate.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/inftrees.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/trees.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/zmod.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/zutil.c			optional zfs compile-with "${ZFS_C}"
 # dtrace specific
 cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c	optional dtrace compile-with "${DTRACE_C}" \
 							warning "kernel contains CDDL licensed DTRACE"
 cddl/contrib/opensolaris/uts/common/dtrace/dtrace_xoroshiro128_plus.c	optional dtrace compile-with "${DTRACE_C}"
 cddl/dev/dtmalloc/dtmalloc.c		optional dtmalloc        | dtraceall compile-with "${CDDL_C}"
 cddl/dev/profile/profile.c		optional dtrace_profile  | dtraceall compile-with "${CDDL_C}"
 cddl/dev/sdt/sdt.c			optional dtrace_sdt      | dtraceall compile-with "${CDDL_C}"
 cddl/dev/fbt/fbt.c			optional dtrace_fbt      | dtraceall compile-with "${FBT_C}"
 cddl/dev/systrace/systrace.c		optional dtrace_systrace | dtraceall compile-with "${CDDL_C}"
 cddl/dev/prototype.c			optional dtrace_prototype | dtraceall compile-with "${CDDL_C}"
 fs/nfsclient/nfs_clkdtrace.c		optional dtnfscl nfscl   | dtraceall nfscl compile-with "${CDDL_C}"
 compat/cloudabi/cloudabi_clock.c	optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_errno.c	optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_fd.c		optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_file.c		optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_futex.c	optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_mem.c		optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_proc.c		optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_random.c	optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_sock.c		optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_thread.c	optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi/cloudabi_vdso.c		optional compat_cloudabi32 | compat_cloudabi64
 compat/cloudabi32/cloudabi32_fd.c	optional compat_cloudabi32
 compat/cloudabi32/cloudabi32_module.c	optional compat_cloudabi32
 compat/cloudabi32/cloudabi32_poll.c	optional compat_cloudabi32
 compat/cloudabi32/cloudabi32_sock.c	optional compat_cloudabi32
 compat/cloudabi32/cloudabi32_syscalls.c	optional compat_cloudabi32
 compat/cloudabi32/cloudabi32_sysent.c	optional compat_cloudabi32
 compat/cloudabi32/cloudabi32_thread.c	optional compat_cloudabi32
 compat/cloudabi64/cloudabi64_fd.c	optional compat_cloudabi64
 compat/cloudabi64/cloudabi64_module.c	optional compat_cloudabi64
 compat/cloudabi64/cloudabi64_poll.c	optional compat_cloudabi64
 compat/cloudabi64/cloudabi64_sock.c	optional compat_cloudabi64
 compat/cloudabi64/cloudabi64_syscalls.c	optional compat_cloudabi64
 compat/cloudabi64/cloudabi64_sysent.c	optional compat_cloudabi64
 compat/cloudabi64/cloudabi64_thread.c	optional compat_cloudabi64
 compat/freebsd32/freebsd32_capability.c	optional compat_freebsd32
 compat/freebsd32/freebsd32_ioctl.c	optional compat_freebsd32
 compat/freebsd32/freebsd32_misc.c	optional compat_freebsd32
 compat/freebsd32/freebsd32_syscalls.c	optional compat_freebsd32
 compat/freebsd32/freebsd32_sysent.c	optional compat_freebsd32
 contrib/ck/src/ck_array.c				standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_centralized.c			standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_combining.c			standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_dissemination.c		standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_mcs.c				standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_tournament.c			standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_epoch.c				standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_hp.c					standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_hs.c					standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_ht.c					standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_rhs.c					standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/dev/acpica/common/ahids.c			optional acpi acpi_debug
 contrib/dev/acpica/common/ahuuids.c			optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbcmds.c		optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbconvert.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbdisply.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbexec.c		optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbhistry.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbinput.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbmethod.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbnames.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbobject.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbstats.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbtest.c		optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbutils.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbxface.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmbuffer.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmcstyle.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmdeferred.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmnames.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmopcode.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmresrc.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmresrcl.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmresrcl2.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmresrcs.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmutils.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmwalk.c	optional acpi acpi_debug
 contrib/dev/acpica/components/dispatcher/dsargs.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dscontrol.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsdebug.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsfield.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsinit.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsmethod.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsmthdat.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsobject.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsopcode.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsutils.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswexec.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswload.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswload2.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswscope.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswstate.c	optional acpi
 contrib/dev/acpica/components/events/evevent.c		optional acpi
 contrib/dev/acpica/components/events/evglock.c		optional acpi
 contrib/dev/acpica/components/events/evgpe.c		optional acpi
 contrib/dev/acpica/components/events/evgpeblk.c		optional acpi
 contrib/dev/acpica/components/events/evgpeinit.c	optional acpi
 contrib/dev/acpica/components/events/evgpeutil.c	optional acpi
 contrib/dev/acpica/components/events/evhandler.c	optional acpi
 contrib/dev/acpica/components/events/evmisc.c		optional acpi
 contrib/dev/acpica/components/events/evregion.c		optional acpi
 contrib/dev/acpica/components/events/evrgnini.c		optional acpi
 contrib/dev/acpica/components/events/evsci.c		optional acpi
 contrib/dev/acpica/components/events/evxface.c		optional acpi
 contrib/dev/acpica/components/events/evxfevnt.c		optional acpi
 contrib/dev/acpica/components/events/evxfgpe.c		optional acpi
 contrib/dev/acpica/components/events/evxfregn.c		optional acpi
 contrib/dev/acpica/components/executer/exconcat.c	optional acpi
 contrib/dev/acpica/components/executer/exconfig.c	optional acpi
 contrib/dev/acpica/components/executer/exconvrt.c	optional acpi
 contrib/dev/acpica/components/executer/excreate.c	optional acpi
 contrib/dev/acpica/components/executer/exdebug.c	optional acpi
 contrib/dev/acpica/components/executer/exdump.c		optional acpi
 contrib/dev/acpica/components/executer/exfield.c	optional acpi
 contrib/dev/acpica/components/executer/exfldio.c	optional acpi
 contrib/dev/acpica/components/executer/exmisc.c		optional acpi
 contrib/dev/acpica/components/executer/exmutex.c	optional acpi
 contrib/dev/acpica/components/executer/exnames.c	optional acpi
 contrib/dev/acpica/components/executer/exoparg1.c	optional acpi
 contrib/dev/acpica/components/executer/exoparg2.c	optional acpi
 contrib/dev/acpica/components/executer/exoparg3.c	optional acpi
 contrib/dev/acpica/components/executer/exoparg6.c	optional acpi
 contrib/dev/acpica/components/executer/exprep.c		optional acpi
 contrib/dev/acpica/components/executer/exregion.c	optional acpi
 contrib/dev/acpica/components/executer/exresnte.c	optional acpi
 contrib/dev/acpica/components/executer/exresolv.c	optional acpi
 contrib/dev/acpica/components/executer/exresop.c	optional acpi
 contrib/dev/acpica/components/executer/exstore.c	optional acpi
 contrib/dev/acpica/components/executer/exstoren.c	optional acpi
 contrib/dev/acpica/components/executer/exstorob.c	optional acpi
 contrib/dev/acpica/components/executer/exsystem.c	optional acpi
 contrib/dev/acpica/components/executer/extrace.c	optional acpi
 contrib/dev/acpica/components/executer/exutils.c	optional acpi
 contrib/dev/acpica/components/hardware/hwacpi.c		optional acpi
 contrib/dev/acpica/components/hardware/hwesleep.c	optional acpi
 contrib/dev/acpica/components/hardware/hwgpe.c		optional acpi
 contrib/dev/acpica/components/hardware/hwpci.c		optional acpi
 contrib/dev/acpica/components/hardware/hwregs.c		optional acpi
 contrib/dev/acpica/components/hardware/hwsleep.c	optional acpi
 contrib/dev/acpica/components/hardware/hwtimer.c	optional acpi
 contrib/dev/acpica/components/hardware/hwvalid.c	optional acpi
 contrib/dev/acpica/components/hardware/hwxface.c	optional acpi
 contrib/dev/acpica/components/hardware/hwxfsleep.c	optional acpi
 contrib/dev/acpica/components/namespace/nsaccess.c	optional acpi
 contrib/dev/acpica/components/namespace/nsalloc.c	optional acpi
 contrib/dev/acpica/components/namespace/nsarguments.c	optional acpi
 contrib/dev/acpica/components/namespace/nsconvert.c	optional acpi
 contrib/dev/acpica/components/namespace/nsdump.c	optional acpi
 contrib/dev/acpica/components/namespace/nseval.c	optional acpi
 contrib/dev/acpica/components/namespace/nsinit.c	optional acpi
 contrib/dev/acpica/components/namespace/nsload.c	optional acpi
 contrib/dev/acpica/components/namespace/nsnames.c	optional acpi
 contrib/dev/acpica/components/namespace/nsobject.c	optional acpi
 contrib/dev/acpica/components/namespace/nsparse.c	optional acpi
 contrib/dev/acpica/components/namespace/nspredef.c	optional acpi
 contrib/dev/acpica/components/namespace/nsprepkg.c	optional acpi
 contrib/dev/acpica/components/namespace/nsrepair.c	optional acpi
 contrib/dev/acpica/components/namespace/nsrepair2.c	optional acpi
 contrib/dev/acpica/components/namespace/nssearch.c	optional acpi
 contrib/dev/acpica/components/namespace/nsutils.c	optional acpi
 contrib/dev/acpica/components/namespace/nswalk.c	optional acpi
 contrib/dev/acpica/components/namespace/nsxfeval.c	optional acpi
 contrib/dev/acpica/components/namespace/nsxfname.c	optional acpi
 contrib/dev/acpica/components/namespace/nsxfobj.c	optional acpi
 contrib/dev/acpica/components/parser/psargs.c		optional acpi
 contrib/dev/acpica/components/parser/psloop.c		optional acpi
 contrib/dev/acpica/components/parser/psobject.c		optional acpi
 contrib/dev/acpica/components/parser/psopcode.c		optional acpi
 contrib/dev/acpica/components/parser/psopinfo.c		optional acpi
 contrib/dev/acpica/components/parser/psparse.c		optional acpi
 contrib/dev/acpica/components/parser/psscope.c		optional acpi
 contrib/dev/acpica/components/parser/pstree.c		optional acpi
 contrib/dev/acpica/components/parser/psutils.c		optional acpi
 contrib/dev/acpica/components/parser/pswalk.c		optional acpi
 contrib/dev/acpica/components/parser/psxface.c		optional acpi
 contrib/dev/acpica/components/resources/rsaddr.c	optional acpi
 contrib/dev/acpica/components/resources/rscalc.c	optional acpi
 contrib/dev/acpica/components/resources/rscreate.c	optional acpi
 contrib/dev/acpica/components/resources/rsdump.c	optional acpi acpi_debug
 contrib/dev/acpica/components/resources/rsdumpinfo.c	optional acpi
 contrib/dev/acpica/components/resources/rsinfo.c	optional acpi
 contrib/dev/acpica/components/resources/rsio.c		optional acpi
 contrib/dev/acpica/components/resources/rsirq.c		optional acpi
 contrib/dev/acpica/components/resources/rslist.c	optional acpi
 contrib/dev/acpica/components/resources/rsmemory.c	optional acpi
 contrib/dev/acpica/components/resources/rsmisc.c	optional acpi
 contrib/dev/acpica/components/resources/rsserial.c	optional acpi
 contrib/dev/acpica/components/resources/rsutils.c	optional acpi
 contrib/dev/acpica/components/resources/rsxface.c	optional acpi
 contrib/dev/acpica/components/tables/tbdata.c		optional acpi
 contrib/dev/acpica/components/tables/tbfadt.c		optional acpi
 contrib/dev/acpica/components/tables/tbfind.c		optional acpi
 contrib/dev/acpica/components/tables/tbinstal.c		optional acpi
 contrib/dev/acpica/components/tables/tbprint.c		optional acpi
 contrib/dev/acpica/components/tables/tbutils.c		optional acpi
 contrib/dev/acpica/components/tables/tbxface.c		optional acpi
 contrib/dev/acpica/components/tables/tbxfload.c		optional acpi
 contrib/dev/acpica/components/tables/tbxfroot.c		optional acpi
 contrib/dev/acpica/components/utilities/utaddress.c	optional acpi
 contrib/dev/acpica/components/utilities/utalloc.c	optional acpi
 contrib/dev/acpica/components/utilities/utascii.c	optional acpi
 contrib/dev/acpica/components/utilities/utbuffer.c	optional acpi
 contrib/dev/acpica/components/utilities/utcache.c	optional acpi
 contrib/dev/acpica/components/utilities/utcopy.c	optional acpi
 contrib/dev/acpica/components/utilities/utdebug.c	optional acpi
 contrib/dev/acpica/components/utilities/utdecode.c	optional acpi
 contrib/dev/acpica/components/utilities/utdelete.c	optional acpi
 contrib/dev/acpica/components/utilities/uterror.c	optional acpi
 contrib/dev/acpica/components/utilities/uteval.c	optional acpi
 contrib/dev/acpica/components/utilities/utexcep.c	optional acpi
 contrib/dev/acpica/components/utilities/utglobal.c	optional acpi
 contrib/dev/acpica/components/utilities/uthex.c		optional acpi
 contrib/dev/acpica/components/utilities/utids.c		optional acpi
 contrib/dev/acpica/components/utilities/utinit.c	optional acpi
 contrib/dev/acpica/components/utilities/utlock.c	optional acpi
 contrib/dev/acpica/components/utilities/utmath.c	optional acpi
 contrib/dev/acpica/components/utilities/utmisc.c	optional acpi
 contrib/dev/acpica/components/utilities/utmutex.c	optional acpi
 contrib/dev/acpica/components/utilities/utnonansi.c	optional acpi
 contrib/dev/acpica/components/utilities/utobject.c	optional acpi
 contrib/dev/acpica/components/utilities/utosi.c		optional acpi
 contrib/dev/acpica/components/utilities/utownerid.c	optional acpi
 contrib/dev/acpica/components/utilities/utpredef.c	optional acpi
 contrib/dev/acpica/components/utilities/utresrc.c	optional acpi
 contrib/dev/acpica/components/utilities/utstate.c	optional acpi
 contrib/dev/acpica/components/utilities/utstring.c	optional acpi
 contrib/dev/acpica/components/utilities/utstrtoul64.c	optional acpi
 contrib/dev/acpica/components/utilities/utuuid.c	optional acpi acpi_debug
 contrib/dev/acpica/components/utilities/utxface.c	optional acpi
 contrib/dev/acpica/components/utilities/utxferror.c	optional acpi
 contrib/dev/acpica/components/utilities/utxfinit.c	optional acpi
 contrib/dev/acpica/os_specific/service_layers/osgendbg.c	optional acpi acpi_debug
 contrib/ipfilter/netinet/fil.c	optional ipfilter inet \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_log.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_state.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -Wno-error -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_nat6.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_rules.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_scan.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_dstlist.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/radix_ipf.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/libfdt/fdt.c		optional fdt
 contrib/libfdt/fdt_ro.c		optional fdt
 contrib/libfdt/fdt_rw.c		optional fdt
 contrib/libfdt/fdt_strerror.c	optional fdt
 contrib/libfdt/fdt_sw.c		optional fdt
 contrib/libfdt/fdt_wip.c	optional fdt
 contrib/libnv/cnvlist.c		standard
 contrib/libnv/dnvlist.c		standard
 contrib/libnv/nvlist.c		standard
 contrib/libnv/nvpair.c		standard
 contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/saal/saal_sscfu.c	optional ngatm_sscfu \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/saal/saal_sscop.c	optional ngatm_sscop \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 crypto/blowfish/bf_ecb.c	optional ipsec | ipsec_support
 crypto/blowfish/bf_skey.c	optional crypto | ipsec | ipsec_support
 crypto/camellia/camellia.c	optional crypto | ipsec | ipsec_support
 crypto/camellia/camellia-api.c	optional crypto | ipsec | ipsec_support
 crypto/chacha20/chacha20.c	optional chacha20
 crypto/des/des_ecb.c		optional crypto | ipsec | ipsec_support | netsmb
 crypto/des/des_setkey.c		optional crypto | ipsec | ipsec_support | netsmb
 crypto/rc4/rc4.c		optional netgraph_mppc_encryption | kgssapi
 crypto/rijndael/rijndael-alg-fst.c optional crypto | ekcd | geom_bde | \
 	ipsec | ipsec_support | random !random_loadable | wlan_ccmp
 crypto/rijndael/rijndael-api-fst.c optional ekcd | geom_bde | random !random_loadable
 crypto/rijndael/rijndael-api.c	optional crypto | ipsec | ipsec_support | \
 	wlan_ccmp
 crypto/sha1.c			optional carp | crypto | ipsec | \
 	ipsec_support | netgraph_mppc_encryption | sctp 
 crypto/sha2/sha256c.c		optional crypto | ekcd | geom_bde | ipsec | \
 	ipsec_support | random !random_loadable | sctp | zfs
 crypto/sha2/sha512c.c		optional crypto | geom_bde | ipsec | \
 	ipsec_support | zfs
 crypto/skein/skein.c		optional crypto | zfs
 crypto/skein/skein_block.c	optional crypto | zfs
 crypto/siphash/siphash.c	optional inet | inet6
 crypto/siphash/siphash_test.c	optional inet | inet6
 ddb/db_access.c			optional ddb
 ddb/db_break.c			optional ddb
 ddb/db_capture.c		optional ddb
 ddb/db_command.c		optional ddb
 ddb/db_examine.c		optional ddb
 ddb/db_expr.c			optional ddb
 ddb/db_input.c			optional ddb
 ddb/db_lex.c			optional ddb
 ddb/db_main.c			optional ddb
 ddb/db_output.c			optional ddb
 ddb/db_print.c			optional ddb
 ddb/db_ps.c			optional ddb
 ddb/db_run.c			optional ddb
 ddb/db_script.c			optional ddb
 ddb/db_sym.c			optional ddb
 ddb/db_thread.c			optional ddb
 ddb/db_textdump.c		optional ddb
 ddb/db_variables.c		optional ddb
 ddb/db_watch.c			optional ddb
 ddb/db_write_cmd.c		optional ddb
 dev/aac/aac.c			optional aac
 dev/aac/aac_cam.c		optional aacp aac
 dev/aac/aac_debug.c		optional aac
 dev/aac/aac_disk.c		optional aac
 dev/aac/aac_linux.c		optional aac compat_linux
 dev/aac/aac_pci.c		optional aac pci
 dev/aacraid/aacraid.c		optional aacraid
 dev/aacraid/aacraid_cam.c	optional aacraid scbus
 dev/aacraid/aacraid_debug.c	optional aacraid
 dev/aacraid/aacraid_linux.c	optional aacraid compat_linux
 dev/aacraid/aacraid_pci.c	optional aacraid pci
 dev/acpi_support/acpi_wmi.c	optional acpi_wmi acpi
 dev/acpi_support/acpi_asus.c	optional acpi_asus acpi
 dev/acpi_support/acpi_asus_wmi.c	optional acpi_asus_wmi acpi
 dev/acpi_support/acpi_fujitsu.c	optional acpi_fujitsu acpi
 dev/acpi_support/acpi_hp.c	optional acpi_hp acpi
 dev/acpi_support/acpi_ibm.c	optional acpi_ibm acpi
 dev/acpi_support/acpi_panasonic.c optional acpi_panasonic acpi
 dev/acpi_support/acpi_sony.c	optional acpi_sony acpi
 dev/acpi_support/acpi_toshiba.c	optional acpi_toshiba acpi
 dev/acpi_support/atk0110.c	optional aibs acpi
 dev/acpica/Osd/OsdDebug.c	optional acpi
 dev/acpica/Osd/OsdHardware.c	optional acpi
 dev/acpica/Osd/OsdInterrupt.c	optional acpi
 dev/acpica/Osd/OsdMemory.c	optional acpi
 dev/acpica/Osd/OsdSchedule.c	optional acpi
 dev/acpica/Osd/OsdStream.c	optional acpi
 dev/acpica/Osd/OsdSynch.c	optional acpi
 dev/acpica/Osd/OsdTable.c	optional acpi
 dev/acpica/acpi.c		optional acpi
 dev/acpica/acpi_acad.c		optional acpi
 dev/acpica/acpi_battery.c	optional acpi
 dev/acpica/acpi_button.c	optional acpi
 dev/acpica/acpi_cmbat.c		optional acpi
 dev/acpica/acpi_cpu.c		optional acpi
 dev/acpica/acpi_ec.c		optional acpi
 dev/acpica/acpi_isab.c		optional acpi isa
 dev/acpica/acpi_lid.c		optional acpi
 dev/acpica/acpi_package.c	optional acpi
 dev/acpica/acpi_perf.c		optional acpi
 dev/acpica/acpi_powerres.c	optional acpi
 dev/acpica/acpi_quirk.c		optional acpi
 dev/acpica/acpi_resource.c	optional acpi
 dev/acpica/acpi_container.c	optional acpi
 dev/acpica/acpi_smbat.c		optional acpi
 dev/acpica/acpi_thermal.c	optional acpi
 dev/acpica/acpi_throttle.c	optional acpi
 dev/acpica/acpi_video.c		optional acpi_video acpi
 dev/acpica/acpi_dock.c		optional acpi_dock acpi
 dev/adlink/adlink.c		optional adlink
 dev/advansys/adv_pci.c		optional adv pci
 dev/advansys/advansys.c		optional adv
 dev/advansys/advlib.c		optional adv
 dev/advansys/advmcode.c		optional adv
 dev/advansys/adw_pci.c		optional adw pci
 dev/advansys/adwcam.c		optional adw
 dev/advansys/adwlib.c		optional adw
 dev/advansys/adwmcode.c		optional adw
 dev/ae/if_ae.c			optional ae pci
 dev/age/if_age.c		optional age pci
 dev/agp/agp.c			optional agp pci
 dev/agp/agp_if.m		optional agp pci
 dev/aha/aha.c			optional aha
 dev/aha/aha_isa.c		optional aha isa
 dev/ahci/ahci.c			optional ahci
 dev/ahci/ahciem.c		optional ahci
 dev/ahci/ahci_pci.c		optional ahci pci
 dev/aic/aic.c			optional aic
 dev/aic/aic_pccard.c		optional aic pccard
 dev/aic7xxx/ahc_isa.c		optional ahc isa
 dev/aic7xxx/ahc_pci.c		optional ahc pci \
 	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
 dev/aic7xxx/ahd_pci.c		optional ahd pci \
 	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
 dev/aic7xxx/aic7770.c		optional ahc
 dev/aic7xxx/aic79xx.c		optional ahd pci
 dev/aic7xxx/aic79xx_osm.c	optional ahd pci
 dev/aic7xxx/aic79xx_pci.c	optional ahd pci
 dev/aic7xxx/aic79xx_reg_print.c	optional ahd pci ahd_reg_pretty_print
 dev/aic7xxx/aic7xxx.c		optional ahc
 dev/aic7xxx/aic7xxx_93cx6.c	optional ahc
 dev/aic7xxx/aic7xxx_osm.c	optional ahc
 dev/aic7xxx/aic7xxx_pci.c	optional ahc pci
 dev/aic7xxx/aic7xxx_reg_print.c	optional ahc ahc_reg_pretty_print
 dev/al_eth/al_eth.c				optional al_eth	fdt	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 dev/al_eth/al_init_eth_lm.c			optional al_eth	fdt	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 dev/al_eth/al_init_eth_kr.c			optional al_eth	fdt	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/al_hal_iofic.c		optional al_iofic	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/al_hal_serdes_25g.c		optional al_serdes	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/al_hal_serdes_hssp.c		optional al_serdes	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/al_hal_udma_config.c		optional al_udma	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/al_hal_udma_debug.c		optional al_udma	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/al_hal_udma_iofic.c		optional al_udma	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/al_hal_udma_main.c		optional al_udma	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/al_serdes.c			optional al_serdes	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/eth/al_hal_eth_kr.c		optional al_eth		\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 contrib/alpine-hal/eth/al_hal_eth_main.c	optional al_eth		\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 dev/alc/if_alc.c		optional alc pci
 dev/ale/if_ale.c		optional ale pci
 dev/alpm/alpm.c			optional alpm pci
 dev/altera/avgen/altera_avgen.c		optional altera_avgen
 dev/altera/avgen/altera_avgen_fdt.c	optional altera_avgen fdt
 dev/altera/avgen/altera_avgen_nexus.c	optional altera_avgen
 dev/altera/sdcard/altera_sdcard.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_disk.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_io.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_fdt.c	optional altera_sdcard fdt
 dev/altera/sdcard/altera_sdcard_nexus.c	optional altera_sdcard
 dev/altera/pio/pio.c		optional altera_pio
 dev/altera/pio/pio_if.m		optional altera_pio
 dev/amdpm/amdpm.c		optional amdpm pci | nfpm pci
 dev/amdsmb/amdsmb.c		optional amdsmb pci
 dev/amr/amr.c			optional amr
 dev/amr/amr_cam.c		optional amrp amr
 dev/amr/amr_disk.c		optional amr
 dev/amr/amr_linux.c		optional amr compat_linux
 dev/amr/amr_pci.c		optional amr pci
 dev/an/if_an.c			optional an
 dev/an/if_an_isa.c		optional an isa
 dev/an/if_an_pccard.c		optional an pccard
 dev/an/if_an_pci.c		optional an pci
 #
 dev/ata/ata_if.m		optional ata | atacore
 dev/ata/ata-all.c		optional ata | atacore
 dev/ata/ata-dma.c		optional ata | atacore
 dev/ata/ata-lowlevel.c		optional ata | atacore
 dev/ata/ata-sata.c		optional ata | atacore
 dev/ata/ata-card.c		optional ata pccard | atapccard
 dev/ata/ata-isa.c		optional ata isa | ataisa
 dev/ata/ata-pci.c		optional ata pci | atapci
 dev/ata/chipsets/ata-acard.c	optional ata pci | ataacard
 dev/ata/chipsets/ata-acerlabs.c	optional ata pci | ataacerlabs
 dev/ata/chipsets/ata-amd.c	optional ata pci | ataamd
 dev/ata/chipsets/ata-ati.c	optional ata pci | ataati
 dev/ata/chipsets/ata-cenatek.c	optional ata pci | atacenatek
 dev/ata/chipsets/ata-cypress.c	optional ata pci | atacypress
 dev/ata/chipsets/ata-cyrix.c	optional ata pci | atacyrix
 dev/ata/chipsets/ata-highpoint.c	optional ata pci | atahighpoint
 dev/ata/chipsets/ata-intel.c	optional ata pci | ataintel
 dev/ata/chipsets/ata-ite.c	optional ata pci | ataite
 dev/ata/chipsets/ata-jmicron.c	optional ata pci | atajmicron
 dev/ata/chipsets/ata-marvell.c	optional ata pci | atamarvell
 dev/ata/chipsets/ata-micron.c	optional ata pci | atamicron
 dev/ata/chipsets/ata-national.c	optional ata pci | atanational
 dev/ata/chipsets/ata-netcell.c	optional ata pci | atanetcell
 dev/ata/chipsets/ata-nvidia.c	optional ata pci | atanvidia
 dev/ata/chipsets/ata-promise.c	optional ata pci | atapromise
 dev/ata/chipsets/ata-serverworks.c	optional ata pci | ataserverworks
 dev/ata/chipsets/ata-siliconimage.c	optional ata pci | atasiliconimage | ataati
 dev/ata/chipsets/ata-sis.c	optional ata pci | atasis
 dev/ata/chipsets/ata-via.c	optional ata pci | atavia
 #
 dev/ath/if_ath_pci.c		optional ath_pci pci \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 #
 dev/ath/if_ath_ahb.c		optional ath_ahb \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 #
 dev/ath/if_ath.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_alq.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_beacon.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_btcoex.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_btcoex_mci.c	optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_debug.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_descdma.c	optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_keycache.c	optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_ioctl.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_led.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_lna_div.c	optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_tx.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_tx_edma.c	optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_tx_ht.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_tdma.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_sysctl.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_rx.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_rx_edma.c	optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_spectral.c	optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ah_osdep.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 #
 dev/ath/ath_hal/ah.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_hal/ah_eeprom_v1.c	optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_hal/ah_eeprom_v3.c	optional ath_hal | ath_ar5211 | ath_ar5212 \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_hal/ah_eeprom_v14.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_hal/ah_eeprom_v4k.c \
 	optional ath_hal | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_hal/ah_eeprom_9287.c \
 	optional ath_hal | ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_hal/ah_regdomain.c	optional ath \
 	compile-with "${NORMAL_C} ${NO_WSHIFT_COUNT_NEGATIVE} ${NO_WSHIFT_COUNT_OVERFLOW} -I$S/dev/ath"
 # ar5210
 dev/ath/ath_hal/ar5210/ar5210_attach.c		optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_beacon.c		optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_interrupts.c	optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_keycache.c	optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_misc.c		optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_phy.c		optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_power.c		optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_recv.c		optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_reset.c		optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_xmit.c		optional ath_hal | ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar5211
 dev/ath/ath_hal/ar5211/ar5211_attach.c		optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_beacon.c		optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_interrupts.c	optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_keycache.c	optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_misc.c		optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_phy.c		optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_power.c		optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_recv.c		optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_reset.c		optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_xmit.c		optional ath_hal | ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar5212
 dev/ath/ath_hal/ar5212/ar5212_ani.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_attach.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_beacon.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_eeprom.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_gpio.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_interrupts.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_keycache.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_misc.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_phy.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_power.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_recv.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_reset.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_rfgain.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_xmit.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar5416 (depends on ar5212)
 dev/ath/ath_hal/ar5416/ar5416_ani.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_attach.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_beacon.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_btcoex.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_cal.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_cal_iq.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_eeprom.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_gpio.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_interrupts.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_keycache.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_misc.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_phy.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_power.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_radar.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_recv.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_reset.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_spectral.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_xmit.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar9130 (depends upon ar5416) - also requires AH_SUPPORT_AR9130
 #
 # Since this is an embedded MAC SoC, there's no need to compile it into the
 # default HAL.
 dev/ath/ath_hal/ar9001/ar9130_attach.c optional ath_ar9130 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9001/ar9130_phy.c optional ath_ar9130 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9001/ar9130_eeprom.c optional ath_ar9130 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar9160 (depends on ar5416)
 dev/ath/ath_hal/ar9001/ar9160_attach.c optional ath_hal | ath_ar9160 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar9280 (depends on ar5416)
 dev/ath/ath_hal/ar9002/ar9280_attach.c optional ath_hal | ath_ar9280 | \
 	ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9280_olc.c optional ath_hal | ath_ar9280 | \
 	ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar9285 (depends on ar5416 and ar9280)
 dev/ath/ath_hal/ar9002/ar9285_attach.c optional ath_hal | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_btcoex.c optional ath_hal | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_reset.c optional ath_hal | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_cal.c optional ath_hal | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_phy.c optional ath_hal | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_diversity.c optional ath_hal | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar9287 (depends on ar5416)
 dev/ath/ath_hal/ar9002/ar9287_attach.c optional ath_hal | ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9287_reset.c optional ath_hal | ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9287_cal.c optional ath_hal | ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9287_olc.c optional ath_hal | ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 
 # ar9300
 contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal ${NO_WCONSTANT_CONVERSION}"
 contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_mci.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_paprd.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_phy.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_power.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_radar.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal ${NO_WSOMETIMES_UNINITIALIZED} -Wno-unused-function"
 contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_spectral.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_timer.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.c optional ath_hal | ath_ar9300 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 
 # rf backends
 dev/ath/ath_hal/ar5212/ar2316.c	optional ath_rf2316 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar2317.c	optional ath_rf2317 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar2413.c	optional ath_hal | ath_rf2413 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar2425.c	optional ath_hal | ath_rf2425 | ath_rf2417 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5111.c	optional ath_hal | ath_rf5111 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5112.c	optional ath_hal | ath_rf5112 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5413.c	optional ath_hal | ath_rf5413 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar2133.c optional ath_hal | ath_ar5416 | \
 	ath_ar9130 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9280.c optional ath_hal | ath_ar9280 | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285.c optional ath_hal | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9287.c optional ath_hal | ath_ar9287 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 
 # ath rate control algorithms
 dev/ath/ath_rate/amrr/amrr.c	optional ath_rate_amrr \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_rate/onoe/onoe.c	optional ath_rate_onoe \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_rate/sample/sample.c	optional ath_rate_sample \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 # ath DFS modules
 dev/ath/ath_dfs/null/dfs_null.c	optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 #
 dev/bce/if_bce.c			optional bce
 dev/bfe/if_bfe.c			optional bfe
 dev/bge/if_bge.c			optional bge
 dev/bhnd/bhnd.c				optional bhnd
 dev/bhnd/bhnd_erom.c			optional bhnd
 dev/bhnd/bhnd_erom_if.m			optional bhnd
 dev/bhnd/bhnd_subr.c			optional bhnd
 dev/bhnd/bhnd_bus_if.m			optional bhnd
 dev/bhnd/bhndb/bhnd_bhndb.c		optional bhndb bhnd
 dev/bhnd/bhndb/bhndb.c			optional bhndb bhnd
 dev/bhnd/bhndb/bhndb_bus_if.m		optional bhndb bhnd
 dev/bhnd/bhndb/bhndb_hwdata.c		optional bhndb bhnd
 dev/bhnd/bhndb/bhndb_if.m		optional bhndb bhnd
 dev/bhnd/bhndb/bhndb_pci.c		optional bhndb bhnd pci
 dev/bhnd/bhndb/bhndb_pci_hwdata.c 	optional bhndb bhnd pci
 dev/bhnd/bhndb/bhndb_pci_sprom.c	optional bhndb bhnd pci
 dev/bhnd/bhndb/bhndb_subr.c		optional bhndb bhnd
 dev/bhnd/bcma/bcma.c			optional bcma bhnd
 dev/bhnd/bcma/bcma_bhndb.c		optional bcma bhnd bhndb
 dev/bhnd/bcma/bcma_erom.c		optional bcma bhnd
 dev/bhnd/bcma/bcma_subr.c		optional bcma bhnd
 dev/bhnd/cores/chipc/bhnd_chipc_if.m	optional bhnd
 dev/bhnd/cores/chipc/bhnd_sprom_chipc.c	optional bhnd
 dev/bhnd/cores/chipc/bhnd_pmu_chipc.c	optional bhnd
 dev/bhnd/cores/chipc/chipc.c		optional bhnd
 dev/bhnd/cores/chipc/chipc_cfi.c	optional bhnd cfi 
 dev/bhnd/cores/chipc/chipc_slicer.c	optional bhnd cfi | bhnd spibus
 dev/bhnd/cores/chipc/chipc_spi.c	optional bhnd spibus
 dev/bhnd/cores/chipc/chipc_subr.c	optional bhnd
 dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c	optional bhnd
 dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_subr.c	optional bhnd
 dev/bhnd/cores/pci/bhnd_pci.c		optional bhnd pci
 dev/bhnd/cores/pci/bhnd_pci_hostb.c	optional bhndb bhnd pci
 dev/bhnd/cores/pci/bhnd_pcib.c		optional bhnd_pcib bhnd pci
 dev/bhnd/cores/pcie2/bhnd_pcie2.c	optional bhnd pci
 dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c	optional bhndb bhnd pci
 dev/bhnd/cores/pcie2/bhnd_pcie2b.c	optional bhnd_pcie2b bhnd pci
 dev/bhnd/cores/pmu/bhnd_pmu.c		optional bhnd
 dev/bhnd/cores/pmu/bhnd_pmu_core.c	optional bhnd
 dev/bhnd/cores/pmu/bhnd_pmu_if.m	optional bhnd
 dev/bhnd/cores/pmu/bhnd_pmu_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_bcm.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_btxt.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_sprom.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_sprom_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_tlv.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_if.m		optional bhnd
 dev/bhnd/nvram/bhnd_nvram_io.c		optional bhnd
 dev/bhnd/nvram/bhnd_nvram_iobuf.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_ioptr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_iores.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_plist.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_store.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_store_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_value.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_value_fmts.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_value_prf.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_value_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_sprom.c		optional bhnd
 dev/bhnd/siba/siba.c			optional siba bhnd
 dev/bhnd/siba/siba_bhndb.c		optional siba bhnd bhndb
 dev/bhnd/siba/siba_erom.c		optional siba bhnd
 dev/bhnd/siba/siba_subr.c		optional siba bhnd
 #
 dev/bktr/bktr_audio.c		optional bktr pci
 dev/bktr/bktr_card.c		optional bktr pci
 dev/bktr/bktr_core.c		optional bktr pci
 dev/bktr/bktr_i2c.c		optional bktr pci smbus
 dev/bktr/bktr_os.c		optional bktr pci
 dev/bktr/bktr_tuner.c		optional bktr pci
 dev/bktr/msp34xx.c		optional bktr pci
 dev/bnxt/bnxt_hwrm.c		optional bnxt iflib pci
 dev/bnxt/bnxt_sysctl.c		optional bnxt iflib pci
 dev/bnxt/bnxt_txrx.c		optional bnxt iflib pci
 dev/bnxt/if_bnxt.c		optional bnxt iflib pci
 dev/buslogic/bt.c		optional bt
 dev/buslogic/bt_isa.c		optional bt isa
 dev/buslogic/bt_pci.c		optional bt pci
 dev/bwi/bwimac.c		optional bwi
 dev/bwi/bwiphy.c		optional bwi
 dev/bwi/bwirf.c			optional bwi
 dev/bwi/if_bwi.c		optional bwi
 dev/bwi/if_bwi_pci.c		optional bwi pci
 # XXX Work around clang warnings, until maintainer approves fix.
 dev/bwn/if_bwn.c		optional bwn siba_bwn \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/bwn/if_bwn_pci.c		optional bwn pci bhnd
 dev/bwn/if_bwn_phy_common.c	optional bwn siba_bwn
 dev/bwn/if_bwn_phy_g.c		optional bwn siba_bwn \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED} ${NO_WCONSTANT_CONVERSION}"
 dev/bwn/if_bwn_phy_lp.c		optional bwn siba_bwn \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/bwn/if_bwn_phy_n.c		optional bwn siba_bwn
 dev/bwn/if_bwn_util.c		optional bwn siba_bwn
 dev/bwn/bwn_mac.c		optional bwn bhnd
 dev/cardbus/cardbus.c		optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
 dev/cardbus/cardbus_device.c	optional cardbus
 dev/cas/if_cas.c		optional cas
 dev/cfi/cfi_bus_fdt.c		optional cfi fdt
 dev/cfi/cfi_bus_nexus.c		optional cfi
 dev/cfi/cfi_core.c		optional cfi
 dev/cfi/cfi_dev.c		optional cfi
 dev/cfi/cfi_disk.c		optional cfid
 dev/chromebook_platform/chromebook_platform.c	optional chromebook_platform
 dev/ciss/ciss.c			optional ciss
 dev/cm/smc90cx6.c		optional cm
 dev/cmx/cmx.c			optional cmx
 dev/cmx/cmx_pccard.c		optional cmx pccard
 dev/cpufreq/ichss.c		optional cpufreq pci
 dev/cs/if_cs.c			optional cs
 dev/cs/if_cs_isa.c		optional cs isa
 dev/cs/if_cs_pccard.c		optional cs pccard
 dev/cxgb/cxgb_main.c		optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/cxgb_sge.c		optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_mc5.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_aq100x.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_tn1010.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/sys/uipc_mvec.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/cxgb_t3fw.c		optional cxgb cxgb_t3fw \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgbe/t4_if.m		optional cxgbe pci
 dev/cxgbe/t4_iov.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_mp_ring.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_main.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_netmap.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_sched.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_sge.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_l2t.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_tracer.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_vf.c		optional cxgbev pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/common/t4_hw.c	optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/common/t4vf_hw.c	optional cxgbev pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 t4fw_cfg.c		optional cxgbe					\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk t4fw_cfg.fw:t4fw_cfg t4fw_cfg_uwire.fw:t4fw_cfg_uwire t4fw.fw:t4fw -mt4fw_cfg -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"t4fw_cfg.c"
 t4fw_cfg.fwo		optional cxgbe					\
 	dependency	"t4fw_cfg.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t4fw_cfg.fwo"
 t4fw_cfg.fw		optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t4fw_cfg.txt"		\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t4fw_cfg.fw"
 t4fw_cfg_uwire.fwo	optional cxgbe					\
 	dependency	"t4fw_cfg_uwire.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t4fw_cfg_uwire.fwo"
 t4fw_cfg_uwire.fw	optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t4fw_cfg_uwire.txt"	\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t4fw_cfg_uwire.fw"
 t4fw.fwo		optional cxgbe					\
 	dependency	"t4fw.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t4fw.fwo"
 t4fw.fw			optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t4fw-1.16.26.0.bin.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"t4fw.fw"
 t5fw_cfg.c		optional cxgbe					\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk t5fw_cfg.fw:t5fw_cfg t5fw.fw:t5fw -mt5fw_cfg -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"t5fw_cfg.c"
 t5fw_cfg.fwo		optional cxgbe					\
 	dependency	"t5fw_cfg.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t5fw_cfg.fwo"
 t5fw_cfg.fw		optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t5fw_cfg.txt"		\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t5fw_cfg.fw"
 t5fw.fwo		optional cxgbe					\
 	dependency	"t5fw.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t5fw.fwo"
 t5fw.fw			optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t5fw-1.16.26.0.bin.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"t5fw.fw"
 t6fw_cfg.c		optional cxgbe					\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk t6fw_cfg.fw:t6fw_cfg t6fw.fw:t6fw -mt6fw_cfg -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"t6fw_cfg.c"
 t6fw_cfg.fwo		optional cxgbe					\
 	dependency	"t6fw_cfg.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t6fw_cfg.fwo"
 t6fw_cfg.fw		optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t6fw_cfg.txt"		\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t6fw_cfg.fw"
 t6fw.fwo		optional cxgbe					\
 	dependency	"t6fw.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t6fw.fwo"
 t6fw.fw			optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t6fw-1.16.26.0.bin.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"t6fw.fw"
 dev/cxgbe/crypto/t4_crypto.c	optional ccr \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cy/cy.c			optional cy
 dev/cy/cy_isa.c			optional cy isa
 dev/cy/cy_pci.c			optional cy pci
 dev/cyapa/cyapa.c		optional cyapa iicbus
 dev/dc/if_dc.c			optional dc pci
 dev/dc/dcphy.c			optional dc pci
 dev/dc/pnphy.c			optional dc pci
 dev/dcons/dcons.c		optional dcons
 dev/dcons/dcons_crom.c		optional dcons_crom
 dev/dcons/dcons_os.c		optional dcons
 dev/de/if_de.c			optional de pci
 dev/dme/if_dme.c		optional dme
 dev/dpt/dpt_pci.c		optional dpt pci
 dev/dpt/dpt_scsi.c		optional dpt
 dev/drm/ati_pcigart.c		optional drm
 dev/drm/drm_agpsupport.c	optional drm
 dev/drm/drm_auth.c		optional drm
 dev/drm/drm_bufs.c		optional drm
 dev/drm/drm_context.c		optional drm
 dev/drm/drm_dma.c		optional drm
 dev/drm/drm_drawable.c		optional drm
 dev/drm/drm_drv.c		optional drm
 dev/drm/drm_fops.c		optional drm
 dev/drm/drm_hashtab.c		optional drm
 dev/drm/drm_ioctl.c		optional drm
 dev/drm/drm_irq.c		optional drm
 dev/drm/drm_lock.c		optional drm
 dev/drm/drm_memory.c		optional drm
 dev/drm/drm_mm.c		optional drm
 dev/drm/drm_pci.c		optional drm
 dev/drm/drm_scatter.c		optional drm
 dev/drm/drm_sman.c		optional drm
 dev/drm/drm_sysctl.c		optional drm
 dev/drm/drm_vm.c		optional drm
 dev/drm/mach64_dma.c		optional mach64drm
 dev/drm/mach64_drv.c		optional mach64drm
 dev/drm/mach64_irq.c		optional mach64drm
 dev/drm/mach64_state.c		optional mach64drm
 dev/drm/mga_dma.c		optional mgadrm
 dev/drm/mga_drv.c		optional mgadrm
 dev/drm/mga_irq.c		optional mgadrm
 dev/drm/mga_state.c		optional mgadrm
 dev/drm/mga_warp.c		optional mgadrm
 dev/drm/r128_cce.c		optional r128drm \
 	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
 dev/drm/r128_drv.c		optional r128drm
 dev/drm/r128_irq.c		optional r128drm
 dev/drm/r128_state.c		optional r128drm
 dev/drm/savage_bci.c		optional savagedrm
 dev/drm/savage_drv.c		optional savagedrm
 dev/drm/savage_state.c		optional savagedrm
 dev/drm/sis_drv.c		optional sisdrm
 dev/drm/sis_ds.c		optional sisdrm
 dev/drm/sis_mm.c		optional sisdrm
 dev/drm/tdfx_drv.c		optional tdfxdrm
 dev/drm/via_dma.c		optional viadrm
 dev/drm/via_dmablit.c		optional viadrm
 dev/drm/via_drv.c		optional viadrm
 dev/drm/via_irq.c		optional viadrm
 dev/drm/via_map.c		optional viadrm
 dev/drm/via_mm.c		optional viadrm
 dev/drm/via_verifier.c		optional viadrm
 dev/drm/via_video.c		optional viadrm
 dev/drm2/drm_agpsupport.c	optional drm2
 dev/drm2/drm_auth.c		optional drm2
 dev/drm2/drm_bufs.c		optional drm2
 dev/drm2/drm_buffer.c		optional drm2
 dev/drm2/drm_context.c		optional drm2
 dev/drm2/drm_crtc.c		optional drm2
 dev/drm2/drm_crtc_helper.c	optional drm2
 dev/drm2/drm_dma.c		optional drm2
 dev/drm2/drm_dp_helper.c	optional drm2
 dev/drm2/drm_dp_iic_helper.c	optional drm2
 dev/drm2/drm_drv.c		optional drm2
 dev/drm2/drm_edid.c		optional drm2
 dev/drm2/drm_fb_helper.c	optional drm2
 dev/drm2/drm_fops.c		optional drm2
 dev/drm2/drm_gem.c		optional drm2
 dev/drm2/drm_gem_names.c	optional drm2
 dev/drm2/drm_global.c		optional drm2
 dev/drm2/drm_hashtab.c		optional drm2
 dev/drm2/drm_ioctl.c		optional drm2
 dev/drm2/drm_irq.c		optional drm2
 dev/drm2/drm_linux_list_sort.c	optional drm2
 dev/drm2/drm_lock.c		optional drm2
 dev/drm2/drm_memory.c		optional drm2
 dev/drm2/drm_mm.c		optional drm2
 dev/drm2/drm_modes.c		optional drm2
 dev/drm2/drm_pci.c		optional drm2
 dev/drm2/drm_platform.c		optional drm2
 dev/drm2/drm_scatter.c		optional drm2
 dev/drm2/drm_stub.c		optional drm2
 dev/drm2/drm_sysctl.c		optional drm2
 dev/drm2/drm_vm.c		optional drm2
 dev/drm2/drm_os_freebsd.c	optional drm2
 dev/drm2/ttm/ttm_agp_backend.c	optional drm2
 dev/drm2/ttm/ttm_lock.c		optional drm2
 dev/drm2/ttm/ttm_object.c	optional drm2
 dev/drm2/ttm/ttm_tt.c		optional drm2
 dev/drm2/ttm/ttm_bo_util.c	optional drm2
 dev/drm2/ttm/ttm_bo.c		optional drm2
 dev/drm2/ttm/ttm_bo_manager.c	optional drm2
 dev/drm2/ttm/ttm_execbuf_util.c	optional drm2
 dev/drm2/ttm/ttm_memory.c	optional drm2
 dev/drm2/ttm/ttm_page_alloc.c	optional drm2
 dev/drm2/ttm/ttm_bo_vm.c	optional drm2
 dev/drm2/ati_pcigart.c		optional drm2 agp pci
 dev/ed/if_ed.c			optional ed
 dev/ed/if_ed_novell.c		optional ed
 dev/ed/if_ed_rtl80x9.c		optional ed
 dev/ed/if_ed_pccard.c		optional ed pccard
 dev/ed/if_ed_pci.c		optional ed pci
 dev/efidev/efidev.c		optional efirt
 dev/e1000/if_em.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/em_txrx.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/igb_txrx.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_80003es2lan.c	optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82540.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82541.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82542.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82543.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82571.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82575.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_ich8lan.c	optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_i210.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_api.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_mac.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_manage.c	optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_nvm.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_phy.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_vf.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_mbx.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_osdep.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/et/if_et.c			optional et
+dev/ena/ena.c			optional ena \
+	compile-with "${NORMAL_C} -I$S/contrib"
+dev/ena/ena_sysctl.c 		optional ena \
+	compile-with "${NORMAL_C} -I$S/contrib"
+contrib/ena-com/ena_com.c	optional ena
+contrib/ena-com/ena_eth_com.c	optional ena
 dev/ep/if_ep.c			optional ep
 dev/ep/if_ep_isa.c		optional ep isa
 dev/ep/if_ep_pccard.c		optional ep pccard
 dev/esp/esp_pci.c		optional esp pci
 dev/esp/ncr53c9x.c		optional esp
 dev/etherswitch/arswitch/arswitch.c		optional arswitch
 dev/etherswitch/arswitch/arswitch_reg.c		optional arswitch
 dev/etherswitch/arswitch/arswitch_phy.c		optional arswitch
 dev/etherswitch/arswitch/arswitch_8216.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_8226.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_8316.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_8327.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_7240.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_9340.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_vlans.c	optional arswitch
 dev/etherswitch/etherswitch.c		optional etherswitch
 dev/etherswitch/etherswitch_if.m	optional etherswitch
 dev/etherswitch/ip17x/ip17x.c		optional ip17x
 dev/etherswitch/ip17x/ip175c.c		optional ip17x
 dev/etherswitch/ip17x/ip175d.c		optional ip17x
 dev/etherswitch/ip17x/ip17x_phy.c	optional ip17x
 dev/etherswitch/ip17x/ip17x_vlans.c	optional ip17x
 dev/etherswitch/miiproxy.c		optional miiproxy
 dev/etherswitch/rtl8366/rtl8366rb.c	optional rtl8366rb
 dev/etherswitch/e6000sw/e6000sw.c	optional e6000sw
 dev/etherswitch/e6000sw/e6060sw.c	optional e6060sw
 dev/etherswitch/infineon/adm6996fc.c	optional adm6996fc
 dev/etherswitch/micrel/ksz8995ma.c	optional ksz8995ma
 dev/etherswitch/ukswitch/ukswitch.c	optional ukswitch
 dev/evdev/cdev.c			optional evdev
 dev/evdev/evdev.c			optional evdev
 dev/evdev/evdev_mt.c			optional evdev
 dev/evdev/evdev_utils.c			optional evdev
 dev/evdev/uinput.c			optional evdev uinput
 dev/ex/if_ex.c			optional ex
 dev/ex/if_ex_isa.c		optional ex isa
 dev/ex/if_ex_pccard.c		optional ex pccard
 dev/exca/exca.c			optional cbb
 dev/extres/clk/clk.c		optional ext_resources clk fdt
 dev/extres/clk/clkdev_if.m	optional ext_resources clk fdt
 dev/extres/clk/clknode_if.m	optional ext_resources clk fdt
 dev/extres/clk/clk_bus.c	optional ext_resources clk fdt
 dev/extres/clk/clk_div.c	optional ext_resources clk fdt
 dev/extres/clk/clk_fixed.c	optional ext_resources clk fdt
 dev/extres/clk/clk_gate.c	optional ext_resources clk fdt
 dev/extres/clk/clk_mux.c	optional ext_resources clk fdt
 dev/extres/phy/phy.c		optional ext_resources phy fdt
 dev/extres/phy/phy_if.m		optional ext_resources phy fdt
 dev/extres/hwreset/hwreset.c	optional ext_resources hwreset fdt
 dev/extres/hwreset/hwreset_if.m	optional ext_resources hwreset fdt
 dev/extres/regulator/regdev_if.m	optional ext_resources regulator fdt
 dev/extres/regulator/regnode_if.m	optional ext_resources regulator fdt
 dev/extres/regulator/regulator.c	optional ext_resources regulator fdt
 dev/extres/regulator/regulator_bus.c	optional ext_resources regulator fdt
 dev/extres/regulator/regulator_fixed.c	optional ext_resources regulator fdt
 dev/fb/fbd.c			optional fbd | vt
 dev/fb/fb_if.m			standard
 dev/fb/splash.c			optional sc splash
 dev/fdt/fdt_clock.c		optional fdt fdt_clock
 dev/fdt/fdt_clock_if.m		optional fdt fdt_clock
 dev/fdt/fdt_common.c		optional fdt
 dev/fdt/fdt_pinctrl.c		optional fdt fdt_pinctrl
 dev/fdt/fdt_pinctrl_if.m	optional fdt fdt_pinctrl
 dev/fdt/fdt_slicer.c		optional fdt cfi | fdt nand | fdt mx25l
 dev/fdt/fdt_static_dtb.S	optional fdt fdt_dtb_static \
 	dependency	"fdt_dtb_file"
 dev/fdt/simplebus.c		optional fdt
 dev/fe/if_fe.c			optional fe
 dev/fe/if_fe_pccard.c		optional fe pccard
 dev/filemon/filemon.c		optional filemon
 dev/firewire/firewire.c		optional firewire
 dev/firewire/fwcrom.c		optional firewire
 dev/firewire/fwdev.c		optional firewire
 dev/firewire/fwdma.c		optional firewire
 dev/firewire/fwmem.c		optional firewire
 dev/firewire/fwohci.c		optional firewire
 dev/firewire/fwohci_pci.c	optional firewire pci
 dev/firewire/if_fwe.c		optional fwe
 dev/firewire/if_fwip.c		optional fwip
 dev/firewire/sbp.c		optional sbp
 dev/firewire/sbp_targ.c		optional sbp_targ
 dev/flash/at45d.c		optional at45d
 dev/flash/mx25l.c		optional mx25l
 dev/fxp/if_fxp.c		optional fxp
 dev/fxp/inphy.c			optional fxp
 dev/gem/if_gem.c		optional gem
 dev/gem/if_gem_pci.c		optional gem pci
 dev/gem/if_gem_sbus.c		optional gem sbus
 dev/gpio/gpiobacklight.c	optional gpiobacklight fdt
 dev/gpio/gpiokeys.c		optional gpiokeys fdt
 dev/gpio/gpiokeys_codes.c	optional gpiokeys fdt
 dev/gpio/gpiobus.c		optional gpio				\
 	dependency	"gpiobus_if.h"
 dev/gpio/gpioc.c		optional gpio				\
 	dependency	"gpio_if.h"
 dev/gpio/gpioiic.c		optional gpioiic
 dev/gpio/gpioled.c		optional gpioled !fdt
 dev/gpio/gpioled_fdt.c		optional gpioled fdt
 dev/gpio/gpiopower.c		optional gpiopower fdt
 dev/gpio/gpioregulator.c	optional gpioregulator fdt ext_resources
 dev/gpio/gpiospi.c		optional gpiospi
 dev/gpio/gpioths.c		optional gpioths
 dev/gpio/gpio_if.m		optional gpio
 dev/gpio/gpiobus_if.m		optional gpio
 dev/gpio/gpiopps.c		optional gpiopps
 dev/gpio/ofw_gpiobus.c		optional fdt gpio
 dev/hifn/hifn7751.c		optional hifn
 dev/hme/if_hme.c		optional hme
 dev/hme/if_hme_pci.c		optional hme pci
 dev/hme/if_hme_sbus.c		optional hme sbus
 dev/hptiop/hptiop.c		optional hptiop scbus
 dev/hwpmc/hwpmc_logging.c	optional hwpmc
 dev/hwpmc/hwpmc_mod.c		optional hwpmc
 dev/hwpmc/hwpmc_soft.c		optional hwpmc
 dev/ichiic/ig4_acpi.c		optional ig4 acpi iicbus
 dev/ichiic/ig4_iic.c		optional ig4 iicbus
 dev/ichiic/ig4_pci.c		optional ig4 pci iicbus
 dev/ichsmb/ichsmb.c		optional ichsmb
 dev/ichsmb/ichsmb_pci.c		optional ichsmb pci
 dev/ida/ida.c			optional ida
 dev/ida/ida_disk.c		optional ida
 dev/ida/ida_pci.c		optional ida pci
 dev/iicbus/ad7418.c		optional ad7418
 dev/iicbus/ds1307.c		optional ds1307
 dev/iicbus/ds133x.c		optional ds133x
 dev/iicbus/ds1374.c		optional ds1374
 dev/iicbus/ds1672.c		optional ds1672
 dev/iicbus/ds3231.c		optional ds3231
 dev/iicbus/icee.c		optional icee
 dev/iicbus/if_ic.c		optional ic
 dev/iicbus/iic.c		optional iic
 dev/iicbus/iicbb.c		optional iicbb
 dev/iicbus/iicbb_if.m		optional iicbb
 dev/iicbus/iicbus.c		optional iicbus
 dev/iicbus/iicbus_if.m		optional iicbus
 dev/iicbus/iiconf.c		optional iicbus
 dev/iicbus/iicsmb.c		optional iicsmb				\
 	dependency	"iicbus_if.h"
 dev/iicbus/iicoc.c		optional iicoc
 dev/iicbus/lm75.c		optional lm75
 dev/iicbus/ofw_iicbus.c		optional fdt iicbus
 dev/iicbus/pcf8563.c		optional pcf8563
 dev/iicbus/s35390a.c		optional s35390a
 dev/iir/iir.c			optional iir
 dev/iir/iir_ctrl.c		optional iir
 dev/iir/iir_pci.c		optional iir pci
 dev/intpm/intpm.c		optional intpm pci
 # XXX Work around clang warning, until maintainer approves fix.
 dev/ips/ips.c			optional ips \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/ips/ips_commands.c		optional ips
 dev/ips/ips_disk.c		optional ips
 dev/ips/ips_ioctl.c		optional ips
 dev/ips/ips_pci.c		optional ips pci
 dev/ipw/if_ipw.c		optional ipw
 ipwbssfw.c			optional ipwbssfw | ipwfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"ipwbssfw.c"
 ipw_bss.fwo			optional ipwbssfw | ipwfw		\
 	dependency	"ipw_bss.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"ipw_bss.fwo"
 ipw_bss.fw			optional ipwbssfw | ipwfw		\
 	dependency	"$S/contrib/dev/ipw/ipw2100-1.3.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"ipw_bss.fw"
 ipwibssfw.c			optional ipwibssfw | ipwfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"ipwibssfw.c"
 ipw_ibss.fwo			optional ipwibssfw | ipwfw		\
 	dependency	"ipw_ibss.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"ipw_ibss.fwo"
 ipw_ibss.fw			optional ipwibssfw | ipwfw		\
 	dependency	"$S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"ipw_ibss.fw"
 ipwmonitorfw.c			optional ipwmonitorfw | ipwfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"ipwmonitorfw.c"
 ipw_monitor.fwo			optional ipwmonitorfw | ipwfw		\
 	dependency	"ipw_monitor.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"ipw_monitor.fwo"
 ipw_monitor.fw			optional ipwmonitorfw | ipwfw		\
 	dependency	"$S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"ipw_monitor.fw"
 dev/iscsi/icl.c			optional iscsi
 dev/iscsi/icl_conn_if.m		optional cfiscsi | iscsi
 dev/iscsi/icl_soft.c		optional iscsi
 dev/iscsi/icl_soft_proxy.c	optional iscsi
 dev/iscsi/iscsi.c		optional iscsi scbus
 dev/iscsi_initiator/iscsi.c	optional iscsi_initiator scbus
 dev/iscsi_initiator/iscsi_subr.c	optional iscsi_initiator scbus
 dev/iscsi_initiator/isc_cam.c	optional iscsi_initiator scbus
 dev/iscsi_initiator/isc_soc.c	optional iscsi_initiator scbus
 dev/iscsi_initiator/isc_sm.c	optional iscsi_initiator scbus
 dev/iscsi_initiator/isc_subr.c	optional iscsi_initiator scbus
 dev/ismt/ismt.c			optional ismt
 dev/isl/isl.c			optional isl iicbus
 dev/isp/isp.c			optional isp
 dev/isp/isp_freebsd.c		optional isp
 dev/isp/isp_library.c		optional isp
 dev/isp/isp_pci.c		optional isp pci
 dev/isp/isp_sbus.c		optional isp sbus
 dev/isp/isp_target.c		optional isp
 dev/ispfw/ispfw.c		optional ispfw
 dev/iwi/if_iwi.c		optional iwi
 iwibssfw.c			optional iwibssfw | iwifw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwibssfw.c"
 iwi_bss.fwo			optional iwibssfw | iwifw		\
 	dependency	"iwi_bss.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwi_bss.fwo"
 iwi_bss.fw			optional iwibssfw | iwifw		\
 	dependency	"$S/contrib/dev/iwi/ipw2200-bss.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwi_bss.fw"
 iwiibssfw.c			optional iwiibssfw | iwifw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwiibssfw.c"
 iwi_ibss.fwo			optional iwiibssfw | iwifw		\
 	dependency	"iwi_ibss.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwi_ibss.fwo"
 iwi_ibss.fw			optional iwiibssfw | iwifw		\
 	dependency	"$S/contrib/dev/iwi/ipw2200-ibss.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwi_ibss.fw"
 iwimonitorfw.c			optional iwimonitorfw | iwifw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwimonitorfw.c"
 iwi_monitor.fwo			optional iwimonitorfw | iwifw		\
 	dependency	"iwi_monitor.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwi_monitor.fwo"
 iwi_monitor.fw			optional iwimonitorfw | iwifw		\
 	dependency	"$S/contrib/dev/iwi/ipw2200-sniffer.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwi_monitor.fw"
 dev/iwm/if_iwm.c		optional iwm
 dev/iwm/if_iwm_7000.c		optional iwm
 dev/iwm/if_iwm_8000.c		optional iwm
 dev/iwm/if_iwm_binding.c	optional iwm
 dev/iwm/if_iwm_fw.c		optional iwm
 dev/iwm/if_iwm_led.c		optional iwm
 dev/iwm/if_iwm_mac_ctxt.c	optional iwm
 dev/iwm/if_iwm_notif_wait.c	optional iwm
 dev/iwm/if_iwm_pcie_trans.c	optional iwm
 dev/iwm/if_iwm_phy_ctxt.c	optional iwm
 dev/iwm/if_iwm_phy_db.c		optional iwm
 dev/iwm/if_iwm_power.c		optional iwm
 dev/iwm/if_iwm_scan.c		optional iwm
 dev/iwm/if_iwm_sta.c		optional iwm
 dev/iwm/if_iwm_time_event.c	optional iwm
 dev/iwm/if_iwm_util.c		optional iwm
 iwm3160fw.c			optional iwm3160fw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm3160.fw:iwm3160fw -miwm3160fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwm3160fw.c"
 iwm3160fw.fwo			optional iwm3160fw | iwmfw		\
 	dependency	"iwm3160.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm3160fw.fwo"
 iwm3160.fw			optional iwm3160fw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-3160-17.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm3160.fw"
 iwm7260fw.c			optional iwm7260fw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm7260.fw:iwm7260fw -miwm7260fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwm7260fw.c"
 iwm7260fw.fwo			optional iwm7260fw | iwmfw		\
 	dependency	"iwm7260.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm7260fw.fwo"
 iwm7260.fw			optional iwm7260fw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-7260-17.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm7260.fw"
 iwm7265fw.c			optional iwm7265fw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm7265.fw:iwm7265fw -miwm7265fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwm7265fw.c"
 iwm7265fw.fwo			optional iwm7265fw | iwmfw		\
 	dependency	"iwm7265.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm7265fw.fwo"
 iwm7265.fw			optional iwm7265fw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-7265-17.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm7265.fw"
 iwm7265Dfw.c			optional iwm7265Dfw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm7265D.fw:iwm7265Dfw -miwm7265Dfw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwm7265Dfw.c"
 iwm7265Dfw.fwo			optional iwm7265Dfw | iwmfw		\
 	dependency	"iwm7265D.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm7265Dfw.fwo"
 iwm7265D.fw			optional iwm7265Dfw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-7265D-17.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm7265D.fw"
 iwm8000Cfw.c			optional iwm8000Cfw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm8000C.fw:iwm8000Cfw -miwm8000Cfw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwm8000Cfw.c"
 iwm8000Cfw.fwo			optional iwm8000Cfw | iwmfw		\
 	dependency	"iwm8000C.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm8000Cfw.fwo"
 iwm8000C.fw			optional iwm8000Cfw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-8000C-16.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm8000C.fw"
 dev/iwn/if_iwn.c		optional iwn
 iwn1000fw.c			optional iwn1000fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn1000fw.c"
 iwn1000fw.fwo			optional iwn1000fw | iwnfw		\
 	dependency	"iwn1000.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn1000fw.fwo"
 iwn1000.fw			optional iwn1000fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn1000.fw"
 iwn100fw.c			optional iwn100fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn100.fw:iwn100fw -miwn100fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn100fw.c"
 iwn100fw.fwo			optional iwn100fw | iwnfw		\
 	dependency	"iwn100.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn100fw.fwo"
 iwn100.fw			optional iwn100fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn100.fw"
 iwn105fw.c			optional iwn105fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn105.fw:iwn105fw -miwn105fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn105fw.c"
 iwn105fw.fwo			optional iwn105fw | iwnfw		\
 	dependency	"iwn105.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn105fw.fwo"
 iwn105.fw			optional iwn105fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn105.fw"
 iwn135fw.c			optional iwn135fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn135.fw:iwn135fw -miwn135fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn135fw.c"
 iwn135fw.fwo			optional iwn135fw | iwnfw		\
 	dependency	"iwn135.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn135fw.fwo"
 iwn135.fw			optional iwn135fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn135.fw"
 iwn2000fw.c			optional iwn2000fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2000.fw:iwn2000fw -miwn2000fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn2000fw.c"
 iwn2000fw.fwo			optional iwn2000fw | iwnfw		\
 	dependency	"iwn2000.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn2000fw.fwo"
 iwn2000.fw			optional iwn2000fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn2000.fw"
 iwn2030fw.c			optional iwn2030fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2030.fw:iwn2030fw -miwn2030fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn2030fw.c"
 iwn2030fw.fwo			optional iwn2030fw | iwnfw		\
 	dependency	"iwn2030.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn2030fw.fwo"
 iwn2030.fw			optional iwn2030fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn2030.fw"
 iwn4965fw.c			optional iwn4965fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn4965.fw:iwn4965fw -miwn4965fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn4965fw.c"
 iwn4965fw.fwo			optional iwn4965fw | iwnfw		\
 	dependency	"iwn4965.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn4965fw.fwo"
 iwn4965.fw			optional iwn4965fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn4965.fw"
 iwn5000fw.c			optional iwn5000fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn5000.fw:iwn5000fw -miwn5000fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn5000fw.c"
 iwn5000fw.fwo		optional iwn5000fw | iwnfw			\
 	dependency	"iwn5000.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn5000fw.fwo"
 iwn5000.fw			optional iwn5000fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn5000.fw"
 iwn5150fw.c			optional iwn5150fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn5150.fw:iwn5150fw -miwn5150fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn5150fw.c"
 iwn5150fw.fwo			optional iwn5150fw | iwnfw		\
 	dependency	"iwn5150.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn5150fw.fwo"
 iwn5150.fw			optional iwn5150fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu"\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn5150.fw"
 iwn6000fw.c			optional iwn6000fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000.fw:iwn6000fw -miwn6000fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn6000fw.c"
 iwn6000fw.fwo			optional iwn6000fw | iwnfw		\
 	dependency	"iwn6000.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn6000fw.fwo"
 iwn6000.fw			optional iwn6000fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6000.fw"
 iwn6000g2afw.c			optional iwn6000g2afw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000g2a.fw:iwn6000g2afw -miwn6000g2afw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn6000g2afw.c"
 iwn6000g2afw.fwo		optional iwn6000g2afw | iwnfw		\
 	dependency	"iwn6000g2a.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn6000g2afw.fwo"
 iwn6000g2a.fw			optional iwn6000g2afw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6000g2a.fw"
 iwn6000g2bfw.c			optional iwn6000g2bfw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000g2b.fw:iwn6000g2bfw -miwn6000g2bfw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn6000g2bfw.c"
 iwn6000g2bfw.fwo		optional iwn6000g2bfw | iwnfw		\
 	dependency	"iwn6000g2b.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn6000g2bfw.fwo"
 iwn6000g2b.fw			optional iwn6000g2bfw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6000g2b.fw"
 iwn6050fw.c			optional iwn6050fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6050.fw:iwn6050fw -miwn6050fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"iwn6050fw.c"
 iwn6050fw.fwo			optional iwn6050fw | iwnfw		\
 	dependency	"iwn6050.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn6050fw.fwo"
 iwn6050.fw			optional iwn6050fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6050.fw"
 dev/ixgb/if_ixgb.c		optional ixgb
 dev/ixgb/ixgb_ee.c		optional ixgb
 dev/ixgb/ixgb_hw.c		optional ixgb
 dev/ixgbe/if_ix.c		optional ix inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
 dev/ixgbe/if_ixv.c		optional ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
 dev/ixgbe/ix_txrx.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_osdep.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_phy.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_api.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_common.c	optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_mbx.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_vf.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_82598.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_82599.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_x540.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_x550.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_dcb.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_dcb_82598.c	optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_dcb_82599.c	optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/jedec_ts/jedec_ts.c		optional jedec_ts smbus
 dev/jme/if_jme.c		optional jme pci
 dev/joy/joy.c			optional joy
 dev/joy/joy_isa.c		optional joy isa
 dev/kbd/kbd.c			optional atkbd | pckbd | sc | ukbd | vt
 dev/kbdmux/kbdmux.c		optional kbdmux
 dev/ksyms/ksyms.c		optional ksyms
 dev/le/am7990.c			optional le
 dev/le/am79900.c		optional le
 dev/le/if_le_pci.c		optional le pci
 dev/le/lance.c			optional le
 dev/led/led.c			standard
 dev/lge/if_lge.c		optional lge
 dev/lmc/if_lmc.c		optional lmc
 dev/malo/if_malo.c		optional malo
 dev/malo/if_malohal.c		optional malo
 dev/malo/if_malo_pci.c		optional malo pci
 dev/mc146818/mc146818.c		optional mc146818
 dev/md/md.c			optional md
 dev/mdio/mdio_if.m		optional miiproxy | mdio
 dev/mdio/mdio.c			optional miiproxy | mdio
 dev/mem/memdev.c		optional mem
 dev/mem/memutil.c		optional mem
 dev/mfi/mfi.c			optional mfi
 dev/mfi/mfi_debug.c		optional mfi
 dev/mfi/mfi_pci.c		optional mfi pci
 dev/mfi/mfi_disk.c		optional mfi
 dev/mfi/mfi_syspd.c		optional mfi
 dev/mfi/mfi_tbolt.c		optional mfi
 dev/mfi/mfi_linux.c		optional mfi compat_linux
 dev/mfi/mfi_cam.c		optional mfip scbus
 dev/mii/acphy.c			optional miibus | acphy
 dev/mii/amphy.c			optional miibus | amphy
 dev/mii/atphy.c			optional miibus | atphy
 dev/mii/axphy.c			optional miibus | axphy
 dev/mii/bmtphy.c		optional miibus | bmtphy
 dev/mii/brgphy.c		optional miibus | brgphy
 dev/mii/ciphy.c			optional miibus | ciphy
 dev/mii/e1000phy.c		optional miibus | e1000phy
 dev/mii/gentbi.c		optional miibus | gentbi
 dev/mii/icsphy.c		optional miibus | icsphy
 dev/mii/ip1000phy.c		optional miibus | ip1000phy
 dev/mii/jmphy.c			optional miibus | jmphy
 dev/mii/lxtphy.c		optional miibus | lxtphy
 dev/mii/micphy.c		optional miibus fdt | micphy fdt
 dev/mii/mii.c			optional miibus | mii
 dev/mii/mii_bitbang.c		optional miibus | mii_bitbang
 dev/mii/mii_physubr.c		optional miibus | mii
 dev/mii/miibus_if.m		optional miibus | mii
 dev/mii/mlphy.c			optional miibus | mlphy
 dev/mii/nsgphy.c		optional miibus | nsgphy
 dev/mii/nsphy.c			optional miibus | nsphy
 dev/mii/nsphyter.c		optional miibus | nsphyter
 dev/mii/pnaphy.c		optional miibus | pnaphy
 dev/mii/qsphy.c			optional miibus | qsphy
 dev/mii/rdcphy.c		optional miibus | rdcphy
 dev/mii/rgephy.c		optional miibus | rgephy
 dev/mii/rlphy.c			optional miibus | rlphy
 dev/mii/rlswitch.c		optional rlswitch
 dev/mii/smcphy.c		optional miibus | smcphy
 dev/mii/smscphy.c		optional miibus | smscphy
 dev/mii/tdkphy.c		optional miibus | tdkphy
 dev/mii/tlphy.c			optional miibus | tlphy
 dev/mii/truephy.c		optional miibus | truephy
 dev/mii/ukphy.c			optional miibus | mii
 dev/mii/ukphy_subr.c		optional miibus | mii
 dev/mii/xmphy.c			optional miibus | xmphy
 dev/mk48txx/mk48txx.c		optional mk48txx
 dev/mlx/mlx.c			optional mlx
 dev/mlx/mlx_disk.c		optional mlx
 dev/mlx/mlx_pci.c		optional mlx pci
 dev/mly/mly.c			optional mly
 dev/mmc/mmc_subr.c		optional mmc | mmcsd
 dev/mmc/mmc.c			optional mmc
 dev/mmc/mmcbr_if.m		standard
 dev/mmc/mmcbus_if.m		standard
 dev/mmc/mmcsd.c			optional mmcsd
 dev/mn/if_mn.c			optional mn pci
 dev/mpr/mpr.c			optional mpr
 dev/mpr/mpr_config.c		optional mpr
 # XXX Work around clang warning, until maintainer approves fix.
 dev/mpr/mpr_mapping.c		optional mpr \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/mpr/mpr_pci.c		optional mpr pci
 dev/mpr/mpr_sas.c		optional mpr \
 	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
 dev/mpr/mpr_sas_lsi.c		optional mpr
 dev/mpr/mpr_table.c		optional mpr
 dev/mpr/mpr_user.c		optional mpr
 dev/mps/mps.c			optional mps
 dev/mps/mps_config.c		optional mps
 # XXX Work around clang warning, until maintainer approves fix.
 dev/mps/mps_mapping.c		optional mps \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/mps/mps_pci.c		optional mps pci
 dev/mps/mps_sas.c		optional mps \
 	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
 dev/mps/mps_sas_lsi.c		optional mps
 dev/mps/mps_table.c		optional mps
 dev/mps/mps_user.c		optional mps
 dev/mpt/mpt.c			optional mpt
 dev/mpt/mpt_cam.c		optional mpt
 dev/mpt/mpt_debug.c		optional mpt
 dev/mpt/mpt_pci.c		optional mpt pci
 dev/mpt/mpt_raid.c		optional mpt
 dev/mpt/mpt_user.c		optional mpt
 dev/mrsas/mrsas.c		optional mrsas
 dev/mrsas/mrsas_cam.c		optional mrsas
 dev/mrsas/mrsas_ioctl.c		optional mrsas
 dev/mrsas/mrsas_fp.c		optional mrsas
 dev/msk/if_msk.c		optional msk
 dev/mvs/mvs.c			optional mvs
 dev/mvs/mvs_if.m		optional mvs
 dev/mvs/mvs_pci.c		optional mvs pci
 dev/mwl/if_mwl.c		optional mwl
 dev/mwl/if_mwl_pci.c		optional mwl pci
 dev/mwl/mwlhal.c		optional mwl
 mwlfw.c				optional mwlfw				\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk mw88W8363.fw:mw88W8363fw mwlboot.fw:mwlboot -mmwl -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"mwlfw.c"
 mw88W8363.fwo		optional mwlfw					\
 	dependency	"mw88W8363.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"mw88W8363.fwo"
 mw88W8363.fw		optional mwlfw					\
 	dependency	"$S/contrib/dev/mwl/mw88W8363.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"mw88W8363.fw"
 mwlboot.fwo		optional mwlfw					\
 	dependency	"mwlboot.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"mwlboot.fwo"
 mwlboot.fw		optional mwlfw					\
 	dependency	"$S/contrib/dev/mwl/mwlboot.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"mwlboot.fw"
 dev/mxge/if_mxge.c		optional mxge pci
 dev/mxge/mxge_eth_z8e.c		optional mxge pci
 dev/mxge/mxge_ethp_z8e.c	optional mxge pci
 dev/mxge/mxge_rss_eth_z8e.c	optional mxge pci
 dev/mxge/mxge_rss_ethp_z8e.c	optional mxge pci
 dev/my/if_my.c			optional my
 dev/nand/nand.c			optional nand
 dev/nand/nand_bbt.c		optional nand
 dev/nand/nand_cdev.c		optional nand
 dev/nand/nand_generic.c		optional nand
 dev/nand/nand_geom.c		optional nand
 dev/nand/nand_id.c		optional nand
 dev/nand/nandbus.c		optional nand
 dev/nand/nandbus_if.m		optional nand
 dev/nand/nand_if.m		optional nand
 dev/nand/nandsim.c		optional nandsim nand
 dev/nand/nandsim_chip.c		optional nandsim nand
 dev/nand/nandsim_ctrl.c		optional nandsim nand
 dev/nand/nandsim_log.c		optional nandsim nand
 dev/nand/nandsim_swap.c		optional nandsim nand
 dev/nand/nfc_if.m		optional nand
 dev/ncr/ncr.c			optional ncr pci
 dev/ncv/ncr53c500.c		optional ncv
 dev/ncv/ncr53c500_pccard.c	optional ncv pccard
 dev/netmap/if_ptnet.c		optional netmap inet
 dev/netmap/netmap.c		optional netmap
 dev/netmap/netmap_freebsd.c	optional netmap
 dev/netmap/netmap_generic.c	optional netmap
 dev/netmap/netmap_mbq.c		optional netmap
 dev/netmap/netmap_mem2.c	optional netmap
 dev/netmap/netmap_monitor.c	optional netmap
 dev/netmap/netmap_offloadings.c	optional netmap
 dev/netmap/netmap_pipe.c	optional netmap
 dev/netmap/netmap_pt.c		optional netmap
 dev/netmap/netmap_vale.c	optional netmap
 # compile-with "${NORMAL_C} -Wconversion -Wextra"
 dev/nfsmb/nfsmb.c		optional nfsmb pci
 dev/nge/if_nge.c		optional nge
 dev/nxge/if_nxge.c		optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nxge/xgehal/xgehal-device.c	optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nxge/xgehal/xgehal-mm.c	optional nxge
 dev/nxge/xgehal/xge-queue.c	optional nxge
 dev/nxge/xgehal/xgehal-driver.c	optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nxge/xgehal/xgehal-ring.c	optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nxge/xgehal/xgehal-channel.c	optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nxge/xgehal/xgehal-fifo.c	optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nxge/xgehal/xgehal-stats.c	optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nxge/xgehal/xgehal-config.c	optional nxge
 dev/nxge/xgehal/xgehal-mgmt.c	optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nmdm/nmdm.c			optional nmdm
 dev/nsp/nsp.c			optional nsp
 dev/nsp/nsp_pccard.c		optional nsp pccard
 dev/null/null.c			standard
 dev/oce/oce_hw.c		optional oce pci
 dev/oce/oce_if.c		optional oce pci
 dev/oce/oce_mbox.c		optional oce pci
 dev/oce/oce_queue.c		optional oce pci
 dev/oce/oce_sysctl.c		optional oce pci
 dev/oce/oce_util.c		optional oce pci
 dev/ofw/ofw_bus_if.m		optional fdt
 dev/ofw/ofw_bus_subr.c		optional fdt
 dev/ofw/ofw_cpu.c		optional fdt
 dev/ofw/ofw_fdt.c		optional fdt
 dev/ofw/ofw_if.m		optional fdt
 dev/ofw/ofw_subr.c		optional fdt
 dev/ofw/ofwbus.c		optional fdt
 dev/ofw/openfirm.c		optional fdt
 dev/ofw/openfirmio.c		optional fdt
 dev/ow/ow.c			optional ow				\
 	dependency	"owll_if.h"					\
 	dependency	"own_if.h"
 dev/ow/owll_if.m		optional ow
 dev/ow/own_if.m			optional ow
 dev/ow/ow_temp.c		optional ow_temp
 dev/ow/owc_gpiobus.c		optional owc gpio
 dev/pbio/pbio.c			optional pbio isa
 dev/pccard/card_if.m		standard
 dev/pccard/pccard.c		optional pccard
 dev/pccard/pccard_cis.c		optional pccard
 dev/pccard/pccard_cis_quirks.c	optional pccard
 dev/pccard/pccard_device.c	optional pccard
 dev/pccard/power_if.m		standard
 dev/pccbb/pccbb.c		optional cbb
 dev/pccbb/pccbb_isa.c		optional cbb isa
 dev/pccbb/pccbb_pci.c		optional cbb pci
 dev/pcf/pcf.c			optional pcf
 dev/pci/fixup_pci.c		optional pci
 dev/pci/hostb_pci.c		optional pci
 dev/pci/ignore_pci.c		optional pci
 dev/pci/isa_pci.c		optional pci isa
 dev/pci/pci.c			optional pci
 dev/pci/pci_if.m		standard
 dev/pci/pci_iov.c		optional pci pci_iov
 dev/pci/pci_iov_if.m		standard
 dev/pci/pci_iov_schema.c	optional pci pci_iov
 dev/pci/pci_pci.c		optional pci
 dev/pci/pci_subr.c		optional pci
 dev/pci/pci_user.c		optional pci
 dev/pci/pcib_if.m		standard
 dev/pci/pcib_support.c		standard
 dev/pci/vga_pci.c		optional pci
 dev/pcn/if_pcn.c		optional pcn pci
 dev/pdq/if_fpa.c		optional fpa pci
 dev/pdq/pdq.c			optional nowerror fpa pci
 dev/pdq/pdq_ifsubr.c		optional nowerror fpa pci
 dev/pms/freebsd/driver/ini/src/agtiapi.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sadisc.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/mpi.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saframe.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sahw.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sainit.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saint.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sampicmd.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sampirsp.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saphy.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saport.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sasata.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sasmp.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sassp.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/satimer.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sautil.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saioctlcmd.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/mpidebug.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dminit.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmsmp.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmdisc.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmport.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmtimer.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmmisc.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/sminit.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smmisc.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smsat.c				optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smsatcb.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smsathw.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smtimer.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdinit.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdmisc.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdesgl.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdport.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdint.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdioctl.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdhw.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/ossacmnapi.c	optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tddmcmnapi.c	optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdsmcmnapi.c	optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdtimers.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sas/ini/itdio.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sas/ini/itdcb.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sas/ini/itdinit.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sata/host/sat.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sata/host/ossasat.c	optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sata/host/sathw.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/ppbus/if_plip.c		optional plip
 dev/ppbus/immio.c		optional vpo
 dev/ppbus/lpbb.c		optional lpbb
 dev/ppbus/lpt.c			optional lpt
 dev/ppbus/pcfclock.c		optional pcfclock
 dev/ppbus/ppb_1284.c		optional ppbus
 dev/ppbus/ppb_base.c		optional ppbus
 dev/ppbus/ppb_msq.c		optional ppbus
 dev/ppbus/ppbconf.c		optional ppbus
 dev/ppbus/ppbus_if.m		optional ppbus
 dev/ppbus/ppi.c			optional ppi
 dev/ppbus/pps.c			optional pps
 dev/ppbus/vpo.c			optional vpo
 dev/ppbus/vpoio.c		optional vpo
 dev/ppc/ppc.c			optional ppc
 dev/ppc/ppc_acpi.c		optional ppc acpi
 dev/ppc/ppc_isa.c		optional ppc isa
 dev/ppc/ppc_pci.c		optional ppc pci
 dev/ppc/ppc_puc.c		optional ppc puc
 dev/proto/proto_bus_isa.c	optional proto acpi | proto isa
 dev/proto/proto_bus_pci.c	optional proto pci
 dev/proto/proto_busdma.c	optional proto
 dev/proto/proto_core.c		optional proto
 dev/pst/pst-iop.c		optional pst
 dev/pst/pst-pci.c		optional pst pci
 dev/pst/pst-raid.c		optional pst
 dev/pty/pty.c			optional pty
 dev/puc/puc.c			optional puc
 dev/puc/puc_cfg.c		optional puc
 dev/puc/puc_pccard.c		optional puc pccard
 dev/puc/puc_pci.c		optional puc pci
 dev/puc/pucdata.c		optional puc pci
 dev/quicc/quicc_core.c		optional quicc
 dev/ral/rt2560.c		optional ral
 dev/ral/rt2661.c		optional ral
 dev/ral/rt2860.c		optional ral
 dev/ral/if_ral_pci.c		optional ral pci
 rt2561fw.c			optional rt2561fw | ralfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rt2561fw.c"
 rt2561fw.fwo			optional rt2561fw | ralfw		\
 	dependency	"rt2561.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rt2561fw.fwo"
 rt2561.fw			optional rt2561fw | ralfw		\
 	dependency	"$S/contrib/dev/ral/rt2561.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rt2561.fw"
 rt2561sfw.c			optional rt2561sfw | ralfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rt2561sfw.c"
 rt2561sfw.fwo			optional rt2561sfw | ralfw		\
 	dependency	"rt2561s.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rt2561sfw.fwo"
 rt2561s.fw			optional rt2561sfw | ralfw		\
 	dependency	"$S/contrib/dev/ral/rt2561s.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rt2561s.fw"
 rt2661fw.c			optional rt2661fw | ralfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rt2661fw.c"
 rt2661fw.fwo			optional rt2661fw | ralfw		\
 	dependency	"rt2661.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rt2661fw.fwo"
 rt2661.fw			optional rt2661fw | ralfw		\
 	dependency	"$S/contrib/dev/ral/rt2661.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rt2661.fw"
 rt2860fw.c			optional rt2860fw | ralfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rt2860fw.c"
 rt2860fw.fwo			optional rt2860fw | ralfw		\
 	dependency	"rt2860.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rt2860fw.fwo"
 rt2860.fw			optional rt2860fw | ralfw		\
 	dependency	"$S/contrib/dev/ral/rt2860.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rt2860.fw"
 dev/random/random_infra.c	optional random
 dev/random/random_harvestq.c	optional random
 dev/random/randomdev.c		optional random random_yarrow | \
 					 random !random_yarrow !random_loadable
 dev/random/yarrow.c		optional random random_yarrow
 dev/random/fortuna.c		optional random !random_yarrow !random_loadable
 dev/random/hash.c		optional random random_yarrow | \
 					 random !random_yarrow !random_loadable
 dev/rc/rc.c			optional rc
 dev/rccgpio/rccgpio.c		optional rccgpio gpio
 dev/re/if_re.c			optional re
 dev/rl/if_rl.c			optional rl pci
 dev/rndtest/rndtest.c		optional rndtest
 dev/rp/rp.c			optional rp
 dev/rp/rp_isa.c			optional rp isa
 dev/rp/rp_pci.c			optional rp pci
 #
 dev/rtwn/if_rtwn.c		optional rtwn
 dev/rtwn/if_rtwn_beacon.c	optional rtwn
 dev/rtwn/if_rtwn_calib.c	optional rtwn
 dev/rtwn/if_rtwn_cam.c		optional rtwn
 dev/rtwn/if_rtwn_efuse.c	optional rtwn
 dev/rtwn/if_rtwn_fw.c		optional rtwn
 dev/rtwn/if_rtwn_rx.c		optional rtwn
 dev/rtwn/if_rtwn_task.c		optional rtwn
 dev/rtwn/if_rtwn_tx.c		optional rtwn
 #
 dev/rtwn/pci/rtwn_pci_attach.c	optional rtwn_pci pci
 dev/rtwn/pci/rtwn_pci_reg.c	optional rtwn_pci pci
 dev/rtwn/pci/rtwn_pci_rx.c	optional rtwn_pci pci
 dev/rtwn/pci/rtwn_pci_tx.c	optional rtwn_pci pci
 #
 dev/rtwn/usb/rtwn_usb_attach.c	optional rtwn_usb
 dev/rtwn/usb/rtwn_usb_ep.c	optional rtwn_usb
 dev/rtwn/usb/rtwn_usb_reg.c	optional rtwn_usb
 dev/rtwn/usb/rtwn_usb_rx.c	optional rtwn_usb
 dev/rtwn/usb/rtwn_usb_tx.c	optional rtwn_usb
 # RTL8188E
 dev/rtwn/rtl8188e/r88e_beacon.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_calib.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_chan.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_fw.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_init.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_led.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_tx.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_rf.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_rom.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_rx.c	optional rtwn
 dev/rtwn/rtl8188e/usb/r88eu_attach.c	optional rtwn_usb
 dev/rtwn/rtl8188e/usb/r88eu_init.c	optional rtwn_usb
 dev/rtwn/rtl8188e/usb/r88eu_rx.c	optional rtwn_usb
 # RTL8192C
 dev/rtwn/rtl8192c/r92c_attach.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_beacon.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_calib.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_chan.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_fw.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_init.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_llt.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_rf.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_rom.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_rx.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_tx.c	optional rtwn
 dev/rtwn/rtl8192c/pci/r92ce_attach.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_calib.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_fw.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_init.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_led.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_rx.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_tx.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/usb/r92cu_attach.c	optional rtwn_usb
 dev/rtwn/rtl8192c/usb/r92cu_init.c	optional rtwn_usb
 dev/rtwn/rtl8192c/usb/r92cu_led.c	optional rtwn_usb
 dev/rtwn/rtl8192c/usb/r92cu_rx.c	optional rtwn_usb
 dev/rtwn/rtl8192c/usb/r92cu_tx.c	optional rtwn_usb
 # RTL8192E
 dev/rtwn/rtl8192e/r92e_chan.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_fw.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_init.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_led.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_rf.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_rom.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_rx.c	optional rtwn
 dev/rtwn/rtl8192e/usb/r92eu_attach.c	optional rtwn_usb
 dev/rtwn/rtl8192e/usb/r92eu_init.c	optional rtwn_usb
 # RTL8812A
 dev/rtwn/rtl8812a/r12a_beacon.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_calib.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_caps.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_chan.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_fw.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_init.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_led.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_rf.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_rom.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_rx.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_tx.c	optional rtwn
 dev/rtwn/rtl8812a/usb/r12au_attach.c	optional rtwn_usb
 dev/rtwn/rtl8812a/usb/r12au_init.c	optional rtwn_usb
 dev/rtwn/rtl8812a/usb/r12au_rx.c	optional rtwn_usb
 dev/rtwn/rtl8812a/usb/r12au_tx.c	optional rtwn_usb
 # RTL8821A
 dev/rtwn/rtl8821a/r21a_beacon.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_calib.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_chan.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_fw.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_init.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_led.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_rom.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_rx.c	optional rtwn
 dev/rtwn/rtl8821a/usb/r21au_attach.c	optional rtwn_usb
 dev/rtwn/rtl8821a/usb/r21au_dfs.c	optional rtwn_usb
 dev/rtwn/rtl8821a/usb/r21au_init.c	optional rtwn_usb
 rtwn-rtl8188eufw.c		optional rtwn-rtl8188eufw | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8188eufw.fw:rtwn-rtl8188eufw:111 -mrtwn-rtl8188eufw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rtwn-rtl8188eufw.c"
 rtwn-rtl8188eufw.fwo		optional rtwn-rtl8188eufw | rtwnfw	\
 	dependency	"rtwn-rtl8188eufw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8188eufw.fwo"
 rtwn-rtl8188eufw.fw		optional rtwn-rtl8188eufw | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8188eufw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8188eufw.fw"
 rtwn-rtl8192cfwE.c		optional rtwn-rtl8192cfwE | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192cfwE.fw:rtwn-rtl8192cfwE:111 -mrtwn-rtl8192cfwE -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rtwn-rtl8192cfwE.c"
 rtwn-rtl8192cfwE.fwo		optional rtwn-rtl8192cfwE | rtwnfw	\
 	dependency	"rtwn-rtl8192cfwE.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwE.fwo"
 rtwn-rtl8192cfwE.fw		optional rtwn-rtl8192cfwE | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192cfwE.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwE.fw"
 rtwn-rtl8192cfwE_B.c		optional rtwn-rtl8192cfwE_B | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192cfwE_B.fw:rtwn-rtl8192cfwE_B:111 -mrtwn-rtl8192cfwE_B -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rtwn-rtl8192cfwE_B.c"
 rtwn-rtl8192cfwE_B.fwo		optional rtwn-rtl8192cfwE_B | rtwnfw	\
 	dependency	"rtwn-rtl8192cfwE_B.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwE_B.fwo"
 rtwn-rtl8192cfwE_B.fw		optional rtwn-rtl8192cfwE_B | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192cfwE_B.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwE_B.fw"
 rtwn-rtl8192cfwT.c		optional rtwn-rtl8192cfwT | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192cfwT.fw:rtwn-rtl8192cfwT:111 -mrtwn-rtl8192cfwT -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rtwn-rtl8192cfwT.c"
 rtwn-rtl8192cfwT.fwo		optional rtwn-rtl8192cfwT | rtwnfw	\
 	dependency	"rtwn-rtl8192cfwT.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwT.fwo"
 rtwn-rtl8192cfwT.fw		optional rtwn-rtl8192cfwT | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192cfwT.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwT.fw"
 rtwn-rtl8192cfwU.c		optional rtwn-rtl8192cfwU | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192cfwU.fw:rtwn-rtl8192cfwU:111 -mrtwn-rtl8192cfwU -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rtwn-rtl8192cfwU.c"
 rtwn-rtl8192cfwU.fwo		optional rtwn-rtl8192cfwU | rtwnfw	\
 	dependency	"rtwn-rtl8192cfwU.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwU.fwo"
 rtwn-rtl8192cfwU.fw		optional rtwn-rtl8192cfwU | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192cfwU.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwU.fw"
 rtwn-rtl8192eufw.c		optional rtwn-rtl8192eufw | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192eufw.fw:rtwn-rtl8192eufw:111 -mrtwn-rtl8192eufw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rtwn-rtl8192eufw.c"
 rtwn-rtl8192eufw.fwo		optional rtwn-rtl8192eufw | rtwnfw	\
 	dependency	"rtwn-rtl8192eufw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192eufw.fwo"
 rtwn-rtl8192eufw.fw		optional rtwn-rtl8192eufw | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192eufw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192eufw.fw"
 rtwn-rtl8812aufw.c		optional rtwn-rtl8812aufw | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8812aufw.fw:rtwn-rtl8812aufw:111 -mrtwn-rtl8812aufw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rtwn-rtl8812aufw.c"
 rtwn-rtl8812aufw.fwo		optional rtwn-rtl8812aufw | rtwnfw	\
 	dependency	"rtwn-rtl8812aufw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8812aufw.fwo"
 rtwn-rtl8812aufw.fw		optional rtwn-rtl8812aufw | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8812aufw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8812aufw.fw"
 rtwn-rtl8821aufw.c		optional rtwn-rtl8821aufw | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8821aufw.fw:rtwn-rtl8821aufw:111 -mrtwn-rtl8821aufw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rtwn-rtl8821aufw.c"
 rtwn-rtl8821aufw.fwo		optional rtwn-rtl8821aufw | rtwnfw	\
 	dependency	"rtwn-rtl8821aufw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8821aufw.fwo"
 rtwn-rtl8821aufw.fw		optional rtwn-rtl8821aufw | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8821aufw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8821aufw.fw"
 dev/safe/safe.c			optional safe
 dev/scc/scc_if.m		optional scc
 dev/scc/scc_bfe_ebus.c		optional scc ebus
 dev/scc/scc_bfe_quicc.c		optional scc quicc
 dev/scc/scc_bfe_sbus.c		optional scc fhc | scc sbus
 dev/scc/scc_core.c		optional scc
 dev/scc/scc_dev_quicc.c		optional scc quicc
 dev/scc/scc_dev_sab82532.c	optional scc
 dev/scc/scc_dev_z8530.c		optional scc
 dev/sdhci/sdhci.c		optional sdhci
 dev/sdhci/sdhci_fdt_gpio.c	optional sdhci fdt gpio
 dev/sdhci/sdhci_if.m		optional sdhci
 dev/sdhci/sdhci_acpi.c		optional sdhci acpi
 dev/sdhci/sdhci_pci.c		optional sdhci pci
 dev/sf/if_sf.c			optional sf pci
 dev/sge/if_sge.c		optional sge pci
 dev/siba/siba_bwn.c		optional siba_bwn pci
 dev/siba/siba_core.c		optional siba_bwn pci
 dev/siis/siis.c			optional siis pci
 dev/sis/if_sis.c		optional sis pci
 dev/sk/if_sk.c			optional sk pci
 dev/smbus/smb.c			optional smb
 dev/smbus/smbconf.c		optional smbus
 dev/smbus/smbus.c		optional smbus
 dev/smbus/smbus_if.m		optional smbus
 dev/smc/if_smc.c		optional smc
 dev/smc/if_smc_fdt.c		optional smc fdt
 dev/sn/if_sn.c			optional sn
 dev/sn/if_sn_isa.c		optional sn isa
 dev/sn/if_sn_pccard.c		optional sn pccard
 dev/snp/snp.c			optional snp
 dev/sound/clone.c		optional sound
 dev/sound/unit.c		optional sound
 dev/sound/isa/ad1816.c		optional snd_ad1816 isa
 dev/sound/isa/ess.c		optional snd_ess isa
 dev/sound/isa/gusc.c		optional snd_gusc isa
 dev/sound/isa/mss.c		optional snd_mss isa
 dev/sound/isa/sb16.c		optional snd_sb16 isa
 dev/sound/isa/sb8.c		optional snd_sb8 isa
 dev/sound/isa/sbc.c		optional snd_sbc isa
 dev/sound/isa/sndbuf_dma.c	optional sound isa
 dev/sound/pci/als4000.c		optional snd_als4000 pci
 dev/sound/pci/atiixp.c		optional snd_atiixp pci
 dev/sound/pci/cmi.c		optional snd_cmi pci
 dev/sound/pci/cs4281.c		optional snd_cs4281 pci
 dev/sound/pci/csa.c		optional snd_csa pci
 dev/sound/pci/csapcm.c		optional snd_csa pci
 dev/sound/pci/ds1.c		optional snd_ds1 pci
 dev/sound/pci/emu10k1.c		optional snd_emu10k1 pci
 dev/sound/pci/emu10kx.c		optional snd_emu10kx pci
 dev/sound/pci/emu10kx-pcm.c	optional snd_emu10kx pci
 dev/sound/pci/emu10kx-midi.c	optional snd_emu10kx pci
 dev/sound/pci/envy24.c		optional snd_envy24 pci
 dev/sound/pci/envy24ht.c	optional snd_envy24ht pci
 dev/sound/pci/es137x.c		optional snd_es137x pci
 dev/sound/pci/fm801.c		optional snd_fm801 pci
 dev/sound/pci/ich.c		optional snd_ich pci
 dev/sound/pci/maestro.c		optional snd_maestro pci
 dev/sound/pci/maestro3.c	optional snd_maestro3 pci
 dev/sound/pci/neomagic.c	optional snd_neomagic pci
 dev/sound/pci/solo.c		optional snd_solo pci
 dev/sound/pci/spicds.c		optional snd_spicds pci
 dev/sound/pci/t4dwave.c		optional snd_t4dwave pci
 dev/sound/pci/via8233.c		optional snd_via8233 pci
 dev/sound/pci/via82c686.c	optional snd_via82c686 pci
 dev/sound/pci/vibes.c		optional snd_vibes pci
 dev/sound/pci/hda/hdaa.c	optional snd_hda pci
 dev/sound/pci/hda/hdaa_patches.c	optional snd_hda pci
 dev/sound/pci/hda/hdac.c	optional snd_hda pci
 dev/sound/pci/hda/hdac_if.m	optional snd_hda pci
 dev/sound/pci/hda/hdacc.c	optional snd_hda pci
 dev/sound/pci/hdspe.c		optional snd_hdspe pci
 dev/sound/pci/hdspe-pcm.c	optional snd_hdspe pci
 dev/sound/pcm/ac97.c		optional sound
 dev/sound/pcm/ac97_if.m		optional sound
 dev/sound/pcm/ac97_patch.c	optional sound
 dev/sound/pcm/buffer.c		optional sound	\
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/channel.c		optional sound
 dev/sound/pcm/channel_if.m	optional sound
 dev/sound/pcm/dsp.c		optional sound
 dev/sound/pcm/feeder.c		optional sound
 dev/sound/pcm/feeder_chain.c	optional sound
 dev/sound/pcm/feeder_eq.c	optional sound	\
 	dependency	"feeder_eq_gen.h"	\
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_if.m	optional sound
 dev/sound/pcm/feeder_format.c	optional sound  \
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_matrix.c	optional sound  \
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_mixer.c	optional sound  \
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_rate.c	optional sound	\
 	dependency	"feeder_rate_gen.h"	\
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_volume.c	optional sound  \
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/mixer.c		optional sound
 dev/sound/pcm/mixer_if.m	optional sound
 dev/sound/pcm/sndstat.c		optional sound
 dev/sound/pcm/sound.c		optional sound
 dev/sound/pcm/vchan.c		optional sound
 dev/sound/usb/uaudio.c		optional snd_uaudio usb
 dev/sound/usb/uaudio_pcm.c	optional snd_uaudio usb
 dev/sound/midi/midi.c		optional sound
 dev/sound/midi/mpu401.c		optional sound
 dev/sound/midi/mpu_if.m		optional sound
 dev/sound/midi/mpufoi_if.m	optional sound
 dev/sound/midi/sequencer.c	optional sound
 dev/sound/midi/synth_if.m	optional sound
 dev/spibus/ofw_spibus.c		optional fdt spibus
 dev/spibus/spibus.c		optional spibus				\
 	dependency	"spibus_if.h"
 dev/spibus/spigen.c		optional spigen
 dev/spibus/spibus_if.m		optional spibus
 dev/ste/if_ste.c		optional ste pci
 dev/stg/tmc18c30.c		optional stg
 dev/stg/tmc18c30_isa.c		optional stg isa
 dev/stg/tmc18c30_pccard.c	optional stg pccard
 dev/stg/tmc18c30_pci.c		optional stg pci
 dev/stg/tmc18c30_subr.c		optional stg
 dev/stge/if_stge.c		optional stge
 dev/sym/sym_hipd.c		optional sym				\
 	dependency	"$S/dev/sym/sym_{conf,defs}.h"
 dev/syscons/blank/blank_saver.c	optional blank_saver
 dev/syscons/daemon/daemon_saver.c optional daemon_saver
 dev/syscons/dragon/dragon_saver.c optional dragon_saver
 dev/syscons/fade/fade_saver.c	optional fade_saver
 dev/syscons/fire/fire_saver.c	optional fire_saver
 dev/syscons/green/green_saver.c	optional green_saver
 dev/syscons/logo/logo.c		optional logo_saver
 dev/syscons/logo/logo_saver.c	optional logo_saver
 dev/syscons/rain/rain_saver.c	optional rain_saver
 dev/syscons/schistory.c		optional sc
 dev/syscons/scmouse.c		optional sc
 dev/syscons/scterm.c		optional sc
 dev/syscons/scvidctl.c		optional sc
 dev/syscons/snake/snake_saver.c	optional snake_saver
 dev/syscons/star/star_saver.c	optional star_saver
 dev/syscons/syscons.c		optional sc
 dev/syscons/sysmouse.c		optional sc
 dev/syscons/warp/warp_saver.c	optional warp_saver
 dev/tdfx/tdfx_linux.c		optional tdfx_linux tdfx compat_linux
 dev/tdfx/tdfx_pci.c		optional tdfx pci
 dev/ti/if_ti.c			optional ti pci
 dev/tl/if_tl.c			optional tl pci
 dev/trm/trm.c			optional trm
 dev/twa/tw_cl_init.c		optional twa \
 	compile-with "${NORMAL_C} -I$S/dev/twa"
 dev/twa/tw_cl_intr.c		optional twa \
 	compile-with "${NORMAL_C} -I$S/dev/twa"
 dev/twa/tw_cl_io.c		optional twa \
 	compile-with "${NORMAL_C} -I$S/dev/twa"
 dev/twa/tw_cl_misc.c		optional twa \
 	compile-with "${NORMAL_C} -I$S/dev/twa"
 dev/twa/tw_osl_cam.c		optional twa \
 	compile-with "${NORMAL_C} -I$S/dev/twa"
 dev/twa/tw_osl_freebsd.c	optional twa \
 	compile-with "${NORMAL_C} -I$S/dev/twa"
 dev/twe/twe.c			optional twe
 dev/twe/twe_freebsd.c		optional twe
 dev/tws/tws.c			optional tws
 dev/tws/tws_cam.c		optional tws
 dev/tws/tws_hdm.c		optional tws
 dev/tws/tws_services.c		optional tws
 dev/tws/tws_user.c		optional tws
 dev/tx/if_tx.c			optional tx
 dev/txp/if_txp.c		optional txp
 dev/uart/uart_bus_acpi.c	optional uart acpi
 dev/uart/uart_bus_ebus.c	optional uart ebus
 dev/uart/uart_bus_fdt.c		optional uart fdt
 dev/uart/uart_bus_isa.c		optional uart isa
 dev/uart/uart_bus_pccard.c	optional uart pccard
 dev/uart/uart_bus_pci.c		optional uart pci
 dev/uart/uart_bus_puc.c		optional uart puc
 dev/uart/uart_bus_scc.c		optional uart scc
 dev/uart/uart_core.c		optional uart
 dev/uart/uart_dbg.c		optional uart gdb
 dev/uart/uart_dev_ns8250.c	optional uart uart_ns8250 | uart uart_snps
 dev/uart/uart_dev_pl011.c	optional uart pl011
 dev/uart/uart_dev_quicc.c	optional uart quicc
 dev/uart/uart_dev_sab82532.c	optional uart uart_sab82532
 dev/uart/uart_dev_sab82532.c	optional uart scc
 dev/uart/uart_dev_snps.c	optional uart uart_snps fdt
 dev/uart/uart_dev_z8530.c	optional uart uart_z8530
 dev/uart/uart_dev_z8530.c	optional uart scc
 dev/uart/uart_if.m		optional uart
 dev/uart/uart_subr.c		optional uart
 dev/uart/uart_tty.c		optional uart
 dev/ubsec/ubsec.c		optional ubsec
 #
 # USB controller drivers
 #
 dev/usb/controller/at91dci.c		optional at91dci
 dev/usb/controller/at91dci_atmelarm.c	optional at91dci at91rm9200
 dev/usb/controller/musb_otg.c		optional musb
 dev/usb/controller/musb_otg_atmelarm.c	optional musb at91rm9200
 dev/usb/controller/dwc_otg.c		optional dwcotg
 dev/usb/controller/dwc_otg_fdt.c	optional dwcotg fdt
 dev/usb/controller/ehci.c		optional ehci
 dev/usb/controller/ehci_pci.c		optional ehci pci
 dev/usb/controller/ohci.c		optional ohci
 dev/usb/controller/ohci_pci.c		optional ohci pci
 dev/usb/controller/uhci.c		optional uhci
 dev/usb/controller/uhci_pci.c		optional uhci pci
 dev/usb/controller/xhci.c		optional xhci
 dev/usb/controller/xhci_pci.c		optional xhci pci
 dev/usb/controller/saf1761_otg.c	optional saf1761otg
 dev/usb/controller/saf1761_otg_fdt.c	optional saf1761otg fdt
 dev/usb/controller/uss820dci.c		optional uss820dci
 dev/usb/controller/uss820dci_atmelarm.c	optional uss820dci at91rm9200
 dev/usb/controller/usb_controller.c	optional usb
 #
 # USB storage drivers
 #
 dev/usb/storage/cfumass.c	optional cfumass ctl
 dev/usb/storage/umass.c		optional umass
 dev/usb/storage/urio.c		optional urio
 dev/usb/storage/ustorage_fs.c	optional usfs
 #
 # USB core
 #
 dev/usb/usb_busdma.c		optional usb
 dev/usb/usb_core.c		optional usb
 dev/usb/usb_debug.c		optional usb
 dev/usb/usb_dev.c		optional usb
 dev/usb/usb_device.c		optional usb
 dev/usb/usb_dynamic.c		optional usb
 dev/usb/usb_error.c		optional usb
 dev/usb/usb_generic.c		optional usb
 dev/usb/usb_handle_request.c	optional usb
 dev/usb/usb_hid.c		optional usb
 dev/usb/usb_hub.c		optional usb
 dev/usb/usb_if.m		optional usb
 dev/usb/usb_lookup.c		optional usb
 dev/usb/usb_mbuf.c		optional usb
 dev/usb/usb_msctest.c		optional usb
 dev/usb/usb_parse.c		optional usb
 dev/usb/usb_pf.c		optional usb
 dev/usb/usb_process.c		optional usb
 dev/usb/usb_request.c		optional usb
 dev/usb/usb_transfer.c		optional usb
 dev/usb/usb_util.c		optional usb
 #
 # USB network drivers
 #
 dev/usb/net/if_aue.c		optional aue
 dev/usb/net/if_axe.c		optional axe
 dev/usb/net/if_axge.c		optional axge
 dev/usb/net/if_cdce.c		optional cdce
 dev/usb/net/if_cue.c		optional cue
 dev/usb/net/if_ipheth.c		optional ipheth
 dev/usb/net/if_kue.c		optional kue
 dev/usb/net/if_mos.c		optional mos
 dev/usb/net/if_rue.c		optional rue
 dev/usb/net/if_smsc.c		optional smsc
 dev/usb/net/if_udav.c		optional udav
 dev/usb/net/if_ure.c		optional ure
 dev/usb/net/if_usie.c		optional usie
 dev/usb/net/if_urndis.c		optional urndis
 dev/usb/net/ruephy.c		optional rue
 dev/usb/net/usb_ethernet.c	optional uether | aue | axe | axge | cdce | \
 					 cue | ipheth | kue | mos | rue | \
 					 smsc | udav | ure | urndis
 dev/usb/net/uhso.c		optional uhso
 #
 # USB WLAN drivers
 #
 dev/usb/wlan/if_rsu.c		optional rsu
 rsu-rtl8712fw.c			optional rsu-rtl8712fw | rsufw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rsu-rtl8712fw.fw:rsu-rtl8712fw:120 -mrsu-rtl8712fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"rsu-rtl8712fw.c"
 rsu-rtl8712fw.fwo		optional rsu-rtl8712fw | rsufw		\
 	dependency	"rsu-rtl8712fw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rsu-rtl8712fw.fwo"
 rsu-rtl8712fw.fw		optional rsu-rtl8712.fw | rsufw		\
 	dependency	"$S/contrib/dev/rsu/rsu-rtl8712fw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rsu-rtl8712fw.fw"
 dev/usb/wlan/if_rum.c		optional rum
 dev/usb/wlan/if_run.c		optional run
 runfw.c				optional runfw							\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk run.fw:runfw -mrunfw -c${.TARGET}"	\
 	no-implicit-rule before-depend local							\
 	clean		"runfw.c"
 runfw.fwo			optional runfw							\
 	dependency	"run.fw"								\
 	compile-with	"${NORMAL_FWO}"								\
 	no-implicit-rule									\
 	clean		"runfw.fwo"
 run.fw				optional runfw							\
 	dependency	"$S/contrib/dev/run/rt2870.fw.uu"					\
 	compile-with	"${NORMAL_FW}"								\
 	no-obj no-implicit-rule									\
 	clean		"run.fw"
 dev/usb/wlan/if_uath.c		optional uath
 dev/usb/wlan/if_upgt.c		optional upgt
 dev/usb/wlan/if_ural.c		optional ural
 dev/usb/wlan/if_urtw.c		optional urtw
 dev/usb/wlan/if_zyd.c		optional zyd
 #
 # USB serial and parallel port drivers
 #
 dev/usb/serial/u3g.c		optional u3g
 dev/usb/serial/uark.c		optional uark
 dev/usb/serial/ubsa.c		optional ubsa
 dev/usb/serial/ubser.c		optional ubser
 dev/usb/serial/uchcom.c		optional uchcom
 dev/usb/serial/ucycom.c		optional ucycom
 dev/usb/serial/ufoma.c		optional ufoma
 dev/usb/serial/uftdi.c		optional uftdi
 dev/usb/serial/ugensa.c		optional ugensa
 dev/usb/serial/uipaq.c		optional uipaq
 dev/usb/serial/ulpt.c		optional ulpt
 dev/usb/serial/umcs.c		optional umcs
 dev/usb/serial/umct.c		optional umct
 dev/usb/serial/umodem.c		optional umodem
 dev/usb/serial/umoscom.c	optional umoscom
 dev/usb/serial/uplcom.c		optional uplcom
 dev/usb/serial/uslcom.c		optional uslcom
 dev/usb/serial/uvisor.c		optional uvisor
 dev/usb/serial/uvscom.c		optional uvscom
 dev/usb/serial/usb_serial.c 	optional ucom | u3g | uark | ubsa | ubser | \
 					 uchcom | ucycom | ufoma | uftdi | \
 					 ugensa | uipaq | umcs | umct | \
 					 umodem | umoscom | uplcom | usie | \
 					 uslcom | uvisor | uvscom
 #
 # USB misc drivers
 #
 dev/usb/misc/ufm.c		optional ufm
 dev/usb/misc/udbp.c		optional udbp
 dev/usb/misc/ugold.c		optional ugold
 dev/usb/misc/uled.c		optional uled
 #
 # USB input drivers
 #
 dev/usb/input/atp.c		optional atp
 dev/usb/input/uep.c		optional uep
 dev/usb/input/uhid.c		optional uhid
 dev/usb/input/ukbd.c		optional ukbd
 dev/usb/input/ums.c		optional ums
 dev/usb/input/wsp.c		optional wsp
 #
 # USB quirks
 #
 dev/usb/quirk/usb_quirk.c	optional usb
 #
 # USB templates
 #
 dev/usb/template/usb_template.c		optional usb_template
 dev/usb/template/usb_template_audio.c	optional usb_template
 dev/usb/template/usb_template_cdce.c	optional usb_template
 dev/usb/template/usb_template_kbd.c	optional usb_template
 dev/usb/template/usb_template_modem.c	optional usb_template
 dev/usb/template/usb_template_mouse.c	optional usb_template
 dev/usb/template/usb_template_msc.c	optional usb_template
 dev/usb/template/usb_template_mtp.c	optional usb_template
 dev/usb/template/usb_template_phone.c	optional usb_template
 dev/usb/template/usb_template_serialnet.c	optional usb_template
 dev/usb/template/usb_template_midi.c	optional usb_template
 #
 # USB video drivers
 #
 dev/usb/video/udl.c			optional udl
 #
 # USB END
 #
 dev/videomode/videomode.c		optional videomode
 dev/videomode/edid.c			optional videomode
 dev/videomode/pickmode.c		optional videomode
 dev/videomode/vesagtf.c			optional videomode
 dev/vge/if_vge.c		optional vge
 dev/viapm/viapm.c		optional viapm pci
 dev/virtio/virtio.c			optional	virtio
 dev/virtio/virtqueue.c			optional	virtio
 dev/virtio/virtio_bus_if.m		optional	virtio
 dev/virtio/virtio_if.m			optional	virtio
 dev/virtio/pci/virtio_pci.c		optional	virtio_pci
 dev/virtio/mmio/virtio_mmio.c		optional	virtio_mmio fdt
 dev/virtio/mmio/virtio_mmio_if.m	optional	virtio_mmio fdt
 dev/virtio/network/if_vtnet.c		optional	vtnet
 dev/virtio/block/virtio_blk.c		optional	virtio_blk
 dev/virtio/balloon/virtio_balloon.c	optional	virtio_balloon
 dev/virtio/scsi/virtio_scsi.c		optional	virtio_scsi
 dev/virtio/random/virtio_random.c	optional	virtio_random
 dev/virtio/console/virtio_console.c	optional	virtio_console
 dev/vkbd/vkbd.c			optional vkbd
 dev/vr/if_vr.c			optional vr pci
 dev/vt/colors/vt_termcolors.c	optional vt
 dev/vt/font/vt_font_default.c	optional vt
 dev/vt/font/vt_mouse_cursor.c	optional vt
 dev/vt/hw/efifb/efifb.c		optional vt_efifb
 dev/vt/hw/fb/vt_fb.c		optional vt
 dev/vt/hw/vga/vt_vga.c		optional vt vt_vga
 dev/vt/logo/logo_freebsd.c	optional vt splash
 dev/vt/logo/logo_beastie.c	optional vt splash
 dev/vt/vt_buf.c			optional vt
 dev/vt/vt_consolectl.c		optional vt
 dev/vt/vt_core.c		optional vt
 dev/vt/vt_cpulogos.c		optional vt splash
 dev/vt/vt_font.c		optional vt
 dev/vt/vt_sysmouse.c		optional vt
 dev/vte/if_vte.c		optional vte pci
 dev/vx/if_vx.c			optional vx
 dev/vx/if_vx_pci.c		optional vx pci
 dev/vxge/vxge.c				optional vxge
 dev/vxge/vxgehal/vxgehal-ifmsg.c	optional vxge
 dev/vxge/vxgehal/vxgehal-mrpcim.c	optional vxge
 dev/vxge/vxgehal/vxge-queue.c		optional vxge
 dev/vxge/vxgehal/vxgehal-ring.c		optional vxge
 dev/vxge/vxgehal/vxgehal-swapper.c	optional vxge
 dev/vxge/vxgehal/vxgehal-mgmt.c		optional vxge
 dev/vxge/vxgehal/vxgehal-srpcim.c	optional vxge
 dev/vxge/vxgehal/vxgehal-config.c	optional vxge
 dev/vxge/vxgehal/vxgehal-blockpool.c	optional vxge
 dev/vxge/vxgehal/vxgehal-doorbells.c	optional vxge
 dev/vxge/vxgehal/vxgehal-mgmtaux.c	optional vxge
 dev/vxge/vxgehal/vxgehal-device.c	optional vxge
 dev/vxge/vxgehal/vxgehal-mm.c		optional vxge
 dev/vxge/vxgehal/vxgehal-driver.c	optional vxge
 dev/vxge/vxgehal/vxgehal-virtualpath.c	optional vxge
 dev/vxge/vxgehal/vxgehal-channel.c	optional vxge
 dev/vxge/vxgehal/vxgehal-fifo.c		optional vxge
 dev/watchdog/watchdog.c		standard
 dev/wb/if_wb.c			optional wb pci
 dev/wi/if_wi.c			optional wi
 dev/wi/if_wi_pccard.c		optional wi pccard
 dev/wi/if_wi_pci.c		optional wi pci
 dev/wpi/if_wpi.c		optional wpi pci
 wpifw.c			optional wpifw					\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:153229 -mwpi -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"wpifw.c"
 wpifw.fwo			optional wpifw				\
 	dependency	"wpi.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"wpifw.fwo"
 wpi.fw			optional wpifw					\
 	dependency	"$S/contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"wpi.fw"
 dev/xdma/xdma.c			optional xdma
 dev/xdma/xdma_if.m		optional xdma
 dev/xdma/xdma_fdt_test.c	optional xdma xdma_test fdt
 dev/xe/if_xe.c			optional xe
 dev/xe/if_xe_pccard.c		optional xe pccard
 dev/xen/balloon/balloon.c	optional xenhvm
 dev/xen/blkfront/blkfront.c	optional xenhvm
 dev/xen/blkback/blkback.c	optional xenhvm
 dev/xen/console/xen_console.c	optional xenhvm
 dev/xen/control/control.c	optional xenhvm
 dev/xen/grant_table/grant_table.c	optional xenhvm
 dev/xen/netback/netback.c	optional xenhvm
 dev/xen/netfront/netfront.c	optional xenhvm
 dev/xen/xenpci/xenpci.c		optional xenpci
 dev/xen/timer/timer.c		optional xenhvm
 dev/xen/pvcpu/pvcpu.c		optional xenhvm
 dev/xen/xenstore/xenstore.c	optional xenhvm
 dev/xen/xenstore/xenstore_dev.c	optional xenhvm
 dev/xen/xenstore/xenstored_dev.c	optional xenhvm
 dev/xen/evtchn/evtchn_dev.c	optional xenhvm
 dev/xen/privcmd/privcmd.c	optional xenhvm
 dev/xen/gntdev/gntdev.c		optional xenhvm
 dev/xen/debug/debug.c		optional xenhvm
 dev/xl/if_xl.c			optional xl pci
 dev/xl/xlphy.c			optional xl pci
 fs/autofs/autofs.c		optional autofs
 fs/autofs/autofs_vfsops.c	optional autofs
 fs/autofs/autofs_vnops.c	optional autofs
 fs/deadfs/dead_vnops.c		standard
 fs/devfs/devfs_devs.c		standard
 fs/devfs/devfs_dir.c		standard
 fs/devfs/devfs_rule.c		standard
 fs/devfs/devfs_vfsops.c		standard
 fs/devfs/devfs_vnops.c		standard
 fs/fdescfs/fdesc_vfsops.c	optional fdescfs
 fs/fdescfs/fdesc_vnops.c	optional fdescfs
 fs/fifofs/fifo_vnops.c		standard
 fs/cuse/cuse.c			optional cuse
 fs/fuse/fuse_device.c		optional fuse
 fs/fuse/fuse_file.c		optional fuse
 fs/fuse/fuse_internal.c		optional fuse
 fs/fuse/fuse_io.c		optional fuse
 fs/fuse/fuse_ipc.c		optional fuse
 fs/fuse/fuse_main.c		optional fuse
 fs/fuse/fuse_node.c		optional fuse
 fs/fuse/fuse_vfsops.c		optional fuse
 fs/fuse/fuse_vnops.c		optional fuse
 fs/msdosfs/msdosfs_conv.c	optional msdosfs
 fs/msdosfs/msdosfs_denode.c	optional msdosfs
 fs/msdosfs/msdosfs_fat.c	optional msdosfs
 fs/msdosfs/msdosfs_fileno.c	optional msdosfs
 fs/msdosfs/msdosfs_iconv.c	optional msdosfs_iconv
 fs/msdosfs/msdosfs_lookup.c	optional msdosfs
 fs/msdosfs/msdosfs_vfsops.c	optional msdosfs
 fs/msdosfs/msdosfs_vnops.c	optional msdosfs
 fs/nandfs/bmap.c		optional nandfs
 fs/nandfs/nandfs_alloc.c	optional nandfs
 fs/nandfs/nandfs_bmap.c		optional nandfs
 fs/nandfs/nandfs_buffer.c	optional nandfs
 fs/nandfs/nandfs_cleaner.c	optional nandfs
 fs/nandfs/nandfs_cpfile.c	optional nandfs
 fs/nandfs/nandfs_dat.c		optional nandfs
 fs/nandfs/nandfs_dir.c		optional nandfs
 fs/nandfs/nandfs_ifile.c	optional nandfs
 fs/nandfs/nandfs_segment.c	optional nandfs
 fs/nandfs/nandfs_subr.c		optional nandfs
 fs/nandfs/nandfs_sufile.c	optional nandfs
 fs/nandfs/nandfs_vfsops.c	optional nandfs
 fs/nandfs/nandfs_vnops.c	optional nandfs
 fs/nfs/nfs_commonkrpc.c		optional nfscl | nfsd
 fs/nfs/nfs_commonsubs.c		optional nfscl | nfsd
 fs/nfs/nfs_commonport.c		optional nfscl | nfsd
 fs/nfs/nfs_commonacl.c		optional nfscl | nfsd
 fs/nfsclient/nfs_clcomsubs.c	optional nfscl
 fs/nfsclient/nfs_clsubs.c	optional nfscl
 fs/nfsclient/nfs_clstate.c	optional nfscl
 fs/nfsclient/nfs_clkrpc.c	optional nfscl
 fs/nfsclient/nfs_clrpcops.c	optional nfscl
 fs/nfsclient/nfs_clvnops.c	optional nfscl
 fs/nfsclient/nfs_clnode.c	optional nfscl
 fs/nfsclient/nfs_clvfsops.c	optional nfscl
 fs/nfsclient/nfs_clport.c	optional nfscl
 fs/nfsclient/nfs_clbio.c	optional nfscl
 fs/nfsclient/nfs_clnfsiod.c	optional nfscl
 fs/nfsserver/nfs_fha_new.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdsocket.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdsubs.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdstate.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdkrpc.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdserv.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdport.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdcache.c	optional nfsd inet
 fs/nullfs/null_subr.c		optional nullfs
 fs/nullfs/null_vfsops.c		optional nullfs
 fs/nullfs/null_vnops.c		optional nullfs
 fs/procfs/procfs.c		optional procfs
 fs/procfs/procfs_dbregs.c	optional procfs
 fs/procfs/procfs_fpregs.c	optional procfs
 fs/procfs/procfs_ioctl.c	optional procfs
 fs/procfs/procfs_map.c		optional procfs
 fs/procfs/procfs_mem.c		optional procfs
 fs/procfs/procfs_note.c		optional procfs
 fs/procfs/procfs_osrel.c	optional procfs
 fs/procfs/procfs_regs.c		optional procfs
 fs/procfs/procfs_rlimit.c	optional procfs
 fs/procfs/procfs_status.c	optional procfs
 fs/procfs/procfs_type.c		optional procfs
 fs/pseudofs/pseudofs.c		optional pseudofs
 fs/pseudofs/pseudofs_fileno.c	optional pseudofs
 fs/pseudofs/pseudofs_vncache.c	optional pseudofs
 fs/pseudofs/pseudofs_vnops.c	optional pseudofs
 fs/smbfs/smbfs_io.c		optional smbfs
 fs/smbfs/smbfs_node.c		optional smbfs
 fs/smbfs/smbfs_smb.c		optional smbfs
 fs/smbfs/smbfs_subr.c		optional smbfs
 fs/smbfs/smbfs_vfsops.c		optional smbfs
 fs/smbfs/smbfs_vnops.c		optional smbfs
 fs/udf/osta.c			optional udf
 fs/udf/udf_iconv.c		optional udf_iconv
 fs/udf/udf_vfsops.c		optional udf
 fs/udf/udf_vnops.c		optional udf
 fs/unionfs/union_subr.c		optional unionfs
 fs/unionfs/union_vfsops.c	optional unionfs
 fs/unionfs/union_vnops.c	optional unionfs
 fs/tmpfs/tmpfs_vnops.c		optional tmpfs
 fs/tmpfs/tmpfs_fifoops.c 	optional tmpfs
 fs/tmpfs/tmpfs_vfsops.c 	optional tmpfs
 fs/tmpfs/tmpfs_subr.c 		optional tmpfs
 gdb/gdb_cons.c			optional gdb
 gdb/gdb_main.c			optional gdb
 gdb/gdb_packet.c		optional gdb
 geom/bde/g_bde.c		optional geom_bde
 geom/bde/g_bde_crypt.c		optional geom_bde
 geom/bde/g_bde_lock.c		optional geom_bde
 geom/bde/g_bde_work.c		optional geom_bde
 geom/cache/g_cache.c		optional geom_cache
 geom/concat/g_concat.c		optional geom_concat
 geom/eli/g_eli.c		optional geom_eli
 geom/eli/g_eli_crypto.c		optional geom_eli
 geom/eli/g_eli_ctl.c		optional geom_eli
 geom/eli/g_eli_hmac.c		optional geom_eli
 geom/eli/g_eli_integrity.c	optional geom_eli
 geom/eli/g_eli_key.c		optional geom_eli
 geom/eli/g_eli_key_cache.c	optional geom_eli
 geom/eli/g_eli_privacy.c	optional geom_eli
 geom/eli/pkcs5v2.c		optional geom_eli
 geom/gate/g_gate.c		optional geom_gate
 geom/geom_aes.c			optional geom_aes
 geom/geom_bsd.c			optional geom_bsd
 geom/geom_bsd_enc.c		optional geom_bsd | geom_part_bsd
 geom/geom_ccd.c			optional ccd | geom_ccd
 geom/geom_ctl.c			standard
 geom/geom_dev.c			standard
 geom/geom_disk.c		standard
 geom/geom_dump.c		standard
 geom/geom_event.c		standard
 geom/geom_fox.c			optional geom_fox
 geom/geom_flashmap.c		optional fdt cfi | fdt nand | fdt mx25l | mmcsd
 geom/geom_io.c			standard
 geom/geom_kern.c		standard
 geom/geom_map.c			optional geom_map
 geom/geom_mbr.c			optional geom_mbr
 geom/geom_mbr_enc.c		optional geom_mbr
 geom/geom_redboot.c		optional geom_redboot
 geom/geom_slice.c		standard
 geom/geom_subr.c		standard
 geom/geom_sunlabel.c		optional geom_sunlabel
 geom/geom_sunlabel_enc.c	optional geom_sunlabel
 geom/geom_vfs.c			standard
 geom/geom_vol_ffs.c		optional geom_vol
 geom/journal/g_journal.c	optional geom_journal
 geom/journal/g_journal_ufs.c	optional geom_journal
 geom/label/g_label.c		optional geom_label | geom_label_gpt
 geom/label/g_label_ext2fs.c	optional geom_label
 geom/label/g_label_iso9660.c	optional geom_label
 geom/label/g_label_msdosfs.c	optional geom_label
 geom/label/g_label_ntfs.c	optional geom_label
 geom/label/g_label_reiserfs.c	optional geom_label
 geom/label/g_label_ufs.c	optional geom_label
 geom/label/g_label_gpt.c	optional geom_label | geom_label_gpt
 geom/label/g_label_disk_ident.c	optional geom_label
 geom/linux_lvm/g_linux_lvm.c	optional geom_linux_lvm
 geom/mirror/g_mirror.c		optional geom_mirror
 geom/mirror/g_mirror_ctl.c	optional geom_mirror
 geom/mountver/g_mountver.c	optional geom_mountver
 geom/multipath/g_multipath.c	optional geom_multipath
 geom/nop/g_nop.c		optional geom_nop
 geom/part/g_part.c		standard
 geom/part/g_part_if.m		standard
 geom/part/g_part_apm.c		optional geom_part_apm
 geom/part/g_part_bsd.c		optional geom_part_bsd
 geom/part/g_part_bsd64.c	optional geom_part_bsd64
 geom/part/g_part_ebr.c		optional geom_part_ebr
 geom/part/g_part_gpt.c		optional geom_part_gpt
 geom/part/g_part_ldm.c		optional geom_part_ldm
 geom/part/g_part_mbr.c		optional geom_part_mbr
 geom/part/g_part_vtoc8.c	optional geom_part_vtoc8
 geom/raid/g_raid.c		optional geom_raid
 geom/raid/g_raid_ctl.c		optional geom_raid
 geom/raid/g_raid_md_if.m	optional geom_raid
 geom/raid/g_raid_tr_if.m	optional geom_raid
 geom/raid/md_ddf.c		optional geom_raid
 geom/raid/md_intel.c		optional geom_raid
 geom/raid/md_jmicron.c		optional geom_raid
 geom/raid/md_nvidia.c		optional geom_raid
 geom/raid/md_promise.c		optional geom_raid
 geom/raid/md_sii.c		optional geom_raid
 geom/raid/tr_concat.c		optional geom_raid
 geom/raid/tr_raid0.c		optional geom_raid
 geom/raid/tr_raid1.c		optional geom_raid
 geom/raid/tr_raid1e.c		optional geom_raid
 geom/raid/tr_raid5.c		optional geom_raid
 geom/raid3/g_raid3.c		optional geom_raid3
 geom/raid3/g_raid3_ctl.c	optional geom_raid3
 geom/shsec/g_shsec.c		optional geom_shsec
 geom/stripe/g_stripe.c		optional geom_stripe
 contrib/xz-embedded/freebsd/xz_malloc.c	\
 	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_crc32.c \
 	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c \
 	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \
 	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c \
 	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 geom/uzip/g_uzip.c		optional geom_uzip
 geom/uzip/g_uzip_lzma.c		optional geom_uzip
 geom/uzip/g_uzip_wrkthr.c	optional geom_uzip
 geom/uzip/g_uzip_zlib.c		optional geom_uzip
 geom/vinum/geom_vinum.c		optional geom_vinum
 geom/vinum/geom_vinum_create.c	optional geom_vinum
 geom/vinum/geom_vinum_drive.c	optional geom_vinum
 geom/vinum/geom_vinum_plex.c	optional geom_vinum
 geom/vinum/geom_vinum_volume.c	optional geom_vinum
 geom/vinum/geom_vinum_subr.c	optional geom_vinum
 geom/vinum/geom_vinum_raid5.c	optional geom_vinum
 geom/vinum/geom_vinum_share.c	optional geom_vinum
 geom/vinum/geom_vinum_list.c	optional geom_vinum
 geom/vinum/geom_vinum_rm.c	optional geom_vinum
 geom/vinum/geom_vinum_init.c	optional geom_vinum
 geom/vinum/geom_vinum_state.c	optional geom_vinum
 geom/vinum/geom_vinum_rename.c	optional geom_vinum
 geom/vinum/geom_vinum_move.c	optional geom_vinum
 geom/vinum/geom_vinum_events.c	optional geom_vinum
 geom/virstor/binstream.c	optional geom_virstor
 geom/virstor/g_virstor.c	optional geom_virstor
 geom/virstor/g_virstor_md.c	optional geom_virstor
 geom/zero/g_zero.c		optional geom_zero
 fs/ext2fs/ext2_alloc.c		optional ext2fs
 fs/ext2fs/ext2_balloc.c		optional ext2fs
 fs/ext2fs/ext2_bmap.c		optional ext2fs
 fs/ext2fs/ext2_extattr.c	optional ext2fs
 fs/ext2fs/ext2_extents.c	optional ext2fs
 fs/ext2fs/ext2_inode.c		optional ext2fs
 fs/ext2fs/ext2_inode_cnv.c	optional ext2fs
 fs/ext2fs/ext2_hash.c		optional ext2fs
 fs/ext2fs/ext2_htree.c		optional ext2fs
 fs/ext2fs/ext2_lookup.c		optional ext2fs
 fs/ext2fs/ext2_subr.c		optional ext2fs
 fs/ext2fs/ext2_vfsops.c		optional ext2fs
 fs/ext2fs/ext2_vnops.c		optional ext2fs
 #
 isa/isa_if.m			standard
 isa/isa_common.c		optional isa
 isa/isahint.c			optional isa
 isa/pnp.c			optional isa isapnp
 isa/pnpparse.c			optional isa isapnp
 fs/cd9660/cd9660_bmap.c	optional cd9660
 fs/cd9660/cd9660_lookup.c	optional cd9660
 fs/cd9660/cd9660_node.c	optional cd9660
 fs/cd9660/cd9660_rrip.c	optional cd9660
 fs/cd9660/cd9660_util.c	optional cd9660
 fs/cd9660/cd9660_vfsops.c	optional cd9660
 fs/cd9660/cd9660_vnops.c	optional cd9660
 fs/cd9660/cd9660_iconv.c	optional cd9660_iconv
 kern/bus_if.m			standard
 kern/clock_if.m			standard
 kern/cpufreq_if.m		standard
 kern/device_if.m		standard
 kern/imgact_binmisc.c		optional	imagact_binmisc
 kern/imgact_elf.c		standard
 kern/imgact_elf32.c		optional compat_freebsd32
 kern/imgact_shell.c		standard
 kern/inflate.c			optional gzip
 kern/init_main.c		standard
 kern/init_sysent.c		standard
 kern/ksched.c			optional _kposix_priority_scheduling
 kern/kern_acct.c		standard
 kern/kern_alq.c			optional alq
 kern/kern_clock.c		standard
 kern/kern_condvar.c		standard
 kern/kern_conf.c		standard
 kern/kern_cons.c		standard
 kern/kern_cpu.c			standard
 kern/kern_cpuset.c		standard
 kern/kern_context.c		standard
 kern/kern_descrip.c		standard
 kern/kern_dtrace.c		optional kdtrace_hooks
 kern/kern_dump.c		standard
 kern/kern_environment.c		standard
 kern/kern_et.c			standard
 kern/kern_event.c		standard
 kern/kern_exec.c		standard
 kern/kern_exit.c		standard
 kern/kern_fail.c		standard
 kern/kern_ffclock.c		standard
 kern/kern_fork.c		standard
 kern/kern_gzio.c		optional gzio
 kern/kern_hhook.c		standard
 kern/kern_idle.c		standard
 kern/kern_intr.c		standard
 kern/kern_jail.c		standard
 kern/kern_khelp.c		standard
 kern/kern_kthread.c		standard
 kern/kern_ktr.c			optional ktr
 kern/kern_ktrace.c		standard
 kern/kern_linker.c		standard
 kern/kern_lock.c		standard
 kern/kern_lockf.c		standard
 kern/kern_lockstat.c		optional kdtrace_hooks
 kern/kern_loginclass.c		standard
 kern/kern_malloc.c		standard
 kern/kern_mbuf.c		standard
 kern/kern_mib.c			standard
 kern/kern_module.c		standard
 kern/kern_mtxpool.c		standard
 kern/kern_mutex.c		standard
 kern/kern_ntptime.c		standard
 kern/kern_numa.c		standard
 kern/kern_osd.c			standard
 kern/kern_physio.c		standard
 kern/kern_pmc.c			standard
 kern/kern_poll.c		optional device_polling
 kern/kern_priv.c		standard
 kern/kern_proc.c		standard
 kern/kern_procctl.c		standard
 kern/kern_prot.c		standard
 kern/kern_racct.c		standard
 kern/kern_rangelock.c		standard
 kern/kern_rctl.c		standard
 kern/kern_resource.c		standard
 kern/kern_rmlock.c		standard
 kern/kern_rwlock.c		standard
 kern/kern_sdt.c			optional kdtrace_hooks
 kern/kern_sema.c		standard
 kern/kern_sendfile.c		standard
 kern/kern_sharedpage.c		standard
 kern/kern_shutdown.c		standard
 kern/kern_sig.c			standard
 kern/kern_switch.c		standard
 kern/kern_sx.c			standard
 kern/kern_synch.c		standard
 kern/kern_syscalls.c		standard
 kern/kern_sysctl.c		standard
 kern/kern_tc.c			standard
 kern/kern_thr.c			standard
 kern/kern_thread.c		standard
 kern/kern_time.c		standard
 kern/kern_timeout.c		standard
 kern/kern_umtx.c		standard
 kern/kern_uuid.c		standard
 kern/kern_xxx.c			standard
 kern/link_elf.c			standard
 kern/linker_if.m		standard
 kern/md4c.c			optional netsmb
 kern/md5c.c			standard
 kern/p1003_1b.c			standard
 kern/posix4_mib.c		standard
 kern/sched_4bsd.c		optional sched_4bsd
 kern/sched_ule.c		optional sched_ule
 kern/serdev_if.m		standard
 kern/stack_protector.c		standard \
 	compile-with "${NORMAL_C:N-fstack-protector*}"
 kern/subr_acl_nfs4.c		optional ufs_acl | zfs
 kern/subr_acl_posix1e.c		optional ufs_acl
 kern/subr_autoconf.c		standard
 kern/subr_blist.c		standard
 kern/subr_bus.c			standard
 kern/subr_bus_dma.c		standard
 kern/subr_bufring.c		standard
 kern/subr_capability.c		standard
 kern/subr_clock.c		standard
 kern/subr_counter.c		standard
 kern/subr_devstat.c		standard
 kern/subr_disk.c		standard
 kern/subr_eventhandler.c	standard
 kern/subr_fattime.c		standard
 kern/subr_firmware.c		optional firmware
 kern/subr_gtaskqueue.c		standard
 kern/subr_hash.c		standard
 kern/subr_hints.c		standard
 kern/subr_kdb.c			standard
 kern/subr_kobj.c		standard
 kern/subr_lock.c		standard
 kern/subr_log.c			standard
 kern/subr_mbpool.c		optional libmbpool
 kern/subr_mchain.c		optional libmchain
 kern/subr_module.c		standard
 kern/subr_msgbuf.c		standard
 kern/subr_param.c		standard
 kern/subr_pcpu.c		standard
 kern/subr_pctrie.c		standard
 kern/subr_power.c		standard
 kern/subr_prf.c			standard
 kern/subr_prof.c		standard
 kern/subr_rman.c		standard
 kern/subr_rtc.c			standard
 kern/subr_sbuf.c		standard
 kern/subr_scanf.c		standard
 kern/subr_sglist.c		standard
 kern/subr_sleepqueue.c		standard
 kern/subr_smp.c			standard
 kern/subr_stack.c		optional ddb | stack | ktr
 kern/subr_taskqueue.c		standard
 kern/subr_terminal.c		optional vt
 kern/subr_trap.c		standard
 kern/subr_turnstile.c		standard
 kern/subr_uio.c			standard
 kern/subr_unit.c		standard
 kern/subr_vmem.c		standard
 kern/subr_witness.c		optional witness
 kern/sys_capability.c		standard
 kern/sys_generic.c		standard
 kern/sys_pipe.c			standard
 kern/sys_procdesc.c		standard
 kern/sys_process.c		standard
 kern/sys_socket.c		standard
 kern/syscalls.c			standard
 kern/sysv_ipc.c			standard
 kern/sysv_msg.c			optional sysvmsg
 kern/sysv_sem.c			optional sysvsem
 kern/sysv_shm.c			optional sysvshm
 kern/tty.c			standard
 kern/tty_compat.c		optional compat_43tty
 kern/tty_info.c			standard
 kern/tty_inq.c			standard
 kern/tty_outq.c			standard
 kern/tty_pts.c			standard
 kern/tty_tty.c			standard
 kern/tty_ttydisc.c		standard
 kern/uipc_accf.c		standard
 kern/uipc_debug.c		optional ddb
 kern/uipc_domain.c		standard
 kern/uipc_mbuf.c		standard
 kern/uipc_mbuf2.c		standard
 kern/uipc_mbufhash.c		standard
 kern/uipc_mqueue.c		optional p1003_1b_mqueue
 kern/uipc_sem.c			optional p1003_1b_semaphores
 kern/uipc_shm.c			standard
 kern/uipc_sockbuf.c		standard
 kern/uipc_socket.c		standard
 kern/uipc_syscalls.c		standard
 kern/uipc_usrreq.c		standard
 kern/vfs_acl.c			standard
 kern/vfs_aio.c			standard
 kern/vfs_bio.c			standard
 kern/vfs_cache.c		standard
 kern/vfs_cluster.c		standard
 kern/vfs_default.c		standard
 kern/vfs_export.c		standard
 kern/vfs_extattr.c		standard
 kern/vfs_hash.c			standard
 kern/vfs_init.c			standard
 kern/vfs_lookup.c		standard
 kern/vfs_mount.c		standard
 kern/vfs_mountroot.c		standard
 kern/vfs_subr.c			standard
 kern/vfs_syscalls.c		standard
 kern/vfs_vnops.c		standard
 #
 # Kernel GSS-API
 #
 gssd.h				optional kgssapi			\
 	dependency		"$S/kgssapi/gssd.x"			\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h" \
 	no-obj no-implicit-rule before-depend local			\
 	clean			"gssd.h"
 gssd_xdr.c			optional kgssapi			\
 	dependency		"$S/kgssapi/gssd.x gssd.h"		\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c" \
 	no-implicit-rule before-depend local				\
 	clean			"gssd_xdr.c"
 gssd_clnt.c			optional kgssapi			\
 	dependency		"$S/kgssapi/gssd.x gssd.h"		\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c" \
 	no-implicit-rule before-depend local				\
 	clean			"gssd_clnt.c"
 kgssapi/gss_accept_sec_context.c optional kgssapi
 kgssapi/gss_add_oid_set_member.c optional kgssapi
 kgssapi/gss_acquire_cred.c	optional kgssapi
 kgssapi/gss_canonicalize_name.c	optional kgssapi
 kgssapi/gss_create_empty_oid_set.c optional kgssapi
 kgssapi/gss_delete_sec_context.c optional kgssapi
 kgssapi/gss_display_status.c	optional kgssapi
 kgssapi/gss_export_name.c	optional kgssapi
 kgssapi/gss_get_mic.c		optional kgssapi
 kgssapi/gss_init_sec_context.c	optional kgssapi
 kgssapi/gss_impl.c		optional kgssapi
 kgssapi/gss_import_name.c	optional kgssapi
 kgssapi/gss_names.c		optional kgssapi
 kgssapi/gss_pname_to_uid.c	optional kgssapi
 kgssapi/gss_release_buffer.c	optional kgssapi
 kgssapi/gss_release_cred.c	optional kgssapi
 kgssapi/gss_release_name.c	optional kgssapi
 kgssapi/gss_release_oid_set.c	optional kgssapi
 kgssapi/gss_set_cred_option.c	optional kgssapi
 kgssapi/gss_test_oid_set_member.c optional kgssapi
 kgssapi/gss_unwrap.c		optional kgssapi
 kgssapi/gss_verify_mic.c	optional kgssapi
 kgssapi/gss_wrap.c		optional kgssapi
 kgssapi/gss_wrap_size_limit.c	optional kgssapi
 kgssapi/gssd_prot.c		optional kgssapi
 kgssapi/krb5/krb5_mech.c	optional kgssapi
 kgssapi/krb5/kcrypto.c		optional kgssapi
 kgssapi/krb5/kcrypto_aes.c	optional kgssapi
 kgssapi/krb5/kcrypto_arcfour.c	optional kgssapi
 kgssapi/krb5/kcrypto_des.c	optional kgssapi
 kgssapi/krb5/kcrypto_des3.c	optional kgssapi
 kgssapi/kgss_if.m		optional kgssapi
 kgssapi/gsstest.c		optional kgssapi_debug
 # These files in libkern/ are those needed by all architectures.  Some
 # of the files in libkern/ are only needed on some architectures, e.g.,
 # libkern/divdi3.c is needed by i386 but not alpha.  Also, some of these
 # routines may be optimized for a particular platform.  In either case,
 # the file should be moved to conf/files.<arch> from here.
 #
 libkern/arc4random.c		standard
 crypto/chacha20/chacha.c	standard
 libkern/asprintf.c		standard
 libkern/bcd.c			standard
 libkern/bsearch.c		standard
 libkern/crc32.c			standard
 libkern/explicit_bzero.c	standard
 libkern/fnmatch.c		standard
 libkern/iconv.c			optional libiconv
 libkern/iconv_converter_if.m	optional libiconv
 libkern/iconv_ucs.c		optional libiconv
 libkern/iconv_xlat.c		optional libiconv
 libkern/iconv_xlat16.c		optional libiconv
 libkern/inet_aton.c		standard
 libkern/inet_ntoa.c		standard
 libkern/inet_ntop.c		standard
 libkern/inet_pton.c		standard
 libkern/jenkins_hash.c		standard
 libkern/murmur3_32.c		standard
 libkern/mcount.c		optional profiling-routine
 libkern/memcchr.c		standard
 libkern/memchr.c		standard
 libkern/memcmp.c		standard
 libkern/memmem.c		optional gdb
 libkern/qsort.c			standard
 libkern/qsort_r.c		standard
 libkern/random.c		standard
 libkern/scanc.c			standard
 libkern/strcasecmp.c		standard
 libkern/strcat.c		standard
 libkern/strchr.c		standard
 libkern/strcmp.c		standard
 libkern/strcpy.c		standard
 libkern/strcspn.c		standard
 libkern/strdup.c		standard
 libkern/strndup.c		standard
 libkern/strlcat.c		standard
 libkern/strlcpy.c		standard
 libkern/strlen.c		standard
 libkern/strncat.c		standard
 libkern/strncmp.c		standard
 libkern/strncpy.c		standard
 libkern/strnlen.c		standard
 libkern/strrchr.c		standard
 libkern/strsep.c		standard
 libkern/strspn.c		standard
 libkern/strstr.c		standard
 libkern/strtol.c		standard
 libkern/strtoq.c		standard
 libkern/strtoul.c		standard
 libkern/strtouq.c		standard
 libkern/strvalid.c		standard
 libkern/timingsafe_bcmp.c	standard
 libkern/zlib.c			optional crypto | geom_uzip | ipsec | \
 	ipsec_support | mxge | netgraph_deflate | ddb_ctf | gzio
 net/altq/altq_cbq.c		optional altq
 net/altq/altq_cdnr.c		optional altq
 net/altq/altq_codel.c		optional altq
 net/altq/altq_hfsc.c		optional altq
 net/altq/altq_fairq.c		optional altq
 net/altq/altq_priq.c		optional altq
 net/altq/altq_red.c		optional altq
 net/altq/altq_rio.c		optional altq
 net/altq/altq_rmclass.c		optional altq
 net/altq/altq_subr.c		optional altq
 net/bpf.c			standard
 net/bpf_buffer.c		optional bpf
 net/bpf_jitter.c		optional bpf_jitter
 net/bpf_filter.c		optional bpf | netgraph_bpf
 net/bpf_zerocopy.c		optional bpf
 net/bridgestp.c			optional bridge | if_bridge
 net/flowtable.c			optional flowtable inet | flowtable inet6
 net/ieee8023ad_lacp.c		optional lagg
 net/if.c			standard
 net/if_arcsubr.c		optional arcnet
 net/if_bridge.c			optional bridge inet | if_bridge inet
 net/if_clone.c			standard
 net/if_dead.c			standard
 net/if_debug.c			optional ddb
 net/if_disc.c			optional disc
 net/if_edsc.c			optional edsc
 net/if_enc.c			optional enc inet | enc inet6
 net/if_epair.c			optional epair
 net/if_ethersubr.c		optional ether
 net/if_fddisubr.c		optional fddi
 net/if_fwsubr.c			optional fwip
 net/if_gif.c			optional gif inet | gif inet6 | \
 					 netgraph_gif inet | netgraph_gif inet6
 net/if_gre.c			optional gre inet | gre inet6
 net/if_ipsec.c			optional inet ipsec | inet6 ipsec
 net/if_iso88025subr.c		optional token
 net/if_lagg.c			optional lagg
 net/if_loop.c			optional loop
 net/if_llatbl.c			standard
 net/if_me.c			optional me inet
 net/if_media.c			standard
 net/if_mib.c			standard
 net/if_spppfr.c			optional sppp | netgraph_sppp
 net/if_spppsubr.c		optional sppp | netgraph_sppp
 net/if_stf.c			optional stf inet inet6
 net/if_tun.c			optional tun
 net/if_tap.c			optional tap
 net/if_vlan.c			optional vlan
 net/if_vxlan.c			optional vxlan inet | vxlan inet6
 net/ifdi_if.m			optional ether pci
 net/iflib.c			optional ether pci
 net/mp_ring.c			optional ether
 net/mppcc.c			optional netgraph_mppc_compression
 net/mppcd.c			optional netgraph_mppc_compression
 net/netisr.c			standard
 net/pfil.c			optional ether | inet
 net/radix.c			standard
 net/radix_mpath.c		standard
 net/raw_cb.c			standard
 net/raw_usrreq.c		standard
 net/route.c			standard
 net/rss_config.c		optional inet rss | inet6 rss
 net/rtsock.c			standard
 net/slcompress.c		optional netgraph_vjc | sppp | \
 					 netgraph_sppp
 net/toeplitz.c			optional inet rss | inet6 rss
 net/vnet.c			optional vimage
 net80211/ieee80211.c		optional wlan
 net80211/ieee80211_acl.c	optional wlan wlan_acl
 net80211/ieee80211_action.c	optional wlan
 net80211/ieee80211_ageq.c	optional wlan
 net80211/ieee80211_adhoc.c	optional wlan \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_ageq.c	optional wlan
 net80211/ieee80211_amrr.c	optional wlan | wlan_amrr
 net80211/ieee80211_crypto.c	optional wlan \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_crypto_ccmp.c optional wlan wlan_ccmp
 net80211/ieee80211_crypto_none.c optional wlan
 net80211/ieee80211_crypto_tkip.c optional wlan wlan_tkip
 net80211/ieee80211_crypto_wep.c	optional wlan wlan_wep
 net80211/ieee80211_ddb.c	optional wlan ddb
 net80211/ieee80211_dfs.c	optional wlan
 net80211/ieee80211_freebsd.c	optional wlan
 net80211/ieee80211_hostap.c	optional wlan \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_ht.c		optional wlan
 net80211/ieee80211_hwmp.c	optional wlan ieee80211_support_mesh
 net80211/ieee80211_input.c	optional wlan
 net80211/ieee80211_ioctl.c	optional wlan
 net80211/ieee80211_mesh.c	optional wlan ieee80211_support_mesh \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_monitor.c	optional wlan
 net80211/ieee80211_node.c	optional wlan
 net80211/ieee80211_output.c	optional wlan
 net80211/ieee80211_phy.c	optional wlan
 net80211/ieee80211_power.c	optional wlan
 net80211/ieee80211_proto.c	optional wlan
 net80211/ieee80211_radiotap.c	optional wlan
 net80211/ieee80211_ratectl.c	optional wlan
 net80211/ieee80211_ratectl_none.c optional wlan
 net80211/ieee80211_regdomain.c	optional wlan
 net80211/ieee80211_rssadapt.c	optional wlan wlan_rssadapt
 net80211/ieee80211_scan.c	optional wlan
 net80211/ieee80211_scan_sta.c	optional wlan
 net80211/ieee80211_sta.c	optional wlan \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_superg.c	optional wlan ieee80211_support_superg
 net80211/ieee80211_scan_sw.c	optional wlan
 net80211/ieee80211_tdma.c	optional wlan ieee80211_support_tdma
 net80211/ieee80211_vht.c	optional wlan
 net80211/ieee80211_wds.c	optional wlan
 net80211/ieee80211_xauth.c	optional wlan wlan_xauth
 net80211/ieee80211_alq.c	optional wlan ieee80211_alq
 netgraph/atm/ccatm/ng_ccatm.c	optional ngatm_ccatm \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/atm/ngatmbase.c	optional ngatm_atmbase \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/atm/sscfu/ng_sscfu.c	optional ngatm_sscfu \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/atm/uni/ng_uni.c	optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth
 netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c
 netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4
 netgraph/bluetooth/drivers/ubt/ng_ubt.c optional netgraph_bluetooth_ubt usb
 netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c optional netgraph_bluetooth_ubtbcmfw usb
 netgraph/bluetooth/hci/ng_hci_cmds.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_evnt.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_main.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_misc.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_ulpi.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/l2cap/ng_l2cap_cmds.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_evnt.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_llpi.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_main.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_misc.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/socket/ng_btsocket.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_hci_raw.c	optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_l2cap.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_rfcomm.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_sco.c optional netgraph_bluetooth_socket
 netgraph/netflow/netflow.c	optional netgraph_netflow
 netgraph/netflow/netflow_v9.c	optional netgraph_netflow
 netgraph/netflow/ng_netflow.c	optional netgraph_netflow
 netgraph/ng_UI.c		optional netgraph_UI
 netgraph/ng_async.c		optional netgraph_async
 netgraph/ng_atmllc.c		optional netgraph_atmllc
 netgraph/ng_base.c		optional netgraph
 netgraph/ng_bpf.c		optional netgraph_bpf
 netgraph/ng_bridge.c		optional netgraph_bridge
 netgraph/ng_car.c		optional netgraph_car
 netgraph/ng_cisco.c		optional netgraph_cisco
 netgraph/ng_deflate.c		optional netgraph_deflate
 netgraph/ng_device.c		optional netgraph_device
 netgraph/ng_echo.c		optional netgraph_echo
 netgraph/ng_eiface.c		optional netgraph_eiface
 netgraph/ng_ether.c		optional netgraph_ether
 netgraph/ng_ether_echo.c	optional netgraph_ether_echo
 netgraph/ng_frame_relay.c	optional netgraph_frame_relay
 netgraph/ng_gif.c		optional netgraph_gif inet6 | netgraph_gif inet
 netgraph/ng_gif_demux.c		optional netgraph_gif_demux
 netgraph/ng_hole.c		optional netgraph_hole
 netgraph/ng_iface.c		optional netgraph_iface
 netgraph/ng_ip_input.c		optional netgraph_ip_input
 netgraph/ng_ipfw.c		optional netgraph_ipfw inet ipfirewall
 netgraph/ng_ksocket.c		optional netgraph_ksocket
 netgraph/ng_l2tp.c		optional netgraph_l2tp
 netgraph/ng_lmi.c		optional netgraph_lmi
 netgraph/ng_mppc.c		optional netgraph_mppc_compression | \
 					 netgraph_mppc_encryption
 netgraph/ng_nat.c		optional netgraph_nat inet libalias
 netgraph/ng_one2many.c		optional netgraph_one2many
 netgraph/ng_parse.c		optional netgraph
 netgraph/ng_patch.c		optional netgraph_patch
 netgraph/ng_pipe.c		optional netgraph_pipe
 netgraph/ng_ppp.c		optional netgraph_ppp
 netgraph/ng_pppoe.c		optional netgraph_pppoe
 netgraph/ng_pptpgre.c		optional netgraph_pptpgre
 netgraph/ng_pred1.c		optional netgraph_pred1
 netgraph/ng_rfc1490.c		optional netgraph_rfc1490
 netgraph/ng_socket.c		optional netgraph_socket
 netgraph/ng_split.c		optional netgraph_split
 netgraph/ng_sppp.c		optional netgraph_sppp
 netgraph/ng_tag.c		optional netgraph_tag
 netgraph/ng_tcpmss.c		optional netgraph_tcpmss
 netgraph/ng_tee.c		optional netgraph_tee
 netgraph/ng_tty.c		optional netgraph_tty
 netgraph/ng_vjc.c		optional netgraph_vjc
 netgraph/ng_vlan.c		optional netgraph_vlan
 netinet/accf_data.c		optional accept_filter_data inet
 netinet/accf_dns.c		optional accept_filter_dns inet
 netinet/accf_http.c		optional accept_filter_http inet
 netinet/if_ether.c		optional inet ether
 netinet/igmp.c			optional inet
 netinet/in.c			optional inet
 netinet/in_debug.c		optional inet ddb
 netinet/in_kdtrace.c		optional inet | inet6
 netinet/ip_carp.c		optional inet carp | inet6 carp
 netinet/in_fib.c		optional inet
 netinet/in_gif.c		optional gif inet | netgraph_gif inet
 netinet/ip_gre.c		optional gre inet
 netinet/ip_id.c			optional inet
 netinet/in_jail.c		optional inet
 netinet/in_mcast.c		optional inet
 netinet/in_pcb.c		optional inet | inet6
 netinet/in_pcbgroup.c		optional inet pcbgroup | inet6 pcbgroup
 netinet/in_prot.c		optional inet | inet6
 netinet/in_proto.c		optional inet | inet6
 netinet/in_rmx.c		optional inet
 netinet/in_rss.c		optional inet rss
 netinet/ip_divert.c		optional inet ipdivert ipfirewall
 netinet/ip_ecn.c		optional inet | inet6
 netinet/ip_encap.c		optional inet | inet6
 netinet/ip_fastfwd.c		optional inet
 netinet/ip_icmp.c		optional inet | inet6
 netinet/ip_input.c		optional inet
 netinet/ip_mroute.c		optional mrouting inet
 netinet/ip_options.c		optional inet
 netinet/ip_output.c		optional inet
 netinet/ip_reass.c		optional inet
 netinet/raw_ip.c		optional inet | inet6
 netinet/cc/cc.c			optional inet | inet6
 netinet/cc/cc_newreno.c		optional inet | inet6
 netinet/sctp_asconf.c		optional inet sctp | inet6 sctp
 netinet/sctp_auth.c		optional inet sctp | inet6 sctp
 netinet/sctp_bsd_addr.c		optional inet sctp | inet6 sctp
 netinet/sctp_cc_functions.c	optional inet sctp | inet6 sctp
 netinet/sctp_crc32.c		optional inet sctp | inet6 sctp
 netinet/sctp_indata.c		optional inet sctp | inet6 sctp
 netinet/sctp_input.c		optional inet sctp | inet6 sctp
 netinet/sctp_output.c		optional inet sctp | inet6 sctp
 netinet/sctp_pcb.c		optional inet sctp | inet6 sctp
 netinet/sctp_peeloff.c		optional inet sctp | inet6 sctp
 netinet/sctp_ss_functions.c	optional inet sctp | inet6 sctp
 netinet/sctp_syscalls.c		optional inet sctp | inet6 sctp
 netinet/sctp_sysctl.c		optional inet sctp | inet6 sctp
 netinet/sctp_timer.c		optional inet sctp | inet6 sctp
 netinet/sctp_usrreq.c		optional inet sctp | inet6 sctp
 netinet/sctputil.c		optional inet sctp | inet6 sctp
 netinet/siftr.c			optional inet siftr alq | inet6 siftr alq
 netinet/tcp_debug.c		optional tcpdebug
 netinet/tcp_fastopen.c		optional inet tcp_rfc7413 | inet6 tcp_rfc7413
 netinet/tcp_hostcache.c		optional inet | inet6
 netinet/tcp_input.c		optional inet | inet6
 netinet/tcp_lro.c		optional inet | inet6
 netinet/tcp_output.c		optional inet | inet6
 netinet/tcp_offload.c		optional tcp_offload inet | tcp_offload inet6
 netinet/tcp_pcap.c		optional inet tcppcap | inet6 tcppcap
 netinet/tcp_reass.c		optional inet | inet6
 netinet/tcp_sack.c		optional inet | inet6
 netinet/tcp_subr.c		optional inet | inet6
 netinet/tcp_syncache.c		optional inet | inet6
 netinet/tcp_timer.c		optional inet | inet6
 netinet/tcp_timewait.c		optional inet | inet6
 netinet/tcp_usrreq.c		optional inet | inet6
 netinet/udp_usrreq.c		optional inet | inet6
 netinet/libalias/alias.c	optional libalias inet | netgraph_nat inet
 netinet/libalias/alias_db.c	optional libalias inet | netgraph_nat inet
 netinet/libalias/alias_mod.c	optional libalias | netgraph_nat
 netinet/libalias/alias_proxy.c	optional libalias inet | netgraph_nat inet
 netinet/libalias/alias_util.c	optional libalias inet | netgraph_nat inet
 netinet/libalias/alias_sctp.c	optional libalias inet | netgraph_nat inet
 netinet6/dest6.c		optional inet6
 netinet6/frag6.c		optional inet6
 netinet6/icmp6.c		optional inet6
 netinet6/in6.c			optional inet6
 netinet6/in6_cksum.c		optional inet6
 netinet6/in6_fib.c		optional inet6
 netinet6/in6_gif.c		optional gif inet6 | netgraph_gif inet6
 netinet6/in6_ifattach.c		optional inet6
 netinet6/in6_jail.c		optional inet6
 netinet6/in6_mcast.c		optional inet6
 netinet6/in6_pcb.c		optional inet6
 netinet6/in6_pcbgroup.c		optional inet6 pcbgroup
 netinet6/in6_proto.c		optional inet6
 netinet6/in6_rmx.c		optional inet6
 netinet6/in6_rss.c		optional inet6 rss
 netinet6/in6_src.c		optional inet6
 netinet6/ip6_fastfwd.c		optional inet6
 netinet6/ip6_forward.c		optional inet6
 netinet6/ip6_gre.c		optional gre inet6
 netinet6/ip6_id.c		optional inet6
 netinet6/ip6_input.c		optional inet6
 netinet6/ip6_mroute.c		optional mrouting inet6
 netinet6/ip6_output.c		optional inet6
 netinet6/mld6.c			optional inet6
 netinet6/nd6.c			optional inet6
 netinet6/nd6_nbr.c		optional inet6
 netinet6/nd6_rtr.c		optional inet6
 netinet6/raw_ip6.c		optional inet6
 netinet6/route6.c		optional inet6
 netinet6/scope6.c		optional inet6
 netinet6/sctp6_usrreq.c		optional inet6 sctp
 netinet6/udp6_usrreq.c		optional inet6
 netipsec/ipsec.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_input.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_mbuf.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_mod.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_output.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_pcb.c		optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/key.c			optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/key_debug.c		optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/keysock.c		optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/subr_ipsec.c		optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/udpencap.c		optional ipsec inet
 netipsec/xform_ah.c		optional ipsec inet | ipsec inet6
 netipsec/xform_esp.c		optional ipsec inet | ipsec inet6
 netipsec/xform_ipcomp.c		optional ipsec inet | ipsec inet6
 netipsec/xform_tcp.c		optional ipsec inet tcp_signature | \
 	 ipsec inet6 tcp_signature | ipsec_support inet tcp_signature | \
 	 ipsec_support inet6 tcp_signature
 netpfil/ipfw/dn_aqm_codel.c	optional inet dummynet
 netpfil/ipfw/dn_aqm_pie.c	optional inet dummynet
 netpfil/ipfw/dn_heap.c		optional inet dummynet
 netpfil/ipfw/dn_sched_fifo.c	optional inet dummynet
 netpfil/ipfw/dn_sched_fq_codel.c	optional inet dummynet
 netpfil/ipfw/dn_sched_fq_pie.c	optional inet dummynet
 netpfil/ipfw/dn_sched_prio.c	optional inet dummynet
 netpfil/ipfw/dn_sched_qfq.c	optional inet dummynet
 netpfil/ipfw/dn_sched_rr.c	optional inet dummynet
 netpfil/ipfw/dn_sched_wf2q.c	optional inet dummynet
 netpfil/ipfw/ip_dummynet.c	optional inet dummynet
 netpfil/ipfw/ip_dn_io.c		optional inet dummynet
 netpfil/ipfw/ip_dn_glue.c	optional inet dummynet
 netpfil/ipfw/ip_fw2.c		optional inet ipfirewall
 netpfil/ipfw/ip_fw_bpf.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_dynamic.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_eaction.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_log.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_pfil.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_sockopt.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_table.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_table_algo.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_table_value.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_iface.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_nat.c	optional inet ipfirewall_nat
 netpfil/ipfw/nat64/ip_fw_nat64.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64lsn.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64lsn_control.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64stl.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64stl_control.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64_translate.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nptv6/ip_fw_nptv6.c	optional inet inet6 ipfirewall \
 	ipfirewall_nptv6
 netpfil/ipfw/nptv6/nptv6.c	optional inet inet6 ipfirewall \
 	ipfirewall_nptv6
 netpfil/ipfw/pmod/ip_fw_pmod.c	optional inet ipfirewall_pmod
 netpfil/ipfw/pmod/tcpmod.c	optional inet ipfirewall_pmod
 netpfil/pf/if_pflog.c		optional pflog pf inet
 netpfil/pf/if_pfsync.c		optional pfsync pf inet
 netpfil/pf/pf.c			optional pf inet
 netpfil/pf/pf_if.c		optional pf inet
 netpfil/pf/pf_ioctl.c		optional pf inet
 netpfil/pf/pf_lb.c		optional pf inet
 netpfil/pf/pf_norm.c		optional pf inet
 netpfil/pf/pf_osfp.c		optional pf inet
 netpfil/pf/pf_ruleset.c		optional pf inet
 netpfil/pf/pf_table.c		optional pf inet
 netpfil/pf/in4_cksum.c		optional pf inet
 netsmb/smb_conn.c		optional netsmb
 netsmb/smb_crypt.c		optional netsmb
 netsmb/smb_dev.c		optional netsmb
 netsmb/smb_iod.c		optional netsmb
 netsmb/smb_rq.c			optional netsmb
 netsmb/smb_smb.c		optional netsmb
 netsmb/smb_subr.c		optional netsmb
 netsmb/smb_trantcp.c		optional netsmb
 netsmb/smb_usr.c		optional netsmb
 nfs/bootp_subr.c		optional bootp nfscl
 nfs/krpc_subr.c			optional bootp nfscl
 nfs/nfs_diskless.c		optional nfscl nfs_root
 nfs/nfs_fha.c			optional nfsd
 nfs/nfs_lock.c			optional nfscl | nfslockd | nfsd
 nfs/nfs_nfssvc.c		optional nfscl | nfsd
 nlm/nlm_advlock.c		optional nfslockd | nfsd
 nlm/nlm_prot_clnt.c		optional nfslockd | nfsd
 nlm/nlm_prot_impl.c		optional nfslockd | nfsd
 nlm/nlm_prot_server.c		optional nfslockd | nfsd
 nlm/nlm_prot_svc.c		optional nfslockd | nfsd
 nlm/nlm_prot_xdr.c		optional nfslockd | nfsd
 nlm/sm_inter_xdr.c		optional nfslockd | nfsd
 
 # Linux Kernel Programming Interface
 compat/linuxkpi/common/src/linux_kmod.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_compat.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_current.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_kthread.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_lock.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_page.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_pci.c		optional compat_linuxkpi pci \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_tasklet.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_idr.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_radix.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_rcu.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C} -I$S/contrib/ck/include"
 compat/linuxkpi/common/src/linux_slab.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_usb.c		optional compat_linuxkpi usb \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_work.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 
 # OpenFabrics Enterprise Distribution (Infiniband)
 ofed/drivers/infiniband/core/addr.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/agent.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/cache.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 # XXX Mad.c must be ordered before cm.c for sysinit sets to occur in
 # the correct order.
 ofed/drivers/infiniband/core/mad.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/cm.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/ -Wno-unused-function"
 ofed/drivers/infiniband/core/cma.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/device.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/fmr_pool.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/iwcm.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/mad_rmpp.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/multicast.c	optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/packer.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/peer_mem.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/sa_query.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/smi.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/sysfs.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/ucm.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/ucma.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/ud_header.c	optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/umem.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/user_mad.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/uverbs_cmd.c	optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/uverbs_main.c	optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/uverbs_marshall.c	optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 ofed/drivers/infiniband/core/verbs.c		optional ofed		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
 
 ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c	optional ipoib		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 #ofed/drivers/infiniband/ulp/ipoib/ipoib_fs.c	optional ipoib		\
 #	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c	optional ipoib		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c	optional ipoib		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c	optional ipoib	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c	optional ipoib		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 #ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c	optional ipoib		\
 #	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 
 ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c	optional sdp inet	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
 ofed/drivers/infiniband/ulp/sdp/sdp_main.c	optional sdp inet 	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
 ofed/drivers/infiniband/ulp/sdp/sdp_rx.c	optional sdp inet 	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
 ofed/drivers/infiniband/ulp/sdp/sdp_cma.c	optional sdp inet 	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
 ofed/drivers/infiniband/ulp/sdp/sdp_tx.c	optional sdp inet 	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
 
 dev/mlx4/mlx4_ib/mlx4_ib_alias_GUID.c		optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_mcg.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_sysfs.c		optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_cm.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_ah.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_cq.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_doorbell.c		optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_mad.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_main.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_exp.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_mr.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_qp.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_srq.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_wc.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 
 dev/mlx4/mlx4_core/mlx4_alloc.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_catas.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_cmd.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_cq.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_eq.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_fw.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_icm.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_intf.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_main.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_mcg.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_mr.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_pd.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_port.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_profile.c		optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_qp.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_reset.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_sense.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_srq.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_resource_tracker.c	optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_sys_tune.c		optional mlx4 pci \
 	compile-with "${OFED_C}"
 
 dev/mlx4/mlx4_en/mlx4_en_cq.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_main.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_netdev.c		optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_port.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_resources.c		optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_rx.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_tx.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 
 dev/mlx5/mlx5_core/mlx5_alloc.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_cmd.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_cq.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_diagnostics.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_eq.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_flow_table.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_fw.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_health.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_mad.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_main.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_mcg.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_mr.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_pagealloc.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_pd.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_port.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_qp.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_srq.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_transobj.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_uar.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_vport.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_wq.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 
 dev/mlx5/mlx5_en/mlx5_en_ethtool.c		optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_main.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_tx.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_flow_table.c		optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_rx.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_txrx.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 
 ofed/drivers/infiniband/hw/mthca/mthca_allocator.c	optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_av.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_catas.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_cmd.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_cq.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_eq.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_mad.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_main.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_mcg.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_memfree.c	optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_mr.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_pd.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_profile.c	optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_provider.c	optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_qp.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_reset.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_srq.c		optional mthca	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/hw/mthca/mthca_uar.c		optional mthca	\
 	compile-with "${OFED_C}"
 
 # crypto support
 opencrypto/cast.c		optional crypto | ipsec | ipsec_support
 opencrypto/criov.c		optional crypto | ipsec | ipsec_support
 opencrypto/crypto.c		optional crypto | ipsec | ipsec_support
 opencrypto/cryptodev.c		optional cryptodev
 opencrypto/cryptodev_if.m	optional crypto | ipsec | ipsec_support
 opencrypto/cryptosoft.c		optional crypto | ipsec | ipsec_support
 opencrypto/cryptodeflate.c	optional crypto | ipsec | ipsec_support
 opencrypto/gmac.c		optional crypto | ipsec | ipsec_support
 opencrypto/gfmult.c		optional crypto | ipsec | ipsec_support
 opencrypto/rmd160.c		optional crypto | ipsec | ipsec_support
 opencrypto/skipjack.c		optional crypto | ipsec | ipsec_support
 opencrypto/xform.c		optional crypto | ipsec | ipsec_support
 rpc/auth_none.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/auth_unix.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/authunix_prot.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/clnt_bck.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/clnt_dg.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/clnt_rc.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/clnt_vc.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/getnetconfig.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/replay.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/rpc_callmsg.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/rpc_generic.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/rpc_prot.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/rpcb_clnt.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/rpcb_prot.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/svc.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_auth.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_auth_unix.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_dg.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_generic.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_vc.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/rpcsec_gss/rpcsec_gss.c	optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 rpc/rpcsec_gss/rpcsec_gss_conf.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 rpc/rpcsec_gss/rpcsec_gss_misc.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 rpc/rpcsec_gss/rpcsec_gss_prot.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 rpc/rpcsec_gss/svc_rpcsec_gss.c	optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 security/audit/audit.c		optional audit
 security/audit/audit_arg.c	optional audit
 security/audit/audit_bsm.c	optional audit
 security/audit/audit_bsm_db.c	optional audit
 security/audit/audit_bsm_klib.c	optional audit
 security/audit/audit_dtrace.c	optional dtaudit audit | dtraceall audit compile-with "${CDDL_C}"
 security/audit/audit_pipe.c	optional audit
 security/audit/audit_syscalls.c	standard
 security/audit/audit_trigger.c	optional audit
 security/audit/audit_worker.c	optional audit
 security/audit/bsm_domain.c	optional audit
 security/audit/bsm_errno.c	optional audit
 security/audit/bsm_fcntl.c	optional audit
 security/audit/bsm_socket_type.c	optional audit
 security/audit/bsm_token.c	optional audit
 security/mac/mac_audit.c	optional mac audit
 security/mac/mac_cred.c		optional mac
 security/mac/mac_framework.c	optional mac
 security/mac/mac_inet.c		optional mac inet | mac inet6
 security/mac/mac_inet6.c	optional mac inet6
 security/mac/mac_label.c	optional mac
 security/mac/mac_net.c		optional mac
 security/mac/mac_pipe.c		optional mac
 security/mac/mac_posix_sem.c	optional mac
 security/mac/mac_posix_shm.c	optional mac
 security/mac/mac_priv.c		optional mac
 security/mac/mac_process.c	optional mac
 security/mac/mac_socket.c	optional mac
 security/mac/mac_syscalls.c	standard
 security/mac/mac_system.c	optional mac
 security/mac/mac_sysv_msg.c	optional mac
 security/mac/mac_sysv_sem.c	optional mac
 security/mac/mac_sysv_shm.c	optional mac
 security/mac/mac_vfs.c		optional mac
 security/mac_biba/mac_biba.c	optional mac_biba
 security/mac_bsdextended/mac_bsdextended.c	optional mac_bsdextended
 security/mac_bsdextended/ugidfw_system.c	optional mac_bsdextended
 security/mac_bsdextended/ugidfw_vnode.c		optional mac_bsdextended
 security/mac_ifoff/mac_ifoff.c	optional mac_ifoff
 security/mac_lomac/mac_lomac.c	optional mac_lomac
 security/mac_mls/mac_mls.c	optional mac_mls
 security/mac_none/mac_none.c	optional mac_none
 security/mac_partition/mac_partition.c optional mac_partition
 security/mac_portacl/mac_portacl.c optional mac_portacl
 security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids
 security/mac_stub/mac_stub.c	optional mac_stub
 security/mac_test/mac_test.c	optional mac_test
 teken/teken.c			optional sc | vt
 ufs/ffs/ffs_alloc.c		optional ffs
 ufs/ffs/ffs_balloc.c		optional ffs
 ufs/ffs/ffs_inode.c		optional ffs
 ufs/ffs/ffs_snapshot.c		optional ffs
 ufs/ffs/ffs_softdep.c		optional ffs
 ufs/ffs/ffs_subr.c		optional ffs
 ufs/ffs/ffs_tables.c		optional ffs
 ufs/ffs/ffs_vfsops.c		optional ffs
 ufs/ffs/ffs_vnops.c		optional ffs
 ufs/ffs/ffs_rawread.c		optional ffs directio
 ufs/ffs/ffs_suspend.c		optional ffs
 ufs/ufs/ufs_acl.c		optional ffs
 ufs/ufs/ufs_bmap.c		optional ffs
 ufs/ufs/ufs_dirhash.c		optional ffs
 ufs/ufs/ufs_extattr.c		optional ffs
 ufs/ufs/ufs_gjournal.c		optional ffs UFS_GJOURNAL
 ufs/ufs/ufs_inode.c		optional ffs
 ufs/ufs/ufs_lookup.c		optional ffs
 ufs/ufs/ufs_quota.c		optional ffs
 ufs/ufs/ufs_vfsops.c		optional ffs
 ufs/ufs/ufs_vnops.c		optional ffs
 vm/default_pager.c		standard
 vm/device_pager.c		standard
 vm/phys_pager.c			standard
 vm/redzone.c			optional DEBUG_REDZONE
 vm/sg_pager.c			standard
 vm/swap_pager.c			standard
 vm/uma_core.c			standard
 vm/uma_dbg.c			standard
 vm/memguard.c			optional DEBUG_MEMGUARD
 vm/vm_fault.c			standard
 vm/vm_glue.c			standard
 vm/vm_init.c			standard
 vm/vm_kern.c			standard
 vm/vm_map.c			standard
 vm/vm_meter.c			standard
 vm/vm_mmap.c			standard
 vm/vm_object.c			standard
 vm/vm_page.c			standard
 vm/vm_pageout.c			standard
 vm/vm_pager.c			standard
 vm/vm_phys.c			standard
 vm/vm_radix.c			standard
 vm/vm_reserv.c			standard
 vm/vm_domain.c			standard
 vm/vm_unix.c			standard
 vm/vnode_pager.c		standard
 xen/features.c			optional xenhvm
 xen/xenbus/xenbus_if.m		optional xenhvm
 xen/xenbus/xenbus.c		optional xenhvm
 xen/xenbus/xenbusb_if.m		optional xenhvm
 xen/xenbus/xenbusb.c		optional xenhvm
 xen/xenbus/xenbusb_front.c	optional xenhvm
 xen/xenbus/xenbusb_back.c	optional xenhvm
 xen/xenmem/xenmem_if.m		optional xenhvm
 xdr/xdr.c			optional krpc | nfslockd | nfscl | nfsd
 xdr/xdr_array.c			optional krpc | nfslockd | nfscl | nfsd
 xdr/xdr_mbuf.c			optional krpc | nfslockd | nfscl | nfsd
 xdr/xdr_mem.c			optional krpc | nfslockd | nfscl | nfsd
 xdr/xdr_reference.c		optional krpc | nfslockd | nfscl | nfsd
 xdr/xdr_sizeof.c		optional krpc | nfslockd | nfscl | nfsd
Index: projects/clang500-import/sys/contrib/ipfilter/netinet/ip_fil.h
===================================================================
--- projects/clang500-import/sys/contrib/ipfilter/netinet/ip_fil.h	(revision 318657)
+++ projects/clang500-import/sys/contrib/ipfilter/netinet/ip_fil.h	(revision 318658)
@@ -1,2003 +1,1991 @@
 /*
  * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_fil.h	1.35 6/5/96
  * $FreeBSD$
  * Id: ip_fil.h,v 2.170.2.51 2007/10/10 09:48:03 darrenr Exp $
  */
 
 #ifndef	__IP_FIL_H__
 #define	__IP_FIL_H__
 
 #if !defined(linux) || !defined(_KERNEL)
 # include <netinet/in.h>
 #endif
 
 #include "netinet/ip_compat.h"
 #include "netinet/ipf_rb.h"
 #if NETBSD_GE_REV(104040000)
 # include <sys/callout.h>
 #endif
 #if defined(BSD) && defined(_KERNEL)
 # if NETBSD_LT_REV(399000000) || defined(__osf__) || FREEBSD_LT_REV(500043)
 #  include <sys/select.h>
 # else
 #  include <sys/selinfo.h>
 # endif
 #endif
 
 #ifndef	SOLARIS
 # if defined(sun) && (defined(__svr4__) || defined(__SVR4))
 #  define	SOLARIS		1
 # else
 #  define	SOLARIS		0
 # endif
 #endif
 
 #ifndef	__P
 # ifdef	__STDC__
 #  define	__P(x)	x
 # else
 #  define	__P(x)	()
 # endif
 #endif
 
 #if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
 # define	SIOCADAFR	_IOW('r', 60, struct ipfobj)
 # define	SIOCRMAFR	_IOW('r', 61, struct ipfobj)
 # define	SIOCSETFF	_IOW('r', 62, u_int)
 # define	SIOCGETFF	_IOR('r', 63, u_int)
 # define	SIOCGETFS	_IOWR('r', 64, struct ipfobj)
 # define	SIOCIPFFL	_IOWR('r', 65, int)
 # define	SIOCIPFFB	_IOR('r', 66, int)
 # define	SIOCADIFR	_IOW('r', 67, struct ipfobj)
 # define	SIOCRMIFR	_IOW('r', 68, struct ipfobj)
 # define	SIOCSWAPA	_IOR('r', 69, u_int)
 # define	SIOCINAFR	_IOW('r', 70, struct ipfobj)
 # define	SIOCINIFR	_IOW('r', 71, struct ipfobj)
 # define	SIOCFRENB	_IOW('r', 72, u_int)
 # define	SIOCFRSYN	_IOW('r', 73, u_int)
 # define	SIOCFRZST	_IOWR('r', 74, struct ipfobj)
 # define	SIOCZRLST	_IOWR('r', 75, struct ipfobj)
 # define	SIOCAUTHW	_IOWR('r', 76, struct ipfobj)
 # define	SIOCAUTHR	_IOWR('r', 77, struct ipfobj)
 # define	SIOCSTAT1	_IOWR('r', 78, struct ipfobj)
 # define	SIOCSTLCK	_IOWR('r', 79, u_int)
 # define	SIOCSTPUT	_IOWR('r', 80, struct ipfobj)
 # define	SIOCSTGET	_IOWR('r', 81, struct ipfobj)
 # define	SIOCSTGSZ	_IOWR('r', 82, struct ipfobj)
 # define	SIOCSTAT2	_IOWR('r', 83, struct ipfobj)
 # define	SIOCSETLG	_IOWR('r', 84, int)
 # define	SIOCGETLG	_IOWR('r', 85, int)
 # define	SIOCFUNCL	_IOWR('r', 86, struct ipfunc_resolve)
 # define	SIOCIPFGETNEXT	_IOWR('r', 87, struct ipfobj)
 # define	SIOCIPFGET	_IOWR('r', 88, struct ipfobj)
 # define	SIOCIPFSET	_IOWR('r', 89, struct ipfobj)
 # define	SIOCIPFL6	_IOWR('r', 90, int)
 # define	SIOCIPFITER	_IOWR('r', 91, struct ipfobj)
 # define	SIOCGENITER	_IOWR('r', 92, struct ipfobj)
 # define	SIOCGTABL	_IOWR('r', 93, struct ipfobj)
 # define	SIOCIPFDELTOK	_IOWR('r', 94, int)
 # define	SIOCLOOKUPITER	_IOWR('r', 95, struct ipfobj)
 # define	SIOCGTQTAB	_IOWR('r', 96, struct ipfobj)
 # define	SIOCMATCHFLUSH	_IOWR('r', 97, struct ipfobj)
 # define	SIOCIPFINTERROR	_IOR('r', 98, int)
 #else
 # define	SIOCADAFR	_IOW(r, 60, struct ipfobj)
 # define	SIOCRMAFR	_IOW(r, 61, struct ipfobj)
 # define	SIOCSETFF	_IOW(r, 62, u_int)
 # define	SIOCGETFF	_IOR(r, 63, u_int)
 # define	SIOCGETFS	_IOWR(r, 64, struct ipfobj)
 # define	SIOCIPFFL	_IOWR(r, 65, int)
 # define	SIOCIPFFB	_IOR(r, 66, int)
 # define	SIOCADIFR	_IOW(r, 67, struct ipfobj)
 # define	SIOCRMIFR	_IOW(r, 68, struct ipfobj)
 # define	SIOCSWAPA	_IOR(r, 69, u_int)
 # define	SIOCINAFR	_IOW(r, 70, struct ipfobj)
 # define	SIOCINIFR	_IOW(r, 71, struct ipfobj)
 # define	SIOCFRENB	_IOW(r, 72, u_int)
 # define	SIOCFRSYN	_IOW(r, 73, u_int)
 # define	SIOCFRZST	_IOWR(r, 74, struct ipfobj)
 # define	SIOCZRLST	_IOWR(r, 75, struct ipfobj)
 # define	SIOCAUTHW	_IOWR(r, 76, struct ipfobj)
 # define	SIOCAUTHR	_IOWR(r, 77, struct ipfobj)
 # define	SIOCSTAT1	_IOWR(r, 78, struct ipfobj)
 # define	SIOCSTLCK	_IOWR(r, 79, u_int)
 # define	SIOCSTPUT	_IOWR(r, 80, struct ipfobj)
 # define	SIOCSTGET	_IOWR(r, 81, struct ipfobj)
 # define	SIOCSTGSZ	_IOWR(r, 82, struct ipfobj)
 # define	SIOCSTAT2	_IOWR(r, 83, struct ipfobj)
 # define	SIOCSETLG	_IOWR(r, 84, int)
 # define	SIOCGETLG	_IOWR(r, 85, int)
 # define	SIOCFUNCL	_IOWR(r, 86, struct ipfunc_resolve)
 # define	SIOCIPFGETNEXT	_IOWR(r, 87, struct ipfobj)
 # define	SIOCIPFGET	_IOWR(r, 88, struct ipfobj)
 # define	SIOCIPFSET	_IOWR(r, 89, struct ipfobj)
 # define	SIOCIPFL6	_IOWR(r, 90, int)
 # define	SIOCIPFITER	_IOWR(r, 91, struct ipfobj)
 # define	SIOCGENITER	_IOWR(r, 92, struct ipfobj)
 # define	SIOCGTABL	_IOWR(r, 93, struct ipfobj)
 # define	SIOCIPFDELTOK	_IOWR(r, 94, int)
 # define	SIOCLOOKUPITER	_IOWR(r, 95, struct ipfobj)
 # define	SIOCGTQTAB	_IOWR(r, 96, struct ipfobj)
 # define	SIOCMATCHFLUSH	_IOWR(r, 97, struct ipfobj)
 # define	SIOCIPFINTERROR	_IOR(r, 98, int)
 #endif
 #define	SIOCADDFR	SIOCADAFR
 #define	SIOCDELFR	SIOCRMAFR
 #define	SIOCINSFR	SIOCINAFR
 #define	SIOCATHST	SIOCSTAT1
 #define	SIOCGFRST	SIOCSTAT2
 
 
 struct ipscan;
 struct ifnet;
 struct ipf_main_softc_s;
 
 typedef	int	(* lookupfunc_t) __P((struct ipf_main_softc_s *, void *,
 				      int, void *, u_int));
 
 /*
  * i6addr is used as a container for both IPv4 and IPv6 addresses, as well
  * as other types of objects, depending on its qualifier.
  */
-#ifdef	USE_INET6
 typedef	union	i6addr	{
 	u_32_t	i6[4];
 	struct	in_addr	in4;
+#ifdef	USE_INET6
 	struct	in6_addr in6;
+#endif
 	void	*vptr[2];
 	lookupfunc_t	lptr[2];
 	struct {
 		u_short	type;
 		u_short	subtype;
 		int	name;
 	} i6un;
 } i6addr_t;
-#else
-typedef	union	i6addr	{
-	u_32_t	i6[4];
-	struct	in_addr	in4;
-	void	*vptr[2];
-	lookupfunc_t	lptr[2];
-	struct {
-		u_short	type;
-		u_short	subtype;
-		int	name;
-	} i6un;
-} i6addr_t;
-#endif
 
 #define in4_addr	in4.s_addr
 #define	iplookupnum	i6[1]
 #define	iplookupname	i6un.name
 #define	iplookuptype	i6un.type
 #define	iplookupsubtype	i6un.subtype
 /*
  * NOTE: These DO overlap the above on 64bit systems and this IS recognised.
  */
 #define	iplookupptr	vptr[0]
 #define	iplookupfunc	lptr[1]
 
 #define	I60(x)	(((u_32_t *)(x))[0])
 #define	I61(x)	(((u_32_t *)(x))[1])
 #define	I62(x)	(((u_32_t *)(x))[2])
 #define	I63(x)	(((u_32_t *)(x))[3])
 #define	HI60(x)	ntohl(((u_32_t *)(x))[0])
 #define	HI61(x)	ntohl(((u_32_t *)(x))[1])
 #define	HI62(x)	ntohl(((u_32_t *)(x))[2])
 #define	HI63(x)	ntohl(((u_32_t *)(x))[3])
 
 #define	IP6_EQ(a,b)	((I63(a) == I63(b)) && (I62(a) == I62(b)) && \
 			 (I61(a) == I61(b)) && (I60(a) == I60(b)))
 #define	IP6_NEQ(a,b)	((I63(a) != I63(b)) || (I62(a) != I62(b)) || \
 			 (I61(a) != I61(b)) || (I60(a) != I60(b)))
 #define IP6_ISZERO(a)   ((I60(a) | I61(a) | I62(a) | I63(a)) == 0)
 #define IP6_NOTZERO(a)  ((I60(a) | I61(a) | I62(a) | I63(a)) != 0)
 #define	IP6_ISONES(a)	((I63(a) == 0xffffffff) && (I62(a) == 0xffffffff) && \
 			 (I61(a) == 0xffffffff) && (I60(a) == 0xffffffff))
 #define	IP6_GT(a,b)	(ntohl(HI60(a)) > ntohl(HI60(b)) || \
 			 (HI60(a) == HI60(b) && \
 			  (ntohl(HI61(a)) > ntohl(HI61(b)) || \
 			   (HI61(a) == HI61(b) && \
 			    (ntohl(HI62(a)) > ntohl(HI62(b)) || \
 			     (HI62(a) == HI62(b) && \
 			      ntohl(HI63(a)) > ntohl(HI63(b))))))))
 #define	IP6_LT(a,b)	(ntohl(HI60(a)) < ntohl(HI60(b)) || \
 			 (HI60(a) == HI60(b) && \
 			  (ntohl(HI61(a)) < ntohl(HI61(b)) || \
 			   (HI61(a) == HI61(b) && \
 			    (ntohl(HI62(a)) < ntohl(HI62(b)) || \
 			     (HI62(a) == HI62(b) && \
 			      ntohl(HI63(a)) < ntohl(HI63(b))))))))
 #define	NLADD(n,x)	htonl(ntohl(n) + (x))
 #define	IP6_INC(a)	\
 		do { u_32_t *_i6 = (u_32_t *)(a); \
 		  _i6[3] = NLADD(_i6[3], 1); \
 		  if (_i6[3] == 0) { \
 			_i6[2] = NLADD(_i6[2], 1); \
 			if (_i6[2] == 0) { \
 				_i6[1] = NLADD(_i6[1], 1); \
 				if (_i6[1] == 0) { \
 					_i6[0] = NLADD(_i6[0], 1); \
 				} \
 			} \
 		  } \
 		} while (0)
 #define	IP6_ADD(a,x,d)	\
 		do { i6addr_t *_s = (i6addr_t *)(a); \
 		  i6addr_t *_d = (i6addr_t *)(d); \
 		  _d->i6[0] = NLADD(_s->i6[0], x); \
 		  if (ntohl(_d->i6[0]) < ntohl(_s->i6[0])) { \
 			_d->i6[1] = NLADD(_d->i6[1], 1); \
 			if (ntohl(_d->i6[1]) < ntohl(_s->i6[1])) { \
 				_d->i6[2] = NLADD(_d->i6[2], 1); \
 				if (ntohl(_d->i6[2]) < ntohl(_s->i6[2])) { \
 					_d->i6[3] = NLADD(_d->i6[3], 1); \
 				} \
 			} \
 		  } \
 		} while (0)
 #define	IP6_AND(a,b,d)	do { i6addr_t *_s1 = (i6addr_t *)(a); \
 			  i6addr_t *_s2 = (i6addr_t *)(b); \
 			  i6addr_t *_d = (i6addr_t *)(d); \
 			  _d->i6[0] = _s1->i6[0] & _s2->i6[0]; \
 			  _d->i6[1] = _s1->i6[1] & _s2->i6[1]; \
 			  _d->i6[2] = _s1->i6[2] & _s2->i6[2]; \
 			  _d->i6[3] = _s1->i6[3] & _s2->i6[3]; \
 			} while (0)
 #define	IP6_ANDASSIGN(a,m) \
 			do { i6addr_t *_d = (i6addr_t *)(a); \
 			  i6addr_t *_m = (i6addr_t *)(m); \
 			  _d->i6[0] &= _m->i6[0]; \
 			  _d->i6[1] &= _m->i6[1]; \
 			  _d->i6[2] &= _m->i6[2]; \
 			  _d->i6[3] &= _m->i6[3]; \
 			} while (0)
 #define	IP6_MASKEQ(a,m,b) \
 			(((I60(a) & I60(m)) == I60(b)) && \
 			 ((I61(a) & I61(m)) == I61(b)) && \
 			 ((I62(a) & I62(m)) == I62(b)) && \
 			 ((I63(a) & I63(m)) == I63(b)))
 #define	IP6_MASKNEQ(a,m,b) \
 			(((I60(a) & I60(m)) != I60(b)) || \
 			 ((I61(a) & I61(m)) != I61(b)) || \
 			 ((I62(a) & I62(m)) != I62(b)) || \
 			 ((I63(a) & I63(m)) != I63(b)))
 #define	IP6_MERGE(a,b,c) \
 			do { i6addr_t *_d, *_s1, *_s2; \
 			  _d = (i6addr_t *)(a); \
 			  _s1 = (i6addr_t *)(b); \
 			  _s2 = (i6addr_t *)(c); \
 			  _d->i6[0] |= _s1->i6[0] & ~_s2->i6[0]; \
 			  _d->i6[1] |= _s1->i6[1] & ~_s2->i6[1]; \
 			  _d->i6[2] |= _s1->i6[2] & ~_s2->i6[2]; \
 			  _d->i6[3] |= _s1->i6[3] & ~_s2->i6[3]; \
 			} while (0)
 #define	IP6_MASK(a,b,c) \
 			do { i6addr_t *_d, *_s1, *_s2; \
 			  _d = (i6addr_t *)(a); \
 			  _s1 = (i6addr_t *)(b); \
 			  _s2 = (i6addr_t *)(c); \
 			  _d->i6[0] = _s1->i6[0] & ~_s2->i6[0]; \
 			  _d->i6[1] = _s1->i6[1] & ~_s2->i6[1]; \
 			  _d->i6[2] = _s1->i6[2] & ~_s2->i6[2]; \
 			  _d->i6[3] = _s1->i6[3] & ~_s2->i6[3]; \
 			} while (0)
 #define	IP6_SETONES(a)	\
 			do { i6addr_t *_d = (i6addr_t *)(a); \
 			  _d->i6[0] = 0xffffffff; \
 			  _d->i6[1] = 0xffffffff; \
 			  _d->i6[2] = 0xffffffff; \
 			  _d->i6[3] = 0xffffffff; \
 			} while (0)
 
 typedef	union ipso_u	{
 	u_short	ipso_ripso[2];
 	u_32_t	ipso_doi;
 } ipso_t;
 
 typedef	struct	fr_ip	{
 	u_32_t	fi_v:4;		/* IP version */
 	u_32_t	fi_xx:4;	/* spare */
 	u_32_t	fi_tos:8;	/* IP packet TOS */
 	u_32_t	fi_ttl:8;	/* IP packet TTL */
 	u_32_t	fi_p:8;		/* IP packet protocol */
 	u_32_t	fi_optmsk;	/* bitmask composed from IP options */
 	i6addr_t fi_src;	/* source address from packet */
 	i6addr_t fi_dst;	/* destination address from packet */
 	ipso_t	fi_ipso;	/* IP security options */
 	u_32_t	fi_flx;		/* packet flags */
 	u_32_t	fi_tcpmsk;	/* TCP options set/reset */
 	u_32_t	fi_ports[2];	/* TCP ports */
 	u_char	fi_tcpf;	/* TCP flags */
 	u_char	fi_sensitivity;
 	u_char	fi_xxx[2];	/* pad */
 } fr_ip_t;
 
 /*
  * For use in fi_flx
  */
 #define	FI_TCPUDP	0x0001	/* TCP/UCP implied comparison*/
 #define	FI_OPTIONS	0x0002
 #define	FI_FRAG		0x0004
 #define	FI_SHORT	0x0008
 #define	FI_NATED	0x0010
 #define	FI_MULTICAST	0x0020
 #define	FI_BROADCAST	0x0040
 #define	FI_MBCAST	0x0080
 #define	FI_STATE	0x0100
 #define	FI_BADNAT	0x0200
 #define	FI_BAD		0x0400
 #define	FI_OOW		0x0800	/* Out of state window, else match */
 #define	FI_ICMPERR	0x1000
 #define	FI_FRAGBODY	0x2000
 #define	FI_BADSRC	0x4000
 #define	FI_LOWTTL	0x8000
 #define	FI_CMP		0x5cfe3	/* Not FI_FRAG,FI_NATED,FI_FRAGTAIL */
 #define	FI_ICMPCMP	0x0003	/* Flags we can check for ICMP error packets */
 #define	FI_WITH		0x5effe	/* Not FI_TCPUDP */
 #define	FI_V6EXTHDR	0x10000
 #define	FI_COALESCE	0x20000
 #define	FI_NEWNAT	0x40000
 #define	FI_ICMPQUERY	0x80000
 #define	FI_ENCAP	0x100000	/* encap/decap with NAT */
 #define	FI_AH		0x200000	/* AH header present */
 #define	FI_DOCKSUM	0x10000000	/* Proxy wants L4 recalculation */
 #define	FI_NOCKSUM	0x20000000	/* don't do a L4 checksum validation */
 #define	FI_NOWILD	0x40000000	/* Do not do wildcard searches */
 #define	FI_IGNORE	0x80000000
 
 #define	fi_secmsk	fi_ipso.ipso_ripso[0]
 #define	fi_auth		fi_ipso.ipso_ripso[1]
 #define	fi_doi		fi_ipso.ipso_doi
 #define	fi_saddr	fi_src.in4.s_addr
 #define	fi_daddr	fi_dst.in4.s_addr
 #define	fi_srcnum	fi_src.iplookupnum
 #define	fi_dstnum	fi_dst.iplookupnum
 #define	fi_srcname	fi_src.iplookupname
 #define	fi_dstname	fi_dst.iplookupname
 #define	fi_srctype	fi_src.iplookuptype
 #define	fi_dsttype	fi_dst.iplookuptype
 #define	fi_srcsubtype	fi_src.iplookupsubtype
 #define	fi_dstsubtype	fi_dst.iplookupsubtype
 #define	fi_srcptr	fi_src.iplookupptr
 #define	fi_dstptr	fi_dst.iplookupptr
 #define	fi_srcfunc	fi_src.iplookupfunc
 #define	fi_dstfunc	fi_dst.iplookupfunc
 
 
 /*
  * These are both used by the state and NAT code to indicate that one port or
  * the other should be treated as a wildcard.
  * NOTE: When updating, check bit masks in ip_state.h and update there too.
  */
 #define	SI_W_SPORT	0x00000100
 #define	SI_W_DPORT	0x00000200
 #define	SI_WILDP	(SI_W_SPORT|SI_W_DPORT)
 #define	SI_W_SADDR	0x00000400
 #define	SI_W_DADDR	0x00000800
 #define	SI_WILDA	(SI_W_SADDR|SI_W_DADDR)
 #define	SI_NEWFR	0x00001000
 #define	SI_CLONE	0x00002000
 #define	SI_CLONED	0x00004000
 #define	SI_NEWCLONE	0x00008000
 
 typedef	struct {
 	u_short	fda_ports[2];
 	u_char	fda_tcpf;		/* TCP header flags (SYN, ACK, etc) */
 } frdat_t;
 
 typedef enum fr_breasons_e {
 	FRB_BLOCKED = 0,
 	FRB_LOGFAIL = 1,
 	FRB_PPSRATE = 2,
 	FRB_JUMBO = 3,
 	FRB_MAKEFRIP = 4,
 	FRB_STATEADD = 5,
 	FRB_UPDATEIPID = 6,
 	FRB_LOGFAIL2 = 7,
 	FRB_DECAPFRIP = 8,
 	FRB_AUTHNEW = 9,
 	FRB_AUTHCAPTURE = 10,
 	FRB_COALESCE = 11,
 	FRB_PULLUP = 12,
 	FRB_AUTHFEEDBACK = 13,
 	FRB_BADFRAG = 14,
 	FRB_NATV4 = 15,
 	FRB_NATV6 = 16,
 } fr_breason_t;
 
 #define	FRB_MAX_VALUE	16
 
 typedef enum ipf_cksum_e {
 	FI_CK_BAD = -1,
 	FI_CK_NEEDED = 0,
 	FI_CK_SUMOK = 1,
 	FI_CK_L4PART = 2,
 	FI_CK_L4FULL = 4
 } ipf_cksum_t;
 
 typedef	struct	fr_info	{
 	void	*fin_main_soft;
 	void	*fin_ifp;		/* interface packet is `on' */
 	struct	frentry *fin_fr;	/* last matching rule */
 	int	fin_out;		/* in or out ? 1 == out, 0 == in */
 	fr_ip_t	fin_fi;			/* IP Packet summary */
 	frdat_t	fin_dat;		/* TCP/UDP ports, ICMP code/type */
 	int	fin_dlen;		/* length of data portion of packet */
 	int	fin_plen;
 	u_32_t	fin_rule;		/* rule # last matched */
 	u_short	fin_hlen;		/* length of IP header in bytes */
 	char	fin_group[FR_GROUPLEN];	/* group number, -1 for none */
 	void	*fin_dp;		/* start of data past IP header */
 	/*
 	 * Fields after fin_dp aren't used for compression of log records.
 	 * fin_fi contains the IP version (fin_family)
 	 * fin_rule isn't included because adding a new rule can change it but
 	 * not change fin_fr. fin_rule is the rule number reported.
 	 * It isn't necessary to include fin_crc because that is checked
 	 * for explicitly, before calling bcmp.
 	 */
 	u_32_t	fin_crc;		/* Simple calculation for logging */
 	int	fin_family;		/* AF_INET, etc. */
 	int	fin_icode;		/* ICMP error to return */
 	int	fin_mtu;		/* MTU input for ICMP need-frag */
 	int	fin_rev;		/* state only: 1 = reverse */
 	int	fin_ipoff;		/* # bytes from buffer start to hdr */
 	u_32_t	fin_id;			/* IP packet id field */
 	u_short	fin_l4hlen;		/* length of L4 header, if known */
 	u_short	fin_off;
 	int	fin_depth;		/* Group nesting depth */
 	int	fin_error;		/* Error code to return */
 	ipf_cksum_t	fin_cksum;	/* -1 = bad, 1 = good, 0 = not done */
 	fr_breason_t	fin_reason;	/* why auto blocked */
 	u_int	fin_pktnum;
 	void	*fin_nattag;
 	struct frdest	*fin_dif;
 	struct frdest	*fin_tif;
 	union {
 		ip_t	*fip_ip;
 #ifdef USE_INET6
 		ip6_t	*fip_ip6;
 #endif
 	} fin_ipu;
 	mb_t	**fin_mp;		/* pointer to pointer to mbuf */
 	mb_t	*fin_m;			/* pointer to mbuf */
 #ifdef	MENTAT
 	mb_t	*fin_qfm;		/* pointer to mblk where pkt starts */
 	void	*fin_qpi;
 	char	fin_ifname[LIFNAMSIZ];
 #endif
 #ifdef	__sgi
 	void	*fin_hbuf;
 #endif
 	void	*fin_fraghdr;		/* pointer to start of ipv6 frag hdr */
 } fr_info_t;
 
 #define	fin_ip		fin_ipu.fip_ip
 #define	fin_ip6		fin_ipu.fip_ip6
 #define	fin_v		fin_fi.fi_v
 #define	fin_p		fin_fi.fi_p
 #define	fin_flx		fin_fi.fi_flx
 #define	fin_optmsk	fin_fi.fi_optmsk
 #define	fin_secmsk	fin_fi.fi_secmsk
 #define	fin_doi		fin_fi.fi_doi
 #define	fin_auth	fin_fi.fi_auth
 #define	fin_src		fin_fi.fi_src.in4
 #define	fin_saddr	fin_fi.fi_saddr
 #define	fin_dst		fin_fi.fi_dst.in4
 #define	fin_daddr	fin_fi.fi_daddr
 #define	fin_data	fin_fi.fi_ports
 #define	fin_sport	fin_fi.fi_ports[0]
 #define	fin_dport	fin_fi.fi_ports[1]
 #define	fin_tcpf	fin_fi.fi_tcpf
 #define	fin_src6	fin_fi.fi_src
 #define	fin_dst6	fin_fi.fi_dst
 #define	fin_srcip6	fin_fi.fi_src.in6
 #define	fin_dstip6	fin_fi.fi_dst.in6
 
 #define	IPF_IN		0
 #define	IPF_OUT		1
 
 typedef	struct frentry	*(*ipfunc_t) __P((fr_info_t *, u_32_t *));
 typedef	int		(*ipfuncinit_t) __P((struct ipf_main_softc_s *, struct frentry *));
 
 typedef	struct	ipfunc_resolve	{
 	char		ipfu_name[32];
 	ipfunc_t	ipfu_addr;
 	ipfuncinit_t	ipfu_init;
 	ipfuncinit_t	ipfu_fini;
 } ipfunc_resolve_t;
 
 /*
  * Size for compares on fr_info structures
  */
 #define	FI_CSIZE	offsetof(fr_info_t, fin_icode)
 #define	FI_LCSIZE	offsetof(fr_info_t, fin_dp)
 
 /*
  * Size for copying cache fr_info structure
  */
 #define	FI_COPYSIZE	offsetof(fr_info_t, fin_dp)
 
 /*
  * Structure for holding IPFilter's tag information
  */
 #define	IPFTAG_LEN	16
 typedef	struct	{
 	union	{
 		u_32_t	iptu_num[4];
 		char	iptu_tag[IPFTAG_LEN];
 	} ipt_un;
 	int	ipt_not;
 } ipftag_t;
 
 #define	ipt_tag	ipt_un.iptu_tag
 #define	ipt_num	ipt_un.iptu_num
 
 /*
  * Structure to define address for pool lookups.
  */
 typedef	struct	{
 	u_char		adf_len;
 	sa_family_t	adf_family;
 	u_char		adf_xxx[2];
 	i6addr_t	adf_addr;
 } addrfamily_t;
 
 
 RBI_LINK(ipf_rb, host_node_s);
 
 typedef	struct	host_node_s {
 	RBI_FIELD(ipf_rb)	hn_entry;
 	addrfamily_t		hn_addr;
 	int			hn_active;
 } host_node_t;
 
 typedef RBI_HEAD(ipf_rb, host_node_s) ipf_rb_head_t;
 
 typedef	struct	host_track_s {
 	ipf_rb_head_t	ht_root;
 	int		ht_max_nodes;
 	int		ht_max_per_node;
 	int		ht_netmask;
 	int		ht_cur_nodes;
 } host_track_t;
 
 
 typedef enum fr_dtypes_e {
 	FRD_NORMAL = 0,
 	FRD_DSTLIST
 } fr_dtypes_t;
 /*
  * This structure is used to hold information about the next hop for where
  * to forward a packet.
  */
 typedef	struct	frdest	{
 	void		*fd_ptr;
 	addrfamily_t	fd_addr;
 	fr_dtypes_t	fd_type;
 	int		fd_name;
 	int		fd_local;
 } frdest_t;
 
 #define	fd_ip6	fd_addr.adf_addr
 #define	fd_ip	fd_ip6.in4
 
 
 typedef enum fr_ctypes_e {
 	FR_NONE = 0,
 	FR_EQUAL,
 	FR_NEQUAL,
 	FR_LESST,
 	FR_GREATERT,
 	FR_LESSTE,
 	FR_GREATERTE,
 	FR_OUTRANGE,
 	FR_INRANGE,
 	FR_INCRANGE
 } fr_ctypes_t;
 
 /*
  * This structure holds information about a port comparison.
  */
 typedef	struct	frpcmp	{
 	fr_ctypes_t	frp_cmp;	/* data for port comparisons */
 	u_32_t		frp_port;	/* top port for <> and >< */
 	u_32_t		frp_top;	/* top port for <> and >< */
 } frpcmp_t;
 
 
 /*
  * Structure containing all the relevant TCP things that can be checked in
  * a filter rule.
  */
 typedef	struct	frtuc	{
 	u_char		ftu_tcpfm;	/* tcp flags mask */
 	u_char		ftu_tcpf;	/* tcp flags */
 	frpcmp_t	ftu_src;
 	frpcmp_t	ftu_dst;
 } frtuc_t;
 
 #define	ftu_scmp	ftu_src.frp_cmp
 #define	ftu_dcmp	ftu_dst.frp_cmp
 #define	ftu_sport	ftu_src.frp_port
 #define	ftu_dport	ftu_dst.frp_port
 #define	ftu_stop	ftu_src.frp_top
 #define	ftu_dtop	ftu_dst.frp_top
 
 #define	FR_TCPFMAX	0x3f
 
 typedef enum fr_atypes_e {
 	FRI_NONE = -1,	/* For LHS of NAT */
 	FRI_NORMAL = 0,	/* Normal address */
 	FRI_DYNAMIC,	/* dynamic address */
 	FRI_LOOKUP,	/* address is a pool # */
 	FRI_RANGE,	/* address/mask is a range */
 	FRI_NETWORK,	/* network address from if */
 	FRI_BROADCAST,	/* broadcast address from if */
 	FRI_PEERADDR,	/* Peer address for P-to-P */
 	FRI_NETMASKED,	/* network address with netmask from if */
 	FRI_SPLIT,	/* For NAT compatibility */
 	FRI_INTERFACE	/* address is based on interface name */
 } fr_atypes_t;
 
 /*
  * This structure makes up what is considered to be the IPFilter specific
  * matching components of a filter rule, as opposed to the data structures
  * used to define the result which are in frentry_t and not here.
  */
 typedef	struct	fripf	{
 	fr_ip_t		fri_ip;
 	fr_ip_t		fri_mip;	/* mask structure */
 
 	u_short		fri_icmpm;	/* data for ICMP packets (mask) */
 	u_short		fri_icmp;
 
 	frtuc_t		fri_tuc;
 	fr_atypes_t	fri_satype;	/* addres type */
 	fr_atypes_t	fri_datype;	/* addres type */
 	int		fri_sifpidx;	/* doing dynamic addressing */
 	int		fri_difpidx;	/* index into fr_ifps[] to use when */
 } fripf_t;
 
 #define	fri_dlookup	fri_mip.fi_dst
 #define	fri_slookup	fri_mip.fi_src
 #define	fri_dstnum	fri_mip.fi_dstnum
 #define	fri_srcnum	fri_mip.fi_srcnum
 #define	fri_dstname	fri_mip.fi_dstname
 #define	fri_srcname	fri_mip.fi_srcname
 #define	fri_dstptr	fri_mip.fi_dstptr
 #define	fri_srcptr	fri_mip.fi_srcptr
 
 
 typedef enum fr_rtypes_e {
 	FR_T_NONE = 0,
 	FR_T_IPF,		/* IPF structures */
 	FR_T_BPFOPC,		/* BPF opcode */
 	FR_T_CALLFUNC,		/* callout to function in fr_func only */
 	FR_T_COMPIPF,			/* compiled C code */
 	FR_T_IPFEXPR,			/* IPF expression */
 	FR_T_BUILTIN = 0x40000000,	/* rule is in kernel space */
 	FR_T_IPF_BUILTIN,
 	FR_T_BPFOPC_BUILTIN,
 	FR_T_CALLFUNC_BUILTIN,
 	FR_T_COMPIPF_BUILTIN,
 	FR_T_IPFEXPR_BUILTIN
 } fr_rtypes_t;
 
 typedef	struct	frentry	* (* frentfunc_t) __P((fr_info_t *));
 
 typedef	struct	frentry {
 	ipfmutex_t	fr_lock;
 	struct	frentry	*fr_next;
 	struct	frentry	**fr_pnext;
 	struct	frgroup	*fr_grp;
 	struct	frgroup	*fr_grphead;
 	struct	frgroup	*fr_icmpgrp;
 	struct	ipscan	*fr_isc;
 	struct	frentry	*fr_dnext;	/* 2 fr_die linked list pointers */
 	struct	frentry	**fr_pdnext;
 	void	*fr_ifas[4];
 	void	*fr_ptr;	/* for use with fr_arg */
 	int	fr_comment;	/* text comment for rule */
 	int	fr_size;	/* size of this structure */
 	int	fr_ref;		/* reference count */
 	int	fr_statecnt;	/* state count - for limit rules */
 	u_32_t	fr_die;		/* only used on loading the rule */
 	u_int	fr_cksum;	/* checksum on filter rules for performance */
 	/*
 	 * The line number from a file is here because we need to be able to
 	 * match the rule generated with ``grep rule ipf.conf | ipf -rf -''
 	 * with the rule loaded using ``ipf -f ipf.conf'' - thus it can't be
 	 * on the other side of fr_func.
 	 */
 	int	fr_flineno;	/* line number from conf file */
 	/*
 	 * These are only incremented when a packet  matches this rule and
 	 * it is the last match
 	 */
 	U_QUAD_T	fr_hits;
 	U_QUAD_T	fr_bytes;
 
 	/*
 	 * For PPS rate limiting
 	 * fr_lpu is used to always have the same size for this field,
 	 * allocating 64bits for seconds and 32bits for milliseconds.
 	 */
 	union {
 		struct timeval	frp_lastpkt;
 		char	frp_bytes[12];
 	} fr_lpu;
 	int		fr_curpps;
 
 	union	{
 		void		*fru_data;
 		char		*fru_caddr;
 		fripf_t		*fru_ipf;
 		frentfunc_t	fru_func;
 	} fr_dun;
 
 	/*
 	 * Fields after this may not change whilst in the kernel.
 	 */
 	ipfunc_t fr_func; 	/* call this function */
 	int	fr_dsize;
 	int	fr_pps;
 	fr_rtypes_t	fr_type;
 	u_32_t	fr_flags;	/* per-rule flags && options (see below) */
 	u_32_t	fr_logtag;	/* user defined log tag # */
 	u_32_t	fr_collect;	/* collection number */
 	u_int	fr_arg;		/* misc. numeric arg for rule */
 	u_int	fr_loglevel;	/* syslog log facility + priority */
 	u_char	fr_family;
 	u_char	fr_icode;	/* return ICMP code */
 	int	fr_group;	/* group to which this rule belongs */
 	int	fr_grhead;	/* group # which this rule starts */
 	int	fr_ifnames[4];
 	int	fr_isctag;
 	int	fr_rpc;		/* XID Filtering */ 
 	ipftag_t fr_nattag;
 	frdest_t fr_tifs[2];	/* "to"/"reply-to" interface */
 	frdest_t fr_dif;	/* duplicate packet interface */
 	/*
 	 * These are all options related to stateful filtering
 	 */
 	host_track_t	fr_srctrack;
 	int	fr_nostatelog;
 	int	fr_statemax;	/* max reference count */
 	int	fr_icmphead;	/* ICMP group  for state options */
 	u_int	fr_age[2];	/* non-TCP state timeouts */
 	/*
 	 * How big is the name buffer at the end?
 	 */
 	int	fr_namelen;
 	char	fr_names[1];
 } frentry_t;
 
 #define	fr_lastpkt	fr_lpu.frp_lastpkt
 #define	fr_caddr	fr_dun.fru_caddr
 #define	fr_data		fr_dun.fru_data
 #define	fr_dfunc	fr_dun.fru_func
 #define	fr_ipf		fr_dun.fru_ipf
 #define	fr_ip		fr_ipf->fri_ip
 #define	fr_mip		fr_ipf->fri_mip
 #define	fr_icmpm	fr_ipf->fri_icmpm
 #define	fr_icmp		fr_ipf->fri_icmp
 #define	fr_tuc		fr_ipf->fri_tuc
 #define	fr_satype	fr_ipf->fri_satype
 #define	fr_datype	fr_ipf->fri_datype
 #define	fr_sifpidx	fr_ipf->fri_sifpidx
 #define	fr_difpidx	fr_ipf->fri_difpidx
 #define	fr_proto	fr_ip.fi_p
 #define	fr_mproto	fr_mip.fi_p
 #define	fr_ttl		fr_ip.fi_ttl
 #define	fr_mttl		fr_mip.fi_ttl
 #define	fr_tos		fr_ip.fi_tos
 #define	fr_mtos		fr_mip.fi_tos
 #define	fr_tcpfm	fr_tuc.ftu_tcpfm
 #define	fr_tcpf		fr_tuc.ftu_tcpf
 #define	fr_scmp		fr_tuc.ftu_scmp
 #define	fr_dcmp		fr_tuc.ftu_dcmp
 #define	fr_dport	fr_tuc.ftu_dport
 #define	fr_sport	fr_tuc.ftu_sport
 #define	fr_stop		fr_tuc.ftu_stop
 #define	fr_dtop		fr_tuc.ftu_dtop
 #define	fr_dst		fr_ip.fi_dst.in4
 #define	fr_dst6		fr_ip.fi_dst
 #define	fr_daddr	fr_ip.fi_dst.in4.s_addr
 #define	fr_src		fr_ip.fi_src.in4
 #define	fr_src6		fr_ip.fi_src
 #define	fr_saddr	fr_ip.fi_src.in4.s_addr
 #define	fr_dmsk		fr_mip.fi_dst.in4
 #define	fr_dmsk6	fr_mip.fi_dst
 #define	fr_dmask	fr_mip.fi_dst.in4.s_addr
 #define	fr_smsk		fr_mip.fi_src.in4
 #define	fr_smsk6	fr_mip.fi_src
 #define	fr_smask	fr_mip.fi_src.in4.s_addr
 #define	fr_dstnum	fr_ip.fi_dstnum
 #define	fr_srcnum	fr_ip.fi_srcnum
 #define	fr_dlookup	fr_ip.fi_dst
 #define	fr_slookup	fr_ip.fi_src
 #define	fr_dstname	fr_ip.fi_dstname
 #define	fr_srcname	fr_ip.fi_srcname
 #define	fr_dsttype	fr_ip.fi_dsttype
 #define	fr_srctype	fr_ip.fi_srctype
 #define	fr_dstsubtype	fr_ip.fi_dstsubtype
 #define	fr_srcsubtype	fr_ip.fi_srcsubtype
 #define	fr_dstptr	fr_mip.fi_dstptr
 #define	fr_srcptr	fr_mip.fi_srcptr
 #define	fr_dstfunc	fr_mip.fi_dstfunc
 #define	fr_srcfunc	fr_mip.fi_srcfunc
 #define	fr_optbits	fr_ip.fi_optmsk
 #define	fr_optmask	fr_mip.fi_optmsk
 #define	fr_secbits	fr_ip.fi_secmsk
 #define	fr_secmask	fr_mip.fi_secmsk
 #define	fr_authbits	fr_ip.fi_auth
 #define	fr_authmask	fr_mip.fi_auth
 #define	fr_doi		fr_ip.fi_doi
 #define	fr_doimask	fr_mip.fi_doi
 #define	fr_flx		fr_ip.fi_flx
 #define	fr_mflx		fr_mip.fi_flx
 #define	fr_ifa		fr_ifas[0]
 #define	fr_oifa		fr_ifas[2]
 #define	fr_tif		fr_tifs[0]
 #define	fr_rif		fr_tifs[1]
 
 #define	FR_NOLOGTAG	0
 
 #define	FR_CMPSIZ	(sizeof(struct frentry) - \
 			 offsetof(struct frentry, fr_func))
 #define	FR_NAME(_f, _n)	(_f)->fr_names + (_f)->_n
 
 
 /*
  * fr_flags
  */
 #define	FR_BLOCK	0x00001	/* do not allow packet to pass */
 #define	FR_PASS		0x00002	/* allow packet to pass */
 #define	FR_AUTH		0x00003	/* use authentication */
 #define	FR_PREAUTH	0x00004	/* require preauthentication */
 #define	FR_ACCOUNT	0x00005	/* Accounting rule */
 #define	FR_SKIP		0x00006	/* skip rule */
 #define	FR_DECAPSULATE	0x00008	/* decapsulate rule */
 #define	FR_CALL		0x00009	/* call rule */
 #define	FR_CMDMASK	0x0000f
 #define	FR_LOG		0x00010	/* Log */
 #define	FR_LOGB		0x00011	/* Log-fail */
 #define	FR_LOGP		0x00012	/* Log-pass */
 #define	FR_LOGMASK	(FR_LOG|FR_CMDMASK)
 #define	FR_CALLNOW	0x00020	/* call another function (fr_func) if matches */
 #define	FR_NOTSRCIP	0x00040
 #define	FR_NOTDSTIP	0x00080
 #define	FR_QUICK	0x00100	/* match & stop processing list */
 #define	FR_KEEPFRAG	0x00200	/* keep fragment information */
 #define	FR_KEEPSTATE	0x00400	/* keep `connection' state information */
 #define	FR_FASTROUTE	0x00800	/* bypass normal routing */
 #define	FR_RETRST	0x01000	/* Return TCP RST packet - reset connection */
 #define	FR_RETICMP	0x02000	/* Return ICMP unreachable packet */
 #define	FR_FAKEICMP	0x03000	/* Return ICMP unreachable with fake source */
 #define	FR_OUTQUE	0x04000	/* outgoing packets */
 #define	FR_INQUE	0x08000	/* ingoing packets */
 #define	FR_LOGBODY	0x10000	/* Log the body */
 #define	FR_LOGFIRST	0x20000	/* Log the first byte if state held */
 #define	FR_LOGORBLOCK	0x40000	/* block the packet if it can't be logged */
 #define	FR_STLOOSE	0x80000	/* loose state checking */
 #define	FR_FRSTRICT	0x100000	/* strict frag. cache */
 #define	FR_STSTRICT	0x200000	/* strict keep state */
 #define	FR_NEWISN	0x400000	/* new ISN for outgoing TCP */
 #define	FR_NOICMPERR	0x800000	/* do not match ICMP errors in state */
 #define	FR_STATESYNC	0x1000000	/* synchronize state to slave */
 #define	FR_COPIED	0x2000000	/* copied from user space */
 #define	FR_INACTIVE	0x4000000	/* only used when flush'ing rules */
 #define	FR_NOMATCH	0x8000000	/* no match occured */
 		/*	0x10000000 	FF_LOGPASS */
 		/*	0x20000000 	FF_LOGBLOCK */
 		/*	0x40000000 	FF_LOGNOMATCH */
 		/*	0x80000000 	FF_BLOCKNONIP */
 
 #define	FR_RETMASK	(FR_RETICMP|FR_RETRST|FR_FAKEICMP)
 #define	FR_ISBLOCK(x)	(((x) & FR_CMDMASK) == FR_BLOCK)
 #define	FR_ISPASS(x)	(((x) & FR_CMDMASK) == FR_PASS)
 #define	FR_ISAUTH(x)	(((x) & FR_CMDMASK) == FR_AUTH)
 #define	FR_ISPREAUTH(x)	(((x) & FR_CMDMASK) == FR_PREAUTH)
 #define	FR_ISACCOUNT(x)	(((x) & FR_CMDMASK) == FR_ACCOUNT)
 #define	FR_ISSKIP(x)	(((x) & FR_CMDMASK) == FR_SKIP)
 #define	FR_ISDECAPS(x)	(((x) & FR_CMDMASK) == FR_DECAPSULATE)
 #define	FR_ISNOMATCH(x)	((x) & FR_NOMATCH)
 #define	FR_INOUT	(FR_INQUE|FR_OUTQUE)
 
 /*
  * recognized flags for SIOCGETFF and SIOCSETFF, and get put in fr_flags
  */
 #define	FF_LOGPASS	0x10000000
 #define	FF_LOGBLOCK	0x20000000
 #define	FF_LOGNOMATCH	0x40000000
 #define	FF_LOGGING	(FF_LOGPASS|FF_LOGBLOCK|FF_LOGNOMATCH)
 #define	FF_BLOCKNONIP	0x80000000	/* Solaris2 Only */
 
 
 /*
  * Structure that passes information on what/how to flush to the kernel.
  */
 typedef	struct	ipfflush	{
 	int		ipflu_how;
 	int		ipflu_arg;
 } ipfflush_t;
 
 
 /*
  *
  */
 typedef	struct	ipfgetctl	{
 	u_int		ipfg_min;	/* min value */
 	u_int		ipfg_current;	/* current value */
 	u_int		ipfg_max;	/* max value */
 	u_int		ipfg_default;	/* default value */
 	u_int		ipfg_steps;	/* value increments */
 	char		ipfg_name[40];	/* tag name for this control */
 } ipfgetctl_t;
 
 typedef	struct	ipfsetctl	{
 	int	ipfs_which;	/* 0 = min 1 = current 2 = max 3 = default */
 	u_int	ipfs_value;	/* min value */
 	char	ipfs_name[40];	/* tag name for this control */
 } ipfsetctl_t;
 
 
 /*
  * Some of the statistics below are in their own counters, but most are kept
  * in this single structure so that they can all easily be collected and
  * copied back as required.
  */
 typedef	struct	ipf_statistics {
 	u_long	fr_icmp_coalesce;
 	u_long	fr_tcp_frag;
 	u_long	fr_tcp_pullup;
 	u_long	fr_tcp_short;
 	u_long	fr_tcp_small;
 	u_long	fr_tcp_bad_flags;
 	u_long	fr_udp_pullup;
 	u_long	fr_ip_freed;
 	u_long	fr_v6_ah_bad;
 	u_long	fr_v6_bad;
 	u_long	fr_v6_badfrag;
 	u_long	fr_v6_dst_bad;
 	u_long	fr_v6_esp_pullup;
 	u_long	fr_v6_ext_short;
 	u_long	fr_v6_ext_pullup;
 	u_long	fr_v6_ext_hlen;
 	u_long	fr_v6_frag_bad;
 	u_long	fr_v6_frag_pullup;
 	u_long	fr_v6_frag_size;
 	u_long	fr_v6_gre_pullup;
 	u_long	fr_v6_icmp6_pullup;
 	u_long	fr_v6_rh_bad;
 	u_long	fr_v6_badttl;	/* TTL in packet doesn't reach minimum */
 	u_long	fr_v4_ah_bad;
 	u_long	fr_v4_ah_pullup;
 	u_long	fr_v4_esp_pullup;
 	u_long	fr_v4_cipso_bad;
 	u_long	fr_v4_cipso_tlen;
 	u_long	fr_v4_gre_frag;
 	u_long	fr_v4_gre_pullup;
 	u_long	fr_v4_icmp_frag;
 	u_long	fr_v4_icmp_pullup;
 	u_long	fr_v4_badttl;	/* TTL in packet doesn't reach minimum */
 	u_long	fr_v4_badsrc;	/* source received doesn't match route */
 	u_long	fr_l4_badcksum;	/* layer 4 header checksum failure */
 	u_long	fr_badcoalesces;
 	u_long	fr_pass;	/* packets allowed */
 	u_long	fr_block;	/* packets denied */
 	u_long	fr_nom;		/* packets which don't match any rule */
 	u_long	fr_short;	/* packets which are short */
 	u_long	fr_ppkl;	/* packets allowed and logged */
 	u_long	fr_bpkl;	/* packets denied and logged */
 	u_long	fr_npkl;	/* packets unmatched and logged */
 	u_long	fr_ret;		/* packets for which a return is sent */
 	u_long	fr_acct;	/* packets for which counting was performed */
 	u_long	fr_bnfr;	/* bad attempts to allocate fragment state */
 	u_long	fr_nfr;		/* new fragment state kept */
 	u_long	fr_cfr;		/* add new fragment state but complete pkt */
 	u_long	fr_bads;	/* bad attempts to allocate packet state */
 	u_long	fr_ads;		/* new packet state kept */
 	u_long	fr_chit;	/* cached hit */
 	u_long	fr_cmiss;	/* cached miss */
 	u_long	fr_tcpbad;	/* TCP checksum check failures */
 	u_long	fr_pull[2];	/* good and bad pullup attempts */
 	u_long	fr_bad;		/* bad IP packets to the filter */
 	u_long	fr_ipv6;	/* IPv6 packets in/out */
 	u_long	fr_ppshit;	/* dropped because of pps ceiling */
 	u_long	fr_ipud;	/* IP id update failures */
 	u_long	fr_blocked[FRB_MAX_VALUE + 1];
 } ipf_statistics_t;
 
 /*
  * Log structure.  Each packet header logged is prepended by one of these.
  * Following this in the log records read from the device will be an ipflog
  * structure which is then followed by any packet data.
  */
 typedef	struct	iplog	{
 	u_32_t		ipl_magic;
 	u_int		ipl_count;
 	u_32_t		ipl_seqnum;
 	struct	timeval	ipl_time;
 	size_t		ipl_dsize;
 	struct	iplog	*ipl_next;
 } iplog_t;
 
 #define	ipl_sec		ipl_time.tv_sec
 #define	ipl_usec	ipl_time.tv_usec
 
 #define IPL_MAGIC	0x49504c4d	/* 'IPLM' */
 #define IPL_MAGIC_NAT	0x49504c4e	/* 'IPLN' */
 #define IPL_MAGIC_STATE	0x49504c53	/* 'IPLS' */
 #define	IPLOG_SIZE	sizeof(iplog_t)
 
 typedef	struct	ipflog	{
 #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
         (defined(OpenBSD) && (OpenBSD >= 199603))
 #else
 	u_int	fl_unit;
 #endif
 	u_32_t		fl_rule;
 	u_32_t		fl_flags;
 	u_32_t		fl_lflags;
 	u_32_t		fl_logtag;
 	ipftag_t	fl_nattag;
 	u_short		fl_plen;	/* extra data after hlen */
 	u_short		fl_loglevel;	/* syslog log level */
 	char		fl_group[FR_GROUPLEN];
 	u_char		fl_hlen;	/* length of IP headers saved */
 	u_char		fl_dir;
 	u_char		fl_breason;	/* from fin_reason */
 	u_char		fl_family;	/* address family of packet logged */
 	char		fl_ifname[LIFNAMSIZ];
 } ipflog_t;
 
 #ifndef	IPF_LOGGING
 # define	IPF_LOGGING	0
 #endif
 #ifndef	IPF_DEFAULT_PASS
 # define	IPF_DEFAULT_PASS	FR_PASS
 #endif
 
 #define	DEFAULT_IPFLOGSIZE	32768
 #ifndef	IPFILTER_LOGSIZE
 # define	IPFILTER_LOGSIZE	DEFAULT_IPFLOGSIZE
 #else
 # if IPFILTER_LOGSIZE < 8192
 #  error IPFILTER_LOGSIZE too small.  Must be >= 8192
 # endif
 #endif
 
 #define	IPF_OPTCOPY	0x07ff00	/* bit mask of copied options */
 
 /*
  * Device filenames for reading log information.  Use ipf on Solaris2 because
  * ipl is already a name used by something else.
  */
 #ifndef	IPL_NAME
 # if	SOLARIS
 #  define	IPL_NAME	"/dev/ipf"
 # else
 #  define	IPL_NAME	"/dev/ipl"
 # endif
 #endif
 /*
  * Pathnames for various IP Filter control devices.  Used by LKM
  * and userland, so defined here.
  */
 #define	IPNAT_NAME	"/dev/ipnat"
 #define	IPSTATE_NAME	"/dev/ipstate"
 #define	IPAUTH_NAME	"/dev/ipauth"
 #define	IPSYNC_NAME	"/dev/ipsync"
 #define	IPSCAN_NAME	"/dev/ipscan"
 #define	IPLOOKUP_NAME	"/dev/iplookup"
 
 #define	IPL_LOGIPF	0	/* Minor device #'s for accessing logs */
 #define	IPL_LOGNAT	1
 #define	IPL_LOGSTATE	2
 #define	IPL_LOGAUTH	3
 #define	IPL_LOGSYNC	4
 #define	IPL_LOGSCAN	5
 #define	IPL_LOGLOOKUP	6
 #define	IPL_LOGCOUNT	7
 #define	IPL_LOGMAX	7
 #define	IPL_LOGSIZE	IPL_LOGMAX + 1
 #define	IPL_LOGALL	-1
 #define	IPL_LOGNONE	-2
 
 /*
  * For SIOCGETFS
  */
 typedef	struct	friostat	{
 	ipf_statistics_t f_st[2];
 	frentry_t	*f_ipf[2][2];
 	frentry_t	*f_acct[2][2];
 	frentry_t	*f_auth;
 	struct frgroup	*f_groups[IPL_LOGSIZE][2];
 	u_long		f_froute[2];
 	u_long		f_log_ok;
 	u_long		f_log_fail;
 	u_long		f_rb_no_mem;
 	u_long		f_rb_node_max;
 	u_32_t		f_ticks;
 	int		f_locks[IPL_LOGSIZE];
 	int		f_defpass;	/* default pass - from fr_pass */
 	int		f_active;	/* 1 or 0 - active rule set */
 	int		f_running;	/* 1 if running, else 0 */
 	int		f_logging;	/* 1 if enabled, else 0 */
 	int		f_features;
 	char		f_version[32];	/* version string */
 } friostat_t;
 
 #define	f_fin		f_ipf[0]
 #define	f_fout		f_ipf[1]
 #define	f_acctin	f_acct[0]
 #define	f_acctout	f_acct[1]
 
 #define	IPF_FEAT_LKM		0x001
 #define	IPF_FEAT_LOG		0x002
 #define	IPF_FEAT_LOOKUP		0x004
 #define	IPF_FEAT_BPF		0x008
 #define	IPF_FEAT_COMPILED	0x010
 #define	IPF_FEAT_CKSUM		0x020
 #define	IPF_FEAT_SYNC		0x040
 #define	IPF_FEAT_SCAN		0x080
 #define	IPF_FEAT_IPV6		0x100
 
 typedef struct	optlist {
 	u_short ol_val;
 	int	ol_bit;
 } optlist_t;
 
 
 /*
  * Group list structure.
  */
 typedef	struct frgroup {
 	struct frgroup	*fg_next;
 	struct frentry	*fg_head;
 	struct frentry	*fg_start;
 	struct frgroup	**fg_set;
 	u_32_t		fg_flags;
 	int		fg_ref;
 	char		fg_name[FR_GROUPLEN];
 } frgroup_t;
 
 #define	FG_NAME(g)	(*(g)->fg_name == '\0' ? "" : (g)->fg_name)
 
 
 /*
  * Used by state and NAT tables
  */
 typedef struct icmpinfo {
 	u_short		ici_id;
 	u_short		ici_seq;
 	u_char		ici_type;
 } icmpinfo_t;
 
 typedef struct udpinfo {
 	u_short		us_sport;
 	u_short		us_dport;
 } udpinfo_t;
 
 
 typedef	struct	tcpdata	{
 	u_32_t		td_end;
 	u_32_t		td_maxend;
 	u_32_t		td_maxwin;
 	u_32_t		td_winscale;
 	u_32_t		td_maxseg;
 	int		td_winflags;
 } tcpdata_t;
 
 #define	TCP_WSCALE_MAX		14
 
 #define	TCP_WSCALE_SEEN		0x00000001
 #define	TCP_WSCALE_FIRST	0x00000002
 #define	TCP_SACK_PERMIT		0x00000004
 
 
 typedef	struct tcpinfo {
 	u_32_t		ts_sport;
 	u_32_t		ts_dport;
 	tcpdata_t	ts_data[2];
 } tcpinfo_t;
 
 
 /*
  * Structures to define a GRE header as seen in a packet.
  */
 struct	grebits	{
 #if defined(sparc)
 	u_32_t		grb_ver:3;
 	u_32_t		grb_flags:3;
 	u_32_t		grb_A:1;
 	u_32_t		grb_recur:1;
 	u_32_t		grb_s:1;
 	u_32_t		grb_S:1;
 	u_32_t		grb_K:1;
 	u_32_t		grb_R:1;
 	u_32_t		grb_C:1;
 #else
 	u_32_t		grb_C:1;
 	u_32_t		grb_R:1;
 	u_32_t		grb_K:1;
 	u_32_t		grb_S:1;
 	u_32_t		grb_s:1;
 	u_32_t		grb_recur:1;
 	u_32_t		grb_A:1;
 	u_32_t		grb_flags:3;
 	u_32_t		grb_ver:3;
 #endif
 	u_short		grb_ptype;
 };
 
 typedef	struct	grehdr	{
 	union	{
 		struct	grebits	gru_bits;
 		u_short	gru_flags;
 	} gr_un;
 	u_short		gr_len;
 	u_short		gr_call;
 } grehdr_t;
 
 #define	gr_flags	gr_un.gru_flags
 #define	gr_bits		gr_un.gru_bits
 #define	gr_ptype	gr_bits.grb_ptype
 #define	gr_C		gr_bits.grb_C
 #define	gr_R		gr_bits.grb_R
 #define	gr_K		gr_bits.grb_K
 #define	gr_S		gr_bits.grb_S
 #define	gr_s		gr_bits.grb_s
 #define	gr_recur	gr_bits.grb_recur
 #define	gr_A		gr_bits.grb_A
 #define	gr_ver		gr_bits.grb_ver
 
 /*
  * GRE information tracked by "keep state"
  */
 typedef	struct	greinfo	{
 	u_short		gs_call[2];
 	u_short		gs_flags;
 	u_short		gs_ptype;
 } greinfo_t;
 
 #define	GRE_REV(x)	((ntohs(x) >> 13) & 7)
 
 
 /*
  * Format of an Authentication header
  */
 typedef	struct	authhdr	{
 	u_char		ah_next;
 	u_char		ah_plen;
 	u_short		ah_reserved;
 	u_32_t		ah_spi;
 	u_32_t		ah_seq;
 	/* Following the sequence number field is 0 or more bytes of */
 	/* authentication data, as specified by ah_plen - RFC 2402.  */
 } authhdr_t;
 
 
 /*
  * Timeout tail queue list member
  */
 typedef	struct	ipftqent	{
 	struct ipftqent **tqe_pnext;
 	struct ipftqent *tqe_next;
 	struct	ipftq	*tqe_ifq;
 	void		*tqe_parent;	/* pointer back to NAT/state struct */
 	u_32_t		tqe_die;	/* when this entriy is to die */
 	u_32_t		tqe_touched;
 	int		tqe_flags;
 	int		tqe_state[2];	/* current state of this entry */
 } ipftqent_t;
 
 #define	TQE_RULEBASED	0x00000001
 #define	TQE_DELETE	0x00000002
 
 
 /*
  * Timeout tail queue head for IPFilter
  */
 typedef struct  ipftq   {
 	ipfmutex_t	ifq_lock;
 	u_int		ifq_ttl;
 	ipftqent_t	*ifq_head;
 	ipftqent_t	**ifq_tail;
 	struct ipftq	*ifq_next;
 	struct ipftq	**ifq_pnext;
 	int		ifq_ref;
 	u_int		ifq_flags;
 } ipftq_t;
 
 #define	IFQF_USER	0x01		/* User defined aging */
 #define	IFQF_DELETE	0x02		/* Marked for deletion */
 #define	IFQF_PROXY	0x04		/* Timeout queue in use by a proxy */
 
 #define	IPFTQ_INIT(x,y,z)	do {			\
 					(x)->ifq_ttl = (y);	\
 					(x)->ifq_head = NULL;	\
 					(x)->ifq_ref = 1;	\
 					(x)->ifq_tail = &(x)->ifq_head; \
 					MUTEX_INIT(&(x)->ifq_lock, (z)); \
 				} while (0)
 
 #define	IPF_HZ_MULT	1
 #define	IPF_HZ_DIVIDE	2		/* How many times a second ipfilter */
 					/* checks its timeout queues.       */
 #define	IPF_TTLVAL(x)	(((x) / IPF_HZ_MULT) * IPF_HZ_DIVIDE)
 
 typedef	int	(*ipftq_delete_fn_t)(struct ipf_main_softc_s *, void *);
 
 
 /*
  * Object structure description.  For passing through in ioctls.
  */
 typedef	struct	ipfobj	{
 	u_32_t		ipfo_rev;	/* IPFilter version number */
 	u_32_t		ipfo_size;	/* size of object at ipfo_ptr */
 	void		*ipfo_ptr;	/* pointer to object */
 	int		ipfo_type;	/* type of object being pointed to */
 	int		ipfo_offset;	/* bytes from ipfo_ptr where to start */
 	int		ipfo_retval;	/* return value */
 	u_char		ipfo_xxxpad[28];	/* reserved for future use */
 } ipfobj_t;
 
 #define	IPFOBJ_FRENTRY		0	/* struct frentry */
 #define	IPFOBJ_IPFSTAT		1	/* struct friostat */
 #define	IPFOBJ_IPFINFO		2	/* struct fr_info */
 #define	IPFOBJ_AUTHSTAT		3	/* struct fr_authstat */
 #define	IPFOBJ_FRAGSTAT		4	/* struct ipfrstat */
 #define	IPFOBJ_IPNAT		5	/* struct ipnat */
 #define	IPFOBJ_NATSTAT		6	/* struct natstat */
 #define	IPFOBJ_STATESAVE	7	/* struct ipstate_save */
 #define	IPFOBJ_NATSAVE		8	/* struct nat_save */
 #define	IPFOBJ_NATLOOKUP	9	/* struct natlookup */
 #define	IPFOBJ_IPSTATE		10	/* struct ipstate */
 #define	IPFOBJ_STATESTAT	11	/* struct ips_stat */
 #define	IPFOBJ_FRAUTH		12	/* struct frauth */
 #define	IPFOBJ_TUNEABLE		13	/* struct ipftune */
 #define	IPFOBJ_NAT		14	/* struct nat */
 #define	IPFOBJ_IPFITER		15	/* struct ipfruleiter */
 #define	IPFOBJ_GENITER		16	/* struct ipfgeniter */
 #define	IPFOBJ_GTABLE		17	/* struct ipftable */
 #define	IPFOBJ_LOOKUPITER	18	/* struct ipflookupiter */
 #define	IPFOBJ_STATETQTAB	19	/* struct ipftq * NSTATES */
 #define	IPFOBJ_IPFEXPR		20
 #define	IPFOBJ_PROXYCTL		21	/* strct ap_ctl */
 #define	IPFOBJ_FRIPF		22	/* structfripf */
 #define	IPFOBJ_COUNT		23	/* How many #defines are above this? */
 
 
 typedef	union	ipftunevalptr	{
 	void		*ipftp_void;
 	u_long		*ipftp_long;
 	u_int		*ipftp_int;
 	u_short		*ipftp_short;
 	u_char		*ipftp_char;
 	u_long		ipftp_offset;
 } ipftunevalptr_t;
 
 typedef	union	ipftuneval	{
 	u_long		ipftu_long;
 	u_int		ipftu_int;
 	u_short		ipftu_short;
 	u_char		ipftu_char;
 } ipftuneval_t;
 
 struct ipftuneable;
 typedef	int (* ipftunefunc_t) __P((struct ipf_main_softc_s *, struct ipftuneable *, ipftuneval_t *));
 
 typedef	struct	ipftuneable	{
 	ipftunevalptr_t	ipft_una;
 	const char	*ipft_name;
 	u_long		ipft_min;
 	u_long		ipft_max;
 	int		ipft_sz;
 	int		ipft_flags;
 	struct ipftuneable *ipft_next;
 	ipftunefunc_t	ipft_func;
 } ipftuneable_t;
 
 #define	ipft_addr	ipft_una.ipftp_void
 #define	ipft_plong	ipft_una.ipftp_long
 #define	ipft_pint	ipft_una.ipftp_int
 #define	ipft_pshort	ipft_una.ipftp_short
 #define	ipft_pchar	ipft_una.ipftp_char
 
 #define	IPFT_RDONLY	1	/* read-only */
 #define	IPFT_WRDISABLED	2	/* write when disabled only */
 
 typedef	struct	ipftune	{
 	void    	*ipft_cookie;
 	ipftuneval_t	ipft_un;
 	u_long  	ipft_min;
 	u_long  	ipft_max;
 	int		ipft_sz;
 	int		ipft_flags;
 	char		ipft_name[80];
 } ipftune_t;
 
 #define	ipft_vlong	ipft_un.ipftu_long
 #define	ipft_vint	ipft_un.ipftu_int
 #define	ipft_vshort	ipft_un.ipftu_short
 #define	ipft_vchar	ipft_un.ipftu_char
 
 /*
  * Hash table header
  */
 #define	IPFHASH(x,y)	typedef struct { 			\
 				ipfrwlock_t	ipfh_lock;	\
 				struct	x	*ipfh_head;	\
 				} y
 
 /*
 ** HPUX Port
 */
 #ifdef __hpux
 /* HP-UX locking sequence deadlock detection module lock MAJOR ID */
 # define	IPF_SMAJ	0	/* temp assignment XXX, not critical */
 #endif
 
 #if !defined(CDEV_MAJOR) && defined (__FreeBSD_version) && \
     (__FreeBSD_version >= 220000)
 # define	CDEV_MAJOR	79
 #endif
 
 /*
  * Post NetBSD 1.2 has the PFIL interface for packet filters.  This turns
  * on those hooks.  We don't need any special mods in non-IP Filter code
  * with this!
  */
 #if (defined(NetBSD) && (NetBSD > 199609) && (NetBSD <= 1991011)) || \
     (defined(NetBSD1_2) && NetBSD1_2 > 1) || \
     (defined(__FreeBSD__) && (__FreeBSD_version >= 500043))
 # if (defined(NetBSD) && NetBSD >= 199905)
 #  define PFIL_HOOKS
 # endif
 # ifdef PFIL_HOOKS
 #  define NETBSD_PF
 # endif
 #endif
 
 #ifdef _KERNEL
 # define	FR_VERBOSE(verb_pr)
 # define	FR_DEBUG(verb_pr)
 #else
 extern	void	ipfkdebug __P((char *, ...));
 extern	void	ipfkverbose __P((char *, ...));
 # define	FR_VERBOSE(verb_pr)	ipfkverbose verb_pr
 # define	FR_DEBUG(verb_pr)	ipfkdebug verb_pr
 #endif
 
 /*
  *
  */
 typedef	struct	ipfruleiter {
 	int		iri_inout;
 	char		iri_group[FR_GROUPLEN];
 	int		iri_active;
 	int		iri_nrules;
 	int		iri_v;		/* No longer used (compatibility) */
 	frentry_t	*iri_rule;
 } ipfruleiter_t;
 
 /*
  * Values for iri_inout
  */
 #define	F_IN	0
 #define	F_OUT	1
 #define	F_ACIN	2
 #define	F_ACOUT	3
 
 
 typedef	struct	ipfgeniter {
 	int	igi_type;
 	int	igi_nitems;
 	void	*igi_data;
 } ipfgeniter_t;
 
 #define	IPFGENITER_IPF		0
 #define	IPFGENITER_NAT		1
 #define	IPFGENITER_IPNAT	2
 #define	IPFGENITER_FRAG		3
 #define	IPFGENITER_AUTH		4
 #define	IPFGENITER_STATE	5
 #define	IPFGENITER_NATFRAG	6
 #define	IPFGENITER_HOSTMAP	7
 #define	IPFGENITER_LOOKUP	8
 
 typedef	struct	ipftable {
 	int	ita_type;
 	void	*ita_table;
 } ipftable_t;
 
 #define	IPFTABLE_BUCKETS	1
 #define	IPFTABLE_BUCKETS_NATIN	2
 #define	IPFTABLE_BUCKETS_NATOUT	3
 
 
 typedef struct ipf_v4_masktab_s {
 	u_32_t	imt4_active[33];
 	int	imt4_masks[33];
 	int	imt4_max;
 } ipf_v4_masktab_t;
 
 typedef struct ipf_v6_masktab_s {
 	i6addr_t	imt6_active[129];
 	int		imt6_masks[129];
 	int		imt6_max;
 } ipf_v6_masktab_t;
 
 
 /*
  *
  */
 typedef struct ipftoken {
 	struct ipftoken	*ipt_next;
 	struct ipftoken	**ipt_pnext;
 	void		*ipt_ctx;
 	void		*ipt_data;
 	u_long		ipt_die;
 	int		ipt_type;
 	int		ipt_uid;
 	int		ipt_subtype;
 	int		ipt_ref;
 	int		ipt_complete;
 } ipftoken_t;
 
 
 /*
  *
  */
 typedef struct ipfexp {
 	int		ipfe_cmd;
 	int		ipfe_not;
 	int		ipfe_narg;
 	int		ipfe_size;
 	int		ipfe_arg0[1];
 } ipfexp_t;
 
 /*
  * Currently support commands (ipfe_cmd)
  * 32bits is split up follows:
  * aabbcccc
  * aa = 0 = packet matching, 1 = meta data matching
  * bb = IP protocol number
  * cccc = command
  */
 #define	IPF_EXP_IP_PR		0x00000001
 #define	IPF_EXP_IP_ADDR		0x00000002
 #define	IPF_EXP_IP_SRCADDR	0x00000003
 #define	IPF_EXP_IP_DSTADDR	0x00000004
 #define	IPF_EXP_IP6_ADDR	0x00000005
 #define	IPF_EXP_IP6_SRCADDR	0x00000006
 #define	IPF_EXP_IP6_DSTADDR	0x00000007
 #define	IPF_EXP_TCP_FLAGS	0x00060001
 #define	IPF_EXP_TCP_PORT	0x00060002
 #define	IPF_EXP_TCP_SPORT	0x00060003
 #define	IPF_EXP_TCP_DPORT	0x00060004
 #define	IPF_EXP_UDP_PORT	0x00110002
 #define	IPF_EXP_UDP_SPORT	0x00110003
 #define	IPF_EXP_UDP_DPORT	0x00110004
 #define	IPF_EXP_IDLE_GT		0x01000001
 #define	IPF_EXP_TCP_STATE	0x01060002
 #define	IPF_EXP_END		0xffffffff
 
 #define	ONE_DAY			IPF_TTLVAL(1 * 86400)   /* 1 day */
 #define	FIVE_DAYS		(5 * ONE_DAY)
 
 typedef struct ipf_main_softc_s {
 	struct ipf_main_softc_s *ipf_next;
 	ipfmutex_t	ipf_rw;
 	ipfmutex_t      ipf_timeoutlock;
 	ipfrwlock_t     ipf_mutex;
 	ipfrwlock_t	ipf_frag;
 	ipfrwlock_t	ipf_global;
 	ipfrwlock_t	ipf_tokens;
 	ipfrwlock_t	ipf_state;
 	ipfrwlock_t	ipf_nat;
 	ipfrwlock_t	ipf_natfrag;
 	ipfrwlock_t	ipf_poolrw;
 	int		ipf_dynamic_softc;
 	int		ipf_refcnt;
 	int		ipf_running;
 	int		ipf_flags;
 	int		ipf_active;
 	int		ipf_control_forwarding;
 	int		ipf_update_ipid;
 	int		ipf_chksrc;	/* causes a system crash if enabled */
 	int		ipf_pass;
 	int		ipf_minttl;
 	int		ipf_icmpminfragmtu;
 	int		ipf_interror;	/* Should be in a struct that is per  */
 					/* thread or process. Does not belong */
 					/* here but there's a lot more work   */
 					/* in doing that properly. For now,   */
 					/* it is squatting. */
 	u_int		ipf_tcpidletimeout;
 	u_int		ipf_tcpclosewait;
 	u_int		ipf_tcplastack;
 	u_int		ipf_tcptimewait;
 	u_int		ipf_tcptimeout;
 	u_int		ipf_tcpsynsent;
 	u_int		ipf_tcpsynrecv;
 	u_int		ipf_tcpclosed;
 	u_int		ipf_tcphalfclosed;
 	u_int		ipf_udptimeout;
 	u_int		ipf_udpacktimeout;
 	u_int		ipf_icmptimeout;
 	u_int		ipf_icmpacktimeout;
 	u_int		ipf_iptimeout;
 	u_long		ipf_ticks;
 	u_long		ipf_userifqs;
 	u_long		ipf_rb_no_mem;
 	u_long		ipf_rb_node_max;
 	u_long		ipf_frouteok[2];
 	ipftuneable_t	*ipf_tuners;
 	void		*ipf_frag_soft;
 	void		*ipf_nat_soft;
 	void		*ipf_state_soft;
 	void		*ipf_auth_soft;
 	void		*ipf_proxy_soft;
 	void		*ipf_sync_soft;
 	void		*ipf_lookup_soft;
 	void		*ipf_log_soft;
 	struct frgroup	*ipf_groups[IPL_LOGSIZE][2];
 	frentry_t	*ipf_rules[2][2];
 	frentry_t	*ipf_acct[2][2];
 	frentry_t	*ipf_rule_explist[2];
 	ipftoken_t	*ipf_token_head;
 	ipftoken_t	**ipf_token_tail;
 #if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) && \
     defined(_KERNEL)
 	struct callout ipf_slow_ch;
 #endif
 #if defined(linux) && defined(_KERNEL)
 	struct timer_list	ipf_timer;
 #endif
 #if NETBSD_GE_REV(104040000)
 	struct callout	ipf_slow_ch;
 #endif
 #if SOLARIS
 # if SOLARIS2 >= 7
 	timeout_id_t	ipf_slow_ch;
 # else
 	int		ipf_slow_ch;
 # endif
 #endif
 #if defined(_KERNEL)
 # if SOLARIS
 	struct pollhead	ipf_poll_head[IPL_LOGSIZE];
 	void		*ipf_dip;
 #  if defined(INSTANCES)
 	int		ipf_get_loopback;
 	u_long		ipf_idnum;
 	net_handle_t	ipf_nd_v4;
 	net_handle_t	ipf_nd_v6;
 	hook_t		*ipf_hk_v4_in;
 	hook_t		*ipf_hk_v4_out;
 	hook_t		*ipf_hk_v4_nic;
 	hook_t		*ipf_hk_v6_in;
 	hook_t		*ipf_hk_v6_out;
 	hook_t		*ipf_hk_v6_nic;
 	hook_t		*ipf_hk_loop_v4_in;
 	hook_t		*ipf_hk_loop_v4_out;
 	hook_t		*ipf_hk_loop_v6_in;
 	hook_t		*ipf_hk_loop_v6_out;
 #  endif
 # else
 #  if defined(linux) && defined(_KERNEL)
 	struct poll_table_struct	ipf_selwait[IPL_LOGSIZE];
 	wait_queue_head_t		iplh_linux[IPL_LOGSIZE];
 #  else
 	struct selinfo	ipf_selwait[IPL_LOGSIZE];
 #  endif
 # endif
 #endif
 	void		*ipf_slow;
 	ipf_statistics_t ipf_stats[2];
 	u_char		ipf_iss_secret[32];
 	u_short		ipf_ip_id;
 } ipf_main_softc_t;
 
 #define	IPFERROR(_e)	do { softc->ipf_interror = (_e); \
 			     DT1(user_error, int, _e); \
 			} while (0)
 
 #ifndef	_KERNEL
 extern	int	ipf_check __P((void *, struct ip *, int, void *, int, mb_t **));
 extern	struct	ifnet *get_unit __P((char *, int));
 extern	char	*get_ifname __P((struct ifnet *));
 extern	int	ipfioctl __P((ipf_main_softc_t *, int, ioctlcmd_t,
 			      caddr_t, int));
 extern	void	m_freem __P((mb_t *));
 extern	size_t	msgdsize __P((mb_t *));
 extern	int	bcopywrap __P((void *, void *, size_t));
 extern	void	ip_fillid(struct ip *);
 #else /* #ifndef _KERNEL */
 # if defined(__NetBSD__) && defined(PFIL_HOOKS)
 extern	void	ipfilterattach __P((int));
 # endif
 extern	int	ipl_enable __P((void));
 extern	int	ipl_disable __P((void));
 # ifdef MENTAT
 extern	int	ipf_check __P((void *, struct ip *, int, void *, int, void *,
 			       mblk_t **));
 #  if SOLARIS
 extern	void	ipf_prependmbt(fr_info_t *, mblk_t *);
 #   if SOLARIS2 >= 7
 extern	int	ipfioctl __P((dev_t, int, intptr_t, int, cred_t *, int *));
 #   else
 extern	int	ipfioctl __P((dev_t, int, int *, int, cred_t *, int *));
 #   endif
 #  endif
 #  ifdef __hpux
 extern	int	ipfioctl __P((dev_t, int, caddr_t, int));
 extern	int	ipf_select __P((dev_t, int));
 #  endif
 extern	int	ipf_qout __P((queue_t *, mblk_t *));
 # else /* MENTAT */
 extern	int	ipf_check __P((void *, struct ip *, int, void *, int, mb_t **));
 extern	int	(*fr_checkp) __P((ip_t *, int, void *, int, mb_t **));
 extern	size_t	mbufchainlen __P((mb_t *));
 #  ifdef	__sgi
 #   include <sys/cred.h>
 extern	int	ipfioctl __P((dev_t, int, caddr_t, int, cred_t *, int *));
 extern	int	ipfilter_sgi_attach __P((void));
 extern	void	ipfilter_sgi_detach __P((void));
 extern	void	ipfilter_sgi_intfsync __P((void));
 #  else
 #   ifdef	IPFILTER_LKM
 extern	int	ipf_identify __P((char *));
 #   endif
 #   if BSDOS_GE_REV(199510) || FREEBSD_GE_REV(220000) || \
       (defined(NetBSD) && (NetBSD >= 199511)) || defined(__OpenBSD__)
 #    if defined(__NetBSD__) || BSDOS_GE_REV(199701) || \
        defined(__OpenBSD__) || FREEBSD_GE_REV(300000)
 #     if (__FreeBSD_version >= 500024)
 #      if (__FreeBSD_version >= 502116)
 extern	int	ipfioctl __P((struct cdev*, u_long, caddr_t, int, struct thread *));
 #      else
 extern	int	ipfioctl __P((dev_t, u_long, caddr_t, int, struct thread *));
 #      endif /* __FreeBSD_version >= 502116 */
 #     else
 #      if  NETBSD_GE_REV(499001000)
 extern	int	ipfioctl __P((dev_t, u_long, void *, int, struct lwp *));
 #       else
 #       if  NETBSD_GE_REV(399001400)
 extern	int	ipfioctl __P((dev_t, u_long, caddr_t, int, struct lwp *));
 #       else
 extern	int	ipfioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
 #       endif
 #      endif
 #     endif /* __FreeBSD_version >= 500024 */
 #    else
 extern	int	ipfioctl __P((dev_t, int, caddr_t, int, struct proc *));
 #    endif
 #   else
 #    ifdef linux
 extern	int	ipfioctl __P((struct inode *, struct file *, u_int, u_long));
 #    else
 extern	int	ipfioctl __P((dev_t, int, caddr_t, int));
 #    endif
 #   endif /* (_BSDI_VERSION >= 199510) */
 #  endif /* __ sgi */
 # endif /* MENTAT */
 
 # if defined(__FreeBSD_version)
 extern	int	ipf_pfil_hook __P((void));
 extern	int	ipf_pfil_unhook __P((void));
 extern	void	ipf_event_reg __P((void));
 extern	void	ipf_event_dereg __P((void));
 # endif
 
 # if defined(INSTANCES)
 extern	ipf_main_softc_t	*ipf_find_softc __P((u_long));
 extern	int	ipf_set_loopback __P((ipf_main_softc_t *, ipftuneable_t *,
 				      ipftuneval_t *));
 # endif
 
 #endif /* #ifndef _KERNEL */
 
 extern	char	*memstr __P((const char *, char *, size_t, size_t));
 extern	int	count4bits __P((u_32_t));
 #ifdef USE_INET6
 extern	int	count6bits __P((u_32_t *));
 #endif
 extern	int	frrequest __P((ipf_main_softc_t *, int, ioctlcmd_t, caddr_t,
 			       int, int));
 extern	char	*getifname __P((struct ifnet *));
 extern	int	ipfattach __P((ipf_main_softc_t *));
 extern	int	ipfdetach __P((ipf_main_softc_t *));
 extern	u_short	ipf_cksum __P((u_short *, int));
 extern	int	copyinptr __P((ipf_main_softc_t *, void *, void *, size_t));
 extern	int	copyoutptr __P((ipf_main_softc_t *, void *, void *, size_t));
 extern	int	ipf_fastroute __P((mb_t *, mb_t **, fr_info_t *, frdest_t *));
 extern	int	ipf_inject __P((fr_info_t *, mb_t *));
 extern	int	ipf_inobj __P((ipf_main_softc_t *, void *, ipfobj_t *,
 			       void *, int));
 extern	int	ipf_inobjsz __P((ipf_main_softc_t *, void *, void *,
 				 int , int));
 extern	int	ipf_ioctlswitch __P((ipf_main_softc_t *, int, void *,
 				     ioctlcmd_t, int, int, void *));
 extern	int	ipf_ipf_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t,
 				   int, int, void *));
 extern	int	ipf_ipftune __P((ipf_main_softc_t *, ioctlcmd_t, void *));
 extern	int	ipf_matcharray_load __P((ipf_main_softc_t *, caddr_t,
 					 ipfobj_t *, int **));
 extern	int	ipf_matcharray_verify __P((int *, int));
 extern	int	ipf_outobj __P((ipf_main_softc_t *, void *, void *, int));
 extern	int	ipf_outobjk __P((ipf_main_softc_t *, ipfobj_t *, void *));
 extern	int	ipf_outobjsz __P((ipf_main_softc_t *, void *, void *,
 				  int, int));
 extern	void	*ipf_pullup __P((mb_t *, fr_info_t *, int));
 extern	int	ipf_resolvedest __P((ipf_main_softc_t *, char *,
 				     struct frdest *, int));
 extern	int	ipf_resolvefunc __P((ipf_main_softc_t *, void *));
 extern	void	*ipf_resolvenic __P((ipf_main_softc_t *, char *, int));
 extern	int	ipf_send_icmp_err __P((int, fr_info_t *, int));
 extern	int	ipf_send_reset __P((fr_info_t *));
 #if  (defined(__FreeBSD_version) && (__FreeBSD_version < 501000)) || \
      !defined(_KERNEL) || defined(linux)
 #endif
 extern	void	ipf_apply_timeout __P((ipftq_t *, u_int));
 extern	ipftq_t	*ipf_addtimeoutqueue __P((ipf_main_softc_t *, ipftq_t **,
 					  u_int));
 extern	void	ipf_deletequeueentry __P((ipftqent_t *));
 extern	int	ipf_deletetimeoutqueue __P((ipftq_t *));
 extern	void	ipf_freetimeoutqueue __P((ipf_main_softc_t *, ipftq_t *));
 extern	void	ipf_movequeue __P((u_long, ipftqent_t *, ipftq_t *,
 				   ipftq_t *));
 extern	void	ipf_queueappend __P((u_long, ipftqent_t *, ipftq_t *, void *));
 extern	void	ipf_queueback __P((u_long, ipftqent_t *));
 extern	int	ipf_queueflush __P((ipf_main_softc_t *, ipftq_delete_fn_t,
 				    ipftq_t *, ipftq_t *, u_int *, int, int));
 extern	void	ipf_queuefront __P((ipftqent_t *));
 extern	int	ipf_settimeout_tcp __P((ipftuneable_t *, ipftuneval_t *,
 					ipftq_t *));
 extern	int	ipf_checkv4sum __P((fr_info_t *));
 extern	int	ipf_checkl4sum __P((fr_info_t *));
 extern	int	ipf_ifpfillv4addr __P((int, struct sockaddr_in *,
 				      struct sockaddr_in *, struct in_addr *,
 				      struct in_addr *));
 extern	int	ipf_coalesce __P((fr_info_t *));
 #ifdef	USE_INET6
 extern	int	ipf_checkv6sum __P((fr_info_t *));
 extern	int	ipf_ifpfillv6addr __P((int, struct sockaddr_in6 *,
 				      struct sockaddr_in6 *, i6addr_t *,
 				      i6addr_t *));
 #endif
 
 extern	int	ipf_tune_add __P((ipf_main_softc_t *, ipftuneable_t *));
 extern	int	ipf_tune_add_array __P((ipf_main_softc_t *, ipftuneable_t *));
 extern	int	ipf_tune_del __P((ipf_main_softc_t *, ipftuneable_t *));
 extern	int	ipf_tune_del_array __P((ipf_main_softc_t *, ipftuneable_t *));
 extern	int	ipf_tune_array_link __P((ipf_main_softc_t *, ipftuneable_t *));
 extern	int	ipf_tune_array_unlink __P((ipf_main_softc_t *,
 					   ipftuneable_t *));
 extern	ipftuneable_t *ipf_tune_array_copy __P((void *, size_t,
 						ipftuneable_t *));
 
 extern int	ipf_pr_pullup __P((fr_info_t *, int));
 
 extern	int	ipf_flush __P((ipf_main_softc_t *, minor_t, int));
 extern	frgroup_t *ipf_group_add __P((ipf_main_softc_t *, char *, void *,
 				      u_32_t, minor_t, int));
 extern	void	ipf_group_del __P((ipf_main_softc_t *, frgroup_t *,
 				   frentry_t *));
 extern	int	ipf_derefrule __P((ipf_main_softc_t *, frentry_t **));
 extern	frgroup_t *ipf_findgroup __P((ipf_main_softc_t *, char *, minor_t,
 				      int, frgroup_t ***));
 
 extern	int	ipf_log_init __P((void));
 extern	int	ipf_log_bytesused __P((ipf_main_softc_t *, int));
 extern	int	ipf_log_canread __P((ipf_main_softc_t *, int));
 extern	int	ipf_log_clear __P((ipf_main_softc_t *, minor_t));
 extern	u_long  ipf_log_failures __P((ipf_main_softc_t *, int));
 extern	int	ipf_log_read __P((ipf_main_softc_t *, minor_t, uio_t *));
 extern	int	ipf_log_items __P((ipf_main_softc_t *, int, fr_info_t *,
 				   void **, size_t *, int *, int));
 extern	u_long  ipf_log_logok __P((ipf_main_softc_t *, int));
 extern	void	ipf_log_unload __P((ipf_main_softc_t *));
 extern	int 	ipf_log_pkt __P((fr_info_t *, u_int));
 
 extern	frentry_t	*ipf_acctpkt __P((fr_info_t *, u_32_t *));
 extern	u_short		fr_cksum __P((fr_info_t *, ip_t *, int, void *));
 extern	void		ipf_deinitialise __P((ipf_main_softc_t *));
 extern	int		ipf_deliverlocal __P((ipf_main_softc_t *, int, void *,
 					      i6addr_t *));
 extern	frentry_t 	*ipf_dstgrpmap __P((fr_info_t *, u_32_t *));
 extern	void		ipf_fixskip __P((frentry_t **, frentry_t *, int));
 extern	void		ipf_forgetifp __P((ipf_main_softc_t *, void *));
 extern	frentry_t 	*ipf_getrulen __P((ipf_main_softc_t *, int, char *,
 					   u_32_t));
 extern	int		ipf_ifpaddr __P((ipf_main_softc_t *, int, int, void *,
 					i6addr_t *, i6addr_t *));
 extern	void		ipf_inet_mask_add __P((int, ipf_v4_masktab_t *));
 extern	void		ipf_inet_mask_del __P((int, ipf_v4_masktab_t *));
 #ifdef	USE_INET6
 extern	void		ipf_inet6_mask_add __P((int, i6addr_t *,
 						ipf_v6_masktab_t *));
 extern	void		ipf_inet6_mask_del __P((int, i6addr_t *,
 						ipf_v6_masktab_t *));
 #endif
 extern	int		ipf_initialise __P((void));
 extern	int		ipf_lock __P((caddr_t, int *));
 extern  int		ipf_makefrip __P((int, ip_t *, fr_info_t *));
 extern	int		ipf_matchtag __P((ipftag_t *, ipftag_t *));
 extern	int		ipf_matchicmpqueryreply __P((int, icmpinfo_t *,
 						     struct icmp *, int));
 extern	u_32_t		ipf_newisn __P((fr_info_t *));
 extern	u_int		ipf_pcksum __P((fr_info_t *, int, u_int));
 extern	void		ipf_rule_expire __P((ipf_main_softc_t *));
 extern	int		ipf_scanlist __P((fr_info_t *, u_32_t));
 extern	frentry_t 	*ipf_srcgrpmap __P((fr_info_t *, u_32_t *));
 extern	int		ipf_tcpudpchk __P((fr_ip_t *, frtuc_t *));
 extern	int		ipf_verifysrc __P((fr_info_t *fin));
 extern	int		ipf_zerostats __P((ipf_main_softc_t *, char *));
 extern	int		ipf_getnextrule __P((ipf_main_softc_t *, ipftoken_t *,
 					     void *));
 extern	int		ipf_sync __P((ipf_main_softc_t *, void *));
 extern	int		ipf_token_deref __P((ipf_main_softc_t *, ipftoken_t *));
 extern	void		ipf_token_expire __P((ipf_main_softc_t *));
 extern	ipftoken_t	*ipf_token_find __P((ipf_main_softc_t *, int, int,
 					    void *));
 extern	int		ipf_token_del __P((ipf_main_softc_t *, int, int,
 					  void *));
 extern	void		ipf_token_mark_complete __P((ipftoken_t *));
 extern	int		ipf_genericiter __P((ipf_main_softc_t *, void *,
 					     int, void *));
 #ifdef	IPFILTER_LOOKUP
 extern	void		*ipf_resolvelookup __P((int, u_int, u_int,
 						lookupfunc_t *));
 #endif
 extern	u_32_t		ipf_random __P((void));
 
 extern	int		ipf_main_load __P((void));
 extern	void		*ipf_main_soft_create __P((void *));
 extern	void		ipf_main_soft_destroy __P((ipf_main_softc_t *));
 extern	int		ipf_main_soft_init __P((ipf_main_softc_t *));
 extern	int		ipf_main_soft_fini __P((ipf_main_softc_t *));
 extern	int		ipf_main_unload __P((void));
 extern	int		ipf_load_all __P((void));
 extern	int		ipf_unload_all __P((void));
 extern	void		ipf_destroy_all __P((ipf_main_softc_t *));
 extern	ipf_main_softc_t *ipf_create_all __P((void *));
 extern	int		ipf_init_all __P((ipf_main_softc_t *));
 extern	int		ipf_fini_all __P((ipf_main_softc_t *));
 extern	void		ipf_log_soft_destroy __P((ipf_main_softc_t *, void *));
 extern	void		*ipf_log_soft_create __P((ipf_main_softc_t *));
 extern	int		ipf_log_soft_init __P((ipf_main_softc_t *, void *));
 extern	int		ipf_log_soft_fini __P((ipf_main_softc_t *, void *));
 extern	int		ipf_log_main_load __P((void));
 extern	int		ipf_log_main_unload __P((void));
 
 
 extern	char	ipfilter_version[];
 #ifdef	USE_INET6
 extern	int	icmptoicmp6types[ICMP_MAXTYPE+1];
 extern	int	icmptoicmp6unreach[ICMP_MAX_UNREACH];
 extern	int	icmpreplytype6[ICMP6_MAXTYPE + 1];
 #endif
 #ifdef	IPFILTER_COMPAT
 extern	int	ipf_in_compat __P((ipf_main_softc_t *, ipfobj_t *, void *,int));
 extern	int	ipf_out_compat __P((ipf_main_softc_t *, ipfobj_t *, void *));
 #endif
 extern	int	icmpreplytype4[ICMP_MAXTYPE + 1];
 
 extern	int	ipf_ht_node_add __P((ipf_main_softc_t *, host_track_t *,
 				     int, i6addr_t *));
 extern	int	ipf_ht_node_del __P((host_track_t *, int, i6addr_t *));
 extern	void	ipf_rb_ht_flush __P((host_track_t *));
 extern	void	ipf_rb_ht_freenode __P((host_node_t *, void *));
 extern	void	ipf_rb_ht_init __P((host_track_t *));
 
 #endif	/* __IP_FIL_H__ */
Index: projects/clang500-import/sys/contrib/ipfilter
===================================================================
--- projects/clang500-import/sys/contrib/ipfilter	(revision 318657)
+++ projects/clang500-import/sys/contrib/ipfilter	(revision 318658)

Property changes on: projects/clang500-import/sys/contrib/ipfilter
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/ipfilter:r317216-318657
Index: projects/clang500-import/sys/dev/ena/ena.c
===================================================================
--- projects/clang500-import/sys/dev/ena/ena.c	(nonexistent)
+++ projects/clang500-import/sys/dev/ena/ena.c	(revision 318658)
@@ -0,0 +1,3769 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright (c) 2015-2017 Amazon.com, Inc. or its affiliates.
+ * 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+ * OWNER 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 <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/endian.h>
+#include <sys/kernel.h>
+#include <sys/kthread.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/smp.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/taskqueue.h>
+#include <sys/time.h>
+#include <sys/eventhandler.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <machine/in_cksum.h>
+
+#include <net/bpf.h>
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_var.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/rss_config.h>
+#include <net/if_types.h>
+#include <net/if_vlan_var.h>
+
+#include <netinet/in_rss.h>
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+
+#include "ena.h"
+#include "ena_sysctl.h"
+
+/*********************************************************
+ *  Function prototypes
+ *********************************************************/
+static int	ena_probe(device_t);
+static void	ena_intr_msix_mgmnt(void *);
+static int	ena_allocate_pci_resources(struct ena_adapter*);
+static void	ena_free_pci_resources(struct ena_adapter *);
+static int	ena_change_mtu(if_t, int);
+static inline void ena_alloc_counters(counter_u64_t *, int);
+static inline void ena_free_counters(counter_u64_t *, int);
+static inline void ena_reset_counters(counter_u64_t *, int);
+static void	ena_init_io_rings_common(struct ena_adapter *,
+    struct ena_ring *, uint16_t);
+static int	ena_init_io_rings(struct ena_adapter *);
+static void	ena_free_io_ring_resources(struct ena_adapter *, unsigned int);
+static void	ena_free_all_io_rings_resources(struct ena_adapter *);
+static int	ena_setup_tx_dma_tag(struct ena_adapter *);
+static int	ena_free_tx_dma_tag(struct ena_adapter *);
+static int	ena_setup_rx_dma_tag(struct ena_adapter *);
+static int	ena_free_rx_dma_tag(struct ena_adapter *);
+static int	ena_setup_tx_resources(struct ena_adapter *, int);
+static void	ena_free_tx_resources(struct ena_adapter *, int);
+static int	ena_setup_all_tx_resources(struct ena_adapter *);
+static void	ena_free_all_tx_resources(struct ena_adapter *);
+static int	ena_setup_rx_resources(struct ena_adapter *, unsigned int);
+static void	ena_free_rx_resources(struct ena_adapter *, unsigned int);
+static int	ena_setup_all_rx_resources(struct ena_adapter *);
+static void	ena_free_all_rx_resources(struct ena_adapter *);
+static inline int ena_alloc_rx_mbuf(struct ena_adapter *, struct ena_ring *,
+    struct ena_rx_buffer *);
+static void	ena_free_rx_mbuf(struct ena_adapter *, struct ena_ring *,
+    struct ena_rx_buffer *);
+static int	ena_refill_rx_bufs(struct ena_ring *, uint32_t);
+static void	ena_free_rx_bufs(struct ena_adapter *, unsigned int);
+static void	ena_refill_all_rx_bufs(struct ena_adapter *);
+static void	ena_free_all_rx_bufs(struct ena_adapter *);
+static void	ena_free_tx_bufs(struct ena_adapter *, unsigned int);
+static void	ena_free_all_tx_bufs(struct ena_adapter *);
+static void	ena_destroy_all_tx_queues(struct ena_adapter *);
+static void	ena_destroy_all_rx_queues(struct ena_adapter *);
+static void	ena_destroy_all_io_queues(struct ena_adapter *);
+static int	ena_create_io_queues(struct ena_adapter *);
+static int	ena_tx_cleanup(struct ena_ring *);
+static int	ena_rx_cleanup(struct ena_ring *);
+static int	validate_tx_req_id(struct ena_ring *, uint16_t);
+static void	ena_rx_hash_mbuf(struct ena_ring *, struct ena_com_rx_ctx *,
+    struct mbuf *);
+static struct mbuf* ena_rx_mbuf(struct ena_ring *, struct ena_com_rx_buf_info *,
+    struct ena_com_rx_ctx *, uint16_t *);
+static inline void ena_rx_checksum(struct ena_ring *, struct ena_com_rx_ctx *,
+    struct mbuf *);
+static void	ena_handle_msix(void *);
+static int	ena_enable_msix(struct ena_adapter *);
+static void	ena_setup_mgmnt_intr(struct ena_adapter *);
+static void	ena_setup_io_intr(struct ena_adapter *);
+static int	ena_request_mgmnt_irq(struct ena_adapter *);
+static int	ena_request_io_irq(struct ena_adapter *);
+static void	ena_free_mgmnt_irq(struct ena_adapter *);
+static void	ena_free_io_irq(struct ena_adapter *);
+static void	ena_free_irqs(struct ena_adapter*);
+static void	ena_disable_msix(struct ena_adapter *);
+static void	ena_unmask_all_io_irqs(struct ena_adapter *);
+static int	ena_rss_configure(struct ena_adapter *);
+static int	ena_up_complete(struct ena_adapter *);
+static int	ena_up(struct ena_adapter *);
+static void	ena_down(struct ena_adapter *);
+static uint64_t	ena_get_counter(if_t, ift_counter);
+static int	ena_media_change(if_t);
+static void	ena_media_status(if_t, struct ifmediareq *);
+static void	ena_init(void *);
+static int	ena_ioctl(if_t, u_long, caddr_t);
+static int	ena_get_dev_offloads(struct ena_com_dev_get_features_ctx *);
+static void	ena_update_host_info(struct ena_admin_host_info *, if_t);
+static void	ena_update_hwassist(struct ena_adapter *);
+static int	ena_setup_ifnet(device_t, struct ena_adapter *,
+    struct ena_com_dev_get_features_ctx *);
+static void	ena_tx_csum(struct ena_com_tx_ctx *, struct mbuf *);
+static int	ena_xmit_mbuf(struct ena_ring *, struct mbuf *);
+static void	ena_start_xmit(struct ena_ring *);
+static int	ena_mq_start(if_t, struct mbuf *);
+static void	ena_deferred_mq_start(void *, int);
+static void	ena_qflush(if_t);
+static int	ena_calc_io_queue_num(struct ena_adapter *,
+    struct ena_com_dev_get_features_ctx *);
+static int	ena_calc_queue_size(struct ena_adapter *, uint16_t *,
+    uint16_t *, struct ena_com_dev_get_features_ctx *);
+static int	ena_rss_init_default(struct ena_adapter *);
+static void	ena_rss_init_default_deferred(void *);
+static void	ena_config_host_info(struct ena_com_dev *);
+static int	ena_attach(device_t);
+static int	ena_detach(device_t);
+static int	ena_device_init(struct ena_adapter *, device_t,
+    struct ena_com_dev_get_features_ctx *, int *);
+static int	ena_enable_msix_and_set_admin_interrupts(struct ena_adapter *,
+    int);
+static void ena_update_on_link_change(void *, struct ena_admin_aenq_entry *);
+static void	unimplemented_aenq_handler(void *,
+    struct ena_admin_aenq_entry *);
+static void	ena_timer_service(void *);
+
+static char ena_version[] = DEVICE_NAME DRV_MODULE_NAME " v" DRV_MODULE_VERSION;
+
+static SYSCTL_NODE(_hw, OID_AUTO, ena, CTLFLAG_RD, 0, "ENA driver parameters");
+
+/*
+ * Tuneable number of buffers in the buf-ring (drbr)
+ */
+static int ena_buf_ring_size = 4096;
+SYSCTL_INT(_hw_ena, OID_AUTO, buf_ring_size, CTLFLAG_RWTUN,
+    &ena_buf_ring_size, 0, "Size of the bufring");
+
+
+static ena_vendor_info_t ena_vendor_info_array[] = {
+    { PCI_VENDOR_ID_AMAZON, PCI_DEV_ID_ENA_PF, 0},
+    { PCI_VENDOR_ID_AMAZON, PCI_DEV_ID_ENA_LLQ_PF, 0},
+    { PCI_VENDOR_ID_AMAZON, PCI_DEV_ID_ENA_VF, 0},
+    { PCI_VENDOR_ID_AMAZON, PCI_DEV_ID_ENA_LLQ_VF, 0},
+    /* Last entry */
+    { 0, 0, 0 }
+};
+
+/*
+ * Contains pointers to event handlers, e.g. link state chage.
+ */
+static struct ena_aenq_handlers aenq_handlers;
+
+void
+ena_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nseg, int error)
+{
+	if (error)
+		return;
+	*(bus_addr_t *) arg = segs[0].ds_addr;
+	return;
+}
+
+int
+ena_dma_alloc(device_t dmadev, bus_size_t size,
+    ena_mem_handle_t *dma , int mapflags)
+{
+	struct ena_adapter* adapter = device_get_softc(dmadev);
+	uint32_t maxsize = ((size - 1)/PAGE_SIZE + 1) * PAGE_SIZE;
+	uint64_t dma_space_addr = ENA_DMA_BIT_MASK(adapter->dma_width);
+	int error;
+
+	if (dma_space_addr == 0)
+		dma_space_addr = BUS_SPACE_MAXADDR;
+	error = bus_dma_tag_create(bus_get_dma_tag(dmadev), /* parent */
+	    8, 0,	      /* alignment, bounds */
+	    dma_space_addr,   /* lowaddr */
+	    dma_space_addr,   /* highaddr */
+	    NULL, NULL,	      /* filter, filterarg */
+	    maxsize,	      /* maxsize */
+	    1,		      /* nsegments */
+	    maxsize,	      /* maxsegsize */
+	    BUS_DMA_ALLOCNOW, /* flags */
+	    NULL,	      /* lockfunc */
+	    NULL,	      /* lockarg */
+	    &dma->tag);
+	if (error) {
+		device_printf(dmadev,
+		"%s: bus_dma_tag_create failed: %d\n",
+		__func__, error);
+		goto fail_tag;
+	}
+
+	error = bus_dmamem_alloc(dma->tag, (void**) &dma->vaddr,
+	    BUS_DMA_COHERENT | BUS_DMA_ZERO, &dma->map);
+	if (error) {
+		device_printf(dmadev,
+		"%s: bus_dmamem_alloc(%ju) failed: %d\n",
+		__func__, (uintmax_t)size, error);
+		goto fail_map_create;
+	}
+
+	dma->paddr = 0;
+	error = bus_dmamap_load(dma->tag, dma->map, dma->vaddr,
+	    size, ena_dmamap_callback, &dma->paddr, mapflags);
+	if (error || dma->paddr == 0) {
+		device_printf(dmadev,
+		"%s: bus_dmamap_load failed: %d\n",
+		__func__, error);
+		goto fail_map_load;
+	}
+
+	return (0);
+
+fail_map_load:
+	bus_dmamap_unload(dma->tag, dma->map);
+fail_map_create:
+	bus_dmamem_free(dma->tag, dma->vaddr, dma->map);
+	bus_dma_tag_destroy(dma->tag);
+fail_tag:
+	dma->tag = NULL;
+
+	return (error);
+}
+
+static int
+ena_allocate_pci_resources(struct ena_adapter* adapter)
+{
+	device_t pdev = adapter->pdev;
+	int rid;
+
+	rid = PCIR_BAR(ENA_REG_BAR);
+	adapter->memory = NULL;
+	adapter->registers = bus_alloc_resource_any(pdev, SYS_RES_MEMORY,
+	    &rid, RF_ACTIVE);
+	if (adapter->registers == NULL) {
+		device_printf(pdev, "Unable to allocate bus resource: "
+		    "registers\n");
+		return (ENXIO);
+	}
+
+	return (0);
+}
+
+static void
+ena_free_pci_resources(struct ena_adapter *adapter)
+{
+	device_t pdev = adapter->pdev;
+
+	if (adapter->memory != NULL) {
+		bus_release_resource(pdev, SYS_RES_MEMORY,
+		    PCIR_BAR(ENA_MEM_BAR), adapter->memory);
+	}
+
+	if (adapter->registers != NULL) {
+		bus_release_resource(pdev, SYS_RES_MEMORY,
+		    PCIR_BAR(ENA_REG_BAR), adapter->registers);
+	}
+
+	return;
+}
+
+static int
+ena_probe(device_t dev)
+{
+	ena_vendor_info_t *ent;
+	char		adapter_name[60];
+	uint16_t	pci_vendor_id = 0;
+	uint16_t	pci_device_id = 0;
+
+	pci_vendor_id = pci_get_vendor(dev);
+	pci_device_id = pci_get_device(dev);
+
+	ent = ena_vendor_info_array;
+	while (ent->vendor_id != 0) {
+		if ((pci_vendor_id == ent->vendor_id) &&
+		    (pci_device_id == ent->device_id)) {
+			ena_trace(ENA_DBG, "vendor=%x device=%x ",
+			    pci_vendor_id, pci_device_id);
+
+			sprintf(adapter_name, DEVICE_DESC);
+			device_set_desc_copy(dev, adapter_name);
+			return (BUS_PROBE_DEFAULT);
+		}
+
+		ent++;
+
+	}
+
+	return (ENXIO);
+}
+
+static int
+ena_change_mtu(if_t ifp, int new_mtu)
+{
+	struct ena_adapter *adapter = if_getsoftc(ifp);
+	struct ena_com_dev_get_features_ctx get_feat_ctx;
+	int rc, old_mtu, max_frame;
+
+	rc = ena_com_get_dev_attr_feat(adapter->ena_dev, &get_feat_ctx);
+	if (rc) {
+		device_printf(adapter->pdev,
+		    "Cannot get attribute for ena device\n");
+		return (ENXIO);
+	}
+
+	/* Save old MTU in case of fail */
+	old_mtu = if_getmtu(ifp);
+
+	/* Change MTU and calculate max frame */
+	if_setmtu(ifp, new_mtu);
+	max_frame = ETHER_MAX_FRAME(ifp, ETHERTYPE_VLAN, 1);
+
+	if ((new_mtu < ENA_MIN_FRAME_LEN) ||
+	    (new_mtu > get_feat_ctx.dev_attr.max_mtu) ||
+	    (max_frame > ENA_MAX_FRAME_LEN)) {
+		device_printf(adapter->pdev, "Invalid MTU setting. "
+		    "new_mtu: %d\n", new_mtu);
+		goto error;
+	}
+
+	rc = ena_com_set_dev_mtu(adapter->ena_dev, new_mtu);
+	if (rc != 0)
+		goto error;
+
+	return (0);
+error:
+	if_setmtu(ifp, old_mtu);
+	return (EINVAL);
+}
+
+static inline void
+ena_alloc_counters(counter_u64_t *begin, int size)
+{
+	counter_u64_t *end = (counter_u64_t *)((char *)begin + size);
+
+	for (; begin < end; ++begin)
+		*begin = counter_u64_alloc(M_WAITOK);
+}
+
+static inline void
+ena_free_counters(counter_u64_t *begin, int size)
+{
+	counter_u64_t *end = (counter_u64_t *)((char *)begin + size);
+
+	for (; begin < end; ++begin)
+		counter_u64_free(*begin);
+}
+
+static inline void
+ena_reset_counters(counter_u64_t *begin, int size)
+{
+	counter_u64_t *end = (counter_u64_t *)((char *)begin + size);
+
+	for (; begin < end; ++begin)
+		counter_u64_zero(*begin);
+}
+
+static void
+ena_init_io_rings_common(struct ena_adapter *adapter, struct ena_ring *ring,
+    uint16_t qid)
+{
+
+	ring->qid = qid;
+	ring->adapter = adapter;
+	ring->ena_dev = adapter->ena_dev;
+}
+
+static int
+ena_init_io_rings(struct ena_adapter *adapter)
+{
+	struct ena_com_dev *ena_dev;
+	struct ena_ring *txr, *rxr;
+	struct ena_que *que;
+	int i;
+	int rc;
+
+	ena_dev = adapter->ena_dev;
+
+	for (i = 0; i < adapter->num_queues; i++) {
+		txr = &adapter->tx_ring[i];
+		rxr = &adapter->rx_ring[i];
+
+		/* TX/RX common ring state */
+		ena_init_io_rings_common(adapter, txr, i);
+		ena_init_io_rings_common(adapter, rxr, i);
+
+		/* TX specific ring state */
+		txr->ring_size = adapter->tx_ring_size;
+		txr->tx_max_header_size = ena_dev->tx_max_header_size;
+		txr->tx_mem_queue_type = ena_dev->tx_mem_queue_type;
+		txr->smoothed_interval =
+		    ena_com_get_nonadaptive_moderation_interval_tx(ena_dev);
+
+		/* Allocate a buf ring */
+		txr->br = buf_ring_alloc(ena_buf_ring_size, M_DEVBUF,
+		    M_WAITOK, &txr->ring_mtx);
+		if (txr->br == NULL) {
+			device_printf(adapter->pdev,
+			    "Error while setting up bufring\n");
+			rc = ENOMEM;
+			goto err_bufr_free;
+		}
+
+		/* Alloc TX statistics. */
+		ena_alloc_counters((counter_u64_t *)&txr->tx_stats,
+		    sizeof(txr->tx_stats));
+
+		/* RX specific ring state */
+		rxr->ring_size = adapter->rx_ring_size;
+		rxr->rx_small_copy_len = adapter->small_copy_len;
+		rxr->smoothed_interval =
+		    ena_com_get_nonadaptive_moderation_interval_rx(ena_dev);
+
+		/* Alloc RX statistics. */
+		ena_alloc_counters((counter_u64_t *)&rxr->rx_stats,
+		    sizeof(rxr->rx_stats));
+
+		/* Initialize locks */
+		snprintf(txr->mtx_name, nitems(txr->mtx_name), "%s:tx(%d)",
+		    device_get_nameunit(adapter->pdev), i);
+		snprintf(rxr->mtx_name, nitems(rxr->mtx_name), "%s:rx(%d)",
+		    device_get_nameunit(adapter->pdev), i);
+
+		mtx_init(&txr->ring_mtx, txr->mtx_name, NULL, MTX_DEF);
+		mtx_init(&rxr->ring_mtx, rxr->mtx_name, NULL, MTX_DEF);
+
+		que = &adapter->que[i];
+		que->adapter = adapter;
+		que->id = i;
+		que->tx_ring = txr;
+		que->rx_ring = rxr;
+
+		txr->que = que;
+		rxr->que = que;
+	}
+
+	return 0;
+
+err_bufr_free:
+	while (i--)
+		ena_free_io_ring_resources(adapter, i);
+
+	return (rc);
+}
+
+static void
+ena_free_io_ring_resources(struct ena_adapter *adapter, unsigned int qid)
+{
+	struct ena_ring *txr = &adapter->tx_ring[qid];
+	struct ena_ring *rxr = &adapter->rx_ring[qid];
+
+	ena_free_counters((counter_u64_t *)&txr->tx_stats,
+	    sizeof(txr->tx_stats));
+	ena_free_counters((counter_u64_t *)&rxr->rx_stats,
+	    sizeof(rxr->rx_stats));
+
+	mtx_destroy(&txr->ring_mtx);
+	mtx_destroy(&rxr->ring_mtx);
+
+	drbr_free(txr->br, M_DEVBUF);
+
+}
+
+static void
+ena_free_all_io_rings_resources(struct ena_adapter *adapter)
+{
+	int i;
+
+	for (i = 0; i < adapter->num_queues; i++)
+		ena_free_io_ring_resources(adapter, i);
+
+}
+
+static int
+ena_setup_tx_dma_tag(struct ena_adapter *adapter)
+{
+	int ret;
+
+	/* Create DMA tag for Tx buffers */
+	ret = bus_dma_tag_create(bus_get_dma_tag(adapter->pdev),
+	    1, 0,				  /* alignment, bounds 	*/
+	    ENA_DMA_BIT_MASK(adapter->dma_width), /* lowaddr 		*/
+	    ENA_DMA_BIT_MASK(adapter->dma_width), /* highaddr 		*/
+	    NULL, NULL,				  /* filter, filterarg 	*/
+	    ENA_TSO_MAXSIZE,			  /* maxsize 		*/
+	    adapter->max_tx_sgl_size,		  /* nsegments 		*/
+	    ENA_TSO_MAXSIZE,			  /* maxsegsize 	*/
+	    0,					  /* flags 		*/
+	    NULL,				  /* lockfunc 		*/
+	    NULL,				  /* lockfuncarg 	*/
+	    &adapter->tx_buf_tag);
+
+	if (ret != 0)
+		device_printf(adapter->pdev, "Unable to create Tx DMA tag\n");
+
+	return (ret);
+}
+
+static int
+ena_free_tx_dma_tag(struct ena_adapter *adapter)
+{
+	int ret;
+
+	ret = bus_dma_tag_destroy(adapter->tx_buf_tag);
+
+	if (ret == 0)
+		adapter->tx_buf_tag = NULL;
+
+	return (ret);
+}
+
+static int
+ena_setup_rx_dma_tag(struct ena_adapter *adapter)
+{
+	int ret;
+
+	/* Create DMA tag for Rx buffers*/
+	ret = bus_dma_tag_create(bus_get_dma_tag(adapter->pdev), /* parent */
+	    1, 0,				  /* alignment, bounds 	*/
+	    ENA_DMA_BIT_MASK(adapter->dma_width), /* lowaddr 		*/
+	    ENA_DMA_BIT_MASK(adapter->dma_width), /* highaddr 		*/
+	    NULL, NULL,				  /* filter, filterarg 	*/
+	    MJUM16BYTES,			  /* maxsize 		*/
+	    1,					  /* nsegments 		*/
+	    MJUM16BYTES,			  /* maxsegsize 	*/
+	    0,					  /* flags 		*/
+	    NULL,				  /* lockfunc 		*/
+	    NULL,				  /* lockarg 		*/
+	    &adapter->rx_buf_tag);
+
+	if (ret != 0)
+		device_printf(adapter->pdev, "Unable to create Rx DMA tag\n");
+
+	return (ret);
+}
+
+static int
+ena_free_rx_dma_tag(struct ena_adapter *adapter)
+{
+	int ret;
+
+	ret = bus_dma_tag_destroy(adapter->rx_buf_tag);
+
+	if (ret == 0)
+		adapter->rx_buf_tag = NULL;
+
+	return (ret);
+}
+
+
+/**
+ * ena_setup_tx_resources - allocate Tx resources (Descriptors)
+ * @adapter: network interface device structure
+ * @qid: queue index
+ *
+ * Returns 0 on success, otherwise on failure.
+ **/
+static int
+ena_setup_tx_resources(struct ena_adapter *adapter, int qid)
+{
+	struct ena_que *que = &adapter->que[qid];
+	struct ena_ring *tx_ring = que->tx_ring;
+	int size, i, err;
+#ifdef	RSS
+	cpuset_t cpu_mask;
+#endif
+
+	size = sizeof(struct ena_tx_buffer) * tx_ring->ring_size;
+
+	tx_ring->tx_buffer_info = malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO);
+	if (!tx_ring->tx_buffer_info)
+		goto err_tx_buffer_info;
+
+	size = sizeof(uint16_t) * tx_ring->ring_size;
+	tx_ring->free_tx_ids = malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO);
+	if (!tx_ring->free_tx_ids)
+		goto err_tx_reqs;
+
+	/* Req id stack for TX OOO completions */
+	for (i = 0; i < tx_ring->ring_size; i++)
+		tx_ring->free_tx_ids[i] = i;
+
+	/* Reset TX statistics. */
+	ena_reset_counters((counter_u64_t *)&tx_ring->tx_stats,
+	    sizeof(tx_ring->tx_stats));
+
+	tx_ring->next_to_use = 0;
+	tx_ring->next_to_clean = 0;
+
+	/* Make sure that drbr is empty */
+	drbr_flush(adapter->ifp, tx_ring->br);
+
+	/* ... and create the buffer DMA maps */
+	for (i = 0; i < tx_ring->ring_size; i++) {
+		err = bus_dmamap_create(adapter->tx_buf_tag, 0,
+		    &tx_ring->tx_buffer_info[i].map);
+		if (err != 0) {
+			device_printf(adapter->pdev,
+			    "Unable to create Tx DMA map for buffer %d\n", i);
+			goto err_tx_map;
+		}
+	}
+
+	/* Allocate taskqueues */
+	TASK_INIT(&tx_ring->enqueue_task, 0, ena_deferred_mq_start, tx_ring);
+	tx_ring->enqueue_tq = taskqueue_create_fast("ena_tx_enque", M_NOWAIT,
+	    taskqueue_thread_enqueue, &tx_ring->enqueue_tq);
+	if (tx_ring->enqueue_tq == NULL) {
+		device_printf(adapter->pdev,
+		    "Unable to create taskqueue for enqueue task\n");
+		i = tx_ring->ring_size;
+		goto err_tx_map;
+	}
+
+	/* RSS set cpu for thread */
+#ifdef RSS
+	CPU_SETOF(que->cpu, &cpu_mask);
+	taskqueue_start_threads_cpuset(&tx_ring->enqueue_tq, 1, PI_NET,
+	    &cpu_mask, "%s tx_ring enq (bucket %d)",
+	    device_get_nameunit(adapter->pdev), que->cpu);
+#else /* RSS */
+	taskqueue_start_threads(&tx_ring->enqueue_tq, 1, PI_NET,
+	    "%s txeq %d", device_get_nameunit(adapter->pdev), que->cpu);
+#endif /* RSS */
+
+	return (0);
+
+err_tx_map:
+	while (i--) {
+		bus_dmamap_destroy(adapter->tx_buf_tag,
+		    tx_ring->tx_buffer_info[i].map);
+	}
+	ENA_MEM_FREE(adapter->ena_dev->dmadev, tx_ring->free_tx_ids);
+err_tx_reqs:
+	ENA_MEM_FREE(adapter->ena_dev->dmadev, tx_ring->tx_buffer_info);
+err_tx_buffer_info:
+	return (ENOMEM);
+}
+
+/**
+ * ena_free_tx_resources - Free Tx Resources per Queue
+ * @adapter: network interface device structure
+ * @qid: queue index
+ *
+ * Free all transmit software resources
+ **/
+static void
+ena_free_tx_resources(struct ena_adapter *adapter, int qid)
+{
+	struct ena_ring *tx_ring = &adapter->tx_ring[qid];
+
+	while (taskqueue_cancel(tx_ring->enqueue_tq, &tx_ring->enqueue_task,
+	    NULL))
+		taskqueue_drain(tx_ring->enqueue_tq, &tx_ring->enqueue_task);
+
+	taskqueue_free(tx_ring->enqueue_tq);
+
+	/* Flush buffer ring, */
+	drbr_flush(adapter->ifp, tx_ring->br);
+
+	/* Free buffer DMA maps, */
+	for (int i = 0; i < tx_ring->ring_size; i++) {
+		m_freem(tx_ring->tx_buffer_info[i].mbuf);
+		tx_ring->tx_buffer_info[i].mbuf = NULL;
+		bus_dmamap_unload(adapter->tx_buf_tag,
+		    tx_ring->tx_buffer_info[i].map);
+		bus_dmamap_destroy(adapter->tx_buf_tag,
+		    tx_ring->tx_buffer_info[i].map);
+	}
+
+	/* And free allocated memory. */
+	ENA_MEM_FREE(adapter->ena_dev->dmadev, tx_ring->tx_buffer_info);
+	tx_ring->tx_buffer_info = NULL;
+
+	ENA_MEM_FREE(adapter->ena_dev->dmadev, tx_ring->free_tx_ids);
+	tx_ring->free_tx_ids = NULL;
+}
+
+/**
+ * ena_setup_all_tx_resources - allocate all queues Tx resources
+ * @adapter: network interface device structure
+ *
+ * Returns 0 on success, otherwise on failure.
+ **/
+static int
+ena_setup_all_tx_resources(struct ena_adapter *adapter)
+{
+	int i, rc;
+
+	for (i = 0; i < adapter->num_queues; i++) {
+		rc = ena_setup_tx_resources(adapter, i);
+		if (!rc)
+			continue;
+
+		device_printf(adapter->pdev,
+		    "Allocation for Tx Queue %u failed\n", i);
+		goto err_setup_tx;
+	}
+
+	return (0);
+
+err_setup_tx:
+	/* Rewind the index freeing the rings as we go */
+	while (i--)
+		ena_free_tx_resources(adapter, i);
+	return (rc);
+}
+
+/**
+ * ena_free_all_tx_resources - Free Tx Resources for All Queues
+ * @adapter: network interface device structure
+ *
+ * Free all transmit software resources
+ **/
+static void
+ena_free_all_tx_resources(struct ena_adapter *adapter)
+{
+	int i;
+
+	for (i = 0; i < adapter->num_queues; i++)
+		ena_free_tx_resources(adapter, i);
+
+	return;
+}
+
+/**
+ * ena_setup_rx_resources - allocate Rx resources (Descriptors)
+ * @adapter: network interface device structure
+ * @qid: queue index
+ *
+ * Returns 0 on success, otherwise on failure.
+ **/
+static int
+ena_setup_rx_resources(struct ena_adapter *adapter, unsigned int qid)
+{
+	struct ena_que *que = &adapter->que[qid];
+	struct ena_ring *rx_ring = que->rx_ring;
+	int size, err, i;
+#ifdef	RSS
+	cpuset_t cpu_mask;
+#endif
+
+	size = sizeof(struct ena_rx_buffer) * rx_ring->ring_size;
+
+	/*
+	 * Alloc extra element so in rx path
+	 * we can always prefetch rx_info + 1
+	 */
+	size += sizeof(struct ena_rx_buffer);
+
+	rx_ring->rx_buffer_info = ENA_MEM_ALLOC(adapter->ena_dev->dmadev, size);
+	if (!rx_ring->rx_buffer_info)
+		return (ENOMEM);
+
+	/* Reset RX statistics. */
+	ena_reset_counters((counter_u64_t *)&rx_ring->rx_stats,
+	    sizeof(rx_ring->rx_stats));
+
+	rx_ring->next_to_clean = 0;
+	rx_ring->next_to_use = 0;
+
+	/* ... and create the buffer DMA maps */
+	for (i = 0; i < rx_ring->ring_size; i++) {
+		err = bus_dmamap_create(adapter->rx_buf_tag, 0,
+		    &(rx_ring->rx_buffer_info[i].map));
+		if (err != 0) {
+			device_printf(adapter->pdev,
+			    "Unable to create Rx DMA map for buffer %d\n", i);
+			goto err_rx_dma;
+		}
+	}
+
+	/* Create LRO for the ring */
+	if (adapter->ifp->if_capenable & IFCAP_LRO) {
+		int err = tcp_lro_init(&rx_ring->lro);
+		if (err) {
+			device_printf(adapter->pdev,
+			    "LRO[%d] Initialization failed!\n", qid);
+		} else {
+			ena_trace(ENA_INFO,
+			    "RX Soft LRO[%d] Initialized\n", qid);
+			rx_ring->lro.ifp = adapter->ifp;
+		}
+	}
+
+	return (0);
+
+err_rx_dma:
+	while (i--) {
+		bus_dmamap_destroy(adapter->rx_buf_tag,
+		    rx_ring->rx_buffer_info[i].map);
+	}
+
+	ENA_MEM_FREE(adapter->ena_dev->dmadev, rx_ring->rx_buffer_info);
+	rx_ring->rx_buffer_info = NULL;
+	ena_trace(ENA_ALERT, "RX resource allocation fail");
+	return (ENOMEM);
+}
+
+/**
+ * ena_free_rx_resources - Free Rx Resources
+ * @adapter: network interface device structure
+ * @qid: queue index
+ *
+ * Free all receive software resources
+ **/
+static void
+ena_free_rx_resources(struct ena_adapter *adapter, unsigned int qid)
+{
+	struct ena_ring *rx_ring = &adapter->rx_ring[qid];
+
+	ena_trace(ENA_INFO, "%s qid %d\n", __func__, qid);
+
+	/* Free buffer DMA maps, */
+	for (int i = 0; i < rx_ring->ring_size; i++) {
+		m_freem(rx_ring->rx_buffer_info[i].mbuf);
+		rx_ring->rx_buffer_info[i].mbuf = NULL;
+		bus_dmamap_unload(adapter->rx_buf_tag,
+		    rx_ring->rx_buffer_info[i].map);
+		bus_dmamap_destroy(adapter->rx_buf_tag,
+		    rx_ring->rx_buffer_info[i].map);
+	}
+
+	/* free LRO resources, */
+	tcp_lro_free(&rx_ring->lro);
+
+	/* free allocated memory */
+	ENA_MEM_FREE(adapter->ena_dev->dmadev, rx_ring->rx_buffer_info);
+	rx_ring->rx_buffer_info = NULL;
+
+	return;
+}
+
+/**
+ * ena_setup_all_rx_resources - allocate all queues Rx resources
+ * @adapter: network interface device structure
+ *
+ * Returns 0 on success, otherwise on failure.
+ **/
+static int
+ena_setup_all_rx_resources(struct ena_adapter *adapter)
+{
+	int i, rc = 0;
+
+	for (i = 0; i < adapter->num_queues; i++) {
+		rc = ena_setup_rx_resources(adapter, i);
+		if (!rc)
+			continue;
+
+		device_printf(adapter->pdev,
+		    "Allocation for Rx Queue %u failed\n", i);
+		goto err_setup_rx;
+	}
+	return (0);
+
+err_setup_rx:
+	/* rewind the index freeing the rings as we go */
+	while (i--)
+		ena_free_rx_resources(adapter, i);
+	return (rc);
+}
+
+/**
+ * ena_free_all_rx_resources - Free Rx resources for all queues
+ * @adapter: network interface device structure
+ *
+ * Free all receive software resources
+ **/
+static void
+ena_free_all_rx_resources(struct ena_adapter *adapter)
+{
+	int i;
+
+	for (i = 0; i < adapter->num_queues; i++)
+		ena_free_rx_resources(adapter, i);
+
+	return;
+}
+
+static inline int
+ena_alloc_rx_mbuf(struct ena_adapter *adapter,
+    struct ena_ring *rx_ring, struct ena_rx_buffer *rx_info)
+{
+	struct ena_com_buf *ena_buf;
+	bus_dma_segment_t segs[1];
+	int nsegs, error;
+
+	/* if previous allocated frag is not used */
+	if (rx_info->mbuf != NULL)
+		return (0);
+
+	ENA_RING_MTX_LOCK(rx_ring);
+	/* Get mbuf using UMA allocator */
+	rx_info->mbuf = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUM16BYTES);
+	ENA_RING_MTX_UNLOCK(rx_ring);
+
+	if (!rx_info->mbuf) {
+		counter_u64_add(rx_ring->rx_stats.mbuf_alloc_fail, 1);
+		return (ENOMEM);
+	}
+	/* Set mbuf length*/
+	rx_info->mbuf->m_pkthdr.len = rx_info->mbuf->m_len = MJUM16BYTES;
+
+	/* Map packets for DMA */
+	ena_trace(ENA_DBG | ENA_RSC | ENA_RXPTH,
+	    "Using tag %p for buffers' DMA mapping, mbuf %p len: %d",
+	    adapter->rx_buf_tag,rx_info->mbuf, rx_info->mbuf->m_len);
+	error = bus_dmamap_load_mbuf_sg(adapter->rx_buf_tag, rx_info->map,
+	    rx_info->mbuf, segs, &nsegs, BUS_DMA_NOWAIT);
+	if (error || (nsegs != 1)) {
+		device_printf(adapter->pdev, "failed to map mbuf, error: %d, "
+		    "nsegs: %d\n", error, nsegs);
+		counter_u64_add(rx_ring->rx_stats.dma_mapping_err, 1);
+		goto exit;
+
+	}
+
+	bus_dmamap_sync(adapter->rx_buf_tag, rx_info->map, BUS_DMASYNC_PREREAD);
+
+	ena_buf = &rx_info->ena_buf;
+	ena_buf->paddr = segs[0].ds_addr;
+	ena_buf->len = MJUM16BYTES;
+
+	ena_trace(ENA_DBG | ENA_RSC | ENA_RXPTH,
+	    "ALLOC RX BUF: mbuf %p, rx_info %p, len %d, paddr %#jx\n",
+	    rx_info->mbuf, rx_info,ena_buf->len, (uintmax_t)ena_buf->paddr);
+
+	return (0);
+
+exit:
+	m_freem(rx_info->mbuf);
+	rx_info->mbuf = NULL;
+	return (EFAULT);
+}
+
+static void
+ena_free_rx_mbuf(struct ena_adapter *adapter, struct ena_ring *rx_ring,
+    struct ena_rx_buffer *rx_info)
+{
+
+	if (!rx_info->mbuf)
+		return;
+
+	bus_dmamap_unload(adapter->rx_buf_tag, rx_info->map);
+	m_freem(rx_info->mbuf);
+	rx_info->mbuf = NULL;
+
+	return;
+}
+
+
+/**
+ * ena_refill_rx_bufs - Refills ring with descriptors
+ * @rx_ring: the ring which we want to feed with free descriptors
+ * @num: number of descriptors to refill
+ * Refills the ring with newly allocated DMA-mapped mbufs for receiving
+ **/
+static int
+ena_refill_rx_bufs(struct ena_ring *rx_ring, uint32_t num)
+{
+	struct ena_adapter *adapter = rx_ring->adapter;
+	uint16_t next_to_use;
+	uint32_t i;
+	int rc;
+
+	ena_trace(ENA_DBG | ENA_RXPTH | ENA_RSC, "refill qid: %d",
+	    rx_ring->qid);
+
+	next_to_use = rx_ring->next_to_use;
+
+	for (i = 0; i < num; i++) {
+		ena_trace(ENA_DBG | ENA_RXPTH | ENA_RSC,
+		    "RX buffer - next to use: %d", next_to_use);
+
+		struct ena_rx_buffer *rx_info =
+		    &rx_ring->rx_buffer_info[next_to_use];
+
+		rc = ena_alloc_rx_mbuf(adapter, rx_ring, rx_info);
+		if (rc < 0) {
+			device_printf(adapter->pdev,
+			    "failed to alloc buffer for rx queue\n");
+			break;
+		}
+		rc = ena_com_add_single_rx_desc(rx_ring->ena_com_io_sq,
+		    &rx_info->ena_buf, next_to_use);
+		if (unlikely(rc)) {
+			device_printf(adapter->pdev,
+			    "failed to add buffer for rx queue %d\n",
+			    rx_ring->qid);
+			break;
+		}
+		next_to_use = ENA_RX_RING_IDX_NEXT(next_to_use,
+		    rx_ring->ring_size);
+	}
+
+	if (i < num) {
+		counter_u64_add(rx_ring->rx_stats.refil_partial, 1);
+		device_printf(adapter->pdev,
+		    "refilled rx queue %d with %d pages only\n",
+		    rx_ring->qid, i);
+	}
+
+	if (i != 0) {
+		wmb();
+		ena_com_write_sq_doorbell(rx_ring->ena_com_io_sq);
+	}
+	rx_ring->next_to_use = next_to_use;
+	return (i);
+}
+
+static void
+ena_free_rx_bufs(struct ena_adapter *adapter, unsigned int qid)
+{
+	struct ena_ring *rx_ring = &adapter->rx_ring[qid];
+	unsigned int i;
+
+	for (i = 0; i < rx_ring->ring_size; i++) {
+		struct ena_rx_buffer *rx_info = &rx_ring->rx_buffer_info[i];
+
+		if (rx_info->mbuf)
+			ena_free_rx_mbuf(adapter, rx_ring, rx_info);
+	}
+
+	return;
+}
+
+/**
+ * ena_refill_all_rx_bufs - allocate all queues Rx buffers
+ * @adapter: network interface device structure
+ *
+ */
+static void
+ena_refill_all_rx_bufs(struct ena_adapter *adapter)
+{
+	struct ena_ring *rx_ring;
+	int i, rc, bufs_num;
+
+	for (i = 0; i < adapter->num_queues; i++) {
+		rx_ring = &adapter->rx_ring[i];
+		bufs_num = rx_ring->ring_size - 1;
+		rc = ena_refill_rx_bufs(rx_ring, bufs_num);
+
+		if (unlikely(rc != bufs_num))
+			device_printf(adapter->pdev,
+			    "refilling Queue %d failed. allocated %d buffers"
+			    " from: %d\n", i, rc, bufs_num);
+	}
+}
+
+static void
+ena_free_all_rx_bufs(struct ena_adapter *adapter)
+{
+	int i;
+
+	for (i = 0; i < adapter->num_queues; i++)
+		ena_free_rx_bufs(adapter, i);
+	return;
+}
+
+/**
+ * ena_free_tx_bufs - Free Tx Buffers per Queue
+ * @adapter: network interface device structure
+ * @qid: queue index
+ **/
+static void
+ena_free_tx_bufs(struct ena_adapter *adapter, unsigned int qid)
+{
+	struct ena_ring *tx_ring = &adapter->tx_ring[qid];
+
+	for (int i = 0; i < tx_ring->ring_size; i++) {
+		struct ena_tx_buffer *tx_info = &tx_ring->tx_buffer_info[i];
+
+		if (tx_info->mbuf == NULL)
+			continue;
+
+		ena_trace(ENA_DBG | ENA_TXPTH | ENA_RSC,
+		    "free uncompleted Tx mbufs qid[%d] idx: 0x%x", qid, i);
+
+		bus_dmamap_unload(adapter->tx_buf_tag, tx_info->map);
+		m_free(tx_info->mbuf);
+		tx_info->mbuf = NULL;
+	}
+
+	return;
+}
+
+static void
+ena_free_all_tx_bufs(struct ena_adapter *adapter)
+{
+
+	for (int i = 0; i < adapter->num_queues; i++)
+		ena_free_tx_bufs(adapter, i);
+
+	return;
+}
+
+static void
+ena_destroy_all_tx_queues(struct ena_adapter *adapter)
+{
+	uint16_t ena_qid;
+	int i;
+
+	for (i = 0; i < adapter->num_queues; i++) {
+		ena_qid = ENA_IO_TXQ_IDX(i);
+		ena_com_destroy_io_queue(adapter->ena_dev, ena_qid);
+	}
+}
+
+static void
+ena_destroy_all_rx_queues(struct ena_adapter *adapter)
+{
+	uint16_t ena_qid;
+	int i;
+
+	for (i = 0; i < adapter->num_queues; i++) {
+		ena_qid = ENA_IO_RXQ_IDX(i);
+		ena_com_destroy_io_queue(adapter->ena_dev, ena_qid);
+	}
+}
+
+static void
+ena_destroy_all_io_queues(struct ena_adapter *adapter)
+{
+	ena_destroy_all_tx_queues(adapter);
+	ena_destroy_all_rx_queues(adapter);
+}
+
+static int
+validate_tx_req_id(struct ena_ring *tx_ring, uint16_t req_id)
+{
+	struct ena_tx_buffer *tx_info = NULL;
+
+	if (likely(req_id < tx_ring->ring_size)) {
+		tx_info = &tx_ring->tx_buffer_info[req_id];
+		if (tx_info->mbuf)
+			return 0;
+	}
+
+	counter_u64_add(tx_ring->tx_stats.bad_req_id, 1);
+
+	return (EFAULT);
+}
+
+static int
+ena_create_io_queues(struct ena_adapter *adapter)
+{
+	struct ena_com_dev *ena_dev = adapter->ena_dev;
+	struct ena_com_create_io_ctx ctx;
+	struct ena_ring *ring;
+	uint16_t ena_qid;
+	uint32_t msix_vector;
+	int rc, i;
+
+	/* Create TX queues */
+	for (i = 0; i < adapter->num_queues; i++) {
+		msix_vector = ENA_IO_IRQ_IDX(i);
+		ena_qid = ENA_IO_TXQ_IDX(i);
+		ctx.mem_queue_type = ena_dev->tx_mem_queue_type;
+		ctx.direction = ENA_COM_IO_QUEUE_DIRECTION_TX;
+		ctx.queue_size = adapter->tx_ring_size;
+		ctx.msix_vector = msix_vector;
+		ctx.qid = ena_qid;
+		rc = ena_com_create_io_queue(ena_dev, &ctx);
+		if (rc) {
+			device_printf(adapter->pdev,
+			    "Failed to create io TX queue #%d rc: %d\n", i, rc);
+			goto err_tx;
+		}
+		ring = &adapter->tx_ring[i];
+		rc = ena_com_get_io_handlers(ena_dev, ena_qid,
+		    &ring->ena_com_io_sq,
+		    &ring->ena_com_io_cq);
+		if (rc) {
+			device_printf(adapter->pdev,
+			    "Failed to get TX queue handlers. TX queue num"
+			    " %d rc: %d\n", i, rc);
+			ena_com_destroy_io_queue(ena_dev, ena_qid);
+			goto err_tx;
+		}
+	}
+
+	/* Create RX queues */
+	for (i = 0; i < adapter->num_queues; i++) {
+		msix_vector = ENA_IO_IRQ_IDX(i);
+		ena_qid = ENA_IO_RXQ_IDX(i);
+		ctx.mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;
+		ctx.direction = ENA_COM_IO_QUEUE_DIRECTION_RX;
+		ctx.queue_size = adapter->rx_ring_size;
+		ctx.msix_vector = msix_vector;
+		ctx.qid = ena_qid;
+		rc = ena_com_create_io_queue(ena_dev, &ctx);
+		if (rc) {
+			device_printf(adapter->pdev,
+			    "Failed to create io RX queue[%d] rc: %d\n", i, rc);
+			goto err_rx;
+		}
+
+		ring = &adapter->rx_ring[i];
+		rc = ena_com_get_io_handlers(ena_dev, ena_qid,
+		    &ring->ena_com_io_sq,
+		    &ring->ena_com_io_cq);
+		if (rc) {
+			device_printf(adapter->pdev,
+			    "Failed to get RX queue handlers. RX queue num"
+			    " %d rc: %d\n", i, rc);
+			ena_com_destroy_io_queue(ena_dev, ena_qid);
+			goto err_rx;
+		}
+	}
+
+	return (0);
+
+err_rx:
+	while (i--)
+		ena_com_destroy_io_queue(ena_dev, ENA_IO_RXQ_IDX(i));
+	i = adapter->num_queues;
+err_tx:
+	while (i--)
+		ena_com_destroy_io_queue(ena_dev, ENA_IO_TXQ_IDX(i));
+
+	return (ENXIO);
+}
+
+/**
+ * ena_tx_cleanup - clear sent packets and corresponding descriptors
+ * @tx_ring: ring for which we want to clean packets
+ *
+ * Once packets are sent, we ask the device in a loop for no longer used
+ * descriptors. We find the related mbuf chain in a map (index in an array)
+ * and free it, then update ring state.
+ * This is performed in "endless" loop, updating ring pointers every
+ * TX_COMMIT. The first check of free descriptor is performed before the actual
+ * loop, then repeated at the loop end.
+ **/
+static int
+ena_tx_cleanup(struct ena_ring *tx_ring)
+{
+	struct ena_adapter *adapter;
+	struct ena_com_io_cq* io_cq;
+	uint16_t next_to_clean;
+	uint16_t req_id;
+	uint16_t ena_qid;
+	unsigned int total_done = 0;
+	int rc;
+	int commit = TX_COMMIT;
+	int budget = TX_BUDGET;
+	int work_done;
+
+	adapter = tx_ring->que->adapter;
+	ena_qid = ENA_IO_TXQ_IDX(tx_ring->que->id);
+	io_cq = &adapter->ena_dev->io_cq_queues[ena_qid];
+	next_to_clean = tx_ring->next_to_clean;
+
+	do {
+		struct ena_tx_buffer *tx_info;
+		struct mbuf *mbuf;
+
+		rc = ena_com_tx_comp_req_id_get(io_cq, &req_id);
+		if (rc != 0)
+			break;
+
+		rc = validate_tx_req_id(tx_ring, req_id);
+		if (rc)
+			break;
+
+		tx_info = &tx_ring->tx_buffer_info[req_id];
+
+		mbuf = tx_info->mbuf;
+
+		tx_info->mbuf = NULL;
+		bintime_clear(&tx_info->timestamp);
+
+		if (tx_info->num_of_bufs != 0) {
+			/* Map is no longer required */
+			bus_dmamap_unload(adapter->tx_buf_tag, tx_info->map);
+		}
+
+		m_freem(mbuf);
+
+		total_done += tx_info->tx_descs;
+
+		tx_ring->free_tx_ids[next_to_clean] = req_id;
+		next_to_clean = ENA_TX_RING_IDX_NEXT(next_to_clean,
+		    tx_ring->ring_size);
+
+		if (--commit == 0) {
+			commit = TX_COMMIT;
+			/* update ring state every TX_COMMIT descriptor */
+			tx_ring->next_to_clean = next_to_clean;
+			ena_com_comp_ack(&adapter->ena_dev->io_sq_queues[ena_qid], total_done);
+			ena_com_update_dev_comp_head(io_cq);
+			total_done = 0;
+		}
+	} while (--budget);
+
+	work_done = TX_BUDGET - budget;
+
+	/* If there is still something to commit update ring state */
+	if (commit != TX_COMMIT) {
+		tx_ring->next_to_clean = next_to_clean;
+		ena_com_comp_ack(&adapter->ena_dev->io_sq_queues[ena_qid], total_done);
+		ena_com_update_dev_comp_head(io_cq);
+	}
+
+	taskqueue_enqueue(tx_ring->enqueue_tq, &tx_ring->enqueue_task);
+
+	return (work_done);
+}
+
+static void
+ena_rx_hash_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_ctx *ena_rx_ctx,
+    struct mbuf *mbuf)
+{
+	struct ena_adapter *adapter = rx_ring->adapter;
+
+	if (adapter->rss_support) {
+		mbuf->m_pkthdr.flowid = ena_rx_ctx->hash;
+
+		if (ena_rx_ctx->frag &&
+		    ena_rx_ctx->l3_proto != ENA_ETH_IO_L4_PROTO_UNKNOWN) {
+			M_HASHTYPE_SET(mbuf, M_HASHTYPE_OPAQUE_HASH);
+			return;
+		}
+
+		switch (ena_rx_ctx->l3_proto) {
+		case ENA_ETH_IO_L3_PROTO_IPV4:
+			switch (ena_rx_ctx->l4_proto) {
+			case ENA_ETH_IO_L4_PROTO_TCP:
+				M_HASHTYPE_SET(mbuf, M_HASHTYPE_RSS_TCP_IPV4);
+				break;
+			case ENA_ETH_IO_L4_PROTO_UDP:
+				M_HASHTYPE_SET(mbuf, M_HASHTYPE_RSS_UDP_IPV4);
+				break;
+			default:
+				M_HASHTYPE_SET(mbuf, M_HASHTYPE_RSS_IPV4);
+			}
+			break;
+		case ENA_ETH_IO_L3_PROTO_IPV6:
+			switch (ena_rx_ctx->l4_proto) {
+			case ENA_ETH_IO_L4_PROTO_TCP:
+				M_HASHTYPE_SET(mbuf, M_HASHTYPE_RSS_TCP_IPV6);
+				break;
+			case ENA_ETH_IO_L4_PROTO_UDP:
+				M_HASHTYPE_SET(mbuf, M_HASHTYPE_RSS_UDP_IPV6);
+				break;
+			default:
+				M_HASHTYPE_SET(mbuf, M_HASHTYPE_RSS_IPV6);
+			}
+			break;
+		case ENA_ETH_IO_L3_PROTO_UNKNOWN:
+			M_HASHTYPE_SET(mbuf, M_HASHTYPE_NONE);
+			break;
+		default:
+			M_HASHTYPE_SET(mbuf, M_HASHTYPE_OPAQUE_HASH);
+		}
+	} else {
+		mbuf->m_pkthdr.flowid = rx_ring->qid;
+		M_HASHTYPE_SET(mbuf, M_HASHTYPE_NONE);
+	}
+}
+
+/**
+ * ena_rx_mbuf - assemble mbuf from descriptors
+ * @rx_ring: ring for which we want to clean packets
+ * @ena_bufs: buffer info
+ * @ena_rx_ctx: metadata for this packet(s)
+ * @next_to_clean: ring pointer
+ *
+ **/
+static struct mbuf*
+ena_rx_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_buf_info *ena_bufs,
+    struct ena_com_rx_ctx *ena_rx_ctx, uint16_t *next_to_clean)
+{
+	struct mbuf *mbuf;
+	struct ena_rx_buffer *rx_info;
+	struct ena_adapter *adapter;
+	unsigned int len, buf = 0;
+	unsigned int descs = ena_rx_ctx->descs;
+
+	adapter = rx_ring->adapter;
+	rx_info = &rx_ring->rx_buffer_info[*next_to_clean];
+
+	ENA_ASSERT(rx_info->mbuf, "Invalid alloc frag buffer\n");
+
+	len = ena_bufs[0].len;
+	ena_trace(ENA_DBG | ENA_RXPTH, "rx_info %p, mbuf %p, paddr %jx",
+	    rx_info, rx_info->mbuf, (uintmax_t)rx_info->ena_buf.paddr);
+
+	mbuf = rx_info->mbuf;
+	mbuf->m_flags |= M_PKTHDR;
+	mbuf->m_pkthdr.len = len;
+	mbuf->m_len = len;
+	mbuf->m_pkthdr.rcvif = rx_ring->que->adapter->ifp;
+
+	/* Fill mbuf with hash key and it's interpretation for optimization */
+	ena_rx_hash_mbuf(rx_ring, ena_rx_ctx, mbuf);
+
+	ena_trace(ENA_DBG | ENA_RXPTH, "rx mbuf 0x%p, flags=0x%x, len: %d",
+	    mbuf, mbuf->m_flags, mbuf->m_pkthdr.len);
+
+	/* DMA address is not needed anymore, unmap it */
+	bus_dmamap_unload(rx_ring->adapter->rx_buf_tag, rx_info->map);
+
+	rx_info->mbuf = NULL;
+	*next_to_clean = ENA_RX_RING_IDX_NEXT(*next_to_clean,
+	    rx_ring->ring_size);
+
+	/*
+	 * While we have more than 1 descriptors for one rcvd packet, append
+	 * other mbufs to the main one
+	 */
+	while (--descs) {
+		rx_info = &rx_ring->rx_buffer_info[*next_to_clean];
+		len = ena_bufs[++buf].len;
+
+		if (!m_append(mbuf, len, rx_info->mbuf->m_data)) {
+			counter_u64_add(rx_ring->rx_stats.mbuf_alloc_fail, 1);
+			ena_trace(ENA_WARNING, "Failed to append Rx mbuf %p",
+			    mbuf);
+		}
+		/* Free already appended mbuf, it won't be useful anymore */
+		bus_dmamap_unload(rx_ring->adapter->rx_buf_tag, rx_info->map);
+		m_freem(rx_info->mbuf);
+		rx_info->mbuf = NULL;
+
+		*next_to_clean = ENA_RX_RING_IDX_NEXT(*next_to_clean,
+		    rx_ring->ring_size);
+	}
+
+	return (mbuf);
+}
+
+/**
+ * ena_rx_checksum - indicate in mbuf if hw indicated a good cksum
+ **/
+static inline void
+ena_rx_checksum(struct ena_ring *rx_ring, struct ena_com_rx_ctx *ena_rx_ctx,
+    struct mbuf *mbuf)
+{
+
+	/* if IP and error */
+	if ((ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV4) &&
+	    (ena_rx_ctx->l3_csum_err)) {
+		/* ipv4 checksum error */
+		mbuf->m_pkthdr.csum_flags = 0;
+		counter_u64_add(rx_ring->rx_stats.bad_csum, 1);
+		return;
+	}
+
+	/* if TCP/UDP */
+	if ((ena_rx_ctx->l4_proto == ENA_ETH_IO_L4_PROTO_TCP) ||
+	    (ena_rx_ctx->l4_proto == ENA_ETH_IO_L4_PROTO_UDP)) {
+		if (ena_rx_ctx->l4_csum_err) {
+			/* TCP/UDP checksum error */
+			mbuf->m_pkthdr.csum_flags = 0;
+			counter_u64_add(rx_ring->rx_stats.bad_csum, 1);
+		} else {
+			mbuf->m_pkthdr.csum_flags = CSUM_IP_CHECKED;
+			mbuf->m_pkthdr.csum_flags |= CSUM_IP_VALID;
+		}
+	}
+
+	return;
+}
+
+/**
+ * ena_rx_cleanup - handle rx irq
+ * @arg: ring for which irq is being handled
+ **/
+static int
+ena_rx_cleanup(struct ena_ring *rx_ring)
+{
+	struct ena_adapter *adapter;
+	struct mbuf *mbuf;
+	struct ena_com_rx_ctx ena_rx_ctx;
+	struct ena_com_io_cq* io_cq;
+	struct ena_com_io_sq* io_sq;
+	/* struct ena_eth_io_intr_reg intr_reg; */
+	if_t ifp;
+	uint16_t ena_qid;
+	uint16_t next_to_clean;
+	uint32_t refill_required;
+	uint32_t refill_threshold;
+	uint32_t do_if_input = 0;
+	unsigned int qid;
+	int rc;
+	int budget = RX_BUDGET;
+
+	adapter = rx_ring->que->adapter;
+	ifp = adapter->ifp;
+	qid = rx_ring->que->id;
+	ena_qid = ENA_IO_RXQ_IDX(qid);
+	io_cq = &adapter->ena_dev->io_cq_queues[ena_qid];
+	io_sq = &adapter->ena_dev->io_sq_queues[ena_qid];
+	next_to_clean = rx_ring->next_to_clean;
+
+	do {
+		ena_rx_ctx.ena_bufs = rx_ring->ena_bufs;
+		ena_rx_ctx.max_bufs = adapter->max_rx_sgl_size;
+		ena_rx_ctx.descs = 0;
+		rc = ena_com_rx_pkt(io_cq, io_sq, &ena_rx_ctx);
+
+		if (unlikely(rc))
+			goto error;
+
+		if (unlikely(ena_rx_ctx.descs == 0))
+			break;
+
+		/* Receive mbuf from the ring */
+		mbuf = ena_rx_mbuf(rx_ring, rx_ring->ena_bufs,
+		    &ena_rx_ctx, &next_to_clean);
+
+		/* Exit if we failed to retrieve a buffer */
+		if (unlikely(!mbuf)) {
+			next_to_clean = ENA_RX_RING_IDX_ADD(next_to_clean,
+			    ena_rx_ctx.descs, rx_ring->ring_size);
+			break;
+		}
+		ena_trace(ENA_DBG | ENA_RXPTH, "Rx: %d bytes",
+		    mbuf->m_pkthdr.len);
+
+		if ((ifp->if_capenable & IFCAP_RXCSUM) ||
+		    (ifp->if_capenable & IFCAP_RXCSUM_IPV6)) {
+			ena_rx_checksum(rx_ring, &ena_rx_ctx, mbuf);
+		}
+
+		counter_u64_add(rx_ring->rx_stats.bytes, mbuf->m_pkthdr.len);
+		/*
+		 * LRO is only for IP/TCP packets and TCP checksum of the packet
+		 * should be computed by hardware.
+		 */
+		do_if_input = 1;
+		if ((ifp->if_capenable & IFCAP_LRO) &&
+		    (mbuf->m_pkthdr.csum_flags & CSUM_IP_VALID) &&
+		    ena_rx_ctx.l4_proto == ENA_ETH_IO_L4_PROTO_TCP) {
+			/*
+			 * Send to the stack if:
+			 *  - LRO not enabled, or
+			 *  - no LRO resources, or
+			 *  - lro enqueue fails
+			 */
+			if (rx_ring->lro.lro_cnt != 0 &&
+			    tcp_lro_rx(&rx_ring->lro, mbuf, 0) == 0)
+					do_if_input = 0;
+		}
+		if (do_if_input) {
+			ena_trace(ENA_DBG | ENA_RXPTH, "calling if_input() with mbuf %p",
+			    mbuf);
+			(*ifp->if_input)(ifp, mbuf);
+		}
+
+		counter_u64_add(rx_ring->rx_stats.cnt, 1);
+	} while (--budget);
+
+	rx_ring->next_to_clean = next_to_clean;
+
+	refill_required = ena_com_sq_empty_space(io_sq);
+	refill_threshold = rx_ring->ring_size / ENA_RX_REFILL_THRESH_DEVIDER;
+
+	if (refill_required > refill_threshold) {
+		ena_com_update_dev_comp_head(rx_ring->ena_com_io_cq);
+		ena_refill_rx_bufs(rx_ring, refill_required);
+	}
+
+	tcp_lro_flush_all(&rx_ring->lro);
+
+	return (RX_BUDGET - budget);
+
+error:
+	counter_u64_add(rx_ring->rx_stats.bad_desc_num, 1);
+	return (RX_BUDGET - budget);
+}
+
+/*********************************************************************
+ *
+ *  MSIX & Interrupt Service routine
+ *
+ **********************************************************************/
+
+/**
+ * ena_handle_msix - MSIX Interrupt Handler for admin/async queue
+ * @arg: interrupt number
+ **/
+static void
+ena_intr_msix_mgmnt(void *arg)
+{
+	struct ena_adapter *adapter = (struct ena_adapter *)arg;
+
+	ena_com_admin_q_comp_intr_handler(adapter->ena_dev);
+	if (likely(adapter->running))
+		ena_com_aenq_intr_handler(adapter->ena_dev, arg);
+}
+
+/**
+ * ena_handle_msix - MSIX Interrupt Handler for Tx/Rx
+ * @arg: interrupt number
+ **/
+static void
+ena_handle_msix(void *arg)
+{
+	struct ena_que	*que = arg;
+	struct ena_adapter *adapter = que->adapter;
+	if_t ifp = adapter->ifp;
+	struct ena_ring *tx_ring;
+	struct ena_ring *rx_ring;
+	struct ena_com_io_cq* io_cq;
+	struct ena_eth_io_intr_reg intr_reg;
+	int qid, ena_qid;
+	int txc, rxc, i;
+
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+		return;
+
+	ena_trace(ENA_DBG, "MSI-X TX/RX routine");
+
+	tx_ring = que->tx_ring;
+	rx_ring = que->rx_ring;
+	qid = que->id;
+	ena_qid = ENA_IO_TXQ_IDX(qid);
+	io_cq = &adapter->ena_dev->io_cq_queues[ena_qid];
+
+	for (i = 0; i < CLEAN_BUDGET; ++i) {
+		rxc = ena_rx_cleanup(rx_ring);
+
+		/* Protection from calling ena_tx_cleanup from ena_start_xmit */
+		ENA_RING_MTX_LOCK(tx_ring);
+		txc = ena_tx_cleanup(tx_ring);
+		ENA_RING_MTX_UNLOCK(tx_ring);
+
+		if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+			return;
+
+		if (txc != TX_BUDGET && rxc != RX_BUDGET)
+		       break;
+	}
+
+	/* Signal that work is done and unmask interrupt */
+	ena_com_update_intr_reg(&intr_reg,
+	    RX_IRQ_INTERVAL,
+	    TX_IRQ_INTERVAL,
+	    true);
+	ena_com_unmask_intr(io_cq, &intr_reg);
+}
+
+static int
+ena_enable_msix(struct ena_adapter *adapter)
+{
+	device_t dev = adapter->pdev;
+	int i, msix_vecs, rc = 0;
+
+	/* Reserved the max msix vectors we might need */
+	msix_vecs = ENA_MAX_MSIX_VEC(adapter->num_queues);
+
+	adapter->msix_entries = ENA_MEM_ALLOC(adapter->ena_dev->dmadev,
+	    msix_vecs * sizeof(struct msix_entry));
+	if (!adapter->msix_entries) {
+		device_printf(dev,
+		    "Failed to allocate msix_entries, vectors %d\n", msix_vecs);
+		rc = ENOMEM;
+		goto error;
+	}
+	device_printf(dev, "Allocated msix_entries, vectors (cnt: %d)\n",
+	    msix_vecs);
+
+	for (i = 0; i < msix_vecs; i++) {
+		adapter->msix_entries[i].entry = i;
+		/* Vectors must start from 1 */
+		adapter->msix_entries[i].vector = i + 1;
+	}
+
+	rc = pci_alloc_msix(dev, &msix_vecs);
+	if (rc != 0) {
+		device_printf(dev,
+		    "Failed to enable MSIX, vectors %d rc %d\n", msix_vecs, rc);
+		ENA_MEM_FREE(adapter->ena_dev->dmadev, adapter->msix_entries);
+		adapter->msix_entries = NULL;
+		rc = ENOSPC;
+		goto error;
+	}
+
+	adapter->msix_vecs = msix_vecs;
+	adapter->msix_enabled = true;
+
+error:
+	return (rc);
+}
+
+static void
+ena_setup_mgmnt_intr(struct ena_adapter *adapter)
+{
+
+	snprintf(adapter->irq_tbl[ENA_MGMNT_IRQ_IDX].name,
+	    ENA_IRQNAME_SIZE, "ena-mgmnt@pci:%s",
+	    device_get_nameunit(adapter->pdev));
+	/*
+	 * Handler is NULL on purpose, it will be set
+	 * when mgmnt interrupt is acquired
+	 */
+	adapter->irq_tbl[ENA_MGMNT_IRQ_IDX].handler = NULL;
+	adapter->irq_tbl[ENA_MGMNT_IRQ_IDX].data = adapter;
+	adapter->irq_tbl[ENA_MGMNT_IRQ_IDX].vector =
+	    adapter->msix_entries[ENA_MGMNT_IRQ_IDX].vector;
+
+	return;
+}
+
+static void
+ena_setup_io_intr(struct ena_adapter *adapter)
+{
+	static int last_bind_cpu = -1;
+	int irq_idx;
+	ena_trace(ENA_DBG, "enter");
+
+	for (int i = 0; i < adapter->num_queues; i++) {
+		irq_idx = ENA_IO_IRQ_IDX(i);
+
+		snprintf(adapter->irq_tbl[irq_idx].name, ENA_IRQNAME_SIZE,
+		    "%s-TxRx-%d", device_get_nameunit(adapter->pdev), i);
+		adapter->irq_tbl[irq_idx].handler = ena_handle_msix;
+		adapter->irq_tbl[irq_idx].data = &adapter->que[i];
+		adapter->irq_tbl[irq_idx].vector =
+		    adapter->msix_entries[irq_idx].vector;
+		ena_trace(ENA_INFO | ENA_IOQ, "ena_setup_io_intr vector: %d\n",
+		    adapter->msix_entries[irq_idx].vector);
+#ifdef	RSS
+		adapter->que[i].cpu = adapter->irq_tbl[irq_idx].cpu =
+		    rss_getcpu(i % rss_getnumbuckets());
+#else
+		/*
+		 * We still want to bind rings to the corresponding cpu
+		 * using something similar to the RSS round-robin technique.
+		 */
+		if (last_bind_cpu < 0)
+			last_bind_cpu = CPU_FIRST();
+		adapter->que[i].cpu = adapter->irq_tbl[irq_idx].cpu =
+		    last_bind_cpu;
+		last_bind_cpu = CPU_NEXT(last_bind_cpu);
+#endif
+	}
+
+	return;
+}
+
+static int
+ena_request_mgmnt_irq(struct ena_adapter *adapter)
+{
+	struct ena_irq *irq;
+	unsigned long flags;
+	int rc, rcc;
+
+	flags = RF_ACTIVE | RF_SHAREABLE;
+
+	irq = &adapter->irq_tbl[ENA_MGMNT_IRQ_IDX];
+	irq->res = bus_alloc_resource_any(adapter->pdev, SYS_RES_IRQ,
+	    &irq->vector, flags);
+
+	if (irq->res == NULL) {
+		device_printf(adapter->pdev, "could not allocate "
+		    "irq vector: %d\n", irq->vector);
+		rc = ENXIO;
+		goto exit_res;
+	}
+
+	if ((rc = bus_activate_resource(adapter->pdev, SYS_RES_IRQ, irq->vector,
+	    irq->res)) != 0) {
+		device_printf(adapter->pdev, "could not activate "
+		    "irq vector: %d\n", irq->vector);
+		goto exit_intr;
+	}
+
+	if ((rc = bus_setup_intr(adapter->pdev, irq->res,
+	    INTR_TYPE_NET | INTR_MPSAFE, NULL,
+	    ena_intr_msix_mgmnt, irq->data, &irq->cookie)) != 0) {
+		device_printf(adapter->pdev, "failed to register "
+		    "interrupt handler for irq %ju: %d\n",
+		    rman_get_start(irq->res), rc);
+		goto exit_intr;
+	}
+	irq->requested = true;
+
+	return (rc);
+
+exit_intr:
+	device_printf(adapter->pdev, "exit_intr: releasing resource"
+	    " for irq %d\n", irq->vector);
+	rcc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
+	    irq->vector, irq->res);
+	if (rcc)
+		device_printf(adapter->pdev, "dev has no parent while "
+		    "releasing res for irq: %d\n", irq->vector);
+	irq->res = NULL;
+
+exit_res:
+	return (rc);
+}
+
+static int
+ena_request_io_irq(struct ena_adapter *adapter)
+{
+	struct ena_irq *irq;
+	unsigned long flags = 0;
+	int rc = 0, i, rcc;
+
+	if (!adapter->msix_enabled) {
+		device_printf(adapter->pdev, "failed to request irq\n");
+		return (EINVAL);
+	} else {
+		flags = RF_ACTIVE | RF_SHAREABLE;
+	}
+
+	for (i = ENA_IO_IRQ_FIRST_IDX; i < adapter->msix_vecs; i++) {
+		irq = &adapter->irq_tbl[i];
+
+		if (irq->requested)
+			continue;
+
+		irq->res = bus_alloc_resource_any(adapter->pdev, SYS_RES_IRQ,
+		    &irq->vector, flags);
+		if (irq->res == NULL) {
+			device_printf(adapter->pdev, "could not allocate "
+			    "irq vector: %d\n", irq->vector);
+			goto err;
+		}
+
+		if ((rc = bus_setup_intr(adapter->pdev, irq->res,
+			    INTR_TYPE_NET | INTR_MPSAFE, NULL, irq->handler,
+			    irq->data, &irq->cookie)) != 0) {
+			device_printf(adapter->pdev, "failed to register "
+			    "interrupt handler for irq %ju: %d\n",
+			    rman_get_start(irq->res), rc);
+			goto err;
+		}
+		irq->requested = true;
+
+#ifdef	RSS
+		device_printf(adapter->pdev, "queue %d - RSS bucket %d\n",
+		    i - ENA_IO_IRQ_FIRST_IDX, irq->cpu);
+#else
+		device_printf(adapter->pdev, "queue %d - cpu %d\n",
+		    i - ENA_IO_IRQ_FIRST_IDX, irq->cpu);
+#endif
+	}
+
+	return (rc);
+
+err:
+
+	for (; i >= ENA_IO_IRQ_FIRST_IDX; i--) {
+		irq = &adapter->irq_tbl[i];
+		rcc = 0;
+
+		/* Once we entered err: section and irq->requested is true we
+		   free both intr and resources */
+		if (irq->requested == true)
+			rcc = bus_teardown_intr(adapter->pdev, irq->res, irq->cookie);
+		if (rcc)
+			device_printf(adapter->pdev, "could not release"
+			    " irq: %d, error: %d\n", irq->vector, rcc);
+
+		/* If we entred err: section without irq->requested set we know
+		   it was bus_alloc_resource_any() that needs cleanup, provided
+		   res is not NULL. In case res is NULL no work in needed in
+		   this iteration */
+		rcc = 0;
+		if (irq->res != NULL) {
+			rcc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
+			    irq->vector, irq->res);
+		}
+		if (rcc)
+			device_printf(adapter->pdev, "dev has no parent while "
+			    "releasing res for irq: %d\n", irq->vector);
+		irq->requested = false;
+		irq->res = NULL;
+	}
+
+	return (rc);
+}
+
+static void
+ena_free_mgmnt_irq(struct ena_adapter *adapter)
+{
+	struct ena_irq *irq;
+	int rc;
+
+	irq = &adapter->irq_tbl[ENA_MGMNT_IRQ_IDX];
+	if (irq->requested) {
+		ena_trace(ENA_INFO | ENA_ADMQ, "tear down irq: %d\n",
+		    irq->vector);
+		rc = bus_teardown_intr(adapter->pdev, irq->res, irq->cookie);
+		if (rc)
+			device_printf(adapter->pdev, "failed to tear "
+			    "down irq: %d\n", irq->vector);
+		irq->requested = 0;
+	}
+
+	if (irq->res != NULL) {
+		ena_trace(ENA_INFO | ENA_ADMQ, "release resource irq: %d\n",
+		    irq->vector);
+		rc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
+		    irq->vector, irq->res);
+		irq->res = NULL;
+		if (rc)
+			device_printf(adapter->pdev, "dev has no parent while "
+			    "releasing res for irq: %d\n", irq->vector);
+	}
+
+	return;
+}
+
+static void
+ena_free_io_irq(struct ena_adapter *adapter)
+{
+	struct ena_irq *irq;
+	int rc;
+
+	for (int i = ENA_IO_IRQ_FIRST_IDX; i < adapter->msix_vecs; i++) {
+		irq = &adapter->irq_tbl[i];
+		if (irq->requested) {
+			ena_trace(ENA_INFO | ENA_IOQ, "tear down irq: %d\n",
+			    irq->vector);
+			rc = bus_teardown_intr(adapter->pdev, irq->res,
+			    irq->cookie);
+			if (rc) {
+				device_printf(adapter->pdev, "failed to tear "
+				    "down irq: %d\n", irq->vector);
+			}
+			irq->requested = 0;
+		}
+
+		if (irq->res != NULL) {
+			ena_trace(ENA_INFO | ENA_IOQ, "release resource irq: %d\n",
+			    irq->vector);
+			rc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
+			    irq->vector, irq->res);
+			irq->res = NULL;
+			if (rc) {
+				device_printf(adapter->pdev, "dev has no parent"
+				    " while releasing res for irq: %d\n",
+				    irq->vector);
+			}
+		}
+	}
+
+	return;
+}
+
+static void
+ena_free_irqs(struct ena_adapter* adapter)
+{
+
+	ena_free_io_irq(adapter);
+	ena_free_mgmnt_irq(adapter);
+	ena_disable_msix(adapter);
+}
+
+static void
+ena_disable_msix(struct ena_adapter *adapter)
+{
+
+	pci_release_msi(adapter->pdev);
+
+	adapter->msix_vecs = 0;
+	ENA_MEM_FREE(adapter->ena_dev->dmadev, adapter->msix_entries);
+	adapter->msix_entries = NULL;
+}
+
+static void
+ena_unmask_all_io_irqs(struct ena_adapter *adapter)
+{
+	struct ena_com_io_cq* io_cq;
+	struct ena_eth_io_intr_reg intr_reg;
+	uint16_t ena_qid;
+	int i;
+
+	/* Unmask interrupts for all queues */
+	for (i = 0; i < adapter->num_queues; i++) {
+		ena_qid = ENA_IO_TXQ_IDX(i);
+		io_cq = &adapter->ena_dev->io_cq_queues[ena_qid];
+		ena_com_update_intr_reg(&intr_reg, 0, 0, true);
+		ena_com_unmask_intr(io_cq, &intr_reg);
+	}
+}
+
+/* Configure the Rx forwarding */
+static int ena_rss_configure(struct ena_adapter *adapter)
+{
+	struct ena_com_dev *ena_dev = adapter->ena_dev;
+	int rc;
+
+	/* Set indirect table */
+	rc = ena_com_indirect_table_set(ena_dev);
+	if (unlikely(rc && rc != EPERM))
+		return rc;
+
+	/* Configure hash function (if supported) */
+	rc = ena_com_set_hash_function(ena_dev);
+	if (unlikely(rc && (rc != EPERM)))
+		return rc;
+
+	/* Configure hash inputs (if supported) */
+	rc = ena_com_set_hash_ctrl(ena_dev);
+	if (unlikely(rc && (rc != EPERM)))
+		return rc;
+
+	return 0;
+}
+
+static int
+ena_up_complete(struct ena_adapter *adapter)
+{
+	int rc;
+
+	if (adapter->rss_support) {
+		rc = ena_rss_configure(adapter);
+		if (rc)
+			return (rc);
+	}
+
+	ena_change_mtu(adapter->ifp, adapter->ifp->if_mtu);
+	ena_refill_all_rx_bufs(adapter);
+	ena_unmask_all_io_irqs(adapter);
+
+	return (0);
+}
+
+static int
+ena_up(struct ena_adapter *adapter)
+{
+	int rc = 0;
+
+	if (!device_is_attached(adapter->pdev)) {
+		device_printf(adapter->pdev, "device is not attached!\n");
+		return (ENXIO);
+	}
+
+	if (!adapter->running) {
+		device_printf(adapter->pdev, "device is not running!\n");
+		return (ENXIO);
+	}
+
+	if (!adapter->up) {
+		device_printf(adapter->pdev, "device is going UP\n");
+
+		/* setup interrupts for IO queues */
+		ena_setup_io_intr(adapter);
+		rc = ena_request_io_irq(adapter);
+		if (rc) {
+			ena_trace(ENA_ALERT, "err_req_irq");
+			goto err_req_irq;
+		}
+
+		/* allocate transmit descriptors */
+		rc = ena_setup_all_tx_resources(adapter);
+		if (rc) {
+			ena_trace(ENA_ALERT, "err_setup_tx");
+			goto err_setup_tx;
+		}
+
+		/* allocate receive descriptors */
+		rc = ena_setup_all_rx_resources(adapter);
+		if (rc) {
+			ena_trace(ENA_ALERT, "err_setup_rx");
+			goto err_setup_rx;
+		}
+
+		/* create IO queues for Rx & Tx */
+		rc = ena_create_io_queues(adapter);
+		if (rc) {
+			ena_trace(ENA_ALERT,
+			    "create IO queues failed");
+			goto err_io_que;
+		}
+
+		if (adapter->link_status)
+			if_link_state_change(adapter->ifp, LINK_STATE_UP);
+
+		rc = ena_up_complete(adapter);
+		if (rc)
+			goto err_up_complete;
+
+		counter_u64_add(adapter->dev_stats.interface_up, 1);
+
+		ena_update_hwassist(adapter);
+
+		if_setdrvflagbits(adapter->ifp, IFF_DRV_RUNNING,
+		    IFF_DRV_OACTIVE);
+
+		callout_reset_sbt(&adapter->timer_service, SBT_1S, SBT_1S,
+		    ena_timer_service, (void *)adapter, 0);
+
+		adapter->up = true;
+	}
+
+	return (0);
+
+err_up_complete:
+	ena_destroy_all_io_queues(adapter);
+err_io_que:
+	ena_free_all_rx_resources(adapter);
+err_setup_rx:
+	ena_free_all_tx_resources(adapter);
+err_setup_tx:
+	ena_free_io_irq(adapter);
+err_req_irq:
+	return (rc);
+}
+
+int
+ena_update_stats_counters(struct ena_adapter *adapter)
+{
+	struct ena_admin_basic_stats ena_stats;
+	struct ena_hw_stats *stats = &adapter->hw_stats;
+	int rc = 0;
+
+	if (!adapter->up)
+		return (rc);
+
+	rc = ena_com_get_dev_basic_stats(adapter->ena_dev, &ena_stats);
+	if (rc)
+		return (rc);
+
+	stats->tx_bytes = ((uint64_t)ena_stats.tx_bytes_high << 32) |
+		ena_stats.tx_bytes_low;
+	stats->rx_bytes = ((uint64_t)ena_stats.rx_bytes_high << 32) |
+		ena_stats.rx_bytes_low;
+
+	stats->rx_packets = ((uint64_t)ena_stats.rx_pkts_high << 32) |
+		ena_stats.rx_pkts_low;
+	stats->tx_packets = ((uint64_t)ena_stats.tx_pkts_high << 32) |
+		ena_stats.tx_pkts_low;
+
+	stats->rx_drops = ((uint64_t)ena_stats.rx_drops_high << 32) |
+		ena_stats.rx_drops_low;
+
+	return (0);
+}
+
+static uint64_t
+ena_get_counter(if_t ifp, ift_counter cnt)
+{
+	struct ena_adapter *adapter;
+	struct ena_hw_stats *stats;
+	int rc;
+
+	adapter = if_getsoftc(ifp);
+
+	/*
+	 * Update only when asking for first counter and interface is up.
+	 * Usually asks for all statistics in sequence.
+	 */
+	if (adapter->up) {
+		if (cnt == 0) {
+			rc = ena_update_stats_counters(adapter);
+			if (rc) {
+				ena_trace(ENA_WARNING,
+				    "Error updating stats counters, rc = %d",
+				    rc);
+			}
+		}
+	}
+	stats = &adapter->hw_stats;
+
+	switch (cnt) {
+	case IFCOUNTER_IPACKETS:
+		return (stats->rx_packets);
+	case IFCOUNTER_OPACKETS:
+		return (stats->tx_packets);
+	case IFCOUNTER_IBYTES:
+		return (stats->rx_bytes);
+	case IFCOUNTER_OBYTES:
+		return (stats->tx_bytes);
+	case IFCOUNTER_IQDROPS:
+		return (stats->rx_drops);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
+}
+
+static int
+ena_media_change(if_t ifp)
+{
+	/* Media Change is not supported by firmware */
+	return (0);
+}
+
+static void
+ena_media_status(if_t ifp, struct ifmediareq *ifmr)
+{
+	struct ena_adapter *adapter = if_getsoftc(ifp);
+	ena_trace(ENA_DBG, "enter");
+
+	ENA_DEV_LOCK;
+
+	ifmr->ifm_status = IFM_AVALID;
+	ifmr->ifm_active = IFM_ETHER;
+
+	if (!adapter->link_status) {
+		ENA_DEV_UNLOCK;
+		ena_trace(ENA_WARNING, "link_status = false");
+		return;
+	}
+
+	ifmr->ifm_status |= IFM_ACTIVE;
+	ifmr->ifm_active |= IFM_10G_T | IFM_FDX;
+
+	ENA_DEV_UNLOCK;
+
+	return;
+}
+
+static void
+ena_init(void *arg)
+{
+	struct ena_adapter *adapter = (struct ena_adapter *)arg;
+
+	if (adapter->up == false)
+		ena_up(adapter);
+
+	return;
+}
+
+static int
+ena_ioctl(if_t ifp, u_long command, caddr_t data)
+{
+	struct ena_adapter *adapter;
+	struct ifreq *ifr;
+	int rc;
+
+	adapter = ifp->if_softc;
+	ifr = (struct ifreq *)data;
+
+	/*
+	 * Acquiring lock to prevent from running up and down routines parallel.
+	 */
+	sx_xlock(&adapter->ioctl_sx);
+
+	rc = 0;
+	switch (command) {
+	case SIOCSIFMTU:
+		ena_down(adapter);
+
+		ena_change_mtu(ifp, ifr->ifr_mtu);
+
+		rc = ena_up(adapter);
+		break;
+
+	case SIOCSIFFLAGS:
+		if (ifp->if_flags & IFF_UP) {
+			if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) {
+				if (ifp->if_flags & (IFF_PROMISC |
+				    IFF_ALLMULTI)) {
+					device_printf(adapter->pdev,
+					    "ioctl promisc/allmulti\n");
+				}
+			} else {
+				rc = ena_up(adapter);
+			}
+		} else {
+			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+				ena_down(adapter);
+		}
+		break;
+
+	case SIOCADDMULTI:
+	case SIOCDELMULTI:
+		break;
+
+	case SIOCSIFMEDIA:
+	case SIOCGIFMEDIA:
+		rc = ifmedia_ioctl(ifp, ifr, &adapter->media, command);
+		break;
+
+	case SIOCSIFCAP:
+		{
+			int reinit = 0;
+
+			if (ifr->ifr_reqcap != ifp->if_capenable) {
+				ifp->if_capenable = ifr->ifr_reqcap;
+				reinit = 1;
+			}
+
+			if (reinit && (ifp->if_drv_flags & IFF_DRV_RUNNING)) {
+				ena_down(adapter);
+				rc = ena_up(adapter);
+			}
+		}
+
+		break;
+	default:
+		rc = ether_ioctl(ifp, command, data);
+		break;
+	}
+
+	sx_unlock(&adapter->ioctl_sx);
+
+	return (rc);
+}
+
+static int
+ena_get_dev_offloads(struct ena_com_dev_get_features_ctx *feat)
+{
+	int caps = 0;
+
+	if (feat->offload.tx &
+	    (ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV4_CSUM_FULL_MASK |
+	    ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV4_CSUM_PART_MASK |
+	    ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L3_CSUM_IPV4_MASK))
+		caps |= IFCAP_TXCSUM;
+
+	if (feat->offload.tx &
+	    (ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV6_CSUM_FULL_MASK |
+	    ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV6_CSUM_PART_MASK))
+		caps |= IFCAP_TXCSUM_IPV6;
+
+	if (feat->offload.tx & ENA_ADMIN_FEATURE_OFFLOAD_DESC_TSO_IPV4_MASK)
+		caps |= IFCAP_TSO4;
+
+	if (feat->offload.tx & ENA_ADMIN_FEATURE_OFFLOAD_DESC_TSO_IPV6_MASK)
+		caps |= IFCAP_TSO6;
+
+	if (feat->offload.rx_supported &
+	    (ENA_ADMIN_FEATURE_OFFLOAD_DESC_RX_L4_IPV4_CSUM_MASK |
+	    ENA_ADMIN_FEATURE_OFFLOAD_DESC_RX_L3_CSUM_IPV4_MASK))
+		caps |= IFCAP_RXCSUM;
+
+	if (feat->offload.rx_supported &
+	    ENA_ADMIN_FEATURE_OFFLOAD_DESC_RX_L4_IPV6_CSUM_MASK)
+		caps |= IFCAP_RXCSUM_IPV6;
+
+	caps |= IFCAP_LRO | IFCAP_JUMBO_MTU;
+
+	return (caps);
+}
+
+static void
+ena_update_host_info(struct ena_admin_host_info *host_info, if_t ifp)
+{
+
+	host_info->supported_network_features[0] =
+	    (uint32_t)if_getcapabilities(ifp);
+}
+
+static void
+ena_update_hwassist(struct ena_adapter *adapter)
+{
+	if_t ifp = adapter->ifp;
+	uint32_t feat = adapter->tx_offload_cap;
+	int cap = if_getcapenable(ifp);
+	int flags = 0;
+
+	if_clearhwassist(ifp);
+
+	if (cap & IFCAP_TXCSUM) {
+		if (feat & ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L3_CSUM_IPV4_MASK)
+			flags |= CSUM_IP;
+		if (feat &
+		    (ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV4_CSUM_FULL_MASK |
+		    ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV4_CSUM_PART_MASK))
+			flags |= CSUM_IP_UDP | CSUM_IP_TCP;
+	}
+
+	if (cap & IFCAP_TXCSUM_IPV6)
+		flags |= CSUM_IP6_UDP | CSUM_IP6_TCP;
+
+	if (cap & IFCAP_TSO4)
+		flags |= CSUM_IP_TSO;
+
+	if (cap & IFCAP_TSO6)
+		flags |= CSUM_IP6_TSO;
+
+	if_sethwassistbits(ifp, flags, 0);
+}
+
+static int
+ena_setup_ifnet(device_t pdev, struct ena_adapter *adapter,
+    struct ena_com_dev_get_features_ctx *feat)
+{
+	if_t ifp;
+	int caps = 0;
+
+	ena_trace(ENA_DBG, "enter");
+
+	ifp = adapter->ifp = if_gethandle(IFT_ETHER);
+	if (ifp == 0) {
+		device_printf(pdev, "can not allocate ifnet structure\n");
+		return (ENXIO);
+	}
+	if_initname(ifp, device_get_name(pdev), device_get_unit(pdev));
+	if_setdev(ifp, pdev);
+	if_setsoftc(ifp, adapter);
+
+	if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
+	if_setinitfn(ifp, ena_init);
+	if_settransmitfn(ifp, ena_mq_start);
+	if_setqflushfn(ifp, ena_qflush);
+	if_setioctlfn(ifp, ena_ioctl);
+	if_setgetcounterfn(ifp, ena_get_counter);
+
+	if_setsendqlen(ifp, adapter->tx_ring_size);
+	if_setsendqready(ifp);
+	if_setmtu(ifp, ETHERMTU);
+	if_setbaudrate(ifp, 0);
+	/* Zeroize capabilities... */
+	if_setcapabilities(ifp, 0);
+	if_setcapenable(ifp, 0);
+	/* check hardware support */
+	caps = ena_get_dev_offloads(feat);
+	/* ... and set them */
+	if_setcapabilitiesbit(ifp, caps, 0);
+
+	/* TSO parameters */
+	ifp->if_hw_tsomax = ENA_TSO_MAXSIZE;
+	ifp->if_hw_tsomaxsegcount = ENA_TSO_NSEGS;
+	ifp->if_hw_tsomaxsegsize = MCLBYTES;
+
+	if_setifheaderlen(ifp, sizeof(struct ether_vlan_header));
+	if_setcapenable(ifp, if_getcapabilities(ifp));
+
+	/*
+	 * Specify the media types supported by this adapter and register
+	 * callbacks to update media and link information
+	 */
+	ifmedia_init(&adapter->media, IFM_IMASK,
+	    ena_media_change, ena_media_status);
+	ifmedia_add(&adapter->media, IFM_ETHER | IFM_AUTO, 0, NULL);
+	ifmedia_set(&adapter->media, IFM_ETHER | IFM_AUTO);
+
+	ether_ifattach(ifp, adapter->mac_addr);
+
+	return (0);
+}
+
+static void
+ena_down(struct ena_adapter *adapter)
+{
+
+	if (adapter->up) {
+		device_printf(adapter->pdev, "device is going DOWN\n");
+
+		callout_drain(&adapter->timer_service);
+
+		adapter->up = false;
+		if_setdrvflagbits(adapter->ifp, IFF_DRV_OACTIVE,
+		    IFF_DRV_RUNNING);
+
+		ena_free_io_irq(adapter);
+
+		ena_destroy_all_io_queues(adapter);
+
+		ena_free_all_tx_bufs(adapter);
+		ena_free_all_rx_bufs(adapter);
+		ena_free_all_tx_resources(adapter);
+		ena_free_all_rx_resources(adapter);
+
+		counter_u64_add(adapter->dev_stats.interface_down, 1);
+	}
+
+	return;
+}
+
+static void
+ena_tx_csum(struct ena_com_tx_ctx *ena_tx_ctx, struct mbuf *mbuf)
+{
+	struct ena_com_tx_meta *ena_meta;
+	struct ether_vlan_header *eh;
+	u32 mss;
+	bool offload;
+	uint16_t etype;
+	int ehdrlen;
+	struct ip *ip;
+	int iphlen;
+	struct tcphdr *th;
+
+	offload = false;
+	ena_meta = &ena_tx_ctx->ena_meta;
+	mss = mbuf->m_pkthdr.tso_segsz;
+
+	if (mss != 0)
+		offload = true;
+
+	if ((mbuf->m_pkthdr.csum_flags & CSUM_TSO) != 0)
+		offload = true;
+
+	if ((mbuf->m_pkthdr.csum_flags & CSUM_OFFLOAD) != 0)
+		offload = true;
+
+	if (offload == false) {
+		ena_tx_ctx->meta_valid = 0;
+		return;
+	}
+
+	/* Determine where frame payload starts. */
+	eh = mtod(mbuf, struct ether_vlan_header *);
+	if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) {
+		etype = ntohs(eh->evl_proto);
+		ehdrlen = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
+	} else {
+		etype = ntohs(eh->evl_encap_proto);
+		ehdrlen = ETHER_HDR_LEN;
+	}
+
+	ip = (struct ip *)(mbuf->m_data + ehdrlen);
+	iphlen = ip->ip_hl << 2;
+	th = (struct tcphdr *)((caddr_t)ip + iphlen);
+
+	if ((mbuf->m_pkthdr.csum_flags & CSUM_IP) != 0) {
+		ena_tx_ctx->l3_csum_enable = 1;
+	}
+	if ((mbuf->m_pkthdr.csum_flags & CSUM_TSO) != 0) {
+		ena_tx_ctx->tso_enable = 1;
+		ena_meta->l4_hdr_len = (th->th_off);
+	}
+
+	switch (etype) {
+	case ETHERTYPE_IP:
+		ena_tx_ctx->l3_proto = ENA_ETH_IO_L3_PROTO_IPV4;
+		if (ip->ip_off == 0)
+			ena_tx_ctx->df = 1;
+		break;
+	case ETHERTYPE_IPV6:
+		ena_tx_ctx->l3_proto = ENA_ETH_IO_L3_PROTO_IPV6;
+
+	default:
+		break;
+	}
+
+	if (ip->ip_p == IPPROTO_TCP) {
+		ena_tx_ctx->l4_proto = ENA_ETH_IO_L4_PROTO_TCP;
+		if (mbuf->m_pkthdr.csum_flags & (CSUM_IP_TCP | CSUM_IP6_TCP))
+		    ena_tx_ctx->l4_csum_enable = 1;
+		else
+		    ena_tx_ctx->l4_csum_enable = 0;
+	} else if (ip->ip_p == IPPROTO_UDP) {
+		ena_tx_ctx->l4_proto = ENA_ETH_IO_L4_PROTO_UDP;
+		if (mbuf->m_pkthdr.csum_flags & (CSUM_IP_UDP | CSUM_IP6_UDP))
+		    ena_tx_ctx->l4_csum_enable = 1;
+		else
+		    ena_tx_ctx->l4_csum_enable = 0;
+	} else {
+		ena_tx_ctx->l4_proto = ENA_ETH_IO_L4_PROTO_UNKNOWN;
+		ena_tx_ctx->l4_csum_enable = 0;
+	}
+
+	ena_meta->mss = mss;
+	ena_meta->l3_hdr_len = iphlen;
+	ena_meta->l3_hdr_offset = ehdrlen;
+	ena_tx_ctx->meta_valid = 1;
+}
+
+static int
+ena_xmit_mbuf(struct ena_ring *tx_ring, struct mbuf *mbuf)
+{
+	struct ena_adapter *adapter;
+	struct ena_tx_buffer *tx_info;
+	struct ena_com_tx_ctx ena_tx_ctx;
+	struct ena_com_dev *ena_dev;
+	struct ena_com_buf *ena_buf;
+	struct ena_com_io_sq* io_sq;
+	bus_dma_segment_t segs[ENA_BUS_DMA_SEGS];
+	void *push_hdr;
+	uint16_t next_to_use;
+	uint16_t req_id;
+	uint16_t push_len;
+	uint16_t ena_qid;
+	uint32_t len, nsegs, header_len;
+	int i, rc;
+	int nb_hw_desc, num_frags;
+
+	ena_qid = ENA_IO_TXQ_IDX(tx_ring->que->id);
+	adapter = tx_ring->que->adapter;
+	ena_dev = adapter->ena_dev;
+	io_sq = &adapter->ena_dev->io_sq_queues[ena_qid];
+
+	ENA_ASSERT(mbuf, "mbuf is NULL\n");
+
+	num_frags = ena_mbuf_count(mbuf);
+	if (num_frags > (adapter->max_tx_sgl_size - 2)) {
+		device_printf(adapter->pdev,
+		   "too many fragments. Last fragment: %d!\n", num_frags);
+		return (ENA_COM_INVAL);
+	}
+
+	next_to_use = tx_ring->next_to_use;
+	req_id = tx_ring->free_tx_ids[next_to_use];
+	tx_info = &tx_ring->tx_buffer_info[req_id];
+
+	tx_info->mbuf = mbuf;
+	tx_info->num_of_bufs = 0;
+
+	ena_buf = tx_info->bufs;
+	len = mbuf->m_len;
+
+	ena_trace(ENA_DBG | ENA_TXPTH, "Tx: %d bytes", mbuf->m_pkthdr.len);
+
+	push_len = 0;
+	header_len = min_t(uint32_t, len, tx_ring->tx_max_header_size);
+	push_hdr = NULL;
+
+	rc = bus_dmamap_load_mbuf_sg(adapter->tx_buf_tag, tx_info->map,
+	    mbuf, segs, &nsegs, BUS_DMA_NOWAIT);
+
+	if (rc || (nsegs == 0)) {
+		ena_trace(ENA_WARNING,
+		    "dmamap load failed! err: %d nsegs: %d", rc, nsegs);
+		counter_u64_add(tx_ring->tx_stats.dma_mapping_err, 1);
+		tx_info->mbuf = NULL;
+		if (rc == ENOMEM)
+			return (ENA_COM_NO_MEM);
+		else
+			return (ENA_COM_INVAL);
+	}
+
+	for (i = 0; i < nsegs; i++) {
+		ena_buf->len = segs[i].ds_len;
+		ena_buf->paddr = segs[i].ds_addr;
+		ena_buf++;
+	}
+	tx_info->num_of_bufs = nsegs;
+
+	memset(&ena_tx_ctx, 0x0, sizeof(struct ena_com_tx_ctx));
+	ena_tx_ctx.ena_bufs = tx_info->bufs;
+	ena_tx_ctx.push_header = push_hdr;
+	ena_tx_ctx.num_bufs = tx_info->num_of_bufs;
+	ena_tx_ctx.req_id = req_id;
+	ena_tx_ctx.header_len = header_len;
+
+	/* Set flags and meta data */
+	ena_tx_csum(&ena_tx_ctx, mbuf);
+	/* Prepare the packet's descriptors and send them to device */
+	rc = ena_com_prepare_tx(io_sq, &ena_tx_ctx, &nb_hw_desc);
+	if (rc != 0) {
+		ena_trace(ENA_WARNING, "failed to prepare tx bufs\n");
+		counter_enter();
+		counter_u64_add_protected(tx_ring->tx_stats.queue_stop, 1);
+		counter_u64_add_protected(tx_ring->tx_stats.prepare_ctx_err, 1);
+		counter_exit();
+		goto dma_error;
+	}
+
+	counter_enter();
+	counter_u64_add_protected(tx_ring->tx_stats.cnt, 1);
+	counter_u64_add_protected(tx_ring->tx_stats.bytes,  mbuf->m_pkthdr.len);
+	counter_exit();
+
+	tx_info->tx_descs = nb_hw_desc;
+	getbinuptime(&tx_info->timestamp);
+	tx_info->print_once = true;
+
+	tx_ring->next_to_use = ENA_TX_RING_IDX_NEXT(next_to_use,
+	    tx_ring->ring_size);
+
+	bus_dmamap_sync(adapter->tx_buf_tag, tx_info->map, BUS_DMASYNC_PREWRITE);
+
+	return (0);
+
+dma_error:
+	tx_info->mbuf = NULL;
+	bus_dmamap_unload(adapter->tx_buf_tag, tx_info->map);
+
+	return (rc);
+}
+
+static void
+ena_start_xmit(struct ena_ring *tx_ring)
+{
+	struct mbuf *mbuf;
+	struct ena_adapter *adapter = tx_ring->adapter;
+	struct ena_com_io_sq* io_sq;
+	int ena_qid;
+	int acum_pkts = 0;
+	int ret = 0;
+
+	if ((adapter->ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+		return;
+
+	if (!adapter->link_status)
+		return;
+
+	ena_qid = ENA_IO_TXQ_IDX(tx_ring->que->id);
+	io_sq = &adapter->ena_dev->io_sq_queues[ena_qid];
+
+	while ((mbuf = drbr_peek(adapter->ifp, tx_ring->br)) != NULL) {
+		ena_trace(ENA_DBG | ENA_TXPTH, "\ndequeued mbuf %p with flags %#x and"
+		    " header csum flags %#jx",
+		    mbuf, mbuf->m_flags, mbuf->m_pkthdr.csum_flags);
+
+		if (ena_com_sq_empty_space(io_sq) < ENA_TX_CLEANUP_TRESHOLD)
+			ena_tx_cleanup(tx_ring);
+
+		if ((ret = ena_xmit_mbuf(tx_ring, mbuf)) != 0) {
+			if (ret == ENA_COM_NO_MEM) {
+				drbr_putback(adapter->ifp, tx_ring->br, mbuf);
+			} else if (ret == ENA_COM_NO_SPACE) {
+				drbr_putback(adapter->ifp, tx_ring->br, mbuf);
+			} else {
+				m_freem(mbuf);
+				drbr_advance(adapter->ifp, tx_ring->br);
+			}
+
+			break;
+		}
+
+		if ((adapter->ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+			return;
+
+		drbr_advance(adapter->ifp, tx_ring->br);
+		acum_pkts++;
+
+		BPF_MTAP(adapter->ifp, mbuf);
+
+		if (acum_pkts == DB_THRESHOLD) {
+			acum_pkts = 0;
+			wmb();
+			/* Trigger the dma engine */
+			ena_com_write_sq_doorbell(io_sq);
+			counter_u64_add(tx_ring->tx_stats.doorbells, 1);
+		}
+
+	}
+
+	if (acum_pkts) {
+		wmb();
+		/* Trigger the dma engine */
+		ena_com_write_sq_doorbell(io_sq);
+		counter_u64_add(tx_ring->tx_stats.doorbells, 1);
+	}
+
+	if (ena_com_sq_empty_space(io_sq) < ENA_TX_CLEANUP_TRESHOLD)
+		ena_tx_cleanup(tx_ring);
+}
+
+static void
+ena_deferred_mq_start(void *arg, int pending)
+{
+	struct ena_ring *tx_ring = (struct ena_ring *)arg;
+	struct ifnet *ifp = tx_ring->adapter->ifp;
+
+	while (drbr_empty(ifp, tx_ring->br) == FALSE &&
+	    (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) {
+		ENA_RING_MTX_LOCK(tx_ring);
+		ena_start_xmit(tx_ring);
+		ENA_RING_MTX_UNLOCK(tx_ring);
+	}
+}
+
+static int
+ena_mq_start(if_t ifp, struct mbuf *m)
+{
+	struct ena_adapter *adapter = ifp->if_softc;
+	struct ena_ring *tx_ring;
+	int ret, is_drbr_empty;
+	uint32_t i;
+
+	if ((adapter->ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+		return (ENODEV);
+
+	/* Which queue to use */
+	/*
+	 * If everything is setup correctly, it should be the
+	 * same bucket that the current CPU we're on is.
+	 * It should improve performance.
+	 */
+	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) {
+#ifdef	RSS
+		if (rss_hash2bucket(m->m_pkthdr.flowid,
+		    M_HASHTYPE_GET(m), &i) == 0) {
+			i = i % adapter->num_queues;
+
+		} else
+#endif
+		{
+			i = m->m_pkthdr.flowid % adapter->num_queues;
+		}
+	} else {
+		i = curcpu % adapter->num_queues;
+	}
+	tx_ring = &adapter->tx_ring[i];
+
+	/* Check if drbr is empty before putting packet */
+	is_drbr_empty = drbr_empty(ifp, tx_ring->br);
+	ret = drbr_enqueue(ifp, tx_ring->br, m);
+	if (ret) {
+		taskqueue_enqueue(tx_ring->enqueue_tq, &tx_ring->enqueue_task);
+		return (ret);
+	}
+
+	if (is_drbr_empty && ENA_RING_MTX_TRYLOCK(tx_ring)) {
+		ena_start_xmit(tx_ring);
+		ENA_RING_MTX_UNLOCK(tx_ring);
+	} else {
+		taskqueue_enqueue(tx_ring->enqueue_tq, &tx_ring->enqueue_task);
+	}
+
+	return (0);
+}
+
+static void
+ena_qflush(if_t ifp)
+{
+	struct ena_adapter *adapter = ifp->if_softc;
+	struct ena_ring *tx_ring = adapter->tx_ring;
+	int i;
+
+	for(i = 0; i < adapter->num_queues; ++i, ++tx_ring)
+		if (drbr_empty(ifp, tx_ring->br) == FALSE) {
+			ENA_RING_MTX_LOCK(tx_ring);
+			drbr_flush(ifp, tx_ring->br);
+			ENA_RING_MTX_UNLOCK(tx_ring);
+		}
+
+	if_qflush(ifp);
+
+	return;
+}
+
+static int ena_calc_io_queue_num(struct ena_adapter *adapter,
+    struct ena_com_dev_get_features_ctx *get_feat_ctx)
+{
+	int io_sq_num, io_cq_num, io_queue_num;
+
+	io_sq_num = get_feat_ctx->max_queues.max_sq_num;
+	io_cq_num = get_feat_ctx->max_queues.max_sq_num;
+
+	io_queue_num = min_t(int, mp_ncpus, ENA_MAX_NUM_IO_QUEUES);
+	io_queue_num = min_t(int, io_queue_num, io_sq_num);
+	io_queue_num = min_t(int, io_queue_num, io_cq_num);
+	/* 1 IRQ for for mgmnt and 1 IRQ for each TX/RX pair */
+	io_queue_num = min_t(int, io_queue_num,
+	    pci_msix_count(adapter->pdev) - 1);
+#ifdef	RSS
+	io_queue_num = min_t(int, io_queue_num, rss_getnumbuckets());
+#endif
+
+	return io_queue_num;
+}
+
+static int ena_calc_queue_size(struct ena_adapter *adapter,
+    uint16_t *max_tx_sgl_size,  uint16_t *max_rx_sgl_size,
+    struct ena_com_dev_get_features_ctx *feat)
+{
+	uint32_t queue_size = ENA_DEFAULT_RING_SIZE;
+	uint32_t v;
+	uint32_t q;
+
+	queue_size = min_t(uint32_t, queue_size,
+	    feat->max_queues.max_cq_depth);
+	queue_size = min_t(uint32_t, queue_size,
+	    feat->max_queues.max_sq_depth);
+
+	/* round down to the nearest power of 2 */
+	v = queue_size;
+	while (v != 0) {
+		if (powerof2(queue_size))
+			break;
+		v /= 2;
+		q = rounddown2(queue_size, v);
+		if (q != 0) {
+			queue_size = q;
+			break;
+		}
+	}
+
+	if (unlikely(!queue_size)) {
+		device_printf(adapter->pdev, "Invalid queue size\n");
+		return ENA_COM_FAULT;
+	}
+
+	*max_tx_sgl_size = min_t(uint16_t, ENA_PKT_MAX_BUFS,
+	    feat->max_queues.max_packet_tx_descs);
+	*max_rx_sgl_size = min_t(uint16_t, ENA_PKT_MAX_BUFS,
+	    feat->max_queues.max_packet_rx_descs);
+
+	return queue_size;
+}
+
+static int ena_rss_init_default(struct ena_adapter *adapter)
+{
+	struct ena_com_dev *ena_dev = adapter->ena_dev;
+	device_t dev = adapter->pdev;
+	int qid, rc, i;
+
+	rc = ena_com_rss_init(ena_dev, ENA_RX_RSS_TABLE_LOG_SIZE);
+	if (unlikely(rc)) {
+		device_printf(dev, "Cannot init RSS\n");
+		goto err_rss_init;
+	}
+
+	for (i = 0; i < ENA_RX_RSS_TABLE_SIZE; i++) {
+#ifdef	RSS
+		qid = rss_get_indirection_to_bucket(i);
+		qid = qid % adapter->num_queues;
+#else
+		qid = i % adapter->num_queues;
+#endif
+		rc = ena_com_indirect_table_fill_entry(ena_dev, i,
+						       ENA_IO_RXQ_IDX(qid));
+		if (unlikely(rc && (rc != EPERM))) {
+			device_printf(dev, "Cannot fill indirect table\n");
+			goto err_fill_indir;
+		}
+	}
+
+	rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_CRC32, NULL,
+					ENA_HASH_KEY_SIZE, 0xFFFFFFFF);
+	if (unlikely(rc && (rc != EPERM))) {
+		device_printf(dev, "Cannot fill hash function\n");
+		goto err_fill_indir;
+	}
+
+	rc = ena_com_set_default_hash_ctrl(ena_dev);
+	if (unlikely(rc && (rc != EPERM))) {
+		device_printf(dev, "Cannot fill hash control\n");
+		goto err_fill_indir;
+	}
+
+	return (0);
+
+err_fill_indir:
+	ena_com_rss_destroy(ena_dev);
+err_rss_init:
+	return (rc);
+}
+
+static void
+ena_rss_init_default_deferred(void *arg)
+{
+	struct ena_adapter *adapter;
+	devclass_t dc;
+	int max;
+	int rc;
+
+	dc = devclass_find("ena");
+	if (dc == NULL) {
+		ena_trace(ENA_DBG, "No devclass ena\n");
+		return;
+	}
+
+	max = devclass_get_maxunit(dc);
+	while (max-- >= 0) {
+		adapter = devclass_get_softc(dc, max);
+		if (adapter != NULL) {
+			rc = ena_rss_init_default(adapter);
+			adapter->rss_support = true;
+			if (rc) {
+				device_printf(adapter->pdev,
+				    "WARNING: RSS was not properly initialized,"
+				    " it will affect bandwith\n");
+				adapter->rss_support = false;
+			}
+		}
+	}
+}
+SYSINIT(ena_rss_init, SI_SUB_KICK_SCHEDULER, SI_ORDER_SECOND, ena_rss_init_default_deferred, NULL);
+
+static void ena_config_host_info(struct ena_com_dev *ena_dev)
+{
+	struct ena_admin_host_info *host_info;
+	int rc;
+
+	/* Allocate only the host info */
+	rc = ena_com_allocate_host_info(ena_dev);
+	if (rc) {
+		ena_trace(ENA_ALERT, "Cannot allocate host info\n");
+		return;
+	}
+
+	host_info = ena_dev->host_attr.host_info;
+
+	host_info->os_type = ENA_ADMIN_OS_FREEBSD;
+	host_info->kernel_ver = osreldate;
+
+	sprintf(host_info->kernel_ver_str, "%d", osreldate);
+	host_info->os_dist = 0;
+	strncpy(host_info->os_dist_str, osrelease,
+	    sizeof(host_info->os_dist_str) - 1);
+
+	host_info->driver_version =
+		(DRV_MODULE_VER_MAJOR) |
+		(DRV_MODULE_VER_MINOR << ENA_ADMIN_HOST_INFO_MINOR_SHIFT) |
+		(DRV_MODULE_VER_SUBMINOR << ENA_ADMIN_HOST_INFO_SUB_MINOR_SHIFT);
+
+	rc = ena_com_set_host_attributes(ena_dev);
+	if (rc) {
+		if (rc == EPERM)
+			ena_trace(ENA_WARNING, "Cannot set host attributes\n");
+		else
+			ena_trace(ENA_ALERT, "Cannot set host attributes\n");
+
+		goto err;
+	}
+
+	return;
+
+err:
+	ena_com_delete_host_info(ena_dev);
+}
+
+static int
+ena_device_init(struct ena_adapter *adapter, device_t pdev,
+	struct ena_com_dev_get_features_ctx *get_feat_ctx, int *wd_active)
+{
+	struct ena_com_dev* ena_dev = adapter->ena_dev;
+	bool readless_supported;
+	uint32_t aenq_groups;
+	int dma_width;
+	int rc;
+
+	rc = ena_com_mmio_reg_read_request_init(ena_dev);
+	if (rc) {
+		device_printf(pdev, "failed to init mmio read less\n");
+		return rc;
+	}
+
+	/*
+	 * The PCIe configuration space revision id indicate if mmio reg
+	 * read is disabled
+	 */
+	readless_supported = !(pci_get_revid(pdev) & ENA_MMIO_DISABLE_REG_READ);
+	ena_com_set_mmio_read_mode(ena_dev, readless_supported);
+
+	rc = ena_com_dev_reset(ena_dev);
+	if (rc) {
+		device_printf(pdev, "Can not reset device\n");
+		goto err_mmio_read_less;
+	}
+
+	rc = ena_com_validate_version(ena_dev);
+	if (rc) {
+		device_printf(pdev, "device version is too low\n");
+		goto err_mmio_read_less;
+	}
+
+	dma_width = ena_com_get_dma_width(ena_dev);
+	if (dma_width < 0) {
+		device_printf(pdev, "Invalid dma width value %d", dma_width);
+		rc = dma_width;
+		goto err_mmio_read_less;
+	}
+	adapter->dma_width = dma_width;
+
+	/* ENA admin level init */
+	rc = ena_com_admin_init(ena_dev, &aenq_handlers, true);
+	if (rc) {
+		device_printf(pdev,
+		    "Can not initialize ena admin queue with device\n");
+		goto err_mmio_read_less;
+	}
+
+	/*
+	 * To enable the msix interrupts the driver needs to know the number
+	 * of queues. So the driver uses polling mode to retrieve this
+	 * information
+	 */
+	ena_com_set_admin_polling_mode(ena_dev, true);
+
+	ena_config_host_info(ena_dev);
+
+	/* Get Device Attributes */
+	rc = ena_com_get_dev_attr_feat(ena_dev, get_feat_ctx);
+	if (rc) {
+		device_printf(pdev,
+		    "Cannot get attribute for ena device rc: %d\n", rc);
+		goto err_admin_init;
+	}
+
+	aenq_groups = BIT(ENA_ADMIN_LINK_CHANGE) |
+	    BIT(ENA_ADMIN_FATAL_ERROR) |
+	    BIT(ENA_ADMIN_WARNING) |
+	    BIT(ENA_ADMIN_NOTIFICATION) |
+	    BIT(ENA_ADMIN_KEEP_ALIVE);
+
+	aenq_groups &= get_feat_ctx->aenq.supported_groups;
+	rc = ena_com_set_aenq_config(ena_dev, aenq_groups);
+	if (rc) {
+		device_printf(pdev, "Cannot configure aenq groups rc: %d\n", rc);
+		goto err_admin_init;
+	}
+
+	*wd_active = !!(aenq_groups & BIT(ENA_ADMIN_KEEP_ALIVE));
+
+	return 0;
+
+err_admin_init:
+	ena_com_delete_host_info(ena_dev);
+	ena_com_admin_destroy(ena_dev);
+err_mmio_read_less:
+	ena_com_mmio_reg_read_request_destroy(ena_dev);
+
+	return rc;
+}
+
+static int ena_enable_msix_and_set_admin_interrupts(struct ena_adapter *adapter,
+    int io_vectors)
+{
+	struct ena_com_dev *ena_dev = adapter->ena_dev;
+	int rc;
+
+	rc = ena_enable_msix(adapter);
+	if (rc) {
+		device_printf(adapter->pdev, "Error with MSI-X enablement\n");
+		return rc;
+	}
+
+	ena_setup_mgmnt_intr(adapter);
+
+	rc = ena_request_mgmnt_irq(adapter);
+	if (rc) {
+		device_printf(adapter->pdev, "Cannot setup mgmnt queue intr\n");
+		goto err_disable_msix;
+	}
+
+	ena_com_set_admin_polling_mode(ena_dev, false);
+
+	ena_com_admin_aenq_enable(ena_dev);
+
+	return 0;
+
+err_disable_msix:
+	ena_disable_msix(adapter);
+
+	return rc;
+}
+
+/* Function called on ENA_ADMIN_KEEP_ALIVE event */
+static void ena_keep_alive_wd(void *adapter_data,
+    struct ena_admin_aenq_entry *aenq_e)
+{
+	struct ena_adapter *adapter = (struct ena_adapter *)adapter_data;
+	sbintime_t stime;
+
+	stime = getsbinuptime();
+	atomic_store_rel_64(&adapter->keep_alive_timestamp, stime);
+}
+
+/* Check for keep alive expiration */
+static void check_for_missing_keep_alive(struct ena_adapter *adapter)
+{
+	sbintime_t timestamp, time;
+
+	if (adapter->wd_active == 0)
+		return;
+
+	if (adapter->keep_alive_timeout == 0)
+		return;
+
+	timestamp = atomic_load_acq_64(&adapter->keep_alive_timestamp);
+	time = getsbinuptime() - timestamp;
+	if (unlikely(time > adapter->keep_alive_timeout)) {
+		device_printf(adapter->pdev,
+		    "Keep alive watchdog timeout.\n");
+		counter_u64_add(adapter->dev_stats.wd_expired, 1);
+		adapter->trigger_reset = true;
+	}
+}
+
+/* Check if admin queue is enabled */
+static void check_for_admin_com_state(struct ena_adapter *adapter)
+{
+	if (unlikely(!ena_com_get_admin_running_state(adapter->ena_dev))) {
+		device_printf(adapter->pdev,
+		    "ENA admin queue is not in running state!\n");
+		counter_u64_add(adapter->dev_stats.admin_q_pause, 1);
+		adapter->trigger_reset = true;
+	}
+}
+
+/*
+ * Check for TX which were not completed on time.
+ * Timeout is defined by "missing_tx_timeout".
+ * Reset will be performed if number of incompleted
+ * transactions exceeds "missing_tx_threshold".
+ */
+static void check_for_missing_tx_completions(struct ena_adapter *adapter)
+{
+	struct ena_ring *tx_ring;
+	struct ena_tx_buffer *tx_info;
+	struct bintime curtime, time;
+	int i, j, budget, missed_tx;
+
+	/* Make sure the driver doesn't turn the device in other process */
+	rmb();
+
+	if (!adapter->up)
+		return;
+
+	if (adapter->trigger_reset)
+		return;
+
+	if (adapter->missing_tx_timeout == 0)
+		return;
+
+	budget = adapter->missing_tx_max_queues;
+	getbinuptime(&curtime);
+
+	for (i = adapter->next_monitored_tx_qid; i < adapter->num_queues; i++) {
+		tx_ring = &adapter->tx_ring[i];
+
+		missed_tx = 0;
+
+		for (j = 0; j < tx_ring->ring_size; j++) {
+			tx_info = &tx_ring->tx_buffer_info[j];
+
+			if (!bintime_isset(&tx_info->timestamp))
+				continue;
+
+			time = curtime;
+			bintime_sub(&time, &tx_info->timestamp);
+
+			/* Check again if packet is still waiting */
+			if (bintime_isset(&tx_info->timestamp) && unlikely(
+			    bttosbt(time) > adapter->missing_tx_timeout)) {
+				if (tx_info->print_once)
+					device_printf(adapter->pdev,
+					    "Found a Tx that wasn't completed "
+					    "on time, qid %d, index %d.\n",
+					    tx_ring->qid, j);
+
+				tx_info->print_once = false;
+				missed_tx++;
+
+				if (unlikely(missed_tx >
+				    adapter->missing_tx_threshold)) {
+					device_printf(adapter->pdev,
+					    "The number of lost tx completion "
+					    "is above the threshold (%d > %d). "
+					    "Reset the device\n", missed_tx,
+					    adapter->missing_tx_threshold);
+					adapter->trigger_reset = true;
+					return;
+				}
+			}
+		}
+
+		budget--;
+		if (!budget) {
+			i++;
+			break;
+		}
+	}
+
+	adapter->next_monitored_tx_qid = i % adapter->num_queues;
+}
+
+
+static void
+ena_timer_service(void *data)
+{
+	struct ena_adapter *adapter = (struct ena_adapter *)data;
+	struct ena_admin_host_info *host_info =
+	    adapter->ena_dev->host_attr.host_info;
+
+	check_for_missing_keep_alive(adapter);
+
+	check_for_admin_com_state(adapter);
+
+	check_for_missing_tx_completions(adapter);
+
+	if (host_info)
+		ena_update_host_info(host_info, adapter->ifp);
+
+	if (unlikely(adapter->trigger_reset)) {
+		device_printf(adapter->pdev, "Trigger reset is on\n");
+		taskqueue_enqueue(adapter->reset_tq, &adapter->reset_task);
+		return;
+	}
+
+	/*
+	 * Schedule another timeout one second from now.
+	 */
+	callout_schedule_sbt(&adapter->timer_service, SBT_1S, SBT_1S, 0);
+}
+
+static void
+ena_reset_task(void *arg, int pending)
+{
+	struct ena_com_dev_get_features_ctx get_feat_ctx;
+	struct ena_adapter *adapter = (struct ena_adapter *)arg;
+	struct ena_com_dev *ena_dev = adapter->ena_dev;
+	bool dev_up;
+	int rc;
+
+	if (unlikely(!adapter->trigger_reset)) {
+		device_printf(adapter->pdev,
+		    "device reset scheduled but trigger_reset is off\n");
+		return;
+	}
+
+	sx_xlock(&adapter->ioctl_sx);
+
+	callout_drain(&adapter->timer_service);
+
+	dev_up = adapter->up;
+
+	ena_com_set_admin_running_state(ena_dev, false);
+	ena_free_mgmnt_irq(adapter);
+	ena_down(adapter);
+	ena_com_dev_reset(ena_dev);
+	ena_disable_msix(adapter);
+	ena_com_abort_admin_commands(ena_dev);
+	ena_com_wait_for_abort_completion(ena_dev);
+	ena_com_admin_destroy(ena_dev);
+	ena_com_mmio_reg_read_request_destroy(ena_dev);
+
+	adapter->trigger_reset = false;
+
+	/* Finished destroy part. Restart the device */
+	rc = ena_device_init(adapter, adapter->pdev, &get_feat_ctx,
+	    &adapter->wd_active);
+	if (rc) {
+		device_printf(adapter->pdev,
+		    "ENA device init failed! (err: %d)\n", rc);
+		goto err_dev_free;
+	}
+
+	rc = ena_enable_msix_and_set_admin_interrupts(adapter,
+	    adapter->num_queues);
+	if (rc) {
+		device_printf(adapter->pdev, "Enable MSI-X failed\n");
+		goto err_com_free;
+	}
+
+	/* If the interface was up before the reset bring it up */
+	if (dev_up) {
+		rc = ena_up(adapter);
+		if (rc) {
+			device_printf(adapter->pdev,
+			    "Failed to create I/O queues\n");
+			goto err_msix_free;
+		}
+	}
+
+	callout_reset_sbt(&adapter->timer_service, SBT_1S, SBT_1S,
+	    ena_timer_service, (void *)adapter, 0);
+
+	sx_unlock(&adapter->ioctl_sx);
+
+	return;
+
+err_msix_free:
+	ena_com_dev_reset(ena_dev);
+	ena_free_mgmnt_irq(adapter);
+	ena_disable_msix(adapter);
+err_com_free:
+	ena_com_admin_destroy(ena_dev);
+err_dev_free:
+	device_printf(adapter->pdev, "ENA reset failed!\n");
+	adapter->running = false;
+	sx_unlock(&adapter->ioctl_sx);
+}
+
+/**
+ * ena_attach - Device Initialization Routine
+ * @pdev: device information struct
+ *
+ * Returns 0 on success, otherwise on failure.
+ *
+ * ena_attach initializes an adapter identified by a device structure.
+ * The OS initialization, configuring of the adapter private structure,
+ * and a hardware reset occur.
+ **/
+static int
+ena_attach(device_t pdev)
+{
+	struct ena_com_dev_get_features_ctx get_feat_ctx;
+	static int version_printed;
+	struct ena_adapter *adapter;
+	struct ena_com_dev *ena_dev = NULL;
+	uint16_t tx_sgl_size = 0;
+	uint16_t rx_sgl_size = 0;
+	int io_queue_num;
+	int queue_size;
+	int rc;
+	struct sysctl_ctx_list *ctx;
+	struct sysctl_oid_list *children;
+
+	adapter = device_get_softc(pdev);
+	adapter->pdev = pdev;
+	ctx = device_get_sysctl_ctx(pdev);
+	children = SYSCTL_CHILDREN(device_get_sysctl_tree(pdev));
+
+	mtx_init(&adapter->global_mtx, "ENA global mtx", NULL, MTX_DEF);
+	sx_init(&adapter->ioctl_sx, "ENA ioctl sx");
+
+	/* Sysctl calls for Watchdog service */
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO, "wd_active",
+	    CTLFLAG_RWTUN, &adapter->wd_active, 0,
+	    "Watchdog is active");
+
+	SYSCTL_ADD_QUAD(ctx, children, OID_AUTO, "keep_alive_timeout",
+	    CTLFLAG_RWTUN, &adapter->keep_alive_timeout,
+	    "Timeout for Keep Alive messages");
+
+	SYSCTL_ADD_QUAD(ctx, children, OID_AUTO, "missing_tx_timeout",
+	    CTLFLAG_RWTUN, &adapter->missing_tx_timeout,
+	    "Timeout for TX completion");
+
+	SYSCTL_ADD_U32(ctx, children, OID_AUTO, "missing_tx_max_queues",
+	    CTLFLAG_RWTUN, &adapter->missing_tx_max_queues, 0,
+	    "Number of TX queues to check per run");
+
+	SYSCTL_ADD_U32(ctx, children, OID_AUTO, "missing_tx_threshold",
+	    CTLFLAG_RWTUN, &adapter->missing_tx_threshold, 0,
+	    "Max number of timeouted packets");
+
+	/* Set up the timer service */
+	callout_init_mtx(&adapter->timer_service, &adapter->global_mtx, 0);
+	adapter->keep_alive_timeout = DEFAULT_KEEP_ALIVE_TO;
+	adapter->missing_tx_timeout = DEFAULT_TX_CMP_TO;
+	adapter->missing_tx_max_queues = DEFAULT_TX_MONITORED_QUEUES;
+	adapter->missing_tx_threshold = DEFAULT_TX_CMP_THRESHOLD;
+
+	if (version_printed++ == 0)
+		device_printf(pdev, "%s\n", ena_version);
+
+	rc = ena_allocate_pci_resources(adapter);
+	if (rc) {
+		device_printf(pdev, "PCI resource allocation failed!\n");
+		ena_free_pci_resources(adapter);
+		goto err_pci_res;
+	}
+
+	/* Allocate memory for ena_dev structure */
+	ena_dev = ENA_MEM_ALLOC(pdev, sizeof(struct ena_com_dev));
+	if (!ena_dev) {
+		device_printf(pdev, "allocating ena_dev failed\n");
+		rc = ENOMEM;
+		goto err_select_region;
+	}
+
+	adapter->ena_dev = ena_dev;
+	ena_dev->dmadev = pdev;
+	ena_dev->bus = malloc(sizeof(struct ena_bus), M_DEVBUF,
+	    M_WAITOK | M_ZERO);
+
+	/* Store register resources */
+	((struct ena_bus*)(ena_dev->bus))->reg_bar_t =
+	    rman_get_bustag(adapter->registers);
+	((struct ena_bus*)(ena_dev->bus))->reg_bar_h =
+	    rman_get_bushandle(adapter->registers);
+
+	if (((struct ena_bus*)(ena_dev->bus))->reg_bar_h == 0) {
+		device_printf(pdev, "failed to pmap registers bar\n");
+		rc = ENXIO;
+		goto err_dev_free;
+	}
+
+	ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;
+
+	/* Device initialization */
+	rc = ena_device_init(adapter, pdev, &get_feat_ctx, &adapter->wd_active);
+	if (rc) {
+		device_printf(pdev, "ENA device init failed! (err: %d)\n", rc);
+		rc = ENXIO;
+		goto err_bus_free;
+	}
+
+	adapter->keep_alive_timestamp = getsbinuptime();
+
+	adapter->tx_offload_cap = get_feat_ctx.offload.tx;
+
+	/* Set for sure that interface is not up */
+	adapter->up = false;
+
+	memcpy(adapter->mac_addr, get_feat_ctx.dev_attr.mac_addr,
+	    ETHER_ADDR_LEN);
+
+	adapter->small_copy_len =
+	    ENA_DEFAULT_SMALL_PACKET_LEN;
+
+	/* calculate IO queue number to create */
+	io_queue_num = ena_calc_io_queue_num(adapter, &get_feat_ctx);
+
+	ENA_ASSERT(io_queue_num > 0, "Invalid queue number: %d\n",
+	    io_queue_num);
+	adapter->num_queues = io_queue_num;
+
+	/* calculatre ring sizes */
+	queue_size = ena_calc_queue_size(adapter,&tx_sgl_size,
+	    &rx_sgl_size, &get_feat_ctx);
+	if ((queue_size <= 0) || (io_queue_num <= 0)) {
+		rc = ENA_COM_FAULT;
+		goto err_com_free;
+	}
+
+	adapter->tx_ring_size = queue_size;
+	adapter->rx_ring_size = queue_size;
+
+	adapter->max_tx_sgl_size = tx_sgl_size;
+	adapter->max_rx_sgl_size = rx_sgl_size;
+
+	/* set up dma tags for rx and tx buffers */
+	rc = ena_setup_tx_dma_tag(adapter);
+	if (rc)
+		goto dma_tx_err;
+
+	rc = ena_setup_rx_dma_tag(adapter);
+	if (rc)
+		goto dma_rx_err;
+
+	/* initialize rings basic information */
+	device_printf(pdev, "initalize %d io queues\n", io_queue_num);
+	rc = ena_init_io_rings(adapter);
+	if (rc) {
+		device_printf(pdev,"Error with initialization of IO rings\n");
+		goto err_io_init;
+	}
+
+	/* setup network interface */
+	rc = ena_setup_ifnet(pdev, adapter, &get_feat_ctx);
+	if (rc) {
+		device_printf(pdev,"Error with network interface setup\n");
+		goto err_com_free;
+	}
+
+	rc = ena_enable_msix_and_set_admin_interrupts(adapter, io_queue_num);
+	if (rc) {
+		device_printf(pdev,
+		    "Failed to enable and set the admin interrupts\n");
+		goto err_ifp_free;
+	}
+
+	/* Initialize statistics */
+	ena_alloc_counters((counter_u64_t *)&adapter->dev_stats,
+	    sizeof(struct ena_stats_dev));
+	ena_update_stats_counters(adapter);
+	ena_sysctl_add_nodes(adapter);
+
+	/* Tell the stack that the interface is not active */
+	if_setdrvflagbits(adapter->ifp, IFF_DRV_OACTIVE, IFF_DRV_RUNNING);
+
+	/* Initialize reset task queue */
+	TASK_INIT(&adapter->reset_task, 0, ena_reset_task, adapter);
+	adapter->reset_tq = taskqueue_create("ena_reset_enqueue",
+	    M_WAITOK | M_ZERO, taskqueue_thread_enqueue, &adapter->reset_tq);
+	taskqueue_start_threads(&adapter->reset_tq, 1, PI_NET,
+	    "%s rstq", device_get_nameunit(adapter->pdev));
+
+	adapter->running = true;
+	return (0);
+
+err_ifp_free:
+	if_detach(adapter->ifp);
+	if_free(adapter->ifp);
+err_com_free:
+	ena_free_all_io_rings_resources(adapter);
+err_io_init:
+	ena_free_rx_dma_tag(adapter);
+dma_rx_err:
+	ena_free_tx_dma_tag(adapter);
+dma_tx_err:
+	ena_com_admin_destroy(ena_dev);
+	ena_com_delete_host_info(ena_dev);
+err_bus_free:
+	free(ena_dev->bus, M_DEVBUF);
+err_dev_free:
+	free(ena_dev, M_DEVBUF);
+err_select_region:
+	ena_free_pci_resources(adapter);
+err_pci_res:
+	return (rc);
+}
+
+/**
+ * ena_detach - Device Removal Routine
+ * @pdev: device information struct
+ *
+ * ena_detach is called by the device subsystem to alert the driver
+ * that it should release a PCI device.
+ **/
+static int
+ena_detach(device_t pdev)
+{
+	struct ena_adapter *adapter = device_get_softc(pdev);
+	struct ena_com_dev *ena_dev = adapter->ena_dev;
+	int rc;
+
+	/* Make sure VLANS are not using driver */
+	if (adapter->ifp->if_vlantrunk != NULL) {
+		device_printf(adapter->pdev ,"VLAN is in use, detach first\n");
+		return (EBUSY);
+	}
+
+	/* Free reset task and callout */
+	callout_drain(&adapter->timer_service);
+	while (taskqueue_cancel(adapter->reset_tq, &adapter->reset_task, NULL))
+		taskqueue_drain(adapter->reset_tq, &adapter->reset_task);
+	taskqueue_free(adapter->reset_tq);
+
+	ena_down(adapter);
+
+	if (adapter->ifp != NULL) {
+		ether_ifdetach(adapter->ifp);
+		if_free(adapter->ifp);
+	}
+
+	ena_free_all_io_rings_resources(adapter);
+
+	ena_free_counters((counter_u64_t *)&adapter->dev_stats,
+	    sizeof(struct ena_stats_dev));
+
+	if (adapter->rss_support)
+		ena_com_rss_destroy(ena_dev);
+
+	rc = ena_free_rx_dma_tag(adapter);
+	if (rc)
+		device_printf(adapter->pdev,
+		    "Unmapped RX DMA tag associations\n");
+
+	rc = ena_free_tx_dma_tag(adapter);
+	if (rc)
+		device_printf(adapter->pdev,
+		    "Unmapped TX DMA tag associations\n");
+
+	/* Reset the device only if the device is running. */
+	if (adapter->running)
+		ena_com_dev_reset(ena_dev);
+
+	ena_com_delete_host_info(ena_dev);
+
+	ena_com_admin_destroy(ena_dev);
+
+	ena_free_irqs(adapter);
+
+	ena_com_mmio_reg_read_request_destroy(ena_dev);
+
+	ena_free_pci_resources(adapter);
+
+	mtx_destroy(&adapter->global_mtx);
+	sx_destroy(&adapter->ioctl_sx);
+
+	if (ena_dev->bus != NULL)
+		free(ena_dev->bus, M_DEVBUF);
+
+	if (ena_dev != NULL)
+		free(ena_dev, M_DEVBUF);
+
+	return (bus_generic_detach(pdev));
+}
+
+/******************************************************************************
+ ******************************** AENQ Handlers *******************************
+ *****************************************************************************/
+/**
+ * ena_update_on_link_change:
+ * Notify the network interface about the change in link status
+ **/
+static void
+ena_update_on_link_change(void *adapter_data,
+    struct ena_admin_aenq_entry *aenq_e)
+{
+	struct ena_adapter *adapter = (struct ena_adapter *)adapter_data;
+	struct ena_admin_aenq_link_change_desc *aenq_desc;
+	int status;
+	if_t ifp;
+
+	aenq_desc = (struct ena_admin_aenq_link_change_desc *)aenq_e;
+	ifp = adapter->ifp;
+	status = aenq_desc->flags &
+	    ENA_ADMIN_AENQ_LINK_CHANGE_DESC_LINK_STATUS_MASK;
+
+	if (status != 0) {
+		device_printf(adapter->pdev, "link is UP\n");
+		if_link_state_change(ifp, LINK_STATE_UP);
+	} else if (status == 0) {
+		device_printf(adapter->pdev, "link is DOWN\n");
+		if_link_state_change(ifp, LINK_STATE_DOWN);
+	} else {
+		device_printf(adapter->pdev, "invalid value recvd\n");
+		BUG();
+	}
+
+	adapter->link_status = status;
+
+	return;
+}
+
+/**
+ * This handler will called for unknown event group or unimplemented handlers
+ **/
+static void
+unimplemented_aenq_handler(void *data,
+    struct ena_admin_aenq_entry *aenq_e)
+{
+	return;
+}
+
+static struct ena_aenq_handlers aenq_handlers = {
+    .handlers = {
+	    [ENA_ADMIN_LINK_CHANGE] = ena_update_on_link_change,
+	    [ENA_ADMIN_KEEP_ALIVE] = ena_keep_alive_wd,
+    },
+    .unimplemented_handler = unimplemented_aenq_handler
+};
+
+/*********************************************************************
+ *  FreeBSD Device Interface Entry Points
+ *********************************************************************/
+
+static device_method_t ena_methods[] = {
+    /* Device interface */
+    DEVMETHOD(device_probe, ena_probe),
+    DEVMETHOD(device_attach, ena_attach),
+    DEVMETHOD(device_detach, ena_detach),
+    DEVMETHOD_END
+};
+
+static driver_t ena_driver = {
+    "ena", ena_methods, sizeof(struct ena_adapter),
+};
+
+devclass_t ena_devclass;
+DRIVER_MODULE(ena, pci, ena_driver, ena_devclass, 0, 0);
+MODULE_DEPEND(ena, pci, 1, 1, 1);
+MODULE_DEPEND(ena, ether, 1, 1, 1);
+
+/*********************************************************************/

Property changes on: projects/clang500-import/sys/dev/ena/ena.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/sys/dev/ena/ena.h
===================================================================
--- projects/clang500-import/sys/dev/ena/ena.h	(nonexistent)
+++ projects/clang500-import/sys/dev/ena/ena.h	(revision 318658)
@@ -0,0 +1,434 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright (c) 2015-2017 Amazon.com, Inc. or its affiliates.
+ * 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+ * OWNER 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$
+ *
+ */
+
+#ifndef ENA_H
+#define ENA_H
+
+#include <sys/types.h>
+
+#include "ena-com/ena_com.h"
+#include "ena-com/ena_eth_com.h"
+
+#define DRV_MODULE_VER_MAJOR	0
+#define DRV_MODULE_VER_MINOR	7
+#define DRV_MODULE_VER_SUBMINOR 0
+
+#define DRV_MODULE_NAME		"ena"
+
+#ifndef DRV_MODULE_VERSION
+#define DRV_MODULE_VERSION				\
+	__XSTRING(DRV_MODULE_VER_MAJOR) "."		\
+	__XSTRING(DRV_MODULE_VER_MINOR) "."		\
+	__XSTRING(DRV_MODULE_VER_SUBMINOR)
+#endif
+#define DEVICE_NAME	"Elastic Network Adapter (ENA)"
+#define DEVICE_DESC	"ENA adapter"
+
+/* Calculate DMA mask - width for ena cannot exceed 48, so it is safe */
+#define ENA_DMA_BIT_MASK(x)		((1ULL << (x)) - 1ULL)
+
+/* 1 for AENQ + ADMIN */
+#define	ENA_MAX_MSIX_VEC(io_queues)	(1 + (io_queues))
+
+#define	ENA_REG_BAR			0
+#define	ENA_MEM_BAR			2
+
+#define	ENA_BUS_DMA_SEGS		32
+
+#define	ENA_DEFAULT_RING_SIZE		1024
+#define	ENA_DEFAULT_SMALL_PACKET_LEN	128
+#define	ENA_DEFAULT_MAX_RX_BUFF_ALLOC_SIZE	1536
+
+#define	ENA_RX_REFILL_THRESH_DEVIDER	8
+
+#define	ENA_MAX_PUSH_PKT_SIZE		128
+
+#define	ENA_NAME_MAX_LEN		20
+#define	ENA_IRQNAME_SIZE		40
+
+#define	ENA_PKT_MAX_BUFS		19
+#define	ENA_STALL_TIMEOUT		100
+
+#define	ENA_RX_RSS_TABLE_LOG_SIZE	7
+#define	ENA_RX_RSS_TABLE_SIZE		(1 << ENA_RX_RSS_TABLE_LOG_SIZE)
+
+#define	ENA_HASH_KEY_SIZE		40
+
+#define	ENA_DMA_BITS_MASK		40
+#define	ENA_MAX_FRAME_LEN		10000
+#define	ENA_MIN_FRAME_LEN		60
+#define	ENA_RX_HASH_KEY_NUM		10
+#define	ENA_RX_THASH_TABLE_SIZE		(1 << 8)
+
+#define ENA_TX_CLEANUP_TRESHOLD		128
+
+#define DB_THRESHOLD	64
+
+#define TX_COMMIT	32
+ /*
+ * TX budget for cleaning. It should be half of the RX budget to reduce amount
+ *  of TCP retransmissions.
+ */
+#define TX_BUDGET	128
+/* RX cleanup budget. -1 stands for infinity. */
+#define RX_BUDGET	256
+/*
+ * How many times we can repeat cleanup in the io irq handling routine if the
+ * RX or TX budget was depleted.
+ */
+#define CLEAN_BUDGET	8
+
+#define RX_IRQ_INTERVAL 20
+#define TX_IRQ_INTERVAL 50
+
+#define	ENA_MAX_MTU		9216
+#define	ENA_TSO_MAXSIZE		PAGE_SIZE
+#define	ENA_TSO_NSEGS		ENA_PKT_MAX_BUFS
+#define	ENA_RX_OFFSET		NET_SKB_PAD + NET_IP_ALIGN
+
+#define	ENA_MMIO_DISABLE_REG_READ	BIT(0)
+
+#define	ENA_TX_RING_IDX_NEXT(idx, ring_size) (((idx) + 1) & ((ring_size) - 1))
+
+#define	ENA_RX_RING_IDX_NEXT(idx, ring_size) (((idx) + 1) & ((ring_size) - 1))
+#define	ENA_RX_RING_IDX_ADD(idx, n, ring_size)	\
+	(((idx) + (n)) & ((ring_size) - 1))
+
+#define	ENA_IO_TXQ_IDX(q)		(2 * (q))
+#define	ENA_IO_RXQ_IDX(q)		(2 * (q) + 1)
+
+#define	ENA_MGMNT_IRQ_IDX		0
+#define	ENA_IO_IRQ_FIRST_IDX		1
+#define	ENA_IO_IRQ_IDX(q)		(ENA_IO_IRQ_FIRST_IDX + (q))
+
+/*
+ * ENA device should send keep alive msg every 1 sec.
+ * We wait for 6 sec just to be on the safe side.
+ */
+#define DEFAULT_KEEP_ALIVE_TO		(SBT_1S * 6)
+
+/* Time in jiffies before concluding the transmitter is hung. */
+#define DEFAULT_TX_CMP_TO		(SBT_1S * 5)
+
+/* Number of queues to check for missing queues per timer tick */
+#define DEFAULT_TX_MONITORED_QUEUES	(4)
+
+/* Max number of timeouted packets before device reset */
+#define DEFAULT_TX_CMP_THRESHOLD	(128)
+
+/*
+ * Supported PCI vendor and devices IDs
+ */
+#define	PCI_VENDOR_ID_AMAZON	0x1d0f
+
+#define	PCI_DEV_ID_ENA_PF	0x0ec2
+#define	PCI_DEV_ID_ENA_LLQ_PF	0x1ec2
+#define	PCI_DEV_ID_ENA_VF	0xec20
+#define	PCI_DEV_ID_ENA_LLQ_VF	0xec21
+
+struct msix_entry {
+	int entry;
+	int vector;
+};
+
+typedef struct _ena_vendor_info_t {
+	unsigned int vendor_id;
+	unsigned int device_id;
+	unsigned int index;
+} ena_vendor_info_t;
+
+struct ena_irq {
+	/* Interrupt resources */
+	struct resource *res;
+	driver_intr_t *handler;
+	void *data;
+	void *cookie;
+	unsigned int vector;
+	bool requested;
+	int cpu;
+	char name[ENA_IRQNAME_SIZE];
+};
+
+struct ena_que {
+	struct ena_adapter *adapter;
+	struct ena_ring *tx_ring;
+	struct ena_ring *rx_ring;
+	uint32_t id;
+	int cpu;
+};
+
+struct ena_tx_buffer {
+	struct mbuf *mbuf;
+	/* # of ena desc for this specific mbuf
+	 * (includes data desc and metadata desc) */
+	unsigned int tx_descs;
+	/* # of buffers used by this mbuf */
+	unsigned int num_of_bufs;
+	bus_dmamap_t map;
+
+	/* Used to detect missing tx packets */
+	struct bintime timestamp;
+	bool print_once;
+
+	struct ena_com_buf bufs[ENA_PKT_MAX_BUFS];
+} __aligned(CACHE_LINE_SIZE);
+
+struct ena_rx_buffer {
+	struct mbuf *mbuf;
+	bus_dmamap_t map;
+	struct ena_com_buf ena_buf;
+} __aligned(CACHE_LINE_SIZE);
+
+
+struct ena_stats_tx {
+	counter_u64_t cnt;
+	counter_u64_t bytes;
+	counter_u64_t queue_stop;
+	counter_u64_t prepare_ctx_err;
+	counter_u64_t queue_wakeup;
+	counter_u64_t dma_mapping_err;
+	/* Not counted */
+	counter_u64_t unsupported_desc_num;
+	/* Not counted */
+	counter_u64_t napi_comp;
+	/* Not counted */
+	counter_u64_t tx_poll;
+	counter_u64_t doorbells;
+	counter_u64_t missing_tx_comp;
+	counter_u64_t bad_req_id;
+};
+
+struct ena_stats_rx {
+	counter_u64_t cnt;
+	counter_u64_t bytes;
+	counter_u64_t refil_partial;
+	counter_u64_t bad_csum;
+	/* Not counted */
+	counter_u64_t page_alloc_fail;
+	counter_u64_t mbuf_alloc_fail;
+	counter_u64_t dma_mapping_err;
+	counter_u64_t bad_desc_num;
+	/* Not counted */
+	counter_u64_t small_copy_len_pkt;
+};
+
+
+struct ena_ring {
+	/* Holds the empty requests for TX out of order completions */
+	uint16_t *free_tx_ids;
+	struct ena_com_dev *ena_dev;
+	struct ena_adapter *adapter;
+	struct ena_com_io_cq *ena_com_io_cq;
+	struct ena_com_io_sq *ena_com_io_sq;
+
+	/* The maximum length the driver can push to the device (For LLQ) */
+	enum ena_admin_placement_policy_type tx_mem_queue_type;
+	uint16_t rx_small_copy_len;
+	uint16_t qid;
+	uint16_t mtu;
+	uint8_t tx_max_header_size;
+
+	struct ena_com_rx_buf_info ena_bufs[ENA_PKT_MAX_BUFS];
+	uint32_t  smoothed_interval;
+	enum ena_intr_moder_level moder_tbl_idx;
+
+	struct ena_que *que;
+	struct lro_ctrl lro;
+
+	uint16_t next_to_use;
+	uint16_t next_to_clean;
+
+	union {
+		struct ena_tx_buffer *tx_buffer_info; /* contex of tx packet */
+		struct ena_rx_buffer *rx_buffer_info; /* contex of rx packet */
+	};
+	int ring_size; /* number of tx/rx_buffer_info's entries */
+
+	struct buf_ring *br; /* only for TX */
+	struct mtx ring_mtx;
+	char mtx_name[16];
+	struct task enqueue_task;
+	struct taskqueue *enqueue_tq;
+	struct task cmpl_task;
+	struct taskqueue *cmpl_tq;
+
+	union {
+		struct ena_stats_tx tx_stats;
+		struct ena_stats_rx rx_stats;
+	};
+
+} __aligned(CACHE_LINE_SIZE);
+
+struct ena_stats_dev {
+	/* Not counted */
+	counter_u64_t tx_timeout;
+	/* Not counted */
+	counter_u64_t io_suspend;
+	/* Not counted */
+	counter_u64_t io_resume;
+	/* Not counted */
+	counter_u64_t wd_expired;
+	counter_u64_t interface_up;
+	counter_u64_t interface_down;
+	/* Not counted */
+	counter_u64_t admin_q_pause;
+};
+
+struct ena_hw_stats {
+	uint64_t rx_packets;
+	uint64_t tx_packets;
+
+	uint64_t rx_bytes;
+	uint64_t tx_bytes;
+
+	uint64_t rx_drops;
+};
+
+/* Board specific private data structure */
+struct ena_adapter {
+	struct ena_com_dev *ena_dev;
+
+	/* OS defined structs */
+	if_t ifp;
+	device_t pdev;
+	struct ifmedia	media;
+
+	/* OS resources */
+	struct resource * memory;
+	struct resource * registers;
+
+	struct mtx global_mtx;
+	struct sx ioctl_sx;
+
+	/* MSI-X */
+	uint32_t msix_enabled;
+	struct msix_entry *msix_entries;
+	int msix_vecs;
+
+	/* DMA tags used throughout the driver adapter for Tx and Rx */
+	bus_dma_tag_t tx_buf_tag;
+	bus_dma_tag_t rx_buf_tag;
+	int dma_width;
+	/*
+	 * RX packets that shorter that this len will be copied to the skb
+	 * header
+	 */
+	unsigned int small_copy_len;
+
+	uint16_t max_tx_sgl_size;
+	uint16_t max_rx_sgl_size;
+
+	uint32_t tx_offload_cap;
+
+	/* Tx fast path data */
+	int num_queues;
+
+	unsigned int tx_usecs, rx_usecs; /* Interrupt coalescing */
+
+	unsigned int tx_ring_size;
+	unsigned int rx_ring_size;
+
+	/* RSS*/
+	uint8_t	 rss_ind_tbl[ENA_RX_RSS_TABLE_SIZE];
+	bool rss_support;
+
+	uint32_t msg_enable;
+
+	uint8_t mac_addr[ETHER_ADDR_LEN];
+	/* mdio and phy*/
+
+	char name[ENA_NAME_MAX_LEN];
+	bool link_status;
+	bool trigger_reset;
+	bool up;
+	bool running;
+
+	uint32_t wol;
+
+	/* Queue will represent one TX and one RX ring */
+	struct ena_que que[ENA_MAX_NUM_IO_QUEUES]
+	    __aligned(CACHE_LINE_SIZE);
+
+	/* TX */
+	struct ena_ring tx_ring[ENA_MAX_NUM_IO_QUEUES]
+	    __aligned(CACHE_LINE_SIZE);
+
+	/* RX */
+	struct ena_ring rx_ring[ENA_MAX_NUM_IO_QUEUES]
+	    __aligned(CACHE_LINE_SIZE);
+
+	struct ena_irq irq_tbl[ENA_MAX_MSIX_VEC(ENA_MAX_NUM_IO_QUEUES)];
+
+	/* Timer service */
+	struct callout timer_service;
+	sbintime_t keep_alive_timestamp;
+	uint32_t next_monitored_tx_qid;
+	struct task reset_task;
+	struct taskqueue *reset_tq;
+	int wd_active;
+	sbintime_t keep_alive_timeout;
+	sbintime_t missing_tx_timeout;
+	uint32_t missing_tx_max_queues;
+	uint32_t missing_tx_threshold;
+
+	/* Statistics */
+	struct ena_stats_dev dev_stats;
+	struct ena_hw_stats hw_stats;
+};
+
+
+#define	ENA_DEV_LOCK			mtx_lock(&adapter->global_mtx)
+#define	ENA_DEV_UNLOCK			mtx_unlock(&adapter->global_mtx)
+
+#define	ENA_RING_MTX_LOCK(_ring)		mtx_lock(&(_ring)->ring_mtx)
+#define	ENA_RING_MTX_TRYLOCK(_ring)		mtx_trylock(&(_ring)->ring_mtx)
+#define	ENA_RING_MTX_UNLOCK(_ring)		mtx_unlock(&(_ring)->ring_mtx)
+
+struct ena_dev *ena_efa_enadev_get(device_t pdev);
+
+int ena_register_adapter(struct ena_adapter *adapter);
+void ena_unregister_adapter(struct ena_adapter *adapter);
+
+int ena_update_stats_counters(struct ena_adapter *adapter);
+
+static inline int ena_mbuf_count(struct mbuf *mbuf)
+{
+	int count = 1;
+
+	while ((mbuf = mbuf->m_next) != NULL)
+		++count;
+
+	return count;
+}
+
+#endif /* !(ENA_H) */

Property changes on: projects/clang500-import/sys/dev/ena/ena.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/sys/dev/ena/ena_sysctl.c
===================================================================
--- projects/clang500-import/sys/dev/ena/ena_sysctl.c	(nonexistent)
+++ projects/clang500-import/sys/dev/ena/ena_sysctl.c	(revision 318658)
@@ -0,0 +1,243 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright (c) 2015-2017 Amazon.com, Inc. or its affiliates.
+ * 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+ * OWNER 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 "ena_sysctl.h"
+
+static int	ena_sysctl_update_stats(SYSCTL_HANDLER_ARGS);
+static void	ena_sysctl_add_stats(struct ena_adapter *);
+
+void
+ena_sysctl_add_nodes(struct ena_adapter *adapter)
+{
+	ena_sysctl_add_stats(adapter);
+}
+
+static void
+ena_sysctl_add_stats(struct ena_adapter *adapter)
+{
+	device_t dev;
+
+	struct ena_ring *tx_ring;
+	struct ena_ring *rx_ring;
+
+	struct ena_hw_stats *hw_stats;
+	struct ena_stats_dev *dev_stats;
+	struct ena_stats_tx *tx_stats;
+	struct ena_stats_rx *rx_stats;
+	struct ena_com_stats_admin *admin_stats;
+
+	struct sysctl_ctx_list *ctx;
+	struct sysctl_oid *tree;
+	struct sysctl_oid_list *child;
+
+	struct sysctl_oid *queue_node, *tx_node, *rx_node, *hw_node;
+	struct sysctl_oid *admin_node;
+	struct sysctl_oid_list *queue_list, *tx_list, *rx_list, *hw_list;
+	struct sysctl_oid_list *admin_list;
+
+#define QUEUE_NAME_LEN 32
+	char namebuf[QUEUE_NAME_LEN];
+	int i;
+
+	dev = adapter->pdev;
+
+	ctx = device_get_sysctl_ctx(dev);
+	tree = device_get_sysctl_tree(dev);
+	child = SYSCTL_CHILDREN(tree);
+
+	tx_ring = adapter->tx_ring;
+	rx_ring = adapter->rx_ring;
+
+	hw_stats = &adapter->hw_stats;
+	dev_stats = &adapter->dev_stats;
+	admin_stats = &adapter->ena_dev->admin_queue.stats;
+
+	SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "tx_timeout",
+	    CTLFLAG_RD, &dev_stats->tx_timeout,
+	    "Driver TX timeouts");
+	SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "io_suspend",
+	    CTLFLAG_RD, &dev_stats->io_suspend,
+	    "IO queue suspends");
+	SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "io_resume",
+	    CTLFLAG_RD, &dev_stats->io_resume,
+	    "IO queue resumes");
+	SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "wd_expired",
+	    CTLFLAG_RD, &dev_stats->wd_expired,
+	    "Watchdog expiry count");
+	SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "interface_up",
+	    CTLFLAG_RD, &dev_stats->interface_up,
+	    "Network interface up count");
+	SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "interface_down",
+	    CTLFLAG_RD, &dev_stats->interface_down,
+	    "Network interface down count");
+	SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "admin_q_pause",
+	    CTLFLAG_RD, &dev_stats->admin_q_pause,
+	    "Admin queue pauses");
+
+	for (i = 0; i < adapter->num_queues; ++i, ++tx_ring, ++rx_ring) {
+		snprintf(namebuf, QUEUE_NAME_LEN, "queue%d", i);
+
+		queue_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO,
+		    namebuf, CTLFLAG_RD, NULL, "Queue Name");
+		queue_list = SYSCTL_CHILDREN(queue_node);
+
+		/* TX specific stats */
+		tx_node = SYSCTL_ADD_NODE(ctx, queue_list, OID_AUTO,
+		    "tx_ring", CTLFLAG_RD, NULL, "TX ring");
+		tx_list = SYSCTL_CHILDREN(tx_node);
+
+		tx_stats = &tx_ring->tx_stats;
+
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "count", CTLFLAG_RD,
+		    &tx_stats->cnt, "Packets sent");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "bytes", CTLFLAG_RD,
+		    &tx_stats->bytes, "Bytes sent");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "prepare_ctx_err", CTLFLAG_RD,
+		    &tx_stats->prepare_ctx_err,
+		    "TX buffer preparation failures");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "queue_wakeup", CTLFLAG_RD,
+		    &tx_stats->queue_wakeup, "Queue wakeups");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "dma_mapping_err", CTLFLAG_RD,
+		    &tx_stats->dma_mapping_err, "DMA mapping failures");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "unsupported_desc_num", CTLFLAG_RD,
+		    &tx_stats->unsupported_desc_num,
+		    "Excessive descriptor packet discards");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "napi_comp", CTLFLAG_RD,
+		    &tx_stats->napi_comp, "Napi completions");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "tx_poll", CTLFLAG_RD,
+		    &tx_stats->tx_poll, "TX poll count");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "doorbells", CTLFLAG_RD,
+		    &tx_stats->doorbells, "Queue doorbells");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "missing_tx_comp", CTLFLAG_RD,
+		    &tx_stats->missing_tx_comp, "TX completions missed");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "bad_req_id", CTLFLAG_RD,
+		    &tx_stats->bad_req_id, "Bad request id count");
+		SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
+		    "stops", CTLFLAG_RD,
+		    &tx_stats->queue_stop, "Queue stops");
+
+		/* RX specific stats */
+		rx_node = SYSCTL_ADD_NODE(ctx, queue_list, OID_AUTO,
+		    "rx_ring", CTLFLAG_RD, NULL, "RX ring");
+		rx_list = SYSCTL_CHILDREN(rx_node);
+
+		rx_stats = &rx_ring->rx_stats;
+
+		SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+		    "count", CTLFLAG_RD,
+		    &rx_stats->cnt, "Packets received");
+		SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+		    "bytes", CTLFLAG_RD,
+		    &rx_stats->bytes, "Bytes received");
+		SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+		    "refil_partial", CTLFLAG_RD,
+		    &rx_stats->refil_partial, "Partial refilled mbufs");
+		SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+		    "bad_csum", CTLFLAG_RD,
+		    &rx_stats->bad_csum, "Bad RX checksum");
+		SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+		    "page_alloc_fail", CTLFLAG_RD,
+		    &rx_stats->page_alloc_fail, "Failed page allocs");
+		SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+		    "mbuf_alloc_fail", CTLFLAG_RD,
+		    &rx_stats->mbuf_alloc_fail, "Failed mbuf allocs");
+		SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+		    "dma_mapping_err", CTLFLAG_RD,
+		    &rx_stats->dma_mapping_err, "DMA mapping errors");
+		SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+		    "bad_desc_num", CTLFLAG_RD,
+		    &rx_stats->bad_desc_num, "Bad descriptor count");
+		SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+		    "small_copy_len_pkt", CTLFLAG_RD,
+		    &rx_stats->small_copy_len_pkt, "Small copy packet count");
+	}
+
+	/* Stats read from device */
+	hw_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "hw_stats",
+	    CTLFLAG_RD, NULL, "Statistics from hardware");
+	hw_list = SYSCTL_CHILDREN(hw_node);
+
+	SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "rx_packets", CTLFLAG_RD,
+	    &hw_stats->rx_packets, 0, "Packets received");
+	SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "tx_packets", CTLFLAG_RD,
+	    &hw_stats->tx_packets, 0, "Packets transmitted");
+	SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "rx_bytes", CTLFLAG_RD,
+	    &hw_stats->rx_bytes, 0, "Bytes received");
+	SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "tx_bytes", CTLFLAG_RD,
+	    &hw_stats->tx_bytes, 0, "Bytes transmitted");
+	SYSCTL_ADD_U64(ctx, hw_list, OID_AUTO, "rx_drops", CTLFLAG_RD,
+	    &hw_stats->rx_drops, 0, "Receive packet drops");
+
+	SYSCTL_ADD_PROC(ctx, hw_list, OID_AUTO, "update_stats",
+	    CTLTYPE_INT|CTLFLAG_RD, adapter, 0, ena_sysctl_update_stats,
+	    "A", "Update stats from hardware");
+	/* ENA Admin queue stats */
+	admin_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "admin_stats",
+	    CTLFLAG_RD, NULL, "ENA Admin Queue statistics");
+	admin_list = SYSCTL_CHILDREN(admin_node);
+
+	SYSCTL_ADD_U32(ctx, admin_list, OID_AUTO, "aborted_cmd", CTLFLAG_RD,
+	    &admin_stats->aborted_cmd, 0, "Aborted commands");
+	SYSCTL_ADD_U32(ctx, admin_list, OID_AUTO, "sumbitted_cmd", CTLFLAG_RD,
+	    &admin_stats->submitted_cmd, 0, "Submitted commands");
+	SYSCTL_ADD_U32(ctx, admin_list, OID_AUTO, "completed_cmd", CTLFLAG_RD,
+	    &admin_stats->completed_cmd, 0, "Completed commands");
+	SYSCTL_ADD_U32(ctx, admin_list, OID_AUTO, "out_of_space", CTLFLAG_RD,
+	    &admin_stats->out_of_space, 0, "Queue out of space");
+	SYSCTL_ADD_U32(ctx, admin_list, OID_AUTO, "no_completion", CTLFLAG_RD,
+	    &admin_stats->no_completion, 0, "Commands not completed");
+}
+
+static int
+ena_sysctl_update_stats(SYSCTL_HANDLER_ARGS)
+{
+	struct ena_adapter *adapter = (struct ena_adapter *)arg1;
+	int rc;
+
+	if (adapter->up)
+		ena_update_stats_counters(adapter);
+
+	rc = sysctl_handle_string(oidp, "", 1, req);
+	return (rc);
+}
+

Property changes on: projects/clang500-import/sys/dev/ena/ena_sysctl.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/sys/dev/ena/ena_sysctl.h
===================================================================
--- projects/clang500-import/sys/dev/ena/ena_sysctl.h	(nonexistent)
+++ projects/clang500-import/sys/dev/ena/ena_sysctl.h	(revision 318658)
@@ -0,0 +1,44 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright (c) 2015-2017 Amazon.com, Inc. or its affiliates.
+ * 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+ * OWNER 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$
+ *
+ */
+
+#ifndef ENA_SYSCTL_H
+#define ENA_SYSCTL_H
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+#include "ena.h"
+
+void	ena_sysctl_add_nodes(struct ena_adapter *);
+
+#endif /* !(ENA_SYSCTL_H) */

Property changes on: projects/clang500-import/sys/dev/ena/ena_sysctl.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/sys/dev/xen/netfront/netfront.c
===================================================================
--- projects/clang500-import/sys/dev/xen/netfront/netfront.c	(revision 318657)
+++ projects/clang500-import/sys/dev/xen/netfront/netfront.c	(revision 318658)
@@ -1,2338 +1,2336 @@
 /*-
  * Copyright (c) 2004-2006 Kip Macy
  * Copyright (c) 2015 Wei Liu <wei.liu2@citrix.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.
  *
  * 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"
 
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/limits.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_media.h>
 #include <net/bpf.h>
 #include <net/if_types.h>
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_lro.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <sys/bus.h>
 
 #include <xen/xen-os.h>
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
 #include <xen/gnttab.h>
 #include <xen/interface/memory.h>
 #include <xen/interface/io/netif.h>
 #include <xen/xenbus/xenbusvar.h>
 
 #include "xenbus_if.h"
 
 /* Features supported by all backends.  TSO and LRO can be negotiated */
 #define XN_CSUM_FEATURES	(CSUM_TCP | CSUM_UDP)
 
 #define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE)
 #define NET_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE)
 
 #define NET_RX_SLOTS_MIN (XEN_NETIF_NR_SLOTS_MIN + 1)
 
 /*
  * Should the driver do LRO on the RX end
  *  this can be toggled on the fly, but the
  *  interface must be reset (down/up) for it
  *  to take effect.
  */
 static int xn_enable_lro = 1;
 TUNABLE_INT("hw.xn.enable_lro", &xn_enable_lro);
 
 /*
  * Number of pairs of queues.
  */
 static unsigned long xn_num_queues = 4;
 TUNABLE_ULONG("hw.xn.num_queues", &xn_num_queues);
 
 /**
  * \brief The maximum allowed data fragments in a single transmit
  *        request.
  *
  * This limit is imposed by the backend driver.  We assume here that
  * we are dealing with a Linux driver domain and have set our limit
  * to mirror the Linux MAX_SKB_FRAGS constant.
  */
 #define	MAX_TX_REQ_FRAGS (65536 / PAGE_SIZE + 2)
 
 #define RX_COPY_THRESHOLD 256
 
 #define net_ratelimit() 0
 
 struct netfront_rxq;
 struct netfront_txq;
 struct netfront_info;
 struct netfront_rx_info;
 
 static void xn_txeof(struct netfront_txq *);
 static void xn_rxeof(struct netfront_rxq *);
 static void xn_alloc_rx_buffers(struct netfront_rxq *);
 static void xn_alloc_rx_buffers_callout(void *arg);
 
 static void xn_release_rx_bufs(struct netfront_rxq *);
 static void xn_release_tx_bufs(struct netfront_txq *);
 
 static void xn_rxq_intr(struct netfront_rxq *);
 static void xn_txq_intr(struct netfront_txq *);
 static void xn_intr(void *);
 static inline int xn_count_frags(struct mbuf *m);
 static int xn_assemble_tx_request(struct netfront_txq *, struct mbuf *);
 static int xn_ioctl(struct ifnet *, u_long, caddr_t);
 static void xn_ifinit_locked(struct netfront_info *);
 static void xn_ifinit(void *);
 static void xn_stop(struct netfront_info *);
 static void xn_query_features(struct netfront_info *np);
 static int xn_configure_features(struct netfront_info *np);
 static void netif_free(struct netfront_info *info);
 static int netfront_detach(device_t dev);
 
 static int xn_txq_mq_start_locked(struct netfront_txq *, struct mbuf *);
 static int xn_txq_mq_start(struct ifnet *, struct mbuf *);
 
 static int talk_to_backend(device_t dev, struct netfront_info *info);
 static int create_netdev(device_t dev);
 static void netif_disconnect_backend(struct netfront_info *info);
 static int setup_device(device_t dev, struct netfront_info *info,
     unsigned long);
 static int xn_ifmedia_upd(struct ifnet *ifp);
 static void xn_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr);
 
 static int xn_connect(struct netfront_info *);
 static void xn_kick_rings(struct netfront_info *);
 
 static int xn_get_responses(struct netfront_rxq *,
     struct netfront_rx_info *, RING_IDX, RING_IDX *,
     struct mbuf **);
 
 #define virt_to_mfn(x) (vtophys(x) >> PAGE_SHIFT)
 
 #define INVALID_P2M_ENTRY (~0UL)
 #define XN_QUEUE_NAME_LEN  8	/* xn{t,r}x_%u, allow for two digits */
 struct netfront_rxq {
 	struct netfront_info 	*info;
 	u_int			id;
 	char			name[XN_QUEUE_NAME_LEN];
 	struct mtx		lock;
 
 	int			ring_ref;
 	netif_rx_front_ring_t 	ring;
 	xen_intr_handle_t	xen_intr_handle;
 
 	grant_ref_t 		gref_head;
 	grant_ref_t 		grant_ref[NET_RX_RING_SIZE + 1];
 
 	struct mbuf		*mbufs[NET_RX_RING_SIZE + 1];
 
 	struct lro_ctrl		lro;
 
 	struct callout		rx_refill;
 };
 
 struct netfront_txq {
 	struct netfront_info 	*info;
 	u_int 			id;
 	char			name[XN_QUEUE_NAME_LEN];
 	struct mtx		lock;
 
 	int			ring_ref;
 	netif_tx_front_ring_t	ring;
 	xen_intr_handle_t 	xen_intr_handle;
 
 	grant_ref_t		gref_head;
 	grant_ref_t		grant_ref[NET_TX_RING_SIZE + 1];
 
 	struct mbuf		*mbufs[NET_TX_RING_SIZE + 1];
 	int			mbufs_cnt;
 	struct buf_ring		*br;
 
 	struct taskqueue 	*tq;
 	struct task       	defrtask;
 
 	bool			full;
 };
 
 struct netfront_info {
 	struct ifnet 		*xn_ifp;
 
 	struct mtx   		sc_lock;
 
 	u_int  num_queues;
 	struct netfront_rxq 	*rxq;
 	struct netfront_txq 	*txq;
 
 	u_int			carrier;
 	u_int			maxfrags;
 
 	device_t		xbdev;
 	uint8_t			mac[ETHER_ADDR_LEN];
 
 	int			xn_if_flags;
 
 	struct ifmedia		sc_media;
 
 	bool			xn_reset;
 };
 
 struct netfront_rx_info {
 	struct netif_rx_response rx;
 	struct netif_extra_info extras[XEN_NETIF_EXTRA_TYPE_MAX - 1];
 };
 
 #define XN_RX_LOCK(_q)         mtx_lock(&(_q)->lock)
 #define XN_RX_UNLOCK(_q)       mtx_unlock(&(_q)->lock)
 
 #define XN_TX_LOCK(_q)         mtx_lock(&(_q)->lock)
 #define XN_TX_TRYLOCK(_q)      mtx_trylock(&(_q)->lock)
 #define XN_TX_UNLOCK(_q)       mtx_unlock(&(_q)->lock)
 
 #define XN_LOCK(_sc)           mtx_lock(&(_sc)->sc_lock);
 #define XN_UNLOCK(_sc)         mtx_unlock(&(_sc)->sc_lock);
 
 #define XN_LOCK_ASSERT(_sc)    mtx_assert(&(_sc)->sc_lock, MA_OWNED);
 #define XN_RX_LOCK_ASSERT(_q)  mtx_assert(&(_q)->lock, MA_OWNED);
 #define XN_TX_LOCK_ASSERT(_q)  mtx_assert(&(_q)->lock, MA_OWNED);
 
 #define netfront_carrier_on(netif)	((netif)->carrier = 1)
 #define netfront_carrier_off(netif)	((netif)->carrier = 0)
 #define netfront_carrier_ok(netif)	((netif)->carrier)
 
 /* Access macros for acquiring freeing slots in xn_free_{tx,rx}_idxs[]. */
 
 static inline void
 add_id_to_freelist(struct mbuf **list, uintptr_t id)
 {
 
 	KASSERT(id != 0,
 		("%s: the head item (0) must always be free.", __func__));
 	list[id] = list[0];
 	list[0]  = (struct mbuf *)id;
 }
 
 static inline unsigned short
 get_id_from_freelist(struct mbuf **list)
 {
 	uintptr_t id;
 
 	id = (uintptr_t)list[0];
 	KASSERT(id != 0,
 		("%s: the head item (0) must always remain free.", __func__));
 	list[0] = list[id];
 	return (id);
 }
 
 static inline int
 xn_rxidx(RING_IDX idx)
 {
 
 	return idx & (NET_RX_RING_SIZE - 1);
 }
 
 static inline struct mbuf *
 xn_get_rx_mbuf(struct netfront_rxq *rxq, RING_IDX ri)
 {
 	int i;
 	struct mbuf *m;
 
 	i = xn_rxidx(ri);
 	m = rxq->mbufs[i];
 	rxq->mbufs[i] = NULL;
 	return (m);
 }
 
 static inline grant_ref_t
 xn_get_rx_ref(struct netfront_rxq *rxq, RING_IDX ri)
 {
 	int i = xn_rxidx(ri);
 	grant_ref_t ref = rxq->grant_ref[i];
 
 	KASSERT(ref != GRANT_REF_INVALID, ("Invalid grant reference!\n"));
 	rxq->grant_ref[i] = GRANT_REF_INVALID;
 	return (ref);
 }
 
 #define IPRINTK(fmt, args...) \
     printf("[XEN] " fmt, ##args)
 #ifdef INVARIANTS
 #define WPRINTK(fmt, args...) \
     printf("[XEN] " fmt, ##args)
 #else
 #define WPRINTK(fmt, args...)
 #endif
 #ifdef DEBUG
 #define DPRINTK(fmt, args...) \
     printf("[XEN] %s: " fmt, __func__, ##args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
 
 /**
  * Read the 'mac' node at the given device's node in the store, and parse that
  * as colon-separated octets, placing result the given mac array.  mac must be
  * a preallocated array of length ETH_ALEN (as declared in linux/if_ether.h).
  * Return 0 on success, or errno on error.
  */
 static int
 xen_net_read_mac(device_t dev, uint8_t mac[])
 {
 	int error, i;
 	char *s, *e, *macstr;
 	const char *path;
 
 	path = xenbus_get_node(dev);
 	error = xs_read(XST_NIL, path, "mac", NULL, (void **) &macstr);
 	if (error == ENOENT) {
 		/*
 		 * Deal with missing mac XenStore nodes on devices with
 		 * HVM emulation (the 'ioemu' configuration attribute)
 		 * enabled.
 		 *
 		 * The HVM emulator may execute in a stub device model
 		 * domain which lacks the permission, only given to Dom0,
 		 * to update the guest's XenStore tree.  For this reason,
 		 * the HVM emulator doesn't even attempt to write the
 		 * front-side mac node, even when operating in Dom0.
 		 * However, there should always be a mac listed in the
 		 * backend tree.  Fallback to this version if our query
 		 * of the front side XenStore location doesn't find
 		 * anything.
 		 */
 		path = xenbus_get_otherend_path(dev);
 		error = xs_read(XST_NIL, path, "mac", NULL, (void **) &macstr);
 	}
 	if (error != 0) {
 		xenbus_dev_fatal(dev, error, "parsing %s/mac", path);
 		return (error);
 	}
 
 	s = macstr;
 	for (i = 0; i < ETHER_ADDR_LEN; i++) {
 		mac[i] = strtoul(s, &e, 16);
 		if (s == e || (e[0] != ':' && e[0] != 0)) {
 			free(macstr, M_XENBUS);
 			return (ENOENT);
 		}
 		s = &e[1];
 	}
 	free(macstr, M_XENBUS);
 	return (0);
 }
 
 /**
  * Entry point to this code when a new device is created.  Allocate the basic
  * structures and the ring buffers for communication with the backend, and
  * inform the backend of the appropriate details for those.  Switch to
  * Connected state.
  */
 static int
 netfront_probe(device_t dev)
 {
 
 	if (xen_hvm_domain() && xen_disable_pv_nics != 0)
 		return (ENXIO);
 
 	if (!strcmp(xenbus_get_type(dev), "vif")) {
 		device_set_desc(dev, "Virtual Network Interface");
 		return (0);
 	}
 
 	return (ENXIO);
 }
 
 static int
 netfront_attach(device_t dev)
 {
 	int err;
 
 	err = create_netdev(dev);
 	if (err != 0) {
 		xenbus_dev_fatal(dev, err, "creating netdev");
 		return (err);
 	}
 
 	SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
 	    OID_AUTO, "enable_lro", CTLFLAG_RW,
 	    &xn_enable_lro, 0, "Large Receive Offload");
 
 	SYSCTL_ADD_ULONG(device_get_sysctl_ctx(dev),
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
 	    OID_AUTO, "num_queues", CTLFLAG_RD,
 	    &xn_num_queues, "Number of pairs of queues");
 
 	return (0);
 }
 
 static int
 netfront_suspend(device_t dev)
 {
 	struct netfront_info *np = device_get_softc(dev);
 	u_int i;
 
 	for (i = 0; i < np->num_queues; i++) {
 		XN_RX_LOCK(&np->rxq[i]);
 		XN_TX_LOCK(&np->txq[i]);
 	}
 	netfront_carrier_off(np);
 	for (i = 0; i < np->num_queues; i++) {
 		XN_RX_UNLOCK(&np->rxq[i]);
 		XN_TX_UNLOCK(&np->txq[i]);
 	}
 	return (0);
 }
 
 /**
  * We are reconnecting to the backend, due to a suspend/resume, or a backend
  * driver restart.  We tear down our netif structure and recreate it, but
  * leave the device-layer structures intact so that this is transparent to the
  * rest of the kernel.
  */
 static int
 netfront_resume(device_t dev)
 {
 	struct netfront_info *info = device_get_softc(dev);
 	u_int i;
 
 	if (xen_suspend_cancelled) {
 		for (i = 0; i < info->num_queues; i++) {
 			XN_RX_LOCK(&info->rxq[i]);
 			XN_TX_LOCK(&info->txq[i]);
 		}
 		netfront_carrier_on(info);
 		for (i = 0; i < info->num_queues; i++) {
 			XN_RX_UNLOCK(&info->rxq[i]);
 			XN_TX_UNLOCK(&info->txq[i]);
 		}
 		return (0);
 	}
 
 	netif_disconnect_backend(info);
 	return (0);
 }
 
 static int
 write_queue_xenstore_keys(device_t dev,
     struct netfront_rxq *rxq,
     struct netfront_txq *txq,
     struct xs_transaction *xst, bool hierarchy)
 {
 	int err;
 	const char *message;
 	const char *node = xenbus_get_node(dev);
 	char *path;
 	size_t path_size;
 
 	KASSERT(rxq->id == txq->id, ("Mismatch between RX and TX queue ids"));
 	/* Split event channel support is not yet there. */
 	KASSERT(rxq->xen_intr_handle == txq->xen_intr_handle,
 	    ("Split event channels are not supported"));
 
 	if (hierarchy) {
 		path_size = strlen(node) + 10;
 		path = malloc(path_size, M_DEVBUF, M_WAITOK|M_ZERO);
 		snprintf(path, path_size, "%s/queue-%u", node, rxq->id);
 	} else {
 		path_size = strlen(node) + 1;
 		path = malloc(path_size, M_DEVBUF, M_WAITOK|M_ZERO);
 		snprintf(path, path_size, "%s", node);
 	}
 
 	err = xs_printf(*xst, path, "tx-ring-ref","%u", txq->ring_ref);
 	if (err != 0) {
 		message = "writing tx ring-ref";
 		goto error;
 	}
 	err = xs_printf(*xst, path, "rx-ring-ref","%u", rxq->ring_ref);
 	if (err != 0) {
 		message = "writing rx ring-ref";
 		goto error;
 	}
 	err = xs_printf(*xst, path, "event-channel", "%u",
 	    xen_intr_port(rxq->xen_intr_handle));
 	if (err != 0) {
 		message = "writing event-channel";
 		goto error;
 	}
 
 	free(path, M_DEVBUF);
 
 	return (0);
 
 error:
 	free(path, M_DEVBUF);
 	xenbus_dev_fatal(dev, err, "%s", message);
 
 	return (err);
 }
 
 /* Common code used when first setting up, and when resuming. */
 static int
 talk_to_backend(device_t dev, struct netfront_info *info)
 {
 	const char *message;
 	struct xs_transaction xst;
 	const char *node = xenbus_get_node(dev);
 	int err;
 	unsigned long num_queues, max_queues = 0;
 	unsigned int i;
 
 	err = xen_net_read_mac(dev, info->mac);
 	if (err != 0) {
 		xenbus_dev_fatal(dev, err, "parsing %s/mac", node);
 		goto out;
 	}
 
 	err = xs_scanf(XST_NIL, xenbus_get_otherend_path(info->xbdev),
 	    "multi-queue-max-queues", NULL, "%lu", &max_queues);
 	if (err != 0)
 		max_queues = 1;
 	num_queues = xn_num_queues;
 	if (num_queues > max_queues)
 		num_queues = max_queues;
 
 	err = setup_device(dev, info, num_queues);
 	if (err != 0)
 		goto out;
 
  again:
 	err = xs_transaction_start(&xst);
 	if (err != 0) {
 		xenbus_dev_fatal(dev, err, "starting transaction");
 		goto free;
 	}
 
 	if (info->num_queues == 1) {
 		err = write_queue_xenstore_keys(dev, &info->rxq[0],
 		    &info->txq[0], &xst, false);
 		if (err != 0)
 			goto abort_transaction_no_def_error;
 	} else {
 		err = xs_printf(xst, node, "multi-queue-num-queues",
 		    "%u", info->num_queues);
 		if (err != 0) {
 			message = "writing multi-queue-num-queues";
 			goto abort_transaction;
 		}
 
 		for (i = 0; i < info->num_queues; i++) {
 			err = write_queue_xenstore_keys(dev, &info->rxq[i],
 			    &info->txq[i], &xst, true);
 			if (err != 0)
 				goto abort_transaction_no_def_error;
 		}
 	}
 
 	err = xs_printf(xst, node, "request-rx-copy", "%u", 1);
 	if (err != 0) {
 		message = "writing request-rx-copy";
 		goto abort_transaction;
 	}
 	err = xs_printf(xst, node, "feature-rx-notify", "%d", 1);
 	if (err != 0) {
 		message = "writing feature-rx-notify";
 		goto abort_transaction;
 	}
 	err = xs_printf(xst, node, "feature-sg", "%d", 1);
 	if (err != 0) {
 		message = "writing feature-sg";
 		goto abort_transaction;
 	}
 	if ((info->xn_ifp->if_capenable & IFCAP_LRO) != 0) {
 		err = xs_printf(xst, node, "feature-gso-tcpv4", "%d", 1);
 		if (err != 0) {
 			message = "writing feature-gso-tcpv4";
 			goto abort_transaction;
 		}
 	}
 	if ((info->xn_ifp->if_capenable & IFCAP_RXCSUM) == 0) {
 		err = xs_printf(xst, node, "feature-no-csum-offload", "%d", 1);
 		if (err != 0) {
 			message = "writing feature-no-csum-offload";
 			goto abort_transaction;
 		}
 	}
 
 	err = xs_transaction_end(xst, 0);
 	if (err != 0) {
 		if (err == EAGAIN)
 			goto again;
 		xenbus_dev_fatal(dev, err, "completing transaction");
 		goto free;
 	}
 
 	return 0;
 
  abort_transaction:
 	xenbus_dev_fatal(dev, err, "%s", message);
  abort_transaction_no_def_error:
 	xs_transaction_end(xst, 1);
  free:
 	netif_free(info);
  out:
 	return (err);
 }
 
 static void
 xn_rxq_intr(struct netfront_rxq *rxq)
 {
 
 	XN_RX_LOCK(rxq);
 	xn_rxeof(rxq);
 	XN_RX_UNLOCK(rxq);
 }
 
 static void
 xn_txq_start(struct netfront_txq *txq)
 {
 	struct netfront_info *np = txq->info;
 	struct ifnet *ifp = np->xn_ifp;
 
 	XN_TX_LOCK_ASSERT(txq);
 	if (!drbr_empty(ifp, txq->br))
 		xn_txq_mq_start_locked(txq, NULL);
 }
 
 static void
 xn_txq_intr(struct netfront_txq *txq)
 {
 
 	XN_TX_LOCK(txq);
 	if (RING_HAS_UNCONSUMED_RESPONSES(&txq->ring))
 		xn_txeof(txq);
 	xn_txq_start(txq);
 	XN_TX_UNLOCK(txq);
 }
 
 static void
 xn_txq_tq_deferred(void *xtxq, int pending)
 {
 	struct netfront_txq *txq = xtxq;
 
 	XN_TX_LOCK(txq);
 	xn_txq_start(txq);
 	XN_TX_UNLOCK(txq);
 }
 
 static void
 disconnect_rxq(struct netfront_rxq *rxq)
 {
 
 	xn_release_rx_bufs(rxq);
 	gnttab_free_grant_references(rxq->gref_head);
 	gnttab_end_foreign_access(rxq->ring_ref, NULL);
 	/*
 	 * No split event channel support at the moment, handle will
 	 * be unbound in tx. So no need to call xen_intr_unbind here,
 	 * but we do want to reset the handler to 0.
 	 */
 	rxq->xen_intr_handle = 0;
 }
 
 static void
 destroy_rxq(struct netfront_rxq *rxq)
 {
 
 	callout_drain(&rxq->rx_refill);
 	free(rxq->ring.sring, M_DEVBUF);
 }
 
 static void
 destroy_rxqs(struct netfront_info *np)
 {
 	int i;
 
 	for (i = 0; i < np->num_queues; i++)
 		destroy_rxq(&np->rxq[i]);
 
 	free(np->rxq, M_DEVBUF);
 	np->rxq = NULL;
 }
 
 static int
 setup_rxqs(device_t dev, struct netfront_info *info,
 	   unsigned long num_queues)
 {
 	int q, i;
 	int error;
 	netif_rx_sring_t *rxs;
 	struct netfront_rxq *rxq;
 
 	info->rxq = malloc(sizeof(struct netfront_rxq) * num_queues,
 	    M_DEVBUF, M_WAITOK|M_ZERO);
 
 	for (q = 0; q < num_queues; q++) {
 		rxq = &info->rxq[q];
 
 		rxq->id = q;
 		rxq->info = info;
 		rxq->ring_ref = GRANT_REF_INVALID;
 		rxq->ring.sring = NULL;
 		snprintf(rxq->name, XN_QUEUE_NAME_LEN, "xnrx_%u", q);
 		mtx_init(&rxq->lock, rxq->name, "netfront receive lock",
 		    MTX_DEF);
 
 		for (i = 0; i <= NET_RX_RING_SIZE; i++) {
 			rxq->mbufs[i] = NULL;
 			rxq->grant_ref[i] = GRANT_REF_INVALID;
 		}
 
 		/* Start resources allocation */
 
 		if (gnttab_alloc_grant_references(NET_RX_RING_SIZE,
 		    &rxq->gref_head) != 0) {
 			device_printf(dev, "allocating rx gref");
 			error = ENOMEM;
 			goto fail;
 		}
 
 		rxs = (netif_rx_sring_t *)malloc(PAGE_SIZE, M_DEVBUF,
 		    M_WAITOK|M_ZERO);
 		SHARED_RING_INIT(rxs);
 		FRONT_RING_INIT(&rxq->ring, rxs, PAGE_SIZE);
 
 		error = xenbus_grant_ring(dev, virt_to_mfn(rxs),
 		    &rxq->ring_ref);
 		if (error != 0) {
 			device_printf(dev, "granting rx ring page");
 			goto fail_grant_ring;
 		}
 
 		callout_init(&rxq->rx_refill, 1);
 	}
 
 	return (0);
 
 fail_grant_ring:
 	gnttab_free_grant_references(rxq->gref_head);
 	free(rxq->ring.sring, M_DEVBUF);
 fail:
 	for (; q >= 0; q--) {
 		disconnect_rxq(&info->rxq[q]);
 		destroy_rxq(&info->rxq[q]);
 	}
 
 	free(info->rxq, M_DEVBUF);
 	return (error);
 }
 
 static void
 disconnect_txq(struct netfront_txq *txq)
 {
 
 	xn_release_tx_bufs(txq);
 	gnttab_free_grant_references(txq->gref_head);
 	gnttab_end_foreign_access(txq->ring_ref, NULL);
 	xen_intr_unbind(&txq->xen_intr_handle);
 }
 
 static void
 destroy_txq(struct netfront_txq *txq)
 {
 
 	free(txq->ring.sring, M_DEVBUF);
 	buf_ring_free(txq->br, M_DEVBUF);
 	taskqueue_drain_all(txq->tq);
 	taskqueue_free(txq->tq);
 }
 
 static void
 destroy_txqs(struct netfront_info *np)
 {
 	int i;
 
 	for (i = 0; i < np->num_queues; i++)
 		destroy_txq(&np->txq[i]);
 
 	free(np->txq, M_DEVBUF);
 	np->txq = NULL;
 }
 
 static int
 setup_txqs(device_t dev, struct netfront_info *info,
 	   unsigned long num_queues)
 {
 	int q, i;
 	int error;
 	netif_tx_sring_t *txs;
 	struct netfront_txq *txq;
 
 	info->txq = malloc(sizeof(struct netfront_txq) * num_queues,
 	    M_DEVBUF, M_WAITOK|M_ZERO);
 
 	for (q = 0; q < num_queues; q++) {
 		txq = &info->txq[q];
 
 		txq->id = q;
 		txq->info = info;
 
 		txq->ring_ref = GRANT_REF_INVALID;
 		txq->ring.sring = NULL;
 
 		snprintf(txq->name, XN_QUEUE_NAME_LEN, "xntx_%u", q);
 
 		mtx_init(&txq->lock, txq->name, "netfront transmit lock",
 		    MTX_DEF);
 
 		for (i = 0; i <= NET_TX_RING_SIZE; i++) {
 			txq->mbufs[i] = (void *) ((u_long) i+1);
 			txq->grant_ref[i] = GRANT_REF_INVALID;
 		}
 		txq->mbufs[NET_TX_RING_SIZE] = (void *)0;
 
 		/* Start resources allocation. */
 
 		if (gnttab_alloc_grant_references(NET_TX_RING_SIZE,
 		    &txq->gref_head) != 0) {
 			device_printf(dev, "failed to allocate tx grant refs\n");
 			error = ENOMEM;
 			goto fail;
 		}
 
 		txs = (netif_tx_sring_t *)malloc(PAGE_SIZE, M_DEVBUF,
 		    M_WAITOK|M_ZERO);
 		SHARED_RING_INIT(txs);
 		FRONT_RING_INIT(&txq->ring, txs, PAGE_SIZE);
 
 		error = xenbus_grant_ring(dev, virt_to_mfn(txs),
 		    &txq->ring_ref);
 		if (error != 0) {
 			device_printf(dev, "failed to grant tx ring\n");
 			goto fail_grant_ring;
 		}
 
 		txq->br = buf_ring_alloc(NET_TX_RING_SIZE, M_DEVBUF,
 		    M_WAITOK, &txq->lock);
 		TASK_INIT(&txq->defrtask, 0, xn_txq_tq_deferred, txq);
 
 		txq->tq = taskqueue_create(txq->name, M_WAITOK,
 		    taskqueue_thread_enqueue, &txq->tq);
 
 		error = taskqueue_start_threads(&txq->tq, 1, PI_NET,
 		    "%s txq %d", device_get_nameunit(dev), txq->id);
 		if (error != 0) {
 			device_printf(dev, "failed to start tx taskq %d\n",
 			    txq->id);
 			goto fail_start_thread;
 		}
 
 		error = xen_intr_alloc_and_bind_local_port(dev,
 		    xenbus_get_otherend_id(dev), /* filter */ NULL, xn_intr,
 		    &info->txq[q], INTR_TYPE_NET | INTR_MPSAFE | INTR_ENTROPY,
 		    &txq->xen_intr_handle);
 
 		if (error != 0) {
 			device_printf(dev, "xen_intr_alloc_and_bind_local_port failed\n");
 			goto fail_bind_port;
 		}
 	}
 
 	return (0);
 
 fail_bind_port:
 	taskqueue_drain_all(txq->tq);
 fail_start_thread:
 	buf_ring_free(txq->br, M_DEVBUF);
 	taskqueue_free(txq->tq);
 	gnttab_end_foreign_access(txq->ring_ref, NULL);
 fail_grant_ring:
 	gnttab_free_grant_references(txq->gref_head);
 	free(txq->ring.sring, M_DEVBUF);
 fail:
 	for (; q >= 0; q--) {
 		disconnect_txq(&info->txq[q]);
 		destroy_txq(&info->txq[q]);
 	}
 
 	free(info->txq, M_DEVBUF);
 	return (error);
 }
 
 static int
 setup_device(device_t dev, struct netfront_info *info,
     unsigned long num_queues)
 {
 	int error;
 	int q;
 
 	if (info->txq)
 		destroy_txqs(info);
 
 	if (info->rxq)
 		destroy_rxqs(info);
 
 	info->num_queues = 0;
 
 	error = setup_rxqs(dev, info, num_queues);
 	if (error != 0)
 		goto out;
 	error = setup_txqs(dev, info, num_queues);
 	if (error != 0)
 		goto out;
 
 	info->num_queues = num_queues;
 
 	/* No split event channel at the moment. */
 	for (q = 0; q < num_queues; q++)
 		info->rxq[q].xen_intr_handle = info->txq[q].xen_intr_handle;
 
 	return (0);
 
 out:
 	KASSERT(error != 0, ("Error path taken without providing an error code"));
 	return (error);
 }
 
 #ifdef INET
 /**
  * If this interface has an ipv4 address, send an arp for it. This
  * helps to get the network going again after migrating hosts.
  */
 static void
 netfront_send_fake_arp(device_t dev, struct netfront_info *info)
 {
 	struct ifnet *ifp;
 	struct ifaddr *ifa;
 
 	ifp = info->xn_ifp;
 	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 		if (ifa->ifa_addr->sa_family == AF_INET) {
 			arp_ifinit(ifp, ifa);
 		}
 	}
 }
 #endif
 
 /**
  * Callback received when the backend's state changes.
  */
 static void
 netfront_backend_changed(device_t dev, XenbusState newstate)
 {
 	struct netfront_info *sc = device_get_softc(dev);
 
 	DPRINTK("newstate=%d\n", newstate);
 
 	switch (newstate) {
 	case XenbusStateInitialising:
 	case XenbusStateInitialised:
 	case XenbusStateUnknown:
 	case XenbusStateReconfigured:
 	case XenbusStateReconfiguring:
 		break;
 	case XenbusStateInitWait:
 		if (xenbus_get_state(dev) != XenbusStateInitialising)
 			break;
 		if (xn_connect(sc) != 0)
 			break;
 		/* Switch to connected state before kicking the rings. */
 		xenbus_set_state(sc->xbdev, XenbusStateConnected);
 		xn_kick_rings(sc);
 		break;
 	case XenbusStateClosing:
 		xenbus_set_state(dev, XenbusStateClosed);
 		break;
 	case XenbusStateClosed:
 		if (sc->xn_reset) {
 			netif_disconnect_backend(sc);
 			xenbus_set_state(dev, XenbusStateInitialising);
 			sc->xn_reset = false;
 		}
 		break;
 	case XenbusStateConnected:
 #ifdef INET
 		netfront_send_fake_arp(dev, sc);
 #endif
 		break;
 	}
 }
 
 /**
  * \brief Verify that there is sufficient space in the Tx ring
  *        buffer for a maximally sized request to be enqueued.
  *
  * A transmit request requires a transmit descriptor for each packet
  * fragment, plus up to 2 entries for "options" (e.g. TSO).
  */
 static inline int
 xn_tx_slot_available(struct netfront_txq *txq)
 {
 
 	return (RING_FREE_REQUESTS(&txq->ring) > (MAX_TX_REQ_FRAGS + 2));
 }
 
 static void
 xn_release_tx_bufs(struct netfront_txq *txq)
 {
 	int i;
 
 	for (i = 1; i <= NET_TX_RING_SIZE; i++) {
 		struct mbuf *m;
 
 		m = txq->mbufs[i];
 
 		/*
 		 * We assume that no kernel addresses are
 		 * less than NET_TX_RING_SIZE.  Any entry
 		 * in the table that is below this number
 		 * must be an index from free-list tracking.
 		 */
 		if (((uintptr_t)m) <= NET_TX_RING_SIZE)
 			continue;
 		gnttab_end_foreign_access_ref(txq->grant_ref[i]);
 		gnttab_release_grant_reference(&txq->gref_head,
 		    txq->grant_ref[i]);
 		txq->grant_ref[i] = GRANT_REF_INVALID;
 		add_id_to_freelist(txq->mbufs, i);
 		txq->mbufs_cnt--;
 		if (txq->mbufs_cnt < 0) {
 			panic("%s: tx_chain_cnt must be >= 0", __func__);
 		}
 		m_free(m);
 	}
 }
 
 static struct mbuf *
 xn_alloc_one_rx_buffer(struct netfront_rxq *rxq)
 {
 	struct mbuf *m;
 
 	m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
 	if (m == NULL)
 		return NULL;
 	m->m_len = m->m_pkthdr.len = MJUMPAGESIZE;
 
 	return (m);
 }
 
 static void
 xn_alloc_rx_buffers(struct netfront_rxq *rxq)
 {
 	RING_IDX req_prod;
 	int notify;
 
 	XN_RX_LOCK_ASSERT(rxq);
 
 	if (__predict_false(rxq->info->carrier == 0))
 		return;
 
 	for (req_prod = rxq->ring.req_prod_pvt;
 	     req_prod - rxq->ring.rsp_cons < NET_RX_RING_SIZE;
 	     req_prod++) {
 		struct mbuf *m;
 		unsigned short id;
 		grant_ref_t ref;
 		struct netif_rx_request *req;
 		unsigned long pfn;
 
 		m = xn_alloc_one_rx_buffer(rxq);
 		if (m == NULL)
 			break;
 
 		id = xn_rxidx(req_prod);
 
 		KASSERT(rxq->mbufs[id] == NULL, ("non-NULL xn_rx_chain"));
 		rxq->mbufs[id] = m;
 
 		ref = gnttab_claim_grant_reference(&rxq->gref_head);
 		KASSERT(ref != GNTTAB_LIST_END,
 		    ("reserved grant references exhuasted"));
 		rxq->grant_ref[id] = ref;
 
 		pfn = atop(vtophys(mtod(m, vm_offset_t)));
 		req = RING_GET_REQUEST(&rxq->ring, req_prod);
 
 		gnttab_grant_foreign_access_ref(ref,
 		    xenbus_get_otherend_id(rxq->info->xbdev), pfn, 0);
 		req->id = id;
 		req->gref = ref;
 	}
 
 	rxq->ring.req_prod_pvt = req_prod;
 
 	/* Not enough requests? Try again later. */
 	if (req_prod - rxq->ring.rsp_cons < NET_RX_SLOTS_MIN) {
 		callout_reset_curcpu(&rxq->rx_refill, hz/10,
 		    xn_alloc_rx_buffers_callout, rxq);
 		return;
 	}
 
 	wmb();		/* barrier so backend seens requests */
 
 	RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&rxq->ring, notify);
 	if (notify)
 		xen_intr_signal(rxq->xen_intr_handle);
 }
 
 static void xn_alloc_rx_buffers_callout(void *arg)
 {
 	struct netfront_rxq *rxq;
 
 	rxq = (struct netfront_rxq *)arg;
 	XN_RX_LOCK(rxq);
 	xn_alloc_rx_buffers(rxq);
 	XN_RX_UNLOCK(rxq);
 }
 
 static void
 xn_release_rx_bufs(struct netfront_rxq *rxq)
 {
 	int i,  ref;
 	struct mbuf *m;
 
 	for (i = 0; i < NET_RX_RING_SIZE; i++) {
 		m = rxq->mbufs[i];
 
 		if (m == NULL)
 			continue;
 
 		ref = rxq->grant_ref[i];
 		if (ref == GRANT_REF_INVALID)
 			continue;
 
 		gnttab_end_foreign_access_ref(ref);
 		gnttab_release_grant_reference(&rxq->gref_head, ref);
 		rxq->mbufs[i] = NULL;
 		rxq->grant_ref[i] = GRANT_REF_INVALID;
 		m_freem(m);
 	}
 }
 
 static void
 xn_rxeof(struct netfront_rxq *rxq)
 {
 	struct ifnet *ifp;
 	struct netfront_info *np = rxq->info;
 #if (defined(INET) || defined(INET6))
 	struct lro_ctrl *lro = &rxq->lro;
 #endif
 	struct netfront_rx_info rinfo;
 	struct netif_rx_response *rx = &rinfo.rx;
 	struct netif_extra_info *extras = rinfo.extras;
 	RING_IDX i, rp;
 	struct mbuf *m;
 	struct mbufq mbufq_rxq, mbufq_errq;
 	int err, work_to_do;
 
 	XN_RX_LOCK_ASSERT(rxq);
 
 	if (!netfront_carrier_ok(np))
 		return;
 
 	/* XXX: there should be some sane limit. */
 	mbufq_init(&mbufq_errq, INT_MAX);
 	mbufq_init(&mbufq_rxq, INT_MAX);
 
 	ifp = np->xn_ifp;
 
 	do {
 		rp = rxq->ring.sring->rsp_prod;
 		rmb();	/* Ensure we see queued responses up to 'rp'. */
 
 		i = rxq->ring.rsp_cons;
 		while ((i != rp)) {
 			memcpy(rx, RING_GET_RESPONSE(&rxq->ring, i), sizeof(*rx));
 			memset(extras, 0, sizeof(rinfo.extras));
 
 			m = NULL;
 			err = xn_get_responses(rxq, &rinfo, rp, &i, &m);
 
 			if (__predict_false(err)) {
 				if (m)
 					(void )mbufq_enqueue(&mbufq_errq, m);
 				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				continue;
 			}
 
 			m->m_pkthdr.rcvif = ifp;
 			if (rx->flags & NETRXF_data_validated) {
 				/*
 				 * According to mbuf(9) the correct way to tell
 				 * the stack that the checksum of an inbound
 				 * packet is correct, without it actually being
 				 * present (because the underlying interface
 				 * doesn't provide it), is to set the
 				 * CSUM_DATA_VALID and CSUM_PSEUDO_HDR flags,
 				 * and the csum_data field to 0xffff.
 				 */
 				m->m_pkthdr.csum_flags |= (CSUM_DATA_VALID
 				    | CSUM_PSEUDO_HDR);
 				m->m_pkthdr.csum_data = 0xffff;
 			}
 			if ((rx->flags & NETRXF_extra_info) != 0 &&
 			    (extras[XEN_NETIF_EXTRA_TYPE_GSO - 1].type ==
 			    XEN_NETIF_EXTRA_TYPE_GSO)) {
 				m->m_pkthdr.tso_segsz =
 				extras[XEN_NETIF_EXTRA_TYPE_GSO - 1].u.gso.size;
 				m->m_pkthdr.csum_flags |= CSUM_TSO;
 			}
 
 			(void )mbufq_enqueue(&mbufq_rxq, m);
 		}
 
 		rxq->ring.rsp_cons = i;
 
 		xn_alloc_rx_buffers(rxq);
 
 		RING_FINAL_CHECK_FOR_RESPONSES(&rxq->ring, work_to_do);
 	} while (work_to_do);
 
-	XN_RX_UNLOCK(rxq);
 	mbufq_drain(&mbufq_errq);
 	/*
 	 * Process all the mbufs after the remapping is complete.
 	 * Break the mbuf chain first though.
 	 */
 	while ((m = mbufq_dequeue(&mbufq_rxq)) != NULL) {
 		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 #if (defined(INET) || defined(INET6))
 		/* Use LRO if possible */
 		if ((ifp->if_capenable & IFCAP_LRO) == 0 ||
 		    lro->lro_cnt == 0 || tcp_lro_rx(lro, m, 0)) {
 			/*
 			 * If LRO fails, pass up to the stack
 			 * directly.
 			 */
 			(*ifp->if_input)(ifp, m);
 		}
 #else
 		(*ifp->if_input)(ifp, m);
 #endif
 	}
 
 #if (defined(INET) || defined(INET6))
 	/*
 	 * Flush any outstanding LRO work
 	 */
 	tcp_lro_flush_all(lro);
 #endif
-	XN_RX_LOCK(rxq);
 }
 
 static void
 xn_txeof(struct netfront_txq *txq)
 {
 	RING_IDX i, prod;
 	unsigned short id;
 	struct ifnet *ifp;
 	netif_tx_response_t *txr;
 	struct mbuf *m;
 	struct netfront_info *np = txq->info;
 
 	XN_TX_LOCK_ASSERT(txq);
 
 	if (!netfront_carrier_ok(np))
 		return;
 
 	ifp = np->xn_ifp;
 
 	do {
 		prod = txq->ring.sring->rsp_prod;
 		rmb(); /* Ensure we see responses up to 'rp'. */
 
 		for (i = txq->ring.rsp_cons; i != prod; i++) {
 			txr = RING_GET_RESPONSE(&txq->ring, i);
 			if (txr->status == NETIF_RSP_NULL)
 				continue;
 
 			if (txr->status != NETIF_RSP_OKAY) {
 				printf("%s: WARNING: response is %d!\n",
 				       __func__, txr->status);
 			}
 			id = txr->id;
 			m = txq->mbufs[id];
 			KASSERT(m != NULL, ("mbuf not found in chain"));
 			KASSERT((uintptr_t)m > NET_TX_RING_SIZE,
 				("mbuf already on the free list, but we're "
 				"trying to free it again!"));
 			M_ASSERTVALID(m);
 
 			if (__predict_false(gnttab_query_foreign_access(
 			    txq->grant_ref[id]) != 0)) {
 				panic("%s: grant id %u still in use by the "
 				    "backend", __func__, id);
 			}
 			gnttab_end_foreign_access_ref(txq->grant_ref[id]);
 			gnttab_release_grant_reference(
 				&txq->gref_head, txq->grant_ref[id]);
 			txq->grant_ref[id] = GRANT_REF_INVALID;
 
 			txq->mbufs[id] = NULL;
 			add_id_to_freelist(txq->mbufs, id);
 			txq->mbufs_cnt--;
 			m_free(m);
 			/* Only mark the txq active if we've freed up at least one slot to try */
 			ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 		}
 		txq->ring.rsp_cons = prod;
 
 		/*
 		 * Set a new event, then check for race with update of
 		 * tx_cons. Note that it is essential to schedule a
 		 * callback, no matter how few buffers are pending. Even if
 		 * there is space in the transmit ring, higher layers may
 		 * be blocked because too much data is outstanding: in such
 		 * cases notification from Xen is likely to be the only kick
 		 * that we'll get.
 		 */
 		txq->ring.sring->rsp_event =
 		    prod + ((txq->ring.sring->req_prod - prod) >> 1) + 1;
 
 		mb();
 	} while (prod != txq->ring.sring->rsp_prod);
 
 	if (txq->full &&
 	    ((txq->ring.sring->req_prod - prod) < NET_TX_RING_SIZE)) {
 		txq->full = false;
 		xn_txq_start(txq);
 	}
 }
 
 static void
 xn_intr(void *xsc)
 {
 	struct netfront_txq *txq = xsc;
 	struct netfront_info *np = txq->info;
 	struct netfront_rxq *rxq = &np->rxq[txq->id];
 
 	/* kick both tx and rx */
 	xn_rxq_intr(rxq);
 	xn_txq_intr(txq);
 }
 
 static void
 xn_move_rx_slot(struct netfront_rxq *rxq, struct mbuf *m,
     grant_ref_t ref)
 {
 	int new = xn_rxidx(rxq->ring.req_prod_pvt);
 
 	KASSERT(rxq->mbufs[new] == NULL, ("mbufs != NULL"));
 	rxq->mbufs[new] = m;
 	rxq->grant_ref[new] = ref;
 	RING_GET_REQUEST(&rxq->ring, rxq->ring.req_prod_pvt)->id = new;
 	RING_GET_REQUEST(&rxq->ring, rxq->ring.req_prod_pvt)->gref = ref;
 	rxq->ring.req_prod_pvt++;
 }
 
 static int
 xn_get_extras(struct netfront_rxq *rxq,
     struct netif_extra_info *extras, RING_IDX rp, RING_IDX *cons)
 {
 	struct netif_extra_info *extra;
 
 	int err = 0;
 
 	do {
 		struct mbuf *m;
 		grant_ref_t ref;
 
 		if (__predict_false(*cons + 1 == rp)) {
 			err = EINVAL;
 			break;
 		}
 
 		extra = (struct netif_extra_info *)
 		RING_GET_RESPONSE(&rxq->ring, ++(*cons));
 
 		if (__predict_false(!extra->type ||
 			extra->type >= XEN_NETIF_EXTRA_TYPE_MAX)) {
 			err = EINVAL;
 		} else {
 			memcpy(&extras[extra->type - 1], extra, sizeof(*extra));
 		}
 
 		m = xn_get_rx_mbuf(rxq, *cons);
 		ref = xn_get_rx_ref(rxq,  *cons);
 		xn_move_rx_slot(rxq, m, ref);
 	} while (extra->flags & XEN_NETIF_EXTRA_FLAG_MORE);
 
 	return err;
 }
 
 static int
 xn_get_responses(struct netfront_rxq *rxq,
     struct netfront_rx_info *rinfo, RING_IDX rp, RING_IDX *cons,
     struct mbuf  **list)
 {
 	struct netif_rx_response *rx = &rinfo->rx;
 	struct netif_extra_info *extras = rinfo->extras;
 	struct mbuf *m, *m0, *m_prev;
 	grant_ref_t ref = xn_get_rx_ref(rxq, *cons);
 	RING_IDX ref_cons = *cons;
 	int frags = 1;
 	int err = 0;
 	u_long ret;
 
 	m0 = m = m_prev = xn_get_rx_mbuf(rxq, *cons);
 
 	if (rx->flags & NETRXF_extra_info) {
 		err = xn_get_extras(rxq, extras, rp, cons);
 	}
 
 	if (m0 != NULL) {
 		m0->m_pkthdr.len = 0;
 		m0->m_next = NULL;
 	}
 
 	for (;;) {
 #if 0
 		DPRINTK("rx->status=%hd rx->offset=%hu frags=%u\n",
 			rx->status, rx->offset, frags);
 #endif
 		if (__predict_false(rx->status < 0 ||
 			rx->offset + rx->status > PAGE_SIZE)) {
 
 			xn_move_rx_slot(rxq, m, ref);
 			if (m0 == m)
 				m0 = NULL;
 			m = NULL;
 			err = EINVAL;
 			goto next_skip_queue;
 		}
 
 		/*
 		 * This definitely indicates a bug, either in this driver or in
 		 * the backend driver. In future this should flag the bad
 		 * situation to the system controller to reboot the backed.
 		 */
 		if (ref == GRANT_REF_INVALID) {
 			printf("%s: Bad rx response id %d.\n", __func__, rx->id);
 			err = EINVAL;
 			goto next;
 		}
 
 		ret = gnttab_end_foreign_access_ref(ref);
 		KASSERT(ret, ("Unable to end access to grant references"));
 
 		gnttab_release_grant_reference(&rxq->gref_head, ref);
 
 next:
 		if (m == NULL)
 			break;
 
 		m->m_len = rx->status;
 		m->m_data += rx->offset;
 		m0->m_pkthdr.len += rx->status;
 
 next_skip_queue:
 		if (!(rx->flags & NETRXF_more_data))
 			break;
 
 		if (*cons + frags == rp) {
 			if (net_ratelimit())
 				WPRINTK("Need more frags\n");
 			err = ENOENT;
 			printf("%s: cons %u frags %u rp %u, not enough frags\n",
 			       __func__, *cons, frags, rp);
 			break;
 		}
 		/*
 		 * Note that m can be NULL, if rx->status < 0 or if
 		 * rx->offset + rx->status > PAGE_SIZE above.
 		 */
 		m_prev = m;
 
 		rx = RING_GET_RESPONSE(&rxq->ring, *cons + frags);
 		m = xn_get_rx_mbuf(rxq, *cons + frags);
 
 		/*
 		 * m_prev == NULL can happen if rx->status < 0 or if
 		 * rx->offset + * rx->status > PAGE_SIZE above.
 		 */
 		if (m_prev != NULL)
 			m_prev->m_next = m;
 
 		/*
 		 * m0 can be NULL if rx->status < 0 or if * rx->offset +
 		 * rx->status > PAGE_SIZE above.
 		 */
 		if (m0 == NULL)
 			m0 = m;
 		m->m_next = NULL;
 		ref = xn_get_rx_ref(rxq, *cons + frags);
 		ref_cons = *cons + frags;
 		frags++;
 	}
 	*list = m0;
 	*cons += frags;
 
 	return (err);
 }
 
 /**
  * \brief Count the number of fragments in an mbuf chain.
  *
  * Surprisingly, there isn't an M* macro for this.
  */
 static inline int
 xn_count_frags(struct mbuf *m)
 {
 	int nfrags;
 
 	for (nfrags = 0; m != NULL; m = m->m_next)
 		nfrags++;
 
 	return (nfrags);
 }
 
 /**
  * Given an mbuf chain, make sure we have enough room and then push
  * it onto the transmit ring.
  */
 static int
 xn_assemble_tx_request(struct netfront_txq *txq, struct mbuf *m_head)
 {
 	struct mbuf *m;
 	struct netfront_info *np = txq->info;
 	struct ifnet *ifp = np->xn_ifp;
 	u_int nfrags;
 	int otherend_id;
 
 	/**
 	 * Defragment the mbuf if necessary.
 	 */
 	nfrags = xn_count_frags(m_head);
 
 	/*
 	 * Check to see whether this request is longer than netback
 	 * can handle, and try to defrag it.
 	 */
 	/**
 	 * It is a bit lame, but the netback driver in Linux can't
 	 * deal with nfrags > MAX_TX_REQ_FRAGS, which is a quirk of
 	 * the Linux network stack.
 	 */
 	if (nfrags > np->maxfrags) {
 		m = m_defrag(m_head, M_NOWAIT);
 		if (!m) {
 			/*
 			 * Defrag failed, so free the mbuf and
 			 * therefore drop the packet.
 			 */
 			m_freem(m_head);
 			return (EMSGSIZE);
 		}
 		m_head = m;
 	}
 
 	/* Determine how many fragments now exist */
 	nfrags = xn_count_frags(m_head);
 
 	/*
 	 * Check to see whether the defragmented packet has too many
 	 * segments for the Linux netback driver.
 	 */
 	/**
 	 * The FreeBSD TCP stack, with TSO enabled, can produce a chain
 	 * of mbufs longer than Linux can handle.  Make sure we don't
 	 * pass a too-long chain over to the other side by dropping the
 	 * packet.  It doesn't look like there is currently a way to
 	 * tell the TCP stack to generate a shorter chain of packets.
 	 */
 	if (nfrags > MAX_TX_REQ_FRAGS) {
 #ifdef DEBUG
 		printf("%s: nfrags %d > MAX_TX_REQ_FRAGS %d, netback "
 		       "won't be able to handle it, dropping\n",
 		       __func__, nfrags, MAX_TX_REQ_FRAGS);
 #endif
 		m_freem(m_head);
 		return (EMSGSIZE);
 	}
 
 	/*
 	 * This check should be redundant.  We've already verified that we
 	 * have enough slots in the ring to handle a packet of maximum
 	 * size, and that our packet is less than the maximum size.  Keep
 	 * it in here as an assert for now just to make certain that
 	 * chain_cnt is accurate.
 	 */
 	KASSERT((txq->mbufs_cnt + nfrags) <= NET_TX_RING_SIZE,
 		("%s: chain_cnt (%d) + nfrags (%d) > NET_TX_RING_SIZE "
 		 "(%d)!", __func__, (int) txq->mbufs_cnt,
                     (int) nfrags, (int) NET_TX_RING_SIZE));
 
 	/*
 	 * Start packing the mbufs in this chain into
 	 * the fragment pointers. Stop when we run out
 	 * of fragments or hit the end of the mbuf chain.
 	 */
 	m = m_head;
 	otherend_id = xenbus_get_otherend_id(np->xbdev);
 	for (m = m_head; m; m = m->m_next) {
 		netif_tx_request_t *tx;
 		uintptr_t id;
 		grant_ref_t ref;
 		u_long mfn; /* XXX Wrong type? */
 
 		tx = RING_GET_REQUEST(&txq->ring, txq->ring.req_prod_pvt);
 		id = get_id_from_freelist(txq->mbufs);
 		if (id == 0)
 			panic("%s: was allocated the freelist head!\n",
 			    __func__);
 		txq->mbufs_cnt++;
 		if (txq->mbufs_cnt > NET_TX_RING_SIZE)
 			panic("%s: tx_chain_cnt must be <= NET_TX_RING_SIZE\n",
 			    __func__);
 		txq->mbufs[id] = m;
 		tx->id = id;
 		ref = gnttab_claim_grant_reference(&txq->gref_head);
 		KASSERT((short)ref >= 0, ("Negative ref"));
 		mfn = virt_to_mfn(mtod(m, vm_offset_t));
 		gnttab_grant_foreign_access_ref(ref, otherend_id,
 		    mfn, GNTMAP_readonly);
 		tx->gref = txq->grant_ref[id] = ref;
 		tx->offset = mtod(m, vm_offset_t) & (PAGE_SIZE - 1);
 		tx->flags = 0;
 		if (m == m_head) {
 			/*
 			 * The first fragment has the entire packet
 			 * size, subsequent fragments have just the
 			 * fragment size. The backend works out the
 			 * true size of the first fragment by
 			 * subtracting the sizes of the other
 			 * fragments.
 			 */
 			tx->size = m->m_pkthdr.len;
 
 			/*
 			 * The first fragment contains the checksum flags
 			 * and is optionally followed by extra data for
 			 * TSO etc.
 			 */
 			/**
 			 * CSUM_TSO requires checksum offloading.
 			 * Some versions of FreeBSD fail to
 			 * set CSUM_TCP in the CSUM_TSO case,
 			 * so we have to test for CSUM_TSO
 			 * explicitly.
 			 */
 			if (m->m_pkthdr.csum_flags
 			    & (CSUM_DELAY_DATA | CSUM_TSO)) {
 				tx->flags |= (NETTXF_csum_blank
 				    | NETTXF_data_validated);
 			}
 			if (m->m_pkthdr.csum_flags & CSUM_TSO) {
 				struct netif_extra_info *gso =
 					(struct netif_extra_info *)
 					RING_GET_REQUEST(&txq->ring,
 							 ++txq->ring.req_prod_pvt);
 
 				tx->flags |= NETTXF_extra_info;
 
 				gso->u.gso.size = m->m_pkthdr.tso_segsz;
 				gso->u.gso.type =
 					XEN_NETIF_GSO_TYPE_TCPV4;
 				gso->u.gso.pad = 0;
 				gso->u.gso.features = 0;
 
 				gso->type = XEN_NETIF_EXTRA_TYPE_GSO;
 				gso->flags = 0;
 			}
 		} else {
 			tx->size = m->m_len;
 		}
 		if (m->m_next)
 			tx->flags |= NETTXF_more_data;
 
 		txq->ring.req_prod_pvt++;
 	}
 	BPF_MTAP(ifp, m_head);
 
 	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	if_inc_counter(ifp, IFCOUNTER_OBYTES, m_head->m_pkthdr.len);
 	if (m_head->m_flags & M_MCAST)
 		if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 
 	xn_txeof(txq);
 
 	return (0);
 }
 
 /* equivalent of network_open() in Linux */
 static void
 xn_ifinit_locked(struct netfront_info *np)
 {
 	struct ifnet *ifp;
 	int i;
 	struct netfront_rxq *rxq;
 
 	XN_LOCK_ASSERT(np);
 
 	ifp = np->xn_ifp;
 
 	if (ifp->if_drv_flags & IFF_DRV_RUNNING || !netfront_carrier_ok(np))
 		return;
 
 	xn_stop(np);
 
 	for (i = 0; i < np->num_queues; i++) {
 		rxq = &np->rxq[i];
 		XN_RX_LOCK(rxq);
 		xn_alloc_rx_buffers(rxq);
 		rxq->ring.sring->rsp_event = rxq->ring.rsp_cons + 1;
 		if (RING_HAS_UNCONSUMED_RESPONSES(&rxq->ring))
 			xn_rxeof(rxq);
 		XN_RX_UNLOCK(rxq);
 	}
 
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 	if_link_state_change(ifp, LINK_STATE_UP);
 }
 
 static void
 xn_ifinit(void *xsc)
 {
 	struct netfront_info *sc = xsc;
 
 	XN_LOCK(sc);
 	xn_ifinit_locked(sc);
 	XN_UNLOCK(sc);
 }
 
 static int
 xn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct netfront_info *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *) data;
 	device_t dev;
 #ifdef INET
 	struct ifaddr *ifa = (struct ifaddr *)data;
 #endif
 	int mask, error = 0, reinit;
 
 	dev = sc->xbdev;
 
 	switch(cmd) {
 	case SIOCSIFADDR:
 #ifdef INET
 		XN_LOCK(sc);
 		if (ifa->ifa_addr->sa_family == AF_INET) {
 			ifp->if_flags |= IFF_UP;
 			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
 				xn_ifinit_locked(sc);
 			arp_ifinit(ifp, ifa);
 			XN_UNLOCK(sc);
 		} else {
 			XN_UNLOCK(sc);
 #endif
 			error = ether_ioctl(ifp, cmd, data);
 #ifdef INET
 		}
 #endif
 		break;
 	case SIOCSIFMTU:
 		ifp->if_mtu = ifr->ifr_mtu;
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		xn_ifinit(sc);
 		break;
 	case SIOCSIFFLAGS:
 		XN_LOCK(sc);
 		if (ifp->if_flags & IFF_UP) {
 			/*
 			 * If only the state of the PROMISC flag changed,
 			 * then just use the 'set promisc mode' command
 			 * instead of reinitializing the entire NIC. Doing
 			 * a full re-init means reloading the firmware and
 			 * waiting for it to start up, which may take a
 			 * second or two.
 			 */
 			xn_ifinit_locked(sc);
 		} else {
 			if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
 				xn_stop(sc);
 			}
 		}
 		sc->xn_if_flags = ifp->if_flags;
 		XN_UNLOCK(sc);
 		break;
 	case SIOCSIFCAP:
 		mask = ifr->ifr_reqcap ^ ifp->if_capenable;
 		reinit = 0;
 
 		if (mask & IFCAP_TXCSUM) {
 			ifp->if_capenable ^= IFCAP_TXCSUM;
 			ifp->if_hwassist ^= XN_CSUM_FEATURES;
 		}
 		if (mask & IFCAP_TSO4) {
 			ifp->if_capenable ^= IFCAP_TSO4;
 			ifp->if_hwassist ^= CSUM_TSO;
 		}
 
 		if (mask & (IFCAP_RXCSUM | IFCAP_LRO)) {
 			/* These Rx features require us to renegotiate. */
 			reinit = 1;
 
 			if (mask & IFCAP_RXCSUM)
 				ifp->if_capenable ^= IFCAP_RXCSUM;
 			if (mask & IFCAP_LRO)
 				ifp->if_capenable ^= IFCAP_LRO;
 		}
 
 		if (reinit == 0)
 			break;
 
 		/*
 		 * We must reset the interface so the backend picks up the
 		 * new features.
 		 */
 		device_printf(sc->xbdev,
 		    "performing interface reset due to feature change\n");
 		XN_LOCK(sc);
 		netfront_carrier_off(sc);
 		sc->xn_reset = true;
 		/*
 		 * NB: the pending packet queue is not flushed, since
 		 * the interface should still support the old options.
 		 */
 		XN_UNLOCK(sc);
 		/*
 		 * Delete the xenstore nodes that export features.
 		 *
 		 * NB: There's a xenbus state called
 		 * "XenbusStateReconfiguring", which is what we should set
 		 * here. Sadly none of the backends know how to handle it,
 		 * and simply disconnect from the frontend, so we will just
 		 * switch back to XenbusStateInitialising in order to force
 		 * a reconnection.
 		 */
 		xs_rm(XST_NIL, xenbus_get_node(dev), "feature-gso-tcpv4");
 		xs_rm(XST_NIL, xenbus_get_node(dev), "feature-no-csum-offload");
 		xenbus_set_state(dev, XenbusStateClosing);
 
 		/*
 		 * Wait for the frontend to reconnect before returning
 		 * from the ioctl. 30s should be more than enough for any
 		 * sane backend to reconnect.
 		 */
 		error = tsleep(sc, 0, "xn_rst", 30*hz);
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		break;
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
 		error = ifmedia_ioctl(ifp, ifr, &sc->sc_media, cmd);
 		break;
 	default:
 		error = ether_ioctl(ifp, cmd, data);
 	}
 
 	return (error);
 }
 
 static void
 xn_stop(struct netfront_info *sc)
 {
 	struct ifnet *ifp;
 
 	XN_LOCK_ASSERT(sc);
 
 	ifp = sc->xn_ifp;
 
 	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
 	if_link_state_change(ifp, LINK_STATE_DOWN);
 }
 
 static void
 xn_rebuild_rx_bufs(struct netfront_rxq *rxq)
 {
 	int requeue_idx, i;
 	grant_ref_t ref;
 	netif_rx_request_t *req;
 
 	for (requeue_idx = 0, i = 0; i < NET_RX_RING_SIZE; i++) {
 		struct mbuf *m;
 		u_long pfn;
 
 		if (rxq->mbufs[i] == NULL)
 			continue;
 
 		m = rxq->mbufs[requeue_idx] = xn_get_rx_mbuf(rxq, i);
 		ref = rxq->grant_ref[requeue_idx] = xn_get_rx_ref(rxq, i);
 
 		req = RING_GET_REQUEST(&rxq->ring, requeue_idx);
 		pfn = vtophys(mtod(m, vm_offset_t)) >> PAGE_SHIFT;
 
 		gnttab_grant_foreign_access_ref(ref,
 		    xenbus_get_otherend_id(rxq->info->xbdev),
 		    pfn, 0);
 
 		req->gref = ref;
 		req->id   = requeue_idx;
 
 		requeue_idx++;
 	}
 
 	rxq->ring.req_prod_pvt = requeue_idx;
 }
 
 /* START of Xenolinux helper functions adapted to FreeBSD */
 static int
 xn_connect(struct netfront_info *np)
 {
 	int i, error;
 	u_int feature_rx_copy;
 	struct netfront_rxq *rxq;
 	struct netfront_txq *txq;
 
 	error = xs_scanf(XST_NIL, xenbus_get_otherend_path(np->xbdev),
 	    "feature-rx-copy", NULL, "%u", &feature_rx_copy);
 	if (error != 0)
 		feature_rx_copy = 0;
 
 	/* We only support rx copy. */
 	if (!feature_rx_copy)
 		return (EPROTONOSUPPORT);
 
 	/* Recovery procedure: */
 	error = talk_to_backend(np->xbdev, np);
 	if (error != 0)
 		return (error);
 
 	/* Step 1: Reinitialise variables. */
 	xn_query_features(np);
 	xn_configure_features(np);
 
 	/* Step 2: Release TX buffer */
 	for (i = 0; i < np->num_queues; i++) {
 		txq = &np->txq[i];
 		xn_release_tx_bufs(txq);
 	}
 
 	/* Step 3: Rebuild the RX buffer freelist and the RX ring itself. */
 	for (i = 0; i < np->num_queues; i++) {
 		rxq = &np->rxq[i];
 		xn_rebuild_rx_bufs(rxq);
 	}
 
 	/* Step 4: All public and private state should now be sane.  Get
 	 * ready to start sending and receiving packets and give the driver
 	 * domain a kick because we've probably just requeued some
 	 * packets.
 	 */
 	netfront_carrier_on(np);
 	wakeup(np);
 
 	return (0);
 }
 
 static void
 xn_kick_rings(struct netfront_info *np)
 {
 	struct netfront_rxq *rxq;
 	struct netfront_txq *txq;
 	int i;
 
 	for (i = 0; i < np->num_queues; i++) {
 		txq = &np->txq[i];
 		rxq = &np->rxq[i];
 		xen_intr_signal(txq->xen_intr_handle);
 		XN_TX_LOCK(txq);
 		xn_txeof(txq);
 		XN_TX_UNLOCK(txq);
 		XN_RX_LOCK(rxq);
 		xn_alloc_rx_buffers(rxq);
 		XN_RX_UNLOCK(rxq);
 	}
 }
 
 static void
 xn_query_features(struct netfront_info *np)
 {
 	int val;
 
 	device_printf(np->xbdev, "backend features:");
 
 	if (xs_scanf(XST_NIL, xenbus_get_otherend_path(np->xbdev),
 		"feature-sg", NULL, "%d", &val) != 0)
 		val = 0;
 
 	np->maxfrags = 1;
 	if (val) {
 		np->maxfrags = MAX_TX_REQ_FRAGS;
 		printf(" feature-sg");
 	}
 
 	if (xs_scanf(XST_NIL, xenbus_get_otherend_path(np->xbdev),
 		"feature-gso-tcpv4", NULL, "%d", &val) != 0)
 		val = 0;
 
 	np->xn_ifp->if_capabilities &= ~(IFCAP_TSO4|IFCAP_LRO);
 	if (val) {
 		np->xn_ifp->if_capabilities |= IFCAP_TSO4|IFCAP_LRO;
 		printf(" feature-gso-tcp4");
 	}
 
 	/*
 	 * HW CSUM offload is assumed to be available unless
 	 * feature-no-csum-offload is set in xenstore.
 	 */
 	if (xs_scanf(XST_NIL, xenbus_get_otherend_path(np->xbdev),
 		"feature-no-csum-offload", NULL, "%d", &val) != 0)
 		val = 0;
 
 	np->xn_ifp->if_capabilities |= IFCAP_HWCSUM;
 	if (val) {
 		np->xn_ifp->if_capabilities &= ~(IFCAP_HWCSUM);
 		printf(" feature-no-csum-offload");
 	}
 
 	printf("\n");
 }
 
 static int
 xn_configure_features(struct netfront_info *np)
 {
 	int err, cap_enabled;
 #if (defined(INET) || defined(INET6))
 	int i;
 #endif
 	struct ifnet *ifp;
 
 	ifp = np->xn_ifp;
 	err = 0;
 
 	if ((ifp->if_capenable & ifp->if_capabilities) == ifp->if_capenable) {
 		/* Current options are available, no need to do anything. */
 		return (0);
 	}
 
 	/* Try to preserve as many options as possible. */
 	cap_enabled = ifp->if_capenable;
 	ifp->if_capenable = ifp->if_hwassist = 0;
 
 #if (defined(INET) || defined(INET6))
 	if ((cap_enabled & IFCAP_LRO) != 0)
 		for (i = 0; i < np->num_queues; i++)
 			tcp_lro_free(&np->rxq[i].lro);
 	if (xn_enable_lro &&
 	    (ifp->if_capabilities & cap_enabled & IFCAP_LRO) != 0) {
 	    	ifp->if_capenable |= IFCAP_LRO;
 		for (i = 0; i < np->num_queues; i++) {
 			err = tcp_lro_init(&np->rxq[i].lro);
 			if (err != 0) {
 				device_printf(np->xbdev,
 				    "LRO initialization failed\n");
 				ifp->if_capenable &= ~IFCAP_LRO;
 				break;
 			}
 			np->rxq[i].lro.ifp = ifp;
 		}
 	}
 	if ((ifp->if_capabilities & cap_enabled & IFCAP_TSO4) != 0) {
 		ifp->if_capenable |= IFCAP_TSO4;
 		ifp->if_hwassist |= CSUM_TSO;
 	}
 #endif
 	if ((ifp->if_capabilities & cap_enabled & IFCAP_TXCSUM) != 0) {
 		ifp->if_capenable |= IFCAP_TXCSUM;
 		ifp->if_hwassist |= XN_CSUM_FEATURES;
 	}
 	if ((ifp->if_capabilities & cap_enabled & IFCAP_RXCSUM) != 0)
 		ifp->if_capenable |= IFCAP_RXCSUM;
 
 	return (err);
 }
 
 static int
 xn_txq_mq_start_locked(struct netfront_txq *txq, struct mbuf *m)
 {
 	struct netfront_info *np;
 	struct ifnet *ifp;
 	struct buf_ring *br;
 	int error, notify;
 
 	np = txq->info;
 	br = txq->br;
 	ifp = np->xn_ifp;
 	error = 0;
 
 	XN_TX_LOCK_ASSERT(txq);
 
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ||
 	    !netfront_carrier_ok(np)) {
 		if (m != NULL)
 			error = drbr_enqueue(ifp, br, m);
 		return (error);
 	}
 
 	if (m != NULL) {
 		error = drbr_enqueue(ifp, br, m);
 		if (error != 0)
 			return (error);
 	}
 
 	while ((m = drbr_peek(ifp, br)) != NULL) {
 		if (!xn_tx_slot_available(txq)) {
 			drbr_putback(ifp, br, m);
 			break;
 		}
 
 		error = xn_assemble_tx_request(txq, m);
 		/* xn_assemble_tx_request always consumes the mbuf*/
 		if (error != 0) {
 			drbr_advance(ifp, br);
 			break;
 		}
 
 		RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&txq->ring, notify);
 		if (notify)
 			xen_intr_signal(txq->xen_intr_handle);
 
 		drbr_advance(ifp, br);
 	}
 
 	if (RING_FULL(&txq->ring))
 		txq->full = true;
 
 	return (0);
 }
 
 static int
 xn_txq_mq_start(struct ifnet *ifp, struct mbuf *m)
 {
 	struct netfront_info *np;
 	struct netfront_txq *txq;
 	int i, npairs, error;
 
 	np = ifp->if_softc;
 	npairs = np->num_queues;
 
 	if (!netfront_carrier_ok(np))
 		return (ENOBUFS);
 
 	KASSERT(npairs != 0, ("called with 0 available queues"));
 
 	/* check if flowid is set */
 	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)
 		i = m->m_pkthdr.flowid % npairs;
 	else
 		i = curcpu % npairs;
 
 	txq = &np->txq[i];
 
 	if (XN_TX_TRYLOCK(txq) != 0) {
 		error = xn_txq_mq_start_locked(txq, m);
 		XN_TX_UNLOCK(txq);
 	} else {
 		error = drbr_enqueue(ifp, txq->br, m);
 		taskqueue_enqueue(txq->tq, &txq->defrtask);
 	}
 
 	return (error);
 }
 
 static void
 xn_qflush(struct ifnet *ifp)
 {
 	struct netfront_info *np;
 	struct netfront_txq *txq;
 	struct mbuf *m;
 	int i;
 
 	np = ifp->if_softc;
 
 	for (i = 0; i < np->num_queues; i++) {
 		txq = &np->txq[i];
 
 		XN_TX_LOCK(txq);
 		while ((m = buf_ring_dequeue_sc(txq->br)) != NULL)
 			m_freem(m);
 		XN_TX_UNLOCK(txq);
 	}
 
 	if_qflush(ifp);
 }
 
 /**
  * Create a network device.
  * @param dev  Newbus device representing this virtual NIC.
  */
 int
 create_netdev(device_t dev)
 {
 	struct netfront_info *np;
 	int err;
 	struct ifnet *ifp;
 
 	np = device_get_softc(dev);
 
 	np->xbdev         = dev;
 
 	mtx_init(&np->sc_lock, "xnsc", "netfront softc lock", MTX_DEF);
 
 	ifmedia_init(&np->sc_media, 0, xn_ifmedia_upd, xn_ifmedia_sts);
 	ifmedia_add(&np->sc_media, IFM_ETHER|IFM_MANUAL, 0, NULL);
 	ifmedia_set(&np->sc_media, IFM_ETHER|IFM_MANUAL);
 
 	err = xen_net_read_mac(dev, np->mac);
 	if (err != 0)
 		goto error;
 
 	/* Set up ifnet structure */
 	ifp = np->xn_ifp = if_alloc(IFT_ETHER);
     	ifp->if_softc = np;
     	if_initname(ifp, "xn",  device_get_unit(dev));
     	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
     	ifp->if_ioctl = xn_ioctl;
 
 	ifp->if_transmit = xn_txq_mq_start;
 	ifp->if_qflush = xn_qflush;
 
     	ifp->if_init = xn_ifinit;
 
     	ifp->if_hwassist = XN_CSUM_FEATURES;
 	/* Enable all supported features at device creation. */
 	ifp->if_capenable = ifp->if_capabilities =
 	    IFCAP_HWCSUM|IFCAP_TSO4|IFCAP_LRO;
 	ifp->if_hw_tsomax = 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN);
 	ifp->if_hw_tsomaxsegcount = MAX_TX_REQ_FRAGS;
 	ifp->if_hw_tsomaxsegsize = PAGE_SIZE;
 
     	ether_ifattach(ifp, np->mac);
 	netfront_carrier_off(np);
 
 	return (0);
 
 error:
 	KASSERT(err != 0, ("Error path with no error code specified"));
 	return (err);
 }
 
 static int
 netfront_detach(device_t dev)
 {
 	struct netfront_info *info = device_get_softc(dev);
 
 	DPRINTK("%s\n", xenbus_get_node(dev));
 
 	netif_free(info);
 
 	return 0;
 }
 
 static void
 netif_free(struct netfront_info *np)
 {
 
 	XN_LOCK(np);
 	xn_stop(np);
 	XN_UNLOCK(np);
 	netif_disconnect_backend(np);
 	ether_ifdetach(np->xn_ifp);
 	free(np->rxq, M_DEVBUF);
 	free(np->txq, M_DEVBUF);
 	if_free(np->xn_ifp);
 	np->xn_ifp = NULL;
 	ifmedia_removeall(&np->sc_media);
 }
 
 static void
 netif_disconnect_backend(struct netfront_info *np)
 {
 	u_int i;
 
 	for (i = 0; i < np->num_queues; i++) {
 		XN_RX_LOCK(&np->rxq[i]);
 		XN_TX_LOCK(&np->txq[i]);
 	}
 	netfront_carrier_off(np);
 	for (i = 0; i < np->num_queues; i++) {
 		XN_RX_UNLOCK(&np->rxq[i]);
 		XN_TX_UNLOCK(&np->txq[i]);
 	}
 
 	for (i = 0; i < np->num_queues; i++) {
 		disconnect_rxq(&np->rxq[i]);
 		disconnect_txq(&np->txq[i]);
 	}
 }
 
 static int
 xn_ifmedia_upd(struct ifnet *ifp)
 {
 
 	return (0);
 }
 
 static void
 xn_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
 {
 
 	ifmr->ifm_status = IFM_AVALID|IFM_ACTIVE;
 	ifmr->ifm_active = IFM_ETHER|IFM_MANUAL;
 }
 
 /* ** Driver registration ** */
 static device_method_t netfront_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,         netfront_probe),
 	DEVMETHOD(device_attach,        netfront_attach),
 	DEVMETHOD(device_detach,        netfront_detach),
 	DEVMETHOD(device_shutdown,      bus_generic_shutdown),
 	DEVMETHOD(device_suspend,       netfront_suspend),
 	DEVMETHOD(device_resume,        netfront_resume),
 
 	/* Xenbus interface */
 	DEVMETHOD(xenbus_otherend_changed, netfront_backend_changed),
 
 	DEVMETHOD_END
 };
 
 static driver_t netfront_driver = {
 	"xn",
 	netfront_methods,
 	sizeof(struct netfront_info),
 };
 devclass_t netfront_devclass;
 
 DRIVER_MODULE(xe, xenbusb_front, netfront_driver, netfront_devclass, NULL,
     NULL);
Index: projects/clang500-import/sys/fs/msdosfs/denode.h
===================================================================
--- projects/clang500-import/sys/fs/msdosfs/denode.h	(revision 318657)
+++ projects/clang500-import/sys/fs/msdosfs/denode.h	(revision 318658)
@@ -1,280 +1,280 @@
 /* $FreeBSD$ */
 /*	$NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
  *
  * 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 TooLs GmbH.
  * 4. The name of TooLs GmbH may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
  */
 /*-
  * Written by Paul Popelka (paulp@uts.amdahl.com)
  *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
  *
  * This software is provided "as is".
  *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
  *
  * October 1992
  */
 
 /*
  * This is the pc filesystem specific portion of the vnode structure.
  *
  * To describe a file uniquely the de_dirclust, de_diroffset, and
  * de_StartCluster fields are used.
  *
  * de_dirclust contains the cluster number of the directory cluster
  *	containing the entry for a file or directory.
  * de_diroffset is the index into the cluster for the entry describing
  *	a file or directory.
  * de_StartCluster is the number of the first cluster of the file or directory.
  *
  * Now to describe the quirks of the pc filesystem.
  * - Clusters 0 and 1 are reserved.
  * - The first allocatable cluster is 2.
  * - The root directory is of fixed size and all blocks that make it up
  *   are contiguous.
  * - Cluster 0 refers to the root directory when it is found in the
  *   startcluster field of a directory entry that points to another directory.
  * - Cluster 0 implies a 0 length file when found in the start cluster field
  *   of a directory entry that points to a file.
  * - You can't use the cluster number 0 to derive the address of the root
  *   directory.
  * - Multiple directory entries can point to a directory. The entry in the
  *   parent directory points to a child directory.  Any directories in the
  *   child directory contain a ".." entry that points back to the parent.
  *   The child directory itself contains a "." entry that points to itself.
  * - The root directory does not contain a "." or ".." entry.
  * - Directory entries for directories are never changed once they are created
  *   (except when removed).  The size stays 0, and the last modification time
  *   is never changed.  This is because so many directory entries can point to
  *   the physical clusters that make up a directory.  It would lead to an
  *   update nightmare.
  * - The length field in a directory entry pointing to a directory contains 0
  *   (always).  The only way to find the end of a directory is to follow the
  *   cluster chain until the "last cluster" marker is found.
  *
  * My extensions to make this house of cards work.  These apply only to the in
  * memory copy of the directory entry.
  * - A reference count for each denode will be kept since dos doesn't keep such
  *   things.
  */
 
 /*
  * Internal pseudo-offset for (nonexistent) directory entry for the root
  * dir in the root dir
  */
 #define	MSDOSFSROOT_OFS	0x1fffffff
 
 /*
- * The fat cache structure. fc_fsrcn is the filesystem relative cluster
+ * The FAT cache structure. fc_fsrcn is the filesystem relative cluster
  * number that corresponds to the file relative cluster number in this
  * structure (fc_frcn).
  */
 struct fatcache {
 	u_long fc_frcn;		/* file relative cluster number */
 	u_long fc_fsrcn;	/* filesystem relative cluster number */
 };
 
 /*
- * The fat entry cache as it stands helps make extending files a "quick"
- * operation by avoiding having to scan the fat to discover the last
+ * The FAT entry cache as it stands helps make extending files a "quick"
+ * operation by avoiding having to scan the FAT to discover the last
  * cluster of the file. The cache also helps sequential reads by
  * remembering the last cluster read from the file.  This also prevents us
- * from having to rescan the fat to find the next cluster to read.  This
+ * from having to rescan the FAT to find the next cluster to read.  This
  * cache is probably pretty worthless if a file is opened by multiple
  * processes.
  */
 #define	FC_SIZE		3	/* number of entries in the cache */
 #define	FC_LASTMAP	0	/* entry the last call to pcbmap() resolved
 				 * to */
 #define	FC_LASTFC	1	/* entry for the last cluster in the file */
 #define	FC_NEXTTOLASTFC	2	/* entry for a close to the last cluster in
 				 * the file */
 
 #define	FCE_EMPTY	0xffffffff	/* doesn't represent an actual cluster # */
 
 /*
- * Set a slot in the fat cache.
+ * Set a slot in the FAT cache.
  */
 #define	fc_setcache(dep, slot, frcn, fsrcn) \
 	(dep)->de_fc[(slot)].fc_frcn = (frcn); \
 	(dep)->de_fc[(slot)].fc_fsrcn = (fsrcn);
 
 /*
  * This is the in memory variant of a dos directory entry.  It is usually
  * contained within a vnode.
  */
 struct denode {
 	struct vnode *de_vnode;	/* addr of vnode we are part of */
 	u_long de_flag;		/* flag bits */
 	u_long de_dirclust;	/* cluster of the directory file containing this entry */
 	u_long de_diroffset;	/* offset of this entry in the directory cluster */
 	u_long de_fndoffset;	/* offset of found dir entry */
 	int de_fndcnt;		/* number of slots before de_fndoffset */
 	long de_refcnt;		/* reference count */
 	struct msdosfsmount *de_pmp;	/* addr of our mount struct */
 	u_char de_Name[12];	/* name, from DOS directory entry */
 	u_char de_Attributes;	/* attributes, from directory entry */
 	u_char de_LowerCase;	/* NT VFAT lower case flags */
 	u_char de_CHun;		/* Hundredth of second of CTime*/
 	u_short de_CTime;	/* creation time */
 	u_short de_CDate;	/* creation date */
 	u_short de_ADate;	/* access date */
 	u_short de_MTime;	/* modification time */
 	u_short de_MDate;	/* modification date */
 	u_long de_StartCluster; /* starting cluster of file */
 	u_long de_FileSize;	/* size of file in bytes */
-	struct fatcache de_fc[FC_SIZE];	/* fat cache */
+	struct fatcache de_fc[FC_SIZE];	/* FAT cache */
 	u_quad_t de_modrev;	/* Revision level for lease. */
 	uint64_t de_inode;	/* Inode number (really byte offset of direntry) */
 };
 
 /*
  * Values for the de_flag field of the denode.
  */
 #define	DE_UPDATE	0x0004	/* Modification time update request */
 #define	DE_CREATE	0x0008	/* Creation time update */
 #define	DE_ACCESS	0x0010	/* Access time update */
 #define	DE_MODIFIED	0x0020	/* Denode has been modified */
 #define	DE_RENAME	0x0040	/* Denode is in the process of being renamed */
 
 
 /*
  * Transfer directory entries between internal and external form.
  * dep is a struct denode * (internal form),
  * dp is a struct direntry * (external form).
  */
 #define DE_INTERNALIZE32(dep, dp)			\
 	 ((dep)->de_StartCluster |= getushort((dp)->deHighClust) << 16)
 #define DE_INTERNALIZE(dep, dp)				\
 	(bcopy((dp)->deName, (dep)->de_Name, 11),	\
 	 (dep)->de_Attributes = (dp)->deAttributes,	\
 	 (dep)->de_LowerCase = (dp)->deLowerCase,	\
 	 (dep)->de_CHun = (dp)->deCHundredth,		\
 	 (dep)->de_CTime = getushort((dp)->deCTime),	\
 	 (dep)->de_CDate = getushort((dp)->deCDate),	\
 	 (dep)->de_ADate = getushort((dp)->deADate),	\
 	 (dep)->de_MTime = getushort((dp)->deMTime),	\
 	 (dep)->de_MDate = getushort((dp)->deMDate),	\
 	 (dep)->de_StartCluster = getushort((dp)->deStartCluster), \
 	 (dep)->de_FileSize = getulong((dp)->deFileSize), \
 	 (FAT32((dep)->de_pmp) ? DE_INTERNALIZE32((dep), (dp)) : 0))
 
 #define DE_EXTERNALIZE(dp, dep)				\
 	(bcopy((dep)->de_Name, (dp)->deName, 11),	\
 	 (dp)->deAttributes = (dep)->de_Attributes,	\
 	 (dp)->deLowerCase = (dep)->de_LowerCase,	\
 	 (dp)->deCHundredth = (dep)->de_CHun,		\
 	 putushort((dp)->deCTime, (dep)->de_CTime),	\
 	 putushort((dp)->deCDate, (dep)->de_CDate),	\
 	 putushort((dp)->deADate, (dep)->de_ADate),	\
 	 putushort((dp)->deMTime, (dep)->de_MTime),	\
 	 putushort((dp)->deMDate, (dep)->de_MDate),	\
 	 putushort((dp)->deStartCluster, (dep)->de_StartCluster), \
 	 putulong((dp)->deFileSize,			\
 	     ((dep)->de_Attributes & ATTR_DIRECTORY) ? 0 : (dep)->de_FileSize), \
 	 putushort((dp)->deHighClust, (dep)->de_StartCluster >> 16))
 
 #ifdef _KERNEL
 
 #define	VTODE(vp)	((struct denode *)(vp)->v_data)
 #define	DETOV(de)	((de)->de_vnode)
 
 #define	DETIMES(dep, acc, mod, cre) do {				\
 	if ((dep)->de_flag & DE_UPDATE) {				\
 		(dep)->de_flag |= DE_MODIFIED;				\
 		timespec2fattime((mod), 0, &(dep)->de_MDate,		\
 		    &(dep)->de_MTime, NULL);				\
 		(dep)->de_Attributes |= ATTR_ARCHIVE;			\
 	}								\
 	if ((dep)->de_pmp->pm_flags & MSDOSFSMNT_NOWIN95) {		\
 		(dep)->de_flag &= ~(DE_UPDATE | DE_CREATE | DE_ACCESS);	\
 		break;							\
 	}								\
 	if ((dep)->de_flag & DE_ACCESS) {				\
 		uint16_t adate;						\
 									\
 		timespec2fattime((acc), 0, &adate, NULL, NULL);		\
 		if (adate != (dep)->de_ADate) {				\
 			(dep)->de_flag |= DE_MODIFIED;			\
 			(dep)->de_ADate = adate;			\
 		}							\
 	}								\
 	if ((dep)->de_flag & DE_CREATE) {				\
 		timespec2fattime((cre), 0, &(dep)->de_CDate,		\
 		    &(dep)->de_CTime, &(dep)->de_CHun);			\
 		(dep)->de_flag |= DE_MODIFIED;				\
 	}								\
 	(dep)->de_flag &= ~(DE_UPDATE | DE_CREATE | DE_ACCESS);		\
 } while (0)
 
 /*
  * This overlays the fid structure (see mount.h)
  */
 struct defid {
 	u_short defid_len;	/* length of structure */
 	u_short defid_pad;	/* force long alignment */
 
 	uint32_t defid_dirclust; /* cluster this dir entry came from */
 	uint32_t defid_dirofs;	/* offset of entry within the cluster */
 #if 0
 	uint32_t defid_gen;	/* generation number */
 #endif
 };
 
 extern struct vop_vector msdosfs_vnodeops;
 
 int msdosfs_lookup(struct vop_cachedlookup_args *);
 int msdosfs_inactive(struct vop_inactive_args *);
 int msdosfs_reclaim(struct vop_reclaim_args *);
 
 /*
  * Internal service routine prototypes.
  */
 int deget(struct msdosfsmount *, u_long, u_long, struct denode **);
 int uniqdosname(struct denode *, struct componentname *, u_char *);
 
 int readep(struct msdosfsmount *pmp, u_long dirclu, u_long dirofs,  struct buf **bpp, struct direntry **epp);
 int readde(struct denode *dep, struct buf **bpp, struct direntry **epp);
 int deextend(struct denode *dep, u_long length, struct ucred *cred);
 int fillinusemap(struct msdosfsmount *pmp);
 void reinsert(struct denode *dep);
 int dosdirempty(struct denode *dep);
 int createde(struct denode *dep, struct denode *ddep, struct denode **depp, struct componentname *cnp);
 int deupdat(struct denode *dep, int waitfor);
 int removede(struct denode *pdep, struct denode *dep);
 int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred);
 int doscheckpath( struct denode *source, struct denode *target);
 #endif	/* _KERNEL */
Index: projects/clang500-import/sys/fs/msdosfs/fat.h
===================================================================
--- projects/clang500-import/sys/fs/msdosfs/fat.h	(revision 318657)
+++ projects/clang500-import/sys/fs/msdosfs/fat.h	(revision 318658)
@@ -1,104 +1,104 @@
 /* $FreeBSD$ */
 /*	$NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
  *
  * 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 TooLs GmbH.
  * 4. The name of TooLs GmbH may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
  */
 /*-
  * Written by Paul Popelka (paulp@uts.amdahl.com)
  *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
  *
  * This software is provided "as is".
  *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
  *
  * October 1992
  */
 
 /*
  * Some useful cluster numbers.
  */
 #define	MSDOSFSROOT	0		/* cluster 0 means the root dir */
 #define	CLUST_FREE	0		/* cluster 0 also means a free cluster */
 #define	MSDOSFSFREE	CLUST_FREE
 #define	CLUST_FIRST	2		/* first legal cluster number */
 #define	CLUST_RSRVD	0xfffffff6	/* reserved cluster range */
 #define	CLUST_BAD	0xfffffff7	/* a cluster with a defect */
 #define	CLUST_EOFS	0xfffffff8	/* start of eof cluster range */
 #define	CLUST_EOFE	0xffffffff	/* end of eof cluster range */
 
 #define	FAT12_MASK	0x00000fff	/* mask for 12 bit cluster numbers */
 #define	FAT16_MASK	0x0000ffff	/* mask for 16 bit cluster numbers */
 #define	FAT32_MASK	0x0fffffff	/* mask for FAT32 cluster numbers */
 
 /*
  * MSDOSFS:
- * Return true if filesystem uses 12 bit fats. Microsoft Programmer's
+ * Return true if filesystem uses 12 bit FATs. Microsoft Programmer's
  * Reference says if the maximum cluster number in a filesystem is greater
- * than 4078 ((CLUST_RSRVS - CLUST_FIRST) & FAT12_MASK) then we've got a
- * 16 bit fat filesystem. While mounting, the result of this test is stored
+ * than 4084 ((CLUST_RSRVD - CLUST_FIRST) & FAT12_MASK) then we've got a
+ * 16 bit FAT filesystem. While mounting, the result of this test is stored
  * in pm_fatentrysize.
  */
 #define	FAT12(pmp)	(pmp->pm_fatmask == FAT12_MASK)
 #define	FAT16(pmp)	(pmp->pm_fatmask == FAT16_MASK)
 #define	FAT32(pmp)	(pmp->pm_fatmask == FAT32_MASK)
 
 #define	MSDOSFSEOF(pmp, cn)	((((cn) | ~(pmp)->pm_fatmask) & CLUST_EOFS) == CLUST_EOFS)
 
 #ifdef _KERNEL
 /*
  * These are the values for the function argument to the function
  * fatentry().
  */
-#define	FAT_GET		0x0001	/* get a fat entry */
-#define	FAT_SET		0x0002	/* set a fat entry */
+#define	FAT_GET		0x0001	/* get a FAT entry */
+#define	FAT_SET		0x0002	/* set a FAT entry */
 #define	FAT_GET_AND_SET	(FAT_GET | FAT_SET)
 
 /*
  * Flags to extendfile:
  */
 #define	DE_CLEAR	1	/* Zero out the blocks allocated */
 
 int pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int* sp);
 int clusterfree(struct msdosfsmount *pmp, u_long cn, u_long *oldcnp);
 int clusteralloc(struct msdosfsmount *pmp, u_long start, u_long count, u_long fillwith, u_long *retcluster, u_long *got);
 int fatentry(int function, struct msdosfsmount *pmp, u_long cluster, u_long *oldcontents, u_long newcontents);
 int freeclusterchain(struct msdosfsmount *pmp, u_long startchain);
 int extendfile(struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags);
 void fc_purge(struct denode *dep, u_int frcn);
 int markvoldirty(struct msdosfsmount *pmp, int dirty);
 
 #endif	/* _KERNEL */
Index: projects/clang500-import/sys/fs/msdosfs/msdosfs_conv.c
===================================================================
--- projects/clang500-import/sys/fs/msdosfs/msdosfs_conv.c	(revision 318657)
+++ projects/clang500-import/sys/fs/msdosfs/msdosfs_conv.c	(revision 318658)
@@ -1,1078 +1,1078 @@
 /* $FreeBSD$ */
 /*	$NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $	*/
 
 /*-
  * Copyright (C) 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
  *
  * 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 TooLs GmbH.
  * 4. The name of TooLs GmbH may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
  */
 /*-
  * Written by Paul Popelka (paulp@uts.amdahl.com)
  *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
  *
  * This software is provided "as is".
  *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
  *
  * October 1992
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/dirent.h>
 #include <sys/iconv.h>
 #include <sys/mount.h>
 
 #include <fs/msdosfs/bpb.h>
 #include <fs/msdosfs/direntry.h>
 #include <fs/msdosfs/msdosfsmount.h>
 
 extern struct iconv_functions *msdosfs_iconv;
 
 static int mbsadjpos(const char **, size_t, size_t, int, int, void *handle);
 static u_char * dos2unixchr(u_char *, const u_char **, size_t *, int, struct msdosfsmount *);
 static uint16_t unix2doschr(const u_char **, size_t *, struct msdosfsmount *);
 static u_char * win2unixchr(u_char *, uint16_t, struct msdosfsmount *);
 static uint16_t unix2winchr(const u_char **, size_t *, int, struct msdosfsmount *);
 
 /*
  * 0 - character disallowed in long file name.
  * 1 - character should be replaced by '_' in DOS file name, 
  *     and generation number inserted.
  * 2 - character ('.' and ' ') should be skipped in DOS file name,
  *     and generation number inserted.
  */
-static u_char
+static const u_char
 unix2dos[256] = {
 /* iso8859-1 -> cp850 */
 	0,    0,    0,    0,    0,    0,    0,    0,	/* 00-07 */
 	0,    0,    0,    0,    0,    0,    0,    0,	/* 08-0f */
 	0,    0,    0,    0,    0,    0,    0,    0,	/* 10-17 */
 	0,    0,    0,    0,    0,    0,    0,    0,	/* 18-1f */
 	2,    0x21, 0,    0x23, 0x24, 0x25, 0x26, 0x27,	/* 20-27 */
 	0x28, 0x29, 0,    1,    1,    0x2d, 2,    0,	/* 28-2f */
 	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,	/* 30-37 */
 	0x38, 0x39, 0,    1,    0,    1,    0,    0,	/* 38-3f */
 	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,	/* 40-47 */
 	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,	/* 48-4f */
 	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,	/* 50-57 */
 	0x58, 0x59, 0x5a, 1,    0,    1,    0x5e, 0x5f,	/* 58-5f */
 	0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,	/* 60-67 */
 	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,	/* 68-6f */
 	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,	/* 70-77 */
 	0x58, 0x59, 0x5a, 0x7b, 0,    0x7d, 0x7e, 0,	/* 78-7f */
 	0,    0,    0,    0,    0,    0,    0,    0,	/* 80-87 */
 	0,    0,    0,    0,    0,    0,    0,    0,	/* 88-8f */
 	0,    0,    0,    0,    0,    0,    0,    0,	/* 90-97 */
 	0,    0,    0,    0,    0,    0,    0,    0,	/* 98-9f */
 	0,    0xad, 0xbd, 0x9c, 0xcf, 0xbe, 0xdd, 0xf5,	/* a0-a7 */
 	0xf9, 0xb8, 0xa6, 0xae, 0xaa, 0xf0, 0xa9, 0xee,	/* a8-af */
 	0xf8, 0xf1, 0xfd, 0xfc, 0xef, 0xe6, 0xf4, 0xfa,	/* b0-b7 */
 	0xf7, 0xfb, 0xa7, 0xaf, 0xac, 0xab, 0xf3, 0xa8,	/* b8-bf */
 	0xb7, 0xb5, 0xb6, 0xc7, 0x8e, 0x8f, 0x92, 0x80,	/* c0-c7 */
 	0xd4, 0x90, 0xd2, 0xd3, 0xde, 0xd6, 0xd7, 0xd8,	/* c8-cf */
 	0xd1, 0xa5, 0xe3, 0xe0, 0xe2, 0xe5, 0x99, 0x9e,	/* d0-d7 */
 	0x9d, 0xeb, 0xe9, 0xea, 0x9a, 0xed, 0xe8, 0xe1,	/* d8-df */
 	0xb7, 0xb5, 0xb6, 0xc7, 0x8e, 0x8f, 0x92, 0x80,	/* e0-e7 */
 	0xd4, 0x90, 0xd2, 0xd3, 0xde, 0xd6, 0xd7, 0xd8,	/* e8-ef */
 	0xd1, 0xa5, 0xe3, 0xe0, 0xe2, 0xe5, 0x99, 0xf6,	/* f0-f7 */
 	0x9d, 0xeb, 0xe9, 0xea, 0x9a, 0xed, 0xe8, 0x98,	/* f8-ff */
 };
 
-static u_char
+static const u_char
 dos2unix[256] = {
 /* cp850 -> iso8859-1 */
 	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,	/* 00-07 */
 	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,	/* 08-0f */
 	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,	/* 10-17 */
 	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,	/* 18-1f */
 	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,	/* 20-27 */
 	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,	/* 28-2f */
 	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,	/* 30-37 */
 	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,	/* 38-3f */
 	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,	/* 40-47 */
 	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,	/* 48-4f */
 	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,	/* 50-57 */
 	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,	/* 58-5f */
 	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,	/* 60-67 */
 	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,	/* 68-6f */
 	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,	/* 70-77 */
 	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,	/* 78-7f */
 	0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7,	/* 80-87 */
 	0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,	/* 88-8f */
 	0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9,	/* 90-97 */
 	0xff, 0xd6, 0xdc, 0xf8, 0xa3, 0xd8, 0xd7, 0x3f,	/* 98-9f */
 	0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba,	/* a0-a7 */
 	0xbf, 0xae, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,	/* a8-af */
 	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xc1, 0xc2, 0xc0,	/* b0-b7 */
 	0xa9, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0xa5, 0x3f,	/* b8-bf */
 	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xe3, 0xc3,	/* c0-c7 */
 	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa4,	/* c8-cf */
 	0xf0, 0xd0, 0xca, 0xcb, 0xc8, 0x3f, 0xcd, 0xce,	/* d0-d7 */
 	0xcf, 0x3f, 0x3f, 0x3f, 0x3f, 0xa6, 0xcc, 0x3f,	/* d8-df */
 	0xd3, 0xdf, 0xd4, 0xd2, 0xf5, 0xd5, 0xb5, 0xfe,	/* e0-e7 */
 	0xde, 0xda, 0xdb, 0xd9, 0xfd, 0xdd, 0xaf, 0x3f,	/* e8-ef */
 	0xad, 0xb1, 0x3f, 0xbe, 0xb6, 0xa7, 0xf7, 0xb8,	/* f0-f7 */
 	0xb0, 0xa8, 0xb7, 0xb9, 0xb3, 0xb2, 0x3f, 0x3f,	/* f8-ff */
 };
 
-static u_char
+static const u_char
 u2l[256] = {
 /* tolower */
 	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 00-07 */
 	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 08-0f */
 	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 10-17 */
 	0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, /* 18-1f */
 	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 20-27 */
 	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, /* 28-2f */
 	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 30-37 */
 	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, /* 38-3f */
 	0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 40-47 */
 	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /* 48-4f */
 	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 50-57 */
 	0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, /* 58-5f */
 	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 60-67 */
 	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /* 68-6f */
 	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 70-77 */
 	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, /* 78-7f */
 	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, /* 80-87 */
 	0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, /* 88-8f */
 	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, /* 90-97 */
 	0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, /* 98-9f */
 	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, /* a0-a7 */
 	0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, /* a8-af */
 	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, /* b0-b7 */
 	0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, /* b8-bf */
 	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* c0-c7 */
 	0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* c8-cf */
 	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xd7, /* d0-d7 */
 	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xdf, /* d8-df */
 	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* e0-e7 */
 	0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* e8-ef */
 	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* f0-f7 */
 	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* f8-ff */
 };
 
-static u_char
+static const u_char
 l2u[256] = {
 /* toupper */
 	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 00-07 */
 	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 08-0f */
 	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 10-17 */
 	0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, /* 18-1f */
 	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 20-27 */
 	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, /* 28-2f */
 	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 30-37 */
 	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, /* 38-3f */
 	0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 40-47 */
 	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /* 48-4f */
 	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 50-57 */
 	0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, /* 58-5f */
 	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 60-67 */
 	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /* 68-6f */
 	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 70-77 */
 	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, /* 78-7f */
 	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, /* 80-87 */
 	0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, /* 88-8f */
 	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, /* 90-97 */
 	0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, /* 98-9f */
 	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, /* a0-a7 */
 	0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, /* a8-af */
 	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, /* b0-b7 */
 	0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, /* b8-bf */
 	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* c0-c7 */
 	0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* c8-cf */
 	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xd7, /* d0-d7 */
 	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xdf, /* d8-df */
 	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* e0-e7 */
 	0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* e8-ef */
 	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* f0-f7 */
 	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* f8-ff */
 };
 
 /*
  * DOS filenames are made of 2 parts, the name part and the extension part.
  * The name part is 8 characters long and the extension part is 3
  * characters long.  They may contain trailing blanks if the name or
  * extension are not long enough to fill their respective fields.
  */
 
 /*
  * Convert a DOS filename to a unix filename. And, return the number of
  * characters in the resulting unix filename excluding the terminating
  * null.
  */
 int
 dos2unixfn(u_char dn[11], u_char *un, int lower, struct msdosfsmount *pmp)
 {
 	size_t i;
 	int thislong = 0;
 	u_char *c, tmpbuf[5];
 
 	/*
 	 * If first char of the filename is SLOT_E5 (0x05), then the real
 	 * first char of the filename should be 0xe5. But, they couldn't
 	 * just have a 0xe5 mean 0xe5 because that is used to mean a freed
 	 * directory slot. Another dos quirk.
 	 */
 	if (*dn == SLOT_E5)
 		*dn = 0xe5;
 
 	/*
 	 * Copy the name portion into the unix filename string.
 	 */
 	for (i = 8; i > 0 && *dn != ' ';) {
 		c = dos2unixchr(tmpbuf, __DECONST(const u_char **, &dn), &i,
 		    lower & LCASE_BASE, pmp);
 		while (*c != '\0') {
 			*un++ = *c++;
 			thislong++;
 		}
 	}
 	dn += i;
 
 	/*
 	 * Now, if there is an extension then put in a period and copy in
 	 * the extension.
 	 */
 	if (*dn != ' ') {
 		*un++ = '.';
 		thislong++;
 		for (i = 3; i > 0 && *dn != ' ';) {
 			c = dos2unixchr(tmpbuf, __DECONST(const u_char **, &dn),
 			    &i, lower & LCASE_EXT, pmp);
 			while (*c != '\0') {
 				*un++ = *c++;
 				thislong++;
 			}
 		}
 	}
 	*un++ = 0;
 
 	return (thislong);
 }
 
 /*
  * Convert a unix filename to a DOS filename according to Win95 rules.
  * If applicable and gen is not 0, it is inserted into the converted
  * filename as a generation number.
  * Returns
  *	0 if name couldn't be converted
  *	1 if the converted name is the same as the original
  *	  (no long filename entry necessary for Win95)
  *	2 if conversion was successful
  *	3 if conversion was successful and generation number was inserted
  */
 int
 unix2dosfn(const u_char *un, u_char dn[12], size_t unlen, u_int gen,
     struct msdosfsmount *pmp)
 {
 	ssize_t i, j;
 	int l;
 	int conv = 1;
 	const u_char *cp, *dp, *dp1;
 	u_char gentext[6], *wcp;
 	uint16_t c;
 
 	/*
 	 * Fill the dos filename string with blanks. These are DOS's pad
 	 * characters.
 	 */
 	for (i = 0; i < 11; i++)
 		dn[i] = ' ';
 	dn[11] = 0;
 
 	/*
 	 * The filenames "." and ".." are handled specially, since they
 	 * don't follow dos filename rules.
 	 */
 	if (un[0] == '.' && unlen == 1) {
 		dn[0] = '.';
 		return gen <= 1;
 	}
 	if (un[0] == '.' && un[1] == '.' && unlen == 2) {
 		dn[0] = '.';
 		dn[1] = '.';
 		return gen <= 1;
 	}
 
 	/*
 	 * Filenames with only blanks and dots are not allowed!
 	 */
 	for (cp = un, i = unlen; --i >= 0; cp++)
 		if (*cp != ' ' && *cp != '.')
 			break;
 	if (i < 0)
 		return 0;
 
 
 	/*
 	 * Filenames with some characters are not allowed!
 	 */
 	for (cp = un, i = unlen; i > 0;)
 		if (unix2doschr(&cp, (size_t *)&i, pmp) == 0)
 			return 0;
 
 	/*
 	 * Now find the extension
 	 * Note: dot as first char doesn't start extension
 	 *	 and trailing dots and blanks are ignored
 	 * Note(2003/7): It seems recent Windows has
 	 *	 defferent rule than this code, that Windows
 	 *	 ignores all dots before extension, and use all
 	 * 	 chars as filename except for dots.
 	 */
 	dp = dp1 = NULL;
 	for (cp = un + 1, i = unlen - 1; --i >= 0;) {
 		switch (*cp++) {
 		case '.':
 			if (!dp1)
 				dp1 = cp;
 			break;
 		case ' ':
 			break;
 		default:
 			if (dp1)
 				dp = dp1;
 			dp1 = NULL;
 			break;
 		}
 	}
 
 	/*
 	 * Now convert it (this part is for extension).
 	 * As Windows XP do, if it's not ascii char,
 	 * this function should return 2 or 3, so that checkng out Unicode name.
 	 */
 	if (dp) {
 		if (dp1)
 			l = dp1 - dp;
 		else
 			l = unlen - (dp - un);
 		for (cp = dp, i = l, j = 8; i > 0 && j < 11; j++) {
 			c = unix2doschr(&cp, (size_t *)&i, pmp);
 			if (c & 0xff00) {
 				dn[j] = c >> 8;
 				if (++j < 11) {
 					dn[j] = c;
 					if (conv != 3)
 						conv = 2;
 					continue;
 				} else {
 					conv = 3;
 					dn[j-1] = ' ';
 					break;
 				}
 			} else {
 				dn[j] = c;
 			}
 			if (((dn[j] & 0x80) || *(cp - 1) != dn[j]) && conv != 3)
 				conv = 2;
 			if (dn[j] == 1) {
 				conv = 3;
 				dn[j] = '_';
 			}
 			if (dn[j] == 2) {
 				conv = 3;
 				dn[j--] = ' ';
 			}
 		}
 		if (i > 0)
 			conv = 3;
 		dp--;
 	} else {
 		for (dp = cp; *--dp == ' ' || *dp == '.';);
 		dp++;
 	}
 
 	/*
 	 * Now convert the rest of the name
 	 */
 	for (i = dp - un, j = 0; un < dp && j < 8; j++) {
 		c = unix2doschr(&un, &i, pmp);
 		if (c & 0xff00) {
 			dn[j] = c >> 8;
 			if (++j < 8) {
 				dn[j] = c;
 				if (conv != 3)
 					conv = 2;
 				continue;
 			} else {
 				conv = 3;
 				dn[j-1] = ' ';
 				break;
 			}
 		} else {
 			dn[j] = c;
 		}
 		if (((dn[j] & 0x80) || *(un - 1) != dn[j]) && conv != 3)
 			conv = 2;
 		if (dn[j] == 1) {
 			conv = 3;
 			dn[j] = '_';
 		}
 		if (dn[j] == 2) {
 			conv = 3;
 			dn[j--] = ' ';
 		}
 	}
 	if (un < dp)
 		conv = 3;
 	/*
 	 * If we didn't have any chars in filename,
 	 * generate a default
 	 */
 	if (!j)
 		dn[0] = '_';
 
 	/*
 	 * If there wasn't any char dropped,
 	 * there is no place for generation numbers
 	 */
 	if (conv != 3) {
 		if (gen > 1)
 			conv = 0;
 		goto done;
 	}
 
 	/*
 	 * Now insert the generation number into the filename part
 	 */
 	if (gen == 0)
 		goto done;
 	for (wcp = gentext + sizeof(gentext); wcp > gentext && gen; gen /= 10)
 		*--wcp = gen % 10 + '0';
 	if (gen) {
 		conv = 0;
 		goto done;
 	}
 	for (i = 8; dn[--i] == ' ';);
 	i++;
 	if (gentext + sizeof(gentext) - wcp + 1 > 8 - i)
 		i = 8 - (gentext + sizeof(gentext) - wcp + 1);
 	/*
 	 * Correct posision to where insert the generation number
 	 */
 	cp = dn;
 	i -= mbsadjpos((const char**)&cp, i, unlen, 1, pmp->pm_flags, pmp->pm_d2u);
 
 	dn[i++] = '~';
 	while (wcp < gentext + sizeof(gentext))
 		dn[i++] = *wcp++;
 
 	/*
 	 * Tail of the filename should be space
 	 */
 	while (i < 8)
 		dn[i++] = ' ';
 	conv = 3;
 
 done:
 	/*
 	 * The first character cannot be E5,
 	 * because that means a deleted entry
 	 */
 	if (dn[0] == 0xe5)
 		dn[0] = SLOT_E5;
 
 	return conv;
 }
 
 /*
  * Create a Win95 long name directory entry
  * Note: assumes that the filename is valid,
  *	 i.e. doesn't consist solely of blanks and dots
  */
 int
 unix2winfn(const u_char *un, size_t unlen, struct winentry *wep, int cnt,
     int chksum, struct msdosfsmount *pmp)
 {
 	uint8_t *wcp;
 	int i, end;
 	uint16_t code;
 
 	/*
 	 * Drop trailing blanks and dots
 	 */
 	unlen = winLenFixup(un, unlen);
 
 	/*
 	 * Cut *un for this slot
 	 */
 	unlen = mbsadjpos((const char **)&un, unlen, (cnt - 1) * WIN_CHARS, 2,
 			  pmp->pm_flags, pmp->pm_u2w);
 
 	/*
 	 * Initialize winentry to some useful default
 	 */
 	for (wcp = (uint8_t *)wep, i = sizeof(*wep); --i >= 0; *wcp++ = 0xff);
 	wep->weCnt = cnt;
 	wep->weAttributes = ATTR_WIN95;
 	wep->weReserved1 = 0;
 	wep->weChksum = chksum;
 	wep->weReserved2 = 0;
 
 	/*
 	 * Now convert the filename parts
 	 */
 	end = 0;
 	for (wcp = wep->wePart1, i = sizeof(wep->wePart1)/2; --i >= 0 && !end;) {
 		code = unix2winchr(&un, &unlen, 0, pmp);
 		*wcp++ = code;
 		*wcp++ = code >> 8;
 		if (!code)
 			end = WIN_LAST;
 	}
 	for (wcp = wep->wePart2, i = sizeof(wep->wePart2)/2; --i >= 0 && !end;) {
 		code = unix2winchr(&un, &unlen, 0, pmp);
 		*wcp++ = code;
 		*wcp++ = code >> 8;
 		if (!code)
 			end = WIN_LAST;
 	}
 	for (wcp = wep->wePart3, i = sizeof(wep->wePart3)/2; --i >= 0 && !end;) {
 		code = unix2winchr(&un, &unlen, 0, pmp);
 		*wcp++ = code;
 		*wcp++ = code >> 8;
 		if (!code)
 			end = WIN_LAST;
 	}
 	if (*un == '\0')
 		end = WIN_LAST;
 	wep->weCnt |= end;
 	return !end;
 }
 
 /*
  * Compare our filename to the one in the Win95 entry
  * Returns the checksum or -1 if no match
  */
 int
 winChkName(struct mbnambuf *nbp, const u_char *un, size_t unlen, int chksum,
     struct msdosfsmount *pmp)
 {
 	size_t len;
 	uint16_t c1, c2;
 	u_char *np;
 	struct dirent dirbuf;
 
 	/*
 	 * We already have winentry in *nbp.
 	 */
 	if (!mbnambuf_flush(nbp, &dirbuf) || dirbuf.d_namlen == 0)
 		return -1;
 
 #ifdef MSDOSFS_DEBUG
 	printf("winChkName(): un=%s:%d,d_name=%s:%d\n", un, unlen,
 							dirbuf.d_name,
 							dirbuf.d_namlen);
 #endif
 
 	/*
 	 * Compare the name parts
 	 */
 	len = dirbuf.d_namlen;
 	if (unlen != len)
 		return -2;
 
 	for (np = dirbuf.d_name; unlen > 0 && len > 0;) {
 		/*
 		 * Comparison must be case insensitive, because FAT disallows
 		 * to look up or create files in case sensitive even when
 		 * it's a long file name.
 		 */
 		c1 = unix2winchr(__DECONST(const u_char **, &np), &len,
 		    LCASE_BASE, pmp);
 		c2 = unix2winchr(&un, &unlen, LCASE_BASE, pmp);
 		if (c1 != c2)
 			return -2;
 	}
 	return chksum;
 }
 
 /*
  * Convert Win95 filename to dirbuf.
  * Returns the checksum or -1 if impossible
  */
 int
 win2unixfn(struct mbnambuf *nbp, struct winentry *wep, int chksum,
     struct msdosfsmount *pmp)
 {
 	u_char *c, tmpbuf[5];
 	uint8_t *cp;
 	uint8_t *np, name[WIN_CHARS * 3 + 1];
 	uint16_t code;
 	int i;
 
 	if ((wep->weCnt&WIN_CNT) > howmany(WIN_MAXLEN, WIN_CHARS)
 	    || !(wep->weCnt&WIN_CNT))
 		return -1;
 
 	/*
 	 * First compare checksums
 	 */
 	if (wep->weCnt&WIN_LAST) {
 		chksum = wep->weChksum;
 	} else if (chksum != wep->weChksum)
 		chksum = -1;
 	if (chksum == -1)
 		return -1;
 
 	/*
 	 * Convert the name parts
 	 */
 	np = name;
 	for (cp = wep->wePart1, i = sizeof(wep->wePart1)/2; --i >= 0;) {
 		code = (cp[1] << 8) | cp[0];
 		switch (code) {
 		case 0:
 			*np = '\0';
 			if (mbnambuf_write(nbp, name,
 			    (wep->weCnt & WIN_CNT) - 1) != 0)
 				return -1;
 			return chksum;
 		case '/':
 			*np = '\0';
 			return -1;
 		default:
 			c = win2unixchr(tmpbuf, code, pmp);
 			while (*c != '\0')
 				*np++ = *c++;
 			break;
 		}
 		cp += 2;
 	}
 	for (cp = wep->wePart2, i = sizeof(wep->wePart2)/2; --i >= 0;) {
 		code = (cp[1] << 8) | cp[0];
 		switch (code) {
 		case 0:
 			*np = '\0';
 			if (mbnambuf_write(nbp, name,
 			    (wep->weCnt & WIN_CNT) - 1) != 0)
 				return -1;
 			return chksum;
 		case '/':
 			*np = '\0';
 			return -1;
 		default:
 			c = win2unixchr(tmpbuf, code, pmp);
 			while (*c != '\0')
 				*np++ = *c++;
 			break;
 		}
 		cp += 2;
 	}
 	for (cp = wep->wePart3, i = sizeof(wep->wePart3)/2; --i >= 0;) {
 		code = (cp[1] << 8) | cp[0];
 		switch (code) {
 		case 0:
 			*np = '\0';
 			if (mbnambuf_write(nbp, name,
 			    (wep->weCnt & WIN_CNT) - 1) != 0)
 				return -1;
 			return chksum;
 		case '/':
 			*np = '\0';
 			return -1;
 		default:
 			c = win2unixchr(tmpbuf, code, pmp);
 			while (*c != '\0')
 				*np++ = *c++;
 			break;
 		}
 		cp += 2;
 	}
 	*np = '\0';
 	if (mbnambuf_write(nbp, name, (wep->weCnt & WIN_CNT) - 1) != 0)
 		return -1;
 	return chksum;
 }
 
 /*
  * Compute the unrolled checksum of a DOS filename for Win95 LFN use.
  */
 uint8_t
 winChksum(uint8_t *name)
 {
 	int i;
 	uint8_t s;
 
 	for (s = 0, i = 11; --i >= 0; s += *name++)
 		s = (s << 7)|(s >> 1);
 	return (s);
 }
 
 /*
  * Determine the number of slots necessary for Win95 names
  */
 int
 winSlotCnt(const u_char *un, size_t unlen, struct msdosfsmount *pmp)
 {
 	size_t wlen;
 	char wn[WIN_MAXLEN * 2 + 1], *wnp;
 
 	unlen = winLenFixup(un, unlen);
 
 	if (pmp->pm_flags & MSDOSFSMNT_KICONV && msdosfs_iconv) {
 		wlen = WIN_MAXLEN * 2;
 		wnp = wn;
 		msdosfs_iconv->conv(pmp->pm_u2w, (const char **)&un, &unlen, &wnp, &wlen);
 		if (unlen > 0)
 			return 0;
 		return howmany(WIN_MAXLEN - wlen/2, WIN_CHARS);
 	}
 
 	if (unlen > WIN_MAXLEN)
 		return 0;
 	return howmany(unlen, WIN_CHARS);
 }
 
 /*
  * Determine the number of bytes necessary for Win95 names
  */
 size_t
 winLenFixup(const u_char *un, size_t unlen)
 {
 	for (un += unlen; unlen > 0; unlen--)
 		if (*--un != ' ' && *un != '.')
 			break;
 	return unlen;
 }
 
 /*
  * Store an area with multi byte string instr, and returns left
  * byte of instr and moves pointer forward. The area's size is
  * inlen or outlen.
  */
 static int
 mbsadjpos(const char **instr, size_t inlen, size_t outlen, int weight, int flag, void *handle)
 {
 	char *outp, outstr[outlen * weight + 1];
 
 	if (flag & MSDOSFSMNT_KICONV && msdosfs_iconv) {
 		outp = outstr;
 		outlen *= weight;
 		msdosfs_iconv->conv(handle, instr, &inlen, &outp, &outlen);
 		return (inlen);
 	}
 
 	(*instr) += min(inlen, outlen);
 	return (inlen - min(inlen, outlen));
 }
 
 /*
  * Convert DOS char to Local char
  */
 static u_char *
 dos2unixchr(u_char *outbuf, const u_char **instr, size_t *ilen, int lower, struct msdosfsmount *pmp)
 {
 	u_char c, *outp;
 	size_t len, olen;
 
 	outp = outbuf;
 	if (pmp->pm_flags & MSDOSFSMNT_KICONV && msdosfs_iconv) {
 		olen = len = 4;
 
 		if (lower & (LCASE_BASE | LCASE_EXT))
 			msdosfs_iconv->convchr_case(pmp->pm_d2u, (const char **)instr,
 						  ilen, (char **)&outp, &olen, KICONV_LOWER);
 		else
 			msdosfs_iconv->convchr(pmp->pm_d2u, (const char **)instr,
 					     ilen, (char **)&outp, &olen);
 		len -= olen;
 
 		/*
 		 * return '?' if failed to convert
 		 */
 		if (len == 0) {
 			(*ilen)--;
 			(*instr)++;
 			*outp++ = '?';
 		}
 	} else {
 		(*ilen)--;
 		c = *(*instr)++;
 		c = dos2unix[c];
 		if (lower & (LCASE_BASE | LCASE_EXT))
 			c = u2l[c];
 		*outp++ = c;
 		outbuf[1] = '\0';
 	}
 
 	*outp = '\0';
 	outp = outbuf;
 	return (outp);
 }
 
 /*
  * Convert Local char to DOS char
  */
 static uint16_t
 unix2doschr(const u_char **instr, size_t *ilen, struct msdosfsmount *pmp)
 {
 	u_char c;
 	char *up, *outp, unicode[3], outbuf[3];
 	uint16_t wc;
 	size_t len, ucslen, unixlen, olen;
 
 	if (pmp->pm_flags & MSDOSFSMNT_KICONV && msdosfs_iconv) {
 		/*
 		 * to hide an invisible character, using a unicode filter
 		 */
 		ucslen = 2;
 		len = *ilen;
 		up = unicode;
 		msdosfs_iconv->convchr(pmp->pm_u2w, (const char **)instr,
 				     ilen, &up, &ucslen);
 		unixlen = len - *ilen;
 
 		/*
 		 * cannot be converted
 		 */
 		if (unixlen == 0) {
 			(*ilen)--;
 			(*instr)++;
 			return (0);
 		}
 
 		/*
 		 * return magic number for ascii char
 		 */
 		if (unixlen == 1) {
 			c = *(*instr -1);
 			if (! (c & 0x80)) {
 				c = unix2dos[c];
 				if (c <= 2)
 					return (c);
 			}
 		}
 
 		/*
 		 * now convert using libiconv
 		 */
 		*instr -= unixlen;
 		*ilen = len;
 
 		olen = len = 2;
 		outp = outbuf;
 		msdosfs_iconv->convchr_case(pmp->pm_u2d, (const char **)instr,
 					  ilen, &outp, &olen, KICONV_FROM_UPPER);
 		len -= olen;
 
 		/*
 		 * cannot be converted, but has unicode char, should return magic number
 		 */
 		if (len == 0) {
 			(*ilen) -= unixlen;
 			(*instr) += unixlen;
 			return (1);
 		}
 
 		wc = 0;
 		while(len--)
 			wc |= (*(outp - len - 1) & 0xff) << (len << 3);
 		return (wc);
 	}
 
 	(*ilen)--;
 	c = *(*instr)++;
 	c = l2u[c];
 	c = unix2dos[c];
 	return ((uint16_t)c);
 }
 
 /*
  * Convert Windows char to Local char
  */
 static u_char *
 win2unixchr(u_char *outbuf, uint16_t wc, struct msdosfsmount *pmp)
 {
 	u_char *inp, *outp, inbuf[3];
 	size_t ilen, olen, len;
 
 	outp = outbuf;
 	if (pmp->pm_flags & MSDOSFSMNT_KICONV && msdosfs_iconv) {
 		inbuf[0] = (u_char)(wc>>8);
 		inbuf[1] = (u_char)wc;
 		inbuf[2] = '\0';
 
 		ilen = 2;
 		olen = len = 4;
 		inp = inbuf;
 		msdosfs_iconv->convchr(pmp->pm_w2u, __DECONST(const char **,
 		    &inp), &ilen, (char **)&outp, &olen);
 		len -= olen;
 
 		/*
 		 * return '?' if failed to convert
 		 */
 		if (len == 0)
 			*outp++ = '?';
 	} else {
 		*outp++ = (wc & 0xff00) ? '?' : (u_char)(wc & 0xff);
 	}
 
 	*outp = '\0';
 	outp = outbuf;
 	return (outp);
 }
 
 /*
  * Convert Local char to Windows char
  */
 static uint16_t
 unix2winchr(const u_char **instr, size_t *ilen, int lower, struct msdosfsmount *pmp)
 {
 	u_char *outp, outbuf[3];
 	uint16_t wc;
 	size_t olen;
 
 	if (*ilen == 0)
 		return (0);
 
 	if (pmp->pm_flags & MSDOSFSMNT_KICONV && msdosfs_iconv) {
 		outp = outbuf;
 		olen = 2;
 		if (lower & (LCASE_BASE | LCASE_EXT))
 			msdosfs_iconv->convchr_case(pmp->pm_u2w, (const char **)instr,
 						  ilen, (char **)&outp, &olen,
 						  KICONV_FROM_LOWER);
 		else
 			msdosfs_iconv->convchr(pmp->pm_u2w, (const char **)instr,
 					     ilen, (char **)&outp, &olen);
 
 		/*
 		 * return '0' if end of filename
 		 */
 		if (olen == 2)
 			return (0);
 
 		wc = (outbuf[0]<<8) | outbuf[1];
 
 		return (wc);
 	}
 
 	(*ilen)--;
 	wc = (*instr)[0];
 	if (lower & (LCASE_BASE | LCASE_EXT))
 		wc = u2l[wc];
 	(*instr)++;
 	return (wc);
 }
 
 /*
  * Initialize the temporary concatenation buffer.
  */
 void
 mbnambuf_init(struct mbnambuf *nbp)
 {
 
 	nbp->nb_len = 0;
 	nbp->nb_last_id = -1;
 	nbp->nb_buf[sizeof(nbp->nb_buf) - 1] = '\0';
 }
 
 /*
  * Fill out our concatenation buffer with the given substring, at the offset
  * specified by its id.  Since this function must be called with ids in
  * descending order, we take advantage of the fact that ASCII substrings are
  * exactly WIN_CHARS in length.  For non-ASCII substrings, we shift all
  * previous (i.e. higher id) substrings upwards to make room for this one.
  * This only penalizes portions of substrings that contain more than
  * WIN_CHARS bytes when they are first encountered.
  */
 int
 mbnambuf_write(struct mbnambuf *nbp, char *name, int id)
 {
 	char *slot;
 	size_t count, newlen;
 
 	if (nbp->nb_len != 0 && id != nbp->nb_last_id - 1) {
 #ifdef MSDOSFS_DEBUG
 		printf("msdosfs: non-decreasing id: id %d, last id %d\n",
 		    id, nbp->nb_last_id);
 #endif
 		return (EINVAL);
 	}
 
 	/* Will store this substring in a WIN_CHARS-aligned slot. */
 	slot = &nbp->nb_buf[id * WIN_CHARS];
 	count = strlen(name);
 	newlen = nbp->nb_len + count;
 	if (newlen > WIN_MAXLEN || newlen > MAXNAMLEN) {
 #ifdef MSDOSFS_DEBUG
 		printf("msdosfs: file name length %zu too large\n", newlen);
 #endif
 		return (ENAMETOOLONG);
 	}
 
 	/* Shift suffix upwards by the amount length exceeds WIN_CHARS. */
 	if (count > WIN_CHARS && nbp->nb_len != 0) {
 		if ((id * WIN_CHARS + count + nbp->nb_len) >
 		    sizeof(nbp->nb_buf))
 			return (ENAMETOOLONG);
 
 		bcopy(slot + WIN_CHARS, slot + count, nbp->nb_len);
 	}
 
 	/* Copy in the substring to its slot and update length so far. */
 	bcopy(name, slot, count);
 	nbp->nb_len = newlen;
 	nbp->nb_last_id = id;
 
 	return (0);
 }
 
 /*
  * Take the completed string and use it to setup the struct dirent.
  * Be sure to always nul-terminate the d_name and then copy the string
  * from our buffer.  Note that this function assumes the full string has
  * been reassembled in the buffer.  If it's called before all substrings
  * have been written via mbnambuf_write(), the result will be incorrect.
  */
 char *
 mbnambuf_flush(struct mbnambuf *nbp, struct dirent *dp)
 {
 
 	if (nbp->nb_len > sizeof(dp->d_name) - 1) {
 		mbnambuf_init(nbp);
 		return (NULL);
 	}
 	bcopy(&nbp->nb_buf[0], dp->d_name, nbp->nb_len);
 	dp->d_name[nbp->nb_len] = '\0';
 	dp->d_namlen = nbp->nb_len;
 
 	mbnambuf_init(nbp);
 	return (dp->d_name);
 }
Index: projects/clang500-import/sys/fs/msdosfs/msdosfs_denode.c
===================================================================
--- projects/clang500-import/sys/fs/msdosfs/msdosfs_denode.c	(revision 318657)
+++ projects/clang500-import/sys/fs/msdosfs/msdosfs_denode.c	(revision 318658)
@@ -1,615 +1,615 @@
 /* $FreeBSD$ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
  *
  * 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 TooLs GmbH.
  * 4. The name of TooLs GmbH may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
  */
 /*-
  * Written by Paul Popelka (paulp@uts.amdahl.com)
  *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
  *
  * This software is provided "as is".
  *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
  *
  * October 1992
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/clock.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/vmmeter.h>
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
 #include <fs/msdosfs/bpb.h>
 #include <fs/msdosfs/direntry.h>
 #include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
 #include <fs/msdosfs/msdosfsmount.h>
 
 static MALLOC_DEFINE(M_MSDOSFSNODE, "msdosfs_node", "MSDOSFS vnode private part");
 
 static int
 de_vncmpf(struct vnode *vp, void *arg)
 {
 	struct denode *de;
 	uint64_t *a;
 
 	a = arg;
 	de = VTODE(vp);
 	return (de->de_inode != *a);
 }
 
 /*
  * If deget() succeeds it returns with the gotten denode locked().
  *
  * pmp	     - address of msdosfsmount structure of the filesystem containing
  *	       the denode of interest.  The address of
  *	       the msdosfsmount structure are used.
  * dirclust  - which cluster bp contains, if dirclust is 0 (root directory)
  *	       diroffset is relative to the beginning of the root directory,
  *	       otherwise it is cluster relative.
  * diroffset - offset past begin of cluster of denode we want
  * depp	     - returns the address of the gotten denode.
  */
 int
 deget(struct msdosfsmount *pmp, u_long dirclust, u_long diroffset,
     struct denode **depp)
 {
 	int error;
 	uint64_t inode;
 	struct mount *mntp = pmp->pm_mountp;
 	struct direntry *direntptr;
 	struct denode *ldep;
 	struct vnode *nvp, *xvp;
 	struct buf *bp;
 
 #ifdef MSDOSFS_DEBUG
 	printf("deget(pmp %p, dirclust %lu, diroffset %lx, depp %p)\n",
 	    pmp, dirclust, diroffset, depp);
 #endif
 
 	/*
 	 * On FAT32 filesystems, root is a (more or less) normal
 	 * directory
 	 */
 	if (FAT32(pmp) && dirclust == MSDOSFSROOT)
 		dirclust = pmp->pm_rootdirblk;
 
 	/*
 	 * See if the denode is in the denode cache. Use the location of
 	 * the directory entry to compute the hash value. For subdir use
 	 * address of "." entry. For root dir (if not FAT32) use cluster
 	 * MSDOSFSROOT, offset MSDOSFSROOT_OFS
 	 *
 	 * NOTE: The check for de_refcnt > 0 below insures the denode being
 	 * examined does not represent an unlinked but still open file.
 	 * These files are not to be accessible even when the directory
 	 * entry that represented the file happens to be reused while the
 	 * deleted file is still open.
 	 */
 	inode = (uint64_t)pmp->pm_bpcluster * dirclust + diroffset;
 
 	error = vfs_hash_get(mntp, inode, LK_EXCLUSIVE, curthread, &nvp,
 	    de_vncmpf, &inode);
 	if (error)
 		return (error);
 	if (nvp != NULL) {
 		*depp = VTODE(nvp);
 		KASSERT((*depp)->de_dirclust == dirclust, ("wrong dirclust"));
 		KASSERT((*depp)->de_diroffset == diroffset, ("wrong diroffset"));
 		return (0);
 	}
 	ldep = malloc(sizeof(struct denode), M_MSDOSFSNODE, M_WAITOK | M_ZERO);
 
 	/*
 	 * Directory entry was not in cache, have to create a vnode and
 	 * copy it from the passed disk buffer.
 	 */
 	/* getnewvnode() does a VREF() on the vnode */
 	error = getnewvnode("msdosfs", mntp, &msdosfs_vnodeops, &nvp);
 	if (error) {
 		*depp = NULL;
 		free(ldep, M_MSDOSFSNODE);
 		return error;
 	}
 	nvp->v_data = ldep;
 	ldep->de_vnode = nvp;
 	ldep->de_flag = 0;
 	ldep->de_dirclust = dirclust;
 	ldep->de_diroffset = diroffset;
 	ldep->de_inode = inode;
 	lockmgr(nvp->v_vnlock, LK_EXCLUSIVE, NULL);
-	fc_purge(ldep, 0);	/* init the fat cache for this denode */
+	fc_purge(ldep, 0);	/* init the FAT cache for this denode */
 	error = insmntque(nvp, mntp);
 	if (error != 0) {
 		free(ldep, M_MSDOSFSNODE);
 		*depp = NULL;
 		return (error);
 	}
 	error = vfs_hash_insert(nvp, inode, LK_EXCLUSIVE, curthread, &xvp,
 	    de_vncmpf, &inode);
 	if (error) {
 		*depp = NULL;
 		return (error);
 	}
 	if (xvp != NULL) {
 		*depp = xvp->v_data;
 		return (0);
 	}
 
 	ldep->de_pmp = pmp;
 	ldep->de_refcnt = 1;
 	/*
 	 * Copy the directory entry into the denode area of the vnode.
 	 */
 	if ((dirclust == MSDOSFSROOT
 	     || (FAT32(pmp) && dirclust == pmp->pm_rootdirblk))
 	    && diroffset == MSDOSFSROOT_OFS) {
 		/*
 		 * Directory entry for the root directory. There isn't one,
 		 * so we manufacture one. We should probably rummage
 		 * through the root directory and find a label entry (if it
 		 * exists), and then use the time and date from that entry
 		 * as the time and date for the root denode.
 		 */
 		nvp->v_vflag |= VV_ROOT; /* should be further down XXX */
 
 		ldep->de_Attributes = ATTR_DIRECTORY;
 		ldep->de_LowerCase = 0;
 		if (FAT32(pmp))
 			ldep->de_StartCluster = pmp->pm_rootdirblk;
 			/* de_FileSize will be filled in further down */
 		else {
 			ldep->de_StartCluster = MSDOSFSROOT;
 			ldep->de_FileSize = pmp->pm_rootdirsize * DEV_BSIZE;
 		}
 		/*
 		 * fill in time and date so that fattime2timespec() doesn't
 		 * spit up when called from msdosfs_getattr() with root
 		 * denode
 		 */
 		ldep->de_CHun = 0;
 		ldep->de_CTime = 0x0000;	/* 00:00:00	 */
 		ldep->de_CDate = (0 << DD_YEAR_SHIFT) | (1 << DD_MONTH_SHIFT)
 		    | (1 << DD_DAY_SHIFT);
 		/* Jan 1, 1980	 */
 		ldep->de_ADate = ldep->de_CDate;
 		ldep->de_MTime = ldep->de_CTime;
 		ldep->de_MDate = ldep->de_CDate;
 		/* leave the other fields as garbage */
 	} else {
 		error = readep(pmp, dirclust, diroffset, &bp, &direntptr);
 		if (error) {
 			/*
 			 * The denode does not contain anything useful, so
 			 * it would be wrong to leave it on its hash chain.
 			 * Arrange for vput() to just forget about it.
 			 */
 			ldep->de_Name[0] = SLOT_DELETED;
 
 			vput(nvp);
 			*depp = NULL;
 			return (error);
 		}
 		(void)DE_INTERNALIZE(ldep, direntptr);
 		brelse(bp);
 	}
 
 	/*
 	 * Fill in a few fields of the vnode and finish filling in the
 	 * denode.  Then return the address of the found denode.
 	 */
 	if (ldep->de_Attributes & ATTR_DIRECTORY) {
 		/*
 		 * Since DOS directory entries that describe directories
 		 * have 0 in the filesize field, we take this opportunity
 		 * to find out the length of the directory and plug it into
 		 * the denode structure.
 		 */
 		u_long size;
 
 		/*
 		 * XXX it sometimes happens that the "." entry has cluster
 		 * number 0 when it shouldn't.  Use the actual cluster number
 		 * instead of what is written in directory entry.
 		 */
 		if (diroffset == 0 && ldep->de_StartCluster != dirclust) {
 #ifdef MSDOSFS_DEBUG
 			printf("deget(): \".\" entry at clust %lu != %lu\n",
 			    dirclust, ldep->de_StartCluster);
 #endif
 			ldep->de_StartCluster = dirclust;
 		}
 
 		nvp->v_type = VDIR;
 		if (ldep->de_StartCluster != MSDOSFSROOT) {
 			error = pcbmap(ldep, 0xffff, 0, &size, 0);
 			if (error == E2BIG) {
 				ldep->de_FileSize = de_cn2off(pmp, size);
 				error = 0;
 			} else {
 #ifdef MSDOSFS_DEBUG
 				printf("deget(): pcbmap returned %d\n", error);
 #endif
 			}
 		}
 	} else
 		nvp->v_type = VREG;
 	ldep->de_modrev = init_va_filerev();
 	*depp = ldep;
 	return (0);
 }
 
 int
 deupdat(struct denode *dep, int waitfor)
 {
 	struct direntry dir;
 	struct timespec ts;
 	struct buf *bp;
 	struct direntry *dirp;
 	int error;
 
 	if (DETOV(dep)->v_mount->mnt_flag & MNT_RDONLY) {
 		dep->de_flag &= ~(DE_UPDATE | DE_CREATE | DE_ACCESS |
 		    DE_MODIFIED);
 		return (0);
 	}
 	getnanotime(&ts);
 	DETIMES(dep, &ts, &ts, &ts);
 	if ((dep->de_flag & DE_MODIFIED) == 0 && waitfor == 0)
 		return (0);
 	dep->de_flag &= ~DE_MODIFIED;
 	if (DETOV(dep)->v_vflag & VV_ROOT)
 		return (EINVAL);
 	if (dep->de_refcnt <= 0)
 		return (0);
 	error = readde(dep, &bp, &dirp);
 	if (error)
 		return (error);
 	DE_EXTERNALIZE(&dir, dep);
 	if (bcmp(dirp, &dir, sizeof(dir)) == 0) {
 		if (waitfor == 0 || (bp->b_flags & B_DELWRI) == 0) {
 			brelse(bp);
 			return (0);
 		}
 	} else
 		*dirp = dir;
 	if ((DETOV(dep)->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0)
 		bp->b_flags |= B_CLUSTEROK;
 	if (waitfor)
 		error = bwrite(bp);
 	else if (vm_page_count_severe() || buf_dirty_count_severe())
 		bawrite(bp);
 	else
 		bdwrite(bp);
 	return (error);
 }
 
 /*
  * Truncate the file described by dep to the length specified by length.
  */
 int
 detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred)
 {
 	int error;
 	int allerror;
 	u_long eofentry;
 	u_long chaintofree;
 	daddr_t bn;
 	int boff;
 	int isadir = dep->de_Attributes & ATTR_DIRECTORY;
 	struct buf *bp;
 	struct msdosfsmount *pmp = dep->de_pmp;
 
 #ifdef MSDOSFS_DEBUG
 	printf("detrunc(): file %s, length %lu, flags %x\n", dep->de_Name, length, flags);
 #endif
 
 	/*
 	 * Disallow attempts to truncate the root directory since it is of
 	 * fixed size.  That's just the way dos filesystems are.  We use
 	 * the VROOT bit in the vnode because checking for the directory
 	 * bit and a startcluster of 0 in the denode is not adequate to
 	 * recognize the root directory at this point in a file or
 	 * directory's life.
 	 */
 	if ((DETOV(dep)->v_vflag & VV_ROOT) && !FAT32(pmp)) {
 #ifdef MSDOSFS_DEBUG
 		printf("detrunc(): can't truncate root directory, clust %ld, offset %ld\n",
 		    dep->de_dirclust, dep->de_diroffset);
 #endif
 		return (EINVAL);
 	}
 
 	if (dep->de_FileSize < length) {
 		vnode_pager_setsize(DETOV(dep), length);
 		return deextend(dep, length, cred);
 	}
 
 	/*
 	 * If the desired length is 0 then remember the starting cluster of
 	 * the file and set the StartCluster field in the directory entry
 	 * to 0.  If the desired length is not zero, then get the number of
 	 * the last cluster in the shortened file.  Then get the number of
 	 * the first cluster in the part of the file that is to be freed.
 	 * Then set the next cluster pointer in the last cluster of the
 	 * file to CLUST_EOFE.
 	 */
 	if (length == 0) {
 		chaintofree = dep->de_StartCluster;
 		dep->de_StartCluster = 0;
 		eofentry = ~0;
 	} else {
 		error = pcbmap(dep, de_clcount(pmp, length) - 1, 0, 
 			       &eofentry, 0);
 		if (error) {
 #ifdef MSDOSFS_DEBUG
 			printf("detrunc(): pcbmap fails %d\n", error);
 #endif
 			return (error);
 		}
 	}
 
 	fc_purge(dep, de_clcount(pmp, length));
 
 	/*
 	 * If the new length is not a multiple of the cluster size then we
 	 * must zero the tail end of the new last cluster in case it
 	 * becomes part of the file again because of a seek.
 	 */
 	if ((boff = length & pmp->pm_crbomask) != 0) {
 		if (isadir) {
 			bn = cntobn(pmp, eofentry);
 			error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster,
 			    NOCRED, &bp);
 			if (error) {
 				brelse(bp);
 #ifdef MSDOSFS_DEBUG
 				printf("detrunc(): bread fails %d\n", error);
 #endif
 				return (error);
 			}
 			bzero(bp->b_data + boff, pmp->pm_bpcluster - boff);
 			if (flags & IO_SYNC)
 				bwrite(bp);
 			else
 				bdwrite(bp);
 		}
 	}
 
 	/*
 	 * Write out the updated directory entry.  Even if the update fails
 	 * we free the trailing clusters.
 	 */
 	dep->de_FileSize = length;
 	if (!isadir)
 		dep->de_flag |= DE_UPDATE | DE_MODIFIED;
 	allerror = vtruncbuf(DETOV(dep), cred, length, pmp->pm_bpcluster);
 #ifdef MSDOSFS_DEBUG
 	if (allerror)
 		printf("detrunc(): vtruncbuf error %d\n", allerror);
 #endif
 	error = deupdat(dep, !DOINGASYNC((DETOV(dep))));
 	if (error != 0 && allerror == 0)
 		allerror = error;
 #ifdef MSDOSFS_DEBUG
 	printf("detrunc(): allerror %d, eofentry %lu\n",
 	       allerror, eofentry);
 #endif
 
 	/*
 	 * If we need to break the cluster chain for the file then do it
 	 * now.
 	 */
 	if (eofentry != ~0) {
 		error = fatentry(FAT_GET_AND_SET, pmp, eofentry,
 				 &chaintofree, CLUST_EOFE);
 		if (error) {
 #ifdef MSDOSFS_DEBUG
 			printf("detrunc(): fatentry errors %d\n", error);
 #endif
 			return (error);
 		}
 		fc_setcache(dep, FC_LASTFC, de_cluster(pmp, length - 1),
 			    eofentry);
 	}
 
 	/*
 	 * Now free the clusters removed from the file because of the
 	 * truncation.
 	 */
 	if (chaintofree != 0 && !MSDOSFSEOF(pmp, chaintofree))
 		freeclusterchain(pmp, chaintofree);
 
 	return (allerror);
 }
 
 /*
  * Extend the file described by dep to length specified by length.
  */
 int
 deextend(struct denode *dep, u_long length, struct ucred *cred)
 {
 	struct msdosfsmount *pmp = dep->de_pmp;
 	u_long count;
 	int error;
 
 	/*
 	 * The root of a DOS filesystem cannot be extended.
 	 */
 	if ((DETOV(dep)->v_vflag & VV_ROOT) && !FAT32(pmp))
 		return (EINVAL);
 
 	/*
 	 * Directories cannot be extended.
 	 */
 	if (dep->de_Attributes & ATTR_DIRECTORY)
 		return (EISDIR);
 
 	if (length <= dep->de_FileSize)
 		panic("deextend: file too large");
 
 	/*
 	 * Compute the number of clusters to allocate.
 	 */
 	count = de_clcount(pmp, length) - de_clcount(pmp, dep->de_FileSize);
 	if (count > 0) {
 		if (count > pmp->pm_freeclustercount)
 			return (ENOSPC);
 		error = extendfile(dep, count, NULL, NULL, DE_CLEAR);
 		if (error) {
 			/* truncate the added clusters away again */
 			(void) detrunc(dep, dep->de_FileSize, 0, cred);
 			return (error);
 		}
 	}
 	dep->de_FileSize = length;
 	dep->de_flag |= DE_UPDATE | DE_MODIFIED;
 	return (deupdat(dep, !DOINGASYNC(DETOV(dep))));
 }
 
 /*
  * Move a denode to its correct hash queue after the file it represents has
  * been moved to a new directory.
  */
 void
 reinsert(struct denode *dep)
 {
 	struct vnode *vp;
 
 	/*
 	 * Fix up the denode cache.  If the denode is for a directory,
 	 * there is nothing to do since the hash is based on the starting
 	 * cluster of the directory file and that hasn't changed.  If for a
 	 * file the hash is based on the location of the directory entry,
 	 * so we must remove it from the cache and re-enter it with the
 	 * hash based on the new location of the directory entry.
 	 */
 #if 0
 	if (dep->de_Attributes & ATTR_DIRECTORY)
 		return;
 #endif
 	vp = DETOV(dep);
 	dep->de_inode = (uint64_t)dep->de_pmp->pm_bpcluster * dep->de_dirclust +
 	    dep->de_diroffset;
 	vfs_hash_rehash(vp, dep->de_inode);
 }
 
 int
 msdosfs_reclaim(struct vop_reclaim_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(vp);
 
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_reclaim(): dep %p, file %s, refcnt %ld\n",
 	    dep, dep->de_Name, dep->de_refcnt);
 #endif
 
 	/*
 	 * Destroy the vm object and flush associated pages.
 	 */
 	vnode_destroy_vobject(vp);
 	/*
 	 * Remove the denode from its hash chain.
 	 */
 	vfs_hash_remove(vp);
 	/*
 	 * Purge old data structures associated with the denode.
 	 */
 #if 0 /* XXX */
 	dep->de_flag = 0;
 #endif
 	free(dep, M_MSDOSFSNODE);
 	vp->v_data = NULL;
 
 	return (0);
 }
 
 int
 msdosfs_inactive(struct vop_inactive_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(vp);
 	int error = 0;
 
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_inactive(): dep %p, de_Name[0] %x\n", dep, dep->de_Name[0]);
 #endif
 
 	/*
 	 * Ignore denodes related to stale file handles.
 	 */
 	if (dep->de_Name[0] == SLOT_DELETED || dep->de_Name[0] == SLOT_EMPTY)
 		goto out;
 
 	/*
 	 * If the file has been deleted and it is on a read/write
 	 * filesystem, then truncate the file, and mark the directory slot
 	 * as empty.  (This may not be necessary for the dos filesystem.)
 	 */
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_inactive(): dep %p, refcnt %ld, mntflag %x, MNT_RDONLY %x\n",
 	       dep, dep->de_refcnt, vp->v_mount->mnt_flag, MNT_RDONLY);
 #endif
 	if (dep->de_refcnt <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
 		error = detrunc(dep, (u_long) 0, 0, NOCRED);
 		dep->de_flag |= DE_UPDATE;
 		dep->de_Name[0] = SLOT_DELETED;
 	}
 	deupdat(dep, 0);
 
 out:
 	/*
 	 * If we are done with the denode, reclaim it
 	 * so that it can be reused immediately.
 	 */
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_inactive(): v_usecount %d, de_Name[0] %x\n",
 	       vrefcnt(vp), dep->de_Name[0]);
 #endif
 	if (dep->de_Name[0] == SLOT_DELETED || dep->de_Name[0] == SLOT_EMPTY)
 		vrecycle(vp);
 	return (error);
 }
Index: projects/clang500-import/sys/fs/msdosfs/msdosfs_fat.c
===================================================================
--- projects/clang500-import/sys/fs/msdosfs/msdosfs_fat.c	(revision 318657)
+++ projects/clang500-import/sys/fs/msdosfs/msdosfs_fat.c	(revision 318658)
@@ -1,1163 +1,1163 @@
 /* $FreeBSD$ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
  *
  * 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 TooLs GmbH.
  * 4. The name of TooLs GmbH may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
  */
 /*-
  * Written by Paul Popelka (paulp@uts.amdahl.com)
  *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
  *
  * This software is provided "as is".
  *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
  *
  * October 1992
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
 #include <fs/msdosfs/bpb.h>
 #include <fs/msdosfs/direntry.h>
 #include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
 #include <fs/msdosfs/msdosfsmount.h>
 
 #define	FULL_RUN	((u_int)0xffffffff)
 
 static int	chainalloc(struct msdosfsmount *pmp, u_long start,
 		    u_long count, u_long fillwith, u_long *retcluster,
 		    u_long *got);
 static int	chainlength(struct msdosfsmount *pmp, u_long start,
 		    u_long count);
 static void	fatblock(struct msdosfsmount *pmp, u_long ofs, u_long *bnp,
 		    u_long *sizep, u_long *bop);
 static int	fatchain(struct msdosfsmount *pmp, u_long start, u_long count,
 		    u_long fillwith);
 static void	fc_lookup(struct denode *dep, u_long findcn, u_long *frcnp,
 		    u_long *fsrcnp);
 static void	updatefats(struct msdosfsmount *pmp, struct buf *bp,
 		    u_long fatbn);
 static __inline void
 		usemap_alloc(struct msdosfsmount *pmp, u_long cn);
 static __inline void
 		usemap_free(struct msdosfsmount *pmp, u_long cn);
 static int	clusteralloc1(struct msdosfsmount *pmp, u_long start,
 		    u_long count, u_long fillwith, u_long *retcluster,
 		    u_long *got);
 
 static void
 fatblock(struct msdosfsmount *pmp, u_long ofs, u_long *bnp, u_long *sizep,
     u_long *bop)
 {
 	u_long bn, size;
 
 	bn = ofs / pmp->pm_fatblocksize * pmp->pm_fatblocksec;
 	size = min(pmp->pm_fatblocksec, pmp->pm_FATsecs - bn)
 	    * DEV_BSIZE;
 	bn += pmp->pm_fatblk + pmp->pm_curfat * pmp->pm_FATsecs;
 
 	if (bnp)
 		*bnp = bn;
 	if (sizep)
 		*sizep = size;
 	if (bop)
 		*bop = ofs % pmp->pm_fatblocksize;
 }
 
 /*
  * Map the logical cluster number of a file into a physical disk sector
  * that is filesystem relative.
  *
  * dep	  - address of denode representing the file of interest
  * findcn - file relative cluster whose filesystem relative cluster number
  *	    and/or block number are/is to be found
  * bnp	  - address of where to place the filesystem relative block number.
  *	    If this pointer is null then don't return this quantity.
  * cnp	  - address of where to place the filesystem relative cluster number.
  *	    If this pointer is null then don't return this quantity.
  * sp     - pointer to returned block size
  *
  * NOTE: Either bnp or cnp must be non-null.
  * This function has one side effect.  If the requested file relative cluster
  * is beyond the end of file, then the actual number of clusters in the file
  * is returned in *cnp.  This is useful for determining how long a directory is.
  *  If cnp is null, nothing is returned.
  */
 int
 pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int *sp)
 {
 	int error;
 	u_long i;
 	u_long cn;
 	u_long prevcn = 0; /* XXX: prevcn could be used unititialized */
 	u_long byteoffset;
 	u_long bn;
 	u_long bo;
 	struct buf *bp = NULL;
 	u_long bp_bn = -1;
 	struct msdosfsmount *pmp = dep->de_pmp;
 	u_long bsize;
 
 	KASSERT(bnp != NULL || cnp != NULL || sp != NULL,
 	    ("pcbmap: extra call"));
 	ASSERT_VOP_ELOCKED(DETOV(dep), "pcbmap");
 
 	cn = dep->de_StartCluster;
 	/*
 	 * The "file" that makes up the root directory is contiguous,
 	 * permanently allocated, of fixed size, and is not made up of
 	 * clusters.  If the cluster number is beyond the end of the root
 	 * directory, then return the number of clusters in the file.
 	 */
 	if (cn == MSDOSFSROOT) {
 		if (dep->de_Attributes & ATTR_DIRECTORY) {
 			if (de_cn2off(pmp, findcn) >= dep->de_FileSize) {
 				if (cnp)
 					*cnp = de_bn2cn(pmp, pmp->pm_rootdirsize);
 				return (E2BIG);
 			}
 			if (bnp)
 				*bnp = pmp->pm_rootdirblk + de_cn2bn(pmp, findcn);
 			if (cnp)
 				*cnp = MSDOSFSROOT;
 			if (sp)
 				*sp = min(pmp->pm_bpcluster,
 				    dep->de_FileSize - de_cn2off(pmp, findcn));
 			return (0);
 		} else {		/* just an empty file */
 			if (cnp)
 				*cnp = 0;
 			return (E2BIG);
 		}
 	}
 
 	/*
 	 * All other files do I/O in cluster sized blocks
 	 */
 	if (sp)
 		*sp = pmp->pm_bpcluster;
 
 	/*
-	 * Rummage around in the fat cache, maybe we can avoid tromping
-	 * through every fat entry for the file. And, keep track of how far
+	 * Rummage around in the FAT cache, maybe we can avoid tromping
+	 * through every FAT entry for the file. And, keep track of how far
 	 * off the cache was from where we wanted to be.
 	 */
 	i = 0;
 	fc_lookup(dep, findcn, &i, &cn);
 
 	/*
 	 * Handle all other files or directories the normal way.
 	 */
 	for (; i < findcn; i++) {
 		/*
 		 * Stop with all reserved clusters, not just with EOF.
 		 */
 		if ((cn | ~pmp->pm_fatmask) >= CLUST_RSRVD)
 			goto hiteof;
 		byteoffset = FATOFS(pmp, cn);
 		fatblock(pmp, byteoffset, &bn, &bsize, &bo);
 		if (bn != bp_bn) {
 			if (bp)
 				brelse(bp);
 			error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
 			if (error) {
 				brelse(bp);
 				return (error);
 			}
 			bp_bn = bn;
 		}
 		prevcn = cn;
 		if (bo >= bsize) {
 			if (bp)
 				brelse(bp);
 			return (EIO);
 		}
 		if (FAT32(pmp))
 			cn = getulong(&bp->b_data[bo]);
 		else
 			cn = getushort(&bp->b_data[bo]);
 		if (FAT12(pmp) && (prevcn & 1))
 			cn >>= 4;
 		cn &= pmp->pm_fatmask;
 
 		/*
 		 * Force the special cluster numbers
 		 * to be the same for all cluster sizes
 		 * to let the rest of msdosfs handle
 		 * all cases the same.
 		 */
 		if ((cn | ~pmp->pm_fatmask) >= CLUST_RSRVD)
 			cn |= ~pmp->pm_fatmask;
 	}
 
 	if (!MSDOSFSEOF(pmp, cn)) {
 		if (bp)
 			brelse(bp);
 		if (bnp)
 			*bnp = cntobn(pmp, cn);
 		if (cnp)
 			*cnp = cn;
 		fc_setcache(dep, FC_LASTMAP, i, cn);
 		return (0);
 	}
 
 hiteof:;
 	if (cnp)
 		*cnp = i;
 	if (bp)
 		brelse(bp);
-	/* update last file cluster entry in the fat cache */
+	/* update last file cluster entry in the FAT cache */
 	fc_setcache(dep, FC_LASTFC, i - 1, prevcn);
 	return (E2BIG);
 }
 
 /*
- * Find the closest entry in the fat cache to the cluster we are looking
+ * Find the closest entry in the FAT cache to the cluster we are looking
  * for.
  */
 static void
 fc_lookup(struct denode *dep, u_long findcn, u_long *frcnp, u_long *fsrcnp)
 {
 	int i;
 	u_long cn;
 	struct fatcache *closest = NULL;
 
 	ASSERT_VOP_LOCKED(DETOV(dep), "fc_lookup");
 
 	for (i = 0; i < FC_SIZE; i++) {
 		cn = dep->de_fc[i].fc_frcn;
 		if (cn != FCE_EMPTY && cn <= findcn) {
 			if (closest == NULL || cn > closest->fc_frcn)
 				closest = &dep->de_fc[i];
 		}
 	}
 	if (closest) {
 		*frcnp = closest->fc_frcn;
 		*fsrcnp = closest->fc_fsrcn;
 	}
 }
 
 /*
- * Purge the fat cache in denode dep of all entries relating to file
+ * Purge the FAT cache in denode dep of all entries relating to file
  * relative cluster frcn and beyond.
  */
 void
 fc_purge(struct denode *dep, u_int frcn)
 {
 	int i;
 	struct fatcache *fcp;
 
 	ASSERT_VOP_ELOCKED(DETOV(dep), "fc_purge");
 
 	fcp = dep->de_fc;
 	for (i = 0; i < FC_SIZE; i++, fcp++) {
 		if (fcp->fc_frcn >= frcn)
 			fcp->fc_frcn = FCE_EMPTY;
 	}
 }
 
 /*
- * Update the fat.
- * If mirroring the fat, update all copies, with the first copy as last.
- * Else update only the current fat (ignoring the others).
+ * Update the FAT.
+ * If mirroring the FAT, update all copies, with the first copy as last.
+ * Else update only the current FAT (ignoring the others).
  *
  * pmp	 - msdosfsmount structure for filesystem to update
- * bp	 - addr of modified fat block
- * fatbn - block number relative to begin of filesystem of the modified fat block.
+ * bp	 - addr of modified FAT block
+ * fatbn - block number relative to begin of filesystem of the modified FAT block.
  */
 static void
 updatefats(struct msdosfsmount *pmp, struct buf *bp, u_long fatbn)
 {
 	struct buf *bpn;
 	int cleanfat, i;
 
 #ifdef MSDOSFS_DEBUG
 	printf("updatefats(pmp %p, bp %p, fatbn %lu)\n", pmp, bp, fatbn);
 #endif
 
 	if (pmp->pm_flags & MSDOSFS_FATMIRROR) {
 		/*
-		 * Now copy the block(s) of the modified fat to the other copies of
-		 * the fat and write them out.  This is faster than reading in the
-		 * other fats and then writing them back out.  This could tie up
-		 * the fat for quite a while. Preventing others from accessing it.
-		 * To prevent us from going after the fat quite so much we use
-		 * delayed writes, unless they specfied "synchronous" when the
+		 * Now copy the block(s) of the modified FAT to the other copies of
+		 * the FAT and write them out.  This is faster than reading in the
+		 * other FATs and then writing them back out.  This could tie up
+		 * the FAT for quite a while. Preventing others from accessing it.
+		 * To prevent us from going after the FAT quite so much we use
+		 * delayed writes, unless they specified "synchronous" when the
 		 * filesystem was mounted.  If synch is asked for then use
 		 * bwrite()'s and really slow things down.
 		 */
 		if (fatbn != pmp->pm_fatblk || FAT12(pmp))
 			cleanfat = 0;
 		else if (FAT16(pmp))
 			cleanfat = 16;
 		else
 			cleanfat = 32;
 		for (i = 1; i < pmp->pm_FATs; i++) {
 			fatbn += pmp->pm_FATsecs;
 			/* getblk() never fails */
 			bpn = getblk(pmp->pm_devvp, fatbn, bp->b_bcount,
 			    0, 0, 0);
 			bcopy(bp->b_data, bpn->b_data, bp->b_bcount);
 			/* Force the clean bit on in the other copies. */
 			if (cleanfat == 16)
 				((uint8_t *)bpn->b_data)[3] |= 0x80;
 			else if (cleanfat == 32)
 				((uint8_t *)bpn->b_data)[7] |= 0x08;
 			if (pmp->pm_mountp->mnt_flag & MNT_SYNCHRONOUS)
 				bwrite(bpn);
 			else
 				bdwrite(bpn);
 		}
 	}
 
 	/*
-	 * Write out the first (or current) fat last.
+	 * Write out the first (or current) FAT last.
 	 */
 	if (pmp->pm_mountp->mnt_flag & MNT_SYNCHRONOUS)
 		bwrite(bp);
 	else
 		bdwrite(bp);
 }
 
 /*
- * Updating entries in 12 bit fats is a pain in the butt.
+ * Updating entries in 12 bit FATs is a pain in the butt.
  *
  * The following picture shows where nibbles go when moving from a 12 bit
  * cluster number into the appropriate bytes in the FAT.
  *
  *	byte m        byte m+1      byte m+2
  *	+----+----+   +----+----+   +----+----+
  *	|  0    1 |   |  2    3 |   |  4    5 |   FAT bytes
  *	+----+----+   +----+----+   +----+----+
  *
  *	+----+----+----+   +----+----+----+
  *	|  3    0    1 |   |  4    5    2 |
  *	+----+----+----+   +----+----+----+
  *	cluster n  	   cluster n+1
  *
  * Where n is even. m = n + (n >> 2)
  *
  */
 static __inline void
 usemap_alloc(struct msdosfsmount *pmp, u_long cn)
 {
 
 	MSDOSFS_ASSERT_MP_LOCKED(pmp);
 
 	KASSERT(cn <= pmp->pm_maxcluster, ("cn too large %lu %lu", cn,
 	    pmp->pm_maxcluster));
 	KASSERT((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0,
 	    ("usemap_alloc on ro msdosfs mount"));
 	KASSERT((pmp->pm_inusemap[cn / N_INUSEBITS] & (1 << (cn % N_INUSEBITS)))
 	    == 0, ("Allocating used sector %ld %ld %x", cn, cn % N_INUSEBITS,
 		(unsigned)pmp->pm_inusemap[cn / N_INUSEBITS]));
 	pmp->pm_inusemap[cn / N_INUSEBITS] |= 1 << (cn % N_INUSEBITS);
 	KASSERT(pmp->pm_freeclustercount > 0, ("usemap_alloc: too little"));
 	pmp->pm_freeclustercount--;
 	pmp->pm_flags |= MSDOSFS_FSIMOD;
 }
 
 static __inline void
 usemap_free(struct msdosfsmount *pmp, u_long cn)
 {
 
 	MSDOSFS_ASSERT_MP_LOCKED(pmp);
 
 	KASSERT(cn <= pmp->pm_maxcluster, ("cn too large %lu %lu", cn,
 	    pmp->pm_maxcluster));
 	KASSERT((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0,
 	    ("usemap_free on ro msdosfs mount"));
 	pmp->pm_freeclustercount++;
 	pmp->pm_flags |= MSDOSFS_FSIMOD;
 	KASSERT((pmp->pm_inusemap[cn / N_INUSEBITS] & (1 << (cn % N_INUSEBITS)))
 	    != 0, ("Freeing unused sector %ld %ld %x", cn, cn % N_INUSEBITS,
 		(unsigned)pmp->pm_inusemap[cn / N_INUSEBITS]));
 	pmp->pm_inusemap[cn / N_INUSEBITS] &= ~(1 << (cn % N_INUSEBITS));
 }
 
 int
 clusterfree(struct msdosfsmount *pmp, u_long cluster, u_long *oldcnp)
 {
 	int error;
 	u_long oldcn;
 
 	error = fatentry(FAT_GET_AND_SET, pmp, cluster, &oldcn, MSDOSFSFREE);
 	if (error)
 		return (error);
 	/*
 	 * If the cluster was successfully marked free, then update
 	 * the count of free clusters, and turn off the "allocated"
 	 * bit in the "in use" cluster bit map.
 	 */
 	MSDOSFS_LOCK_MP(pmp);
 	usemap_free(pmp, cluster);
 	MSDOSFS_UNLOCK_MP(pmp);
 	if (oldcnp)
 		*oldcnp = oldcn;
 	return (0);
 }
 
 /*
- * Get or Set or 'Get and Set' the cluster'th entry in the fat.
+ * Get or Set or 'Get and Set' the cluster'th entry in the FAT.
  *
- * function	- whether to get or set a fat entry
+ * function	- whether to get or set a FAT entry
  * pmp		- address of the msdosfsmount structure for the filesystem
- *		  whose fat is to be manipulated.
+ *		  whose FAT is to be manipulated.
  * cn		- which cluster is of interest
  * oldcontents	- address of a word that is to receive the contents of the
  *		  cluster'th entry if this is a get function
  * newcontents	- the new value to be written into the cluster'th element of
- *		  the fat if this is a set function.
+ *		  the FAT if this is a set function.
  *
- * This function can also be used to free a cluster by setting the fat entry
+ * This function can also be used to free a cluster by setting the FAT entry
  * for a cluster to 0.
  *
- * All copies of the fat are updated if this is a set function. NOTE: If
+ * All copies of the FAT are updated if this is a set function. NOTE: If
  * fatentry() marks a cluster as free it does not update the inusemap in
  * the msdosfsmount structure. This is left to the caller.
  */
 int
 fatentry(int function, struct msdosfsmount *pmp, u_long cn, u_long *oldcontents,
     u_long newcontents)
 {
 	int error;
 	u_long readcn;
 	u_long bn, bo, bsize, byteoffset;
 	struct buf *bp;
 
 #ifdef	MSDOSFS_DEBUG
 	printf("fatentry(func %d, pmp %p, clust %lu, oldcon %p, newcon %lx)\n",
 	    function, pmp, cn, oldcontents, newcontents);
 #endif
 
 #ifdef DIAGNOSTIC
 	/*
 	 * Be sure they asked us to do something.
 	 */
 	if ((function & (FAT_SET | FAT_GET)) == 0) {
 #ifdef MSDOSFS_DEBUG
 		printf("fatentry(): function code doesn't specify get or set\n");
 #endif
 		return (EINVAL);
 	}
 
 	/*
 	 * If they asked us to return a cluster number but didn't tell us
 	 * where to put it, give them an error.
 	 */
 	if ((function & FAT_GET) && oldcontents == NULL) {
 #ifdef MSDOSFS_DEBUG
 		printf("fatentry(): get function with no place to put result\n");
 #endif
 		return (EINVAL);
 	}
 #endif
 
 	/*
 	 * Be sure the requested cluster is in the filesystem.
 	 */
 	if (cn < CLUST_FIRST || cn > pmp->pm_maxcluster)
 		return (EINVAL);
 
 	byteoffset = FATOFS(pmp, cn);
 	fatblock(pmp, byteoffset, &bn, &bsize, &bo);
 	error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
 	if (error) {
 		brelse(bp);
 		return (error);
 	}
 
 	if (function & FAT_GET) {
 		if (FAT32(pmp))
 			readcn = getulong(&bp->b_data[bo]);
 		else
 			readcn = getushort(&bp->b_data[bo]);
 		if (FAT12(pmp) & (cn & 1))
 			readcn >>= 4;
 		readcn &= pmp->pm_fatmask;
-		/* map reserved fat entries to same values for all fats */
+		/* map reserved FAT entries to same values for all FATs */
 		if ((readcn | ~pmp->pm_fatmask) >= CLUST_RSRVD)
 			readcn |= ~pmp->pm_fatmask;
 		*oldcontents = readcn;
 	}
 	if (function & FAT_SET) {
 		switch (pmp->pm_fatmask) {
 		case FAT12_MASK:
 			readcn = getushort(&bp->b_data[bo]);
 			if (cn & 1) {
 				readcn &= 0x000f;
 				readcn |= newcontents << 4;
 			} else {
 				readcn &= 0xf000;
 				readcn |= newcontents & 0xfff;
 			}
 			putushort(&bp->b_data[bo], readcn);
 			break;
 		case FAT16_MASK:
 			putushort(&bp->b_data[bo], newcontents);
 			break;
 		case FAT32_MASK:
 			/*
 			 * According to spec we have to retain the
-			 * high order bits of the fat entry.
+			 * high order bits of the FAT entry.
 			 */
 			readcn = getulong(&bp->b_data[bo]);
 			readcn &= ~FAT32_MASK;
 			readcn |= newcontents & FAT32_MASK;
 			putulong(&bp->b_data[bo], readcn);
 			break;
 		}
 		updatefats(pmp, bp, bn);
 		bp = NULL;
 		pmp->pm_fmod = 1;
 	}
 	if (bp)
 		brelse(bp);
 	return (0);
 }
 
 /*
  * Update a contiguous cluster chain
  *
  * pmp	    - mount point
  * start    - first cluster of chain
  * count    - number of clusters in chain
- * fillwith - what to write into fat entry of last cluster
+ * fillwith - what to write into FAT entry of last cluster
  */
 static int
 fatchain(struct msdosfsmount *pmp, u_long start, u_long count, u_long fillwith)
 {
 	int error;
 	u_long bn, bo, bsize, byteoffset, readcn, newc;
 	struct buf *bp;
 
 #ifdef MSDOSFS_DEBUG
 	printf("fatchain(pmp %p, start %lu, count %lu, fillwith %lx)\n",
 	    pmp, start, count, fillwith);
 #endif
 	/*
 	 * Be sure the clusters are in the filesystem.
 	 */
 	if (start < CLUST_FIRST || start + count - 1 > pmp->pm_maxcluster)
 		return (EINVAL);
 
 	while (count > 0) {
 		byteoffset = FATOFS(pmp, start);
 		fatblock(pmp, byteoffset, &bn, &bsize, &bo);
 		error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
 		if (error) {
 			brelse(bp);
 			return (error);
 		}
 		while (count > 0) {
 			start++;
 			newc = --count > 0 ? start : fillwith;
 			switch (pmp->pm_fatmask) {
 			case FAT12_MASK:
 				readcn = getushort(&bp->b_data[bo]);
 				if (start & 1) {
 					readcn &= 0xf000;
 					readcn |= newc & 0xfff;
 				} else {
 					readcn &= 0x000f;
 					readcn |= newc << 4;
 				}
 				putushort(&bp->b_data[bo], readcn);
 				bo++;
 				if (!(start & 1))
 					bo++;
 				break;
 			case FAT16_MASK:
 				putushort(&bp->b_data[bo], newc);
 				bo += 2;
 				break;
 			case FAT32_MASK:
 				readcn = getulong(&bp->b_data[bo]);
 				readcn &= ~pmp->pm_fatmask;
 				readcn |= newc & pmp->pm_fatmask;
 				putulong(&bp->b_data[bo], readcn);
 				bo += 4;
 				break;
 			}
 			if (bo >= bsize)
 				break;
 		}
 		updatefats(pmp, bp, bn);
 	}
 	pmp->pm_fmod = 1;
 	return (0);
 }
 
 /*
  * Check the length of a free cluster chain starting at start.
  *
  * pmp	 - mount point
  * start - start of chain
  * count - maximum interesting length
  */
 static int
 chainlength(struct msdosfsmount *pmp, u_long start, u_long count)
 {
 	u_long idx, max_idx;
 	u_int map;
 	u_long len;
 
 	MSDOSFS_ASSERT_MP_LOCKED(pmp);
 
 	if (start > pmp->pm_maxcluster)
 		return (0);
 	max_idx = pmp->pm_maxcluster / N_INUSEBITS;
 	idx = start / N_INUSEBITS;
 	start %= N_INUSEBITS;
 	map = pmp->pm_inusemap[idx];
 	map &= ~((1 << start) - 1);
 	if (map) {
 		len = ffs(map) - 1 - start;
 		len = MIN(len, count);
 		if (start + len > pmp->pm_maxcluster)
 			len = pmp->pm_maxcluster - start + 1;
 		return (len);
 	}
 	len = N_INUSEBITS - start;
 	if (len >= count) {
 		len = count;
 		if (start + len > pmp->pm_maxcluster)
 			len = pmp->pm_maxcluster - start + 1;
 		return (len);
 	}
 	while (++idx <= max_idx) {
 		if (len >= count)
 			break;
 		map = pmp->pm_inusemap[idx];
 		if (map) {
 			len += ffs(map) - 1;
 			break;
 		}
 		len += N_INUSEBITS;
 	}
 	len = MIN(len, count);
 	if (start + len > pmp->pm_maxcluster)
 		len = pmp->pm_maxcluster - start + 1;
 	return (len);
 }
 
 /*
  * Allocate contigous free clusters.
  *
  * pmp	      - mount point.
  * start      - start of cluster chain.
  * count      - number of clusters to allocate.
- * fillwith   - put this value into the fat entry for the
+ * fillwith   - put this value into the FAT entry for the
  *		last allocated cluster.
  * retcluster - put the first allocated cluster's number here.
  * got	      - how many clusters were actually allocated.
  */
 static int
 chainalloc(struct msdosfsmount *pmp, u_long start, u_long count,
     u_long fillwith, u_long *retcluster, u_long *got)
 {
 	int error;
 	u_long cl, n;
 
 	MSDOSFS_ASSERT_MP_LOCKED(pmp);
 	KASSERT((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0,
 	    ("chainalloc on ro msdosfs mount"));
 
 	for (cl = start, n = count; n-- > 0;)
 		usemap_alloc(pmp, cl++);
 	pmp->pm_nxtfree = start + count;
 	if (pmp->pm_nxtfree > pmp->pm_maxcluster)
 		pmp->pm_nxtfree = CLUST_FIRST;
 	pmp->pm_flags |= MSDOSFS_FSIMOD;
 	error = fatchain(pmp, start, count, fillwith);
 	if (error != 0) {
 		for (cl = start, n = count; n-- > 0;)
 			usemap_free(pmp, cl++);
 		return (error);
 	}
 #ifdef MSDOSFS_DEBUG
 	printf("clusteralloc(): allocated cluster chain at %lu (%lu clusters)\n",
 	    start, count);
 #endif
 	if (retcluster)
 		*retcluster = start;
 	if (got)
 		*got = count;
 	return (0);
 }
 
 /*
  * Allocate contiguous free clusters.
  *
  * pmp	      - mount point.
  * start      - preferred start of cluster chain.
  * count      - number of clusters requested.
- * fillwith   - put this value into the fat entry for the
+ * fillwith   - put this value into the FAT entry for the
  *		last allocated cluster.
  * retcluster - put the first allocated cluster's number here.
  * got	      - how many clusters were actually allocated.
  */
 int
 clusteralloc(struct msdosfsmount *pmp, u_long start, u_long count,
     u_long fillwith, u_long *retcluster, u_long *got)
 {
 	int error;
 
 	MSDOSFS_LOCK_MP(pmp);
 	error = clusteralloc1(pmp, start, count, fillwith, retcluster, got);
 	MSDOSFS_UNLOCK_MP(pmp);
 	return (error);
 }
 
 static int
 clusteralloc1(struct msdosfsmount *pmp, u_long start, u_long count,
     u_long fillwith, u_long *retcluster, u_long *got)
 {
 	u_long idx;
 	u_long len, newst, foundl, cn, l;
 	u_long foundcn = 0; /* XXX: foundcn could be used unititialized */
 	u_int map;
 
 	MSDOSFS_ASSERT_MP_LOCKED(pmp);
 
 #ifdef MSDOSFS_DEBUG
 	printf("clusteralloc(): find %lu clusters\n", count);
 #endif
 	if (start) {
 		if ((len = chainlength(pmp, start, count)) >= count)
 			return (chainalloc(pmp, start, count, fillwith, retcluster, got));
 	} else
 		len = 0;
 
 	newst = pmp->pm_nxtfree;
 	foundl = 0;
 
 	for (cn = newst; cn <= pmp->pm_maxcluster;) {
 		idx = cn / N_INUSEBITS;
 		map = pmp->pm_inusemap[idx];
 		map |= (1 << (cn % N_INUSEBITS)) - 1;
 		if (map != FULL_RUN) {
 			cn = idx * N_INUSEBITS + ffs(map ^ FULL_RUN) - 1;
 			if ((l = chainlength(pmp, cn, count)) >= count)
 				return (chainalloc(pmp, cn, count, fillwith, retcluster, got));
 			if (l > foundl) {
 				foundcn = cn;
 				foundl = l;
 			}
 			cn += l + 1;
 			continue;
 		}
 		cn += N_INUSEBITS - cn % N_INUSEBITS;
 	}
 	for (cn = 0; cn < newst;) {
 		idx = cn / N_INUSEBITS;
 		map = pmp->pm_inusemap[idx];
 		map |= (1 << (cn % N_INUSEBITS)) - 1;
 		if (map != FULL_RUN) {
 			cn = idx * N_INUSEBITS + ffs(map ^ FULL_RUN) - 1;
 			if ((l = chainlength(pmp, cn, count)) >= count)
 				return (chainalloc(pmp, cn, count, fillwith, retcluster, got));
 			if (l > foundl) {
 				foundcn = cn;
 				foundl = l;
 			}
 			cn += l + 1;
 			continue;
 		}
 		cn += N_INUSEBITS - cn % N_INUSEBITS;
 	}
 
 	if (!foundl)
 		return (ENOSPC);
 
 	if (len)
 		return (chainalloc(pmp, start, len, fillwith, retcluster, got));
 	else
 		return (chainalloc(pmp, foundcn, foundl, fillwith, retcluster, got));
 }
 
 
 /*
  * Free a chain of clusters.
  *
  * pmp		- address of the msdosfs mount structure for the filesystem
  *		  containing the cluster chain to be freed.
  * startcluster - number of the 1st cluster in the chain of clusters to be
  *		  freed.
  */
 int
 freeclusterchain(struct msdosfsmount *pmp, u_long cluster)
 {
 	int error;
 	struct buf *bp = NULL;
 	u_long bn, bo, bsize, byteoffset;
 	u_long readcn, lbn = -1;
 
 	MSDOSFS_LOCK_MP(pmp);
 	while (cluster >= CLUST_FIRST && cluster <= pmp->pm_maxcluster) {
 		byteoffset = FATOFS(pmp, cluster);
 		fatblock(pmp, byteoffset, &bn, &bsize, &bo);
 		if (lbn != bn) {
 			if (bp)
 				updatefats(pmp, bp, lbn);
 			error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
 			if (error) {
 				brelse(bp);
 				MSDOSFS_UNLOCK_MP(pmp);
 				return (error);
 			}
 			lbn = bn;
 		}
 		usemap_free(pmp, cluster);
 		switch (pmp->pm_fatmask) {
 		case FAT12_MASK:
 			readcn = getushort(&bp->b_data[bo]);
 			if (cluster & 1) {
 				cluster = readcn >> 4;
 				readcn &= 0x000f;
 				readcn |= MSDOSFSFREE << 4;
 			} else {
 				cluster = readcn;
 				readcn &= 0xf000;
 				readcn |= MSDOSFSFREE & 0xfff;
 			}
 			putushort(&bp->b_data[bo], readcn);
 			break;
 		case FAT16_MASK:
 			cluster = getushort(&bp->b_data[bo]);
 			putushort(&bp->b_data[bo], MSDOSFSFREE);
 			break;
 		case FAT32_MASK:
 			cluster = getulong(&bp->b_data[bo]);
 			putulong(&bp->b_data[bo],
 				 (MSDOSFSFREE & FAT32_MASK) | (cluster & ~FAT32_MASK));
 			break;
 		}
 		cluster &= pmp->pm_fatmask;
 		if ((cluster | ~pmp->pm_fatmask) >= CLUST_RSRVD)
 			cluster |= pmp->pm_fatmask;
 	}
 	if (bp)
 		updatefats(pmp, bp, bn);
 	MSDOSFS_UNLOCK_MP(pmp);
 	return (0);
 }
 
 /*
- * Read in fat blocks looking for free clusters. For every free cluster
+ * Read in FAT blocks looking for free clusters. For every free cluster
  * found turn off its corresponding bit in the pm_inusemap.
  */
 int
 fillinusemap(struct msdosfsmount *pmp)
 {
 	struct buf *bp = NULL;
 	u_long cn, readcn;
 	int error;
 	u_long bn, bo, bsize, byteoffset;
 
 	MSDOSFS_ASSERT_MP_LOCKED(pmp);
 
 	/*
-	 * Mark all clusters in use, we mark the free ones in the fat scan
+	 * Mark all clusters in use, we mark the free ones in the FAT scan
 	 * loop further down.
 	 */
 	for (cn = 0; cn < (pmp->pm_maxcluster + N_INUSEBITS) / N_INUSEBITS; cn++)
 		pmp->pm_inusemap[cn] = FULL_RUN;
 
 	/*
 	 * Figure how many free clusters are in the filesystem by ripping
-	 * through the fat counting the number of entries whose content is
+	 * through the FAT counting the number of entries whose content is
 	 * zero.  These represent free clusters.
 	 */
 	pmp->pm_freeclustercount = 0;
 	for (cn = CLUST_FIRST; cn <= pmp->pm_maxcluster; cn++) {
 		byteoffset = FATOFS(pmp, cn);
 		bo = byteoffset % pmp->pm_fatblocksize;
 		if (!bo || !bp) {
 			/* Read new FAT block */
 			if (bp)
 				brelse(bp);
 			fatblock(pmp, byteoffset, &bn, &bsize, NULL);
 			error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
 			if (error) {
 				brelse(bp);
 				return (error);
 			}
 		}
 		if (FAT32(pmp))
 			readcn = getulong(&bp->b_data[bo]);
 		else
 			readcn = getushort(&bp->b_data[bo]);
 		if (FAT12(pmp) && (cn & 1))
 			readcn >>= 4;
 		readcn &= pmp->pm_fatmask;
 
 		if (readcn == CLUST_FREE)
 			usemap_free(pmp, cn);
 	}
 	if (bp != NULL)
 		brelse(bp);
 
 	for (cn = pmp->pm_maxcluster + 1; cn < (pmp->pm_maxcluster +
 	    N_INUSEBITS) / N_INUSEBITS; cn++)
 		pmp->pm_inusemap[cn / N_INUSEBITS] |= 1 << (cn % N_INUSEBITS);
 
 	return (0);
 }
 
 /*
  * Allocate a new cluster and chain it onto the end of the file.
  *
  * dep	 - the file to extend
  * count - number of clusters to allocate
  * bpp	 - where to return the address of the buf header for the first new
  *	   file block
  * ncp	 - where to put cluster number of the first newly allocated cluster
  *	   If this pointer is 0, do not return the cluster number.
  * flags - see fat.h
  *
  * NOTE: This function is not responsible for turning on the DE_UPDATE bit of
  * the de_flag field of the denode and it does not change the de_FileSize
  * field.  This is left for the caller to do.
  */
 int
 extendfile(struct denode *dep, u_long count, struct buf **bpp, u_long *ncp,
     int flags)
 {
 	int error;
 	u_long frcn;
 	u_long cn, got;
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct buf *bp;
 	daddr_t blkno;
 
 	/*
 	 * Don't try to extend the root directory
 	 */
 	if (dep->de_StartCluster == MSDOSFSROOT
 	    && (dep->de_Attributes & ATTR_DIRECTORY)) {
 #ifdef MSDOSFS_DEBUG
 		printf("extendfile(): attempt to extend root directory\n");
 #endif
 		return (ENOSPC);
 	}
 
 	/*
 	 * If the "file's last cluster" cache entry is empty, and the file
 	 * is not empty, then fill the cache entry by calling pcbmap().
 	 */
 	if (dep->de_fc[FC_LASTFC].fc_frcn == FCE_EMPTY &&
 	    dep->de_StartCluster != 0) {
 		error = pcbmap(dep, 0xffff, 0, &cn, 0);
 		/* we expect it to return E2BIG */
 		if (error != E2BIG)
 			return (error);
 	}
 
 	dep->de_fc[FC_NEXTTOLASTFC].fc_frcn =
 	    dep->de_fc[FC_LASTFC].fc_frcn;
 	dep->de_fc[FC_NEXTTOLASTFC].fc_fsrcn =
 	    dep->de_fc[FC_LASTFC].fc_fsrcn;
 	while (count > 0) {
 		/*
 		 * Allocate a new cluster chain and cat onto the end of the
 		 * file.
 		 * If the file is empty we make de_StartCluster point
 		 * to the new block.  Note that de_StartCluster being
 		 * 0 is sufficient to be sure the file is empty since
 		 * we exclude attempts to extend the root directory
 		 * above, and the root dir is the only file with a
 		 * startcluster of 0 that has blocks allocated (sort
 		 * of).
 		 */
 		if (dep->de_StartCluster == 0)
 			cn = 0;
 		else
 			cn = dep->de_fc[FC_LASTFC].fc_fsrcn + 1;
 		error = clusteralloc(pmp, cn, count, CLUST_EOFE, &cn, &got);
 		if (error)
 			return (error);
 
 		count -= got;
 
 		/*
 		 * Give them the filesystem relative cluster number if they want
 		 * it.
 		 */
 		if (ncp) {
 			*ncp = cn;
 			ncp = NULL;
 		}
 
 		if (dep->de_StartCluster == 0) {
 			dep->de_StartCluster = cn;
 			frcn = 0;
 		} else {
 			error = fatentry(FAT_SET, pmp,
 					 dep->de_fc[FC_LASTFC].fc_fsrcn,
 					 0, cn);
 			if (error) {
 				clusterfree(pmp, cn, NULL);
 				return (error);
 			}
 			frcn = dep->de_fc[FC_LASTFC].fc_frcn + 1;
 		}
 
 		/*
-		 * Update the "last cluster of the file" entry in the denode's fat
-		 * cache.
+		 * Update the "last cluster of the file" entry in the
+		 * denode's FAT cache.
 		 */
 		fc_setcache(dep, FC_LASTFC, frcn + got - 1, cn + got - 1);
 
 		if (flags & DE_CLEAR) {
 			while (got-- > 0) {
 				/*
 				 * Get the buf header for the new block of the file.
 				 */
 				if (dep->de_Attributes & ATTR_DIRECTORY)
 					bp = getblk(pmp->pm_devvp,
 					    cntobn(pmp, cn++),
 					    pmp->pm_bpcluster, 0, 0, 0);
 				else {
 					bp = getblk(DETOV(dep),
 					    frcn++,
 					    pmp->pm_bpcluster, 0, 0, 0);
 					/*
 					 * Do the bmap now, as in msdosfs_write
 					 */
 					if (pcbmap(dep,
 					    bp->b_lblkno,
 					    &blkno, 0, 0))
 						bp->b_blkno = -1;
 					if (bp->b_blkno == -1)
 						panic("extendfile: pcbmap");
 					else
 						bp->b_blkno = blkno;
 				}
 				vfs_bio_clrbuf(bp);
 				if (bpp) {
 					*bpp = bp;
 					bpp = NULL;
 				} else
 					bdwrite(bp);
 			}
 		}
 	}
 
 	return (0);
 }
 
 /*-
  * Routine to mark a FAT16 or FAT32 volume as "clean" or "dirty" by
  * manipulating the upper bit of the FAT entry for cluster 1.  Note that
  * this bit is not defined for FAT12 volumes, which are always assumed to
  * be clean.
  *
  * The fatentry() routine only works on cluster numbers that a file could
  * occupy, so it won't manipulate the entry for cluster 1.  So we have to do
  * it here.  The code was stolen from fatentry() and tailored for cluster 1.
  *
  * Inputs:
  *	pmp	The MS-DOS volume to mark
  *	dirty	Non-zero if the volume should be marked dirty; zero if it
  *		should be marked clean
  *
  * Result:
  *	0	Success
  *	EROFS	Volume is read-only
  *	?	(other errors from called routines)
  */
 int
 markvoldirty(struct msdosfsmount *pmp, int dirty)
 {
 	struct buf *bp;
 	u_long bn, bo, bsize, byteoffset, fatval;
 	int error;
 
 	/*
 	 * FAT12 does not support a "clean" bit, so don't do anything for
 	 * FAT12.
 	 */
 	if (FAT12(pmp))
 		return (0);
 
 	/* Can't change the bit on a read-only filesystem. */
 	if (pmp->pm_flags & MSDOSFSMNT_RONLY)
 		return (EROFS);
 
 	/*
 	 * Fetch the block containing the FAT entry.  It is given by the
 	 * pseudo-cluster 1.
 	 */
 	byteoffset = FATOFS(pmp, 1);
 	fatblock(pmp, byteoffset, &bn, &bsize, &bo);
 	error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
 	if (error) {
 		brelse(bp);
 		return (error);
 	}
 
 	/*
 	 * Get the current value of the FAT entry and set/clear the relevant
 	 * bit.  Dirty means clear the "clean" bit; clean means set the
 	 * "clean" bit.
 	 */
 	if (FAT32(pmp)) {
 		/* FAT32 uses bit 27. */
 		fatval = getulong(&bp->b_data[bo]);
 		if (dirty)
 			fatval &= 0xF7FFFFFF;
 		else
 			fatval |= 0x08000000;
 		putulong(&bp->b_data[bo], fatval);
 	} else {
 		/* Must be FAT16; use bit 15. */
 		fatval = getushort(&bp->b_data[bo]);
 		if (dirty)
 			fatval &= 0x7FFF;
 		else
 			fatval |= 0x8000;
 		putushort(&bp->b_data[bo], fatval);
 	}
 
 	/* Write out the modified FAT block synchronously. */
 	return (bwrite(bp));
 }
Index: projects/clang500-import/sys/fs/msdosfs/msdosfs_vfsops.c
===================================================================
--- projects/clang500-import/sys/fs/msdosfs/msdosfs_vfsops.c	(revision 318657)
+++ projects/clang500-import/sys/fs/msdosfs/msdosfs_vfsops.c	(revision 318658)
@@ -1,1014 +1,1014 @@
 /* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
  *
  * 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 TooLs GmbH.
  * 4. The name of TooLs GmbH may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
  */
 /*-
  * Written by Paul Popelka (paulp@uts.amdahl.com)
  *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
  *
  * This software is provided "as is".
  *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
  *
  * October 1992
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/iconv.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 
 #include <geom/geom.h>
 #include <geom/geom_vfs.h>
 
 #include <fs/msdosfs/bootsect.h>
 #include <fs/msdosfs/bpb.h>
 #include <fs/msdosfs/direntry.h>
 #include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
 #include <fs/msdosfs/msdosfsmount.h>
 
 static const char msdosfs_lock_msg[] = "fatlk";
 
 /* Mount options that we support. */
 static const char *msdosfs_opts[] = {
 	"async", "noatime", "noclusterr", "noclusterw",
 	"export", "force", "from", "sync",
 	"cs_dos", "cs_local", "cs_win", "dirmask",
 	"gid", "kiconv", "large", "longname",
 	"longnames", "mask", "shortname", "shortnames",
 	"uid", "win95", "nowin95",
 	NULL
 };
 
 #if 1 /*def PC98*/
 /*
  * XXX - The boot signature formatted by NEC PC-98 DOS looks like a
  *       garbage or a random value :-{
  *       If you want to use that broken-signatured media, define the
  *       following symbol even though PC/AT.
  *       (ex. mount PC-98 DOS formatted FD on PC/AT)
  */
 #define	MSDOSFS_NOCHECKSIG
 #endif
 
 MALLOC_DEFINE(M_MSDOSFSMNT, "msdosfs_mount", "MSDOSFS mount structure");
 static MALLOC_DEFINE(M_MSDOSFSFAT, "msdosfs_fat", "MSDOSFS file allocation table");
 
 struct iconv_functions *msdosfs_iconv;
 
 static int	update_mp(struct mount *mp, struct thread *td);
 static int	mountmsdosfs(struct vnode *devvp, struct mount *mp);
 static vfs_fhtovp_t	msdosfs_fhtovp;
 static vfs_mount_t	msdosfs_mount;
 static vfs_root_t	msdosfs_root;
 static vfs_statfs_t	msdosfs_statfs;
 static vfs_sync_t	msdosfs_sync;
 static vfs_unmount_t	msdosfs_unmount;
 
 /* Maximum length of a character set name (arbitrary). */
 #define	MAXCSLEN	64
 
 static int
 update_mp(struct mount *mp, struct thread *td)
 {
 	struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
 	void *dos, *win, *local;
 	int error, v;
 
 	if (!vfs_getopt(mp->mnt_optnew, "kiconv", NULL, NULL)) {
 		if (msdosfs_iconv != NULL) {
 			error = vfs_getopt(mp->mnt_optnew,
 			    "cs_win", &win, NULL);
 			if (!error)
 				error = vfs_getopt(mp->mnt_optnew,
 				    "cs_local", &local, NULL);
 			if (!error)
 				error = vfs_getopt(mp->mnt_optnew,
 				    "cs_dos", &dos, NULL);
 			if (!error) {
 				msdosfs_iconv->open(win, local, &pmp->pm_u2w);
 				msdosfs_iconv->open(local, win, &pmp->pm_w2u);
 				msdosfs_iconv->open(dos, local, &pmp->pm_u2d);
 				msdosfs_iconv->open(local, dos, &pmp->pm_d2u);
 			}
 			if (error != 0)
 				return (error);
 		} else {
 			pmp->pm_w2u = NULL;
 			pmp->pm_u2w = NULL;
 			pmp->pm_d2u = NULL;
 			pmp->pm_u2d = NULL;
 		}
 	}
 
 	if (vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v) == 1)
 		pmp->pm_gid = v;
 	if (vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v) == 1)
 		pmp->pm_uid = v;
 	if (vfs_scanopt(mp->mnt_optnew, "mask", "%d", &v) == 1)
 		pmp->pm_mask = v & ALLPERMS;
 	if (vfs_scanopt(mp->mnt_optnew, "dirmask", "%d", &v) == 1)
 		pmp->pm_dirmask = v & ALLPERMS;
 	vfs_flagopt(mp->mnt_optnew, "shortname",
 	    &pmp->pm_flags, MSDOSFSMNT_SHORTNAME);
 	vfs_flagopt(mp->mnt_optnew, "shortnames",
 	    &pmp->pm_flags, MSDOSFSMNT_SHORTNAME);
 	vfs_flagopt(mp->mnt_optnew, "longname",
 	    &pmp->pm_flags, MSDOSFSMNT_LONGNAME);
 	vfs_flagopt(mp->mnt_optnew, "longnames",
 	    &pmp->pm_flags, MSDOSFSMNT_LONGNAME);
 	vfs_flagopt(mp->mnt_optnew, "kiconv",
 	    &pmp->pm_flags, MSDOSFSMNT_KICONV);
 
 	if (vfs_getopt(mp->mnt_optnew, "nowin95", NULL, NULL) == 0)
 		pmp->pm_flags |= MSDOSFSMNT_NOWIN95;
 	else
 		pmp->pm_flags &= ~MSDOSFSMNT_NOWIN95;
 
 	if (pmp->pm_flags & MSDOSFSMNT_NOWIN95)
 		pmp->pm_flags |= MSDOSFSMNT_SHORTNAME;
 	else
 		pmp->pm_flags |= MSDOSFSMNT_LONGNAME;
 	return 0;
 }
 
 static int
 msdosfs_cmount(struct mntarg *ma, void *data, uint64_t flags)
 {
 	struct msdosfs_args args;
 	struct export_args exp;
 	int error;
 
 	if (data == NULL)
 		return (EINVAL);
 	error = copyin(data, &args, sizeof args);
 	if (error)
 		return (error);
 	vfs_oexport_conv(&args.export, &exp);
 
 	ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN);
 	ma = mount_arg(ma, "export", &exp, sizeof(exp));
 	ma = mount_argf(ma, "uid", "%d", args.uid);
 	ma = mount_argf(ma, "gid", "%d", args.gid);
 	ma = mount_argf(ma, "mask", "%d", args.mask);
 	ma = mount_argf(ma, "dirmask", "%d", args.dirmask);
 
 	ma = mount_argb(ma, args.flags & MSDOSFSMNT_SHORTNAME, "noshortname");
 	ma = mount_argb(ma, args.flags & MSDOSFSMNT_LONGNAME, "nolongname");
 	ma = mount_argb(ma, !(args.flags & MSDOSFSMNT_NOWIN95), "nowin95");
 	ma = mount_argb(ma, args.flags & MSDOSFSMNT_KICONV, "nokiconv");
 
 	ma = mount_argsu(ma, "cs_win", args.cs_win, MAXCSLEN);
 	ma = mount_argsu(ma, "cs_dos", args.cs_dos, MAXCSLEN);
 	ma = mount_argsu(ma, "cs_local", args.cs_local, MAXCSLEN);
 
 	error = kernel_mount(ma, flags);
 
 	return (error);
 }
 
 /*
  * mp - path - addr in user space of mount point (ie /usr or whatever)
  * data - addr in user space of mount params including the name of the block
  * special file to treat as a filesystem.
  */
 static int
 msdosfs_mount(struct mount *mp)
 {
 	struct vnode *devvp;	  /* vnode for blk device to mount */
 	struct thread *td;
 	/* msdosfs specific mount control block */
 	struct msdosfsmount *pmp = NULL;
 	struct nameidata ndp;
 	int error, flags;
 	accmode_t accmode;
 	char *from;
 
 	td = curthread;
 	if (vfs_filteropt(mp->mnt_optnew, msdosfs_opts))
 		return (EINVAL);
 
 	/*
 	 * If updating, check whether changing from read-only to
 	 * read/write; if there is no device name, that's all we do.
 	 */
 	if (mp->mnt_flag & MNT_UPDATE) {
 		pmp = VFSTOMSDOSFS(mp);
 		if (vfs_flagopt(mp->mnt_optnew, "export", NULL, 0)) {
 			/*
 			 * Forbid export requests if filesystem has
 			 * MSDOSFS_LARGEFS flag set.
 			 */
 			if ((pmp->pm_flags & MSDOSFS_LARGEFS) != 0) {
 				vfs_mount_error(mp,
 				    "MSDOSFS_LARGEFS flag set, cannot export");
 				return (EOPNOTSUPP);
 			}
 		}
 		if (!(pmp->pm_flags & MSDOSFSMNT_RONLY) &&
 		    vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0)) {
 			error = VFS_SYNC(mp, MNT_WAIT);
 			if (error)
 				return (error);
 			flags = WRITECLOSE;
 			if (mp->mnt_flag & MNT_FORCE)
 				flags |= FORCECLOSE;
 			error = vflush(mp, 0, flags, td);
 			if (error)
 				return (error);
 
 			/*
 			 * Now the volume is clean.  Mark it so while the
 			 * device is still rw.
 			 */
 			error = markvoldirty(pmp, 0);
 			if (error) {
 				(void)markvoldirty(pmp, 1);
 				return (error);
 			}
 
 			/* Downgrade the device from rw to ro. */
 			g_topology_lock();
 			error = g_access(pmp->pm_cp, 0, -1, 0);
 			g_topology_unlock();
 			if (error) {
 				(void)markvoldirty(pmp, 1);
 				return (error);
 			}
 
 			/*
 			 * Backing out after an error was painful in the
 			 * above.  Now we are committed to succeeding.
 			 */
 			pmp->pm_fmod = 0;
 			pmp->pm_flags |= MSDOSFSMNT_RONLY;
 			MNT_ILOCK(mp);
 			mp->mnt_flag |= MNT_RDONLY;
 			MNT_IUNLOCK(mp);
 		} else if ((pmp->pm_flags & MSDOSFSMNT_RONLY) &&
 		    !vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0)) {
 			/*
 			 * If upgrade to read-write by non-root, then verify
 			 * that user has necessary permissions on the device.
 			 */
 			devvp = pmp->pm_devvp;
 			vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 			error = VOP_ACCESS(devvp, VREAD | VWRITE,
 			    td->td_ucred, td);
 			if (error)
 				error = priv_check(td, PRIV_VFS_MOUNT_PERM);
 			if (error) {
 				VOP_UNLOCK(devvp, 0);
 				return (error);
 			}
 			VOP_UNLOCK(devvp, 0);
 			g_topology_lock();
 			error = g_access(pmp->pm_cp, 0, 1, 0);
 			g_topology_unlock();
 			if (error)
 				return (error);
 
 			pmp->pm_fmod = 1;
 			pmp->pm_flags &= ~MSDOSFSMNT_RONLY;
 			MNT_ILOCK(mp);
 			mp->mnt_flag &= ~MNT_RDONLY;
 			MNT_IUNLOCK(mp);
 
 			/* Now that the volume is modifiable, mark it dirty. */
 			error = markvoldirty(pmp, 1);
 			if (error)
 				return (error); 
 		}
 	}
 	/*
 	 * Not an update, or updating the name: look up the name
 	 * and verify that it refers to a sensible disk device.
 	 */
 	if (vfs_getopt(mp->mnt_optnew, "from", (void **)&from, NULL))
 		return (EINVAL);
 	NDINIT(&ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, from, td);
 	error = namei(&ndp);
 	if (error)
 		return (error);
 	devvp = ndp.ni_vp;
 	NDFREE(&ndp, NDF_ONLY_PNBUF);
 
 	if (!vn_isdisk(devvp, &error)) {
 		vput(devvp);
 		return (error);
 	}
 	/*
 	 * If mount by non-root, then verify that user has necessary
 	 * permissions on the device.
 	 */
 	accmode = VREAD;
 	if ((mp->mnt_flag & MNT_RDONLY) == 0)
 		accmode |= VWRITE;
 	error = VOP_ACCESS(devvp, accmode, td->td_ucred, td);
 	if (error)
 		error = priv_check(td, PRIV_VFS_MOUNT_PERM);
 	if (error) {
 		vput(devvp);
 		return (error);
 	}
 	if ((mp->mnt_flag & MNT_UPDATE) == 0) {
 		error = mountmsdosfs(devvp, mp);
 #ifdef MSDOSFS_DEBUG		/* only needed for the printf below */
 		pmp = VFSTOMSDOSFS(mp);
 #endif
 	} else {
 		vput(devvp);
 		if (devvp != pmp->pm_devvp)
 			return (EINVAL);	/* XXX needs translation */
 	}
 	if (error) {
 		vrele(devvp);
 		return (error);
 	}
 
 	error = update_mp(mp, td);
 	if (error) {
 		if ((mp->mnt_flag & MNT_UPDATE) == 0)
 			msdosfs_unmount(mp, MNT_FORCE);
 		return error;
 	}
 
 	vfs_mountedfrom(mp, from);
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_mount(): mp %p, pmp %p, inusemap %p\n", mp, pmp, pmp->pm_inusemap);
 #endif
 	return (0);
 }
 
 static int
 mountmsdosfs(struct vnode *devvp, struct mount *mp)
 {
 	struct msdosfsmount *pmp;
 	struct buf *bp;
 	struct cdev *dev;
 	union bootsector *bsp;
 	struct byte_bpb33 *b33;
 	struct byte_bpb50 *b50;
 	struct byte_bpb710 *b710;
 	uint8_t SecPerClust;
 	u_long clusters;
 	int ronly, error;
 	struct g_consumer *cp;
 	struct bufobj *bo;
 
 	bp = NULL;		/* This and pmp both used in error_exit. */
 	pmp = NULL;
 	ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
 
 	dev = devvp->v_rdev;
 	if (atomic_cmpset_acq_ptr((uintptr_t *)&dev->si_mountpt, 0,
 	    (uintptr_t)mp) == 0) {
 		VOP_UNLOCK(devvp, 0);
 		return (EBUSY);
 	}
 	g_topology_lock();
 	error = g_vfs_open(devvp, &cp, "msdosfs", ronly ? 0 : 1);
 	g_topology_unlock();
 	if (error != 0) {
 		atomic_store_rel_ptr((uintptr_t *)&dev->si_mountpt, 0);
 		VOP_UNLOCK(devvp, 0);
 		return (error);
 	}
 	dev_ref(dev);
 	VOP_UNLOCK(devvp, 0);
 
 	bo = &devvp->v_bufobj;
 
 	/*
 	 * Read the boot sector of the filesystem, and then check the
 	 * boot signature.  If not a dos boot sector then error out.
 	 *
 	 * NOTE: 8192 is a magic size that works for ffs.
 	 */
 	error = bread(devvp, 0, 8192, NOCRED, &bp);
 	if (error)
 		goto error_exit;
 	bp->b_flags |= B_AGE;
 	bsp = (union bootsector *)bp->b_data;
 	b33 = (struct byte_bpb33 *)bsp->bs33.bsBPB;
 	b50 = (struct byte_bpb50 *)bsp->bs50.bsBPB;
 	b710 = (struct byte_bpb710 *)bsp->bs710.bsBPB;
 
 #ifndef MSDOSFS_NOCHECKSIG
 	if (bsp->bs50.bsBootSectSig0 != BOOTSIG0
 	    || bsp->bs50.bsBootSectSig1 != BOOTSIG1) {
 		error = EINVAL;
 		goto error_exit;
 	}
 #endif
 
 	pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_WAITOK | M_ZERO);
 	pmp->pm_mountp = mp;
 	pmp->pm_cp = cp;
 	pmp->pm_bo = bo;
 
 	lockinit(&pmp->pm_fatlock, 0, msdosfs_lock_msg, 0, 0);
 
 	/*
 	 * Initialize ownerships and permissions, since nothing else will
 	 * initialize them iff we are mounting root.
 	 */
 	pmp->pm_uid = UID_ROOT;
 	pmp->pm_gid = GID_WHEEL;
 	pmp->pm_mask = pmp->pm_dirmask = S_IXUSR | S_IXGRP | S_IXOTH |
 	    S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR;
 
 	/*
 	 * Experimental support for large MS-DOS filesystems.
 	 * WARNING: This uses at least 32 bytes of kernel memory (which is not
 	 * reclaimed until the FS is unmounted) for each file on disk to map
 	 * between the 32-bit inode numbers used by VFS and the 64-bit
 	 * pseudo-inode numbers used internally by msdosfs. This is only
 	 * safe to use in certain controlled situations (e.g. read-only FS
 	 * with less than 1 million files).
 	 * Since the mappings do not persist across unmounts (or reboots), these
 	 * filesystems are not suitable for exporting through NFS, or any other
 	 * application that requires fixed inode numbers.
 	 */
 	vfs_flagopt(mp->mnt_optnew, "large", &pmp->pm_flags, MSDOSFS_LARGEFS);
 
 	/*
 	 * Compute several useful quantities from the bpb in the
 	 * bootsector.  Copy in the dos 5 variant of the bpb then fix up
 	 * the fields that are different between dos 5 and dos 3.3.
 	 */
 	SecPerClust = b50->bpbSecPerClust;
 	pmp->pm_BytesPerSec = getushort(b50->bpbBytesPerSec);
 	if (pmp->pm_BytesPerSec < DEV_BSIZE) {
 		error = EINVAL;
 		goto error_exit;
 	}
 	pmp->pm_ResSectors = getushort(b50->bpbResSectors);
 	pmp->pm_FATs = b50->bpbFATs;
 	pmp->pm_RootDirEnts = getushort(b50->bpbRootDirEnts);
 	pmp->pm_Sectors = getushort(b50->bpbSectors);
 	pmp->pm_FATsecs = getushort(b50->bpbFATsecs);
 	pmp->pm_SecPerTrack = getushort(b50->bpbSecPerTrack);
 	pmp->pm_Heads = getushort(b50->bpbHeads);
 	pmp->pm_Media = b50->bpbMedia;
 
 	/* calculate the ratio of sector size to DEV_BSIZE */
 	pmp->pm_BlkPerSec = pmp->pm_BytesPerSec / DEV_BSIZE;
 
 	/*
 	 * We don't check pm_Heads nor pm_SecPerTrack, because
 	 * these may not be set for EFI file systems. We don't
 	 * use these anyway, so we're unaffected if they are
 	 * invalid.
 	 */
 	if (!pmp->pm_BytesPerSec || !SecPerClust) {
 		error = EINVAL;
 		goto error_exit;
 	}
 
 	if (pmp->pm_Sectors == 0) {
 		pmp->pm_HiddenSects = getulong(b50->bpbHiddenSecs);
 		pmp->pm_HugeSectors = getulong(b50->bpbHugeSectors);
 	} else {
 		pmp->pm_HiddenSects = getushort(b33->bpbHiddenSecs);
 		pmp->pm_HugeSectors = pmp->pm_Sectors;
 	}
 	if (!(pmp->pm_flags & MSDOSFS_LARGEFS)) {
 		if (pmp->pm_HugeSectors > 0xffffffff /
 		    (pmp->pm_BytesPerSec / sizeof(struct direntry)) + 1) {
 			/*
 			 * We cannot deal currently with this size of disk
 			 * due to fileid limitations (see msdosfs_getattr and
 			 * msdosfs_readdir)
 			 */
 			error = EINVAL;
 			vfs_mount_error(mp,
 			    "Disk too big, try '-o large' mount option");
 			goto error_exit;
 		}
 	}
 
 	if (pmp->pm_RootDirEnts == 0) {
 		if (pmp->pm_FATsecs
 		    || getushort(b710->bpbFSVers)) {
 			error = EINVAL;
 #ifdef MSDOSFS_DEBUG
 			printf("mountmsdosfs(): bad FAT32 filesystem\n");
 #endif
 			goto error_exit;
 		}
 		pmp->pm_fatmask = FAT32_MASK;
 		pmp->pm_fatmult = 4;
 		pmp->pm_fatdiv = 1;
 		pmp->pm_FATsecs = getulong(b710->bpbBigFATsecs);
 		if (getushort(b710->bpbExtFlags) & FATMIRROR)
 			pmp->pm_curfat = getushort(b710->bpbExtFlags) & FATNUM;
 		else
 			pmp->pm_flags |= MSDOSFS_FATMIRROR;
 	} else
 		pmp->pm_flags |= MSDOSFS_FATMIRROR;
 
 	/*
 	 * Check a few values (could do some more):
 	 * - logical sector size: power of 2, >= block size
 	 * - sectors per cluster: power of 2, >= 1
 	 * - number of sectors:   >= 1, <= size of partition
 	 * - number of FAT sectors: >= 1
 	 */
 	if ( (SecPerClust == 0)
 	  || (SecPerClust & (SecPerClust - 1))
 	  || (pmp->pm_BytesPerSec < DEV_BSIZE)
 	  || (pmp->pm_BytesPerSec & (pmp->pm_BytesPerSec - 1))
 	  || (pmp->pm_HugeSectors == 0)
 	  || (pmp->pm_FATsecs == 0)
 	  || (SecPerClust * pmp->pm_BlkPerSec > MAXBSIZE / DEV_BSIZE)
 	) {
 		error = EINVAL;
 		goto error_exit;
 	}
 
 	pmp->pm_HugeSectors *= pmp->pm_BlkPerSec;
 	pmp->pm_HiddenSects *= pmp->pm_BlkPerSec;	/* XXX not used? */
 	pmp->pm_FATsecs     *= pmp->pm_BlkPerSec;
 	SecPerClust         *= pmp->pm_BlkPerSec;
 
 	pmp->pm_fatblk = pmp->pm_ResSectors * pmp->pm_BlkPerSec;
 
 	if (FAT32(pmp)) {
 		pmp->pm_rootdirblk = getulong(b710->bpbRootClust);
 		pmp->pm_firstcluster = pmp->pm_fatblk
 			+ (pmp->pm_FATs * pmp->pm_FATsecs);
 		pmp->pm_fsinfo = getushort(b710->bpbFSInfo) * pmp->pm_BlkPerSec;
 	} else {
 		pmp->pm_rootdirblk = pmp->pm_fatblk +
 			(pmp->pm_FATs * pmp->pm_FATsecs);
 		pmp->pm_rootdirsize = howmany(pmp->pm_RootDirEnts *
 			sizeof(struct direntry), DEV_BSIZE); /* in blocks */
 		pmp->pm_firstcluster = pmp->pm_rootdirblk + pmp->pm_rootdirsize;
 	}
 
 	pmp->pm_maxcluster = (pmp->pm_HugeSectors - pmp->pm_firstcluster) /
 	    SecPerClust + 1;
 	pmp->pm_fatsize = pmp->pm_FATsecs * DEV_BSIZE;	/* XXX not used? */
 
 	if (pmp->pm_fatmask == 0) {
 		if (pmp->pm_maxcluster
 		    <= ((CLUST_RSRVD - CLUST_FIRST) & FAT12_MASK)) {
 			/*
 			 * This will usually be a floppy disk. This size makes
-			 * sure that one fat entry will not be split across
+			 * sure that one FAT entry will not be split across
 			 * multiple blocks.
 			 */
 			pmp->pm_fatmask = FAT12_MASK;
 			pmp->pm_fatmult = 3;
 			pmp->pm_fatdiv = 2;
 		} else {
 			pmp->pm_fatmask = FAT16_MASK;
 			pmp->pm_fatmult = 2;
 			pmp->pm_fatdiv = 1;
 		}
 	}
 
 	clusters = (pmp->pm_fatsize / pmp->pm_fatmult) * pmp->pm_fatdiv;
 	if (pmp->pm_maxcluster >= clusters) {
 #ifdef MSDOSFS_DEBUG
 		printf("Warning: number of clusters (%ld) exceeds FAT "
 		    "capacity (%ld)\n", pmp->pm_maxcluster + 1, clusters);
 #endif
 		pmp->pm_maxcluster = clusters - 1;
 	}
 
 	if (FAT12(pmp))
 		pmp->pm_fatblocksize = 3 * 512;
 	else
 		pmp->pm_fatblocksize = PAGE_SIZE;
 	pmp->pm_fatblocksize = roundup(pmp->pm_fatblocksize,
 	    pmp->pm_BytesPerSec);
 	pmp->pm_fatblocksec = pmp->pm_fatblocksize / DEV_BSIZE;
 	pmp->pm_bnshift = ffs(DEV_BSIZE) - 1;
 
 	/*
 	 * Compute mask and shift value for isolating cluster relative byte
 	 * offsets and cluster numbers from a file offset.
 	 */
 	pmp->pm_bpcluster = SecPerClust * DEV_BSIZE;
 	pmp->pm_crbomask = pmp->pm_bpcluster - 1;
 	pmp->pm_cnshift = ffs(pmp->pm_bpcluster) - 1;
 
 	/*
 	 * Check for valid cluster size
 	 * must be a power of 2
 	 */
 	if (pmp->pm_bpcluster ^ (1 << pmp->pm_cnshift)) {
 		error = EINVAL;
 		goto error_exit;
 	}
 
 	/*
 	 * Release the bootsector buffer.
 	 */
 	brelse(bp);
 	bp = NULL;
 
 	/*
 	 * Check the fsinfo sector if we have one.  Silently fix up our
 	 * in-core copy of fp->fsinxtfree if it is unknown (0xffffffff)
 	 * or too large.  Ignore fp->fsinfree for now, since we need to
 	 * read the entire FAT anyway to fill the inuse map.
 	 */
 	if (pmp->pm_fsinfo) {
 		struct fsinfo *fp;
 
 		if ((error = bread(devvp, pmp->pm_fsinfo, pmp->pm_BytesPerSec,
 		    NOCRED, &bp)) != 0)
 			goto error_exit;
 		fp = (struct fsinfo *)bp->b_data;
 		if (!bcmp(fp->fsisig1, "RRaA", 4)
 		    && !bcmp(fp->fsisig2, "rrAa", 4)
 		    && !bcmp(fp->fsisig3, "\0\0\125\252", 4)) {
 			pmp->pm_nxtfree = getulong(fp->fsinxtfree);
 			if (pmp->pm_nxtfree > pmp->pm_maxcluster)
 				pmp->pm_nxtfree = CLUST_FIRST;
 		} else
 			pmp->pm_fsinfo = 0;
 		brelse(bp);
 		bp = NULL;
 	}
 
 	/*
 	 * Finish initializing pmp->pm_nxtfree (just in case the first few
 	 * sectors aren't properly reserved in the FAT).  This completes
 	 * the fixup for fp->fsinxtfree, and fixes up the zero-initialized
 	 * value if there is no fsinfo.  We will use pmp->pm_nxtfree
 	 * internally even if there is no fsinfo.
 	 */
 	if (pmp->pm_nxtfree < CLUST_FIRST)
 		pmp->pm_nxtfree = CLUST_FIRST;
 
 	/*
 	 * Allocate memory for the bitmap of allocated clusters, and then
 	 * fill it in.
 	 */
 	pmp->pm_inusemap = malloc(howmany(pmp->pm_maxcluster + 1, N_INUSEBITS)
 				  * sizeof(*pmp->pm_inusemap),
 				  M_MSDOSFSFAT, M_WAITOK);
 
 	/*
 	 * fillinusemap() needs pm_devvp.
 	 */
 	pmp->pm_devvp = devvp;
 	pmp->pm_dev = dev;
 
 	/*
 	 * Have the inuse map filled in.
 	 */
 	MSDOSFS_LOCK_MP(pmp);
 	error = fillinusemap(pmp);
 	MSDOSFS_UNLOCK_MP(pmp);
 	if (error != 0)
 		goto error_exit;
 
 	/*
-	 * If they want fat updates to be synchronous then let them suffer
+	 * If they want FAT updates to be synchronous then let them suffer
 	 * the performance degradation in exchange for the on disk copy of
-	 * the fat being correct just about all the time.  I suppose this
+	 * the FAT being correct just about all the time.  I suppose this
 	 * would be a good thing to turn on if the kernel is still flakey.
 	 */
 	if (mp->mnt_flag & MNT_SYNCHRONOUS)
 		pmp->pm_flags |= MSDOSFSMNT_WAITONFAT;
 
 	/*
 	 * Finish up.
 	 */
 	if (ronly)
 		pmp->pm_flags |= MSDOSFSMNT_RONLY;
 	else {
 		if ((error = markvoldirty(pmp, 1)) != 0) {
 			(void)markvoldirty(pmp, 0);
 			goto error_exit;
 		}
 		pmp->pm_fmod = 1;
 	}
 	mp->mnt_data =  pmp;
 	mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
 	mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
 	MNT_ILOCK(mp);
 	mp->mnt_flag |= MNT_LOCAL;
 	mp->mnt_kern_flag |= MNTK_USES_BCACHE | MNTK_NO_IOPF;
 	MNT_IUNLOCK(mp);
 
 	if (pmp->pm_flags & MSDOSFS_LARGEFS)
 		msdosfs_fileno_init(mp);
 
 	return 0;
 
 error_exit:
 	if (bp)
 		brelse(bp);
 	if (cp != NULL) {
 		g_topology_lock();
 		g_vfs_close(cp);
 		g_topology_unlock();
 	}
 	if (pmp) {
 		lockdestroy(&pmp->pm_fatlock);
 		free(pmp->pm_inusemap, M_MSDOSFSFAT);
 		free(pmp, M_MSDOSFSMNT);
 		mp->mnt_data = NULL;
 	}
 	atomic_store_rel_ptr((uintptr_t *)&dev->si_mountpt, 0);
 	dev_rel(dev);
 	return (error);
 }
 
 /*
  * Unmount the filesystem described by mp.
  */
 static int
 msdosfs_unmount(struct mount *mp, int mntflags)
 {
 	struct msdosfsmount *pmp;
 	int error, flags;
 
 	error = flags = 0;
 	pmp = VFSTOMSDOSFS(mp);
 	if ((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0)
 		error = msdosfs_sync(mp, MNT_WAIT);
 	if ((mntflags & MNT_FORCE) != 0)
 		flags |= FORCECLOSE;
 	else if (error != 0)
 		return (error);
 	error = vflush(mp, 0, flags, curthread);
 	if (error != 0 && error != ENXIO)
 		return (error);
 	if ((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0) {
 		error = markvoldirty(pmp, 0);
 		if (error && error != ENXIO) {
 			(void)markvoldirty(pmp, 1);
 			return (error);
 		}
 	}
 	if (pmp->pm_flags & MSDOSFSMNT_KICONV && msdosfs_iconv) {
 		if (pmp->pm_w2u)
 			msdosfs_iconv->close(pmp->pm_w2u);
 		if (pmp->pm_u2w)
 			msdosfs_iconv->close(pmp->pm_u2w);
 		if (pmp->pm_d2u)
 			msdosfs_iconv->close(pmp->pm_d2u);
 		if (pmp->pm_u2d)
 			msdosfs_iconv->close(pmp->pm_u2d);
 	}
 
 #ifdef MSDOSFS_DEBUG
 	{
 		struct vnode *vp = pmp->pm_devvp;
 		struct bufobj *bo;
 
 		bo = &vp->v_bufobj;
 		BO_LOCK(bo);
 		VI_LOCK(vp);
 		vn_printf(vp,
 		    "msdosfs_umount(): just before calling VOP_CLOSE()\n");
 		printf("freef %p, freeb %p, mount %p\n",
 		    TAILQ_NEXT(vp, v_actfreelist), vp->v_actfreelist.tqe_prev,
 		    vp->v_mount);
 		printf("cleanblkhd %p, dirtyblkhd %p, numoutput %ld, type %d\n",
 		    TAILQ_FIRST(&vp->v_bufobj.bo_clean.bv_hd),
 		    TAILQ_FIRST(&vp->v_bufobj.bo_dirty.bv_hd),
 		    vp->v_bufobj.bo_numoutput, vp->v_type);
 		VI_UNLOCK(vp);
 		BO_UNLOCK(bo);
 	}
 #endif
 	g_topology_lock();
 	g_vfs_close(pmp->pm_cp);
 	g_topology_unlock();
 	atomic_store_rel_ptr((uintptr_t *)&pmp->pm_dev->si_mountpt, 0);
 	vrele(pmp->pm_devvp);
 	dev_rel(pmp->pm_dev);
 	free(pmp->pm_inusemap, M_MSDOSFSFAT);
 	if (pmp->pm_flags & MSDOSFS_LARGEFS)
 		msdosfs_fileno_free(mp);
 	lockdestroy(&pmp->pm_fatlock);
 	free(pmp, M_MSDOSFSMNT);
 	mp->mnt_data = NULL;
 	MNT_ILOCK(mp);
 	mp->mnt_flag &= ~MNT_LOCAL;
 	MNT_IUNLOCK(mp);
 	return (error);
 }
 
 static int
 msdosfs_root(struct mount *mp, int flags, struct vnode **vpp)
 {
 	struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
 	struct denode *ndep;
 	int error;
 
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_root(); mp %p, pmp %p\n", mp, pmp);
 #endif
 	error = deget(pmp, MSDOSFSROOT, MSDOSFSROOT_OFS, &ndep);
 	if (error)
 		return (error);
 	*vpp = DETOV(ndep);
 	return (0);
 }
 
 static int
 msdosfs_statfs(struct mount *mp, struct statfs *sbp)
 {
 	struct msdosfsmount *pmp;
 
 	pmp = VFSTOMSDOSFS(mp);
 	sbp->f_bsize = pmp->pm_bpcluster;
 	sbp->f_iosize = pmp->pm_bpcluster;
 	sbp->f_blocks = pmp->pm_maxcluster + 1;
 	sbp->f_bfree = pmp->pm_freeclustercount;
 	sbp->f_bavail = pmp->pm_freeclustercount;
 	sbp->f_files = pmp->pm_RootDirEnts;	/* XXX */
 	sbp->f_ffree = 0;	/* what to put in here? */
 	return (0);
 }
 
 /*
  * If we have an FSInfo block, update it.
  */
 static int
 msdosfs_fsiflush(struct msdosfsmount *pmp, int waitfor)
 {
 	struct fsinfo *fp;
 	struct buf *bp;
 	int error;
 
 	MSDOSFS_LOCK_MP(pmp);
 	if (pmp->pm_fsinfo == 0 || (pmp->pm_flags & MSDOSFS_FSIMOD) == 0) {
 		error = 0;
 		goto unlock;
 	}
 	error = bread(pmp->pm_devvp, pmp->pm_fsinfo, pmp->pm_BytesPerSec,
 	    NOCRED, &bp);
 	if (error != 0) {
 		brelse(bp);
 		goto unlock;
 	}
 	fp = (struct fsinfo *)bp->b_data;
 	putulong(fp->fsinfree, pmp->pm_freeclustercount);
 	putulong(fp->fsinxtfree, pmp->pm_nxtfree);
 	pmp->pm_flags &= ~MSDOSFS_FSIMOD;
 	if (waitfor == MNT_WAIT)
 		error = bwrite(bp);
 	else
 		bawrite(bp);
 unlock:
 	MSDOSFS_UNLOCK_MP(pmp);
 	return (error);
 }
 
 static int
 msdosfs_sync(struct mount *mp, int waitfor)
 {
 	struct vnode *vp, *nvp;
 	struct thread *td;
 	struct denode *dep;
 	struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
 	int error, allerror = 0;
 
 	td = curthread;
 
 	/*
-	 * If we ever switch to not updating all of the fats all the time,
+	 * If we ever switch to not updating all of the FATs all the time,
 	 * this would be the place to update them from the first one.
 	 */
 	if (pmp->pm_fmod != 0) {
 		if (pmp->pm_flags & MSDOSFSMNT_RONLY)
 			panic("msdosfs_sync: rofs mod");
 		else {
-			/* update fats here */
+			/* update FATs here */
 		}
 	}
 	/*
 	 * Write back each (modified) denode.
 	 */
 loop:
 	MNT_VNODE_FOREACH_ALL(vp, mp, nvp) {
 		if (vp->v_type == VNON) {
 			VI_UNLOCK(vp);
 			continue;
 		}
 		dep = VTODE(vp);
 		if ((dep->de_flag &
 		    (DE_ACCESS | DE_CREATE | DE_UPDATE | DE_MODIFIED)) == 0 &&
 		    (vp->v_bufobj.bo_dirty.bv_cnt == 0 ||
 		    waitfor == MNT_LAZY)) {
 			VI_UNLOCK(vp);
 			continue;
 		}
 		error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, td);
 		if (error) {
 			if (error == ENOENT)
 				goto loop;
 			continue;
 		}
 		error = VOP_FSYNC(vp, waitfor, td);
 		if (error)
 			allerror = error;
 		VOP_UNLOCK(vp, 0);
 		vrele(vp);
 	}
 
 	/*
 	 * Flush filesystem control info.
 	 */
 	if (waitfor != MNT_LAZY) {
 		vn_lock(pmp->pm_devvp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_FSYNC(pmp->pm_devvp, waitfor, td);
 		if (error)
 			allerror = error;
 		VOP_UNLOCK(pmp->pm_devvp, 0);
 	}
 
 	error = msdosfs_fsiflush(pmp, waitfor);
 	if (error != 0)
 		allerror = error;
 	return (allerror);
 }
 
 static int
 msdosfs_fhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp)
 {
 	struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
 	struct defid *defhp = (struct defid *) fhp;
 	struct denode *dep;
 	int error;
 
 	error = deget(pmp, defhp->defid_dirclust, defhp->defid_dirofs, &dep);
 	if (error) {
 		*vpp = NULLVP;
 		return (error);
 	}
 	*vpp = DETOV(dep);
 	vnode_create_vobject(*vpp, dep->de_FileSize, curthread);
 	return (0);
 }
 
 static struct vfsops msdosfs_vfsops = {
 	.vfs_fhtovp =		msdosfs_fhtovp,
 	.vfs_mount =		msdosfs_mount,
 	.vfs_cmount =		msdosfs_cmount,
 	.vfs_root =		msdosfs_root,
 	.vfs_statfs =		msdosfs_statfs,
 	.vfs_sync =		msdosfs_sync,
 	.vfs_unmount =		msdosfs_unmount,
 };
 
 VFS_SET(msdosfs_vfsops, msdosfs, 0);
 MODULE_VERSION(msdosfs, 1);
Index: projects/clang500-import/sys/fs/msdosfs/msdosfs_vnops.c
===================================================================
--- projects/clang500-import/sys/fs/msdosfs/msdosfs_vnops.c	(revision 318657)
+++ projects/clang500-import/sys/fs/msdosfs/msdosfs_vnops.c	(revision 318658)
@@ -1,1963 +1,1963 @@
 /* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
  *
  * 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 TooLs GmbH.
  * 4. The name of TooLs GmbH may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
  */
 /*-
  * Written by Paul Popelka (paulp@uts.amdahl.com)
  *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
  *
  * This software is provided "as is".
  *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
  *
  * October 1992
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/clock.h>
 #include <sys/dirent.h>
 #include <sys/lock.h>
 #include <sys/lockf.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/priv.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 #include <sys/vmmeter.h>
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vnode_pager.h>
 
 #include <fs/msdosfs/bpb.h>
 #include <fs/msdosfs/direntry.h>
 #include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
 #include <fs/msdosfs/msdosfsmount.h>
 
 #define	DOS_FILESIZE_MAX	0xffffffff
 
 /*
  * Prototypes for MSDOSFS vnode operations
  */
 static vop_create_t	msdosfs_create;
 static vop_mknod_t	msdosfs_mknod;
 static vop_open_t	msdosfs_open;
 static vop_close_t	msdosfs_close;
 static vop_access_t	msdosfs_access;
 static vop_getattr_t	msdosfs_getattr;
 static vop_setattr_t	msdosfs_setattr;
 static vop_read_t	msdosfs_read;
 static vop_write_t	msdosfs_write;
 static vop_fsync_t	msdosfs_fsync;
 static vop_remove_t	msdosfs_remove;
 static vop_link_t	msdosfs_link;
 static vop_rename_t	msdosfs_rename;
 static vop_mkdir_t	msdosfs_mkdir;
 static vop_rmdir_t	msdosfs_rmdir;
 static vop_symlink_t	msdosfs_symlink;
 static vop_readdir_t	msdosfs_readdir;
 static vop_bmap_t	msdosfs_bmap;
 static vop_getpages_t	msdosfs_getpages;
 static vop_strategy_t	msdosfs_strategy;
 static vop_print_t	msdosfs_print;
 static vop_pathconf_t	msdosfs_pathconf;
 static vop_vptofh_t	msdosfs_vptofh;
 
 /*
  * Some general notes:
  *
  * In the ufs filesystem the inodes, superblocks, and indirect blocks are
  * read/written using the vnode for the filesystem. Blocks that represent
  * the contents of a file are read/written using the vnode for the file
  * (including directories when they are read/written as files). This
  * presents problems for the dos filesystem because data that should be in
  * an inode (if dos had them) resides in the directory itself.  Since we
  * must update directory entries without the benefit of having the vnode
  * for the directory we must use the vnode for the filesystem.  This means
  * that when a directory is actually read/written (via read, write, or
  * readdir, or seek) we must use the vnode for the filesystem instead of
  * the vnode for the directory as would happen in ufs. This is to insure we
  * retrieve the correct block from the buffer cache since the hash value is
  * based upon the vnode address and the desired block number.
  */
 
 /*
  * Create a regular file. On entry the directory to contain the file being
  * created is locked.  We must release before we return. We must also free
  * the pathname buffer pointed at by cnp->cn_pnbuf, always on error, or
  * only if the SAVESTART bit in cn_flags is clear on success.
  */
 static int
 msdosfs_create(struct vop_create_args *ap)
 {
 	struct componentname *cnp = ap->a_cnp;
 	struct denode ndirent;
 	struct denode *dep;
 	struct denode *pdep = VTODE(ap->a_dvp);
 	struct timespec ts;
 	int error;
 
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_create(cnp %p, vap %p\n", cnp, ap->a_vap);
 #endif
 
 	/*
 	 * If this is the root directory and there is no space left we
 	 * can't do anything.  This is because the root directory can not
 	 * change size.
 	 */
 	if (pdep->de_StartCluster == MSDOSFSROOT
 	    && pdep->de_fndoffset >= pdep->de_FileSize) {
 		error = ENOSPC;
 		goto bad;
 	}
 
 	/*
 	 * Create a directory entry for the file, then call createde() to
 	 * have it installed. NOTE: DOS files are always executable.  We
 	 * use the absence of the owner write bit to make the file
 	 * readonly.
 	 */
 #ifdef DIAGNOSTIC
 	if ((cnp->cn_flags & HASBUF) == 0)
 		panic("msdosfs_create: no name");
 #endif
 	bzero(&ndirent, sizeof(ndirent));
 	error = uniqdosname(pdep, cnp, ndirent.de_Name);
 	if (error)
 		goto bad;
 
 	ndirent.de_Attributes = ATTR_ARCHIVE;
 	ndirent.de_LowerCase = 0;
 	ndirent.de_StartCluster = 0;
 	ndirent.de_FileSize = 0;
 	ndirent.de_pmp = pdep->de_pmp;
 	ndirent.de_flag = DE_ACCESS | DE_CREATE | DE_UPDATE;
 	getnanotime(&ts);
 	DETIMES(&ndirent, &ts, &ts, &ts);
 	error = createde(&ndirent, pdep, &dep, cnp);
 	if (error)
 		goto bad;
 	*ap->a_vpp = DETOV(dep);
 	if ((cnp->cn_flags & MAKEENTRY) != 0)
 		cache_enter(ap->a_dvp, *ap->a_vpp, cnp);
 	return (0);
 
 bad:
 	return (error);
 }
 
 static int
 msdosfs_mknod(struct vop_mknod_args *ap)
 {
 
     return (EINVAL);
 }
 
 static int
 msdosfs_open(struct vop_open_args *ap)
 {
 	struct denode *dep = VTODE(ap->a_vp);
 	vnode_create_vobject(ap->a_vp, dep->de_FileSize, ap->a_td);
 	return 0;
 }
 
 static int
 msdosfs_close(struct vop_close_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(vp);
 	struct timespec ts;
 
 	VI_LOCK(vp);
 	if (vp->v_usecount > 1) {
 		getnanotime(&ts);
 		DETIMES(dep, &ts, &ts, &ts);
 	}
 	VI_UNLOCK(vp);
 	return 0;
 }
 
 static int
 msdosfs_access(struct vop_access_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(ap->a_vp);
 	struct msdosfsmount *pmp = dep->de_pmp;
 	mode_t file_mode;
 	accmode_t accmode = ap->a_accmode;
 
 	file_mode = S_IRWXU|S_IRWXG|S_IRWXO;
 	file_mode &= (vp->v_type == VDIR ? pmp->pm_dirmask : pmp->pm_mask);
 
 	/*
 	 * Disallow writing to directories and regular files if the
 	 * filesystem is read-only.
 	 */
 	if (accmode & VWRITE) {
 		switch (vp->v_type) {
 		case VREG:
 		case VDIR:
 			if (vp->v_mount->mnt_flag & MNT_RDONLY)
 				return (EROFS);
 			break;
 		default:
 			break;
 		}
 	}
 
 	return (vaccess(vp->v_type, file_mode, pmp->pm_uid, pmp->pm_gid,
 	    ap->a_accmode, ap->a_cred, NULL));
 }
 
 static int
 msdosfs_getattr(struct vop_getattr_args *ap)
 {
 	struct denode *dep = VTODE(ap->a_vp);
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct vattr *vap = ap->a_vap;
 	mode_t mode;
 	struct timespec ts;
 	u_long dirsperblk = pmp->pm_BytesPerSec / sizeof(struct direntry);
 	uint64_t fileid;
 
 	getnanotime(&ts);
 	DETIMES(dep, &ts, &ts, &ts);
 	vap->va_fsid = dev2udev(pmp->pm_dev);
 	/*
 	 * The following computation of the fileid must be the same as that
 	 * used in msdosfs_readdir() to compute d_fileno. If not, pwd
 	 * doesn't work.
 	 */
 	if (dep->de_Attributes & ATTR_DIRECTORY) {
 		fileid = (uint64_t)cntobn(pmp, dep->de_StartCluster) *
 		    dirsperblk;
 		if (dep->de_StartCluster == MSDOSFSROOT)
 			fileid = 1;
 	} else {
 		fileid = (uint64_t)cntobn(pmp, dep->de_dirclust) *
 		    dirsperblk;
 		if (dep->de_dirclust == MSDOSFSROOT)
 			fileid = (uint64_t)roottobn(pmp, 0) * dirsperblk;
 		fileid += (uoff_t)dep->de_diroffset / sizeof(struct direntry);
 	}
 
 	if (pmp->pm_flags & MSDOSFS_LARGEFS)
 		vap->va_fileid = msdosfs_fileno_map(pmp->pm_mountp, fileid);
 	else
 		vap->va_fileid = (long)fileid;
 
 	mode = S_IRWXU|S_IRWXG|S_IRWXO;
 	vap->va_mode = mode & 
 	    (ap->a_vp->v_type == VDIR ? pmp->pm_dirmask : pmp->pm_mask);
 	vap->va_uid = pmp->pm_uid;
 	vap->va_gid = pmp->pm_gid;
 	vap->va_nlink = 1;
 	vap->va_rdev = NODEV;
 	vap->va_size = dep->de_FileSize;
 	fattime2timespec(dep->de_MDate, dep->de_MTime, 0, 0, &vap->va_mtime);
 	vap->va_ctime = vap->va_mtime;
 	if (pmp->pm_flags & MSDOSFSMNT_LONGNAME) {
 		fattime2timespec(dep->de_ADate, 0, 0, 0, &vap->va_atime);
 		fattime2timespec(dep->de_CDate, dep->de_CTime, dep->de_CHun,
 		    0, &vap->va_birthtime);
 	} else {
 		vap->va_atime = vap->va_mtime;
 		vap->va_birthtime.tv_sec = -1;
 		vap->va_birthtime.tv_nsec = 0;
 	}
 	vap->va_flags = 0;
 	if (dep->de_Attributes & ATTR_ARCHIVE)
 		vap->va_flags |= UF_ARCHIVE;
 	if (dep->de_Attributes & ATTR_HIDDEN)
 		vap->va_flags |= UF_HIDDEN;
 	if (dep->de_Attributes & ATTR_READONLY)
 		vap->va_flags |= UF_READONLY;
 	if (dep->de_Attributes & ATTR_SYSTEM)
 		vap->va_flags |= UF_SYSTEM;
 	vap->va_gen = 0;
 	vap->va_blocksize = pmp->pm_bpcluster;
 	vap->va_bytes =
 	    (dep->de_FileSize + pmp->pm_crbomask) & ~pmp->pm_crbomask;
 	vap->va_type = ap->a_vp->v_type;
 	vap->va_filerev = dep->de_modrev;
 	return (0);
 }
 
 static int
 msdosfs_setattr(struct vop_setattr_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(ap->a_vp);
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct vattr *vap = ap->a_vap;
 	struct ucred *cred = ap->a_cred;
 	struct thread *td = curthread;
 	int error = 0;
 
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_setattr(): vp %p, vap %p, cred %p\n",
 	    ap->a_vp, vap, cred);
 #endif
 
 	/*
 	 * Check for unsettable attributes.
 	 */
 	if ((vap->va_type != VNON) || (vap->va_nlink != VNOVAL) ||
 	    (vap->va_fsid != VNOVAL) || (vap->va_fileid != VNOVAL) ||
 	    (vap->va_blocksize != VNOVAL) || (vap->va_rdev != VNOVAL) ||
 	    (vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) {
 #ifdef MSDOSFS_DEBUG
 		printf("msdosfs_setattr(): returning EINVAL\n");
 		printf("    va_type %d, va_nlink %x, va_fsid %lx, va_fileid %lx\n",
 		    vap->va_type, vap->va_nlink, vap->va_fsid, vap->va_fileid);
 		printf("    va_blocksize %lx, va_rdev %x, va_bytes %qx, va_gen %lx\n",
 		    vap->va_blocksize, vap->va_rdev, vap->va_bytes, vap->va_gen);
 		printf("    va_uid %x, va_gid %x\n",
 		    vap->va_uid, vap->va_gid);
 #endif
 		return (EINVAL);
 	}
 
 	/*
 	 * We don't allow setting attributes on the root directory.
 	 * The special case for the root directory is because before
 	 * FAT32, the root directory didn't have an entry for itself
 	 * (and was otherwise special).  With FAT32, the root
 	 * directory is not so special, but still doesn't have an
 	 * entry for itself.
 	 */
 	if (vp->v_vflag & VV_ROOT)
 		return (EINVAL);
 
 	if (vap->va_flags != VNOVAL) {
 		if (vp->v_mount->mnt_flag & MNT_RDONLY)
 			return (EROFS);
 		if (cred->cr_uid != pmp->pm_uid) {
 			error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0);
 			if (error)
 				return (error);
 		}
 		/*
 		 * We are very inconsistent about handling unsupported
 		 * attributes.  We ignored the access time and the
 		 * read and execute bits.  We were strict for the other
 		 * attributes.
 		 */
 		if (vap->va_flags & ~(UF_ARCHIVE | UF_HIDDEN | UF_READONLY |
 		    UF_SYSTEM))
 			return EOPNOTSUPP;
 		if (vap->va_flags & UF_ARCHIVE)
 			dep->de_Attributes |= ATTR_ARCHIVE;
 		else
 			dep->de_Attributes &= ~ATTR_ARCHIVE;
 		if (vap->va_flags & UF_HIDDEN)
 			dep->de_Attributes |= ATTR_HIDDEN;
 		else
 			dep->de_Attributes &= ~ATTR_HIDDEN;
 		/* We don't allow changing the readonly bit on directories. */
 		if (vp->v_type != VDIR) {
 			if (vap->va_flags & UF_READONLY)
 				dep->de_Attributes |= ATTR_READONLY;
 			else
 				dep->de_Attributes &= ~ATTR_READONLY;
 		}
 		if (vap->va_flags & UF_SYSTEM)
 			dep->de_Attributes |= ATTR_SYSTEM;
 		else
 			dep->de_Attributes &= ~ATTR_SYSTEM;
 		dep->de_flag |= DE_MODIFIED;
 	}
 
 	if (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL) {
 		uid_t uid;
 		gid_t gid;
 
 		if (vp->v_mount->mnt_flag & MNT_RDONLY)
 			return (EROFS);
 		uid = vap->va_uid;
 		if (uid == (uid_t)VNOVAL)
 			uid = pmp->pm_uid;
 		gid = vap->va_gid;
 		if (gid == (gid_t)VNOVAL)
 			gid = pmp->pm_gid;
 		if (cred->cr_uid != pmp->pm_uid || uid != pmp->pm_uid ||
 		    (gid != pmp->pm_gid && !groupmember(gid, cred))) {
 			error = priv_check_cred(cred, PRIV_VFS_CHOWN, 0);
 			if (error)
 				return (error);
 		}
 		if (uid != pmp->pm_uid || gid != pmp->pm_gid)
 			return EINVAL;
 	}
 
 	if (vap->va_size != VNOVAL) {
 		switch (vp->v_type) {
 		case VDIR:
 			return (EISDIR);
 		case VREG:
 			/*
 			 * Truncation is only supported for regular files,
 			 * Disallow it if the filesystem is read-only.
 			 */
 			if (vp->v_mount->mnt_flag & MNT_RDONLY)
 				return (EROFS);
 			break;
 		default:
 			/*
 			 * According to POSIX, the result is unspecified
 			 * for file types other than regular files,
 			 * directories and shared memory objects.  We
 			 * don't support any file types except regular
 			 * files and directories in this file system, so
 			 * this (default) case is unreachable and can do
 			 * anything.  Keep falling through to detrunc()
 			 * for now.
 			 */
 			break;
 		}
 		error = detrunc(dep, vap->va_size, 0, cred);
 		if (error)
 			return error;
 	}
 	if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) {
 		if (vp->v_mount->mnt_flag & MNT_RDONLY)
 			return (EROFS);
 		error = vn_utimes_perm(vp, vap, cred, td);
 		if (error != 0)
 			return (error);
 		if ((pmp->pm_flags & MSDOSFSMNT_NOWIN95) == 0 &&
 		    vap->va_atime.tv_sec != VNOVAL) {
 			dep->de_flag &= ~DE_ACCESS;
 			timespec2fattime(&vap->va_atime, 0,
 			    &dep->de_ADate, NULL, NULL);
 		}
 		if (vap->va_mtime.tv_sec != VNOVAL) {
 			dep->de_flag &= ~DE_UPDATE;
 			timespec2fattime(&vap->va_mtime, 0,
 			    &dep->de_MDate, &dep->de_MTime, NULL);
 		}
 		/*
 		 * We don't set the archive bit when modifying the time of
 		 * a directory to emulate the Windows/DOS behavior.
 		 */
 		if (vp->v_type != VDIR)
 			dep->de_Attributes |= ATTR_ARCHIVE;
 		dep->de_flag |= DE_MODIFIED;
 	}
 	/*
 	 * DOS files only have the ability to have their writability
 	 * attribute set, so we use the owner write bit to set the readonly
 	 * attribute.
 	 */
 	if (vap->va_mode != (mode_t)VNOVAL) {
 		if (vp->v_mount->mnt_flag & MNT_RDONLY)
 			return (EROFS);
 		if (cred->cr_uid != pmp->pm_uid) {
 			error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0);
 			if (error)
 				return (error);
 		}
 		if (vp->v_type != VDIR) {
 			/* We ignore the read and execute bits. */
 			if (vap->va_mode & VWRITE)
 				dep->de_Attributes &= ~ATTR_READONLY;
 			else
 				dep->de_Attributes |= ATTR_READONLY;
 			dep->de_Attributes |= ATTR_ARCHIVE;
 			dep->de_flag |= DE_MODIFIED;
 		}
 	}
 	return (deupdat(dep, 0));
 }
 
 static int
 msdosfs_read(struct vop_read_args *ap)
 {
 	int error = 0;
 	int blsize;
 	int isadir;
 	ssize_t orig_resid;
 	u_int n;
 	u_long diff;
 	u_long on;
 	daddr_t lbn;
 	daddr_t rablock;
 	int rasize;
 	int seqcount;
 	struct buf *bp;
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(vp);
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct uio *uio = ap->a_uio;
 
 	/*
 	 * If they didn't ask for any data, then we are done.
 	 */
 	orig_resid = uio->uio_resid;
 	if (orig_resid == 0)
 		return (0);
 
 	/*
 	 * The caller is supposed to ensure that
 	 * uio->uio_offset >= 0 and uio->uio_resid >= 0.
 	 * We don't need to check for large offsets as in ffs because
 	 * dep->de_FileSize <= DOS_FILESIZE_MAX < OFF_MAX, so large
 	 * offsets cannot cause overflow even in theory.
 	 */
 
 	seqcount = ap->a_ioflag >> IO_SEQSHIFT;
 
 	isadir = dep->de_Attributes & ATTR_DIRECTORY;
 	do {
 		if (uio->uio_offset >= dep->de_FileSize)
 			break;
 		lbn = de_cluster(pmp, uio->uio_offset);
 		rablock = lbn + 1;
 		blsize = pmp->pm_bpcluster;
 		on = uio->uio_offset & pmp->pm_crbomask;
 		/*
 		 * If we are operating on a directory file then be sure to
 		 * do i/o with the vnode for the filesystem instead of the
 		 * vnode for the directory.
 		 */
 		if (isadir) {
 			/* convert cluster # to block # */
 			error = pcbmap(dep, lbn, &lbn, 0, &blsize);
 			if (error == E2BIG) {
 				error = EINVAL;
 				break;
 			} else if (error)
 				break;
 			error = bread(pmp->pm_devvp, lbn, blsize, NOCRED, &bp);
 		} else if (de_cn2off(pmp, rablock) >= dep->de_FileSize) {
 			error = bread(vp, lbn, blsize, NOCRED, &bp);
 		} else if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0) {
 			error = cluster_read(vp, dep->de_FileSize, lbn, blsize,
 			    NOCRED, on + uio->uio_resid, seqcount, 0, &bp);
 		} else if (seqcount > 1) {
 			rasize = blsize;
 			error = breadn(vp, lbn,
 			    blsize, &rablock, &rasize, 1, NOCRED, &bp);
 		} else {
 			error = bread(vp, lbn, blsize, NOCRED, &bp);
 		}
 		if (error) {
 			brelse(bp);
 			break;
 		}
 		diff = pmp->pm_bpcluster - on;
 		n = diff > uio->uio_resid ? uio->uio_resid : diff;
 		diff = dep->de_FileSize - uio->uio_offset;
 		if (diff < n)
 			n = diff;
 		diff = blsize - bp->b_resid;
 		if (diff < n)
 			n = diff;
 		error = vn_io_fault_uiomove(bp->b_data + on, (int) n, uio);
 		brelse(bp);
 	} while (error == 0 && uio->uio_resid > 0 && n != 0);
 	if (!isadir && (error == 0 || uio->uio_resid != orig_resid) &&
 	    (vp->v_mount->mnt_flag & (MNT_NOATIME | MNT_RDONLY)) == 0)
 		dep->de_flag |= DE_ACCESS;
 	return (error);
 }
 
 /*
  * Write data to a file or directory.
  */
 static int
 msdosfs_write(struct vop_write_args *ap)
 {
 	int n;
 	int croffset;
 	ssize_t resid;
 	u_long osize;
 	int error = 0;
 	u_long count;
 	int seqcount;
 	daddr_t bn, lastcn;
 	struct buf *bp;
 	int ioflag = ap->a_ioflag;
 	struct uio *uio = ap->a_uio;
 	struct vnode *vp = ap->a_vp;
 	struct vnode *thisvp;
 	struct denode *dep = VTODE(vp);
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct ucred *cred = ap->a_cred;
 
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_write(vp %p, uio %p, ioflag %x, cred %p\n",
 	    vp, uio, ioflag, cred);
 	printf("msdosfs_write(): diroff %lu, dirclust %lu, startcluster %lu\n",
 	    dep->de_diroffset, dep->de_dirclust, dep->de_StartCluster);
 #endif
 
 	switch (vp->v_type) {
 	case VREG:
 		if (ioflag & IO_APPEND)
 			uio->uio_offset = dep->de_FileSize;
 		thisvp = vp;
 		break;
 	case VDIR:
 		return EISDIR;
 	default:
 		panic("msdosfs_write(): bad file type");
 	}
 
 	/*
 	 * This is needed (unlike in ffs_write()) because we extend the
 	 * file outside of the loop but we don't want to extend the file
 	 * for writes of 0 bytes.
 	 */
 	if (uio->uio_resid == 0)
 		return (0);
 
 	/*
 	 * The caller is supposed to ensure that
 	 * uio->uio_offset >= 0 and uio->uio_resid >= 0.
 	 */
 	if ((uoff_t)uio->uio_offset + uio->uio_resid > DOS_FILESIZE_MAX)
 		return (EFBIG);
 
 	/*
 	 * If they've exceeded their filesize limit, tell them about it.
 	 */
 	if (vn_rlimit_fsize(vp, uio, uio->uio_td))
 		return (EFBIG);
 
 	/*
 	 * If the offset we are starting the write at is beyond the end of
 	 * the file, then they've done a seek.  Unix filesystems allow
 	 * files with holes in them, DOS doesn't so we must fill the hole
 	 * with zeroed blocks.
 	 */
 	if (uio->uio_offset > dep->de_FileSize) {
 		error = deextend(dep, uio->uio_offset, cred);
 		if (error)
 			return (error);
 	}
 
 	/*
 	 * Remember some values in case the write fails.
 	 */
 	resid = uio->uio_resid;
 	osize = dep->de_FileSize;
 
 	/*
 	 * If we write beyond the end of the file, extend it to its ultimate
 	 * size ahead of the time to hopefully get a contiguous area.
 	 */
 	if (uio->uio_offset + resid > osize) {
 		count = de_clcount(pmp, uio->uio_offset + resid) -
 			de_clcount(pmp, osize);
 		error = extendfile(dep, count, NULL, NULL, 0);
 		if (error &&  (error != ENOSPC || (ioflag & IO_UNIT)))
 			goto errexit;
 		lastcn = dep->de_fc[FC_LASTFC].fc_frcn;
 	} else
 		lastcn = de_clcount(pmp, osize) - 1;
 
 	seqcount = ioflag >> IO_SEQSHIFT;
 	do {
 		if (de_cluster(pmp, uio->uio_offset) > lastcn) {
 			error = ENOSPC;
 			break;
 		}
 
 		croffset = uio->uio_offset & pmp->pm_crbomask;
 		n = min(uio->uio_resid, pmp->pm_bpcluster - croffset);
 		if (uio->uio_offset + n > dep->de_FileSize) {
 			dep->de_FileSize = uio->uio_offset + n;
 			/* The object size needs to be set before buffer is allocated */
 			vnode_pager_setsize(vp, dep->de_FileSize);
 		}
 
 		bn = de_cluster(pmp, uio->uio_offset);
 		if ((uio->uio_offset & pmp->pm_crbomask) == 0
 		    && (de_cluster(pmp, uio->uio_offset + uio->uio_resid)
 			> de_cluster(pmp, uio->uio_offset)
 			|| uio->uio_offset + uio->uio_resid >= dep->de_FileSize)) {
 			/*
 			 * If either the whole cluster gets written,
 			 * or we write the cluster from its start beyond EOF,
 			 * then no need to read data from disk.
 			 */
 			bp = getblk(thisvp, bn, pmp->pm_bpcluster, 0, 0, 0);
 			/*
 			 * This call to vfs_bio_clrbuf() ensures that
 			 * even if vn_io_fault_uiomove() below faults,
 			 * garbage from the newly instantiated buffer
 			 * is not exposed to the userspace via mmap().
 			 */
 			vfs_bio_clrbuf(bp);
 			/*
 			 * Do the bmap now, since pcbmap needs buffers
-			 * for the fat table. (see msdosfs_strategy)
+			 * for the FAT table. (see msdosfs_strategy)
 			 */
 			if (bp->b_blkno == bp->b_lblkno) {
 				error = pcbmap(dep, bp->b_lblkno, &bn, 0, 0);
 				if (error)
 					bp->b_blkno = -1;
 				else
 					bp->b_blkno = bn;
 			}
 			if (bp->b_blkno == -1) {
 				brelse(bp);
 				if (!error)
 					error = EIO;		/* XXX */
 				break;
 			}
 		} else {
 			/*
 			 * The block we need to write into exists, so read it in.
 			 */
 			error = bread(thisvp, bn, pmp->pm_bpcluster, cred, &bp);
 			if (error) {
 				brelse(bp);
 				break;
 			}
 		}
 
 		/*
 		 * Should these vnode_pager_* functions be done on dir
 		 * files?
 		 */
 
 		/*
 		 * Copy the data from user space into the buf header.
 		 */
 		error = vn_io_fault_uiomove(bp->b_data + croffset, n, uio);
 		if (error) {
 			brelse(bp);
 			break;
 		}
 
 		/* Prepare for clustered writes in some else clauses. */
 		if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0)
 			bp->b_flags |= B_CLUSTEROK;
 
 		/*
 		 * If IO_SYNC, then each buffer is written synchronously.
 		 * Otherwise, if we have a severe page deficiency then
 		 * write the buffer asynchronously.  Otherwise, if on a
 		 * cluster boundary then write the buffer asynchronously,
 		 * combining it with contiguous clusters if permitted and
 		 * possible, since we don't expect more writes into this
 		 * buffer soon.  Otherwise, do a delayed write because we
 		 * expect more writes into this buffer soon.
 		 */
 		if (ioflag & IO_SYNC)
 			(void)bwrite(bp);
 		else if (vm_page_count_severe() || buf_dirty_count_severe())
 			bawrite(bp);
 		else if (n + croffset == pmp->pm_bpcluster) {
 			if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0)
 				cluster_write(vp, bp, dep->de_FileSize,
 				    seqcount, 0);
 			else
 				bawrite(bp);
 		} else
 			bdwrite(bp);
 		dep->de_flag |= DE_UPDATE;
 	} while (error == 0 && uio->uio_resid > 0);
 
 	/*
 	 * If the write failed and they want us to, truncate the file back
 	 * to the size it was before the write was attempted.
 	 */
 errexit:
 	if (error) {
 		if (ioflag & IO_UNIT) {
 			detrunc(dep, osize, ioflag & IO_SYNC, NOCRED);
 			uio->uio_offset -= resid - uio->uio_resid;
 			uio->uio_resid = resid;
 		} else {
 			detrunc(dep, dep->de_FileSize, ioflag & IO_SYNC, NOCRED);
 			if (uio->uio_resid != resid)
 				error = 0;
 		}
 	} else if (ioflag & IO_SYNC)
 		error = deupdat(dep, 1);
 	return (error);
 }
 
 /*
  * Flush the blocks of a file to disk.
  */
 static int
 msdosfs_fsync(struct vop_fsync_args *ap)
 {
 	struct vnode *devvp;
 	int allerror, error;
 
 	vop_stdfsync(ap);
 
 	/*
 	* If the syncing request comes from fsync(2), sync the entire
 	* FAT and any other metadata that happens to be on devvp.  We
 	* need this mainly for the FAT.  We write the FAT sloppily, and
 	* syncing it all now is the best we can easily do to get all
 	* directory entries associated with the file (not just the file)
 	* fully synced.  The other metadata includes critical metadata
 	* for all directory entries, but only in the MNT_ASYNC case.  We
 	* will soon sync all metadata in the file's directory entry.
 	* Non-critical metadata for associated directory entries only
 	* gets synced accidentally, as in most file systems.
 	*/
 	if (ap->a_waitfor == MNT_WAIT) {
 		devvp = VTODE(ap->a_vp)->de_pmp->pm_devvp;
 		vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 		allerror = VOP_FSYNC(devvp, MNT_WAIT, ap->a_td);
 		VOP_UNLOCK(devvp, 0);
 	} else
 		allerror = 0;
 
 	error = deupdat(VTODE(ap->a_vp), ap->a_waitfor == MNT_WAIT);
 	if (allerror == 0)
 		allerror = error;
 	return (allerror);
 }
 
 static int
 msdosfs_remove(struct vop_remove_args *ap)
 {
 	struct denode *dep = VTODE(ap->a_vp);
 	struct denode *ddep = VTODE(ap->a_dvp);
 	int error;
 
 	if (ap->a_vp->v_type == VDIR)
 		error = EPERM;
 	else
 		error = removede(ddep, dep);
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_remove(), dep %p, v_usecount %d\n", dep, ap->a_vp->v_usecount);
 #endif
 	return (error);
 }
 
 /*
  * DOS filesystems don't know what links are.
  */
 static int
 msdosfs_link(struct vop_link_args *ap)
 {
 	return (EOPNOTSUPP);
 }
 
 /*
  * Renames on files require moving the denode to a new hash queue since the
  * denode's location is used to compute which hash queue to put the file
  * in. Unless it is a rename in place.  For example "mv a b".
  *
  * What follows is the basic algorithm:
  *
  * if (file move) {
  *	if (dest file exists) {
  *		remove dest file
  *	}
  *	if (dest and src in same directory) {
  *		rewrite name in existing directory slot
  *	} else {
  *		write new entry in dest directory
  *		update offset and dirclust in denode
  *		move denode to new hash chain
  *		clear old directory entry
  *	}
  * } else {
  *	directory move
  *	if (dest directory exists) {
  *		if (dest is not empty) {
  *			return ENOTEMPTY
  *		}
  *		remove dest directory
  *	}
  *	if (dest and src in same directory) {
  *		rewrite name in existing entry
  *	} else {
  *		be sure dest is not a child of src directory
  *		write entry in dest directory
  *		update "." and ".." in moved directory
  *		clear old directory entry for moved directory
  *	}
  * }
  *
  * On entry:
  *	source's parent directory is unlocked
  *	source file or directory is unlocked
  *	destination's parent directory is locked
  *	destination file or directory is locked if it exists
  *
  * On exit:
  *	all denodes should be released
  */
 static int
 msdosfs_rename(struct vop_rename_args *ap)
 {
 	struct vnode *tdvp = ap->a_tdvp;
 	struct vnode *fvp = ap->a_fvp;
 	struct vnode *fdvp = ap->a_fdvp;
 	struct vnode *tvp = ap->a_tvp;
 	struct componentname *tcnp = ap->a_tcnp;
 	struct componentname *fcnp = ap->a_fcnp;
 	struct denode *ip, *xp, *dp, *zp;
 	u_char toname[12], oldname[11];
 	u_long from_diroffset, to_diroffset;
 	u_char to_count;
 	int doingdirectory = 0, newparent = 0;
 	int error;
 	u_long cn, pcl;
 	daddr_t bn;
 	struct msdosfsmount *pmp;
 	struct direntry *dotdotp;
 	struct buf *bp;
 
 	pmp = VFSTOMSDOSFS(fdvp->v_mount);
 
 #ifdef DIAGNOSTIC
 	if ((tcnp->cn_flags & HASBUF) == 0 ||
 	    (fcnp->cn_flags & HASBUF) == 0)
 		panic("msdosfs_rename: no name");
 #endif
 	/*
 	 * Check for cross-device rename.
 	 */
 	if (fvp->v_mount != tdvp->v_mount ||
 	    (tvp && fvp->v_mount != tvp->v_mount)) {
 		error = EXDEV;
 abortit:
 		if (tdvp == tvp)
 			vrele(tdvp);
 		else
 			vput(tdvp);
 		if (tvp)
 			vput(tvp);
 		vrele(fdvp);
 		vrele(fvp);
 		return (error);
 	}
 
 	/*
 	 * If source and dest are the same, do nothing.
 	 */
 	if (tvp == fvp) {
 		error = 0;
 		goto abortit;
 	}
 
 	error = vn_lock(fvp, LK_EXCLUSIVE);
 	if (error)
 		goto abortit;
 	dp = VTODE(fdvp);
 	ip = VTODE(fvp);
 
 	/*
 	 * Be sure we are not renaming ".", "..", or an alias of ".". This
 	 * leads to a crippled directory tree.  It's pretty tough to do a
 	 * "ls" or "pwd" with the "." directory entry missing, and "cd .."
 	 * doesn't work if the ".." entry is missing.
 	 */
 	if (ip->de_Attributes & ATTR_DIRECTORY) {
 		/*
 		 * Avoid ".", "..", and aliases of "." for obvious reasons.
 		 */
 		if ((fcnp->cn_namelen == 1 && fcnp->cn_nameptr[0] == '.') ||
 		    dp == ip ||
 		    (fcnp->cn_flags & ISDOTDOT) ||
 		    (tcnp->cn_flags & ISDOTDOT) ||
 		    (ip->de_flag & DE_RENAME)) {
 			VOP_UNLOCK(fvp, 0);
 			error = EINVAL;
 			goto abortit;
 		}
 		ip->de_flag |= DE_RENAME;
 		doingdirectory++;
 	}
 
 	/*
 	 * When the target exists, both the directory
 	 * and target vnodes are returned locked.
 	 */
 	dp = VTODE(tdvp);
 	xp = tvp ? VTODE(tvp) : NULL;
 	/*
 	 * Remember direntry place to use for destination
 	 */
 	to_diroffset = dp->de_fndoffset;
 	to_count = dp->de_fndcnt;
 
 	/*
 	 * If ".." must be changed (ie the directory gets a new
 	 * parent) then the source directory must not be in the
 	 * directory hierarchy above the target, as this would
 	 * orphan everything below the source directory. Also
 	 * the user must have write permission in the source so
 	 * as to be able to change "..". We must repeat the call
 	 * to namei, as the parent directory is unlocked by the
 	 * call to doscheckpath().
 	 */
 	error = VOP_ACCESS(fvp, VWRITE, tcnp->cn_cred, tcnp->cn_thread);
 	VOP_UNLOCK(fvp, 0);
 	if (VTODE(fdvp)->de_StartCluster != VTODE(tdvp)->de_StartCluster)
 		newparent = 1;
 	if (doingdirectory && newparent) {
 		if (error)	/* write access check above */
 			goto bad;
 		if (xp != NULL)
 			vput(tvp);
 		/*
 		 * doscheckpath() vput()'s dp,
 		 * so we have to do a relookup afterwards
 		 */
 		error = doscheckpath(ip, dp);
 		if (error)
 			goto out;
 		if ((tcnp->cn_flags & SAVESTART) == 0)
 			panic("msdosfs_rename: lost to startdir");
 		error = relookup(tdvp, &tvp, tcnp);
 		if (error)
 			goto out;
 		dp = VTODE(tdvp);
 		xp = tvp ? VTODE(tvp) : NULL;
 	}
 
 	if (xp != NULL) {
 		/*
 		 * Target must be empty if a directory and have no links
 		 * to it. Also, ensure source and target are compatible
 		 * (both directories, or both not directories).
 		 */
 		if (xp->de_Attributes & ATTR_DIRECTORY) {
 			if (!dosdirempty(xp)) {
 				error = ENOTEMPTY;
 				goto bad;
 			}
 			if (!doingdirectory) {
 				error = ENOTDIR;
 				goto bad;
 			}
 			cache_purge(tdvp);
 		} else if (doingdirectory) {
 			error = EISDIR;
 			goto bad;
 		}
 		error = removede(dp, xp);
 		if (error)
 			goto bad;
 		vput(tvp);
 		xp = NULL;
 	}
 
 	/*
 	 * Convert the filename in tcnp into a dos filename. We copy this
 	 * into the denode and directory entry for the destination
 	 * file/directory.
 	 */
 	error = uniqdosname(VTODE(tdvp), tcnp, toname);
 	if (error)
 		goto abortit;
 
 	/*
 	 * Since from wasn't locked at various places above,
 	 * have to do a relookup here.
 	 */
 	fcnp->cn_flags &= ~MODMASK;
 	fcnp->cn_flags |= LOCKPARENT | LOCKLEAF;
 	if ((fcnp->cn_flags & SAVESTART) == 0)
 		panic("msdosfs_rename: lost from startdir");
 	if (!newparent)
 		VOP_UNLOCK(tdvp, 0);
 	if (relookup(fdvp, &fvp, fcnp) == 0)
 		vrele(fdvp);
 	if (fvp == NULL) {
 		/*
 		 * From name has disappeared.
 		 */
 		if (doingdirectory)
 			panic("rename: lost dir entry");
 		if (newparent)
 			VOP_UNLOCK(tdvp, 0);
 		vrele(tdvp);
 		vrele(ap->a_fvp);
 		return 0;
 	}
 	xp = VTODE(fvp);
 	zp = VTODE(fdvp);
 	from_diroffset = zp->de_fndoffset;
 
 	/*
 	 * Ensure that the directory entry still exists and has not
 	 * changed till now. If the source is a file the entry may
 	 * have been unlinked or renamed. In either case there is
 	 * no further work to be done. If the source is a directory
 	 * then it cannot have been rmdir'ed or renamed; this is
 	 * prohibited by the DE_RENAME flag.
 	 */
 	if (xp != ip) {
 		if (doingdirectory)
 			panic("rename: lost dir entry");
 		VOP_UNLOCK(fvp, 0);
 		if (newparent)
 			VOP_UNLOCK(fdvp, 0);
 		vrele(ap->a_fvp);
 		xp = NULL;
 	} else {
 		vrele(fvp);
 		xp = NULL;
 
 		/*
 		 * First write a new entry in the destination
 		 * directory and mark the entry in the source directory
 		 * as deleted.  Then move the denode to the correct hash
 		 * chain for its new location in the filesystem.  And, if
 		 * we moved a directory, then update its .. entry to point
 		 * to the new parent directory.
 		 */
 		bcopy(ip->de_Name, oldname, 11);
 		bcopy(toname, ip->de_Name, 11);	/* update denode */
 		dp->de_fndoffset = to_diroffset;
 		dp->de_fndcnt = to_count;
 		error = createde(ip, dp, (struct denode **)0, tcnp);
 		if (error) {
 			bcopy(oldname, ip->de_Name, 11);
 			if (newparent)
 				VOP_UNLOCK(fdvp, 0);
 			VOP_UNLOCK(fvp, 0);
 			goto bad;
 		}
 		/*
 		 * If ip is for a directory, then its name should always
 		 * be "." since it is for the directory entry in the
 		 * directory itself (msdosfs_lookup() always translates
 		 * to the "." entry so as to get a unique denode, except
 		 * for the root directory there are different
 		 * complications).  However, we just corrupted its name
 		 * to pass the correct name to createde().  Undo this.
 		 */
 		if ((ip->de_Attributes & ATTR_DIRECTORY) != 0)
 			bcopy(oldname, ip->de_Name, 11);
 		ip->de_refcnt++;
 		zp->de_fndoffset = from_diroffset;
 		error = removede(zp, ip);
 		if (error) {
 			/* XXX should downgrade to ro here, fs is corrupt */
 			if (newparent)
 				VOP_UNLOCK(fdvp, 0);
 			VOP_UNLOCK(fvp, 0);
 			goto bad;
 		}
 		if (!doingdirectory) {
 			error = pcbmap(dp, de_cluster(pmp, to_diroffset), 0,
 				       &ip->de_dirclust, 0);
 			if (error) {
 				/* XXX should downgrade to ro here, fs is corrupt */
 				if (newparent)
 					VOP_UNLOCK(fdvp, 0);
 				VOP_UNLOCK(fvp, 0);
 				goto bad;
 			}
 			if (ip->de_dirclust == MSDOSFSROOT)
 				ip->de_diroffset = to_diroffset;
 			else
 				ip->de_diroffset = to_diroffset & pmp->pm_crbomask;
 		}
 		reinsert(ip);
 		if (newparent)
 			VOP_UNLOCK(fdvp, 0);
 	}
 
 	/*
 	 * If we moved a directory to a new parent directory, then we must
 	 * fixup the ".." entry in the moved directory.
 	 */
 	if (doingdirectory && newparent) {
 		cn = ip->de_StartCluster;
 		if (cn == MSDOSFSROOT) {
 			/* this should never happen */
 			panic("msdosfs_rename(): updating .. in root directory?");
 		} else
 			bn = cntobn(pmp, cn);
 		error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster,
 			      NOCRED, &bp);
 		if (error) {
 			/* XXX should downgrade to ro here, fs is corrupt */
 			brelse(bp);
 			VOP_UNLOCK(fvp, 0);
 			goto bad;
 		}
 		dotdotp = (struct direntry *)bp->b_data + 1;
 		pcl = dp->de_StartCluster;
 		if (FAT32(pmp) && pcl == pmp->pm_rootdirblk)
 			pcl = MSDOSFSROOT;
 		putushort(dotdotp->deStartCluster, pcl);
 		if (FAT32(pmp))
 			putushort(dotdotp->deHighClust, pcl >> 16);
 		if (DOINGASYNC(fvp))
 			bdwrite(bp);
 		else if ((error = bwrite(bp)) != 0) {
 			/* XXX should downgrade to ro here, fs is corrupt */
 			VOP_UNLOCK(fvp, 0);
 			goto bad;
 		}
 	}
 
 	/*
 	 * The msdosfs lookup is case insensitive. Several aliases may
 	 * be inserted for a single directory entry. As a consequnce,
 	 * name cache purge done by lookup for fvp when DELETE op for
 	 * namei is specified, might be not enough to expunge all
 	 * namecache entries that were installed for this direntry.
 	 */
 	cache_purge(fvp);
 	VOP_UNLOCK(fvp, 0);
 bad:
 	if (xp)
 		vput(tvp);
 	vput(tdvp);
 out:
 	ip->de_flag &= ~DE_RENAME;
 	vrele(fdvp);
 	vrele(fvp);
 	return (error);
 
 }
 
 static struct {
 	struct direntry dot;
 	struct direntry dotdot;
 } dosdirtemplate = {
 	{	".          ",				/* the . entry */
 		ATTR_DIRECTORY,				/* file attribute */
 		0,					/* reserved */
 		0, { 0, 0 }, { 0, 0 },			/* create time & date */
 		{ 0, 0 },				/* access date */
 		{ 0, 0 },				/* high bits of start cluster */
 		{ 210, 4 }, { 210, 4 },			/* modify time & date */
 		{ 0, 0 },				/* startcluster */
 		{ 0, 0, 0, 0 }				/* filesize */
 	},
 	{	"..         ",				/* the .. entry */
 		ATTR_DIRECTORY,				/* file attribute */
 		0,					/* reserved */
 		0, { 0, 0 }, { 0, 0 },			/* create time & date */
 		{ 0, 0 },				/* access date */
 		{ 0, 0 },				/* high bits of start cluster */
 		{ 210, 4 }, { 210, 4 },			/* modify time & date */
 		{ 0, 0 },				/* startcluster */
 		{ 0, 0, 0, 0 }				/* filesize */
 	}
 };
 
 static int
 msdosfs_mkdir(struct vop_mkdir_args *ap)
 {
 	struct componentname *cnp = ap->a_cnp;
 	struct denode *dep;
 	struct denode *pdep = VTODE(ap->a_dvp);
 	struct direntry *denp;
 	struct msdosfsmount *pmp = pdep->de_pmp;
 	struct buf *bp;
 	u_long newcluster, pcl;
 	int bn;
 	int error;
 	struct denode ndirent;
 	struct timespec ts;
 
 	/*
 	 * If this is the root directory and there is no space left we
 	 * can't do anything.  This is because the root directory can not
 	 * change size.
 	 */
 	if (pdep->de_StartCluster == MSDOSFSROOT
 	    && pdep->de_fndoffset >= pdep->de_FileSize) {
 		error = ENOSPC;
 		goto bad2;
 	}
 
 	/*
 	 * Allocate a cluster to hold the about to be created directory.
 	 */
 	error = clusteralloc(pmp, 0, 1, CLUST_EOFE, &newcluster, NULL);
 	if (error)
 		goto bad2;
 
 	bzero(&ndirent, sizeof(ndirent));
 	ndirent.de_pmp = pmp;
 	ndirent.de_flag = DE_ACCESS | DE_CREATE | DE_UPDATE;
 	getnanotime(&ts);
 	DETIMES(&ndirent, &ts, &ts, &ts);
 
 	/*
 	 * Now fill the cluster with the "." and ".." entries. And write
 	 * the cluster to disk.  This way it is there for the parent
 	 * directory to be pointing at if there were a crash.
 	 */
 	bn = cntobn(pmp, newcluster);
 	/* always succeeds */
 	bp = getblk(pmp->pm_devvp, bn, pmp->pm_bpcluster, 0, 0, 0);
 	bzero(bp->b_data, pmp->pm_bpcluster);
 	bcopy(&dosdirtemplate, bp->b_data, sizeof dosdirtemplate);
 	denp = (struct direntry *)bp->b_data;
 	putushort(denp[0].deStartCluster, newcluster);
 	putushort(denp[0].deCDate, ndirent.de_CDate);
 	putushort(denp[0].deCTime, ndirent.de_CTime);
 	denp[0].deCHundredth = ndirent.de_CHun;
 	putushort(denp[0].deADate, ndirent.de_ADate);
 	putushort(denp[0].deMDate, ndirent.de_MDate);
 	putushort(denp[0].deMTime, ndirent.de_MTime);
 	pcl = pdep->de_StartCluster;
 	/*
 	 * Although the root directory has a non-magic starting cluster
 	 * number for FAT32, chkdsk and fsck_msdosfs still require
 	 * references to it in dotdot entries to be magic.
 	 */
 	if (FAT32(pmp) && pcl == pmp->pm_rootdirblk)
 		pcl = MSDOSFSROOT;
 	putushort(denp[1].deStartCluster, pcl);
 	putushort(denp[1].deCDate, ndirent.de_CDate);
 	putushort(denp[1].deCTime, ndirent.de_CTime);
 	denp[1].deCHundredth = ndirent.de_CHun;
 	putushort(denp[1].deADate, ndirent.de_ADate);
 	putushort(denp[1].deMDate, ndirent.de_MDate);
 	putushort(denp[1].deMTime, ndirent.de_MTime);
 	if (FAT32(pmp)) {
 		putushort(denp[0].deHighClust, newcluster >> 16);
 		putushort(denp[1].deHighClust, pcl >> 16);
 	}
 
 	if (DOINGASYNC(ap->a_dvp))
 		bdwrite(bp);
 	else if ((error = bwrite(bp)) != 0)
 		goto bad;
 
 	/*
 	 * Now build up a directory entry pointing to the newly allocated
 	 * cluster.  This will be written to an empty slot in the parent
 	 * directory.
 	 */
 #ifdef DIAGNOSTIC
 	if ((cnp->cn_flags & HASBUF) == 0)
 		panic("msdosfs_mkdir: no name");
 #endif
 	error = uniqdosname(pdep, cnp, ndirent.de_Name);
 	if (error)
 		goto bad;
 
 	ndirent.de_Attributes = ATTR_DIRECTORY;
 	ndirent.de_LowerCase = 0;
 	ndirent.de_StartCluster = newcluster;
 	ndirent.de_FileSize = 0;
 	error = createde(&ndirent, pdep, &dep, cnp);
 	if (error)
 		goto bad;
 	*ap->a_vpp = DETOV(dep);
 	return (0);
 
 bad:
 	clusterfree(pmp, newcluster, NULL);
 bad2:
 	return (error);
 }
 
 static int
 msdosfs_rmdir(struct vop_rmdir_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct vnode *dvp = ap->a_dvp;
 	struct componentname *cnp = ap->a_cnp;
 	struct denode *ip, *dp;
 	int error;
 
 	ip = VTODE(vp);
 	dp = VTODE(dvp);
 
 	/*
 	 * Verify the directory is empty (and valid).
 	 * (Rmdir ".." won't be valid since
 	 *  ".." will contain a reference to
 	 *  the current directory and thus be
 	 *  non-empty.)
 	 */
 	error = 0;
 	if (!dosdirempty(ip) || ip->de_flag & DE_RENAME) {
 		error = ENOTEMPTY;
 		goto out;
 	}
 	/*
 	 * Delete the entry from the directory.  For dos filesystems this
 	 * gets rid of the directory entry on disk, the in memory copy
 	 * still exists but the de_refcnt is <= 0.  This prevents it from
 	 * being found by deget().  When the vput() on dep is done we give
 	 * up access and eventually msdosfs_reclaim() will be called which
 	 * will remove it from the denode cache.
 	 */
 	error = removede(dp, ip);
 	if (error)
 		goto out;
 	/*
 	 * This is where we decrement the link count in the parent
 	 * directory.  Since dos filesystems don't do this we just purge
 	 * the name cache.
 	 */
 	cache_purge(dvp);
 	/*
 	 * Truncate the directory that is being deleted.
 	 */
 	error = detrunc(ip, (u_long)0, IO_SYNC, cnp->cn_cred);
 	cache_purge(vp);
 
 out:
 	return (error);
 }
 
 /*
  * DOS filesystems don't know what symlinks are.
  */
 static int
 msdosfs_symlink(struct vop_symlink_args *ap)
 {
 	return (EOPNOTSUPP);
 }
 
 static int
 msdosfs_readdir(struct vop_readdir_args *ap)
 {
 	struct mbnambuf nb;
 	int error = 0;
 	int diff;
 	long n;
 	int blsize;
 	long on;
 	u_long cn;
 	uint64_t fileno;
 	u_long dirsperblk;
 	long bias = 0;
 	daddr_t bn, lbn;
 	struct buf *bp;
 	struct denode *dep = VTODE(ap->a_vp);
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct direntry *dentp;
 	struct dirent dirbuf;
 	struct uio *uio = ap->a_uio;
 	u_long *cookies = NULL;
 	int ncookies = 0;
 	off_t offset, off;
 	int chksum = -1;
 
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_readdir(): vp %p, uio %p, cred %p, eofflagp %p\n",
 	    ap->a_vp, uio, ap->a_cred, ap->a_eofflag);
 #endif
 
 	/*
 	 * msdosfs_readdir() won't operate properly on regular files since
 	 * it does i/o only with the filesystem vnode, and hence can
 	 * retrieve the wrong block from the buffer cache for a plain file.
 	 * So, fail attempts to readdir() on a plain file.
 	 */
 	if ((dep->de_Attributes & ATTR_DIRECTORY) == 0)
 		return (ENOTDIR);
 
 	/*
 	 * To be safe, initialize dirbuf
 	 */
 	bzero(dirbuf.d_name, sizeof(dirbuf.d_name));
 
 	/*
 	 * If the user buffer is smaller than the size of one dos directory
 	 * entry or the file offset is not a multiple of the size of a
 	 * directory entry, then we fail the read.
 	 */
 	off = offset = uio->uio_offset;
 	if (uio->uio_resid < sizeof(struct direntry) ||
 	    (offset & (sizeof(struct direntry) - 1)))
 		return (EINVAL);
 
 	if (ap->a_ncookies) {
 		ncookies = uio->uio_resid / 16;
 		cookies = malloc(ncookies * sizeof(u_long), M_TEMP,
 		       M_WAITOK);
 		*ap->a_cookies = cookies;
 		*ap->a_ncookies = ncookies;
 	}
 
 	dirsperblk = pmp->pm_BytesPerSec / sizeof(struct direntry);
 
 	/*
 	 * If they are reading from the root directory then, we simulate
 	 * the . and .. entries since these don't exist in the root
 	 * directory.  We also set the offset bias to make up for having to
 	 * simulate these entries. By this I mean that at file offset 64 we
 	 * read the first entry in the root directory that lives on disk.
 	 */
 	if (dep->de_StartCluster == MSDOSFSROOT
 	    || (FAT32(pmp) && dep->de_StartCluster == pmp->pm_rootdirblk)) {
 #if 0
 		printf("msdosfs_readdir(): going after . or .. in root dir, offset %d\n",
 		    offset);
 #endif
 		bias = 2 * sizeof(struct direntry);
 		if (offset < bias) {
 			for (n = (int)offset / sizeof(struct direntry);
 			     n < 2; n++) {
 				if (FAT32(pmp))
 					fileno = (uint64_t)cntobn(pmp,
 								 pmp->pm_rootdirblk)
 							  * dirsperblk;
 				else
 					fileno = 1;
 				if (pmp->pm_flags & MSDOSFS_LARGEFS) {
 					dirbuf.d_fileno =
 					    msdosfs_fileno_map(pmp->pm_mountp,
 					    fileno);
 				} else {
 
 					dirbuf.d_fileno = (uint32_t)fileno;
 				}
 				dirbuf.d_type = DT_DIR;
 				switch (n) {
 				case 0:
 					dirbuf.d_namlen = 1;
 					strcpy(dirbuf.d_name, ".");
 					break;
 				case 1:
 					dirbuf.d_namlen = 2;
 					strcpy(dirbuf.d_name, "..");
 					break;
 				}
 				dirbuf.d_reclen = GENERIC_DIRSIZ(&dirbuf);
 				if (uio->uio_resid < dirbuf.d_reclen)
 					goto out;
 				error = uiomove(&dirbuf, dirbuf.d_reclen, uio);
 				if (error)
 					goto out;
 				offset += sizeof(struct direntry);
 				off = offset;
 				if (cookies) {
 					*cookies++ = offset;
 					if (--ncookies <= 0)
 						goto out;
 				}
 			}
 		}
 	}
 
 	mbnambuf_init(&nb);
 	off = offset;
 	while (uio->uio_resid > 0) {
 		lbn = de_cluster(pmp, offset - bias);
 		on = (offset - bias) & pmp->pm_crbomask;
 		n = min(pmp->pm_bpcluster - on, uio->uio_resid);
 		diff = dep->de_FileSize - (offset - bias);
 		if (diff <= 0)
 			break;
 		n = min(n, diff);
 		error = pcbmap(dep, lbn, &bn, &cn, &blsize);
 		if (error)
 			break;
 		error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp);
 		if (error) {
 			brelse(bp);
 			return (error);
 		}
 		n = min(n, blsize - bp->b_resid);
 		if (n == 0) {
 			brelse(bp);
 			return (EIO);
 		}
 
 		/*
 		 * Convert from dos directory entries to fs-independent
 		 * directory entries.
 		 */
 		for (dentp = (struct direntry *)(bp->b_data + on);
 		     (char *)dentp < bp->b_data + on + n;
 		     dentp++, offset += sizeof(struct direntry)) {
 #if 0
 			printf("rd: dentp %08x prev %08x crnt %08x deName %02x attr %02x\n",
 			    dentp, prev, crnt, dentp->deName[0], dentp->deAttributes);
 #endif
 			/*
 			 * If this is an unused entry, we can stop.
 			 */
 			if (dentp->deName[0] == SLOT_EMPTY) {
 				brelse(bp);
 				goto out;
 			}
 			/*
 			 * Skip deleted entries.
 			 */
 			if (dentp->deName[0] == SLOT_DELETED) {
 				chksum = -1;
 				mbnambuf_init(&nb);
 				continue;
 			}
 
 			/*
 			 * Handle Win95 long directory entries
 			 */
 			if (dentp->deAttributes == ATTR_WIN95) {
 				if (pmp->pm_flags & MSDOSFSMNT_SHORTNAME)
 					continue;
 				chksum = win2unixfn(&nb,
 				    (struct winentry *)dentp, chksum, pmp);
 				continue;
 			}
 
 			/*
 			 * Skip volume labels
 			 */
 			if (dentp->deAttributes & ATTR_VOLUME) {
 				chksum = -1;
 				mbnambuf_init(&nb);
 				continue;
 			}
 			/*
 			 * This computation of d_fileno must match
 			 * the computation of va_fileid in
 			 * msdosfs_getattr.
 			 */
 			if (dentp->deAttributes & ATTR_DIRECTORY) {
 				fileno = getushort(dentp->deStartCluster);
 				if (FAT32(pmp))
 					fileno |= getushort(dentp->deHighClust) << 16;
 				/* if this is the root directory */
 				if (fileno == MSDOSFSROOT)
 					if (FAT32(pmp))
 						fileno = (uint64_t)cntobn(pmp,
 								pmp->pm_rootdirblk)
 							 * dirsperblk;
 					else
 						fileno = 1;
 				else
 					fileno = (uint64_t)cntobn(pmp, fileno) *
 					    dirsperblk;
 				dirbuf.d_type = DT_DIR;
 			} else {
 				fileno = (uoff_t)offset /
 				    sizeof(struct direntry);
 				dirbuf.d_type = DT_REG;
 			}
 			if (pmp->pm_flags & MSDOSFS_LARGEFS) {
 				dirbuf.d_fileno =
 				    msdosfs_fileno_map(pmp->pm_mountp, fileno);
 			} else
 				dirbuf.d_fileno = (uint32_t)fileno;
 
 			if (chksum != winChksum(dentp->deName)) {
 				dirbuf.d_namlen = dos2unixfn(dentp->deName,
 				    (u_char *)dirbuf.d_name,
 				    dentp->deLowerCase |
 					((pmp->pm_flags & MSDOSFSMNT_SHORTNAME) ?
 					(LCASE_BASE | LCASE_EXT) : 0),
 				    pmp);
 				mbnambuf_init(&nb);
 			} else
 				mbnambuf_flush(&nb, &dirbuf);
 			chksum = -1;
 			dirbuf.d_reclen = GENERIC_DIRSIZ(&dirbuf);
 			if (uio->uio_resid < dirbuf.d_reclen) {
 				brelse(bp);
 				goto out;
 			}
 			error = uiomove(&dirbuf, dirbuf.d_reclen, uio);
 			if (error) {
 				brelse(bp);
 				goto out;
 			}
 			if (cookies) {
 				*cookies++ = offset + sizeof(struct direntry);
 				if (--ncookies <= 0) {
 					brelse(bp);
 					goto out;
 				}
 			}
 			off = offset + sizeof(struct direntry);
 		}
 		brelse(bp);
 	}
 out:
 	/* Subtract unused cookies */
 	if (ap->a_ncookies)
 		*ap->a_ncookies -= ncookies;
 
 	uio->uio_offset = off;
 
 	/*
 	 * Set the eofflag (NFS uses it)
 	 */
 	if (ap->a_eofflag) {
 		if (dep->de_FileSize - (offset - bias) <= 0)
 			*ap->a_eofflag = 1;
 		else
 			*ap->a_eofflag = 0;
 	}
 	return (error);
 }
 
 /*-
  * a_vp   - pointer to the file's vnode
  * a_bn   - logical block number within the file (cluster number for us)
  * a_bop  - where to return the bufobj of the special file containing the fs
  * a_bnp  - where to return the "physical" block number corresponding to a_bn
  *          (relative to the special file; units are blocks of size DEV_BSIZE)
  * a_runp - where to return the "run past" a_bn.  This is the count of logical
  *          blocks whose physical blocks (together with a_bn's physical block)
  *          are contiguous.
  * a_runb - where to return the "run before" a_bn.
  */
 static int
 msdosfs_bmap(struct vop_bmap_args *ap)
 {
 	struct denode *dep;
 	struct mount *mp;
 	struct msdosfsmount *pmp;
 	struct vnode *vp;
 	daddr_t runbn;
 	u_long cn;
 	int bnpercn, error, maxio, maxrun, run;
 
 	vp = ap->a_vp;
 	dep = VTODE(vp);
 	pmp = dep->de_pmp;
 	if (ap->a_bop != NULL)
 		*ap->a_bop = &pmp->pm_devvp->v_bufobj;
 	if (ap->a_bnp == NULL)
 		return (0);
 	if (ap->a_runp != NULL)
 		*ap->a_runp = 0;
 	if (ap->a_runb != NULL)
 		*ap->a_runb = 0;
 	cn = ap->a_bn;
 	if (cn != ap->a_bn)
 		return (EFBIG);
 	error = pcbmap(dep, cn, ap->a_bnp, NULL, NULL);
 	if (error != 0 || (ap->a_runp == NULL && ap->a_runb == NULL))
 		return (error);
 
 	mp = vp->v_mount;
 	maxio = mp->mnt_iosize_max / mp->mnt_stat.f_iosize;
 	bnpercn = de_cn2bn(pmp, 1);
 	if (ap->a_runp != NULL) {
 		maxrun = ulmin(maxio - 1, pmp->pm_maxcluster - cn);
 		for (run = 1; run <= maxrun; run++) {
 			if (pcbmap(dep, cn + run, &runbn, NULL, NULL) != 0 ||
 			    runbn != *ap->a_bnp + run * bnpercn)
 				break;
 		}
 		*ap->a_runp = run - 1;
 	}
 	if (ap->a_runb != NULL) {
 		maxrun = ulmin(maxio - 1, cn);
 		for (run = 1; run < maxrun; run++) {
 			if (pcbmap(dep, cn - run, &runbn, NULL, NULL) != 0 ||
 			    runbn != *ap->a_bnp - run * bnpercn)
 				break;
 		}
 		*ap->a_runb = run - 1;
 	}
 	return (0);
 }
 
 SYSCTL_NODE(_vfs, OID_AUTO, msdosfs, CTLFLAG_RW, 0, "msdos filesystem");
 static int use_buf_pager = 1;
 SYSCTL_INT(_vfs_msdosfs, OID_AUTO, use_buf_pager, CTLFLAG_RWTUN,
     &use_buf_pager, 0,
     "Use buffer pager instead of bmap");
 
 static daddr_t
 msdosfs_gbp_getblkno(struct vnode *vp, vm_ooffset_t off)
 {
 
 	return (de_cluster(VTODE(vp)->de_pmp, off));
 }
 
 static int
 msdosfs_gbp_getblksz(struct vnode *vp, daddr_t lbn)
 {
 
 	return (VTODE(vp)->de_pmp->pm_bpcluster);
 }
 
 static int
 msdosfs_getpages(struct vop_getpages_args *ap)
 {
 
 	if (use_buf_pager)
 		return (vfs_bio_getpages(ap->a_vp, ap->a_m, ap->a_count,
 		    ap->a_rbehind, ap->a_rahead, msdosfs_gbp_getblkno,
 		    msdosfs_gbp_getblksz));
 	return (vnode_pager_generic_getpages(ap->a_vp, ap->a_m, ap->a_count,
 	    ap->a_rbehind, ap->a_rahead, NULL, NULL));
 }
 
 static int
 msdosfs_strategy(struct vop_strategy_args *ap)
 {
 	struct buf *bp = ap->a_bp;
 	struct denode *dep = VTODE(ap->a_vp);
 	struct bufobj *bo;
 	int error = 0;
 	daddr_t blkno;
 
 	/*
 	 * If we don't already know the filesystem relative block number
 	 * then get it using pcbmap().  If pcbmap() returns the block
 	 * number as -1 then we've got a hole in the file.  DOS filesystems
 	 * don't allow files with holes, so we shouldn't ever see this.
 	 */
 	if (bp->b_blkno == bp->b_lblkno) {
 		error = pcbmap(dep, bp->b_lblkno, &blkno, 0, 0);
 		bp->b_blkno = blkno;
 		if (error) {
 			bp->b_error = error;
 			bp->b_ioflags |= BIO_ERROR;
 			bufdone(bp);
 			return (0);
 		}
 		if ((long)bp->b_blkno == -1)
 			vfs_bio_clrbuf(bp);
 	}
 	if (bp->b_blkno == -1) {
 		bufdone(bp);
 		return (0);
 	}
 	/*
 	 * Read/write the block from/to the disk that contains the desired
 	 * file block.
 	 */
 	bp->b_iooffset = dbtob(bp->b_blkno);
 	bo = dep->de_pmp->pm_bo;
 	BO_STRATEGY(bo, bp);
 	return (0);
 }
 
 static int
 msdosfs_print(struct vop_print_args *ap)
 {
 	struct denode *dep = VTODE(ap->a_vp);
 
 	printf("\tstartcluster %lu, dircluster %lu, diroffset %lu, ",
 	       dep->de_StartCluster, dep->de_dirclust, dep->de_diroffset);
 	printf("on dev %s\n", devtoname(dep->de_pmp->pm_dev));
 	return (0);
 }
 
 static int
 msdosfs_pathconf(struct vop_pathconf_args *ap)
 {
 	struct msdosfsmount *pmp = VTODE(ap->a_vp)->de_pmp;
 
 	switch (ap->a_name) {
 	case _PC_LINK_MAX:
 		*ap->a_retval = 1;
 		return (0);
 	case _PC_NAME_MAX:
 		*ap->a_retval = pmp->pm_flags & MSDOSFSMNT_LONGNAME ? WIN_MAXLEN : 12;
 		return (0);
 	case _PC_PATH_MAX:
 		*ap->a_retval = PATH_MAX;
 		return (0);
 	case _PC_CHOWN_RESTRICTED:
 		*ap->a_retval = 1;
 		return (0);
 	case _PC_NO_TRUNC:
 		*ap->a_retval = 0;
 		return (0);
 	default:
 		return (EINVAL);
 	}
 	/* NOTREACHED */
 }
 
 static int
 msdosfs_vptofh(struct vop_vptofh_args *ap)
 {
 	struct denode *dep;
 	struct defid *defhp;
 
 	dep = VTODE(ap->a_vp);
 	defhp = (struct defid *)ap->a_fhp;
 	defhp->defid_len = sizeof(struct defid);
 	defhp->defid_dirclust = dep->de_dirclust;
 	defhp->defid_dirofs = dep->de_diroffset;
 	/* defhp->defid_gen = dep->de_gen; */
 	return (0);
 }
 
 /* Global vfs data structures for msdosfs */
 struct vop_vector msdosfs_vnodeops = {
 	.vop_default =		&default_vnodeops,
 
 	.vop_access =		msdosfs_access,
 	.vop_bmap =		msdosfs_bmap,
 	.vop_getpages =		msdosfs_getpages,
 	.vop_cachedlookup =	msdosfs_lookup,
 	.vop_open =		msdosfs_open,
 	.vop_close =		msdosfs_close,
 	.vop_create =		msdosfs_create,
 	.vop_fsync =		msdosfs_fsync,
 	.vop_fdatasync =	vop_stdfdatasync_buf,
 	.vop_getattr =		msdosfs_getattr,
 	.vop_inactive =		msdosfs_inactive,
 	.vop_link =		msdosfs_link,
 	.vop_lookup =		vfs_cache_lookup,
 	.vop_mkdir =		msdosfs_mkdir,
 	.vop_mknod =		msdosfs_mknod,
 	.vop_pathconf =		msdosfs_pathconf,
 	.vop_print =		msdosfs_print,
 	.vop_read =		msdosfs_read,
 	.vop_readdir =		msdosfs_readdir,
 	.vop_reclaim =		msdosfs_reclaim,
 	.vop_remove =		msdosfs_remove,
 	.vop_rename =		msdosfs_rename,
 	.vop_rmdir =		msdosfs_rmdir,
 	.vop_setattr =		msdosfs_setattr,
 	.vop_strategy =		msdosfs_strategy,
 	.vop_symlink =		msdosfs_symlink,
 	.vop_write =		msdosfs_write,
 	.vop_vptofh =		msdosfs_vptofh,
 };
Index: projects/clang500-import/sys/fs/msdosfs/msdosfsmount.h
===================================================================
--- projects/clang500-import/sys/fs/msdosfs/msdosfsmount.h	(revision 318657)
+++ projects/clang500-import/sys/fs/msdosfs/msdosfsmount.h	(revision 318658)
@@ -1,267 +1,267 @@
 /* $FreeBSD$ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
  *
  * 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 TooLs GmbH.
  * 4. The name of TooLs GmbH may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
  */
 /*-
  * Written by Paul Popelka (paulp@uts.amdahl.com)
  *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
  *
  * This software is provided "as is".
  *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
  *
  * October 1992
  */
 
 #ifndef _MSDOSFS_MSDOSFSMOUNT_H_
 #define	_MSDOSFS_MSDOSFSMOUNT_H_
 
 #ifdef _KERNEL
 
 #include <sys/types.h>
 #include <sys/lock.h>
 #include <sys/lockmgr.h>
 #include <sys/tree.h>
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_MSDOSFSMNT);
 #endif
 
 struct msdosfs_fileno;
 
 /*
- * Layout of the mount control block for a msdos filesystem.
+ * Layout of the mount control block for a MSDOSFS filesystem.
  */
 struct msdosfsmount {
 	struct mount *pm_mountp;/* vfs mount struct for this fs */
 	struct g_consumer *pm_cp;
 	struct bufobj *pm_bo;
 	uid_t pm_uid;		/* uid to set as owner of the files */
 	gid_t pm_gid;		/* gid to set as owner of the files */
-	mode_t pm_mask;		/* mask to and with file protection bits 
+	mode_t pm_mask;		/* mask to and with file protection bits
 				   for files */
 	mode_t pm_dirmask;	/* mask to and with file protection bits
 				   for directories */
 	struct vnode *pm_devvp;	/* vnode for character device mounted */
 	struct cdev *pm_dev;	/* character device mounted */
 	struct bpb50 pm_bpb;	/* BIOS parameter blk for this fs */
 	u_long pm_BlkPerSec;	/* How many DEV_BSIZE blocks fit inside a physical sector */
-	u_long pm_FATsecs;	/* actual number of fat sectors */
+	u_long pm_FATsecs;	/* actual number of FAT sectors */
 	u_long pm_fatblk;	/* block # of first FAT */
 	u_long pm_rootdirblk;	/* block # (cluster # for FAT32) of root directory number */
 	u_long pm_rootdirsize;	/* size in blocks (not clusters) */
 	u_long pm_firstcluster;	/* block number of first cluster */
 	u_long pm_maxcluster;	/* maximum cluster number */
 	u_long pm_freeclustercount;	/* number of free clusters */
 	u_long pm_cnshift;	/* shift file offset right this amount to get a cluster number */
 	u_long pm_crbomask;	/* and a file offset with this mask to get cluster rel offset */
 	u_long pm_bnshift;	/* shift file offset right this amount to get a block number */
 	u_long pm_bpcluster;	/* bytes per cluster */
 	u_long pm_fmod;		/* ~0 if fs is modified, this can rollover to 0	*/
-	u_long pm_fatblocksize;	/* size of fat blocks in bytes */
-	u_long pm_fatblocksec;	/* size of fat blocks in sectors */
-	u_long pm_fatsize;	/* size of fat in bytes */
-	uint32_t pm_fatmask;	/* mask to use for fat numbers */
+	u_long pm_fatblocksize;	/* size of FAT blocks in bytes */
+	u_long pm_fatblocksec;	/* size of FAT blocks in sectors */
+	u_long pm_fatsize;	/* size of FAT in bytes */
+	uint32_t pm_fatmask;	/* mask to use for FAT numbers */
 	u_long pm_fsinfo;	/* fsinfo block number */
 	u_long pm_nxtfree;	/* next place to search for a free cluster */
-	u_int pm_fatmult;	/* these 2 values are used in fat */
+	u_int pm_fatmult;	/* these 2 values are used in FAT */
 	u_int pm_fatdiv;	/*	offset computation */
-	u_int pm_curfat;	/* current fat for FAT32 (0 otherwise) */
+	u_int pm_curfat;	/* current FAT for FAT32 (0 otherwise) */
 	u_int *pm_inusemap;	/* ptr to bitmap of in-use clusters */
 	uint64_t pm_flags;	/* see below */
 	void *pm_u2w;	/* Local->Unicode iconv handle */
 	void *pm_w2u;	/* Unicode->Local iconv handle */
 	void *pm_u2d;	/* Unicode->DOS iconv handle */
 	void *pm_d2u;	/* DOS->Local iconv handle */
 	uint32_t pm_nfileno;	/* next 32-bit fileno */
 	RB_HEAD(msdosfs_filenotree, msdosfs_fileno)
 	    pm_filenos; /* 64<->32-bit fileno mapping */
 	struct lock pm_fatlock;	/* lockmgr protecting allocations and rb tree */
 };
 
 /*
  * A 64-bit file number and the 32-bit file number to which it is mapped,
  * in a red-black tree node.
  */
 struct msdosfs_fileno {
 	RB_ENTRY(msdosfs_fileno)	mf_tree;
 	uint32_t			mf_fileno32;
 	uint64_t			mf_fileno64;
 };
 
 /* Byte offset in FAT on filesystem pmp, cluster cn */
 #define	FATOFS(pmp, cn)	((cn) * (pmp)->pm_fatmult / (pmp)->pm_fatdiv)
 
 
 #define	VFSTOMSDOSFS(mp)	((struct msdosfsmount *)mp->mnt_data)
 
 /* Number of bits in one pm_inusemap item: */
 #define	N_INUSEBITS	(8 * sizeof(u_int))
 
 /*
  * Shorthand for fields in the bpb contained in the msdosfsmount structure.
  */
 #define	pm_BytesPerSec	pm_bpb.bpbBytesPerSec
 #define	pm_ResSectors	pm_bpb.bpbResSectors
 #define	pm_FATs		pm_bpb.bpbFATs
 #define	pm_RootDirEnts	pm_bpb.bpbRootDirEnts
 #define	pm_Sectors	pm_bpb.bpbSectors
 #define	pm_Media	pm_bpb.bpbMedia
 #define	pm_SecPerTrack	pm_bpb.bpbSecPerTrack
 #define	pm_Heads	pm_bpb.bpbHeads
 #define	pm_HiddenSects	pm_bpb.bpbHiddenSecs
 #define	pm_HugeSectors	pm_bpb.bpbHugeSectors
 
 /*
  * Convert pointer to buffer -> pointer to direntry
  */
 #define	bptoep(pmp, bp, dirofs) \
 	((struct direntry *)(((bp)->b_data)	\
 	 + ((dirofs) & (pmp)->pm_crbomask)))
 
 /*
  * Convert block number to cluster number
  */
 #define	de_bn2cn(pmp, bn) \
 	((bn) >> ((pmp)->pm_cnshift - (pmp)->pm_bnshift))
 
 /*
  * Convert cluster number to block number
  */
 #define	de_cn2bn(pmp, cn) \
 	((cn) << ((pmp)->pm_cnshift - (pmp)->pm_bnshift))
 
 /*
  * Convert file offset to cluster number
  */
 #define de_cluster(pmp, off) \
 	((off) >> (pmp)->pm_cnshift)
 
 /*
  * Clusters required to hold size bytes
  */
 #define	de_clcount(pmp, size) \
 	(((size) + (pmp)->pm_bpcluster - 1) >> (pmp)->pm_cnshift)
 
 /*
  * Convert file offset to block number
  */
 #define de_blk(pmp, off) \
 	(de_cn2bn(pmp, de_cluster((pmp), (off))))
 
 /*
  * Convert cluster number to file offset
  */
 #define	de_cn2off(pmp, cn) \
 	((cn) << (pmp)->pm_cnshift)
 
 /*
  * Convert block number to file offset
  */
 #define	de_bn2off(pmp, bn) \
 	((bn) << (pmp)->pm_bnshift)
 /*
  * Map a cluster number into a filesystem relative block number.
  */
 #define	cntobn(pmp, cn) \
 	(de_cn2bn((pmp), (cn)-CLUST_FIRST) + (pmp)->pm_firstcluster)
 
 /*
  * Calculate block number for directory entry in root dir, offset dirofs
  */
 #define	roottobn(pmp, dirofs) \
 	(de_blk((pmp), (dirofs)) + (pmp)->pm_rootdirblk)
 
 /*
  * Calculate block number for directory entry at cluster dirclu, offset
  * dirofs
  */
 #define	detobn(pmp, dirclu, dirofs) \
 	((dirclu) == MSDOSFSROOT \
 	 ? roottobn((pmp), (dirofs)) \
 	 : cntobn((pmp), (dirclu)))
 
 void msdosfs_fileno_init(struct mount *);
 void msdosfs_fileno_free(struct mount *);
 uint32_t msdosfs_fileno_map(struct mount *, uint64_t);
 
 #define	MSDOSFS_LOCK_MP(pmp) \
 	lockmgr(&(pmp)->pm_fatlock, LK_EXCLUSIVE, NULL)
 #define	MSDOSFS_UNLOCK_MP(pmp) \
 	lockmgr(&(pmp)->pm_fatlock, LK_RELEASE, NULL)
 #define	MSDOSFS_ASSERT_MP_LOCKED(pmp) \
 	lockmgr_assert(&(pmp)->pm_fatlock, KA_XLOCKED)
 
 #endif /* _KERNEL */
 
 /*
  *  Arguments to mount MSDOS filesystems.
  */
 struct msdosfs_args {
 	char	*fspec;		/* blocks special holding the fs to mount */
 	struct	oexport_args export;	/* network export information */
 	uid_t	uid;		/* uid that owns msdosfs files */
 	gid_t	gid;		/* gid that owns msdosfs files */
 	mode_t	mask;		/* file mask to be applied for msdosfs perms */
 	int	flags;		/* see below */
 	int	unused1;	/* unused, was version number */
 	uint16_t unused2[128];	/* no longer used, was Local->Unicode table */
 	char	*cs_win;	/* Windows(Unicode) Charset */
 	char	*cs_dos;	/* DOS Charset */
 	char	*cs_local;	/* Local Charset */
 	mode_t	dirmask;	/* dir  mask to be applied for msdosfs perms */
 };
 
 /*
  * Msdosfs mount options:
  */
 #define	MSDOSFSMNT_SHORTNAME	1	/* Force old DOS short names only */
 #define	MSDOSFSMNT_LONGNAME	2	/* Force Win'95 long names */
 #define	MSDOSFSMNT_NOWIN95	4	/* Completely ignore Win95 entries */
 #define	MSDOSFSMNT_KICONV	0x10    /* Use libiconv to convert chars */
 /* All flags above: */
 #define	MSDOSFSMNT_MNTOPT \
 	(MSDOSFSMNT_SHORTNAME|MSDOSFSMNT_LONGNAME|MSDOSFSMNT_NOWIN95 \
 	 |MSDOSFSMNT_KICONV)
 #define	MSDOSFSMNT_RONLY	0x80000000	/* mounted read-only	*/
 #define	MSDOSFSMNT_WAITONFAT	0x40000000	/* mounted synchronous	*/
 #define	MSDOSFS_FATMIRROR	0x20000000	/* FAT is mirrored */
 #define	MSDOSFS_LARGEFS		0x10000000	/* perform fileno mapping */
 #define	MSDOSFS_FSIMOD		0x01000000
 
 #endif /* !_MSDOSFS_MSDOSFSMOUNT_H_ */
Index: projects/clang500-import/sys/kern/capabilities.conf
===================================================================
--- projects/clang500-import/sys/kern/capabilities.conf	(revision 318657)
+++ projects/clang500-import/sys/kern/capabilities.conf	(revision 318658)
@@ -1,746 +1,738 @@
 ##
 ## Copyright (c) 2008-2010 Robert N. M. Watson
 ## All rights reserved.
 ##
 ## This software was developed at the University of Cambridge Computer
 ## Laboratory with support from a grant from Google, Inc.
 ##
 ## 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.
 ##
 ## List of system calls enabled in capability mode, one name per line.
 ##
 ## Notes:
 ## - sys_exit(2), abort2(2) and close(2) are very important.
 ## - Sorted alphabetically, please keep it that way.
 ##
 ## $FreeBSD$
 ##
 
 ##
 ## Allow ACL and MAC label operations by file descriptor, subject to
 ## capability rights.  Allow MAC label operations on the current process but
 ## we will need to scope __mac_get_pid(2).
 ##
 __acl_aclcheck_fd
 __acl_delete_fd
 __acl_get_fd
 __acl_set_fd
 __mac_get_fd
 #__mac_get_pid
 __mac_get_proc
 __mac_set_fd
 __mac_set_proc
 
 ##
 ## Allow sysctl(2) as we scope internal to the call; this is a global
 ## namespace, but there are several critical sysctls required for almost
 ## anything to run, such as hw.pagesize.  For now that policy lives in the
 ## kernel for performance and simplicity, but perhaps it could move to a
 ## proxying daemon in userspace.
 ##
 __sysctl
 
 ##
 ## Allow umtx operations as these are scoped by address space.
 ##
 ## XXRW: Need to check this very carefully.
 ##
 _umtx_op
 
 ##
 ## Allow process termination using abort2(2).
 ##
 abort2
 
 ##
 ## Allow accept(2) since it doesn't manipulate namespaces directly, rather
 ## relies on existing bindings on a socket, subject to capability rights.
 ##
 accept
 accept4
 
 ##
 ## Allow AIO operations by file descriptor, subject to capability rights.
 ##
 aio_cancel
 aio_error
 aio_fsync
 aio_read
 aio_return
 aio_suspend
 aio_waitcomplete
 aio_write
 
 ##
 ## audit(2) is a global operation, submitting to the global trail, but it is
 ## controlled by privilege, and it might be useful to be able to submit
 ## records from sandboxes.  For now, disallow, but we may want to think about
 ## providing some sort of proxy service for this.
 ##
 #audit
 
 ##
 ## Allow bindat(2).
 ##
 bindat
 
 ##
 ## Allow capability mode and capability system calls.
 ##
 cap_enter
 cap_fcntls_get
 cap_fcntls_limit
 cap_getmode
 cap_ioctls_get
 cap_ioctls_limit
 __cap_rights_get
 cap_rights_limit
 
 ##
 ## Allow read-only clock operations.
 ##
 clock_getres
 clock_gettime
 
 ##
 ## Always allow file descriptor close(2).
 ##
 close
 closefrom
 
 ##
 ## Allow connectat(2).
 ##
 connectat
 
 ##
 ## cpuset(2) and related calls require scoping by process, but should
 ## eventually be allowed, at least in the current process case.
 ##
 #cpuset
 #cpuset_getaffinity
 #cpuset_getid
 #cpuset_setaffinity
 #cpuset_setid
 
 ##
 ## Always allow dup(2) and dup2(2) manipulation of the file descriptor table.
 ##
 dup
 dup2
 
 ##
 ## Allow extended attribute operations by file descriptor, subject to
 ## capability rights.
 ##
 extattr_delete_fd
 extattr_get_fd
 extattr_list_fd
 extattr_set_fd
 
 ##
 ## Allow changing file flags, mode, and owner by file descriptor, subject to
 ## capability rights.
 ##
 fchflags
 fchmod
 fchown
 
 ##
 ## For now, allow fcntl(2), subject to capability rights, but this probably
 ## needs additional scoping.
 ##
 fcntl
 
 ##
 ## Allow fexecve(2), subject to capability rights.  We perform some scoping,
 ## such as disallowing privilege escalation.
 ##
 fexecve
 
 ##
 ## Allow flock(2), subject to capability rights.
 ##
 flock
 
 ##
 ## Allow fork(2), even though it returns pids -- some applications seem to
 ## prefer this interface.
 ##
 fork
 
 ##
 ## Allow fpathconf(2), subject to capability rights.
 ##
 fpathconf
 
 ##
 ## Allow various file descriptor-based I/O operations, subject to capability
 ## rights.
 ##
 freebsd6_ftruncate
 freebsd6_lseek
 freebsd6_mmap
 freebsd6_pread
 freebsd6_pwrite
 
 ##
 ## Allow querying file and file system state with fstat(2) and fstatfs(2),
 ## subject to capability rights.
 ##
 fstat
 fstatfs
 
 ##
 ## Allow further file descriptor-based I/O operations, subject to capability
 ## rights.
 ##
 fsync
 ftruncate
 
 ##
 ## Allow futimens(2) and futimes(2), subject to capability rights.
 ##
 futimens
 futimes
 
 ##
 ## Allow querying process audit state, subject to normal access control.
 ##
 getaudit
 getaudit_addr
 getauid
 
 ##
 ## Allow thread context management with getcontext(2).
 ##
 getcontext
 
 ##
 ## Allow directory I/O on a file descriptor, subject to capability rights.
 ## Originally we had separate capabilities for directory-specific read
 ## operations, but on BSD we allow reading the raw directory data, so we just
 ## rely on CAP_READ now.
 ##
 getdents
 getdirentries
 
 ##
 ## Allow querying certain trivial global state.
 ##
 getdomainname
 
 ##
 ## Allow querying certain per-process resource limit state.
 ##
 getdtablesize
 
 ##
 ## Allow querying current process credential state.
 ##
 getegid
 geteuid
 
 ##
 ## Allow querying certain trivial global state.
 ##
 gethostid
 gethostname
 
 ##
 ## Allow querying per-process timer.
 ##
 getitimer
 
 ##
 ## Allow querying current process credential state.
 ##
 getgid
 getgroups
 getlogin
 
 ##
 ## Allow querying certain trivial global state.
 ##
 getpagesize
 getpeername
 
 ##
 ## Allow querying certain per-process scheduling, resource limit, and
 ## credential state.
 ##
 ## XXXRW: getpgid(2) needs scoping.  It's not clear if it's worth scoping
 ## getppid(2).  getpriority(2) needs scoping.  getrusage(2) needs scoping.
 ## getsid(2) needs scoping.
 ##
 getpgid
 getpgrp
 getpid
 getppid
 getpriority
 getresgid
 getresuid
 getrlimit
 getrusage
 getsid
 
 ##
 ## Allow querying socket state, subject to capability rights.
 ##
 ## XXXRW: getsockopt(2) may need more attention.
 ##
 getsockname
 getsockopt
 
 ##
 ## Allow querying the global clock.
 ##
 gettimeofday
 
 ##
 ## Allow querying current process credential state.
 ##
 getuid
 
 ##
 ## Allow ioctl(2), which hopefully will be limited by applications only to
 ## required commands with cap_ioctls_limit(2) syscall.
 ##
 ioctl
 
 ##
 ## Allow querying current process credential state.
 ##
 issetugid
 
 ##
 ## Allow kevent(2), as we will authorize based on capability rights on the
 ## target descriptor.
 ##
 kevent
 
 ##
 ## Allow kill(2), as we allow the process to send signals only to himself.
 ##
 kill
 
 ##
 ## Allow message queue operations on file descriptors, subject to capability
 ## rights.
 ##
 kmq_notify
 kmq_setattr
 kmq_timedreceive
 kmq_timedsend
 
 ##
 ## Allow kqueue(2), we will control use.
 ##
 kqueue
 
 ##
 ## Allow managing per-process timers.
 ##
 ktimer_create
 ktimer_delete
 ktimer_getoverrun
 ktimer_gettime
 ktimer_settime
 
 ##
 ## We can't allow ktrace(2) because it relies on a global namespace, but we
 ## might want to introduce an fktrace(2) of some sort.
 ##
 #ktrace
 
 ##
 ## Allow AIO operations by file descriptor, subject to capability rights.
 ##
 lio_listio
 
 ##
 ## Allow listen(2), subject to capability rights.
 ##
 ## XXXRW: One might argue this manipulates a global namespace.
 ##
 listen
 
 ##
 ## Allow I/O-related file descriptors, subject to capability rights.
 ##
 lseek
 
 ##
 ## Allow simple VM operations on the current process.
 ##
 madvise
 mincore
 minherit
 mlock
 mlockall
 
 ##
 ## Allow memory mapping a file descriptor, and updating protections, subject
 ## to capability rights.
 ##
 mmap
 mprotect
 
 ##
 ## Allow simple VM operations on the current process.
 ##
 msync
 munlock
 munlockall
 munmap
 
 ##
 ## Allow the current process to sleep.
 ##
 nanosleep
 
 ##
 ## Allow querying the global clock.
 ##
 ntp_gettime
 
 ##
 ## Allow AIO operations by file descriptor, subject to capability rights.
 ##
 oaio_read
 oaio_write
 
 ##
 ## Allow simple VM operations on the current process.
 ##
 obreak
 
 ##
 ## Allow AIO operations by file descriptor, subject to capability rights.
 ##
 olio_listio
 
 ##
 ## Operations relative to directory capabilities.
 ##
 chflagsat
 faccessat
 fchmodat
 fchownat
 fstatat
 futimesat
 linkat
 mkdirat
 mkfifoat
 mknodat
 openat
 readlinkat
 renameat
 symlinkat
 unlinkat
 utimensat
 
 ##
-## Allow entry into open(2). This system call will fail, since access to the
-## global file namespace has been disallowed, but allowing entry into the
-## syscall means that an audit trail will be generated (which is also very
-## useful for debugging).
-##
-open
-
-##
 ## Process descriptor-related system calls are allowed.
 ##
 pdfork
 pdgetpid
 pdkill
 #pdwait4	# not yet implemented
 
 ##
 ## Allow pipe(2).
 ##
 pipe
 pipe2
 
 ##
 ## Allow poll(2), which will be scoped by capability rights.
 ## XXXRW: We don't yet do that scoping.
 ##
 poll
 
 ##
 ## Allow I/O-related file descriptors, subject to capability rights.
 ##
 pread
 preadv
 
 ##
 ## Allow access to profiling state on the current process.
 ##
 profil
 
 ##
 ## Disallow ptrace(2) for now, but we do need debugging facilities in
 ## capability mode, so we will want to revisit this, possibly by scoping its
 ## operation.
 ##
 #ptrace
 
 ##
 ## Allow I/O-related file descriptors, subject to capability rights.
 ##
 pwrite
 pwritev
 read
 readv
 recv
 recvfrom
 recvmsg
 
 ##
 ## Allow real-time scheduling primitives to be used.
 ##
 ## XXXRW: These require scoping.
 ##
 rtprio
 rtprio_thread
 
 ##
 ## Allow simple VM operations on the current process.
 ##
 sbrk
 
 ##
 ## Allow querying trivial global scheduler state.
 ##
 sched_get_priority_max
 sched_get_priority_min
 
 ##
 ## Allow various thread/process scheduler operations.
 ##
 ## XXXRW: Some of these require further scoping.
 ##
 sched_getparam
 sched_getscheduler
 sched_rr_get_interval
 sched_setparam
 sched_setscheduler
 sched_yield
 
 ##
 ## Allow I/O-related file descriptors, subject to capability rights.
 ##
 sctp_generic_recvmsg
 sctp_generic_sendmsg
 sctp_generic_sendmsg_iov
 sctp_peeloff
 
 ##
 ## Allow pselect(2) and select(2), which will be scoped by capability rights.
 ##
 ## XXXRW: But is it?
 ##
 pselect
 select
 
 ##
 ## Allow I/O-related file descriptors, subject to capability rights.  Use of
 ## explicit addresses here is restricted by the system calls themselves.
 ##
 send
 sendfile
 sendmsg
 sendto
 
 ##
 ## Allow setting per-process audit state, which is controlled separately by
 ## privileges.
 ##
 setaudit
 setaudit_addr
 setauid
 
 ##
 ## Allow setting thread context.
 ##
 setcontext
 
 ##
 ## Allow setting current process credential state, which is controlled
 ## separately by privilege.
 ##
 setegid
 seteuid
 setgid
 
 ##
 ## Allow use of the process interval timer.
 ##
 setitimer
 
 ##
 ## Allow setpriority(2).
 ##
 ## XXXRW: Requires scoping.
 ##
 setpriority
 
 ##
 ## Allow setting current process credential state, which is controlled
 ## separately by privilege.
 ##
 setregid
 setresgid
 setresuid
 setreuid
 
 ##
 ## Allow setting process resource limits with setrlimit(2).
 ##
 setrlimit
 
 ##
 ## Allow creating a new session with setsid(2).
 ##
 setsid
 
 ##
 ## Allow setting socket options with setsockopt(2), subject to capability
 ## rights.
 ##
 ## XXXRW: Might require scoping.
 ##
 setsockopt
 
 ##
 ## Allow setting current process credential state, which is controlled
 ## separately by privilege.
 ##
 setuid
 
 ##
 ## shm_open(2) is scoped so as to allow only access to new anonymous objects.
 ##
 shm_open
 
 ##
 ## Allow I/O-related file descriptors, subject to capability rights.
 ##
 shutdown
 
 ##
 ## Allow signal control on current process.
 ##
 sigaction
 sigaltstack
 sigblock
 sigpending
 sigprocmask
 sigqueue
 sigreturn
 sigsetmask
 sigstack
 sigsuspend
 sigtimedwait
 sigvec
 sigwaitinfo
 sigwait
 
 ##
 ## Allow creating new socket pairs with socket(2) and socketpair(2).
 ##
 socket
 socketpair
 
 ##
 ## Allow simple VM operations on the current process.
 ##
 ## XXXRW: Kernel doesn't implement this, so drop?
 ##
 sstk
 
 ##
 ## Do allow sync(2) for now, but possibly shouldn't.
 ##
 sync
 
 ##
 ## Always allow process termination with sys_exit(2).
 ##
 sys_exit
 
 ##
 ## sysarch(2) does rather diverse things, but is required on at least i386
 ## in order to configure per-thread data.  As such, it's scoped on each
 ## architecture.
 ##
 sysarch
 
 ##
 ## Allow thread operations operating only on current process.
 ##
 thr_create
 thr_exit
 thr_kill
 
 ##
 ## Disallow thr_kill2(2), as it may operate beyond the current process.
 ##
 ## XXXRW: Requires scoping.
 ##
 #thr_kill2
 
 ##
 ## Allow thread operations operating only on current process.
 ##
 thr_new
 thr_self
 thr_set_name
 thr_suspend
 thr_wake
 
 ##
 ## Allow manipulation of the current process umask with umask(2).
 ##
 umask
 
 ##
 ## Allow submitting of process trace entries with utrace(2).
 ##
 utrace
 
 ##
 ## Allow generating UUIDs with uuidgen(2).
 ##
 uuidgen
 
 ##
 ## Allow I/O-related file descriptors, subject to capability rights.
 ##
 write
 writev
 
 ##
 ## Allow processes to yield(2).
 ##
 yield
Index: projects/clang500-import/sys/kern/init_sysent.c
===================================================================
--- projects/clang500-import/sys/kern/init_sysent.c	(revision 318657)
+++ projects/clang500-import/sys/kern/init_sysent.c	(revision 318658)
@@ -1,599 +1,599 @@
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
  */
 
 #include "opt_compat.h"
 
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 
 #define AS(name) (sizeof(struct name) / sizeof(register_t))
 
 #ifdef COMPAT_43
 #define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)
 #else
 #define compat(n, name) 0, (sy_call_t *)nosys
 #endif
 
 #ifdef COMPAT_FREEBSD4
 #define compat4(n, name) n, (sy_call_t *)__CONCAT(freebsd4_,name)
 #else
 #define compat4(n, name) 0, (sy_call_t *)nosys
 #endif
 
 #ifdef COMPAT_FREEBSD6
 #define compat6(n, name) n, (sy_call_t *)__CONCAT(freebsd6_,name)
 #else
 #define compat6(n, name) 0, (sy_call_t *)nosys
 #endif
 
 #ifdef COMPAT_FREEBSD7
 #define compat7(n, name) n, (sy_call_t *)__CONCAT(freebsd7_,name)
 #else
 #define compat7(n, name) 0, (sy_call_t *)nosys
 #endif
 
 #ifdef COMPAT_FREEBSD10
 #define compat10(n, name) n, (sy_call_t *)__CONCAT(freebsd10_,name)
 #else
 #define compat10(n, name) 0, (sy_call_t *)nosys
 #endif
 
 /* The casts are bogus but will do for now. */
 struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },		/* 0 = syscall */
 	{ AS(sys_exit_args), (sy_call_t *)sys_sys_exit, AUE_EXIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 1 = exit */
 	{ 0, (sy_call_t *)sys_fork, AUE_FORK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 2 = fork */
 	{ AS(read_args), (sy_call_t *)sys_read, AUE_READ, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 3 = read */
 	{ AS(write_args), (sy_call_t *)sys_write, AUE_WRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 4 = write */
-	{ AS(open_args), (sy_call_t *)sys_open, AUE_OPEN_RWTC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 5 = open */
+	{ AS(open_args), (sy_call_t *)sys_open, AUE_OPEN_RWTC, NULL, 0, 0, 0, SY_THR_STATIC },	/* 5 = open */
 	{ AS(close_args), (sy_call_t *)sys_close, AUE_CLOSE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 6 = close */
 	{ AS(wait4_args), (sy_call_t *)sys_wait4, AUE_WAIT4, NULL, 0, 0, 0, SY_THR_STATIC },	/* 7 = wait4 */
 	{ compat(AS(ocreat_args),creat), AUE_CREAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 8 = old creat */
 	{ AS(link_args), (sy_call_t *)sys_link, AUE_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 9 = link */
 	{ AS(unlink_args), (sy_call_t *)sys_unlink, AUE_UNLINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 10 = unlink */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 11 = obsolete execv */
 	{ AS(chdir_args), (sy_call_t *)sys_chdir, AUE_CHDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 12 = chdir */
 	{ AS(fchdir_args), (sy_call_t *)sys_fchdir, AUE_FCHDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 13 = fchdir */
 	{ AS(mknod_args), (sy_call_t *)sys_mknod, AUE_MKNOD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 14 = mknod */
 	{ AS(chmod_args), (sy_call_t *)sys_chmod, AUE_CHMOD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 15 = chmod */
 	{ AS(chown_args), (sy_call_t *)sys_chown, AUE_CHOWN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 16 = chown */
 	{ AS(obreak_args), (sy_call_t *)sys_obreak, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 17 = break */
 	{ compat4(AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 18 = freebsd4 getfsstat */
 	{ compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 19 = old lseek */
 	{ 0, (sy_call_t *)sys_getpid, AUE_GETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 20 = getpid */
 	{ AS(mount_args), (sy_call_t *)sys_mount, AUE_MOUNT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 21 = mount */
 	{ AS(unmount_args), (sy_call_t *)sys_unmount, AUE_UMOUNT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 22 = unmount */
 	{ AS(setuid_args), (sy_call_t *)sys_setuid, AUE_SETUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 23 = setuid */
 	{ 0, (sy_call_t *)sys_getuid, AUE_GETUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 24 = getuid */
 	{ 0, (sy_call_t *)sys_geteuid, AUE_GETEUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 25 = geteuid */
 	{ AS(ptrace_args), (sy_call_t *)sys_ptrace, AUE_PTRACE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 26 = ptrace */
 	{ AS(recvmsg_args), (sy_call_t *)sys_recvmsg, AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 27 = recvmsg */
 	{ AS(sendmsg_args), (sy_call_t *)sys_sendmsg, AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 28 = sendmsg */
 	{ AS(recvfrom_args), (sy_call_t *)sys_recvfrom, AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 29 = recvfrom */
 	{ AS(accept_args), (sy_call_t *)sys_accept, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 30 = accept */
 	{ AS(getpeername_args), (sy_call_t *)sys_getpeername, AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 31 = getpeername */
 	{ AS(getsockname_args), (sy_call_t *)sys_getsockname, AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 32 = getsockname */
 	{ AS(access_args), (sy_call_t *)sys_access, AUE_ACCESS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 33 = access */
 	{ AS(chflags_args), (sy_call_t *)sys_chflags, AUE_CHFLAGS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 34 = chflags */
 	{ AS(fchflags_args), (sy_call_t *)sys_fchflags, AUE_FCHFLAGS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 35 = fchflags */
 	{ 0, (sy_call_t *)sys_sync, AUE_SYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 36 = sync */
 	{ AS(kill_args), (sy_call_t *)sys_kill, AUE_KILL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 37 = kill */
 	{ compat(AS(ostat_args),stat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 38 = old stat */
 	{ 0, (sy_call_t *)sys_getppid, AUE_GETPPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 39 = getppid */
 	{ compat(AS(olstat_args),lstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 40 = old lstat */
 	{ AS(dup_args), (sy_call_t *)sys_dup, AUE_DUP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 41 = dup */
 	{ compat10(0,pipe), AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 42 = freebsd10 pipe */
 	{ 0, (sy_call_t *)sys_getegid, AUE_GETEGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 43 = getegid */
 	{ AS(profil_args), (sy_call_t *)sys_profil, AUE_PROFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 44 = profil */
 	{ AS(ktrace_args), (sy_call_t *)sys_ktrace, AUE_KTRACE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 45 = ktrace */
 	{ compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 46 = old sigaction */
 	{ 0, (sy_call_t *)sys_getgid, AUE_GETGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 47 = getgid */
 	{ compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 48 = old sigprocmask */
 	{ AS(getlogin_args), (sy_call_t *)sys_getlogin, AUE_GETLOGIN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 49 = getlogin */
 	{ AS(setlogin_args), (sy_call_t *)sys_setlogin, AUE_SETLOGIN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 50 = setlogin */
 	{ AS(acct_args), (sy_call_t *)sys_acct, AUE_ACCT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 51 = acct */
 	{ compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 52 = old sigpending */
 	{ AS(sigaltstack_args), (sy_call_t *)sys_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 53 = sigaltstack */
 	{ AS(ioctl_args), (sy_call_t *)sys_ioctl, AUE_IOCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 54 = ioctl */
 	{ AS(reboot_args), (sy_call_t *)sys_reboot, AUE_REBOOT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 55 = reboot */
 	{ AS(revoke_args), (sy_call_t *)sys_revoke, AUE_REVOKE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 56 = revoke */
 	{ AS(symlink_args), (sy_call_t *)sys_symlink, AUE_SYMLINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 57 = symlink */
 	{ AS(readlink_args), (sy_call_t *)sys_readlink, AUE_READLINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 58 = readlink */
 	{ AS(execve_args), (sy_call_t *)sys_execve, AUE_EXECVE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 59 = execve */
 	{ AS(umask_args), (sy_call_t *)sys_umask, AUE_UMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 60 = umask */
 	{ AS(chroot_args), (sy_call_t *)sys_chroot, AUE_CHROOT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 61 = chroot */
 	{ compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 62 = old fstat */
 	{ compat(AS(getkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 63 = old getkerninfo */
 	{ compat(0,getpagesize), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 64 = old getpagesize */
 	{ AS(msync_args), (sy_call_t *)sys_msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 65 = msync */
 	{ 0, (sy_call_t *)sys_vfork, AUE_VFORK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 66 = vfork */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 67 = obsolete vread */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 68 = obsolete vwrite */
 	{ AS(sbrk_args), (sy_call_t *)sys_sbrk, AUE_SBRK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 69 = sbrk */
 	{ AS(sstk_args), (sy_call_t *)sys_sstk, AUE_SSTK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 70 = sstk */
 	{ compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 71 = old mmap */
 	{ AS(ovadvise_args), (sy_call_t *)sys_ovadvise, AUE_O_VADVISE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 72 = vadvise */
 	{ AS(munmap_args), (sy_call_t *)sys_munmap, AUE_MUNMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 73 = munmap */
 	{ AS(mprotect_args), (sy_call_t *)sys_mprotect, AUE_MPROTECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 74 = mprotect */
 	{ AS(madvise_args), (sy_call_t *)sys_madvise, AUE_MADVISE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 75 = madvise */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 76 = obsolete vhangup */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 77 = obsolete vlimit */
 	{ AS(mincore_args), (sy_call_t *)sys_mincore, AUE_MINCORE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 78 = mincore */
 	{ AS(getgroups_args), (sy_call_t *)sys_getgroups, AUE_GETGROUPS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 79 = getgroups */
 	{ AS(setgroups_args), (sy_call_t *)sys_setgroups, AUE_SETGROUPS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 80 = setgroups */
 	{ 0, (sy_call_t *)sys_getpgrp, AUE_GETPGRP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 81 = getpgrp */
 	{ AS(setpgid_args), (sy_call_t *)sys_setpgid, AUE_SETPGRP, NULL, 0, 0, 0, SY_THR_STATIC },	/* 82 = setpgid */
 	{ AS(setitimer_args), (sy_call_t *)sys_setitimer, AUE_SETITIMER, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 83 = setitimer */
 	{ compat(0,wait), AUE_WAIT4, NULL, 0, 0, 0, SY_THR_STATIC },			/* 84 = old wait */
 	{ AS(swapon_args), (sy_call_t *)sys_swapon, AUE_SWAPON, NULL, 0, 0, 0, SY_THR_STATIC },	/* 85 = swapon */
 	{ AS(getitimer_args), (sy_call_t *)sys_getitimer, AUE_GETITIMER, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 86 = getitimer */
 	{ compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 87 = old gethostname */
 	{ compat(AS(sethostname_args),sethostname), AUE_SYSCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 88 = old sethostname */
 	{ 0, (sy_call_t *)sys_getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 89 = getdtablesize */
 	{ AS(dup2_args), (sy_call_t *)sys_dup2, AUE_DUP2, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 90 = dup2 */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 91 = getdopt */
 	{ AS(fcntl_args), (sy_call_t *)sys_fcntl, AUE_FCNTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 92 = fcntl */
 	{ AS(select_args), (sy_call_t *)sys_select, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 93 = select */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 94 = setdopt */
 	{ AS(fsync_args), (sy_call_t *)sys_fsync, AUE_FSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 95 = fsync */
 	{ AS(setpriority_args), (sy_call_t *)sys_setpriority, AUE_SETPRIORITY, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 96 = setpriority */
 	{ AS(socket_args), (sy_call_t *)sys_socket, AUE_SOCKET, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 97 = socket */
 	{ AS(connect_args), (sy_call_t *)sys_connect, AUE_CONNECT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 98 = connect */
 	{ compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 99 = old accept */
 	{ AS(getpriority_args), (sy_call_t *)sys_getpriority, AUE_GETPRIORITY, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 100 = getpriority */
 	{ compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 101 = old send */
 	{ compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 102 = old recv */
 	{ compat(AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 103 = old sigreturn */
 	{ AS(bind_args), (sy_call_t *)sys_bind, AUE_BIND, NULL, 0, 0, 0, SY_THR_STATIC },	/* 104 = bind */
 	{ AS(setsockopt_args), (sy_call_t *)sys_setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 105 = setsockopt */
 	{ AS(listen_args), (sy_call_t *)sys_listen, AUE_LISTEN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 106 = listen */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 107 = obsolete vtimes */
 	{ compat(AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 108 = old sigvec */
 	{ compat(AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 109 = old sigblock */
 	{ compat(AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 110 = old sigsetmask */
 	{ compat(AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 111 = old sigsuspend */
 	{ compat(AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 112 = old sigstack */
 	{ compat(AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 113 = old recvmsg */
 	{ compat(AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 114 = old sendmsg */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 115 = obsolete vtrace */
 	{ AS(gettimeofday_args), (sy_call_t *)sys_gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 116 = gettimeofday */
 	{ AS(getrusage_args), (sy_call_t *)sys_getrusage, AUE_GETRUSAGE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 117 = getrusage */
 	{ AS(getsockopt_args), (sy_call_t *)sys_getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 118 = getsockopt */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 119 = resuba */
 	{ AS(readv_args), (sy_call_t *)sys_readv, AUE_READV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 120 = readv */
 	{ AS(writev_args), (sy_call_t *)sys_writev, AUE_WRITEV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 121 = writev */
 	{ AS(settimeofday_args), (sy_call_t *)sys_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0, SY_THR_STATIC },	/* 122 = settimeofday */
 	{ AS(fchown_args), (sy_call_t *)sys_fchown, AUE_FCHOWN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 123 = fchown */
 	{ AS(fchmod_args), (sy_call_t *)sys_fchmod, AUE_FCHMOD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 124 = fchmod */
 	{ compat(AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 125 = old recvfrom */
 	{ AS(setreuid_args), (sy_call_t *)sys_setreuid, AUE_SETREUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 126 = setreuid */
 	{ AS(setregid_args), (sy_call_t *)sys_setregid, AUE_SETREGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 127 = setregid */
 	{ AS(rename_args), (sy_call_t *)sys_rename, AUE_RENAME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 128 = rename */
 	{ compat(AS(otruncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 129 = old truncate */
 	{ compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 130 = old ftruncate */
 	{ AS(flock_args), (sy_call_t *)sys_flock, AUE_FLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 131 = flock */
 	{ AS(mkfifo_args), (sy_call_t *)sys_mkfifo, AUE_MKFIFO, NULL, 0, 0, 0, SY_THR_STATIC },	/* 132 = mkfifo */
 	{ AS(sendto_args), (sy_call_t *)sys_sendto, AUE_SENDTO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 133 = sendto */
 	{ AS(shutdown_args), (sy_call_t *)sys_shutdown, AUE_SHUTDOWN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 134 = shutdown */
 	{ AS(socketpair_args), (sy_call_t *)sys_socketpair, AUE_SOCKETPAIR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 135 = socketpair */
 	{ AS(mkdir_args), (sy_call_t *)sys_mkdir, AUE_MKDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 136 = mkdir */
 	{ AS(rmdir_args), (sy_call_t *)sys_rmdir, AUE_RMDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 137 = rmdir */
 	{ AS(utimes_args), (sy_call_t *)sys_utimes, AUE_UTIMES, NULL, 0, 0, 0, SY_THR_STATIC },	/* 138 = utimes */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 139 = obsolete 4.2 sigreturn */
 	{ AS(adjtime_args), (sy_call_t *)sys_adjtime, AUE_ADJTIME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 140 = adjtime */
 	{ compat(AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 141 = old getpeername */
 	{ compat(0,gethostid), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 142 = old gethostid */
 	{ compat(AS(osethostid_args),sethostid), AUE_SYSCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 143 = old sethostid */
 	{ compat(AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 144 = old getrlimit */
 	{ compat(AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 145 = old setrlimit */
 	{ compat(AS(okillpg_args),killpg), AUE_KILLPG, NULL, 0, 0, 0, SY_THR_STATIC },	/* 146 = old killpg */
 	{ 0, (sy_call_t *)sys_setsid, AUE_SETSID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 147 = setsid */
 	{ AS(quotactl_args), (sy_call_t *)sys_quotactl, AUE_QUOTACTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 148 = quotactl */
 	{ compat(0,quota), AUE_O_QUOTA, NULL, 0, 0, 0, SY_THR_STATIC },		/* 149 = old quota */
 	{ compat(AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 150 = old getsockname */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 151 = sem_lock */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 152 = sem_wakeup */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 153 = asyncdaemon */
 	{ AS(nlm_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 154 = nlm_syscall */
 	{ AS(nfssvc_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 155 = nfssvc */
 	{ compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 156 = old getdirentries */
 	{ compat4(AS(freebsd4_statfs_args),statfs), AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 157 = freebsd4 statfs */
 	{ compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 158 = freebsd4 fstatfs */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 159 = nosys */
 	{ AS(lgetfh_args), (sy_call_t *)sys_lgetfh, AUE_LGETFH, NULL, 0, 0, 0, SY_THR_STATIC },	/* 160 = lgetfh */
 	{ AS(getfh_args), (sy_call_t *)sys_getfh, AUE_NFS_GETFH, NULL, 0, 0, 0, SY_THR_STATIC },	/* 161 = getfh */
 	{ compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 162 = freebsd4 getdomainname */
 	{ compat4(AS(freebsd4_setdomainname_args),setdomainname), AUE_SYSCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 163 = freebsd4 setdomainname */
 	{ compat4(AS(freebsd4_uname_args),uname), AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 164 = freebsd4 uname */
 	{ AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 165 = sysarch */
 	{ AS(rtprio_args), (sy_call_t *)sys_rtprio, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 166 = rtprio */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 167 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 168 = nosys */
 	{ AS(semsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 169 = semsys */
 	{ AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 170 = msgsys */
 	{ AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 171 = shmsys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 172 = nosys */
 	{ compat6(AS(freebsd6_pread_args),pread), AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 173 = freebsd6 pread */
 	{ compat6(AS(freebsd6_pwrite_args),pwrite), AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 174 = freebsd6 pwrite */
 	{ AS(setfib_args), (sy_call_t *)sys_setfib, AUE_SETFIB, NULL, 0, 0, 0, SY_THR_STATIC },	/* 175 = setfib */
 	{ AS(ntp_adjtime_args), (sy_call_t *)sys_ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 176 = ntp_adjtime */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 177 = sfork */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 178 = getdescriptor */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 179 = setdescriptor */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 180 = nosys */
 	{ AS(setgid_args), (sy_call_t *)sys_setgid, AUE_SETGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 181 = setgid */
 	{ AS(setegid_args), (sy_call_t *)sys_setegid, AUE_SETEGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 182 = setegid */
 	{ AS(seteuid_args), (sy_call_t *)sys_seteuid, AUE_SETEUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 183 = seteuid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 184 = lfs_bmapv */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 185 = lfs_markv */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 186 = lfs_segclean */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 187 = lfs_segwait */
 	{ AS(stat_args), (sy_call_t *)sys_stat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 188 = stat */
 	{ AS(fstat_args), (sy_call_t *)sys_fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 189 = fstat */
 	{ AS(lstat_args), (sy_call_t *)sys_lstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 190 = lstat */
 	{ AS(pathconf_args), (sy_call_t *)sys_pathconf, AUE_PATHCONF, NULL, 0, 0, 0, SY_THR_STATIC },	/* 191 = pathconf */
 	{ AS(fpathconf_args), (sy_call_t *)sys_fpathconf, AUE_FPATHCONF, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 192 = fpathconf */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 193 = nosys */
 	{ AS(__getrlimit_args), (sy_call_t *)sys_getrlimit, AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 194 = getrlimit */
 	{ AS(__setrlimit_args), (sy_call_t *)sys_setrlimit, AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 195 = setrlimit */
 	{ AS(getdirentries_args), (sy_call_t *)sys_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 196 = getdirentries */
 	{ compat6(AS(freebsd6_mmap_args),mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 197 = freebsd6 mmap */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },		/* 198 = __syscall */
 	{ compat6(AS(freebsd6_lseek_args),lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 199 = freebsd6 lseek */
 	{ compat6(AS(freebsd6_truncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 200 = freebsd6 truncate */
 	{ compat6(AS(freebsd6_ftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 201 = freebsd6 ftruncate */
 	{ AS(sysctl_args), (sy_call_t *)sys___sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 202 = __sysctl */
 	{ AS(mlock_args), (sy_call_t *)sys_mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 203 = mlock */
 	{ AS(munlock_args), (sy_call_t *)sys_munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 204 = munlock */
 	{ AS(undelete_args), (sy_call_t *)sys_undelete, AUE_UNDELETE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 205 = undelete */
 	{ AS(futimes_args), (sy_call_t *)sys_futimes, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 206 = futimes */
 	{ AS(getpgid_args), (sy_call_t *)sys_getpgid, AUE_GETPGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 207 = getpgid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 208 = newreboot */
 	{ AS(poll_args), (sy_call_t *)sys_poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 209 = poll */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 210 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 211 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 212 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 213 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 214 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 215 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 216 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 217 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 218 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 219 = lkmnosys */
 	{ 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },		/* 220 = freebsd7 __semctl */
 	{ AS(semget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 221 = semget */
 	{ AS(semop_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 222 = semop */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 223 = semconfig */
 	{ 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },		/* 224 = freebsd7 msgctl */
 	{ AS(msgget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 225 = msgget */
 	{ AS(msgsnd_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 226 = msgsnd */
 	{ AS(msgrcv_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 227 = msgrcv */
 	{ AS(shmat_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 228 = shmat */
 	{ 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },		/* 229 = freebsd7 shmctl */
 	{ AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 230 = shmdt */
 	{ AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 231 = shmget */
 	{ AS(clock_gettime_args), (sy_call_t *)sys_clock_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 232 = clock_gettime */
 	{ AS(clock_settime_args), (sy_call_t *)sys_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 233 = clock_settime */
 	{ AS(clock_getres_args), (sy_call_t *)sys_clock_getres, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 234 = clock_getres */
 	{ AS(ktimer_create_args), (sy_call_t *)sys_ktimer_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 235 = ktimer_create */
 	{ AS(ktimer_delete_args), (sy_call_t *)sys_ktimer_delete, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 236 = ktimer_delete */
 	{ AS(ktimer_settime_args), (sy_call_t *)sys_ktimer_settime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 237 = ktimer_settime */
 	{ AS(ktimer_gettime_args), (sy_call_t *)sys_ktimer_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 238 = ktimer_gettime */
 	{ AS(ktimer_getoverrun_args), (sy_call_t *)sys_ktimer_getoverrun, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 239 = ktimer_getoverrun */
 	{ AS(nanosleep_args), (sy_call_t *)sys_nanosleep, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 240 = nanosleep */
 	{ AS(ffclock_getcounter_args), (sy_call_t *)sys_ffclock_getcounter, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 241 = ffclock_getcounter */
 	{ AS(ffclock_setestimate_args), (sy_call_t *)sys_ffclock_setestimate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 242 = ffclock_setestimate */
 	{ AS(ffclock_getestimate_args), (sy_call_t *)sys_ffclock_getestimate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 243 = ffclock_getestimate */
 	{ AS(clock_nanosleep_args), (sy_call_t *)sys_clock_nanosleep, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 244 = clock_nanosleep */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 245 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 246 = nosys */
 	{ AS(clock_getcpuclockid2_args), (sy_call_t *)sys_clock_getcpuclockid2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 247 = clock_getcpuclockid2 */
 	{ AS(ntp_gettime_args), (sy_call_t *)sys_ntp_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 248 = ntp_gettime */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 249 = nosys */
 	{ AS(minherit_args), (sy_call_t *)sys_minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 250 = minherit */
 	{ AS(rfork_args), (sy_call_t *)sys_rfork, AUE_RFORK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 251 = rfork */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 252 = obsolete openbsd_poll */
 	{ 0, (sy_call_t *)sys_issetugid, AUE_ISSETUGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 253 = issetugid */
 	{ AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 254 = lchown */
 	{ AS(aio_read_args), (sy_call_t *)sys_aio_read, AUE_AIO_READ, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 255 = aio_read */
 	{ AS(aio_write_args), (sy_call_t *)sys_aio_write, AUE_AIO_WRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 256 = aio_write */
 	{ AS(lio_listio_args), (sy_call_t *)sys_lio_listio, AUE_LIO_LISTIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 257 = lio_listio */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 258 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 259 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 260 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 261 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 262 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 263 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 264 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 265 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 266 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 267 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 268 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 269 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 270 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 271 = nosys */
 	{ AS(getdents_args), (sy_call_t *)sys_getdents, AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 272 = getdents */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 273 = nosys */
 	{ AS(lchmod_args), (sy_call_t *)sys_lchmod, AUE_LCHMOD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 274 = lchmod */
 	{ AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 275 = netbsd_lchown */
 	{ AS(lutimes_args), (sy_call_t *)sys_lutimes, AUE_LUTIMES, NULL, 0, 0, 0, SY_THR_STATIC },	/* 276 = lutimes */
 	{ AS(msync_args), (sy_call_t *)sys_msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 277 = netbsd_msync */
 	{ AS(nstat_args), (sy_call_t *)sys_nstat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 278 = nstat */
 	{ AS(nfstat_args), (sy_call_t *)sys_nfstat, AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 279 = nfstat */
 	{ AS(nlstat_args), (sy_call_t *)sys_nlstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 280 = nlstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 281 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 282 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 283 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 284 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 285 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 286 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 287 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 288 = nosys */
 	{ AS(preadv_args), (sy_call_t *)sys_preadv, AUE_PREADV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 289 = preadv */
 	{ AS(pwritev_args), (sy_call_t *)sys_pwritev, AUE_PWRITEV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 290 = pwritev */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 291 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 292 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 293 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 294 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 295 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 296 = nosys */
 	{ compat4(AS(freebsd4_fhstatfs_args),fhstatfs), AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 297 = freebsd4 fhstatfs */
 	{ AS(fhopen_args), (sy_call_t *)sys_fhopen, AUE_FHOPEN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 298 = fhopen */
 	{ AS(fhstat_args), (sy_call_t *)sys_fhstat, AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 299 = fhstat */
 	{ AS(modnext_args), (sy_call_t *)sys_modnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 300 = modnext */
 	{ AS(modstat_args), (sy_call_t *)sys_modstat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 301 = modstat */
 	{ AS(modfnext_args), (sy_call_t *)sys_modfnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 302 = modfnext */
 	{ AS(modfind_args), (sy_call_t *)sys_modfind, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 303 = modfind */
 	{ AS(kldload_args), (sy_call_t *)sys_kldload, AUE_MODLOAD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 304 = kldload */
 	{ AS(kldunload_args), (sy_call_t *)sys_kldunload, AUE_MODUNLOAD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 305 = kldunload */
 	{ AS(kldfind_args), (sy_call_t *)sys_kldfind, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 306 = kldfind */
 	{ AS(kldnext_args), (sy_call_t *)sys_kldnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 307 = kldnext */
 	{ AS(kldstat_args), (sy_call_t *)sys_kldstat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 308 = kldstat */
 	{ AS(kldfirstmod_args), (sy_call_t *)sys_kldfirstmod, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 309 = kldfirstmod */
 	{ AS(getsid_args), (sy_call_t *)sys_getsid, AUE_GETSID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 310 = getsid */
 	{ AS(setresuid_args), (sy_call_t *)sys_setresuid, AUE_SETRESUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 311 = setresuid */
 	{ AS(setresgid_args), (sy_call_t *)sys_setresgid, AUE_SETRESGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 312 = setresgid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 313 = obsolete signanosleep */
 	{ AS(aio_return_args), (sy_call_t *)sys_aio_return, AUE_AIO_RETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 314 = aio_return */
 	{ AS(aio_suspend_args), (sy_call_t *)sys_aio_suspend, AUE_AIO_SUSPEND, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 315 = aio_suspend */
 	{ AS(aio_cancel_args), (sy_call_t *)sys_aio_cancel, AUE_AIO_CANCEL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 316 = aio_cancel */
 	{ AS(aio_error_args), (sy_call_t *)sys_aio_error, AUE_AIO_ERROR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 317 = aio_error */
 	{ compat6(AS(freebsd6_aio_read_args),aio_read), AUE_AIO_READ, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 318 = freebsd6 aio_read */
 	{ compat6(AS(freebsd6_aio_write_args),aio_write), AUE_AIO_WRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 319 = freebsd6 aio_write */
 	{ compat6(AS(freebsd6_lio_listio_args),lio_listio), AUE_LIO_LISTIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 320 = freebsd6 lio_listio */
 	{ 0, (sy_call_t *)sys_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 321 = yield */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 322 = obsolete thr_sleep */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 323 = obsolete thr_wakeup */
 	{ AS(mlockall_args), (sy_call_t *)sys_mlockall, AUE_MLOCKALL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 324 = mlockall */
 	{ 0, (sy_call_t *)sys_munlockall, AUE_MUNLOCKALL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 325 = munlockall */
 	{ AS(__getcwd_args), (sy_call_t *)sys___getcwd, AUE_GETCWD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 326 = __getcwd */
 	{ AS(sched_setparam_args), (sy_call_t *)sys_sched_setparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 327 = sched_setparam */
 	{ AS(sched_getparam_args), (sy_call_t *)sys_sched_getparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 328 = sched_getparam */
 	{ AS(sched_setscheduler_args), (sy_call_t *)sys_sched_setscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 329 = sched_setscheduler */
 	{ AS(sched_getscheduler_args), (sy_call_t *)sys_sched_getscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 330 = sched_getscheduler */
 	{ 0, (sy_call_t *)sys_sched_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 331 = sched_yield */
 	{ AS(sched_get_priority_max_args), (sy_call_t *)sys_sched_get_priority_max, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 332 = sched_get_priority_max */
 	{ AS(sched_get_priority_min_args), (sy_call_t *)sys_sched_get_priority_min, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 333 = sched_get_priority_min */
 	{ AS(sched_rr_get_interval_args), (sy_call_t *)sys_sched_rr_get_interval, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 334 = sched_rr_get_interval */
 	{ AS(utrace_args), (sy_call_t *)sys_utrace, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 335 = utrace */
 	{ compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 336 = freebsd4 sendfile */
 	{ AS(kldsym_args), (sy_call_t *)sys_kldsym, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 337 = kldsym */
 	{ AS(jail_args), (sy_call_t *)sys_jail, AUE_JAIL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 338 = jail */
 	{ AS(nnpfs_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 339 = nnpfs_syscall */
 	{ AS(sigprocmask_args), (sy_call_t *)sys_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 340 = sigprocmask */
 	{ AS(sigsuspend_args), (sy_call_t *)sys_sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 341 = sigsuspend */
 	{ compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 342 = freebsd4 sigaction */
 	{ AS(sigpending_args), (sy_call_t *)sys_sigpending, AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 343 = sigpending */
 	{ compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 344 = freebsd4 sigreturn */
 	{ AS(sigtimedwait_args), (sy_call_t *)sys_sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 345 = sigtimedwait */
 	{ AS(sigwaitinfo_args), (sy_call_t *)sys_sigwaitinfo, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 346 = sigwaitinfo */
 	{ AS(__acl_get_file_args), (sy_call_t *)sys___acl_get_file, AUE_ACL_GET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 347 = __acl_get_file */
 	{ AS(__acl_set_file_args), (sy_call_t *)sys___acl_set_file, AUE_ACL_SET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 348 = __acl_set_file */
 	{ AS(__acl_get_fd_args), (sy_call_t *)sys___acl_get_fd, AUE_ACL_GET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 349 = __acl_get_fd */
 	{ AS(__acl_set_fd_args), (sy_call_t *)sys___acl_set_fd, AUE_ACL_SET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 350 = __acl_set_fd */
 	{ AS(__acl_delete_file_args), (sy_call_t *)sys___acl_delete_file, AUE_ACL_DELETE_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 351 = __acl_delete_file */
 	{ AS(__acl_delete_fd_args), (sy_call_t *)sys___acl_delete_fd, AUE_ACL_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 352 = __acl_delete_fd */
 	{ AS(__acl_aclcheck_file_args), (sy_call_t *)sys___acl_aclcheck_file, AUE_ACL_CHECK_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 353 = __acl_aclcheck_file */
 	{ AS(__acl_aclcheck_fd_args), (sy_call_t *)sys___acl_aclcheck_fd, AUE_ACL_CHECK_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 354 = __acl_aclcheck_fd */
 	{ AS(extattrctl_args), (sy_call_t *)sys_extattrctl, AUE_EXTATTRCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 355 = extattrctl */
 	{ AS(extattr_set_file_args), (sy_call_t *)sys_extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 356 = extattr_set_file */
 	{ AS(extattr_get_file_args), (sy_call_t *)sys_extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 357 = extattr_get_file */
 	{ AS(extattr_delete_file_args), (sy_call_t *)sys_extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 358 = extattr_delete_file */
 	{ AS(aio_waitcomplete_args), (sy_call_t *)sys_aio_waitcomplete, AUE_AIO_WAITCOMPLETE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 359 = aio_waitcomplete */
 	{ AS(getresuid_args), (sy_call_t *)sys_getresuid, AUE_GETRESUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 360 = getresuid */
 	{ AS(getresgid_args), (sy_call_t *)sys_getresgid, AUE_GETRESGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 361 = getresgid */
 	{ 0, (sy_call_t *)sys_kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 362 = kqueue */
 	{ AS(kevent_args), (sy_call_t *)sys_kevent, AUE_KEVENT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 363 = kevent */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 364 = __cap_get_proc */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 365 = __cap_set_proc */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 366 = __cap_get_fd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 367 = __cap_get_file */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 368 = __cap_set_fd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 369 = __cap_set_file */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 370 = nosys */
 	{ AS(extattr_set_fd_args), (sy_call_t *)sys_extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 371 = extattr_set_fd */
 	{ AS(extattr_get_fd_args), (sy_call_t *)sys_extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 372 = extattr_get_fd */
 	{ AS(extattr_delete_fd_args), (sy_call_t *)sys_extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 373 = extattr_delete_fd */
 	{ AS(__setugid_args), (sy_call_t *)sys___setugid, AUE_SETUGID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 374 = __setugid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 375 = nfsclnt */
 	{ AS(eaccess_args), (sy_call_t *)sys_eaccess, AUE_EACCESS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 376 = eaccess */
 	{ AS(afs3_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 377 = afs3_syscall */
 	{ AS(nmount_args), (sy_call_t *)sys_nmount, AUE_NMOUNT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 378 = nmount */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 379 = kse_exit */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 380 = kse_wakeup */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 381 = kse_create */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 382 = kse_thr_interrupt */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 383 = kse_release */
 	{ AS(__mac_get_proc_args), (sy_call_t *)sys___mac_get_proc, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 384 = __mac_get_proc */
 	{ AS(__mac_set_proc_args), (sy_call_t *)sys___mac_set_proc, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 385 = __mac_set_proc */
 	{ AS(__mac_get_fd_args), (sy_call_t *)sys___mac_get_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 386 = __mac_get_fd */
 	{ AS(__mac_get_file_args), (sy_call_t *)sys___mac_get_file, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 387 = __mac_get_file */
 	{ AS(__mac_set_fd_args), (sy_call_t *)sys___mac_set_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 388 = __mac_set_fd */
 	{ AS(__mac_set_file_args), (sy_call_t *)sys___mac_set_file, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 389 = __mac_set_file */
 	{ AS(kenv_args), (sy_call_t *)sys_kenv, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 390 = kenv */
 	{ AS(lchflags_args), (sy_call_t *)sys_lchflags, AUE_LCHFLAGS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 391 = lchflags */
 	{ AS(uuidgen_args), (sy_call_t *)sys_uuidgen, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 392 = uuidgen */
 	{ AS(sendfile_args), (sy_call_t *)sys_sendfile, AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 393 = sendfile */
 	{ AS(mac_syscall_args), (sy_call_t *)sys_mac_syscall, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 394 = mac_syscall */
 	{ AS(getfsstat_args), (sy_call_t *)sys_getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 395 = getfsstat */
 	{ AS(statfs_args), (sy_call_t *)sys_statfs, AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 396 = statfs */
 	{ AS(fstatfs_args), (sy_call_t *)sys_fstatfs, AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 397 = fstatfs */
 	{ AS(fhstatfs_args), (sy_call_t *)sys_fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 398 = fhstatfs */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 399 = nosys */
 	{ AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 400 = ksem_close */
 	{ AS(ksem_post_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 401 = ksem_post */
 	{ AS(ksem_wait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 402 = ksem_wait */
 	{ AS(ksem_trywait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 403 = ksem_trywait */
 	{ AS(ksem_init_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 404 = ksem_init */
 	{ AS(ksem_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 405 = ksem_open */
 	{ AS(ksem_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 406 = ksem_unlink */
 	{ AS(ksem_getvalue_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 407 = ksem_getvalue */
 	{ AS(ksem_destroy_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 408 = ksem_destroy */
 	{ AS(__mac_get_pid_args), (sy_call_t *)sys___mac_get_pid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 409 = __mac_get_pid */
 	{ AS(__mac_get_link_args), (sy_call_t *)sys___mac_get_link, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 410 = __mac_get_link */
 	{ AS(__mac_set_link_args), (sy_call_t *)sys___mac_set_link, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 411 = __mac_set_link */
 	{ AS(extattr_set_link_args), (sy_call_t *)sys_extattr_set_link, AUE_EXTATTR_SET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 412 = extattr_set_link */
 	{ AS(extattr_get_link_args), (sy_call_t *)sys_extattr_get_link, AUE_EXTATTR_GET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 413 = extattr_get_link */
 	{ AS(extattr_delete_link_args), (sy_call_t *)sys_extattr_delete_link, AUE_EXTATTR_DELETE_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 414 = extattr_delete_link */
 	{ AS(__mac_execve_args), (sy_call_t *)sys___mac_execve, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 415 = __mac_execve */
 	{ AS(sigaction_args), (sy_call_t *)sys_sigaction, AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 416 = sigaction */
 	{ AS(sigreturn_args), (sy_call_t *)sys_sigreturn, AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 417 = sigreturn */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 418 = __xstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 419 = __xfstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 420 = __xlstat */
 	{ AS(getcontext_args), (sy_call_t *)sys_getcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 421 = getcontext */
 	{ AS(setcontext_args), (sy_call_t *)sys_setcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 422 = setcontext */
 	{ AS(swapcontext_args), (sy_call_t *)sys_swapcontext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 423 = swapcontext */
 	{ AS(swapoff_args), (sy_call_t *)sys_swapoff, AUE_SWAPOFF, NULL, 0, 0, 0, SY_THR_STATIC },	/* 424 = swapoff */
 	{ AS(__acl_get_link_args), (sy_call_t *)sys___acl_get_link, AUE_ACL_GET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 425 = __acl_get_link */
 	{ AS(__acl_set_link_args), (sy_call_t *)sys___acl_set_link, AUE_ACL_SET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 426 = __acl_set_link */
 	{ AS(__acl_delete_link_args), (sy_call_t *)sys___acl_delete_link, AUE_ACL_DELETE_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 427 = __acl_delete_link */
 	{ AS(__acl_aclcheck_link_args), (sy_call_t *)sys___acl_aclcheck_link, AUE_ACL_CHECK_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 428 = __acl_aclcheck_link */
 	{ AS(sigwait_args), (sy_call_t *)sys_sigwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 429 = sigwait */
 	{ AS(thr_create_args), (sy_call_t *)sys_thr_create, AUE_THR_CREATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 430 = thr_create */
 	{ AS(thr_exit_args), (sy_call_t *)sys_thr_exit, AUE_THR_EXIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 431 = thr_exit */
 	{ AS(thr_self_args), (sy_call_t *)sys_thr_self, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 432 = thr_self */
 	{ AS(thr_kill_args), (sy_call_t *)sys_thr_kill, AUE_THR_KILL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 433 = thr_kill */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 434 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 435 = nosys */
 	{ AS(jail_attach_args), (sy_call_t *)sys_jail_attach, AUE_JAIL_ATTACH, NULL, 0, 0, 0, SY_THR_STATIC },	/* 436 = jail_attach */
 	{ AS(extattr_list_fd_args), (sy_call_t *)sys_extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 437 = extattr_list_fd */
 	{ AS(extattr_list_file_args), (sy_call_t *)sys_extattr_list_file, AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 438 = extattr_list_file */
 	{ AS(extattr_list_link_args), (sy_call_t *)sys_extattr_list_link, AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 439 = extattr_list_link */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 440 = kse_switchin */
 	{ AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 441 = ksem_timedwait */
 	{ AS(thr_suspend_args), (sy_call_t *)sys_thr_suspend, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 442 = thr_suspend */
 	{ AS(thr_wake_args), (sy_call_t *)sys_thr_wake, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 443 = thr_wake */
 	{ AS(kldunloadf_args), (sy_call_t *)sys_kldunloadf, AUE_MODUNLOAD, NULL, 0, 0, 0, SY_THR_STATIC },	/* 444 = kldunloadf */
 	{ AS(audit_args), (sy_call_t *)sys_audit, AUE_AUDIT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 445 = audit */
 	{ AS(auditon_args), (sy_call_t *)sys_auditon, AUE_AUDITON, NULL, 0, 0, 0, SY_THR_STATIC },	/* 446 = auditon */
 	{ AS(getauid_args), (sy_call_t *)sys_getauid, AUE_GETAUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 447 = getauid */
 	{ AS(setauid_args), (sy_call_t *)sys_setauid, AUE_SETAUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 448 = setauid */
 	{ AS(getaudit_args), (sy_call_t *)sys_getaudit, AUE_GETAUDIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 449 = getaudit */
 	{ AS(setaudit_args), (sy_call_t *)sys_setaudit, AUE_SETAUDIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 450 = setaudit */
 	{ AS(getaudit_addr_args), (sy_call_t *)sys_getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 451 = getaudit_addr */
 	{ AS(setaudit_addr_args), (sy_call_t *)sys_setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 452 = setaudit_addr */
 	{ AS(auditctl_args), (sy_call_t *)sys_auditctl, AUE_AUDITCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 453 = auditctl */
 	{ AS(_umtx_op_args), (sy_call_t *)sys__umtx_op, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 454 = _umtx_op */
 	{ AS(thr_new_args), (sy_call_t *)sys_thr_new, AUE_THR_NEW, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 455 = thr_new */
 	{ AS(sigqueue_args), (sy_call_t *)sys_sigqueue, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 456 = sigqueue */
 	{ AS(kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 457 = kmq_open */
 	{ AS(kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 458 = kmq_setattr */
 	{ AS(kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 459 = kmq_timedreceive */
 	{ AS(kmq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 460 = kmq_timedsend */
 	{ AS(kmq_notify_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 461 = kmq_notify */
 	{ AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 462 = kmq_unlink */
 	{ AS(abort2_args), (sy_call_t *)sys_abort2, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 463 = abort2 */
 	{ AS(thr_set_name_args), (sy_call_t *)sys_thr_set_name, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 464 = thr_set_name */
 	{ AS(aio_fsync_args), (sy_call_t *)sys_aio_fsync, AUE_AIO_FSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 465 = aio_fsync */
 	{ AS(rtprio_thread_args), (sy_call_t *)sys_rtprio_thread, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 466 = rtprio_thread */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 467 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 468 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 469 = __getpath_fromfd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 470 = __getpath_fromaddr */
 	{ AS(sctp_peeloff_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 471 = sctp_peeloff */
 	{ AS(sctp_generic_sendmsg_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 472 = sctp_generic_sendmsg */
 	{ AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 473 = sctp_generic_sendmsg_iov */
 	{ AS(sctp_generic_recvmsg_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },	/* 474 = sctp_generic_recvmsg */
 	{ AS(pread_args), (sy_call_t *)sys_pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 475 = pread */
 	{ AS(pwrite_args), (sy_call_t *)sys_pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 476 = pwrite */
 	{ AS(mmap_args), (sy_call_t *)sys_mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 477 = mmap */
 	{ AS(lseek_args), (sy_call_t *)sys_lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 478 = lseek */
 	{ AS(truncate_args), (sy_call_t *)sys_truncate, AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 479 = truncate */
 	{ AS(ftruncate_args), (sy_call_t *)sys_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 480 = ftruncate */
 	{ AS(thr_kill2_args), (sy_call_t *)sys_thr_kill2, AUE_THR_KILL2, NULL, 0, 0, 0, SY_THR_STATIC },	/* 481 = thr_kill2 */
 	{ AS(shm_open_args), (sy_call_t *)sys_shm_open, AUE_SHMOPEN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 482 = shm_open */
 	{ AS(shm_unlink_args), (sy_call_t *)sys_shm_unlink, AUE_SHMUNLINK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 483 = shm_unlink */
 	{ AS(cpuset_args), (sy_call_t *)sys_cpuset, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 484 = cpuset */
 	{ AS(cpuset_setid_args), (sy_call_t *)sys_cpuset_setid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 485 = cpuset_setid */
 	{ AS(cpuset_getid_args), (sy_call_t *)sys_cpuset_getid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 486 = cpuset_getid */
 	{ AS(cpuset_getaffinity_args), (sy_call_t *)sys_cpuset_getaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 487 = cpuset_getaffinity */
 	{ AS(cpuset_setaffinity_args), (sy_call_t *)sys_cpuset_setaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 488 = cpuset_setaffinity */
 	{ AS(faccessat_args), (sy_call_t *)sys_faccessat, AUE_FACCESSAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 489 = faccessat */
 	{ AS(fchmodat_args), (sy_call_t *)sys_fchmodat, AUE_FCHMODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 490 = fchmodat */
 	{ AS(fchownat_args), (sy_call_t *)sys_fchownat, AUE_FCHOWNAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 491 = fchownat */
 	{ AS(fexecve_args), (sy_call_t *)sys_fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 492 = fexecve */
 	{ AS(fstatat_args), (sy_call_t *)sys_fstatat, AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 493 = fstatat */
 	{ AS(futimesat_args), (sy_call_t *)sys_futimesat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 494 = futimesat */
 	{ AS(linkat_args), (sy_call_t *)sys_linkat, AUE_LINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 495 = linkat */
 	{ AS(mkdirat_args), (sy_call_t *)sys_mkdirat, AUE_MKDIRAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 496 = mkdirat */
 	{ AS(mkfifoat_args), (sy_call_t *)sys_mkfifoat, AUE_MKFIFOAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 497 = mkfifoat */
 	{ AS(mknodat_args), (sy_call_t *)sys_mknodat, AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 498 = mknodat */
 	{ AS(openat_args), (sy_call_t *)sys_openat, AUE_OPENAT_RWTC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 499 = openat */
 	{ AS(readlinkat_args), (sy_call_t *)sys_readlinkat, AUE_READLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 500 = readlinkat */
 	{ AS(renameat_args), (sy_call_t *)sys_renameat, AUE_RENAMEAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 501 = renameat */
 	{ AS(symlinkat_args), (sy_call_t *)sys_symlinkat, AUE_SYMLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 502 = symlinkat */
 	{ AS(unlinkat_args), (sy_call_t *)sys_unlinkat, AUE_UNLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 503 = unlinkat */
 	{ AS(posix_openpt_args), (sy_call_t *)sys_posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 504 = posix_openpt */
 	{ AS(gssd_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 505 = gssd_syscall */
 	{ AS(jail_get_args), (sy_call_t *)sys_jail_get, AUE_JAIL_GET, NULL, 0, 0, 0, SY_THR_STATIC },	/* 506 = jail_get */
 	{ AS(jail_set_args), (sy_call_t *)sys_jail_set, AUE_JAIL_SET, NULL, 0, 0, 0, SY_THR_STATIC },	/* 507 = jail_set */
 	{ AS(jail_remove_args), (sy_call_t *)sys_jail_remove, AUE_JAIL_REMOVE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 508 = jail_remove */
 	{ AS(closefrom_args), (sy_call_t *)sys_closefrom, AUE_CLOSEFROM, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 509 = closefrom */
 	{ AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 510 = __semctl */
 	{ AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 511 = msgctl */
 	{ AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },	/* 512 = shmctl */
 	{ AS(lpathconf_args), (sy_call_t *)sys_lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0, SY_THR_STATIC },	/* 513 = lpathconf */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 514 = obsolete cap_new */
 	{ AS(__cap_rights_get_args), (sy_call_t *)sys___cap_rights_get, AUE_CAP_RIGHTS_GET, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 515 = __cap_rights_get */
 	{ 0, (sy_call_t *)sys_cap_enter, AUE_CAP_ENTER, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 516 = cap_enter */
 	{ AS(cap_getmode_args), (sy_call_t *)sys_cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 517 = cap_getmode */
 	{ AS(pdfork_args), (sy_call_t *)sys_pdfork, AUE_PDFORK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 518 = pdfork */
 	{ AS(pdkill_args), (sy_call_t *)sys_pdkill, AUE_PDKILL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 519 = pdkill */
 	{ AS(pdgetpid_args), (sy_call_t *)sys_pdgetpid, AUE_PDGETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 520 = pdgetpid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 521 = pdwait4 */
 	{ AS(pselect_args), (sy_call_t *)sys_pselect, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 522 = pselect */
 	{ AS(getloginclass_args), (sy_call_t *)sys_getloginclass, AUE_GETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 523 = getloginclass */
 	{ AS(setloginclass_args), (sy_call_t *)sys_setloginclass, AUE_SETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC },	/* 524 = setloginclass */
 	{ AS(rctl_get_racct_args), (sy_call_t *)sys_rctl_get_racct, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 525 = rctl_get_racct */
 	{ AS(rctl_get_rules_args), (sy_call_t *)sys_rctl_get_rules, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 526 = rctl_get_rules */
 	{ AS(rctl_get_limits_args), (sy_call_t *)sys_rctl_get_limits, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 527 = rctl_get_limits */
 	{ AS(rctl_add_rule_args), (sy_call_t *)sys_rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 528 = rctl_add_rule */
 	{ AS(rctl_remove_rule_args), (sy_call_t *)sys_rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 529 = rctl_remove_rule */
 	{ AS(posix_fallocate_args), (sy_call_t *)sys_posix_fallocate, AUE_POSIX_FALLOCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 530 = posix_fallocate */
 	{ AS(posix_fadvise_args), (sy_call_t *)sys_posix_fadvise, AUE_POSIX_FADVISE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 531 = posix_fadvise */
 	{ AS(wait6_args), (sy_call_t *)sys_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC },	/* 532 = wait6 */
 	{ AS(cap_rights_limit_args), (sy_call_t *)sys_cap_rights_limit, AUE_CAP_RIGHTS_LIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 533 = cap_rights_limit */
 	{ AS(cap_ioctls_limit_args), (sy_call_t *)sys_cap_ioctls_limit, AUE_CAP_IOCTLS_LIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 534 = cap_ioctls_limit */
 	{ AS(cap_ioctls_get_args), (sy_call_t *)sys_cap_ioctls_get, AUE_CAP_IOCTLS_GET, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 535 = cap_ioctls_get */
 	{ AS(cap_fcntls_limit_args), (sy_call_t *)sys_cap_fcntls_limit, AUE_CAP_FCNTLS_LIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 536 = cap_fcntls_limit */
 	{ AS(cap_fcntls_get_args), (sy_call_t *)sys_cap_fcntls_get, AUE_CAP_FCNTLS_GET, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 537 = cap_fcntls_get */
 	{ AS(bindat_args), (sy_call_t *)sys_bindat, AUE_BINDAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 538 = bindat */
 	{ AS(connectat_args), (sy_call_t *)sys_connectat, AUE_CONNECTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 539 = connectat */
 	{ AS(chflagsat_args), (sy_call_t *)sys_chflagsat, AUE_CHFLAGSAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 540 = chflagsat */
 	{ AS(accept4_args), (sy_call_t *)sys_accept4, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 541 = accept4 */
 	{ AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 542 = pipe2 */
 	{ AS(aio_mlock_args), (sy_call_t *)sys_aio_mlock, AUE_AIO_MLOCK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 543 = aio_mlock */
 	{ AS(procctl_args), (sy_call_t *)sys_procctl, AUE_PROCCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 544 = procctl */
 	{ AS(ppoll_args), (sy_call_t *)sys_ppoll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 545 = ppoll */
 	{ AS(futimens_args), (sy_call_t *)sys_futimens, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 546 = futimens */
 	{ AS(utimensat_args), (sy_call_t *)sys_utimensat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 547 = utimensat */
 	{ AS(numa_getaffinity_args), (sy_call_t *)sys_numa_getaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 548 = numa_getaffinity */
 	{ AS(numa_setaffinity_args), (sy_call_t *)sys_numa_setaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 549 = numa_setaffinity */
 	{ AS(fdatasync_args), (sy_call_t *)sys_fdatasync, AUE_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC },	/* 550 = fdatasync */
 };
Index: projects/clang500-import/sys/mips/atheros/ar71xx_machdep.c
===================================================================
--- projects/clang500-import/sys/mips/atheros/ar71xx_machdep.c	(revision 318657)
+++ projects/clang500-import/sys/mips/atheros/ar71xx_machdep.c	(revision 318658)
@@ -1,482 +1,482 @@
 /*-
  * Copyright (c) 2009 Oleksandr Tymoshenko
  * 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.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_ar71xx.h"
 
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cons.h>
 #include <sys/kdb.h>
 #include <sys/reboot.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 
 #include <net/ethernet.h>
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/cpuregs.h>
 #include <machine/hwfunc.h>
 #include <machine/md_var.h>
 #include <machine/trap.h>
 #include <machine/vmparam.h>
 
 #include <mips/atheros/ar71xxreg.h>
 
 #include <mips/atheros/ar71xx_setup.h>
 #include <mips/atheros/ar71xx_cpudef.h>
 #include <mips/atheros/ar71xx_macaddr.h>
 
 extern char edata[], end[];
 
 /* 4KB static data aread to keep a copy of the bootload env until
    the dynamic kenv is setup */
 char boot1_env[4096];
 
 /*
  * We get a string in from Redboot with the all the arguments together,
  * "foo=bar bar=baz". Split them up and save in kenv.
  */
 static void
 parse_argv(char *str)
 {
 	char *n, *v;
 
 	while ((v = strsep(&str, " ")) != NULL) {
 		if (*v == '\0')
 			continue;
 		if (*v == '-') {
 			while (*v != '\0') {
 				v++;
 				switch (*v) {
 				case 'a': boothowto |= RB_ASKNAME; break;
 				case 'd': boothowto |= RB_KDB; break;
 				case 'g': boothowto |= RB_GDB; break;
 				case 's': boothowto |= RB_SINGLE; break;
 				case 'v': boothowto |= RB_VERBOSE; break;
 				}
 			}
 		} else {
 			n = strsep(&v, "=");
 			if (v == NULL)
 				kern_setenv(n, "1");
 			else
 				kern_setenv(n, v);
 		}
 	}
 }
 
 void
 platform_cpu_init()
 {
 	/* Nothing special */
 }
 
 void
 platform_reset(void)
 {
 	ar71xx_device_stop(RST_RESET_FULL_CHIP);
 	/* Wait for reset */
 	while(1)
 		;
 }
 
 /*
  * Obtain the MAC address via the Redboot environment.
  */
 static int
 ar71xx_redboot_get_macaddr(void)
 {
 	char *var;
 	int count = 0, i;
 	uint32_t macaddr[ETHER_ADDR_LEN];
 	uint8_t tmpmac[ETHER_ADDR_LEN];
 
 	/*
 	 * "ethaddr" is passed via envp on RedBoot platforms
 	 * "kmac" is passed via argv on RouterBOOT platforms
 	 */
 	if ((var = kern_getenv("ethaddr")) != NULL ||
 	    (var = kern_getenv("kmac")) != NULL) {
 		count = sscanf(var, "%x%*c%x%*c%x%*c%x%*c%x%*c%x",
 		    &macaddr[0], &macaddr[1],
 		    &macaddr[2], &macaddr[3],
 		    &macaddr[4], &macaddr[5]);
 
 		if (count < 6) {
 			memset(macaddr, 0,
 			    sizeof(macaddr));
 		} else {
 			for (i = 0; i < ETHER_ADDR_LEN; i++)
 				tmpmac[i] = macaddr[i] & 0xff;
 			(void) ar71xx_mac_addr_init(ar71xx_board_mac_addr,
 			    tmpmac,
 			    0, /* offset */
 			    0); /* is_local */
 		}
 		freeenv(var);
 		return (0);
 	}
 	return (-1);
 }
 
 #ifdef	AR71XX_ENV_ROUTERBOOT
 /*
  * RouterBoot gives us the board memory in a command line argument.
  */
 static int
 ar71xx_routerboot_get_mem(int argc, char **argv)
 {
 	int i, board_mem;
 
 	/*
 	 * Protect ourselves from garbage in registers.
 	 */
 	if (!MIPS_IS_VALID_PTR(argv))
 		return (0);
 
 	for (i = 0; i < argc; i++) {
 		if (argv[i] == NULL)
 			continue;
 		if (strncmp(argv[i], "mem=", 4) == 0) {
 			if (sscanf(argv[i] + 4, "%dM", &board_mem) == 1)
 				return (btoc(board_mem * 1024 * 1024));
 		}
 	}
 
 	return (0);
 }
 #endif
 
 /*
  * Handle initialising the MAC address from a specific EEPROM
  * offset.
  *
  * This is done during (very) early boot.
  *
  * hint.ar71xx.0.eeprom_mac_addr=<address to read from>
  * hint.ar71xx.0.eeprom_mac_isascii=<0|1>
  */
 static int
 ar71xx_platform_read_eeprom_mac(void)
 {
 	long eeprom_mac_addr = 0;
 	const char *mac;
 	int i, readascii = 0;
 	uint8_t macaddr[ETHER_ADDR_LEN];
 
 	if (resource_long_value("ar71xx", 0, "eeprom_mac_addr",
 	    &eeprom_mac_addr) != 0)
 		return (-1);
 
 	/* get a pointer to the EEPROM MAC address */
 
 	mac = (const char *) MIPS_PHYS_TO_KSEG1(eeprom_mac_addr);
 
 	/* Check if it's ASCII or not */
 	if (resource_int_value("ar71xx", 0, "eeprom_mac_isascii",
 	    &readascii) == 0 && readascii == 1) {
 		printf("ar71xx: Overriding MAC from EEPROM (ascii)\n");
 		for (i = 0; i < 6; i++) {
 			macaddr[i] = strtol(&(mac[i*3]), NULL, 16);
 		}
 	} else {
 		printf("ar71xx: Overriding MAC from EEPROM\n");
 		for (i = 0; i < 6; i++) {
 			macaddr[i] = mac[i];
 		}
 	}
 
 	/* Set the default board MAC */
 	(void) ar71xx_mac_addr_init(ar71xx_board_mac_addr,
 	    macaddr,
 	    0, /* offset */
 	    0); /* is_local */
 	printf("ar71xx: Board MAC: %6D\n", ar71xx_board_mac_addr, ":");
 	return (0);
 }
 
 /*
  * Populate a kenv hint for the given device based on the given
  * MAC address and offset.
  *
  * Returns 0 if ok, < 0 on error.
  */
 static int
 ar71xx_platform_set_mac_hint(const char *dev, int unit,
     const uint8_t *macaddr, int offset, int islocal)
 {
 	char macstr[32];
 	uint8_t lclmac[ETHER_ADDR_LEN];
 	char devstr[32];
 
 	/* Initialise the MAC address, plus/minus the offset */
 	if (ar71xx_mac_addr_init(lclmac, macaddr, offset, islocal) != 0) {
 		return (-1);
 	}
 
 	/* Turn it into a string */
 	snprintf(macstr, 32, "%6D", lclmac, ":");
 	snprintf(devstr, 32, "hint.%s.%d.macaddr", dev, unit);
 
 	printf("  %s => %s\n", devstr, macstr);
 
 	/* Call setenv */
 	if (kern_setenv(devstr, macstr) != 0) {
 		printf("%s: failed to set hint (%s => %s)\n",
 		    __func__,
 		    devstr,
 		    macstr);
 		return (-1);
 	}
 
 	return (0);
 }
 
 /*
  * Iterate through the list of boot time hints that populate
  * a device MAC address hint based on the "board" MAC address.
  *
  * ar71xx_mac_map.X.devid=<device id, eg ath>
  * ar71xx_mac_map.X.unitid=<unit id, eg 0>
  * ar71xx_mac_map.X.offset=<mac address value offset>
  * ar71xx_mac_map.X.is_local=<1 or 0>
  */
 static int
 ar71xx_platform_check_mac_hints(void)
 {
 	int i;
 	const char *devid;
 	int offset, is_local, unitid;
 
 	for (i = 0; i < 8; i++) {
 		if (resource_string_value("ar71xx_mac_map", i, "devid",
 		    &devid) != 0)
 			break;
 		if (resource_int_value("ar71xx_mac_map", i, "unitid",
 		    &unitid) != 0)
 			break;
 		if (resource_int_value("ar71xx_mac_map", i, "offset",
 		    &offset) != 0)
 			break;
 		if (resource_int_value("ar71xx_mac_map", i, "is_local",
 		    &is_local) != 0)
 			break;
 		printf("ar71xx: devid '%s.%d', MAC offset '%d'\n",
 		    devid, unitid, offset);
 		(void) ar71xx_platform_set_mac_hint(devid, unitid,
 		    ar71xx_board_mac_addr, offset, is_local);
 	}
 
 	return (0);
 }
 
 extern char cpu_model[];
 
 void
 platform_start(__register_t a0 __unused, __register_t a1 __unused, 
     __register_t a2 __unused, __register_t a3 __unused)
 {
 	uint64_t platform_counter_freq;
 	int argc = 0, i;
 	char **argv = NULL, **envp = NULL;
 	vm_offset_t kernend;
 
 	/* 
 	 * clear the BSS and SBSS segments, this should be first call in
 	 * the function
 	 */
 	kernend = (vm_offset_t)&end;
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
 	mips_postboot_fixup();
 
 	/* Initialize pcpu stuff */
 	mips_pcpu0_init();
 
 	/*
 	 * Until some more sensible abstractions for uboot/redboot
 	 * environment handling, we have to make this a compile-time
 	 * hack.  The existing code handles the uboot environment
 	 * very incorrectly so we should just ignore initialising
 	 * the relevant pointers.
 	 */
 #ifndef	AR71XX_ENV_UBOOT
 	argc = a0;
 	argv = (char**)a1;
 	envp = (char**)a2;
 #endif
 	/* 
 	 * Protect ourselves from garbage in registers 
 	 */
 	if (MIPS_IS_VALID_PTR(envp)) {
 		for (i = 0; envp[i]; i += 2) {
 			if (strcmp(envp[i], "memsize") == 0)
 				realmem = btoc(strtoul(envp[i+1], NULL, 16));
 			else if (strcmp(envp[i], "bootverbose") == 0)
 				bootverbose = btoc(strtoul(envp[i+1], NULL, 10));
 		}
 	}
 	bootverbose = 1;
 
 #ifdef	AR71XX_ENV_ROUTERBOOT
 	/*
 	 * RouterBoot informs the board memory as a command line argument.
 	 */
 	if (realmem == 0)
 		realmem = ar71xx_routerboot_get_mem(argc, argv);
 #endif
 
 	/*
 	 * Just wild guess. RedBoot let us down and didn't reported 
 	 * memory size
 	 */
 	if (realmem == 0)
 		realmem = btoc(32*1024*1024);
 
 	/*
 	 * Allow build-time override in case Redboot lies
 	 * or in other situations (eg where there's u-boot)
 	 * where there isn't (yet) a convienent method of
 	 * being told how much RAM is available.
 	 *
 	 * This happens on at least the Ubiquiti LS-SR71A
 	 * board, where redboot says there's 16mb of RAM
 	 * but in fact there's 32mb.
 	 */
 #if	defined(AR71XX_REALMEM)
 		realmem = btoc(AR71XX_REALMEM);
 #endif
 
 	/* phys_avail regions are in bytes */
 	phys_avail[0] = MIPS_KSEG0_TO_PHYS(kernel_kseg0_end);
 	phys_avail[1] = ctob(realmem);
 
-	dump_avail[0] = phys_avail[0];
-	dump_avail[1] = phys_avail[1] - phys_avail[0];
+	dump_avail[0] = 0;
+	dump_avail[1] = phys_avail[1];
 
 	physmem = realmem;
 
 	/*
 	 * ns8250 uart code uses DELAY so ticker should be inititalized 
 	 * before cninit. And tick_init_params refers to hz, so * init_param1 
 	 * should be called first.
 	 */
 	init_param1();
 
 	/* Detect the system type - this is needed for subsequent chipset-specific calls */
 	ar71xx_detect_sys_type();
 	ar71xx_detect_sys_frequency();
 
 	platform_counter_freq = ar71xx_cpu_freq();
 	mips_timer_init_params(platform_counter_freq, 1);
 	cninit();
 	init_static_kenv(boot1_env, sizeof(boot1_env));
 
 	printf("CPU platform: %s\n", ar71xx_get_system_type());
 	printf("CPU Frequency=%d MHz\n", u_ar71xx_cpu_freq / 1000000);
 	printf("CPU DDR Frequency=%d MHz\n", u_ar71xx_ddr_freq / 1000000);
 	printf("CPU AHB Frequency=%d MHz\n", u_ar71xx_ahb_freq / 1000000);
 	printf("platform frequency: %lld MHz\n", platform_counter_freq / 1000000);
 	printf("CPU reference clock: %d MHz\n", u_ar71xx_refclk / 1000000);
 	printf("CPU MDIO clock: %d MHz\n", u_ar71xx_mdio_freq / 1000000);
 	printf("arguments: \n");
 	printf("  a0 = %08x\n", a0);
 	printf("  a1 = %08x\n", a1);
 	printf("  a2 = %08x\n", a2);
 	printf("  a3 = %08x\n", a3);
 
 	strcpy(cpu_model, ar71xx_get_system_type());
 
 	/*
 	 * XXX this code is very redboot specific.
 	 */
 	printf("Cmd line:");
 	if (MIPS_IS_VALID_PTR(argv)) {
 		for (i = 0; i < argc; i++) {
 			printf(" %s", argv[i]);
 			parse_argv(argv[i]);
 		}
 	}
 	else
 		printf ("argv is invalid");
 	printf("\n");
 
 	printf("Environment:\n");
 	if (MIPS_IS_VALID_PTR(envp)) {
 		for (i = 0; envp[i]; i+=2) {
 			printf("  %s = %s\n", envp[i], envp[i+1]);
 			kern_setenv(envp[i], envp[i+1]);
 		}
 	}
 	else 
 		printf ("envp is invalid\n");
 
 	/* Platform setup */
 	init_param2(physmem);
 	mips_cpu_init();
 	pmap_bootstrap();
 	mips_proc0_init();
 	mutex_init();
 
 	/*
 	 * Reset USB devices 
 	 */
 	ar71xx_init_usb_peripheral();
 
 	/*
 	 * Reset internal ethernet switch, if one exists
 	 */
 	ar71xx_reset_ethernet_switch();
 
 	/*
 	 * Initialise the gmac driver.
 	 */
 	ar71xx_init_gmac();
 
 	/* Redboot if_arge MAC address is in the environment */
 	(void) ar71xx_redboot_get_macaddr();
 
 	/* Various other boards need things to come out of EEPROM */
 	(void) ar71xx_platform_read_eeprom_mac();
 
 	/* Initialise the MAC address hint map */
 	ar71xx_platform_check_mac_hints();
 
 	kdb_init();
 #ifdef KDB
 	if (boothowto & RB_KDB)
 		kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger");
 #endif
 }
Index: projects/clang500-import/sys/modules/Makefile
===================================================================
--- projects/clang500-import/sys/modules/Makefile	(revision 318657)
+++ projects/clang500-import/sys/modules/Makefile	(revision 318658)
@@ -1,804 +1,806 @@
 # $FreeBSD$
 
 SYSDIR?=${SRCTOP}/sys
 .include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR_PARALLEL=
 
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
 
 .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES)
 SUBDIR=${MODULES_OVERRIDE}
 .else
 SUBDIR=	\
 	${_3dfx} \
 	${_3dfx_linux} \
 	${_aac} \
 	${_aacraid} \
 	accf_data \
 	accf_dns \
 	accf_http \
 	acl_nfs4 \
 	acl_posix1e \
 	${_acpi} \
 	ae \
 	${_aesni} \
 	age \
 	${_agp} \
 	aha \
 	ahci \
 	${_aic} \
 	aic7xxx \
 	alc \
 	ale \
 	alq \
 	${_amd_ecc_inject} \
 	${_amdsbwd} \
 	${_amdtemp} \
 	amr \
 	${_an} \
 	${_aout} \
 	${_apm} \
 	${_arcmsr} \
 	${_arcnet} \
 	${_armv8crypto} \
 	${_asmc} \
 	ata \
 	ath \
 	ath_pci \
 	${_autofs} \
 	${_auxio} \
 	${_bce} \
 	bfe \
 	bge \
 	bhnd \
 	${_bxe} \
 	${_bios} \
 	${_bktr} \
 	${_bm} \
 	bnxt \
 	bridgestp \
 	bwi \
 	bwn \
 	bwn_pci \
 	${_bytgpio} \
 	cam \
 	${_cardbus} \
 	${_carp} \
 	cas \
 	${_cbb} \
 	cc \
 	cd9660 \
 	cd9660_iconv \
 	${_ce} \
 	${_cfi} \
 	chacha20 \
 	${_chromebook_platform} \
 	${_ciss} \
 	cloudabi \
 	${_cloudabi32} \
 	${_cloudabi64} \
 	${_cm} \
 	${_cmx} \
 	${_coff} \
 	${_coretemp} \
 	${_cp} \
 	${_cpsw} \
 	${_cpuctl} \
 	${_cpufreq} \
 	${_crypto} \
 	${_cryptodev} \
 	${_cs} \
 	${_ctau} \
 	ctl \
 	${_cxgb} \
 	${_cxgbe} \
 	dc \
 	dcons \
 	dcons_crom \
 	de \
 	${_dpms} \
 	${_dpt} \
 	${_drm} \
 	${_drm2} \
 	dummynet \
 	${_ed} \
 	${_efirt} \
 	${_elink} \
 	${_em} \
+	${_ena} \
 	${_ep} \
 	${_epic} \
 	esp \
 	${_et} \
 	evdev \
 	${_ex} \
 	${_exca} \
 	ext2fs \
 	fdc \
 	fdescfs \
 	${_fe} \
 	filemon \
 	firewire \
 	firmware \
 	fuse \
 	${_fxp} \
 	gem \
 	geom \
 	${_glxiic} \
 	${_glxsb} \
 	gpio \
 	hifn \
 	hme \
 	${_hpt27xx} \
 	${_hptiop} \
 	${_hptmv} \
 	${_hptnr} \
 	${_hptrr} \
 	hwpmc \
 	${_hwpmc_mips24k} \
 	${_hwpmc_mips74k} \
 	${_hyperv} \
 	i2c \
         ${_ibcore} \
 	${_ibcs2} \
 	${_ichwd} \
 	${_ida} \
 	if_bridge \
 	if_disc \
 	if_edsc \
 	${_if_enc} \
 	if_epair \
 	${_if_gif} \
 	${_if_gre} \
 	${_if_me} \
 	if_lagg \
 	${_if_ndis} \
 	${_if_stf} \
 	if_tap \
 	if_tun \
 	if_vlan \
 	if_vxlan \
 	${_iir} \
 	imgact_binmisc \
 	${_intelspi} \
 	${_io} \
 	${_ioat} \
         ${_ipoib} \
 	${_ipdivert} \
 	${_ipfilter} \
 	${_ipfw} \
 	ipfw_nat \
 	${_ipfw_nat64} \
 	${_ipfw_nptv6} \
 	${_ipfw_pmod} \
 	${_ipmi} \
 	ip6_mroute_mod \
 	ip_mroute_mod \
 	${_ips} \
 	${_ipsec} \
 	${_ipw} \
 	${_ipwfw} \
 	${_isci} \
 	${_iser} \
 	isp \
 	${_ispfw} \
 	${_iwi} \
 	${_iwifw} \
 	${_iwm} \
 	${_iwmfw} \
 	${_iwn} \
 	${_iwnfw} \
 	${_ix} \
 	${_ixv} \
 	${_ixgb} \
 	${_ixl} \
 	${_ixlv} \
 	jme \
 	joy \
 	kbdmux \
 	kgssapi \
 	kgssapi_krb5 \
 	khelp \
 	krpc \
 	ksyms \
 	le \
 	lge \
 	libalias \
 	libiconv \
 	libmbpool \
 	libmchain \
 	${_linprocfs} \
 	${_linsysfs} \
 	${_linux} \
 	${_linux_common} \
 	${_linux64} \
 	linuxkpi \
 	lmc \
 	lpt \
 	mac_biba \
 	mac_bsdextended \
 	mac_ifoff \
 	mac_lomac \
 	mac_mls \
 	mac_none \
 	mac_partition \
 	mac_portacl \
 	mac_seeotheruids \
 	mac_stub \
 	mac_test \
 	malo \
 	md \
 	mdio \
 	mem \
 	mfi \
 	mii \
 	mlx \
 	${_mlx4} \
 	${_mlx4ib} \
 	${_mlx4en} \
 	${_mlx5} \
 	${_mlx5en} \
 	${_mly} \
 	mmc \
 	mmcsd \
 	mpr \
 	mps \
 	mpt \
 	mqueue \
 	mrsas \
 	msdosfs \
 	msdosfs_iconv \
 	${_mse} \
 	msk \
 	${_mthca} \
 	mvs \
 	mwl \
 	${_mwlfw} \
 	mxge \
 	my \
 	${_nandfs} \
 	${_nandsim} \
 	${_ncr} \
 	${_nctgpio} \
 	${_ncv} \
 	${_ndis} \
 	${_netgraph} \
 	${_nfe} \
 	nfscl \
 	nfscommon \
 	nfsd \
 	nfslock \
 	nfslockd \
 	nfssvc \
 	nge \
 	nmdm \
 	${_nsp} \
 	nullfs \
 	${_ntb} \
 	${_nvd} \
 	${_nvme} \
 	${_nvram} \
 	${_nxge} \
 	oce \
 	otus \
 	${_otusfw} \
 	ow \
 	${_padlock} \
 	${_padlock_rng} \
 	${_pccard} \
 	${_pcfclock} \
 	pcn \
 	${_pf} \
 	${_pflog} \
 	${_pfsync} \
 	plip \
 	${_pms} \
 	ppbus \
 	ppc \
 	ppi \
 	pps \
 	procfs \
 	proto \
 	pseudofs \
 	${_pst} \
 	pty  \
 	puc \
 	${_qlxge} \
 	${_qlxgb} \
 	${_qlxgbe} \
 	${_qlnx} \
 	ral \
 	${_ralfw} \
 	${_random_fortuna} \
 	${_random_yarrow} \
 	${_random_other} \
 	rc4 \
 	${_rdma} \
 	${_rdrand_rng} \
 	re \
 	rl \
 	rtwn \
 	rtwn_pci \
 	rtwn_usb \
 	${_rtwnfw} \
 	${_s3} \
 	${_safe} \
 	${_sbni} \
 	scc \
 	${_scsi_low} \
 	sdhci \
 	${_sdhci_acpi} \
 	sdhci_pci \
 	sem \
 	send \
 	${_sf} \
 	${_sfxge} \
 	sge \
 	siba_bwn \
 	siftr \
 	siis \
 	sis \
 	sk \
 	smbfs \
 	sn \
 	snp \
 	sound \
 	${_speaker} \
 	spigen \
 	${_splash} \
 	${_sppp} \
 	ste \
 	${_stg} \
 	stge \
 	${_sym} \
 	${_syscons} \
 	sysvipc \
 	tcp \
 	${_ti} \
 	tl \
 	tmpfs \
 	${_toecore} \
 	${_tpm} \
 	trm \
 	${_twa} \
 	twe \
 	tws \
 	tx \
 	${_txp} \
 	uart \
 	ubsec \
 	udf \
 	udf_iconv \
 	ufs \
 	uinput \
 	unionfs \
 	usb \
 	${_vesa} \
 	${_virtio} \
 	vge \
 	${_viawd} \
 	videomode \
 	vkbd \
 	${_vmm} \
 	${_vmware} \
 	${_vpo} \
 	vr \
 	vte \
 	vx \
 	${_vxge} \
 	wb \
 	${_wbwd} \
 	${_wi} \
 	wlan \
 	wlan_acl \
 	wlan_amrr \
 	wlan_ccmp \
 	wlan_rssadapt \
 	wlan_tkip \
 	wlan_wep \
 	wlan_xauth \
 	${_wpi} \
 	${_wpifw} \
 	${_x86bios} \
 	${_xe} \
 	xl \
 	zlib
 
 .if ${MK_AUTOFS} != "no" || defined(ALL_MODULES)
 _autofs=	autofs
 .endif
 
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 .if (${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH:Marmv6*} != "") && \
 	${MACHINE_CPUARCH} != "mips" && \
 	${MACHINE_CPUARCH} != "sparc64"
 SUBDIR+=	dtrace
 .endif
 SUBDIR+=	opensolaris
 .endif
 
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 .if exists(${SRCTOP}/sys/opencrypto)
 _crypto=	crypto
 _cryptodev=	cryptodev
 _random_fortuna=random_fortuna
 _random_yarrow=	random_yarrow
 _random_other=	random_other
 .endif
 .endif
 
 .if ${MK_CUSE} != "no" || defined(ALL_MODULES)
 SUBDIR+=	cuse
 .endif
 
 .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _carp=		carp
 _toecore=	toecore
 _if_enc=	if_enc
 _if_gif=	if_gif
 _if_gre=	if_gre
 _ipfw_pmod=	ipfw_pmod
 .if ${MK_IPSEC_SUPPORT} != "no"
 _ipsec=		ipsec
 .endif
 .endif
 
 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _if_stf=	if_stf
 .endif
 
 .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
 _if_me=		if_me
 _ipdivert=	ipdivert
 _ipfw=		ipfw
 .if ${MK_INET6_SUPPORT} != "no" || defined(ALL_MODULES)
 _ipfw_nat64=	ipfw_nat64
 .endif
 .endif
 
 .if ${MK_INET6_SUPPORT} != "no" || defined(ALL_MODULES)
 _ipfw_nptv6=	ipfw_nptv6
 .endif
 
 .if ${MK_IPFILTER} != "no" || defined(ALL_MODULES)
 _ipfilter=	ipfilter
 .endif
 
 .if ${MK_ISCSI} != "no" || defined(ALL_MODULES)
 SUBDIR+=	cfiscsi
 SUBDIR+=	iscsi
 SUBDIR+=	iscsi_initiator
 .endif
 
 .if ${MK_NAND} != "no" || defined(ALL_MODULES)
 _nandfs=	nandfs
 _nandsim=	nandsim
 .endif
 
 .if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES)
 _netgraph=	netgraph
 .endif
 
 .if (${MK_PF} != "no" && (${MK_INET_SUPPORT} != "no" || \
 	${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES)
 _pf=		pf
 _pflog=		pflog
 .if ${MK_INET_SUPPORT} != "no"
 _pfsync=	pfsync
 .endif
 .endif
 
 .if ${MK_SOURCELESS_UCODE} != "no"
 _bce=		bce
 _fxp=		fxp
 _ispfw=		ispfw
 _sf=		sf
 _ti=		ti
 _txp=		txp
 
 .if ${MACHINE_CPUARCH} != "mips"
 _mwlfw=		mwlfw
 _otusfw=	otusfw
 _ralfw=		ralfw
 _rtwnfw=	rtwnfw
 .endif
 .endif
 
 .if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \
 	${MACHINE_CPUARCH} != "mips" && \
 	${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \
 	${MACHINE_CPUARCH} != "riscv"
 _cxgbe=		cxgbe
 .endif
 
 .if ${MK_TESTS} != "no" || defined(ALL_MODULES)
 SUBDIR+=	tests
 .endif
 
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
 SUBDIR+=	zfs
 .endif
 
 .if (${MACHINE_CPUARCH} == "mips" && ${MACHINE_ARCH:Mmips64} == "")
 _hwpmc_mips24k=	hwpmc_mips24k
 _hwpmc_mips74k=	hwpmc_mips74k
 .endif
 
 .if ${MACHINE_CPUARCH} != "aarch64" && ${MACHINE_CPUARCH} != "arm" && \
 	${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "powerpc" && \
 	${MACHINE_CPUARCH} != "riscv"
 _syscons=	syscons
 _vpo=		vpo
 .endif
 
 .if ${MACHINE_CPUARCH} != "mips"
 # no BUS_SPACE_UNSPECIFIED
 # No barrier instruction support (specific to this driver)
 _sym=		sym
 # intr_disable() is a macro, causes problems
 .if ${MK_SOURCELESS_UCODE} != "no"
 _cxgb=		cxgb
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64"
 _armv8crypto=	armv8crypto
 _em=		em
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _agp=		agp
 _an=		an
 _aout=		aout
 _bios=		bios
 _bktr=		bktr
 _bxe=		bxe
 _cardbus=	cardbus
 _cbb=		cbb
 _cpuctl=	cpuctl
 _cpufreq=	cpufreq
 _cs=		cs
 _dpms=		dpms
 _drm=		drm
 _drm2=		drm2
 _ed=		ed
 _em=		em
+_ena=		ena
 _ep=		ep
 _et=		et
 _exca=		exca
 _fe=		fe
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _ibcore=        ibcore
 .endif
 _if_ndis=	if_ndis
 _io=		io
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _ipoib=         ipoib
 _iser=		iser
 .endif
 _ix=		ix
 _ixv=		ixv
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
 _nctgpio=	nctgpio
 _ndis=		ndis
 _pccard=	pccard
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _rdma=		rdma
 .endif
 _safe=		safe
 _scsi_low=	scsi_low
 _speaker=	speaker
 _splash=	splash
 _sppp=		sppp
 _vmware=	vmware
 _vxge=  	vxge
 _wbwd=		wbwd
 _wi=		wi
 _xe=		xe
 
 _aac=		aac
 _aacraid=	aacraid
 _acpi=		acpi
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _aesni=		aesni
 .endif
 _amd_ecc_inject=amd_ecc_inject
 _amdsbwd=	amdsbwd
 _amdtemp=	amdtemp
 _arcmsr=	arcmsr
 _asmc=		asmc
 _bytgpio=	bytgpio
 _ciss=		ciss
 _chromebook_platform=	chromebook_platform
 _cmx=		cmx
 _coretemp=	coretemp
 .if ${MK_SOURCELESS_HOST} != "no"
 _hpt27xx=	hpt27xx
 .endif
 _hptiop=	hptiop
 .if ${MK_SOURCELESS_HOST} != "no"
 _hptmv=		hptmv
 _hptnr=		hptnr
 _hptrr=		hptrr
 .endif
 _hyperv=	hyperv
 _ichwd=		ichwd
 _ida=		ida
 _iir=		iir
 _intelspi=	intelspi
 _ipmi=		ipmi
 _ips=		ips
 _isci=		isci
 _ipw=		ipw
 _iwi=		iwi
 _iwm=		iwm
 _iwn=		iwn
 _ixgb=		ixgb
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ipwfw=		ipwfw
 _iwifw=		iwifw
 _iwmfw=		iwmfw
 _iwnfw=		iwnfw
 .endif
 _mlx4=		mlx4
 _mlx5=		mlx5
 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _mlx4en=	mlx4en
 _mlx5en=	mlx5en
 .endif
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mlx4ib=	mlx4ib
 .endif
 _mly=		mly
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mthca=		mthca
 .endif
 _nfe=		nfe
 _nvd=		nvd
 _nvme=		nvme
 _nvram=		nvram
 _nxge=		nxge
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _padlock=	padlock
 _padlock_rng=	padlock_rng
 _rdrand_rng=	rdrand_rng
 .endif
 _s3=		s3
 _sdhci_acpi=	sdhci_acpi
 _tpm=		tpm
 _twa=		twa
 _vesa=		vesa
 _viawd=		viawd
 _virtio=	virtio
 _wpi=		wpi
 .if ${MK_SOURCELESS_UCODE} != "no"
 _wpifw=		wpifw
 .endif
 _x86bios=	x86bios
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 _efirt=		efirt
 _ioat=		ioat
 _ixl=		ixl
 _ixlv=		ixlv
 _linux64=	linux64
 _linux_common=	linux_common
 _ntb=		ntb
 _pms=		pms
 _qlxge=		qlxge
 _qlxgb=		qlxgb
 _qlxgbe=	qlxgbe
 _qlnx=		qlnx
 _sfxge=		sfxge
 
 .if ${MK_BHYVE} != "no" || defined(ALL_MODULES)
 _vmm=		vmm
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"
 # XXX some of these can move to the general case when de-i386'ed
 # XXX some of these can move now, but are untested on other architectures.
 _3dfx=		3dfx
 _3dfx_linux=	3dfx_linux
 _aic=		aic
 _apm=		apm
 _arcnet=	arcnet
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ce=		ce
 .endif
 _coff=		coff
 .if ${MK_SOURCELESS_UCODE} != "no"
 _cp=		cp
 .endif
 _elink=		elink
 _glxiic=	glxiic
 _glxsb=		glxsb
 #_ibcs2=		ibcs2
 _mse=		mse
 _ncr=		ncr
 _ncv=		ncv
 _nsp=		nsp
 _pcfclock=	pcfclock
 _pst=		pst
 _sbni=		sbni
 _stg=		stg
 _cm=		cm
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ctau=		ctau
 .endif
 _dpt=		dpt
 _ex=		ex
 .endif
 
 .if ${MACHINE_CPUARCH} == "arm"
 _cfi=		cfi
 _cpsw=		cpsw
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc"
 _agp=		agp
 _an=		an
 _bm=		bm
 _cardbus=	cardbus
 _cbb=		cbb
 _cfi=		cfi
 _cpufreq=	cpufreq
 _drm=		drm
 _exca=		exca
 _pccard=	pccard
 _wi=		wi
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64"
 _drm2=		drm2
 .endif
 .if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc"
 # Don't build powermac_nvram for powerpcspe, it's never supported.
 _nvram=		powermac_nvram
 .endif
 
 .if ${MACHINE_CPUARCH} == "sparc64"
 _auxio=		auxio
 _em=		em
 _epic=		epic
 .endif
 
 .if (${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "armv6" || \
      ${MACHINE_CPUARCH} == "i386")
 _cloudabi32=	cloudabi32
 .endif
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"
 _cloudabi64=	cloudabi64
 .endif
 
 .endif
 
 SUBDIR+=${MODULES_EXTRA}
 
 .for reject in ${WITHOUT_MODULES}
 SUBDIR:= ${SUBDIR:N${reject}}
 .endfor
 
 # Calling kldxref(8) for each module is expensive.
 .if !defined(NO_XREF)
 .MAKEFLAGS+=	-DNO_XREF
 afterinstall: .PHONY
 	@if type kldxref >/dev/null 2>&1; then \
 		${ECHO} kldxref ${DESTDIR}${KMODDIR}; \
 		kldxref ${DESTDIR}${KMODDIR}; \
 	fi
 .endif
 
 .include "${SYSDIR}/conf/config.mk"
 
 SUBDIR:= ${SUBDIR:u:O}
 
 .include <bsd.subdir.mk>
Index: projects/clang500-import/sys/modules/ena/Makefile
===================================================================
--- projects/clang500-import/sys/modules/ena/Makefile	(nonexistent)
+++ projects/clang500-import/sys/modules/ena/Makefile	(revision 318658)
@@ -0,0 +1,41 @@
+#
+# BSD LICENSE
+#
+# Copyright (c) 2015-2017 Amazon.com, Inc. or its affiliates.
+# 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+# OWNER 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$
+#
+
+.PATH:	${SRCTOP}/sys/dev/ena \
+	${SRCTOP}/sys/contrib/ena-com
+
+KMOD	= if_ena
+SRCS	= ena.c ena_com.c ena_eth_com.c ena_sysctl.c
+SRCS	+= device_if.h bus_if.h pci_if.h
+CFLAGS  += -I${SRCTOP}/sys/contrib
+
+.include <bsd.kmod.mk>

Property changes on: projects/clang500-import/sys/modules/ena/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/sys/net80211/ieee80211_adhoc.c
===================================================================
--- projects/clang500-import/sys/net80211/ieee80211_adhoc.c	(revision 318657)
+++ projects/clang500-import/sys/net80211/ieee80211_adhoc.c	(revision 318658)
@@ -1,1030 +1,1030 @@
 /*-
  * Copyright (c) 2007-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>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD$");
 #endif
 
 /*
  * IEEE 802.11 IBSS mode support.
  */
 #include "opt_inet.h"
 #include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
 
 #include <net/bpf.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_adhoc.h>
 #include <net80211/ieee80211_input.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
 #include <net80211/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
 #include <net80211/ieee80211_tdma.h>
 #endif
 #include <net80211/ieee80211_sta.h>
 
 #define	IEEE80211_RATE2MBS(r)	(((r) & IEEE80211_RATE_VAL) / 2)
 
 static	void adhoc_vattach(struct ieee80211vap *);
 static	int adhoc_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static int adhoc_input(struct ieee80211_node *, struct mbuf *,
 	    const struct ieee80211_rx_stats *, int, int);
 static void adhoc_recv_mgmt(struct ieee80211_node *, struct mbuf *,
 	int subtype, const struct ieee80211_rx_stats *, int, int);
 static void ahdemo_recv_mgmt(struct ieee80211_node *, struct mbuf *,
 	    int subtype, const struct ieee80211_rx_stats *rxs, int, int);
 static void adhoc_recv_ctl(struct ieee80211_node *, struct mbuf *, int subtype);
 
 void
 ieee80211_adhoc_attach(struct ieee80211com *ic)
 {
 	ic->ic_vattach[IEEE80211_M_IBSS] = adhoc_vattach;
 	ic->ic_vattach[IEEE80211_M_AHDEMO] = adhoc_vattach;
 }
 
 void
 ieee80211_adhoc_detach(struct ieee80211com *ic)
 {
 }
 
 static void
 adhoc_vdetach(struct ieee80211vap *vap)
 {
 }
 
 static void
 adhoc_vattach(struct ieee80211vap *vap)
 {
 	vap->iv_newstate = adhoc_newstate;
 	vap->iv_input = adhoc_input;
 	if (vap->iv_opmode == IEEE80211_M_IBSS)
 		vap->iv_recv_mgmt = adhoc_recv_mgmt;
 	else
 		vap->iv_recv_mgmt = ahdemo_recv_mgmt;
 	vap->iv_recv_ctl = adhoc_recv_ctl;
 	vap->iv_opdetach = adhoc_vdetach;
 #ifdef IEEE80211_SUPPORT_TDMA
 	/*
 	 * Throw control to tdma support.  Note we do this
 	 * after setting up our callbacks so it can piggyback
 	 * on top of us.
 	 */
 	if (vap->iv_caps & IEEE80211_C_TDMA)
 		ieee80211_tdma_vattach(vap);
 #endif
 }
 
 static void
 sta_leave(void *arg, struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	if (ni != vap->iv_bss)
 		ieee80211_node_leave(ni);
 }
 
 /*
  * IEEE80211_M_IBSS+IEEE80211_M_AHDEMO vap state machine handler.
  */
 static int
 adhoc_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_node *ni;
 	enum ieee80211_state ostate;
 
 	IEEE80211_LOCK_ASSERT(vap->iv_ic);
 
 	ostate = vap->iv_state;
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
 	    __func__, ieee80211_state_name[ostate],
 	    ieee80211_state_name[nstate], arg);
 	vap->iv_state = nstate;			/* state transition */
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
 	ni = vap->iv_bss;			/* NB: no reference held */
 	switch (nstate) {
 	case IEEE80211_S_INIT:
 		switch (ostate) {
 		case IEEE80211_S_SCAN:
 			ieee80211_cancel_scan(vap);
 			break;
 		default:
 			break;
 		}
 		if (ostate != IEEE80211_S_INIT) {
 			/* NB: optimize INIT -> INIT case */
 			ieee80211_reset_bss(vap);
 		}
 		break;
 	case IEEE80211_S_SCAN:
 		switch (ostate) {
 		case IEEE80211_S_RUN:		/* beacon miss */
 			/* purge station table; entries are stale */
 			ieee80211_iterate_nodes_vap(&ic->ic_sta, vap,
 			    sta_leave, NULL);
 			/* fall thru... */
 		case IEEE80211_S_INIT:
 			if (vap->iv_des_chan != IEEE80211_CHAN_ANYC &&
 			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
 				/*
 				 * Already have a channel; bypass the
 				 * scan and startup immediately.
 				 */
 				ieee80211_create_ibss(vap,
 				    ieee80211_ht_adjust_channel(ic,
 				    vap->iv_des_chan, vap->iv_flags_ht));
 				break;
 			}
 			/*
 			 * Initiate a scan.  We can come here as a result
 			 * of an IEEE80211_IOC_SCAN_REQ too in which case
 			 * the vap will be marked with IEEE80211_FEXT_SCANREQ
 			 * and the scan request parameters will be present
 			 * in iv_scanreq.  Otherwise we do the default.
 			 */
 			if (vap->iv_flags_ext & IEEE80211_FEXT_SCANREQ) {
 				ieee80211_check_scan(vap,
 				    vap->iv_scanreq_flags,
 				    vap->iv_scanreq_duration,
 				    vap->iv_scanreq_mindwell,
 				    vap->iv_scanreq_maxdwell,
 				    vap->iv_scanreq_nssid, vap->iv_scanreq_ssid);
 				vap->iv_flags_ext &= ~IEEE80211_FEXT_SCANREQ;
 			} else
 				ieee80211_check_scan_current(vap);
 			break;
 		case IEEE80211_S_SCAN:
 			/*
 			 * This can happen because of a change in state
 			 * that requires a reset.  Trigger a new scan
 			 * unless we're in manual roaming mode in which
 			 * case an application must issue an explicit request.
 			 */
 			if (vap->iv_roaming == IEEE80211_ROAMING_AUTO)
 				ieee80211_check_scan_current(vap);
 			break;
 		default:
 			goto invalid;
 		}
 		break;
 	case IEEE80211_S_RUN:
 		if (vap->iv_flags & IEEE80211_F_WPA) {
 			/* XXX validate prerequisites */
 		}
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 			/*
 			 * Already have a channel; bypass the
 			 * scan and startup immediately.
 			 * Note that ieee80211_create_ibss will call
 			 * back to do a RUN->RUN state change.
 			 */
 			ieee80211_create_ibss(vap,
 			    ieee80211_ht_adjust_channel(ic,
 				ic->ic_curchan, vap->iv_flags_ht));
 			/* NB: iv_bss is changed on return */
 			ni = vap->iv_bss;
 			break;
 		case IEEE80211_S_SCAN:
 #ifdef IEEE80211_DEBUG
 			if (ieee80211_msg_debug(vap)) {
 				ieee80211_note(vap,
 				    "synchronized with %s ssid ",
 				    ether_sprintf(ni->ni_bssid));
 				ieee80211_print_essid(vap->iv_bss->ni_essid,
 				    ni->ni_esslen);
 				/* XXX MCS/HT */
 				printf(" channel %d start %uMb\n",
 				    ieee80211_chan2ieee(ic, ic->ic_curchan),
 				    IEEE80211_RATE2MBS(ni->ni_txrate));
 			}
 #endif
 			break;
 		case IEEE80211_S_RUN:	/* IBSS merge */
 			break;
 		default:
 			goto invalid;
 		}
 		/*
 		 * 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)
 			ieee80211_node_authorize(ni);
 		/*
 		 * Fake association when joining an existing bss.
 		 */
 		if (!IEEE80211_ADDR_EQ(ni->ni_macaddr, vap->iv_myaddr) &&
 		    ic->ic_newassoc != NULL)
 			ic->ic_newassoc(ni, ostate != IEEE80211_S_RUN);
 		break;
 	case IEEE80211_S_SLEEP:
 		vap->iv_sta_ps(vap, 0);
 		break;
 	default:
 	invalid:
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE,
 		    "%s: unexpected state transition %s -> %s\n", __func__,
 		    ieee80211_state_name[ostate], ieee80211_state_name[nstate]);
 		break;
 	}
 	return 0;
 }
 
 /*
  * Decide if a received management frame should be
  * printed when debugging is enabled.  This filters some
  * of the less interesting frames that come frequently
  * (e.g. beacons).
  */
 static __inline int
 doprint(struct ieee80211vap *vap, int subtype)
 {
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_BEACON:
 		return (vap->iv_ic->ic_flags & IEEE80211_F_SCAN);
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 		return 1;
 	}
 	return 1;
 }
 
 /*
  * Process a received frame.  The node associated with the sender
  * should be supplied.  If nothing was found in the node table then
  * the caller is assumed to supply a reference to iv_bss instead.
  * The RSSI and a timestamp are also supplied.  The RSSI data is used
  * during AP scanning to select a AP to associate with; it can have
  * any units so long as values have consistent units and higher values
  * mean ``better signal''.  The receive timestamp is currently not used
  * by the 802.11 layer.
  */
 static int
 adhoc_input(struct ieee80211_node *ni, struct mbuf *m,
     const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ifnet *ifp = vap->iv_ifp;
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
 	int hdrspace, need_tap = 1;	/* mbuf need to be tapped. */	
 	uint8_t dir, type, subtype, qos;
 	uint8_t *bssid;
 	int is_hw_decrypted = 0;
 	int has_decrypted = 0;
 
 	/*
 	 * Some devices do hardware decryption all the way through
 	 * to pretending the frame wasn't encrypted in the first place.
 	 * So, tag it appropriately so it isn't discarded inappropriately.
 	 */
 	if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_DECRYPTED))
 		is_hw_decrypted = 1;
 
 	if (m->m_flags & M_AMPDU_MPDU) {
 		/*
 		 * Fastpath for A-MPDU reorder q resubmission.  Frames
 		 * w/ M_AMPDU_MPDU marked have already passed through
 		 * here but were received out of order and been held on
 		 * the reorder queue.  When resubmitted they are marked
 		 * with the M_AMPDU_MPDU flag and we can bypass most of
 		 * the normal processing.
 		 */
 		wh = mtod(m, struct ieee80211_frame *);
 		type = IEEE80211_FC0_TYPE_DATA;
 		dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 		subtype = IEEE80211_FC0_SUBTYPE_QOS;
 		hdrspace = ieee80211_hdrspace(ic, wh);	/* XXX optimize? */
 		goto resubmit_ampdu;
 	}
 
 	KASSERT(ni != NULL, ("null node"));
 	ni->ni_inact = ni->ni_inact_reload;
 
 	type = -1;			/* undefined */
 
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL,
 		    "too short (1): len %u", m->m_pkthdr.len);
 		vap->iv_stats.is_rx_tooshort++;
 		goto out;
 	}
 	/*
 	 * Bit of a cheat here, we use a pointer for a 3-address
 	 * frame format but don't reference fields past outside
 	 * ieee80211_frame_min w/o first validating the data is
 	 * present.
 	 */
 	wh = mtod(m, struct ieee80211_frame *);
 
 	if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) !=
 	    IEEE80211_FC0_VERSION_0) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL, "wrong version, fc %02x:%02x",
 		    wh->i_fc[0], wh->i_fc[1]);
 		vap->iv_stats.is_rx_badversion++;
 		goto err;
 	}
 
 	dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 	if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) {
 		if (dir != IEEE80211_FC1_DIR_NODS)
 			bssid = wh->i_addr1;
 		else if (type == IEEE80211_FC0_TYPE_CTL)
 			bssid = wh->i_addr1;
 		else {
 			if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) {
 				IEEE80211_DISCARD_MAC(vap,
 				    IEEE80211_MSG_ANY, ni->ni_macaddr,
 				    NULL, "too short (2): len %u",
 				    m->m_pkthdr.len);
 				vap->iv_stats.is_rx_tooshort++;
 				goto out;
 			}
 			bssid = wh->i_addr3;
 		}
 		/*
 		 * Validate the bssid.
 		 */
 		if (!(type == IEEE80211_FC0_TYPE_MGT &&
 		     (subtype == IEEE80211_FC0_SUBTYPE_BEACON ||
 		      subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP)) &&
 		    !IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
 		    !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) {
 			/* not interested in */
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    bssid, NULL, "%s", "not to bss");
 			vap->iv_stats.is_rx_wrongbss++;
 			goto out;
 		}
 		/*
 		 * Data frame, cons up a node when it doesn't
 		 * exist. This should probably done after an ACL check.
 		 */
 		if (type == IEEE80211_FC0_TYPE_DATA &&
 		    ni == vap->iv_bss &&
 		    !IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) {
 			/*
 			 * Beware of frames that come in too early; we
 			 * can receive broadcast frames and creating sta
 			 * entries will blow up because there is no bss
 			 * channel yet.
 			 */
 			if (vap->iv_state != IEEE80211_S_RUN) {
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, "data", "not in RUN state (%s)",
 				    ieee80211_state_name[vap->iv_state]);
 				vap->iv_stats.is_rx_badstate++;
 				goto err;
 			}
 			/*
 			 * Fake up a node for this newly discovered member
 			 * of the IBSS.
 			 *
 			 * Note: This doesn't "upgrade" the node to 11n;
 			 * that will happen after a probe request/response
 			 * exchange.
 			 */
 			ni = ieee80211_fakeup_adhoc_node(vap, wh->i_addr2);
 			if (ni == NULL) {
 				/* NB: stat kept for alloc failure */
 				goto err;
 			}
 		}
 		IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
 		ni->ni_noise = nf;
 		if (IEEE80211_HAS_SEQ(type, subtype) &&
 		    IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) {
 			uint8_t tid = ieee80211_gettid(wh);
 			if (IEEE80211_QOS_HAS_SEQ(wh) &&
 			    TID_TO_WME_AC(tid) >= WME_AC_VI)
 				ic->ic_wme.wme_hipri_traffic++;
-			if (! ieee80211_check_rxseq(ni, wh, bssid))
+			if (! ieee80211_check_rxseq(ni, wh, bssid, rxs))
 				goto out;
 		}
 	}
 
 	switch (type) {
 	case IEEE80211_FC0_TYPE_DATA:
 		hdrspace = ieee80211_hdrspace(ic, wh);
 		if (m->m_len < hdrspace &&
 		    (m = m_pullup(m, hdrspace)) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, NULL,
 			    "data too short: expecting %u", hdrspace);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
 		if (dir != IEEE80211_FC1_DIR_NODS) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "incorrect dir 0x%x", dir);
 			vap->iv_stats.is_rx_wrongdir++;
 			goto out;
 		}
 		/* XXX no power-save support */
 
 		/*
 		 * Handle A-MPDU re-ordering.  If the frame is to be
 		 * processed directly then ieee80211_ampdu_reorder
 		 * will return 0; otherwise it has consumed the mbuf
 		 * and we should do nothing more with it.
 		 */
 		if ((m->m_flags & M_AMPDU) &&
-		    ieee80211_ampdu_reorder(ni, m) != 0) {
+		    ieee80211_ampdu_reorder(ni, m, rxs) != 0) {
 			m = NULL;
 			goto out;
 		}
 	resubmit_ampdu:
 
 		/*
 		 * Handle privacy requirements.  Note that we
 		 * must not be preempted from here until after
 		 * we (potentially) call ieee80211_crypto_demic;
 		 * otherwise we may violate assumptions in the
 		 * crypto cipher modules used to do delayed update
 		 * of replay sequence numbers.
 		 */
 		if (is_hw_decrypted || wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, "WEP", "%s", "PRIVACY off");
 				vap->iv_stats.is_rx_noprivacy++;
 				IEEE80211_NODE_STAT(ni, rx_noprivacy);
 				goto out;
 			}
 			if (ieee80211_crypto_decap(ni, m, hdrspace, &key) == 0) {
 				/* NB: stats+msgs handled in crypto_decap */
 				IEEE80211_NODE_STAT(ni, rx_wepfail);
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
 			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 			has_decrypted = 1;
 		} else {
 			/* XXX M_WEP and IEEE80211_F_PRIVACY */
 			key = NULL;
 		}
 
 		/*
 		 * Save QoS bits for use below--before we strip the header.
 		 */
 		if (subtype == IEEE80211_FC0_SUBTYPE_QOS) {
 			qos = (dir == IEEE80211_FC1_DIR_DSTODS) ?
 			    ((struct ieee80211_qosframe_addr4 *)wh)->i_qos[0] :
 			    ((struct ieee80211_qosframe *)wh)->i_qos[0];
 		} else
 			qos = 0;
 
 		/*
 		 * Next up, any fragmentation.
 		 */
 		if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			m = ieee80211_defrag(ni, m, hdrspace);
 			if (m == NULL) {
 				/* Fragment dropped or frame not complete yet */
 				goto out;
 			}
 		}
 		wh = NULL;		/* no longer valid, catch any uses */
 
 		/*
 		 * Next strip any MSDU crypto bits.
 		 */
 		if (!ieee80211_crypto_demic(vap, key, m, 0)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "demic error");
 			vap->iv_stats.is_rx_demicfail++;
 			IEEE80211_NODE_STAT(ni, rx_demicfail);
 			goto out;
 		}
 
 		/* copy to listener after decrypt */
 		if (ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		need_tap = 0;
 
 		/*
 		 * Finally, strip the 802.11 header.
 		 */
 		m = ieee80211_decap(vap, m, hdrspace);
 		if (m == NULL) {
 			/* XXX mask bit to check for both */
 			/* don't count Null data frames as errors */
 			if (subtype == IEEE80211_FC0_SUBTYPE_NODATA ||
 			    subtype == IEEE80211_FC0_SUBTYPE_QOS_NULL)
 				goto out;
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "decap error");
 			vap->iv_stats.is_rx_decap++;
 			IEEE80211_NODE_STAT(ni, rx_decap);
 			goto err;
 		}
 		eh = mtod(m, struct ether_header *);
 		if (!ieee80211_node_is_authorized(ni)) {
 			/*
 			 * Deny any non-PAE frames received prior to
 			 * authorization.  For open/shared-key
 			 * authentication the port is mark authorized
 			 * after authentication completes.  For 802.1x
 			 * the port is not marked authorized by the
 			 * authenticator until the handshake has completed.
 			 */
 			if (eh->ether_type != htons(ETHERTYPE_PAE)) {
 				IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 				    eh->ether_shost, "data",
 				    "unauthorized port: ether type 0x%x len %u",
 				    eh->ether_type, m->m_pkthdr.len);
 				vap->iv_stats.is_rx_unauth++;
 				IEEE80211_NODE_STAT(ni, rx_unauth);
 				goto err;
 			}
 		} else {
 			/*
 			 * When denying unencrypted frames, discard
 			 * any non-PAE frames received without encryption.
 			 */
 			if ((vap->iv_flags & IEEE80211_F_DROPUNENC) &&
 			    ((has_decrypted == 0) && (m->m_flags & M_WEP) == 0) &&
 			    (is_hw_decrypted == 0) &&
 			    eh->ether_type != htons(ETHERTYPE_PAE)) {
 				/*
 				 * Drop unencrypted frames.
 				 */
 				vap->iv_stats.is_rx_unencrypted++;
 				IEEE80211_NODE_STAT(ni, rx_unencrypted);
 				goto out;
 			}
 		}
 		/* XXX require HT? */
 		if (qos & IEEE80211_QOS_AMSDU) {
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
 		} else {
 #ifdef IEEE80211_SUPPORT_SUPERG
 			m = ieee80211_decap_fastframe(vap, ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
 #endif
 		}
 		if (dir == IEEE80211_FC1_DIR_DSTODS && ni->ni_wdsvap != NULL)
 			ieee80211_deliver_data(ni->ni_wdsvap, ni, m);
 		else
 			ieee80211_deliver_data(vap, ni, m);
 		return IEEE80211_FC0_TYPE_DATA;
 
 	case IEEE80211_FC0_TYPE_MGT:
 		vap->iv_stats.is_rx_mgmt++;
 		IEEE80211_NODE_STAT(ni, rx_mgmt);
 		if (dir != IEEE80211_FC1_DIR_NODS) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "incorrect dir 0x%x", dir);
 			vap->iv_stats.is_rx_wrongdir++;
 			goto err;
 		}
 		if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, "mgt", "too short: len %u",
 			    m->m_pkthdr.len);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;
 		}
 #ifdef IEEE80211_DEBUG
 		if ((ieee80211_msg_debug(vap) && doprint(vap, subtype)) ||
 		    ieee80211_msg_dumppkts(vap)) {
 			if_printf(ifp, "received %s from %s rssi %d\n",
 			    ieee80211_mgt_subtype_name(subtype),
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
 		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "WEP set but not permitted");
 			vap->iv_stats.is_rx_mgtdiscard++; /* XXX */
 			goto out;
 		}
 		vap->iv_recv_mgmt(ni, m, subtype, rxs, rssi, nf);
 		goto out;
 
 	case IEEE80211_FC0_TYPE_CTL:
 		vap->iv_stats.is_rx_ctl++;
 		IEEE80211_NODE_STAT(ni, rx_ctrl);
 		vap->iv_recv_ctl(ni, m, subtype);
 		goto out;
 
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, "bad", "frame type 0x%x", type);
 		/* should not come here */
 		break;
 	}
 err:
 	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		m_freem(m);
 	}
 	return type;
 }
 
 static int
 is11bclient(const uint8_t *rates, const uint8_t *xrates)
 {
 	static const uint32_t brates = (1<<2*1)|(1<<2*2)|(1<<11)|(1<<2*11);
 	int i;
 
 	/* NB: the 11b clients we care about will not have xrates */
 	if (xrates != NULL || rates == NULL)
 		return 0;
 	for (i = 0; i < rates[1]; i++) {
 		int r = rates[2+i] & IEEE80211_RATE_VAL;
 		if (r > 2*11 || ((1<<r) & brates) == 0)
 			return 0;
 	}
 	return 1;
 }
 
 static void
 adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0,
 	int subtype, const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_channel *rxchan = ic->ic_curchan;
 	struct ieee80211_frame *wh;
 	uint8_t *frm, *efrm;
 	uint8_t *ssid, *rates, *xrates;
 #if 0
 	int ht_state_change = 0;
 #endif
 
 	wh = mtod(m0, struct ieee80211_frame *);
 	frm = (uint8_t *)&wh[1];
 	efrm = mtod(m0, uint8_t *) + m0->m_len;
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 	case IEEE80211_FC0_SUBTYPE_BEACON: {
 		struct ieee80211_scanparams scan;
 		struct ieee80211_channel *c;
 		/*
 		 * We process beacon/probe response
 		 * frames to discover neighbors.
 		 */ 
 		if (rxs != NULL) {
 			c = ieee80211_lookup_channel_rxstatus(vap, rxs);
 			if (c != NULL)
 				rxchan = c;
 		}
 		if (ieee80211_parse_beacon(ni, m0, rxchan, &scan) != 0)
 			return;
 		/*
 		 * Count frame now that we know it's to be processed.
 		 */
 		if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) {
 			vap->iv_stats.is_rx_beacon++;		/* XXX remove */
 			IEEE80211_NODE_STAT(ni, rx_beacons);
 		} else
 			IEEE80211_NODE_STAT(ni, rx_proberesp);
 		/*
 		 * If scanning, just pass information to the scan module.
 		 */
 		if (ic->ic_flags & IEEE80211_F_SCAN) {
 			if (ic->ic_flags_ext & IEEE80211_FEXT_PROBECHAN) {
 				/*
 				 * Actively scanning a channel marked passive;
 				 * send a probe request now that we know there
 				 * is 802.11 traffic present.
 				 *
 				 * XXX check if the beacon we recv'd gives
 				 * us what we need and suppress the probe req
 				 */
 				ieee80211_probe_curchan(vap, 1);
 				ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN;
 			}
 			ieee80211_add_scan(vap, rxchan, &scan, wh,
 			    subtype, rssi, nf);
 			return;
 		}
 		if (scan.capinfo & IEEE80211_CAPINFO_IBSS) {
 			if (!IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) {
 				/*
 				 * Create a new entry in the neighbor table.
 				 *
 				 * XXX TODO:
 				 *
 				 * Here we're not scanning; so if we have an
 				 * SSID then make sure it matches our SSID.
 				 * Otherwise this code will match on all IBSS
 				 * beacons/probe requests for all SSIDs,
 				 * filling the node table with nodes that
 				 * aren't ours.
 				 */
 				if (ieee80211_ibss_node_check_new(ni, &scan)) {
 					ni = ieee80211_add_neighbor(vap, wh, &scan);
 					/*
 					 * Send a probe request so we announce 11n
 					 * capabilities.
 					 */
 					ieee80211_send_probereq(ni, /* node */
 					    vap->iv_myaddr, /* SA */
 					    ni->ni_macaddr, /* DA */
 					    vap->iv_bss->ni_bssid, /* BSSID */
 					    vap->iv_bss->ni_essid,
 					    vap->iv_bss->ni_esslen); /* SSID */
 				} else
 					ni = NULL;
 
 			} else if (ni->ni_capinfo == 0) {
 				/*
 				 * Update faked node created on transmit.
 				 * Note this also updates the tsf.
 				 */
 				ieee80211_init_neighbor(ni, wh, &scan);
 
 				/*
 				 * Send a probe request so we announce 11n
 				 * capabilities.
 				 */
 				ieee80211_send_probereq(ni, /* node */
 					vap->iv_myaddr, /* SA */
 					ni->ni_macaddr, /* DA */
 					vap->iv_bss->ni_bssid, /* BSSID */
 					vap->iv_bss->ni_essid,
 					vap->iv_bss->ni_esslen); /* SSID */
 			} else {
 				/*
 				 * Record tsf for potential resync.
 				 */
 				memcpy(ni->ni_tstamp.data, scan.tstamp,
 					sizeof(ni->ni_tstamp));
 			}
 			/*
 			 * This isn't enabled yet - otherwise it would
 			 * update the HT parameters and channel width
 			 * from any node, which could lead to lots of
 			 * strange behaviour if the 11n nodes aren't
 			 * exactly configured to match.
 			 */
 #if 0
 			if (scan.htcap != NULL && scan.htinfo != NULL &&
 			    (vap->iv_flags_ht & IEEE80211_FHT_HT)) {
 				ieee80211_ht_updateparams(ni,
 				    scan.htcap, scan.htinfo));
 				if (ieee80211_ht_updateparams_final(ni,
 				    scan.htcap, scan.htinfo))
 					ht_state_change = 1;
 			}
 
 			/* XXX same for VHT? */
 #endif
 			if (ni != NULL) {
 				IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
 				ni->ni_noise = nf;
 			}
 			/*
 			 * Same here - the channel width change should
 			 * be applied to the specific peer node, not
 			 * to the ic.  Ie, the interface configuration
 			 * should stay in its current channel width;
 			 * but it should change the rate control and
 			 * any queued frames for the given node only.
 			 *
 			 * Since there's no (current) way to inform
 			 * the driver that a channel width change has
 			 * occurred for a single node, just stub this
 			 * out.
 			 */
 #if 0
 			if (ht_state_change)
 				ieee80211_update_chw(ic);
 #endif
 		}
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 		if (vap->iv_state != IEEE80211_S_RUN) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "wrong state %s",
 			    ieee80211_state_name[vap->iv_state]);
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 		if (IEEE80211_IS_MULTICAST(wh->i_addr2)) {
 			/* frame must be directed */
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "not unicast");
 			vap->iv_stats.is_rx_mgtdiscard++;	/* XXX stat */
 			return;
 		}
 
 		/*
 		 * prreq frame format
 		 *	[tlv] ssid
 		 *	[tlv] supported rates
 		 *	[tlv] extended supported rates
 		 */
 		ssid = rates = xrates = NULL;
 		while (efrm - frm > 1) {
 			IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
 			switch (*frm) {
 			case IEEE80211_ELEMID_SSID:
 				ssid = frm;
 				break;
 			case IEEE80211_ELEMID_RATES:
 				rates = frm;
 				break;
 			case IEEE80211_ELEMID_XRATES:
 				xrates = frm;
 				break;
 			}
 			frm += frm[1] + 2;
 		}
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE, return);
 		if (xrates != NULL)
 			IEEE80211_VERIFY_ELEMENT(xrates,
 				IEEE80211_RATE_MAXSIZE - rates[1], return);
 		IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN, return);
 		IEEE80211_VERIFY_SSID(vap->iv_bss, ssid, return);
 		if ((vap->iv_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL,
 			    "%s", "no ssid with ssid suppression enabled");
 			vap->iv_stats.is_rx_ssidmismatch++; /*XXX*/
 			return;
 		}
 
 		/* XXX find a better class or define it's own */
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2,
 		    "%s", "recv probe req");
 		/*
 		 * Some legacy 11b clients cannot hack a complete
 		 * probe response frame.  When the request includes
 		 * only a bare-bones rate set, communicate this to
 		 * the transmit side.
 		 */
 		ieee80211_send_proberesp(vap, wh->i_addr2,
 		    is11bclient(rates, xrates) ? IEEE80211_SEND_LEGACY_11B : 0);
 
 		/*
 		 * Note: we don't benefit from stashing the probe request
 		 * IEs away to use for IBSS negotiation, because we
 		 * typically don't get all of the IEs.
 		 */
 		break;
 
 	case IEEE80211_FC0_SUBTYPE_ACTION:
 	case IEEE80211_FC0_SUBTYPE_ACTION_NOACK:
 		if ((ni == vap->iv_bss) &&
 		    !IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "unknown node");
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) &&
 		    !IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "not for us");
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else if (vap->iv_state != IEEE80211_S_RUN) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "wrong state %s",
 			    ieee80211_state_name[vap->iv_state]);
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else {
 			if (ieee80211_parse_action(ni, m0) == 0)
 				(void)ic->ic_recv_action(ni, wh, frm, efrm);
 		}
 		break;
 
 	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
 	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_TIMING_ADV:
 	case IEEE80211_FC0_SUBTYPE_ATIM:
 	case IEEE80211_FC0_SUBTYPE_DISASSOC:
 	case IEEE80211_FC0_SUBTYPE_AUTH:
 	case IEEE80211_FC0_SUBTYPE_DEAUTH:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 		    wh, NULL, "%s", "not handled");
 		vap->iv_stats.is_rx_mgtdiscard++;
 		break;
 
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, "mgt", "subtype 0x%x not handled", subtype);
 		vap->iv_stats.is_rx_badsubtype++;
 		break;
 	}
 }
 #undef IEEE80211_VERIFY_LENGTH
 #undef IEEE80211_VERIFY_ELEMENT
 
 static void
 ahdemo_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0,
 	int subtype, const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_frame *wh;
 
 	/*
 	 * Process management frames when scanning; useful for doing
 	 * a site-survey.
 	 */
 	if (ic->ic_flags & IEEE80211_F_SCAN)
 		adhoc_recv_mgmt(ni, m0, subtype, rxs, rssi, nf);
 	else {
 		wh = mtod(m0, struct ieee80211_frame *);
 		switch (subtype) {
 		case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
 		case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
 		case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
 		case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
 		case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 		case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 		case IEEE80211_FC0_SUBTYPE_TIMING_ADV:
 		case IEEE80211_FC0_SUBTYPE_BEACON:
 		case IEEE80211_FC0_SUBTYPE_ATIM:
 		case IEEE80211_FC0_SUBTYPE_DISASSOC:
 		case IEEE80211_FC0_SUBTYPE_AUTH:
 		case IEEE80211_FC0_SUBTYPE_DEAUTH:
 		case IEEE80211_FC0_SUBTYPE_ACTION:
 		case IEEE80211_FC0_SUBTYPE_ACTION_NOACK:
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			     wh, NULL, "%s", "not handled");
 			vap->iv_stats.is_rx_mgtdiscard++;
 			break;
 		default:
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 			     wh, "mgt", "subtype 0x%x not handled", subtype);
 			vap->iv_stats.is_rx_badsubtype++;
 			break;
 		}
 	}
 }
 
 static void
 adhoc_recv_ctl(struct ieee80211_node *ni, struct mbuf *m, int subtype)
 {
 
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_BAR:
 		ieee80211_recv_bar(ni, m);
 		break;
 	}
 }
Index: projects/clang500-import/sys/net80211/ieee80211_hostap.c
===================================================================
--- projects/clang500-import/sys/net80211/ieee80211_hostap.c	(revision 318657)
+++ projects/clang500-import/sys/net80211/ieee80211_hostap.c	(revision 318658)
@@ -1,2444 +1,2444 @@
 /*-
  * 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.
  */
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD$");
 #endif
 
 /*
  * IEEE 802.11 HOSTAP mode support.
  */
 #include "opt_inet.h"
 #include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
 
 #include <net/bpf.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_hostap.h>
 #include <net80211/ieee80211_input.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
 #include <net80211/ieee80211_superg.h>
 #endif
 #include <net80211/ieee80211_wds.h>
 #include <net80211/ieee80211_vht.h>
 
 #define	IEEE80211_RATE2MBS(r)	(((r) & IEEE80211_RATE_VAL) / 2)
 
 static	void hostap_vattach(struct ieee80211vap *);
 static	int hostap_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static	int hostap_input(struct ieee80211_node *ni, struct mbuf *m,
 	    const struct ieee80211_rx_stats *,
 	    int rssi, int nf);
 static void hostap_deliver_data(struct ieee80211vap *,
 	    struct ieee80211_node *, struct mbuf *);
 static void hostap_recv_mgmt(struct ieee80211_node *, struct mbuf *,
 	    int subtype, const struct ieee80211_rx_stats *rxs, int rssi, int nf);
 static void hostap_recv_ctl(struct ieee80211_node *, struct mbuf *, int);
 
 void
 ieee80211_hostap_attach(struct ieee80211com *ic)
 {
 	ic->ic_vattach[IEEE80211_M_HOSTAP] = hostap_vattach;
 }
 
 void
 ieee80211_hostap_detach(struct ieee80211com *ic)
 {
 }
 
 static void
 hostap_vdetach(struct ieee80211vap *vap)
 {
 }
 
 static void
 hostap_vattach(struct ieee80211vap *vap)
 {
 	vap->iv_newstate = hostap_newstate;
 	vap->iv_input = hostap_input;
 	vap->iv_recv_mgmt = hostap_recv_mgmt;
 	vap->iv_recv_ctl = hostap_recv_ctl;
 	vap->iv_opdetach = hostap_vdetach;
 	vap->iv_deliver_data = hostap_deliver_data;
 	vap->iv_recv_pspoll = ieee80211_recv_pspoll;
 }
 
 static void
 sta_disassoc(void *arg, struct ieee80211_node *ni)
 {
 
 	if (ni->ni_associd != 0) {
 		IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DISASSOC,
 			IEEE80211_REASON_ASSOC_LEAVE);
 		ieee80211_node_leave(ni);
 	}
 }
 
 static void
 sta_csa(void *arg, struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	if (ni->ni_associd != 0)
 		if (ni->ni_inact > vap->iv_inact_init) {
 			ni->ni_inact = vap->iv_inact_init;
 			IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni,
 			    "%s: inact %u", __func__, ni->ni_inact);
 		}
 }
 
 static void
 sta_drop(void *arg, struct ieee80211_node *ni)
 {
 
 	if (ni->ni_associd != 0)
 		ieee80211_node_leave(ni);
 }
 
 /*
  * Does a channel change require associated stations to re-associate
  * so protocol state is correct.  This is used when doing CSA across
  * bands or similar (e.g. HT -> legacy).
  */
 static int
 isbandchange(struct ieee80211com *ic)
 {
 	return ((ic->ic_bsschan->ic_flags ^ ic->ic_csa_newchan->ic_flags) &
 	    (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_HALF |
 	     IEEE80211_CHAN_QUARTER | IEEE80211_CHAN_HT)) != 0;
 }
 
 /*
  * IEEE80211_M_HOSTAP vap state machine handler.
  */
 static int
 hostap_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	enum ieee80211_state ostate;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	ostate = vap->iv_state;
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
 	    __func__, ieee80211_state_name[ostate],
 	    ieee80211_state_name[nstate], arg);
 	vap->iv_state = nstate;			/* state transition */
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
 	switch (nstate) {
 	case IEEE80211_S_INIT:
 		switch (ostate) {
 		case IEEE80211_S_SCAN:
 			ieee80211_cancel_scan(vap);
 			break;
 		case IEEE80211_S_CAC:
 			ieee80211_dfs_cac_stop(vap);
 			break;
 		case IEEE80211_S_RUN:
 			ieee80211_iterate_nodes_vap(&ic->ic_sta, vap,
 			    sta_disassoc, NULL);
 			break;
 		default:
 			break;
 		}
 		if (ostate != IEEE80211_S_INIT) {
 			/* NB: optimize INIT -> INIT case */
 			ieee80211_reset_bss(vap);
 		}
 		if (vap->iv_auth->ia_detach != NULL)
 			vap->iv_auth->ia_detach(vap);
 		break;
 	case IEEE80211_S_SCAN:
 		switch (ostate) {
 		case IEEE80211_S_CSA:
 		case IEEE80211_S_RUN:
 			ieee80211_iterate_nodes_vap(&ic->ic_sta, vap,
 			    sta_disassoc, NULL);
 			/*
 			 * Clear overlapping BSS state; the beacon frame
 			 * will be reconstructed on transition to the RUN
 			 * state and the timeout routines check if the flag
 			 * is set before doing anything so this is sufficient.
 			 */
 			ic->ic_flags_ext &= ~IEEE80211_FEXT_NONERP_PR;
 			ic->ic_flags_ht &= ~IEEE80211_FHT_NONHT_PR;
 			/* fall thru... */
 		case IEEE80211_S_CAC:
 			/*
 			 * NB: We may get here because of a manual channel
 			 *     change in which case we need to stop CAC
 			 * XXX no need to stop if ostate RUN but it's ok
 			 */
 			ieee80211_dfs_cac_stop(vap);
 			/* fall thru... */
 		case IEEE80211_S_INIT:
 			if (vap->iv_des_chan != IEEE80211_CHAN_ANYC &&
 			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
 				/*
 				 * Already have a channel; bypass the
 				 * scan and startup immediately.  
 				 * ieee80211_create_ibss will call back to
 				 * move us to RUN state.
 				 */
 				ieee80211_create_ibss(vap, vap->iv_des_chan);
 				break;
 			}
 			/*
 			 * Initiate a scan.  We can come here as a result
 			 * of an IEEE80211_IOC_SCAN_REQ too in which case
 			 * the vap will be marked with IEEE80211_FEXT_SCANREQ
 			 * and the scan request parameters will be present
 			 * in iv_scanreq.  Otherwise we do the default.
 			 */
 			if (vap->iv_flags_ext & IEEE80211_FEXT_SCANREQ) {
 				ieee80211_check_scan(vap,
 				    vap->iv_scanreq_flags,
 				    vap->iv_scanreq_duration,
 				    vap->iv_scanreq_mindwell,
 				    vap->iv_scanreq_maxdwell,
 				    vap->iv_scanreq_nssid, vap->iv_scanreq_ssid);
 				vap->iv_flags_ext &= ~IEEE80211_FEXT_SCANREQ;
 			} else
 				ieee80211_check_scan_current(vap);
 			break;
 		case IEEE80211_S_SCAN:
 			/*
 			 * A state change requires a reset; scan.
 			 */
 			ieee80211_check_scan_current(vap);
 			break;
 		default:
 			break;
 		}
 		break;
 	case IEEE80211_S_CAC:
 		/*
 		 * Start CAC on a DFS channel.  We come here when starting
 		 * a bss on a DFS channel (see ieee80211_create_ibss).
 		 */
 		ieee80211_dfs_cac_start(vap);
 		break;
 	case IEEE80211_S_RUN:
 		if (vap->iv_flags & IEEE80211_F_WPA) {
 			/* XXX validate prerequisites */
 		}
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 			/*
 			 * Already have a channel; bypass the
 			 * scan and startup immediately.
 			 * Note that ieee80211_create_ibss will call
 			 * back to do a RUN->RUN state change.
 			 */
 			ieee80211_create_ibss(vap,
 			    ieee80211_ht_adjust_channel(ic,
 				ic->ic_curchan, vap->iv_flags_ht));
 			/* NB: iv_bss is changed on return */
 			break;
 		case IEEE80211_S_CAC:
 			/*
 			 * NB: This is the normal state change when CAC
 			 * expires and no radar was detected; no need to
 			 * clear the CAC timer as it's already expired.
 			 */
 			/* fall thru... */
 		case IEEE80211_S_CSA:
 			/*
 			 * Shorten inactivity timer of associated stations
 			 * to weed out sta's that don't follow a CSA.
 			 */
 			ieee80211_iterate_nodes_vap(&ic->ic_sta, vap,
 			    sta_csa, NULL);
 			/*
 			 * Update bss node channel to reflect where
 			 * we landed after CSA.
 			 */
 			ieee80211_node_set_chan(vap->iv_bss,
 			    ieee80211_ht_adjust_channel(ic, ic->ic_curchan,
 				ieee80211_htchanflags(vap->iv_bss->ni_chan)));
 			/* XXX bypass debug msgs */
 			break;
 		case IEEE80211_S_SCAN:
 		case IEEE80211_S_RUN:
 #ifdef IEEE80211_DEBUG
 			if (ieee80211_msg_debug(vap)) {
 				struct ieee80211_node *ni = vap->iv_bss;
 				ieee80211_note(vap,
 				    "synchronized with %s ssid ",
 				    ether_sprintf(ni->ni_bssid));
 				ieee80211_print_essid(ni->ni_essid,
 				    ni->ni_esslen);
 				/* XXX MCS/HT */
 				printf(" channel %d start %uMb\n",
 				    ieee80211_chan2ieee(ic, ic->ic_curchan),
 				    IEEE80211_RATE2MBS(ni->ni_txrate));
 			}
 #endif
 			break;
 		default:
 			break;
 		}
 		/*
 		 * Start/stop the authenticator.  We delay until here
 		 * to allow configuration to happen out of order.
 		 */
 		if (vap->iv_auth->ia_attach != NULL) {
 			/* XXX check failure */
 			vap->iv_auth->ia_attach(vap);
 		} else if (vap->iv_auth->ia_detach != NULL) {
 			vap->iv_auth->ia_detach(vap);
 		}
 		ieee80211_node_authorize(vap->iv_bss);
 		break;
 	case IEEE80211_S_CSA:
 		if (ostate == IEEE80211_S_RUN && isbandchange(ic)) {
 			/*
 			 * On a ``band change'' silently drop associated
 			 * stations as they must re-associate before they
 			 * can pass traffic (as otherwise protocol state
 			 * such as capabilities and the negotiated rate
 			 * set may/will be wrong).
 			 */
 			ieee80211_iterate_nodes_vap(&ic->ic_sta, vap,
 			    sta_drop, NULL);
 		}
 		break;
 	default:
 		break;
 	}
 	return 0;
 }
 
 static void
 hostap_deliver_data(struct ieee80211vap *vap,
 	struct ieee80211_node *ni, struct mbuf *m)
 {
 	struct ether_header *eh = mtod(m, struct ether_header *);
 	struct ifnet *ifp = vap->iv_ifp;
 
 	/* clear driver/net80211 flags before passing up */
 	m->m_flags &= ~(M_MCAST | M_BCAST);
 	m_clrprotoflags(m);
 
 	KASSERT(vap->iv_opmode == IEEE80211_M_HOSTAP,
 	    ("gack, opmode %d", vap->iv_opmode));
 	/*
 	 * Do accounting.
 	 */
 	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	IEEE80211_NODE_STAT(ni, rx_data);
 	IEEE80211_NODE_STAT_ADD(ni, rx_bytes, m->m_pkthdr.len);
 	if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
 		m->m_flags |= M_MCAST;		/* XXX M_BCAST? */
 		IEEE80211_NODE_STAT(ni, rx_mcast);
 	} else
 		IEEE80211_NODE_STAT(ni, rx_ucast);
 
 	/* perform as a bridge within the AP */
 	if ((vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) {
 		struct mbuf *mcopy = NULL;
 
 		if (m->m_flags & M_MCAST) {
 			mcopy = m_dup(m, M_NOWAIT);
 			if (mcopy == NULL)
 				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			else
 				mcopy->m_flags |= M_MCAST;
 		} else {
 			/*
 			 * Check if the destination is associated with the
 			 * same vap and authorized to receive traffic.
 			 * Beware of traffic destined for the vap itself;
 			 * sending it will not work; just let it be delivered
 			 * normally.
 			 */
 			struct ieee80211_node *sta = ieee80211_find_vap_node(
 			     &vap->iv_ic->ic_sta, vap, eh->ether_dhost);
 			if (sta != NULL) {
 				if (ieee80211_node_is_authorized(sta)) {
 					/*
 					 * Beware of sending to ourself; this
 					 * needs to happen via the normal
 					 * input path.
 					 */
 					if (sta != vap->iv_bss) {
 						mcopy = m;
 						m = NULL;
 					}
 				} else {
 					vap->iv_stats.is_rx_unauth++;
 					IEEE80211_NODE_STAT(sta, rx_unauth);
 				}
 				ieee80211_free_node(sta);
 			}
 		}
 		if (mcopy != NULL)
 			(void) ieee80211_vap_xmitpkt(vap, mcopy);
 	}
 	if (m != NULL) {
 		/*
 		 * Mark frame as coming from vap's interface.
 		 */
 		m->m_pkthdr.rcvif = ifp;
 		if (m->m_flags & M_MCAST) {
 			/*
 			 * Spam DWDS vap's w/ multicast traffic.
 			 */
 			/* XXX only if dwds in use? */
 			ieee80211_dwds_mcast(vap, m);
 		}
 		if (ni->ni_vlan != 0) {
 			/* attach vlan tag */
 			m->m_pkthdr.ether_vtag = ni->ni_vlan;
 			m->m_flags |= M_VLANTAG;
 		}
 		ifp->if_input(ifp, m);
 	}
 }
 
 /*
  * Decide if a received management frame should be
  * printed when debugging is enabled.  This filters some
  * of the less interesting frames that come frequently
  * (e.g. beacons).
  */
 static __inline int
 doprint(struct ieee80211vap *vap, int subtype)
 {
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_BEACON:
 		return (vap->iv_ic->ic_flags & IEEE80211_F_SCAN);
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 		return 0;
 	}
 	return 1;
 }
 
 /*
  * Process a received frame.  The node associated with the sender
  * should be supplied.  If nothing was found in the node table then
  * the caller is assumed to supply a reference to iv_bss instead.
  * The RSSI and a timestamp are also supplied.  The RSSI data is used
  * during AP scanning to select a AP to associate with; it can have
  * any units so long as values have consistent units and higher values
  * mean ``better signal''.  The receive timestamp is currently not used
  * by the 802.11 layer.
  */
 static int
 hostap_input(struct ieee80211_node *ni, struct mbuf *m,
     const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ifnet *ifp = vap->iv_ifp;
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
 	int hdrspace, need_tap = 1;	/* mbuf need to be tapped. */
 	uint8_t dir, type, subtype, qos;
 	uint8_t *bssid;
 	int is_hw_decrypted = 0;
 	int has_decrypted = 0;
 
 	/*
 	 * Some devices do hardware decryption all the way through
 	 * to pretending the frame wasn't encrypted in the first place.
 	 * So, tag it appropriately so it isn't discarded inappropriately.
 	 */
 	if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_DECRYPTED))
 		is_hw_decrypted = 1;
 
 	if (m->m_flags & M_AMPDU_MPDU) {
 		/*
 		 * Fastpath for A-MPDU reorder q resubmission.  Frames
 		 * w/ M_AMPDU_MPDU marked have already passed through
 		 * here but were received out of order and been held on
 		 * the reorder queue.  When resubmitted they are marked
 		 * with the M_AMPDU_MPDU flag and we can bypass most of
 		 * the normal processing.
 		 */
 		wh = mtod(m, struct ieee80211_frame *);
 		type = IEEE80211_FC0_TYPE_DATA;
 		dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 		subtype = IEEE80211_FC0_SUBTYPE_QOS;
 		hdrspace = ieee80211_hdrspace(ic, wh);	/* XXX optimize? */
 		goto resubmit_ampdu;
 	}
 
 	KASSERT(ni != NULL, ("null node"));
 	ni->ni_inact = ni->ni_inact_reload;
 
 	type = -1;			/* undefined */
 
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL,
 		    "too short (1): len %u", m->m_pkthdr.len);
 		vap->iv_stats.is_rx_tooshort++;
 		goto out;
 	}
 	/*
 	 * Bit of a cheat here, we use a pointer for a 3-address
 	 * frame format but don't reference fields past outside
 	 * ieee80211_frame_min w/o first validating the data is
 	 * present.
 	 */
 	wh = mtod(m, struct ieee80211_frame *);
 
 	if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) !=
 	    IEEE80211_FC0_VERSION_0) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL, "wrong version, fc %02x:%02x",
 		    wh->i_fc[0], wh->i_fc[1]);
 		vap->iv_stats.is_rx_badversion++;
 		goto err;
 	}
 
 	dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 	if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) {
 		if (dir != IEEE80211_FC1_DIR_NODS)
 			bssid = wh->i_addr1;
 		else if (type == IEEE80211_FC0_TYPE_CTL)
 			bssid = wh->i_addr1;
 		else {
 			if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) {
 				IEEE80211_DISCARD_MAC(vap,
 				    IEEE80211_MSG_ANY, ni->ni_macaddr,
 				    NULL, "too short (2): len %u",
 				    m->m_pkthdr.len);
 				vap->iv_stats.is_rx_tooshort++;
 				goto out;
 			}
 			bssid = wh->i_addr3;
 		}
 		/*
 		 * Validate the bssid.
 		 */
 		if (!(type == IEEE80211_FC0_TYPE_MGT &&
 		      subtype == IEEE80211_FC0_SUBTYPE_BEACON) &&
 		    !IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
 		    !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) {
 			/* not interested in */
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    bssid, NULL, "%s", "not to bss");
 			vap->iv_stats.is_rx_wrongbss++;
 			goto out;
 		}
 
 		IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
 		ni->ni_noise = nf;
 		if (IEEE80211_HAS_SEQ(type, subtype)) {
 			uint8_t tid = ieee80211_gettid(wh);
 			if (IEEE80211_QOS_HAS_SEQ(wh) &&
 			    TID_TO_WME_AC(tid) >= WME_AC_VI)
 				ic->ic_wme.wme_hipri_traffic++;
-			if (! ieee80211_check_rxseq(ni, wh, bssid))
+			if (! ieee80211_check_rxseq(ni, wh, bssid, rxs))
 				goto out;
 		}
 	}
 
 	switch (type) {
 	case IEEE80211_FC0_TYPE_DATA:
 		hdrspace = ieee80211_hdrspace(ic, wh);
 		if (m->m_len < hdrspace &&
 		    (m = m_pullup(m, hdrspace)) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, NULL,
 			    "data too short: expecting %u", hdrspace);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
 		if (!(dir == IEEE80211_FC1_DIR_TODS ||
 		     (dir == IEEE80211_FC1_DIR_DSTODS &&
 		      (vap->iv_flags & IEEE80211_F_DWDS)))) {
 			if (dir != IEEE80211_FC1_DIR_DSTODS) {
 				IEEE80211_DISCARD(vap,
 				    IEEE80211_MSG_INPUT, wh, "data",
 				    "incorrect dir 0x%x", dir);
 			} else {
 				IEEE80211_DISCARD(vap,
 				    IEEE80211_MSG_INPUT |
 				    IEEE80211_MSG_WDS, wh,
 				    "4-address data",
 				    "%s", "DWDS not enabled");
 			}
 			vap->iv_stats.is_rx_wrongdir++;
 			goto out;
 		}
 		/* check if source STA is associated */
 		if (ni == vap->iv_bss) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "%s", "unknown src");
 			ieee80211_send_error(ni, wh->i_addr2,
 			    IEEE80211_FC0_SUBTYPE_DEAUTH,
 			    IEEE80211_REASON_NOT_AUTHED);
 			vap->iv_stats.is_rx_notassoc++;
 			goto err;
 		}
 		if (ni->ni_associd == 0) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "%s", "unassoc src");
 			IEEE80211_SEND_MGMT(ni,
 			    IEEE80211_FC0_SUBTYPE_DISASSOC,
 			    IEEE80211_REASON_NOT_ASSOCED);
 			vap->iv_stats.is_rx_notassoc++;
 			goto err;
 		}
 
 		/*
 		 * Check for power save state change.
 		 * XXX out-of-order A-MPDU frames?
 		 */
 		if (((wh->i_fc[1] & IEEE80211_FC1_PWR_MGT) ^
 		    (ni->ni_flags & IEEE80211_NODE_PWR_MGT)))
 			vap->iv_node_ps(ni,
 				wh->i_fc[1] & IEEE80211_FC1_PWR_MGT);
 		/*
 		 * For 4-address packets handle WDS discovery
 		 * notifications.  Once a WDS link is setup frames
 		 * are just delivered to the WDS vap (see below).
 		 */
 		if (dir == IEEE80211_FC1_DIR_DSTODS && ni->ni_wdsvap == NULL) {
 			if (!ieee80211_node_is_authorized(ni)) {
 				IEEE80211_DISCARD(vap,
 				    IEEE80211_MSG_INPUT |
 				    IEEE80211_MSG_WDS, wh,
 				    "4-address data",
 				    "%s", "unauthorized port");
 				vap->iv_stats.is_rx_unauth++;
 				IEEE80211_NODE_STAT(ni, rx_unauth);
 				goto err;
 			}
 			ieee80211_dwds_discover(ni, m);
 			return type;
 		}
 
 		/*
 		 * Handle A-MPDU re-ordering.  If the frame is to be
 		 * processed directly then ieee80211_ampdu_reorder
 		 * will return 0; otherwise it has consumed the mbuf
 		 * and we should do nothing more with it.
 		 */
 		if ((m->m_flags & M_AMPDU) &&
-		    ieee80211_ampdu_reorder(ni, m) != 0) {
+		    ieee80211_ampdu_reorder(ni, m, rxs) != 0) {
 			m = NULL;
 			goto out;
 		}
 	resubmit_ampdu:
 
 		/*
 		 * Handle privacy requirements.  Note that we
 		 * must not be preempted from here until after
 		 * we (potentially) call ieee80211_crypto_demic;
 		 * otherwise we may violate assumptions in the
 		 * crypto cipher modules used to do delayed update
 		 * of replay sequence numbers.
 		 */
 		if (is_hw_decrypted || wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, "WEP", "%s", "PRIVACY off");
 				vap->iv_stats.is_rx_noprivacy++;
 				IEEE80211_NODE_STAT(ni, rx_noprivacy);
 				goto out;
 			}
 			if (ieee80211_crypto_decap(ni, m, hdrspace, &key) == 0) {
 				/* NB: stats+msgs handled in crypto_decap */
 				IEEE80211_NODE_STAT(ni, rx_wepfail);
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
 			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 			has_decrypted = 1;
 		} else {
 			/* XXX M_WEP and IEEE80211_F_PRIVACY */
 			key = NULL;
 		}
 
 		/*
 		 * Save QoS bits for use below--before we strip the header.
 		 */
 		if (subtype == IEEE80211_FC0_SUBTYPE_QOS) {
 			qos = (dir == IEEE80211_FC1_DIR_DSTODS) ?
 			    ((struct ieee80211_qosframe_addr4 *)wh)->i_qos[0] :
 			    ((struct ieee80211_qosframe *)wh)->i_qos[0];
 		} else
 			qos = 0;
 
 		/*
 		 * Next up, any fragmentation.
 		 */
 		if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			m = ieee80211_defrag(ni, m, hdrspace);
 			if (m == NULL) {
 				/* Fragment dropped or frame not complete yet */
 				goto out;
 			}
 		}
 		wh = NULL;		/* no longer valid, catch any uses */
 
 		/*
 		 * Next strip any MSDU crypto bits.
 		 */
 		if (key != NULL && !ieee80211_crypto_demic(vap, key, m, 0)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "demic error");
 			vap->iv_stats.is_rx_demicfail++;
 			IEEE80211_NODE_STAT(ni, rx_demicfail);
 			goto out;
 		}
 		/* copy to listener after decrypt */
 		if (ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		need_tap = 0;
 		/*
 		 * Finally, strip the 802.11 header.
 		 */
 		m = ieee80211_decap(vap, m, hdrspace);
 		if (m == NULL) {
 			/* XXX mask bit to check for both */
 			/* don't count Null data frames as errors */
 			if (subtype == IEEE80211_FC0_SUBTYPE_NODATA ||
 			    subtype == IEEE80211_FC0_SUBTYPE_QOS_NULL)
 				goto out;
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "decap error");
 			vap->iv_stats.is_rx_decap++;
 			IEEE80211_NODE_STAT(ni, rx_decap);
 			goto err;
 		}
 		eh = mtod(m, struct ether_header *);
 		if (!ieee80211_node_is_authorized(ni)) {
 			/*
 			 * Deny any non-PAE frames received prior to
 			 * authorization.  For open/shared-key
 			 * authentication the port is mark authorized
 			 * after authentication completes.  For 802.1x
 			 * the port is not marked authorized by the
 			 * authenticator until the handshake has completed.
 			 */
 			if (eh->ether_type != htons(ETHERTYPE_PAE)) {
 				IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 				    eh->ether_shost, "data",
 				    "unauthorized port: ether type 0x%x len %u",
 				    eh->ether_type, m->m_pkthdr.len);
 				vap->iv_stats.is_rx_unauth++;
 				IEEE80211_NODE_STAT(ni, rx_unauth);
 				goto err;
 			}
 		} else {
 			/*
 			 * When denying unencrypted frames, discard
 			 * any non-PAE frames received without encryption.
 			 */
 			if ((vap->iv_flags & IEEE80211_F_DROPUNENC) &&
 			    ((has_decrypted == 0) && (m->m_flags & M_WEP) == 0) &&
 			    (is_hw_decrypted == 0) &&
 			    eh->ether_type != htons(ETHERTYPE_PAE)) {
 				/*
 				 * Drop unencrypted frames.
 				 */
 				vap->iv_stats.is_rx_unencrypted++;
 				IEEE80211_NODE_STAT(ni, rx_unencrypted);
 				goto out;
 			}
 		}
 		/* XXX require HT? */
 		if (qos & IEEE80211_QOS_AMSDU) {
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
 		} else {
 #ifdef IEEE80211_SUPPORT_SUPERG
 			m = ieee80211_decap_fastframe(vap, ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
 #endif
 		}
 		if (dir == IEEE80211_FC1_DIR_DSTODS && ni->ni_wdsvap != NULL)
 			ieee80211_deliver_data(ni->ni_wdsvap, ni, m);
 		else
 			hostap_deliver_data(vap, ni, m);
 		return IEEE80211_FC0_TYPE_DATA;
 
 	case IEEE80211_FC0_TYPE_MGT:
 		vap->iv_stats.is_rx_mgmt++;
 		IEEE80211_NODE_STAT(ni, rx_mgmt);
 		if (dir != IEEE80211_FC1_DIR_NODS) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "mgt", "incorrect dir 0x%x", dir);
 			vap->iv_stats.is_rx_wrongdir++;
 			goto err;
 		}
 		if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, "mgt", "too short: len %u",
 			    m->m_pkthdr.len);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;
 		}
 		if (IEEE80211_IS_MULTICAST(wh->i_addr2)) {
 			/* ensure return frames are unicast */
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 			    wh, NULL, "source is multicast: %s",
 			    ether_sprintf(wh->i_addr2));
 			vap->iv_stats.is_rx_mgtdiscard++;	/* XXX stat */
 			goto out;
 		}
 #ifdef IEEE80211_DEBUG
 		if ((ieee80211_msg_debug(vap) && doprint(vap, subtype)) ||
 		    ieee80211_msg_dumppkts(vap)) {
 			if_printf(ifp, "received %s from %s rssi %d\n",
 			    ieee80211_mgt_subtype_name(subtype),
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
 		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if (subtype != IEEE80211_FC0_SUBTYPE_AUTH) {
 				/*
 				 * Only shared key auth frames with a challenge
 				 * should be encrypted, discard all others.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, NULL,
 				    "%s", "WEP set but not permitted");
 				vap->iv_stats.is_rx_mgtdiscard++; /* XXX */
 				goto out;
 			}
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, NULL, "%s", "WEP set but PRIVACY off");
 				vap->iv_stats.is_rx_noprivacy++;
 				goto out;
 			}
 			hdrspace = ieee80211_hdrspace(ic, wh);
 			if (ieee80211_crypto_decap(ni, m, hdrspace, &key) == 0) {
 				/* NB: stats+msgs handled in crypto_decap */
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
 			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 			has_decrypted = 1;
 		}
 		/*
 		 * Pass the packet to radiotap before calling iv_recv_mgmt().
 		 * Otherwise iv_recv_mgmt() might pass another packet to
 		 * radiotap, resulting in out of order packet captures.
 		 */
 		if (ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		need_tap = 0;
 		vap->iv_recv_mgmt(ni, m, subtype, rxs, rssi, nf);
 		goto out;
 
 	case IEEE80211_FC0_TYPE_CTL:
 		vap->iv_stats.is_rx_ctl++;
 		IEEE80211_NODE_STAT(ni, rx_ctrl);
 		vap->iv_recv_ctl(ni, m, subtype);
 		goto out;
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, "bad", "frame type 0x%x", type);
 		/* should not come here */
 		break;
 	}
 err:
 	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		m_freem(m);
 	}
 	return type;
 }
 
 static void
 hostap_auth_open(struct ieee80211_node *ni, struct ieee80211_frame *wh,
     int rssi, int nf, uint16_t seq, uint16_t status)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state));
 
 	if (ni->ni_authmode == IEEE80211_AUTH_SHARED) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 		    ni->ni_macaddr, "open auth",
 		    "bad sta auth mode %u", ni->ni_authmode);
 		vap->iv_stats.is_rx_bad_auth++;	/* XXX */
 		/*
 		 * Clear any challenge text that may be there if
 		 * a previous shared key auth failed and then an
 		 * open auth is attempted.
 		 */
 		if (ni->ni_challenge != NULL) {
 			IEEE80211_FREE(ni->ni_challenge, M_80211_NODE);
 			ni->ni_challenge = NULL;
 		}
 		/* XXX hack to workaround calling convention */
 		ieee80211_send_error(ni, wh->i_addr2, 
 		    IEEE80211_FC0_SUBTYPE_AUTH,
 		    (seq + 1) | (IEEE80211_STATUS_ALG<<16));
 		return;
 	}
 	if (seq != IEEE80211_AUTH_OPEN_REQUEST) {
 		vap->iv_stats.is_rx_bad_auth++;
 		return;
 	}
 	/* always accept open authentication requests */
 	if (ni == vap->iv_bss) {
 		ni = ieee80211_dup_bss(vap, wh->i_addr2);
 		if (ni == NULL)
 			return;
 	} else if ((ni->ni_flags & IEEE80211_NODE_AREF) == 0)
 		(void) ieee80211_ref_node(ni);
 	/*
 	 * Mark the node as referenced to reflect that it's
 	 * reference count has been bumped to insure it remains
 	 * after the transaction completes.
 	 */
 	ni->ni_flags |= IEEE80211_NODE_AREF;
 	/*
 	 * Mark the node as requiring a valid association id
 	 * before outbound traffic is permitted.
 	 */
 	ni->ni_flags |= IEEE80211_NODE_ASSOCID;
 
 	if (vap->iv_acl != NULL &&
 	    vap->iv_acl->iac_getpolicy(vap) == IEEE80211_MACCMD_POLICY_RADIUS) {
 		/*
 		 * When the ACL policy is set to RADIUS we defer the
 		 * authorization to a user agent.  Dispatch an event,
 		 * a subsequent MLME call will decide the fate of the
 		 * station.  If the user agent is not present then the
 		 * node will be reclaimed due to inactivity.
 		 */
 		IEEE80211_NOTE_MAC(vap,
 		    IEEE80211_MSG_AUTH | IEEE80211_MSG_ACL, ni->ni_macaddr,
 		    "%s", "station authentication defered (radius acl)");
 		ieee80211_notify_node_auth(ni);
 	} else {
 		IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1);
 		IEEE80211_NOTE_MAC(vap,
 		    IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni->ni_macaddr,
 		    "%s", "station authenticated (open)");
 		/*
 		 * 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)
 			ieee80211_node_authorize(ni);
 	}
 }
 
 static void
 hostap_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh,
     uint8_t *frm, uint8_t *efrm, int rssi, int nf,
     uint16_t seq, uint16_t status)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	uint8_t *challenge;
 	int allocbs, estatus;
 
 	KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state));
 
 	/*
 	 * NB: this can happen as we allow pre-shared key
 	 * authentication to be enabled w/o wep being turned
 	 * on so that configuration of these can be done
 	 * in any order.  It may be better to enforce the
 	 * ordering in which case this check would just be
 	 * for sanity/consistency.
 	 */
 	if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 		    ni->ni_macaddr, "shared key auth",
 		    "%s", " PRIVACY is disabled");
 		estatus = IEEE80211_STATUS_ALG;
 		goto bad;
 	}
 	/*
 	 * Pre-shared key authentication is evil; accept
 	 * it only if explicitly configured (it is supported
 	 * mainly for compatibility with clients like Mac OS X).
 	 */
 	if (ni->ni_authmode != IEEE80211_AUTH_AUTO &&
 	    ni->ni_authmode != IEEE80211_AUTH_SHARED) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 		    ni->ni_macaddr, "shared key auth",
 		    "bad sta auth mode %u", ni->ni_authmode);
 		vap->iv_stats.is_rx_bad_auth++;	/* XXX maybe a unique error? */
 		estatus = IEEE80211_STATUS_ALG;
 		goto bad;
 	}
 
 	challenge = NULL;
 	if (frm + 1 < efrm) {
 		if ((frm[1] + 2) > (efrm - frm)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 			    ni->ni_macaddr, "shared key auth",
 			    "ie %d/%d too long",
 			    frm[0], (frm[1] + 2) - (efrm - frm));
 			vap->iv_stats.is_rx_bad_auth++;
 			estatus = IEEE80211_STATUS_CHALLENGE;
 			goto bad;
 		}
 		if (*frm == IEEE80211_ELEMID_CHALLENGE)
 			challenge = frm;
 		frm += frm[1] + 2;
 	}
 	switch (seq) {
 	case IEEE80211_AUTH_SHARED_CHALLENGE:
 	case IEEE80211_AUTH_SHARED_RESPONSE:
 		if (challenge == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 			    ni->ni_macaddr, "shared key auth",
 			    "%s", "no challenge");
 			vap->iv_stats.is_rx_bad_auth++;
 			estatus = IEEE80211_STATUS_CHALLENGE;
 			goto bad;
 		}
 		if (challenge[1] != IEEE80211_CHALLENGE_LEN) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 			    ni->ni_macaddr, "shared key auth",
 			    "bad challenge len %d", challenge[1]);
 			vap->iv_stats.is_rx_bad_auth++;
 			estatus = IEEE80211_STATUS_CHALLENGE;
 			goto bad;
 		}
 	default:
 		break;
 	}
 	switch (seq) {
 	case IEEE80211_AUTH_SHARED_REQUEST:
 		if (ni == vap->iv_bss) {
 			ni = ieee80211_dup_bss(vap, wh->i_addr2);
 			if (ni == NULL) {
 				/* NB: no way to return an error */
 				return;
 			}
 			allocbs = 1;
 		} else {
 			if ((ni->ni_flags & IEEE80211_NODE_AREF) == 0)
 				(void) ieee80211_ref_node(ni);
 			allocbs = 0;
 		}
 		/*
 		 * Mark the node as referenced to reflect that it's
 		 * reference count has been bumped to insure it remains
 		 * after the transaction completes.
 		 */
 		ni->ni_flags |= IEEE80211_NODE_AREF;
 		/*
 		 * Mark the node as requiring a valid association id
 		 * before outbound traffic is permitted.
 		 */
 		ni->ni_flags |= IEEE80211_NODE_ASSOCID;
 		IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
 		ni->ni_noise = nf;
 		if (!ieee80211_alloc_challenge(ni)) {
 			/* NB: don't return error so they rexmit */
 			return;
 		}
 		get_random_bytes(ni->ni_challenge,
 			IEEE80211_CHALLENGE_LEN);
 		IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH,
 		    ni, "shared key %sauth request", allocbs ? "" : "re");
 		/*
 		 * When the ACL policy is set to RADIUS we defer the
 		 * authorization to a user agent.  Dispatch an event,
 		 * a subsequent MLME call will decide the fate of the
 		 * station.  If the user agent is not present then the
 		 * node will be reclaimed due to inactivity.
 		 */
 		if (vap->iv_acl != NULL &&
 		    vap->iv_acl->iac_getpolicy(vap) == IEEE80211_MACCMD_POLICY_RADIUS) {
 			IEEE80211_NOTE_MAC(vap,
 			    IEEE80211_MSG_AUTH | IEEE80211_MSG_ACL,
 			    ni->ni_macaddr,
 			    "%s", "station authentication defered (radius acl)");
 			ieee80211_notify_node_auth(ni);
 			return;
 		}
 		break;
 	case IEEE80211_AUTH_SHARED_RESPONSE:
 		if (ni == vap->iv_bss) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 			    ni->ni_macaddr, "shared key response",
 			    "%s", "unknown station");
 			/* NB: don't send a response */
 			return;
 		}
 		if (ni->ni_challenge == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 			    ni->ni_macaddr, "shared key response",
 			    "%s", "no challenge recorded");
 			vap->iv_stats.is_rx_bad_auth++;
 			estatus = IEEE80211_STATUS_CHALLENGE;
 			goto bad;
 		}
 		if (memcmp(ni->ni_challenge, &challenge[2],
 			   challenge[1]) != 0) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 			    ni->ni_macaddr, "shared key response",
 			    "%s", "challenge mismatch");
 			vap->iv_stats.is_rx_auth_fail++;
 			estatus = IEEE80211_STATUS_CHALLENGE;
 			goto bad;
 		}
 		IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH,
 		    ni, "%s", "station authenticated (shared key)");
 		ieee80211_node_authorize(ni);
 		break;
 	default:
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 		    ni->ni_macaddr, "shared key auth",
 		    "bad seq %d", seq);
 		vap->iv_stats.is_rx_bad_auth++;
 		estatus = IEEE80211_STATUS_SEQUENCE;
 		goto bad;
 	}
 	IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1);
 	return;
 bad:
 	/*
 	 * Send an error response; but only when operating as an AP.
 	 */
 	/* XXX hack to workaround calling convention */
 	ieee80211_send_error(ni, wh->i_addr2,
 	    IEEE80211_FC0_SUBTYPE_AUTH,
 	    (seq + 1) | (estatus<<16));
 }
 
 /*
  * Convert a WPA cipher selector OUI to an internal
  * cipher algorithm.  Where appropriate we also
  * record any key length.
  */
 static int
 wpa_cipher(const uint8_t *sel, uint8_t *keylen, uint8_t *cipher)
 {
 #define	WPA_SEL(x)	(((x)<<24)|WPA_OUI)
 	uint32_t w = le32dec(sel);
 
 	switch (w) {
 	case WPA_SEL(WPA_CSE_NULL):
 		*cipher = IEEE80211_CIPHER_NONE;
 		break;
 	case WPA_SEL(WPA_CSE_WEP40):
 		if (keylen)
 			*keylen = 40 / NBBY;
 		*cipher = IEEE80211_CIPHER_WEP;
 		break;
 	case WPA_SEL(WPA_CSE_WEP104):
 		if (keylen)
 			*keylen = 104 / NBBY;
 		*cipher = IEEE80211_CIPHER_WEP;
 		break;
 	case WPA_SEL(WPA_CSE_TKIP):
 		*cipher = IEEE80211_CIPHER_TKIP;
 		break;
 	case WPA_SEL(WPA_CSE_CCMP):
 		*cipher = IEEE80211_CIPHER_AES_CCM;
 		break;
 	default:
 		return (EINVAL);
 	}
 
 	return (0);
 #undef WPA_SEL
 }
 
 /*
  * Convert a WPA key management/authentication algorithm
  * to an internal code.
  */
 static int
 wpa_keymgmt(const uint8_t *sel)
 {
 #define	WPA_SEL(x)	(((x)<<24)|WPA_OUI)
 	uint32_t w = le32dec(sel);
 
 	switch (w) {
 	case WPA_SEL(WPA_ASE_8021X_UNSPEC):
 		return WPA_ASE_8021X_UNSPEC;
 	case WPA_SEL(WPA_ASE_8021X_PSK):
 		return WPA_ASE_8021X_PSK;
 	case WPA_SEL(WPA_ASE_NONE):
 		return WPA_ASE_NONE;
 	}
 	return 0;		/* NB: so is discarded */
 #undef WPA_SEL
 }
 
 /*
  * Parse a WPA information element to collect parameters.
  * Note that we do not validate security parameters; that
  * is handled by the authenticator; the parsing done here
  * is just for internal use in making operational decisions.
  */
 static int
 ieee80211_parse_wpa(struct ieee80211vap *vap, const uint8_t *frm,
 	struct ieee80211_rsnparms *rsn, const struct ieee80211_frame *wh)
 {
 	uint8_t len = frm[1];
 	uint32_t w;
 	int error, n;
 
 	/*
 	 * Check the length once for fixed parts: OUI, type,
 	 * version, mcast cipher, and 2 selector counts.
 	 * Other, variable-length data, must be checked separately.
 	 */
 	if ((vap->iv_flags & IEEE80211_F_WPA1) == 0) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "WPA", "not WPA, flags 0x%x", vap->iv_flags);
 		return IEEE80211_REASON_IE_INVALID;
 	}
 	if (len < 14) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "WPA", "too short, len %u", len);
 		return IEEE80211_REASON_IE_INVALID;
 	}
 	frm += 6, len -= 4;		/* NB: len is payload only */
 	/* NB: iswpaoui already validated the OUI and type */
 	w = le16dec(frm);
 	if (w != WPA_VERSION) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "WPA", "bad version %u", w);
 		return IEEE80211_REASON_IE_INVALID;
 	}
 	frm += 2, len -= 2;
 
 	memset(rsn, 0, sizeof(*rsn));
 
 	/* multicast/group cipher */
 	error = wpa_cipher(frm, &rsn->rsn_mcastkeylen, &rsn->rsn_mcastcipher);
 	if (error != 0) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "WPA", "unknown mcast cipher suite %08X",
 		    le32dec(frm));
 		return IEEE80211_REASON_GROUP_CIPHER_INVALID;
 	}
 	frm += 4, len -= 4;
 
 	/* unicast ciphers */
 	n = le16dec(frm);
 	frm += 2, len -= 2;
 	if (len < n*4+2) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "WPA", "ucast cipher data too short; len %u, n %u",
 		    len, n);
 		return IEEE80211_REASON_IE_INVALID;
 	}
 	w = 0;
 	for (; n > 0; n--) {
 		uint8_t cipher;
 
 		error = wpa_cipher(frm, &rsn->rsn_ucastkeylen, &cipher);
 		if (error == 0)
 			w |= 1 << cipher;
 
 		frm += 4, len -= 4;
 	}
 	if (w == 0) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "WPA", "no usable pairwise cipher suite found (w=%d)",
 		    w);
 		return IEEE80211_REASON_PAIRWISE_CIPHER_INVALID;
 	}
 	/* XXX other? */
 	if (w & (1 << IEEE80211_CIPHER_AES_CCM))
 		rsn->rsn_ucastcipher = IEEE80211_CIPHER_AES_CCM;
 	else
 		rsn->rsn_ucastcipher = IEEE80211_CIPHER_TKIP;
 
 	/* key management algorithms */
 	n = le16dec(frm);
 	frm += 2, len -= 2;
 	if (len < n*4) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "WPA", "key mgmt alg data too short; len %u, n %u",
 		    len, n);
 		return IEEE80211_REASON_IE_INVALID;
 	}
 	w = 0;
 	for (; n > 0; n--) {
 		w |= wpa_keymgmt(frm);
 		frm += 4, len -= 4;
 	}
 	if (w & WPA_ASE_8021X_UNSPEC)
 		rsn->rsn_keymgmt = WPA_ASE_8021X_UNSPEC;
 	else
 		rsn->rsn_keymgmt = WPA_ASE_8021X_PSK;
 
 	if (len > 2)		/* optional capabilities */
 		rsn->rsn_caps = le16dec(frm);
 
 	return 0;
 }
 
 /*
  * Convert an RSN cipher selector OUI to an internal
  * cipher algorithm.  Where appropriate we also
  * record any key length.
  */
 static int
 rsn_cipher(const uint8_t *sel, uint8_t *keylen, uint8_t *cipher)
 {
 #define	RSN_SEL(x)	(((x)<<24)|RSN_OUI)
 	uint32_t w = le32dec(sel);
 
 	switch (w) {
 	case RSN_SEL(RSN_CSE_NULL):
 		*cipher = IEEE80211_CIPHER_NONE;
 		break;
 	case RSN_SEL(RSN_CSE_WEP40):
 		if (keylen)
 			*keylen = 40 / NBBY;
 		*cipher = IEEE80211_CIPHER_WEP;
 		break;
 	case RSN_SEL(RSN_CSE_WEP104):
 		if (keylen)
 			*keylen = 104 / NBBY;
 		*cipher = IEEE80211_CIPHER_WEP;
 		break;
 	case RSN_SEL(RSN_CSE_TKIP):
 		*cipher = IEEE80211_CIPHER_TKIP;
 		break;
 	case RSN_SEL(RSN_CSE_CCMP):
 		*cipher = IEEE80211_CIPHER_AES_CCM;
 		break;
 	case RSN_SEL(RSN_CSE_WRAP):
 		*cipher = IEEE80211_CIPHER_AES_OCB;
 		break;
 	default:
 		return (EINVAL);
 	}
 
 	return (0);
 #undef WPA_SEL
 }
 
 /*
  * Convert an RSN key management/authentication algorithm
  * to an internal code.
  */
 static int
 rsn_keymgmt(const uint8_t *sel)
 {
 #define	RSN_SEL(x)	(((x)<<24)|RSN_OUI)
 	uint32_t w = le32dec(sel);
 
 	switch (w) {
 	case RSN_SEL(RSN_ASE_8021X_UNSPEC):
 		return RSN_ASE_8021X_UNSPEC;
 	case RSN_SEL(RSN_ASE_8021X_PSK):
 		return RSN_ASE_8021X_PSK;
 	case RSN_SEL(RSN_ASE_NONE):
 		return RSN_ASE_NONE;
 	}
 	return 0;		/* NB: so is discarded */
 #undef RSN_SEL
 }
 
 /*
  * Parse a WPA/RSN information element to collect parameters
  * and validate the parameters against what has been
  * configured for the system.
  */
 static int
 ieee80211_parse_rsn(struct ieee80211vap *vap, const uint8_t *frm,
 	struct ieee80211_rsnparms *rsn, const struct ieee80211_frame *wh)
 {
 	uint8_t len = frm[1];
 	uint32_t w;
 	int error, n;
 
 	/*
 	 * Check the length once for fixed parts: 
 	 * version, mcast cipher, and 2 selector counts.
 	 * Other, variable-length data, must be checked separately.
 	 */
 	if ((vap->iv_flags & IEEE80211_F_WPA2) == 0) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "WPA", "not RSN, flags 0x%x", vap->iv_flags);
 		return IEEE80211_REASON_IE_INVALID;
 	}
 	/* XXX may be shorter */
 	if (len < 10) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "RSN", "too short, len %u", len);
 		return IEEE80211_REASON_IE_INVALID;
 	}
 	frm += 2;
 	w = le16dec(frm);
 	if (w != RSN_VERSION) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "RSN", "bad version %u", w);
 		return IEEE80211_REASON_UNSUPP_RSN_IE_VERSION;
 	}
 	frm += 2, len -= 2;
 
 	memset(rsn, 0, sizeof(*rsn));
 
 	/* multicast/group cipher */
 	error = rsn_cipher(frm, &rsn->rsn_mcastkeylen, &rsn->rsn_mcastcipher);
 	if (error != 0) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "RSN", "unknown mcast cipher suite %08X",
 		    le32dec(frm));
 		return IEEE80211_REASON_GROUP_CIPHER_INVALID;
 	}
 	if (rsn->rsn_mcastcipher == IEEE80211_CIPHER_NONE) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "RSN", "invalid mcast cipher suite %d",
 		    rsn->rsn_mcastcipher);
 		return IEEE80211_REASON_GROUP_CIPHER_INVALID;
 	}
 	frm += 4, len -= 4;
 
 	/* unicast ciphers */
 	n = le16dec(frm);
 	frm += 2, len -= 2;
 	if (len < n*4+2) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "RSN", "ucast cipher data too short; len %u, n %u",
 		    len, n);
 		return IEEE80211_REASON_IE_INVALID;
 	}
 	w = 0;
 
 	for (; n > 0; n--) {
 		uint8_t cipher;
 
 		error = rsn_cipher(frm, &rsn->rsn_ucastkeylen, &cipher);
 		if (error == 0)
 			w |= 1 << cipher;
 
 		frm += 4, len -= 4;
 	}
         if (w & (1 << IEEE80211_CIPHER_AES_CCM))
                 rsn->rsn_ucastcipher = IEEE80211_CIPHER_AES_CCM;
 	else if (w & (1 << IEEE80211_CIPHER_AES_OCB))
 		rsn->rsn_ucastcipher = IEEE80211_CIPHER_AES_OCB;
 	else if (w & (1 << IEEE80211_CIPHER_TKIP))
 		rsn->rsn_ucastcipher = IEEE80211_CIPHER_TKIP;
 	else if ((w & (1 << IEEE80211_CIPHER_NONE)) &&
 	    (rsn->rsn_mcastcipher == IEEE80211_CIPHER_WEP ||
 	     rsn->rsn_mcastcipher == IEEE80211_CIPHER_TKIP))
 		rsn->rsn_ucastcipher = IEEE80211_CIPHER_NONE;
 	else {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "RSN", "no usable pairwise cipher suite found (w=%d)",
 		    w);
 		return IEEE80211_REASON_PAIRWISE_CIPHER_INVALID;
 	}
 
 	/* key management algorithms */
 	n = le16dec(frm);
 	frm += 2, len -= 2;
 	if (len < n*4) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
 		    wh, "RSN", "key mgmt alg data too short; len %u, n %u",
 		    len, n);
 		return IEEE80211_REASON_IE_INVALID;
 	}
 	w = 0;
 	for (; n > 0; n--) {
 		w |= rsn_keymgmt(frm);
 		frm += 4, len -= 4;
 	}
 	if (w & RSN_ASE_8021X_UNSPEC)
 		rsn->rsn_keymgmt = RSN_ASE_8021X_UNSPEC;
 	else
 		rsn->rsn_keymgmt = RSN_ASE_8021X_PSK;
 
 	/* optional RSN capabilities */
 	if (len > 2)
 		rsn->rsn_caps = le16dec(frm);
 	/* XXXPMKID */
 
 	return 0;
 }
 
 /*
  * WPA/802.11i association request processing.
  */
 static int
 wpa_assocreq(struct ieee80211_node *ni, struct ieee80211_rsnparms *rsnparms,
 	const struct ieee80211_frame *wh, const uint8_t *wpa,
 	const uint8_t *rsn, uint16_t capinfo)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	uint8_t reason;
 	int badwparsn;
 
 	ni->ni_flags &= ~(IEEE80211_NODE_WPS|IEEE80211_NODE_TSN);
 	if (wpa == NULL && rsn == NULL) {
 		if (vap->iv_flags_ext & IEEE80211_FEXT_WPS) {
 			/*
 			 * W-Fi Protected Setup (WPS) permits
 			 * clients to associate and pass EAPOL frames
 			 * to establish initial credentials.
 			 */
 			ni->ni_flags |= IEEE80211_NODE_WPS;
 			return 1;
 		}
 		if ((vap->iv_flags_ext & IEEE80211_FEXT_TSN) &&
 		    (capinfo & IEEE80211_CAPINFO_PRIVACY)) {
 			/* 
 			 * Transitional Security Network.  Permits clients
 			 * to associate and use WEP while WPA is configured.
 			 */
 			ni->ni_flags |= IEEE80211_NODE_TSN;
 			return 1;
 		}
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA,
 		    wh, NULL, "%s", "no WPA/RSN IE in association request");
 		vap->iv_stats.is_rx_assoc_badwpaie++;
 		reason = IEEE80211_REASON_IE_INVALID;
 		goto bad;
 	}
 	/* assert right association security credentials */
 	badwparsn = 0;			/* NB: to silence compiler */
 	switch (vap->iv_flags & IEEE80211_F_WPA) {
 	case IEEE80211_F_WPA1:
 		badwparsn = (wpa == NULL);
 		break;
 	case IEEE80211_F_WPA2:
 		badwparsn = (rsn == NULL);
 		break;
 	case IEEE80211_F_WPA1|IEEE80211_F_WPA2:
 		badwparsn = (wpa == NULL && rsn == NULL);
 		break;
 	}
 	if (badwparsn) {
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA,
 		    wh, NULL,
 		    "%s", "missing WPA/RSN IE in association request");
 		vap->iv_stats.is_rx_assoc_badwpaie++;
 		reason = IEEE80211_REASON_IE_INVALID;
 		goto bad;
 	}
 	/*
 	 * Parse WPA/RSN information element.
 	 */
 	if (wpa != NULL)
 		reason = ieee80211_parse_wpa(vap, wpa, rsnparms, wh);
 	else
 		reason = ieee80211_parse_rsn(vap, rsn, rsnparms, wh);
 	if (reason != 0) {
 		/* XXX wpa->rsn fallback? */
 		/* XXX distinguish WPA/RSN? */
 		vap->iv_stats.is_rx_assoc_badwpaie++;
 		goto bad;
 	}
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, ni,
 	    "%s ie: mc %u/%u uc %u/%u key %u caps 0x%x",
 	    wpa != NULL ? "WPA" : "RSN",
 	    rsnparms->rsn_mcastcipher, rsnparms->rsn_mcastkeylen,
 	    rsnparms->rsn_ucastcipher, rsnparms->rsn_ucastkeylen,
 	    rsnparms->rsn_keymgmt, rsnparms->rsn_caps);
 
 	return 1;
 bad:
 	ieee80211_node_deauth(ni, reason);
 	return 0;
 }
 
 /* XXX find a better place for definition */
 struct l2_update_frame {
 	struct ether_header eh;
 	uint8_t dsap;
 	uint8_t ssap;
 	uint8_t control;
 	uint8_t xid[3];
 }  __packed;
 
 /*
  * Deliver a TGf L2UF frame on behalf of a station.
  * This primes any bridge when the station is roaming
  * between ap's on the same wired network.
  */
 static void
 ieee80211_deliver_l2uf(struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ifnet *ifp = vap->iv_ifp;
 	struct mbuf *m;
 	struct l2_update_frame *l2uf;
 	struct ether_header *eh;
 	
 	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
 		    "%s", "no mbuf for l2uf frame");
 		vap->iv_stats.is_rx_nobuf++;	/* XXX not right */
 		return;
 	}
 	l2uf = mtod(m, struct l2_update_frame *);
 	eh = &l2uf->eh;
 	/* dst: Broadcast address */
 	IEEE80211_ADDR_COPY(eh->ether_dhost, ifp->if_broadcastaddr);
 	/* src: associated STA */
 	IEEE80211_ADDR_COPY(eh->ether_shost, ni->ni_macaddr);
 	eh->ether_type = htons(sizeof(*l2uf) - sizeof(*eh));
 	
 	l2uf->dsap = 0;
 	l2uf->ssap = 0;
 	l2uf->control = 0xf5;
 	l2uf->xid[0] = 0x81;
 	l2uf->xid[1] = 0x80;
 	l2uf->xid[2] = 0x00;
 	
 	m->m_pkthdr.len = m->m_len = sizeof(*l2uf);
 	hostap_deliver_data(vap, ni, m);
 }
 
 static void
 ratesetmismatch(struct ieee80211_node *ni, const struct ieee80211_frame *wh,
 	int reassoc, int resp, const char *tag, int rate)
 {
 	IEEE80211_NOTE_MAC(ni->ni_vap, IEEE80211_MSG_ANY, wh->i_addr2,
 	    "deny %s request, %s rate set mismatch, rate/MCS %d",
 	    reassoc ? "reassoc" : "assoc", tag, rate & IEEE80211_RATE_VAL);
 	IEEE80211_SEND_MGMT(ni, resp, IEEE80211_STATUS_BASIC_RATE);
 	ieee80211_node_leave(ni);
 }
 
 static void
 capinfomismatch(struct ieee80211_node *ni, const struct ieee80211_frame *wh,
 	int reassoc, int resp, const char *tag, int capinfo)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2,
 	    "deny %s request, %s mismatch 0x%x",
 	    reassoc ? "reassoc" : "assoc", tag, capinfo);
 	IEEE80211_SEND_MGMT(ni, resp, IEEE80211_STATUS_CAPINFO);
 	ieee80211_node_leave(ni);
 	vap->iv_stats.is_rx_assoc_capmismatch++;
 }
 
 static void
 htcapmismatch(struct ieee80211_node *ni, const struct ieee80211_frame *wh,
 	int reassoc, int resp)
 {
 	IEEE80211_NOTE_MAC(ni->ni_vap, IEEE80211_MSG_ANY, wh->i_addr2,
 	    "deny %s request, %s missing HT ie", reassoc ? "reassoc" : "assoc");
 	/* XXX no better code */
 	IEEE80211_SEND_MGMT(ni, resp, IEEE80211_STATUS_MISSING_HT_CAPS);
 	ieee80211_node_leave(ni);
 }
 
 static void
 authalgreject(struct ieee80211_node *ni, const struct ieee80211_frame *wh,
 	int algo, int seq, int status)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 	    wh, NULL, "unsupported alg %d", algo);
 	vap->iv_stats.is_rx_auth_unsupported++;
 	ieee80211_send_error(ni, wh->i_addr2, IEEE80211_FC0_SUBTYPE_AUTH,
 	    seq | (status << 16));
 }
 
 static __inline int
 ishtmixed(const uint8_t *ie)
 {
 	const struct ieee80211_ie_htinfo *ht =
 	    (const struct ieee80211_ie_htinfo *) ie;
 	return (ht->hi_byte2 & IEEE80211_HTINFO_OPMODE) ==
 	    IEEE80211_HTINFO_OPMODE_MIXED;
 }
 
 static int
 is11bclient(const uint8_t *rates, const uint8_t *xrates)
 {
 	static const uint32_t brates = (1<<2*1)|(1<<2*2)|(1<<11)|(1<<2*11);
 	int i;
 
 	/* NB: the 11b clients we care about will not have xrates */
 	if (xrates != NULL || rates == NULL)
 		return 0;
 	for (i = 0; i < rates[1]; i++) {
 		int r = rates[2+i] & IEEE80211_RATE_VAL;
 		if (r > 2*11 || ((1<<r) & brates) == 0)
 			return 0;
 	}
 	return 1;
 }
 
 static void
 hostap_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0,
 	int subtype, const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_frame *wh;
 	uint8_t *frm, *efrm, *sfrm;
 	uint8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath, *htcap;
 	uint8_t *vhtcap, *vhtinfo;
 	int reassoc, resp;
 	uint8_t rate;
 
 	wh = mtod(m0, struct ieee80211_frame *);
 	frm = (uint8_t *)&wh[1];
 	efrm = mtod(m0, uint8_t *) + m0->m_len;
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 		/*
 		 * We process beacon/probe response frames when scanning;
 		 * otherwise we check beacon frames for overlapping non-ERP
 		 * BSS in 11g and/or overlapping legacy BSS when in HT.
 		 */
 		if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) {
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 		/* FALLTHROUGH */
 	case IEEE80211_FC0_SUBTYPE_BEACON: {
 		struct ieee80211_scanparams scan;
 
 		/* NB: accept off-channel frames */
 		/* XXX TODO: use rxstatus to determine off-channel details */
 		if (ieee80211_parse_beacon(ni, m0, ic->ic_curchan, &scan) &~ IEEE80211_BPARSE_OFFCHAN)
 			return;
 		/*
 		 * Count frame now that we know it's to be processed.
 		 */
 		if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) {
 			vap->iv_stats.is_rx_beacon++;		/* XXX remove */
 			IEEE80211_NODE_STAT(ni, rx_beacons);
 		} else
 			IEEE80211_NODE_STAT(ni, rx_proberesp);
 		/*
 		 * If scanning, just pass information to the scan module.
 		 */
 		if (ic->ic_flags & IEEE80211_F_SCAN) {
 			if (scan.status == 0 &&		/* NB: on channel */
 			    (ic->ic_flags_ext & IEEE80211_FEXT_PROBECHAN)) {
 				/*
 				 * Actively scanning a channel marked passive;
 				 * send a probe request now that we know there
 				 * is 802.11 traffic present.
 				 *
 				 * XXX check if the beacon we recv'd gives
 				 * us what we need and suppress the probe req
 				 */
 				ieee80211_probe_curchan(vap, 1);
 				ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN;
 			}
 			ieee80211_add_scan(vap, ic->ic_curchan, &scan, wh,
 			    subtype, rssi, nf);
 			return;
 		}
 		/*
 		 * Check beacon for overlapping bss w/ non ERP stations.
 		 * If we detect one and protection is configured but not
 		 * enabled, enable it and start a timer that'll bring us
 		 * out if we stop seeing the bss.
 		 */
 		if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) &&
 		    scan.status == 0 &&			/* NB: on-channel */
 		    ((scan.erp & 0x100) == 0 ||		/* NB: no ERP, 11b sta*/
 		     (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) {
 			ic->ic_lastnonerp = ticks;
 			ic->ic_flags_ext |= IEEE80211_FEXT_NONERP_PR;
 			if (ic->ic_protmode != IEEE80211_PROT_NONE &&
 			    (ic->ic_flags & IEEE80211_F_USEPROT) == 0) {
 				IEEE80211_NOTE_FRAME(vap,
 				    IEEE80211_MSG_ASSOC, wh,
 				    "non-ERP present on channel %d "
 				    "(saw erp 0x%x from channel %d), "
 				    "enable use of protection",
 				    ic->ic_curchan->ic_ieee,
 				    scan.erp, scan.chan);
 				ic->ic_flags |= IEEE80211_F_USEPROT;
 				ieee80211_notify_erp(ic);
 			}
 		}
 		/* 
 		 * Check beacon for non-HT station on HT channel
 		 * and update HT BSS occupancy as appropriate.
 		 */
 		if (IEEE80211_IS_CHAN_HT(ic->ic_curchan)) {
 			if (scan.status & IEEE80211_BPARSE_OFFCHAN) {
 				/*
 				 * Off control channel; only check frames
 				 * that come in the extension channel when
 				 * operating w/ HT40.
 				 */
 				if (!IEEE80211_IS_CHAN_HT40(ic->ic_curchan))
 					break;
 				if (scan.chan != ic->ic_curchan->ic_extieee)
 					break;
 			}
 			if (scan.htinfo == NULL) {
 				ieee80211_htprot_update(ic,
 				    IEEE80211_HTINFO_OPMODE_PROTOPT |
 				    IEEE80211_HTINFO_NONHT_PRESENT);
 			} else if (ishtmixed(scan.htinfo)) {
 				/* XXX? take NONHT_PRESENT from beacon? */
 				ieee80211_htprot_update(ic,
 				    IEEE80211_HTINFO_OPMODE_MIXED |
 				    IEEE80211_HTINFO_NONHT_PRESENT);
 			}
 		}
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 		if (vap->iv_state != IEEE80211_S_RUN) {
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 		/*
 		 * Consult the ACL policy module if setup.
 		 */
 		if (vap->iv_acl != NULL && !vap->iv_acl->iac_check(vap, wh)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
 			    wh, NULL, "%s", "disallowed by ACL");
 			vap->iv_stats.is_rx_acl++;
 			return;
 		}
 		/*
 		 * prreq frame format
 		 *	[tlv] ssid
 		 *	[tlv] supported rates
 		 *	[tlv] extended supported rates
 		 */
 		ssid = rates = xrates = NULL;
 		while (efrm - frm > 1) {
 			IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
 			switch (*frm) {
 			case IEEE80211_ELEMID_SSID:
 				ssid = frm;
 				break;
 			case IEEE80211_ELEMID_RATES:
 				rates = frm;
 				break;
 			case IEEE80211_ELEMID_XRATES:
 				xrates = frm;
 				break;
 			}
 			frm += frm[1] + 2;
 		}
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE, return);
 		if (xrates != NULL)
 			IEEE80211_VERIFY_ELEMENT(xrates,
 				IEEE80211_RATE_MAXSIZE - rates[1], return);
 		IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN, return);
 		IEEE80211_VERIFY_SSID(vap->iv_bss, ssid, return);
 		if ((vap->iv_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL,
 			    "%s", "no ssid with ssid suppression enabled");
 			vap->iv_stats.is_rx_ssidmismatch++; /*XXX*/
 			return;
 		}
 
 		/* XXX find a better class or define it's own */
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2,
 		    "%s", "recv probe req");
 		/*
 		 * Some legacy 11b clients cannot hack a complete
 		 * probe response frame.  When the request includes
 		 * only a bare-bones rate set, communicate this to
 		 * the transmit side.
 		 */
 		ieee80211_send_proberesp(vap, wh->i_addr2,
 		    is11bclient(rates, xrates) ? IEEE80211_SEND_LEGACY_11B : 0);
 		break;
 
 	case IEEE80211_FC0_SUBTYPE_AUTH: {
 		uint16_t algo, seq, status;
 
 		if (vap->iv_state != IEEE80211_S_RUN) {
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 		if (!IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_bss->ni_bssid)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 			    wh, NULL, "%s", "wrong bssid");
 			vap->iv_stats.is_rx_wrongbss++;	/*XXX unique stat?*/
 			return;
 		}
 		/*
 		 * auth frame format
 		 *	[2] algorithm
 		 *	[2] sequence
 		 *	[2] status
 		 *	[tlv*] challenge
 		 */
 		IEEE80211_VERIFY_LENGTH(efrm - frm, 6, return);
 		algo   = le16toh(*(uint16_t *)frm);
 		seq    = le16toh(*(uint16_t *)(frm + 2));
 		status = le16toh(*(uint16_t *)(frm + 4));
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr2,
 		    "recv auth frame with algorithm %d seq %d", algo, seq);
 		/*
 		 * Consult the ACL policy module if setup.
 		 */
 		if (vap->iv_acl != NULL && !vap->iv_acl->iac_check(vap, wh)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
 			    wh, NULL, "%s", "disallowed by ACL");
 			vap->iv_stats.is_rx_acl++;
 			ieee80211_send_error(ni, wh->i_addr2,
 			    IEEE80211_FC0_SUBTYPE_AUTH,
 			    (seq+1) | (IEEE80211_STATUS_UNSPECIFIED<<16));
 			return;
 		}
 		if (vap->iv_flags & IEEE80211_F_COUNTERM) {
 			IEEE80211_DISCARD(vap,
 			    IEEE80211_MSG_AUTH | IEEE80211_MSG_CRYPTO,
 			    wh, NULL, "%s", "TKIP countermeasures enabled");
 			vap->iv_stats.is_rx_auth_countermeasures++;
 			ieee80211_send_error(ni, wh->i_addr2,
 				IEEE80211_FC0_SUBTYPE_AUTH,
 				IEEE80211_REASON_MIC_FAILURE);
 			return;
 		}
 		if (algo == IEEE80211_AUTH_ALG_SHARED)
 			hostap_auth_shared(ni, wh, frm + 6, efrm, rssi, nf,
 			    seq, status);
 		else if (algo == IEEE80211_AUTH_ALG_OPEN)
 			hostap_auth_open(ni, wh, rssi, nf, seq, status);
 		else if (algo == IEEE80211_AUTH_ALG_LEAP) {
 			authalgreject(ni, wh, algo,
 			    seq+1, IEEE80211_STATUS_ALG);
 			return;
 		} else {
 			/*
 			 * We assume that an unknown algorithm is the result
 			 * of a decryption failure on a shared key auth frame;
 			 * return a status code appropriate for that instead
 			 * of IEEE80211_STATUS_ALG.
 			 *
 			 * NB: a seq# of 4 is intentional; the decrypted
 			 *     frame likely has a bogus seq value.
 			 */
 			authalgreject(ni, wh, algo,
 			    4, IEEE80211_STATUS_CHALLENGE);
 			return;
 		} 
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: {
 		uint16_t capinfo, lintval;
 		struct ieee80211_rsnparms rsnparms;
 
 		if (vap->iv_state != IEEE80211_S_RUN) {
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 		if (!IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_bss->ni_bssid)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 			    wh, NULL, "%s", "wrong bssid");
 			vap->iv_stats.is_rx_assoc_bss++;
 			return;
 		}
 		if (subtype == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) {
 			reassoc = 1;
 			resp = IEEE80211_FC0_SUBTYPE_REASSOC_RESP;
 		} else {
 			reassoc = 0;
 			resp = IEEE80211_FC0_SUBTYPE_ASSOC_RESP;
 		}
 		if (ni == vap->iv_bss) {
 			IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2,
 			    "deny %s request, sta not authenticated",
 			    reassoc ? "reassoc" : "assoc");
 			ieee80211_send_error(ni, wh->i_addr2,
 			    IEEE80211_FC0_SUBTYPE_DEAUTH,
 			    IEEE80211_REASON_ASSOC_NOT_AUTHED);
 			vap->iv_stats.is_rx_assoc_notauth++;
 			return;
 		}
 
 		/*
 		 * asreq frame format
 		 *	[2] capability information
 		 *	[2] listen interval
 		 *	[6*] current AP address (reassoc only)
 		 *	[tlv] ssid
 		 *	[tlv] supported rates
 		 *	[tlv] extended supported rates
 		 *	[tlv] WPA or RSN
 		 *	[tlv] HT capabilities
 		 *	[tlv] Atheros capabilities
 		 */
 		IEEE80211_VERIFY_LENGTH(efrm - frm, (reassoc ? 10 : 4), return);
 		capinfo = le16toh(*(uint16_t *)frm);	frm += 2;
 		lintval = le16toh(*(uint16_t *)frm);	frm += 2;
 		if (reassoc)
 			frm += 6;	/* ignore current AP info */
 		ssid = rates = xrates = wpa = rsn = wme = ath = htcap = NULL;
 		vhtcap = vhtinfo = NULL;
 		sfrm = frm;
 		while (efrm - frm > 1) {
 			IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
 			switch (*frm) {
 			case IEEE80211_ELEMID_SSID:
 				ssid = frm;
 				break;
 			case IEEE80211_ELEMID_RATES:
 				rates = frm;
 				break;
 			case IEEE80211_ELEMID_XRATES:
 				xrates = frm;
 				break;
 			case IEEE80211_ELEMID_RSN:
 				rsn = frm;
 				break;
 			case IEEE80211_ELEMID_HTCAP:
 				htcap = frm;
 				break;
 			case IEEE80211_ELEMID_VHT_CAP:
 				vhtcap = frm;
 				break;
 			case IEEE80211_ELEMID_VHT_OPMODE:
 				vhtinfo = frm;
 				break;
 			case IEEE80211_ELEMID_VENDOR:
 				if (iswpaoui(frm))
 					wpa = frm;
 				else if (iswmeinfo(frm))
 					wme = frm;
 #ifdef IEEE80211_SUPPORT_SUPERG
 				else if (isatherosoui(frm))
 					ath = frm;
 #endif
 				else if (vap->iv_flags_ht & IEEE80211_FHT_HTCOMPAT) {
 					if (ishtcapoui(frm) && htcap == NULL)
 						htcap = frm;
 				}
 				break;
 			}
 			frm += frm[1] + 2;
 		}
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE, return);
 		if (xrates != NULL)
 			IEEE80211_VERIFY_ELEMENT(xrates,
 				IEEE80211_RATE_MAXSIZE - rates[1], return);
 		IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN, return);
 		IEEE80211_VERIFY_SSID(vap->iv_bss, ssid, return);
 		if (htcap != NULL) {
 			IEEE80211_VERIFY_LENGTH(htcap[1],
 			     htcap[0] == IEEE80211_ELEMID_VENDOR ?
 			         4 + sizeof(struct ieee80211_ie_htcap)-2 :
 			         sizeof(struct ieee80211_ie_htcap)-2,
 			     return);		/* XXX just NULL out? */
 		}
 
 		/* Validate VHT IEs */
 		if (vhtcap != NULL) {
 			IEEE80211_VERIFY_LENGTH(vhtcap[1],
 			    sizeof(struct ieee80211_ie_vhtcap) - 2,
 			    return);
 		}
 		if (vhtinfo != NULL) {
 			IEEE80211_VERIFY_LENGTH(vhtinfo[1],
 			    sizeof(struct ieee80211_ie_vht_operation) - 2,
 			    return);
 		}
 
 		if ((vap->iv_flags & IEEE80211_F_WPA) &&
 		    !wpa_assocreq(ni, &rsnparms, wh, wpa, rsn, capinfo))
 			return;
 		/* discard challenge after association */
 		if (ni->ni_challenge != NULL) {
 			IEEE80211_FREE(ni->ni_challenge, M_80211_NODE);
 			ni->ni_challenge = NULL;
 		}
 		/* NB: 802.11 spec says to ignore station's privacy bit */
 		if ((capinfo & IEEE80211_CAPINFO_ESS) == 0) {
 			capinfomismatch(ni, wh, reassoc, resp,
 			    "capability", capinfo);
 			return;
 		}
 		/*
 		 * Disallow re-associate w/ invalid slot time setting.
 		 */
 		if (ni->ni_associd != 0 &&
 		    IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan) &&
 		    ((ni->ni_capinfo ^ capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME)) {
 			capinfomismatch(ni, wh, reassoc, resp,
 			    "slot time", capinfo);
 			return;
 		}
 		rate = ieee80211_setup_rates(ni, rates, xrates,
 				IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE |
 				IEEE80211_F_DONEGO | IEEE80211_F_DODEL);
 		if (rate & IEEE80211_RATE_BASIC) {
 			ratesetmismatch(ni, wh, reassoc, resp, "legacy", rate);
 			vap->iv_stats.is_rx_assoc_norate++;
 			return;
 		}
 		/*
 		 * If constrained to 11g-only stations reject an
 		 * 11b-only station.  We cheat a bit here by looking
 		 * at the max negotiated xmit rate and assuming anyone
 		 * with a best rate <24Mb/s is an 11b station.
 		 */
 		if ((vap->iv_flags & IEEE80211_F_PUREG) && rate < 48) {
 			ratesetmismatch(ni, wh, reassoc, resp, "11g", rate);
 			vap->iv_stats.is_rx_assoc_norate++;
 			return;
 		}
 
 		/*
 		 * Do HT rate set handling and setup HT node state.
 		 */
 		ni->ni_chan = vap->iv_bss->ni_chan;
 
 		/* VHT */
 		if (IEEE80211_IS_CHAN_VHT(ni->ni_chan) &&
 		    vhtcap != NULL &&
 		    vhtinfo != NULL) {
 			/* XXX TODO; see below */
 			printf("%s: VHT TODO!\n", __func__);
 			ieee80211_vht_node_init(ni);
 			ieee80211_vht_update_cap(ni, vhtcap, vhtinfo);
 		} else if (ni->ni_flags & IEEE80211_NODE_VHT)
 			ieee80211_vht_node_cleanup(ni);
 
 		/* HT */
 		if (IEEE80211_IS_CHAN_HT(ni->ni_chan) && htcap != NULL) {
 			rate = ieee80211_setup_htrates(ni, htcap,
 				IEEE80211_F_DOFMCS | IEEE80211_F_DONEGO |
 				IEEE80211_F_DOBRS);
 			if (rate & IEEE80211_RATE_BASIC) {
 				ratesetmismatch(ni, wh, reassoc, resp,
 				    "HT", rate);
 				vap->iv_stats.is_ht_assoc_norate++;
 				return;
 			}
 			ieee80211_ht_node_init(ni);
 			ieee80211_ht_updatehtcap(ni, htcap);
 		} else if (ni->ni_flags & IEEE80211_NODE_HT)
 			ieee80211_ht_node_cleanup(ni);
 
 		/* Finally - this will use HT/VHT info to change node channel */
 		if (IEEE80211_IS_CHAN_HT(ni->ni_chan) && htcap != NULL) {
 			ieee80211_ht_updatehtcap_final(ni);
 		}
 
 #ifdef IEEE80211_SUPPORT_SUPERG
 		/* Always do ff node cleanup; for A-MSDU */
 		ieee80211_ff_node_cleanup(ni);
 #endif
 		/*
 		 * Allow AMPDU operation only with unencrypted traffic
 		 * or AES-CCM; the 11n spec only specifies these ciphers
 		 * so permitting any others is undefined and can lead
 		 * to interoperability problems.
 		 */
 		if ((ni->ni_flags & IEEE80211_NODE_HT) &&
 		    (((vap->iv_flags & IEEE80211_F_WPA) &&
 		      rsnparms.rsn_ucastcipher != IEEE80211_CIPHER_AES_CCM) ||
 		     (vap->iv_flags & (IEEE80211_F_WPA|IEEE80211_F_PRIVACY)) == IEEE80211_F_PRIVACY)) {
 			IEEE80211_NOTE(vap,
 			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, ni,
 			    "disallow HT use because WEP or TKIP requested, "
 			    "capinfo 0x%x ucastcipher %d", capinfo,
 			    rsnparms.rsn_ucastcipher);
 			ieee80211_ht_node_cleanup(ni);
 #ifdef IEEE80211_SUPPORT_SUPERG
 			/* Always do ff node cleanup; for A-MSDU */
 			ieee80211_ff_node_cleanup(ni);
 #endif
 			vap->iv_stats.is_ht_assoc_downgrade++;
 		}
 		/*
 		 * If constrained to 11n-only stations reject legacy stations.
 		 */
 		if ((vap->iv_flags_ht & IEEE80211_FHT_PUREN) &&
 		    (ni->ni_flags & IEEE80211_NODE_HT) == 0) {
 			htcapmismatch(ni, wh, reassoc, resp);
 			vap->iv_stats.is_ht_assoc_nohtcap++;
 			return;
 		}
 		IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
 		ni->ni_noise = nf;
 		ni->ni_intval = lintval;
 		ni->ni_capinfo = capinfo;
 		ni->ni_fhdwell = vap->iv_bss->ni_fhdwell;
 		ni->ni_fhindex = vap->iv_bss->ni_fhindex;
 		/*
 		 * Store the IEs.
 		 * XXX maybe better to just expand
 		 */
 		if (ieee80211_ies_init(&ni->ni_ies, sfrm, efrm - sfrm)) {
 #define	setie(_ie, _off)	ieee80211_ies_setie(ni->ni_ies, _ie, _off)
 			if (wpa != NULL)
 				setie(wpa_ie, wpa - sfrm);
 			if (rsn != NULL)
 				setie(rsn_ie, rsn - sfrm);
 			if (htcap != NULL)
 				setie(htcap_ie, htcap - sfrm);
 			if (wme != NULL) {
 				setie(wme_ie, wme - sfrm);
 				/*
 				 * Mark node as capable of QoS.
 				 */
 				ni->ni_flags |= IEEE80211_NODE_QOS;
 			} else
 				ni->ni_flags &= ~IEEE80211_NODE_QOS;
 #ifdef IEEE80211_SUPPORT_SUPERG
 			if (ath != NULL) {
 				setie(ath_ie, ath - sfrm);
 				/* 
 				 * Parse ATH station parameters.
 				 */
 				ieee80211_parse_ath(ni, ni->ni_ies.ath_ie);
 			} else
 #endif
 				ni->ni_ath_flags = 0;
 #undef setie
 		} else {
 			ni->ni_flags &= ~IEEE80211_NODE_QOS;
 			ni->ni_ath_flags = 0;
 		}
 		ieee80211_node_join(ni, resp);
 		ieee80211_deliver_l2uf(ni);
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_DEAUTH:
 	case IEEE80211_FC0_SUBTYPE_DISASSOC: {
 		uint16_t reason;
 
 		if (vap->iv_state != IEEE80211_S_RUN ||
 		    /* NB: can happen when in promiscuous mode */
 		    !IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr)) {
 			vap->iv_stats.is_rx_mgtdiscard++;
 			break;
 		}
 		/*
 		 * deauth/disassoc frame format
 		 *	[2] reason
 		 */
 		IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return);
 		reason = le16toh(*(uint16_t *)frm);
 		if (subtype == IEEE80211_FC0_SUBTYPE_DEAUTH) {
 			vap->iv_stats.is_rx_deauth++;
 			IEEE80211_NODE_STAT(ni, rx_deauth);
 		} else {
 			vap->iv_stats.is_rx_disassoc++;
 			IEEE80211_NODE_STAT(ni, rx_disassoc);
 		}
 		IEEE80211_NOTE(vap, IEEE80211_MSG_AUTH, ni,
 		    "recv %s (reason: %d (%s))",
 		    ieee80211_mgt_subtype_name(subtype),
 		    reason, ieee80211_reason_to_string(reason));
 		if (ni != vap->iv_bss)
 			ieee80211_node_leave(ni);
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_ACTION:
 	case IEEE80211_FC0_SUBTYPE_ACTION_NOACK:
 		if (ni == vap->iv_bss) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "unknown node");
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) &&
 		    !IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "not for us");
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else if (vap->iv_state != IEEE80211_S_RUN) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "wrong state %s",
 			    ieee80211_state_name[vap->iv_state]);
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else {
 			if (ieee80211_parse_action(ni, m0) == 0)
 				(void)ic->ic_recv_action(ni, wh, frm, efrm);
 		}
 		break;
 
 	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_TIMING_ADV:
 	case IEEE80211_FC0_SUBTYPE_ATIM:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 		    wh, NULL, "%s", "not handled");
 		vap->iv_stats.is_rx_mgtdiscard++;
 		break;
 
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, "mgt", "subtype 0x%x not handled", subtype);
 		vap->iv_stats.is_rx_badsubtype++;
 		break;
 	}
 }
 
 static void
 hostap_recv_ctl(struct ieee80211_node *ni, struct mbuf *m, int subtype)
 {
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_PS_POLL:
 		ni->ni_vap->iv_recv_pspoll(ni, m);
 		break;
 	case IEEE80211_FC0_SUBTYPE_BAR:
 		ieee80211_recv_bar(ni, m);
 		break;
 	}
 }
 
 /*
  * Process a received ps-poll frame.
  */
 void
 ieee80211_recv_pspoll(struct ieee80211_node *ni, struct mbuf *m0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_frame_min *wh;
 	struct mbuf *m;
 	uint16_t aid;
 	int qlen;
 
 	wh = mtod(m0, struct ieee80211_frame_min *);
 	if (ni->ni_associd == 0) {
 		IEEE80211_DISCARD(vap,
 		    IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG,
 		    (struct ieee80211_frame *) wh, NULL,
 		    "%s", "unassociated station");
 		vap->iv_stats.is_ps_unassoc++;
 		IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH,
 			IEEE80211_REASON_NOT_ASSOCED);
 		return;
 	}
 
 	aid = le16toh(*(uint16_t *)wh->i_dur);
 	if (aid != ni->ni_associd) {
 		IEEE80211_DISCARD(vap,
 		    IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG,
 		    (struct ieee80211_frame *) wh, NULL,
 		    "aid mismatch: sta aid 0x%x poll aid 0x%x",
 		    ni->ni_associd, aid);
 		vap->iv_stats.is_ps_badaid++;
 		/*
 		 * NB: We used to deauth the station but it turns out
 		 * the Blackberry Curve 8230 (and perhaps other devices) 
 		 * sometimes send the wrong AID when WME is negotiated.
 		 * Being more lenient here seems ok as we already check
 		 * the station is associated and we only return frames
 		 * queued for the station (i.e. we don't use the AID).
 		 */
 		return;
 	}
 
 	/* Okay, take the first queued packet and put it out... */
 	m = ieee80211_node_psq_dequeue(ni, &qlen);
 	if (m == NULL) {
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_POWER, wh->i_addr2,
 		    "%s", "recv ps-poll, but queue empty");
 		ieee80211_send_nulldata(ieee80211_ref_node(ni));
 		vap->iv_stats.is_ps_qempty++;	/* XXX node stat */
 		if (vap->iv_set_tim != NULL)
 			vap->iv_set_tim(ni, 0);	/* just in case */
 		return;
 	}
 	/* 
 	 * If there are more packets, set the more packets bit
 	 * in the packet dispatched to the station; otherwise
 	 * turn off the TIM bit.
 	 */
 	if (qlen != 0) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni,
 		    "recv ps-poll, send packet, %u still queued", qlen);
 		m->m_flags |= M_MORE_DATA;
 	} else {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni,
 		    "%s", "recv ps-poll, send packet, queue empty");
 		if (vap->iv_set_tim != NULL)
 			vap->iv_set_tim(ni, 0);
 	}
 	m->m_flags |= M_PWR_SAV;		/* bypass PS handling */
 
 	/*
 	 * Do the right thing; if it's an encap'ed frame then
 	 * call ieee80211_parent_xmitpkt() else
 	 * call ieee80211_vap_xmitpkt().
 	 */
 	if (m->m_flags & M_ENCAP) {
 		(void) ieee80211_parent_xmitpkt(ic, m);
 	} else {
 		(void) ieee80211_vap_xmitpkt(vap, m);
 	}
 }
Index: projects/clang500-import/sys/net80211/ieee80211_ht.c
===================================================================
--- projects/clang500-import/sys/net80211/ieee80211_ht.c	(revision 318657)
+++ projects/clang500-import/sys/net80211/ieee80211_ht.c	(revision 318658)
@@ -1,3378 +1,3379 @@
 /*-
  * 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.
  */
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD$");
 #endif
 
 /*
  * IEEE 802.11n protocol support.
  */
 
 #include "opt_inet.h"
 #include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h> 
 #include <sys/endian.h>
  
 #include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_action.h>
 #include <net80211/ieee80211_input.h>
 
 /* define here, used throughout file */
 #define	MS(_v, _f)	(((_v) & _f) >> _f##_S)
 #define	SM(_v, _f)	(((_v) << _f##_S) & _f)
 
 const struct ieee80211_mcs_rates ieee80211_htrates[IEEE80211_HTRATE_MAXSIZE] = {
 	{  13,  14,   27,   30 },	/* MCS 0 */
 	{  26,  29,   54,   60 },	/* MCS 1 */
 	{  39,  43,   81,   90 },	/* MCS 2 */
 	{  52,  58,  108,  120 },	/* MCS 3 */
 	{  78,  87,  162,  180 },	/* MCS 4 */
 	{ 104, 116,  216,  240 },	/* MCS 5 */
 	{ 117, 130,  243,  270 },	/* MCS 6 */
 	{ 130, 144,  270,  300 },	/* MCS 7 */
 	{  26,  29,   54,   60 },	/* MCS 8 */
 	{  52,  58,  108,  120 },	/* MCS 9 */
 	{  78,  87,  162,  180 },	/* MCS 10 */
 	{ 104, 116,  216,  240 },	/* MCS 11 */
 	{ 156, 173,  324,  360 },	/* MCS 12 */
 	{ 208, 231,  432,  480 },	/* MCS 13 */
 	{ 234, 260,  486,  540 },	/* MCS 14 */
 	{ 260, 289,  540,  600 },	/* MCS 15 */
 	{  39,  43,   81,   90 },	/* MCS 16 */
 	{  78,  87,  162,  180 },	/* MCS 17 */
 	{ 117, 130,  243,  270 },	/* MCS 18 */
 	{ 156, 173,  324,  360 },	/* MCS 19 */
 	{ 234, 260,  486,  540 },	/* MCS 20 */
 	{ 312, 347,  648,  720 },	/* MCS 21 */
 	{ 351, 390,  729,  810 },	/* MCS 22 */
 	{ 390, 433,  810,  900 },	/* MCS 23 */
 	{  52,  58,  108,  120 },	/* MCS 24 */
 	{ 104, 116,  216,  240 },	/* MCS 25 */
 	{ 156, 173,  324,  360 },	/* MCS 26 */
 	{ 208, 231,  432,  480 },	/* MCS 27 */
 	{ 312, 347,  648,  720 },	/* MCS 28 */
 	{ 416, 462,  864,  960 },	/* MCS 29 */
 	{ 468, 520,  972, 1080 },	/* MCS 30 */
 	{ 520, 578, 1080, 1200 },	/* MCS 31 */
 	{   0,   0,   12,   13 },	/* MCS 32 */
 	{  78,  87,  162,  180 },	/* MCS 33 */
 	{ 104, 116,  216,  240 },	/* MCS 34 */
 	{ 130, 144,  270,  300 },	/* MCS 35 */
 	{ 117, 130,  243,  270 },	/* MCS 36 */
 	{ 156, 173,  324,  360 },	/* MCS 37 */
 	{ 195, 217,  405,  450 },	/* MCS 38 */
 	{ 104, 116,  216,  240 },	/* MCS 39 */
 	{ 130, 144,  270,  300 },	/* MCS 40 */
 	{ 130, 144,  270,  300 },	/* MCS 41 */
 	{ 156, 173,  324,  360 },	/* MCS 42 */
 	{ 182, 202,  378,  420 },	/* MCS 43 */
 	{ 182, 202,  378,  420 },	/* MCS 44 */
 	{ 208, 231,  432,  480 },	/* MCS 45 */
 	{ 156, 173,  324,  360 },	/* MCS 46 */
 	{ 195, 217,  405,  450 },	/* MCS 47 */
 	{ 195, 217,  405,  450 },	/* MCS 48 */
 	{ 234, 260,  486,  540 },	/* MCS 49 */
 	{ 273, 303,  567,  630 },	/* MCS 50 */
 	{ 273, 303,  567,  630 },	/* MCS 51 */
 	{ 312, 347,  648,  720 },	/* MCS 52 */
 	{ 130, 144,  270,  300 },	/* MCS 53 */
 	{ 156, 173,  324,  360 },	/* MCS 54 */
 	{ 182, 202,  378,  420 },	/* MCS 55 */
 	{ 156, 173,  324,  360 },	/* MCS 56 */
 	{ 182, 202,  378,  420 },	/* MCS 57 */
 	{ 208, 231,  432,  480 },	/* MCS 58 */
 	{ 234, 260,  486,  540 },	/* MCS 59 */
 	{ 208, 231,  432,  480 },	/* MCS 60 */
 	{ 234, 260,  486,  540 },	/* MCS 61 */
 	{ 260, 289,  540,  600 },	/* MCS 62 */
 	{ 260, 289,  540,  600 },	/* MCS 63 */
 	{ 286, 318,  594,  660 },	/* MCS 64 */
 	{ 195, 217,  405,  450 },	/* MCS 65 */
 	{ 234, 260,  486,  540 },	/* MCS 66 */
 	{ 273, 303,  567,  630 },	/* MCS 67 */
 	{ 234, 260,  486,  540 },	/* MCS 68 */
 	{ 273, 303,  567,  630 },	/* MCS 69 */
 	{ 312, 347,  648,  720 },	/* MCS 70 */
 	{ 351, 390,  729,  810 },	/* MCS 71 */
 	{ 312, 347,  648,  720 },	/* MCS 72 */
 	{ 351, 390,  729,  810 },	/* MCS 73 */
 	{ 390, 433,  810,  900 },	/* MCS 74 */
 	{ 390, 433,  810,  900 },	/* MCS 75 */
 	{ 429, 477,  891,  990 },	/* MCS 76 */
 };
 
 static	int ieee80211_ampdu_age = -1;	/* threshold for ampdu reorder q (ms) */
 SYSCTL_PROC(_net_wlan, OID_AUTO, ampdu_age, CTLTYPE_INT | CTLFLAG_RW,
 	&ieee80211_ampdu_age, 0, ieee80211_sysctl_msecs_ticks, "I",
 	"AMPDU max reorder age (ms)");
 
 static	int ieee80211_recv_bar_ena = 1;
 SYSCTL_INT(_net_wlan, OID_AUTO, recv_bar, CTLFLAG_RW, &ieee80211_recv_bar_ena,
 	    0, "BAR frame processing (ena/dis)");
 
 static	int ieee80211_addba_timeout = -1;/* timeout for ADDBA response */
 SYSCTL_PROC(_net_wlan, OID_AUTO, addba_timeout, CTLTYPE_INT | CTLFLAG_RW,
 	&ieee80211_addba_timeout, 0, ieee80211_sysctl_msecs_ticks, "I",
 	"ADDBA request timeout (ms)");
 static	int ieee80211_addba_backoff = -1;/* backoff after max ADDBA requests */
 SYSCTL_PROC(_net_wlan, OID_AUTO, addba_backoff, CTLTYPE_INT | CTLFLAG_RW,
 	&ieee80211_addba_backoff, 0, ieee80211_sysctl_msecs_ticks, "I",
 	"ADDBA request backoff (ms)");
 static	int ieee80211_addba_maxtries = 3;/* max ADDBA requests before backoff */
 SYSCTL_INT(_net_wlan, OID_AUTO, addba_maxtries, CTLFLAG_RW,
 	&ieee80211_addba_maxtries, 0, "max ADDBA requests sent before backoff");
 
 static	int ieee80211_bar_timeout = -1;	/* timeout waiting for BAR response */
 static	int ieee80211_bar_maxtries = 50;/* max BAR requests before DELBA */
 
 static	ieee80211_recv_action_func ht_recv_action_ba_addba_request;
 static	ieee80211_recv_action_func ht_recv_action_ba_addba_response;
 static	ieee80211_recv_action_func ht_recv_action_ba_delba;
 static	ieee80211_recv_action_func ht_recv_action_ht_mimopwrsave;
 static	ieee80211_recv_action_func ht_recv_action_ht_txchwidth;
 
 static	ieee80211_send_action_func ht_send_action_ba_addba;
 static	ieee80211_send_action_func ht_send_action_ba_delba;
 static	ieee80211_send_action_func ht_send_action_ht_txchwidth;
 
 static void
 ieee80211_ht_init(void)
 {
 	/*
 	 * Setup HT parameters that depends on the clock frequency.
 	 */
 	ieee80211_ampdu_age = msecs_to_ticks(500);
 	ieee80211_addba_timeout = msecs_to_ticks(250);
 	ieee80211_addba_backoff = msecs_to_ticks(10*1000);
 	ieee80211_bar_timeout = msecs_to_ticks(250);
 	/*
 	 * Register action frame handlers.
 	 */
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA, 
 	    IEEE80211_ACTION_BA_ADDBA_REQUEST, ht_recv_action_ba_addba_request);
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA, 
 	    IEEE80211_ACTION_BA_ADDBA_RESPONSE, ht_recv_action_ba_addba_response);
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA, 
 	    IEEE80211_ACTION_BA_DELBA, ht_recv_action_ba_delba);
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_HT, 
 	    IEEE80211_ACTION_HT_MIMOPWRSAVE, ht_recv_action_ht_mimopwrsave);
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_HT, 
 	    IEEE80211_ACTION_HT_TXCHWIDTH, ht_recv_action_ht_txchwidth);
 
 	ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA, 
 	    IEEE80211_ACTION_BA_ADDBA_REQUEST, ht_send_action_ba_addba);
 	ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA, 
 	    IEEE80211_ACTION_BA_ADDBA_RESPONSE, ht_send_action_ba_addba);
 	ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA, 
 	    IEEE80211_ACTION_BA_DELBA, ht_send_action_ba_delba);
 	ieee80211_send_action_register(IEEE80211_ACTION_CAT_HT, 
 	    IEEE80211_ACTION_HT_TXCHWIDTH, ht_send_action_ht_txchwidth);
 }
 SYSINIT(wlan_ht, SI_SUB_DRIVERS, SI_ORDER_FIRST, ieee80211_ht_init, NULL);
 
 static int ieee80211_ampdu_enable(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap);
 static int ieee80211_addba_request(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap,
 	int dialogtoken, int baparamset, int batimeout);
 static int ieee80211_addba_response(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap,
 	int code, int baparamset, int batimeout);
 static void ieee80211_addba_stop(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap);
 static void null_addba_response_timeout(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap);
 
 static void ieee80211_bar_response(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap, int status);
 static void ampdu_tx_stop(struct ieee80211_tx_ampdu *tap);
 static void bar_stop_timer(struct ieee80211_tx_ampdu *tap);
 static int ampdu_rx_start(struct ieee80211_node *, struct ieee80211_rx_ampdu *,
 	int baparamset, int batimeout, int baseqctl);
 static void ampdu_rx_stop(struct ieee80211_node *, struct ieee80211_rx_ampdu *);
 
 void
 ieee80211_ht_attach(struct ieee80211com *ic)
 {
 	/* setup default aggregation policy */
 	ic->ic_recv_action = ieee80211_recv_action;
 	ic->ic_send_action = ieee80211_send_action;
 	ic->ic_ampdu_enable = ieee80211_ampdu_enable;
 	ic->ic_addba_request = ieee80211_addba_request;
 	ic->ic_addba_response = ieee80211_addba_response;
 	ic->ic_addba_response_timeout = null_addba_response_timeout;
 	ic->ic_addba_stop = ieee80211_addba_stop;
 	ic->ic_bar_response = ieee80211_bar_response;
 	ic->ic_ampdu_rx_start = ampdu_rx_start;
 	ic->ic_ampdu_rx_stop = ampdu_rx_stop;
 
 	ic->ic_htprotmode = IEEE80211_PROT_RTSCTS;
 	ic->ic_curhtprotmode = IEEE80211_HTINFO_OPMODE_PURE;
 }
 
 void
 ieee80211_ht_detach(struct ieee80211com *ic)
 {
 }
 
 void
 ieee80211_ht_vattach(struct ieee80211vap *vap)
 {
 
 	/* driver can override defaults */
 	vap->iv_ampdu_rxmax = IEEE80211_HTCAP_MAXRXAMPDU_8K;
 	vap->iv_ampdu_density = IEEE80211_HTCAP_MPDUDENSITY_NA;
 	vap->iv_ampdu_limit = vap->iv_ampdu_rxmax;
 	vap->iv_amsdu_limit = vap->iv_htcaps & IEEE80211_HTCAP_MAXAMSDU;
 	/* tx aggregation traffic thresholds */
 	vap->iv_ampdu_mintraffic[WME_AC_BK] = 128;
 	vap->iv_ampdu_mintraffic[WME_AC_BE] = 64;
 	vap->iv_ampdu_mintraffic[WME_AC_VO] = 32;
 	vap->iv_ampdu_mintraffic[WME_AC_VI] = 32;
 
 	if (vap->iv_htcaps & IEEE80211_HTC_HT) {
 		/*
 		 * Device is HT capable; enable all HT-related
 		 * facilities by default.
 		 * XXX these choices may be too aggressive.
 		 */
 		vap->iv_flags_ht |= IEEE80211_FHT_HT
 				 |  IEEE80211_FHT_HTCOMPAT
 				 ;
 		if (vap->iv_htcaps & IEEE80211_HTCAP_SHORTGI20)
 			vap->iv_flags_ht |= IEEE80211_FHT_SHORTGI20;
 		/* XXX infer from channel list? */
 		if (vap->iv_htcaps & IEEE80211_HTCAP_CHWIDTH40) {
 			vap->iv_flags_ht |= IEEE80211_FHT_USEHT40;
 			if (vap->iv_htcaps & IEEE80211_HTCAP_SHORTGI40)
 				vap->iv_flags_ht |= IEEE80211_FHT_SHORTGI40;
 		}
 		/* enable RIFS if capable */
 		if (vap->iv_htcaps & IEEE80211_HTC_RIFS)
 			vap->iv_flags_ht |= IEEE80211_FHT_RIFS;
 
 		/* NB: A-MPDU and A-MSDU rx are mandated, these are tx only */
 		vap->iv_flags_ht |= IEEE80211_FHT_AMPDU_RX;
 		if (vap->iv_htcaps & IEEE80211_HTC_AMPDU)
 			vap->iv_flags_ht |= IEEE80211_FHT_AMPDU_TX;
 		vap->iv_flags_ht |= IEEE80211_FHT_AMSDU_RX;
 		if (vap->iv_htcaps & IEEE80211_HTC_AMSDU)
 			vap->iv_flags_ht |= IEEE80211_FHT_AMSDU_TX;
 
 		if (vap->iv_htcaps & IEEE80211_HTCAP_TXSTBC)
 			vap->iv_flags_ht |= IEEE80211_FHT_STBC_TX;
 		if (vap->iv_htcaps & IEEE80211_HTCAP_RXSTBC)
 			vap->iv_flags_ht |= IEEE80211_FHT_STBC_RX;
 
 		if (vap->iv_htcaps & IEEE80211_HTCAP_LDPC)
 			vap->iv_flags_ht |= IEEE80211_FHT_LDPC_RX;
 		if (vap->iv_htcaps & IEEE80211_HTC_TXLDPC)
 			vap->iv_flags_ht |= IEEE80211_FHT_LDPC_TX;
 	}
 	/* NB: disable default legacy WDS, too many issues right now */
 	if (vap->iv_flags_ext & IEEE80211_FEXT_WDSLEGACY)
 		vap->iv_flags_ht &= ~IEEE80211_FHT_HT;
 }
 
 void
 ieee80211_ht_vdetach(struct ieee80211vap *vap)
 {
 }
 
 static int
 ht_getrate(struct ieee80211com *ic, int index, enum ieee80211_phymode mode,
     int ratetype)
 {
 	int mword, rate;
 
 	mword = ieee80211_rate2media(ic, index | IEEE80211_RATE_MCS, mode);
 	if (IFM_SUBTYPE(mword) != IFM_IEEE80211_MCS)
 		return (0);
 	switch (ratetype) {
 	case 0:
 		rate = ieee80211_htrates[index].ht20_rate_800ns;
 		break;
 	case 1:
 		rate = ieee80211_htrates[index].ht20_rate_400ns;
 		break;
 	case 2:
 		rate = ieee80211_htrates[index].ht40_rate_800ns;
 		break;
 	default:
 		rate = ieee80211_htrates[index].ht40_rate_400ns;
 		break;
 	}
 	return (rate);
 }
 
 static struct printranges {
 	int	minmcs;
 	int	maxmcs;
 	int	txstream;
 	int	ratetype;
 	int	htcapflags;
 } ranges[] = {
 	{  0,  7, 1, 0, 0 },
 	{  8, 15, 2, 0, 0 },
 	{ 16, 23, 3, 0, 0 },
 	{ 24, 31, 4, 0, 0 },
 	{ 32,  0, 1, 2, IEEE80211_HTC_TXMCS32 },
 	{ 33, 38, 2, 0, IEEE80211_HTC_TXUNEQUAL },
 	{ 39, 52, 3, 0, IEEE80211_HTC_TXUNEQUAL },
 	{ 53, 76, 4, 0, IEEE80211_HTC_TXUNEQUAL },
 	{  0,  0, 0, 0, 0 },
 };
 
 static void
 ht_rateprint(struct ieee80211com *ic, enum ieee80211_phymode mode, int ratetype)
 {
 	int minrate, maxrate;
 	struct printranges *range;
 
 	for (range = ranges; range->txstream != 0; range++) {
 		if (ic->ic_txstream < range->txstream)
 			continue;
 		if (range->htcapflags &&
 		    (ic->ic_htcaps & range->htcapflags) == 0)
 			continue;
 		if (ratetype < range->ratetype)
 			continue;
 		minrate = ht_getrate(ic, range->minmcs, mode, ratetype);
 		maxrate = ht_getrate(ic, range->maxmcs, mode, ratetype);
 		if (range->maxmcs) {
 			ic_printf(ic, "MCS %d-%d: %d%sMbps - %d%sMbps\n",
 			    range->minmcs, range->maxmcs,
 			    minrate/2, ((minrate & 0x1) != 0 ? ".5" : ""),
 			    maxrate/2, ((maxrate & 0x1) != 0 ? ".5" : ""));
 		} else {
 			ic_printf(ic, "MCS %d: %d%sMbps\n", range->minmcs,
 			    minrate/2, ((minrate & 0x1) != 0 ? ".5" : ""));
 		}
 	}
 }
 
 static void
 ht_announce(struct ieee80211com *ic, enum ieee80211_phymode mode)
 {
 	const char *modestr = ieee80211_phymode_name[mode];
 
 	ic_printf(ic, "%s MCS 20MHz\n", modestr);
 	ht_rateprint(ic, mode, 0);
 	if (ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI20) {
 		ic_printf(ic, "%s MCS 20MHz SGI\n", modestr);
 		ht_rateprint(ic, mode, 1);
 	}
 	if (ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) {
 		ic_printf(ic, "%s MCS 40MHz:\n", modestr);
 		ht_rateprint(ic, mode, 2);
 	}
 	if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) &&
 	    (ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI40)) {
 		ic_printf(ic, "%s MCS 40MHz SGI:\n", modestr);
 		ht_rateprint(ic, mode, 3);
 	}
 }
 
 void
 ieee80211_ht_announce(struct ieee80211com *ic)
 {
 
 	if (isset(ic->ic_modecaps, IEEE80211_MODE_11NA) ||
 	    isset(ic->ic_modecaps, IEEE80211_MODE_11NG))
 		ic_printf(ic, "%dT%dR\n", ic->ic_txstream, ic->ic_rxstream);
 	if (isset(ic->ic_modecaps, IEEE80211_MODE_11NA))
 		ht_announce(ic, IEEE80211_MODE_11NA);
 	if (isset(ic->ic_modecaps, IEEE80211_MODE_11NG))
 		ht_announce(ic, IEEE80211_MODE_11NG);
 }
 
 void
 ieee80211_init_suphtrates(struct ieee80211com *ic)
 {
 #define	ADDRATE(x)	do {						\
 	htrateset->rs_rates[htrateset->rs_nrates] = x;			\
 	htrateset->rs_nrates++;						\
 } while (0)
 	struct ieee80211_htrateset *htrateset = &ic->ic_sup_htrates;
 	int i;
 
 	memset(htrateset, 0, sizeof(struct ieee80211_htrateset));
 	for (i = 0; i < ic->ic_txstream * 8; i++)
 		ADDRATE(i);
 	if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) &&
 	    (ic->ic_htcaps & IEEE80211_HTC_TXMCS32))
 		ADDRATE(32);
 	if (ic->ic_htcaps & IEEE80211_HTC_TXUNEQUAL) {
 		if (ic->ic_txstream >= 2) {
 			 for (i = 33; i <= 38; i++)
 				ADDRATE(i);
 		}
 		if (ic->ic_txstream >= 3) {
 			for (i = 39; i <= 52; i++)
 				ADDRATE(i);
 		}
 		if (ic->ic_txstream == 4) {
 			for (i = 53; i <= 76; i++)
 				ADDRATE(i);
 		}
 	}
 #undef	ADDRATE
 }
 
 /*
  * Receive processing.
  */
 
 /*
  * Decap the encapsulated A-MSDU frames and dispatch all but
  * the last for delivery.  The last frame is returned for 
  * delivery via the normal path.
  */
 struct mbuf *
 ieee80211_decap_amsdu(struct ieee80211_node *ni, struct mbuf *m)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	int framelen;
 	struct mbuf *n;
 
 	/* discard 802.3 header inserted by ieee80211_decap */
 	m_adj(m, sizeof(struct ether_header));
 
 	vap->iv_stats.is_amsdu_decap++;
 
 	for (;;) {
 		/*
 		 * Decap the first frame, bust it apart from the
 		 * remainder and deliver.  We leave the last frame
 		 * delivery to the caller (for consistency with other
 		 * code paths, could also do it here).
 		 */
 		m = ieee80211_decap1(m, &framelen);
 		if (m == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, "a-msdu", "%s", "decap failed");
 			vap->iv_stats.is_amsdu_tooshort++;
 			return NULL;
 		}
 		if (m->m_pkthdr.len == framelen)
 			break;
 		n = m_split(m, framelen, M_NOWAIT);
 		if (n == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, "a-msdu",
 			    "%s", "unable to split encapsulated frames");
 			vap->iv_stats.is_amsdu_split++;
 			m_freem(m);			/* NB: must reclaim */
 			return NULL;
 		}
 		vap->iv_deliver_data(vap, ni, m);
 
 		/*
 		 * Remove frame contents; each intermediate frame
 		 * is required to be aligned to a 4-byte boundary.
 		 */
 		m = n;
 		m_adj(m, roundup2(framelen, 4) - framelen);	/* padding */
 	}
 	return m;				/* last delivered by caller */
 }
 
 /*
  * Add the given frame to the current RX reorder slot.
  *
  * For future offloaded A-MSDU handling where multiple frames with
  * the same sequence number show up here, this routine will append
  * those frames as long as they're appropriately tagged.
  */
 static int
 ampdu_rx_add_slot(struct ieee80211_rx_ampdu *rap, int off, int tid,
     ieee80211_seq rxseq,
     struct ieee80211_node *ni,
     struct mbuf *m)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	if (rap->rxa_m[off] == NULL) {
 		rap->rxa_m[off] = m;
 		rap->rxa_qframes++;
 		rap->rxa_qbytes += m->m_pkthdr.len;
 		vap->iv_stats.is_ampdu_rx_reorder++;
 		return (0);
 	} else {
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_INPUT | IEEE80211_MSG_11N,
 		    ni->ni_macaddr, "a-mpdu duplicate",
 		    "seqno %u tid %u BA win <%u:%u>",
 		    rxseq, tid, rap->rxa_start,
 		    IEEE80211_SEQ_ADD(rap->rxa_start, rap->rxa_wnd-1));
 		vap->iv_stats.is_rx_dup++;
 		IEEE80211_NODE_STAT(ni, rx_dup);
 		m_freem(m);
 		return (-1);
 	}
 }
 
 static void
 ampdu_rx_purge_slot(struct ieee80211_rx_ampdu *rap, int i)
 {
 	struct mbuf *m;
 
 	m = rap->rxa_m[i];
 	if (m == NULL)
 		return;
 
 	rap->rxa_m[i] = NULL;
 	rap->rxa_qbytes -= m->m_pkthdr.len;
 	rap->rxa_qframes--;
 	m_freem(m);
 }
 
 /*
  * Purge all frames in the A-MPDU re-order queue.
  */
 static void
 ampdu_rx_purge(struct ieee80211_rx_ampdu *rap)
 {
 	int i;
 
 	for (i = 0; i < rap->rxa_wnd; i++) {
 		ampdu_rx_purge_slot(rap, i);
 		if (rap->rxa_qframes == 0)
 			break;
 	}
 	KASSERT(rap->rxa_qbytes == 0 && rap->rxa_qframes == 0,
 	    ("lost %u data, %u frames on ampdu rx q",
 	    rap->rxa_qbytes, rap->rxa_qframes));
 }
 
 /*
  * Start A-MPDU rx/re-order processing for the specified TID.
  */
 static int
 ampdu_rx_start(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap,
 	int baparamset, int batimeout, int baseqctl)
 {
 	int bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ);
 
 	if (rap->rxa_flags & IEEE80211_AGGR_RUNNING) {
 		/*
 		 * AMPDU previously setup and not terminated with a DELBA,
 		 * flush the reorder q's in case anything remains.
 		 */
 		ampdu_rx_purge(rap);
 	}
 	memset(rap, 0, sizeof(*rap));
 	rap->rxa_wnd = (bufsiz == 0) ?
 	    IEEE80211_AGGR_BAWMAX : min(bufsiz, IEEE80211_AGGR_BAWMAX);
 	rap->rxa_start = MS(baseqctl, IEEE80211_BASEQ_START);
 	rap->rxa_flags |=  IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_XCHGPEND;
 
 	return 0;
 }
 
 /*
  * Public function; manually setup the RX ampdu state.
  */
 int
 ieee80211_ampdu_rx_start_ext(struct ieee80211_node *ni, int tid, int seq, int baw)
 {
 	struct ieee80211_rx_ampdu *rap;
 
 	/* XXX TODO: sanity check tid, seq, baw */
 
 	rap = &ni->ni_rx_ampdu[tid];
 
 	if (rap->rxa_flags & IEEE80211_AGGR_RUNNING) {
 		/*
 		 * AMPDU previously setup and not terminated with a DELBA,
 		 * flush the reorder q's in case anything remains.
 		 */
 		ampdu_rx_purge(rap);
 	}
 
 	memset(rap, 0, sizeof(*rap));
 	rap->rxa_wnd = (baw== 0) ?
 	    IEEE80211_AGGR_BAWMAX : min(baw, IEEE80211_AGGR_BAWMAX);
 	if (seq == -1) {
 		/* Wait for the first RX frame, use that as BAW */
 		rap->rxa_start = 0;
 		rap->rxa_flags |= IEEE80211_AGGR_WAITRX;
 	} else {
 		rap->rxa_start = seq;
 	}
 	rap->rxa_flags |=  IEEE80211_AGGR_RUNNING | IEEE80211_AGGR_XCHGPEND;
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni,
 	    "%s: tid=%d, start=%d, wnd=%d, flags=0x%08x",
 	    __func__,
 	    tid,
 	    seq,
 	    rap->rxa_wnd,
 	    rap->rxa_flags);
 
 	return 0;
 }
 
 /*
  * Public function; manually stop the RX AMPDU state.
  */
 void
 ieee80211_ampdu_rx_stop_ext(struct ieee80211_node *ni, int tid)
 {
 	struct ieee80211_rx_ampdu *rap;
 
 	/* XXX TODO: sanity check tid, seq, baw */
 	rap = &ni->ni_rx_ampdu[tid];
 	ampdu_rx_stop(ni, rap);
 }
 
 /*
  * Stop A-MPDU rx processing for the specified TID.
  */
 static void
 ampdu_rx_stop(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap)
 {
 
 	ampdu_rx_purge(rap);
 	rap->rxa_flags &= ~(IEEE80211_AGGR_RUNNING
 	    | IEEE80211_AGGR_XCHGPEND
 	    | IEEE80211_AGGR_WAITRX);
 }
 
 /*
  * Dispatch a frame from the A-MPDU reorder queue.  The
  * frame is fed back into ieee80211_input marked with an
  * M_AMPDU_MPDU flag so it doesn't come back to us (it also
  * permits ieee80211_input to optimize re-processing).
  */
 static __inline void
 ampdu_dispatch(struct ieee80211_node *ni, struct mbuf *m)
 {
 	m->m_flags |= M_AMPDU_MPDU;	/* bypass normal processing */
 	/* NB: rssi and noise are ignored w/ M_AMPDU_MPDU set */
 	(void) ieee80211_input(ni, m, 0, 0);
 }
 
 static int
 ampdu_dispatch_slot(struct ieee80211_rx_ampdu *rap, struct ieee80211_node *ni,
     int i)
 {
 	struct mbuf *m;
 
 	if (rap->rxa_m[i] == NULL)
 		return (0);
 
 	m = rap->rxa_m[i];
 	rap->rxa_m[i] = NULL;
 	rap->rxa_qbytes -= m->m_pkthdr.len;
 	rap->rxa_qframes--;
 
 	ampdu_dispatch(ni, m);
 
 	return (1);
 }
 
 static void
 ampdu_rx_moveup(struct ieee80211_rx_ampdu *rap, struct ieee80211_node *ni,
     int i, int winstart)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	if (rap->rxa_qframes != 0) {
 		int n = rap->rxa_qframes, j;
 
 		if (winstart != -1) {
 			/*
 			 * NB: in window-sliding mode, loop assumes i > 0
 			 * and/or rxa_m[0] is NULL
 			 */
 			KASSERT(rap->rxa_m[0] == NULL,
 			    ("%s: BA window slot 0 occupied", __func__));
 		}
 		for (j = i+1; j < rap->rxa_wnd; j++) {
 			if (rap->rxa_m[j] != NULL) {
 				rap->rxa_m[j-i] = rap->rxa_m[j];
 				rap->rxa_m[j] = NULL;
 				if (--n == 0)
 					break;
 			}
 		}
 		KASSERT(n == 0, ("%s: lost %d frames, qframes %d off %d "
 		    "BA win <%d:%d> winstart %d",
 		    __func__, n, rap->rxa_qframes, i, rap->rxa_start,
 		    IEEE80211_SEQ_ADD(rap->rxa_start, rap->rxa_wnd-1),
 		    winstart));
 		vap->iv_stats.is_ampdu_rx_copy += rap->rxa_qframes;
 	}
 }
 
 /*
  * Dispatch as many frames as possible from the re-order queue.
  * Frames will always be "at the front"; we process all frames
  * up to the first empty slot in the window.  On completion we
  * cleanup state if there are still pending frames in the current
  * BA window.  We assume the frame at slot 0 is already handled
  * by the caller; we always start at slot 1.
  */
 static void
 ampdu_rx_dispatch(struct ieee80211_rx_ampdu *rap, struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	int i;
 
 	/* flush run of frames */
 	for (i = 1; i < rap->rxa_wnd; i++) {
 		if (ampdu_dispatch_slot(rap, ni, i) == 0)
 			break;
 	}
 
 	/*
 	 * If frames remain, copy the mbuf pointers down so
 	 * they correspond to the offsets in the new window.
 	 */
 	ampdu_rx_moveup(rap, ni, i, -1);
 
 	/*
 	 * Adjust the start of the BA window to
 	 * reflect the frames just dispatched.
 	 */
 	rap->rxa_start = IEEE80211_SEQ_ADD(rap->rxa_start, i);
 	vap->iv_stats.is_ampdu_rx_oor += i;
 }
 
 /*
  * Dispatch all frames in the A-MPDU re-order queue.
  */
 static void
 ampdu_rx_flush(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	int i, r;
 
 	for (i = 0; i < rap->rxa_wnd; i++) {
 		r = ampdu_dispatch_slot(rap, ni, i);
 		if (r == 0)
 			continue;
 		vap->iv_stats.is_ampdu_rx_oor += r;
 
 		if (rap->rxa_qframes == 0)
 			break;
 	}
 }
 
 /*
  * Dispatch all frames in the A-MPDU re-order queue
  * preceding the specified sequence number.  This logic
  * handles window moves due to a received MSDU or BAR.
  */
 static void
 ampdu_rx_flush_upto(struct ieee80211_node *ni,
 	struct ieee80211_rx_ampdu *rap, ieee80211_seq winstart)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	ieee80211_seq seqno;
 	int i, r;
 
 	/*
 	 * Flush any complete MSDU's with a sequence number lower
 	 * than winstart.  Gaps may exist.  Note that we may actually
 	 * dispatch frames past winstart if a run continues; this is
 	 * an optimization that avoids having to do a separate pass
 	 * to dispatch frames after moving the BA window start.
 	 */
 	seqno = rap->rxa_start;
 	for (i = 0; i < rap->rxa_wnd; i++) {
 		r = ampdu_dispatch_slot(rap, ni, i);
 		if (r == 0) {
 			if (!IEEE80211_SEQ_BA_BEFORE(seqno, winstart))
 				break;
 		}
 		vap->iv_stats.is_ampdu_rx_oor += r;
 		seqno = IEEE80211_SEQ_INC(seqno);
 	}
 	/*
 	 * If frames remain, copy the mbuf pointers down so
 	 * they correspond to the offsets in the new window.
 	 */
 	ampdu_rx_moveup(rap, ni, i, winstart);
 
 	/*
 	 * Move the start of the BA window; we use the
 	 * sequence number of the last MSDU that was
 	 * passed up the stack+1 or winstart if stopped on
 	 * a gap in the reorder buffer.
 	 */
 	rap->rxa_start = seqno;
 }
 
 /*
  * Process a received QoS data frame for an HT station.  Handle
  * A-MPDU reordering: if this frame is received out of order
  * and falls within the BA window hold onto it.  Otherwise if
  * this frame completes a run, flush any pending frames.  We
  * return 1 if the frame is consumed.  A 0 is returned if
  * the frame should be processed normally by the caller.
  */
 int
-ieee80211_ampdu_reorder(struct ieee80211_node *ni, struct mbuf *m)
+ieee80211_ampdu_reorder(struct ieee80211_node *ni, struct mbuf *m,
+    const struct ieee80211_rx_stats *rxs)
 {
 #define	PROCESS		0	/* caller should process frame */
 #define	CONSUMED	1	/* frame consumed, caller does nothing */
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_qosframe *wh;
 	struct ieee80211_rx_ampdu *rap;
 	ieee80211_seq rxseq;
 	uint8_t tid;
 	int off;
 
 	KASSERT((m->m_flags & (M_AMPDU | M_AMPDU_MPDU)) == M_AMPDU,
 	    ("!a-mpdu or already re-ordered, flags 0x%x", m->m_flags));
 	KASSERT(ni->ni_flags & IEEE80211_NODE_HT, ("not an HT sta"));
 
 	/* NB: m_len known to be sufficient */
 	wh = mtod(m, struct ieee80211_qosframe *);
 	if (wh->i_fc[0] != IEEE80211_FC0_QOSDATA) {
 		/*
 		 * Not QoS data, shouldn't get here but just
 		 * return it to the caller for processing.
 		 */
 		return PROCESS;
 	}
 
 	/*
 	 * 802.11-2012 9.3.2.10 - Duplicate detection and recovery.
 	 *
 	 * Multicast QoS data frames are checked against a different
 	 * counter, not the per-TID counter.
 	 */
 	if (IEEE80211_IS_MULTICAST(wh->i_addr1))
 		return PROCESS;
 
 	if (IEEE80211_IS_DSTODS(wh))
 		tid = ((struct ieee80211_qosframe_addr4 *)wh)->i_qos[0];
 	else
 		tid = wh->i_qos[0];
 	tid &= IEEE80211_QOS_TID;
 	rap = &ni->ni_rx_ampdu[tid];
 	if ((rap->rxa_flags & IEEE80211_AGGR_XCHGPEND) == 0) {
 		/*
 		 * No ADDBA request yet, don't touch.
 		 */
 		return PROCESS;
 	}
 	rxseq = le16toh(*(uint16_t *)wh->i_seq);
 	if ((rxseq & IEEE80211_SEQ_FRAG_MASK) != 0) {
 		/*
 		 * Fragments are not allowed; toss.
 		 */
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_INPUT | IEEE80211_MSG_11N, ni->ni_macaddr,
 		    "A-MPDU", "fragment, rxseq 0x%x tid %u%s", rxseq, tid,
 		    wh->i_fc[1] & IEEE80211_FC1_RETRY ? " (retransmit)" : "");
 		vap->iv_stats.is_ampdu_rx_drop++;
 		IEEE80211_NODE_STAT(ni, rx_drop);
 		m_freem(m);
 		return CONSUMED;
 	}
 	rxseq >>= IEEE80211_SEQ_SEQ_SHIFT;
 	rap->rxa_nframes++;
 
 	/*
 	 * Handle waiting for the first frame to define the BAW.
 	 * Some firmware doesn't provide the RX of the starting point
 	 * of the BAW and we have to cope.
 	 */
 	if (rap->rxa_flags & IEEE80211_AGGR_WAITRX) {
 		rap->rxa_flags &= ~IEEE80211_AGGR_WAITRX;
 		rap->rxa_start = rxseq;
 	}
 again:
 	if (rxseq == rap->rxa_start) {
 		/*
 		 * First frame in window.
 		 */
 		if (rap->rxa_qframes != 0) {
 			/*
 			 * Dispatch as many packets as we can.
 			 */
 			KASSERT(rap->rxa_m[0] == NULL, ("unexpected dup"));
 			ampdu_dispatch(ni, m);
 			ampdu_rx_dispatch(rap, ni);
 			return CONSUMED;
 		} else {
 			/*
 			 * In order; advance window and notify
 			 * caller to dispatch directly.
 			 */
 			rap->rxa_start = IEEE80211_SEQ_INC(rxseq);
 			return PROCESS;
 		}
 	}
 	/*
 	 * Frame is out of order; store if in the BA window.
 	 */
 	/* calculate offset in BA window */
 	off = IEEE80211_SEQ_SUB(rxseq, rap->rxa_start);
 	if (off < rap->rxa_wnd) {
 		/*
 		 * Common case (hopefully): in the BA window.
 		 * Sec 9.10.7.6.2 a) (p.137)
 		 */
 
 		/* 
 		 * Check for frames sitting too long in the reorder queue.
 		 * This should only ever happen if frames are not delivered
 		 * without the sender otherwise notifying us (e.g. with a
 		 * BAR to move the window).  Typically this happens because
 		 * of vendor bugs that cause the sequence number to jump.
 		 * When this happens we get a gap in the reorder queue that
 		 * leaves frame sitting on the queue until they get pushed
 		 * out due to window moves.  When the vendor does not send
 		 * BAR this move only happens due to explicit packet sends
 		 *
 		 * NB: we only track the time of the oldest frame in the
 		 * reorder q; this means that if we flush we might push
 		 * frames that still "new"; if this happens then subsequent
 		 * frames will result in BA window moves which cost something
 		 * but is still better than a big throughput dip.
 		 */
 		if (rap->rxa_qframes != 0) {
 			/* XXX honor batimeout? */
 			if (ticks - rap->rxa_age > ieee80211_ampdu_age) {
 				/*
 				 * Too long since we received the first
 				 * frame; flush the reorder buffer.
 				 */
 				if (rap->rxa_qframes != 0) {
 					vap->iv_stats.is_ampdu_rx_age +=
 					    rap->rxa_qframes;
 					ampdu_rx_flush(ni, rap);
 				}
 				rap->rxa_start = IEEE80211_SEQ_INC(rxseq);
 				return PROCESS;
 			}
 		} else {
 			/*
 			 * First frame, start aging timer.
 			 */
 			rap->rxa_age = ticks;
 		}
 
 		/* save packet - this consumes, no matter what */
 		ampdu_rx_add_slot(rap, off, tid, rxseq, ni, m);
 
 		return CONSUMED;
 	}
 	if (off < IEEE80211_SEQ_BA_RANGE) {
 		/*
 		 * Outside the BA window, but within range;
 		 * flush the reorder q and move the window.
 		 * Sec 9.10.7.6.2 b) (p.138)
 		 */
 		IEEE80211_NOTE(vap, IEEE80211_MSG_11N, ni,
 		    "move BA win <%u:%u> (%u frames) rxseq %u tid %u",
 		    rap->rxa_start,
 		    IEEE80211_SEQ_ADD(rap->rxa_start, rap->rxa_wnd-1),
 		    rap->rxa_qframes, rxseq, tid);
 		vap->iv_stats.is_ampdu_rx_move++;
 
 		/*
 		 * The spec says to flush frames up to but not including:
 		 * 	WinStart_B = rxseq - rap->rxa_wnd + 1
 		 * Then insert the frame or notify the caller to process
 		 * it immediately.  We can safely do this by just starting
 		 * over again because we know the frame will now be within
 		 * the BA window.
 		 */
 		/* NB: rxa_wnd known to be >0 */
 		ampdu_rx_flush_upto(ni, rap,
 		    IEEE80211_SEQ_SUB(rxseq, rap->rxa_wnd-1));
 		goto again;
 	} else {
 		/*
 		 * Outside the BA window and out of range; toss.
 		 * Sec 9.10.7.6.2 c) (p.138)
 		 */
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_INPUT | IEEE80211_MSG_11N, ni->ni_macaddr,
 		    "MPDU", "BA win <%u:%u> (%u frames) rxseq %u tid %u%s",
 		    rap->rxa_start,
 		    IEEE80211_SEQ_ADD(rap->rxa_start, rap->rxa_wnd-1),
 		    rap->rxa_qframes, rxseq, tid,
 		    wh->i_fc[1] & IEEE80211_FC1_RETRY ? " (retransmit)" : "");
 		vap->iv_stats.is_ampdu_rx_drop++;
 		IEEE80211_NODE_STAT(ni, rx_drop);
 		m_freem(m);
 		return CONSUMED;
 	}
 #undef CONSUMED
 #undef PROCESS
 }
 
 /*
  * Process a BAR ctl frame.  Dispatch all frames up to
  * the sequence number of the frame.  If this frame is
  * out of range it's discarded.
  */
 void
 ieee80211_recv_bar(struct ieee80211_node *ni, struct mbuf *m0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_frame_bar *wh;
 	struct ieee80211_rx_ampdu *rap;
 	ieee80211_seq rxseq;
 	int tid, off;
 
 	if (!ieee80211_recv_bar_ena) {
 #if 0
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_11N,
 		    ni->ni_macaddr, "BAR", "%s", "processing disabled");
 #endif
 		vap->iv_stats.is_ampdu_bar_bad++;
 		return;
 	}
 	wh = mtod(m0, struct ieee80211_frame_bar *);
 	/* XXX check basic BAR */
 	tid = MS(le16toh(wh->i_ctl), IEEE80211_BAR_TID);
 	rap = &ni->ni_rx_ampdu[tid];
 	if ((rap->rxa_flags & IEEE80211_AGGR_XCHGPEND) == 0) {
 		/*
 		 * No ADDBA request yet, don't touch.
 		 */
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_INPUT | IEEE80211_MSG_11N,
 		    ni->ni_macaddr, "BAR", "no BA stream, tid %u", tid);
 		vap->iv_stats.is_ampdu_bar_bad++;
 		return;
 	}
 	vap->iv_stats.is_ampdu_bar_rx++;
 	rxseq = le16toh(wh->i_seq) >> IEEE80211_SEQ_SEQ_SHIFT;
 	if (rxseq == rap->rxa_start)
 		return;
 	/* calculate offset in BA window */
 	off = IEEE80211_SEQ_SUB(rxseq, rap->rxa_start);
 	if (off < IEEE80211_SEQ_BA_RANGE) {
 		/*
 		 * Flush the reorder q up to rxseq and move the window.
 		 * Sec 9.10.7.6.3 a) (p.138)
 		 */
 		IEEE80211_NOTE(vap, IEEE80211_MSG_11N, ni,
 		    "BAR moves BA win <%u:%u> (%u frames) rxseq %u tid %u",
 		    rap->rxa_start,
 		    IEEE80211_SEQ_ADD(rap->rxa_start, rap->rxa_wnd-1),
 		    rap->rxa_qframes, rxseq, tid);
 		vap->iv_stats.is_ampdu_bar_move++;
 
 		ampdu_rx_flush_upto(ni, rap, rxseq);
 		if (off >= rap->rxa_wnd) {
 			/*
 			 * BAR specifies a window start to the right of BA
 			 * window; we must move it explicitly since
 			 * ampdu_rx_flush_upto will not.
 			 */
 			rap->rxa_start = rxseq;
 		}
 	} else {
 		/*
 		 * Out of range; toss.
 		 * Sec 9.10.7.6.3 b) (p.138)
 		 */
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_INPUT | IEEE80211_MSG_11N, ni->ni_macaddr,
 		    "BAR", "BA win <%u:%u> (%u frames) rxseq %u tid %u%s",
 		    rap->rxa_start,
 		    IEEE80211_SEQ_ADD(rap->rxa_start, rap->rxa_wnd-1),
 		    rap->rxa_qframes, rxseq, tid,
 		    wh->i_fc[1] & IEEE80211_FC1_RETRY ? " (retransmit)" : "");
 		vap->iv_stats.is_ampdu_bar_oow++;
 		IEEE80211_NODE_STAT(ni, rx_drop);
 	}
 }
 
 /*
  * Setup HT-specific state in a node.  Called only
  * when HT use is negotiated so we don't do extra
  * work for temporary and/or legacy sta's.
  */
 void
 ieee80211_ht_node_init(struct ieee80211_node *ni)
 {
 	struct ieee80211_tx_ampdu *tap;
 	int tid;
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N,
 	    ni,
 	    "%s: called (%p)",
 	    __func__,
 	    ni);
 
 	if (ni->ni_flags & IEEE80211_NODE_HT) {
 		/*
 		 * Clean AMPDU state on re-associate.  This handles the case
 		 * where a station leaves w/o notifying us and then returns
 		 * before node is reaped for inactivity.
 		 */
 		IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N,
 		    ni,
 		    "%s: calling cleanup (%p)",
 		    __func__, ni);
 		ieee80211_ht_node_cleanup(ni);
 	}
 	for (tid = 0; tid < WME_NUM_TID; tid++) {
 		tap = &ni->ni_tx_ampdu[tid];
 		tap->txa_tid = tid;
 		tap->txa_ni = ni;
 		ieee80211_txampdu_init_pps(tap);
 		/* NB: further initialization deferred */
 	}
 	ni->ni_flags |= IEEE80211_NODE_HT | IEEE80211_NODE_AMPDU;
 }
 
 /*
  * Cleanup HT-specific state in a node.  Called only
  * when HT use has been marked.
  */
 void
 ieee80211_ht_node_cleanup(struct ieee80211_node *ni)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	int i;
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N,
 	    ni,
 	    "%s: called (%p)",
 	    __func__, ni);
 
 	KASSERT(ni->ni_flags & IEEE80211_NODE_HT, ("not an HT node"));
 
 	/* XXX optimize this */
 	for (i = 0; i < WME_NUM_TID; i++) {
 		struct ieee80211_tx_ampdu *tap = &ni->ni_tx_ampdu[i];
 		if (tap->txa_flags & IEEE80211_AGGR_SETUP)
 			ampdu_tx_stop(tap);
 	}
 	for (i = 0; i < WME_NUM_TID; i++)
 		ic->ic_ampdu_rx_stop(ni, &ni->ni_rx_ampdu[i]);
 
 	ni->ni_htcap = 0;
 	ni->ni_flags &= ~IEEE80211_NODE_HT_ALL;
 }
 
 /*
  * Age out HT resources for a station.
  */
 void
 ieee80211_ht_node_age(struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	uint8_t tid;
 
 	KASSERT(ni->ni_flags & IEEE80211_NODE_HT, ("not an HT sta"));
 
 	for (tid = 0; tid < WME_NUM_TID; tid++) {
 		struct ieee80211_rx_ampdu *rap;
 
 		rap = &ni->ni_rx_ampdu[tid];
 		if ((rap->rxa_flags & IEEE80211_AGGR_XCHGPEND) == 0)
 			continue;
 		if (rap->rxa_qframes == 0)
 			continue;
 		/* 
 		 * Check for frames sitting too long in the reorder queue.
 		 * See above for more details on what's happening here.
 		 */
 		/* XXX honor batimeout? */
 		if (ticks - rap->rxa_age > ieee80211_ampdu_age) {
 			/*
 			 * Too long since we received the first
 			 * frame; flush the reorder buffer.
 			 */
 			vap->iv_stats.is_ampdu_rx_age += rap->rxa_qframes;
 			ampdu_rx_flush(ni, rap);
 		}
 	}
 }
 
 static struct ieee80211_channel *
 findhtchan(struct ieee80211com *ic, struct ieee80211_channel *c, int htflags)
 {
 	return ieee80211_find_channel(ic, c->ic_freq,
 	    (c->ic_flags &~ IEEE80211_CHAN_HT) | htflags);
 }
 
 /*
  * Adjust a channel to be HT/non-HT according to the vap's configuration.
  */
 struct ieee80211_channel *
 ieee80211_ht_adjust_channel(struct ieee80211com *ic,
 	struct ieee80211_channel *chan, int flags)
 {
 	struct ieee80211_channel *c;
 
 	if (flags & IEEE80211_FHT_HT) {
 		/* promote to HT if possible */
 		if (flags & IEEE80211_FHT_USEHT40) {
 			if (!IEEE80211_IS_CHAN_HT40(chan)) {
 				/* NB: arbitrarily pick ht40+ over ht40- */
 				c = findhtchan(ic, chan, IEEE80211_CHAN_HT40U);
 				if (c == NULL)
 					c = findhtchan(ic, chan,
 						IEEE80211_CHAN_HT40D);
 				if (c == NULL)
 					c = findhtchan(ic, chan,
 						IEEE80211_CHAN_HT20);
 				if (c != NULL)
 					chan = c;
 			}
 		} else if (!IEEE80211_IS_CHAN_HT20(chan)) {
 			c = findhtchan(ic, chan, IEEE80211_CHAN_HT20);
 			if (c != NULL)
 				chan = c;
 		}
 	} else if (IEEE80211_IS_CHAN_HT(chan)) {
 		/* demote to legacy, HT use is disabled */
 		c = ieee80211_find_channel(ic, chan->ic_freq,
 		    chan->ic_flags &~ IEEE80211_CHAN_HT);
 		if (c != NULL)
 			chan = c;
 	}
 	return chan;
 }
 
 /*
  * Setup HT-specific state for a legacy WDS peer.
  */
 void
 ieee80211_ht_wds_init(struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_tx_ampdu *tap;
 	int tid;
 
 	KASSERT(vap->iv_flags_ht & IEEE80211_FHT_HT, ("no HT requested"));
 
 	/* XXX check scan cache in case peer has an ap and we have info */
 	/*
 	 * If setup with a legacy channel; locate an HT channel.
 	 * Otherwise if the inherited channel (from a companion
 	 * AP) is suitable use it so we use the same location
 	 * for the extension channel).
 	 */
 	ni->ni_chan = ieee80211_ht_adjust_channel(ni->ni_ic,
 	    ni->ni_chan, ieee80211_htchanflags(ni->ni_chan));
 
 	ni->ni_htcap = 0;
 	if (vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20)
 		ni->ni_htcap |= IEEE80211_HTCAP_SHORTGI20;
 	if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) {
 		ni->ni_htcap |= IEEE80211_HTCAP_CHWIDTH40;
 		ni->ni_chw = 40;
 		if (IEEE80211_IS_CHAN_HT40U(ni->ni_chan))
 			ni->ni_ht2ndchan = IEEE80211_HTINFO_2NDCHAN_ABOVE;
 		else if (IEEE80211_IS_CHAN_HT40D(ni->ni_chan))
 			ni->ni_ht2ndchan = IEEE80211_HTINFO_2NDCHAN_BELOW;
 		if (vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40)
 			ni->ni_htcap |= IEEE80211_HTCAP_SHORTGI40;
 	} else {
 		ni->ni_chw = 20;
 		ni->ni_ht2ndchan = IEEE80211_HTINFO_2NDCHAN_NONE;
 	}
 	ni->ni_htctlchan = ni->ni_chan->ic_ieee;
 	if (vap->iv_flags_ht & IEEE80211_FHT_RIFS)
 		ni->ni_flags |= IEEE80211_NODE_RIFS;
 	/* XXX does it make sense to enable SMPS? */
 
 	ni->ni_htopmode = 0;		/* XXX need protection state */
 	ni->ni_htstbc = 0;		/* XXX need info */
 
 	for (tid = 0; tid < WME_NUM_TID; tid++) {
 		tap = &ni->ni_tx_ampdu[tid];
 		tap->txa_tid = tid;
 		ieee80211_txampdu_init_pps(tap);
 	}
 	/* NB: AMPDU tx/rx governed by IEEE80211_FHT_AMPDU_{TX,RX} */
 	ni->ni_flags |= IEEE80211_NODE_HT | IEEE80211_NODE_AMPDU;
 }
 
 /*
  * Notify hostap vaps of a change in the HTINFO ie.
  */
 static void
 htinfo_notify(struct ieee80211com *ic)
 {
 	struct ieee80211vap *vap;
 	int first = 1;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
 		if (vap->iv_opmode != IEEE80211_M_HOSTAP)
 			continue;
 		if (vap->iv_state != IEEE80211_S_RUN ||
 		    !IEEE80211_IS_CHAN_HT(vap->iv_bss->ni_chan))
 			continue;
 		if (first) {
 			IEEE80211_NOTE(vap,
 			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N,
 			    vap->iv_bss,
 			    "HT bss occupancy change: %d sta, %d ht, "
 			    "%d ht40%s, HT protmode now 0x%x"
 			    , ic->ic_sta_assoc
 			    , ic->ic_ht_sta_assoc
 			    , ic->ic_ht40_sta_assoc
 			    , (ic->ic_flags_ht & IEEE80211_FHT_NONHT_PR) ?
 				 ", non-HT sta present" : ""
 			    , ic->ic_curhtprotmode);
 			first = 0;
 		}
 		ieee80211_beacon_notify(vap, IEEE80211_BEACON_HTINFO);
 	}
 }
 
 /*
  * Calculate HT protection mode from current
  * state and handle updates.
  */
 static void
 htinfo_update(struct ieee80211com *ic)
 {
 	uint8_t protmode;
 
 	if (ic->ic_sta_assoc != ic->ic_ht_sta_assoc) {
 		protmode = IEEE80211_HTINFO_OPMODE_MIXED
 			 | IEEE80211_HTINFO_NONHT_PRESENT;
 	} else if (ic->ic_flags_ht & IEEE80211_FHT_NONHT_PR) {
 		protmode = IEEE80211_HTINFO_OPMODE_PROTOPT
 			 | IEEE80211_HTINFO_NONHT_PRESENT;
 	} else if (ic->ic_bsschan != IEEE80211_CHAN_ANYC &&
 	    IEEE80211_IS_CHAN_HT40(ic->ic_bsschan) && 
 	    ic->ic_sta_assoc != ic->ic_ht40_sta_assoc) {
 		protmode = IEEE80211_HTINFO_OPMODE_HT20PR;
 	} else {
 		protmode = IEEE80211_HTINFO_OPMODE_PURE;
 	}
 	if (protmode != ic->ic_curhtprotmode) {
 		ic->ic_curhtprotmode = protmode;
 		htinfo_notify(ic);
 	}
 }
 
 /*
  * Handle an HT station joining a BSS.
  */
 void
 ieee80211_ht_node_join(struct ieee80211_node *ni)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	if (ni->ni_flags & IEEE80211_NODE_HT) {
 		ic->ic_ht_sta_assoc++;
 		if (ni->ni_chw == 40)
 			ic->ic_ht40_sta_assoc++;
 	}
 	htinfo_update(ic);
 }
 
 /*
  * Handle an HT station leaving a BSS.
  */
 void
 ieee80211_ht_node_leave(struct ieee80211_node *ni)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	if (ni->ni_flags & IEEE80211_NODE_HT) {
 		ic->ic_ht_sta_assoc--;
 		if (ni->ni_chw == 40)
 			ic->ic_ht40_sta_assoc--;
 	}
 	htinfo_update(ic);
 }
 
 /*
  * Public version of htinfo_update; used for processing
  * beacon frames from overlapping bss.
  *
  * Caller can specify either IEEE80211_HTINFO_OPMODE_MIXED
  * (on receipt of a beacon that advertises MIXED) or
  * IEEE80211_HTINFO_OPMODE_PROTOPT (on receipt of a beacon
  * from an overlapping legacy bss).  We treat MIXED with
  * a higher precedence than PROTOPT (i.e. we will not change
  * change PROTOPT -> MIXED; only MIXED -> PROTOPT).  This
  * corresponds to how we handle things in htinfo_update.
  */
 void
 ieee80211_htprot_update(struct ieee80211com *ic, int protmode)
 {
 #define	OPMODE(x)	SM(x, IEEE80211_HTINFO_OPMODE)
 	IEEE80211_LOCK(ic);
 
 	/* track non-HT station presence */
 	KASSERT(protmode & IEEE80211_HTINFO_NONHT_PRESENT,
 	    ("protmode 0x%x", protmode));
 	ic->ic_flags_ht |= IEEE80211_FHT_NONHT_PR;
 	ic->ic_lastnonht = ticks;
 
 	if (protmode != ic->ic_curhtprotmode &&
 	    (OPMODE(ic->ic_curhtprotmode) != IEEE80211_HTINFO_OPMODE_MIXED ||
 	     OPMODE(protmode) == IEEE80211_HTINFO_OPMODE_PROTOPT)) {
 		/* push beacon update */
 		ic->ic_curhtprotmode = protmode;
 		htinfo_notify(ic);
 	}
 	IEEE80211_UNLOCK(ic);
 #undef OPMODE
 }
 
 /*
  * Time out presence of an overlapping bss with non-HT
  * stations.  When operating in hostap mode we listen for
  * beacons from other stations and if we identify a non-HT
  * station is present we update the opmode field of the
  * HTINFO ie.  To identify when all non-HT stations are
  * gone we time out this condition.
  */
 void
 ieee80211_ht_timeout(struct ieee80211com *ic)
 {
 	IEEE80211_LOCK_ASSERT(ic);
 
 	if ((ic->ic_flags_ht & IEEE80211_FHT_NONHT_PR) &&
 	    ieee80211_time_after(ticks, ic->ic_lastnonht + IEEE80211_NONHT_PRESENT_AGE)) {
 #if 0
 		IEEE80211_NOTE(vap, IEEE80211_MSG_11N, ni,
 		    "%s", "time out non-HT STA present on channel");
 #endif
 		ic->ic_flags_ht &= ~IEEE80211_FHT_NONHT_PR;
 		htinfo_update(ic);
 	}
 }
 
 /*
  * Process an 802.11n HT capabilities ie.
  */
 void
 ieee80211_parse_htcap(struct ieee80211_node *ni, const uint8_t *ie)
 {
 	if (ie[0] == IEEE80211_ELEMID_VENDOR) {
 		/*
 		 * Station used Vendor OUI ie to associate;
 		 * mark the node so when we respond we'll use
 		 * the Vendor OUI's and not the standard ie's.
 		 */
 		ni->ni_flags |= IEEE80211_NODE_HTCOMPAT;
 		ie += 4;
 	} else
 		ni->ni_flags &= ~IEEE80211_NODE_HTCOMPAT;
 
 	ni->ni_htcap = le16dec(ie +
 		__offsetof(struct ieee80211_ie_htcap, hc_cap));
 	ni->ni_htparam = ie[__offsetof(struct ieee80211_ie_htcap, hc_param)];
 }
 
 static void
 htinfo_parse(struct ieee80211_node *ni,
 	const struct ieee80211_ie_htinfo *htinfo)
 {
 	uint16_t w;
 
 	ni->ni_htctlchan = htinfo->hi_ctrlchannel;
 	ni->ni_ht2ndchan = SM(htinfo->hi_byte1, IEEE80211_HTINFO_2NDCHAN);
 	w = le16dec(&htinfo->hi_byte2);
 	ni->ni_htopmode = SM(w, IEEE80211_HTINFO_OPMODE);
 	w = le16dec(&htinfo->hi_byte45);
 	ni->ni_htstbc = SM(w, IEEE80211_HTINFO_BASIC_STBCMCS);
 }
 
 /*
  * Parse an 802.11n HT info ie and save useful information
  * to the node state.  Note this does not effect any state
  * changes such as for channel width change.
  */
 void
 ieee80211_parse_htinfo(struct ieee80211_node *ni, const uint8_t *ie)
 {
 	if (ie[0] == IEEE80211_ELEMID_VENDOR)
 		ie += 4;
 	htinfo_parse(ni, (const struct ieee80211_ie_htinfo *) ie);
 }
 
 /*
  * Handle 11n/11ac channel switch.
  *
  * Use the received HT/VHT ie's to identify the right channel to use.
  * If we cannot locate it in the channel table then fallback to
  * legacy operation.
  *
  * Note that we use this information to identify the node's
  * channel only; the caller is responsible for insuring any
  * required channel change is done (e.g. in sta mode when
  * parsing the contents of a beacon frame).
  */
 static int
 htinfo_update_chw(struct ieee80211_node *ni, int htflags, int vhtflags)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_channel *c;
 	int chanflags;
 	int ret = 0;
 
 	/*
 	 * First step - do HT/VHT only channel lookup based on operating mode
 	 * flags.  This involves masking out the VHT flags as well.
 	 * Otherwise we end up doing the full channel walk each time
 	 * we trigger this, which is expensive.
 	 */
 	chanflags = (ni->ni_chan->ic_flags &~
 	    (IEEE80211_CHAN_HT | IEEE80211_CHAN_VHT)) | htflags | vhtflags;
 
 	if (chanflags == ni->ni_chan->ic_flags)
 		goto done;
 
 	/*
 	 * If HT /or/ VHT flags have changed then check both.
 	 * We need to start by picking a HT channel anyway.
 	 */
 
 	c = NULL;
 	chanflags = (ni->ni_chan->ic_flags &~
 	    (IEEE80211_CHAN_HT | IEEE80211_CHAN_VHT)) | htflags;
 	/* XXX not right for ht40- */
 	c = ieee80211_find_channel(ic, ni->ni_chan->ic_freq, chanflags);
 	if (c == NULL && (htflags & IEEE80211_CHAN_HT40)) {
 		/*
 		 * No HT40 channel entry in our table; fall back
 		 * to HT20 operation.  This should not happen.
 		 */
 		c = findhtchan(ic, ni->ni_chan, IEEE80211_CHAN_HT20);
 #if 0
 		IEEE80211_NOTE(ni->ni_vap,
 		    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, ni,
 		    "no HT40 channel (freq %u), falling back to HT20",
 		    ni->ni_chan->ic_freq);
 #endif
 		/* XXX stat */
 	}
 
 	/* Nothing found - leave it alone; move onto VHT */
 	if (c == NULL)
 		c = ni->ni_chan;
 
 	/*
 	 * If it's non-HT, then bail out now.
 	 */
 	if (! IEEE80211_IS_CHAN_HT(c)) {
 		IEEE80211_NOTE(ni->ni_vap,
 		    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, ni,
 		    "not HT; skipping VHT check (%u/0x%x)",
 		    c->ic_freq, c->ic_flags);
 		goto done;
 	}
 
 	/*
 	 * Next step - look at the current VHT flags and determine
 	 * if we need to upgrade.  Mask out the VHT and HT flags since
 	 * the vhtflags field will already have the correct HT
 	 * flags to use.
 	 */
 	if (IEEE80211_CONF_VHT(ic) && ni->ni_vhtcap != 0 && vhtflags != 0) {
 		chanflags = (c->ic_flags
 		    &~ (IEEE80211_CHAN_HT | IEEE80211_CHAN_VHT))
 		    | vhtflags;
 		IEEE80211_NOTE(ni->ni_vap,
 		    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N,
 		    ni,
 		    "%s: VHT; chanwidth=0x%02x; vhtflags=0x%08x",
 		    __func__, ni->ni_vht_chanwidth, vhtflags);
 
 		IEEE80211_NOTE(ni->ni_vap,
 		    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N,
 		    ni,
 		    "%s: VHT; trying lookup for %d/0x%08x",
 		    __func__, c->ic_freq, chanflags);
 		c = ieee80211_find_channel(ic, c->ic_freq, chanflags);
 	}
 
 	/* Finally, if it's changed */
 	if (c != NULL && c != ni->ni_chan) {
 		IEEE80211_NOTE(ni->ni_vap,
 		    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, ni,
 		    "switch station to %s%d channel %u/0x%x",
 		    IEEE80211_IS_CHAN_VHT(c) ? "VHT" : "HT",
 		    IEEE80211_IS_CHAN_VHT80(c) ? 80 :
 		      (IEEE80211_IS_CHAN_HT40(c) ? 40 : 20),
 		    c->ic_freq, c->ic_flags);
 		ni->ni_chan = c;
 		ret = 1;
 	}
 	/* NB: caller responsible for forcing any channel change */
 
 done:
 	/* update node's (11n) tx channel width */
 	ni->ni_chw = IEEE80211_IS_CHAN_HT40(ni->ni_chan)? 40 : 20;
 	return (ret);
 }
 
 /*
  * Update 11n MIMO PS state according to received htcap.
  */
 static __inline int
 htcap_update_mimo_ps(struct ieee80211_node *ni)
 {
 	uint16_t oflags = ni->ni_flags;
 
 	switch (ni->ni_htcap & IEEE80211_HTCAP_SMPS) {
 	case IEEE80211_HTCAP_SMPS_DYNAMIC:
 		ni->ni_flags |= IEEE80211_NODE_MIMO_PS;
 		ni->ni_flags |= IEEE80211_NODE_MIMO_RTS;
 		break;
 	case IEEE80211_HTCAP_SMPS_ENA:
 		ni->ni_flags |= IEEE80211_NODE_MIMO_PS;
 		ni->ni_flags &= ~IEEE80211_NODE_MIMO_RTS;
 		break;
 	case IEEE80211_HTCAP_SMPS_OFF:
 	default:		/* disable on rx of reserved value */
 		ni->ni_flags &= ~IEEE80211_NODE_MIMO_PS;
 		ni->ni_flags &= ~IEEE80211_NODE_MIMO_RTS;
 		break;
 	}
 	return (oflags ^ ni->ni_flags);
 }
 
 /*
  * Update short GI state according to received htcap
  * and local settings.
  */
 static __inline void
 htcap_update_shortgi(struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	ni->ni_flags &= ~(IEEE80211_NODE_SGI20|IEEE80211_NODE_SGI40);
 	if ((ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20) &&
 	    (vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20))
 		ni->ni_flags |= IEEE80211_NODE_SGI20;
 	if ((ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40) &&
 	    (vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40))
 		ni->ni_flags |= IEEE80211_NODE_SGI40;
 }
 
 /*
  * Update LDPC state according to received htcap
  * and local settings.
  */
 static __inline void
 htcap_update_ldpc(struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	if ((ni->ni_htcap & IEEE80211_HTCAP_LDPC) &&
 	    (vap->iv_flags_ht & IEEE80211_FHT_LDPC_TX))
 		ni->ni_flags |= IEEE80211_NODE_LDPC;
 }
 
 /*
  * Parse and update HT-related state extracted from
  * the HT cap and info ie's.
  *
  * This is called from the STA management path and
  * the ieee80211_node_join() path.  It will take into
  * account the IEs discovered during scanning and
  * adjust things accordingly.
  */
 void
 ieee80211_ht_updateparams(struct ieee80211_node *ni,
 	const uint8_t *htcapie, const uint8_t *htinfoie)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	const struct ieee80211_ie_htinfo *htinfo;
 
 	ieee80211_parse_htcap(ni, htcapie);
 	if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS)
 		htcap_update_mimo_ps(ni);
 	htcap_update_shortgi(ni);
 	htcap_update_ldpc(ni);
 
 	if (htinfoie[0] == IEEE80211_ELEMID_VENDOR)
 		htinfoie += 4;
 	htinfo = (const struct ieee80211_ie_htinfo *) htinfoie;
 	htinfo_parse(ni, htinfo);
 
 	/*
 	 * Defer the node channel change; we need to now
 	 * update VHT parameters before we do it.
 	 */
 
 	if ((htinfo->hi_byte1 & IEEE80211_HTINFO_RIFSMODE_PERM) &&
 	    (vap->iv_flags_ht & IEEE80211_FHT_RIFS))
 		ni->ni_flags |= IEEE80211_NODE_RIFS;
 	else
 		ni->ni_flags &= ~IEEE80211_NODE_RIFS;
 }
 
 static uint32_t
 ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	uint32_t vhtflags = 0;
 
 	vhtflags = 0;
 	if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_flags_vht & IEEE80211_FVHT_VHT) {
 		if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) &&
 		    /* XXX 2 means "160MHz and 80+80MHz", 1 means "160MHz" */
 		    (MS(vap->iv_vhtcaps,
 		     IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >= 1) &&
 		    (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT160)) {
 			vhtflags = IEEE80211_CHAN_VHT160;
 			/* Mirror the HT40 flags */
 			if (htflags == IEEE80211_CHAN_HT40U) {
 				vhtflags |= IEEE80211_CHAN_HT40U;
 			} else if (htflags == IEEE80211_CHAN_HT40D) {
 				vhtflags |= IEEE80211_CHAN_HT40D;
 			}
 		} else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80P80MHZ) &&
 		    /* XXX 2 means "160MHz and 80+80MHz" */
 		    (MS(vap->iv_vhtcaps,
 		     IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) &&
 		    (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80)) {
 			vhtflags = IEEE80211_CHAN_VHT80_80;
 			/* Mirror the HT40 flags */
 			if (htflags == IEEE80211_CHAN_HT40U) {
 				vhtflags |= IEEE80211_CHAN_HT40U;
 			} else if (htflags == IEEE80211_CHAN_HT40D) {
 				vhtflags |= IEEE80211_CHAN_HT40D;
 			}
 		} else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80MHZ) &&
 		    (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80)) {
 			vhtflags = IEEE80211_CHAN_VHT80;
 			/* Mirror the HT40 flags */
 			if (htflags == IEEE80211_CHAN_HT40U) {
 				vhtflags |= IEEE80211_CHAN_HT40U;
 			} else if (htflags == IEEE80211_CHAN_HT40D) {
 				vhtflags |= IEEE80211_CHAN_HT40D;
 			}
 		} else if (ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_USE_HT) {
 			/* Mirror the HT40 flags */
 			/*
 			 * XXX TODO: if ht40 is disabled, but vht40 isn't
 			 * disabled then this logic will get very, very sad.
 			 * It's quite possible the only sane thing to do is
 			 * to not have vht40 as an option, and just obey
 			 * 'ht40' as that flag.
 			 */
 			if ((htflags == IEEE80211_CHAN_HT40U) &&
 			    (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT40)) {
 				vhtflags = IEEE80211_CHAN_VHT40U
 				    | IEEE80211_CHAN_HT40U;
 			} else if (htflags == IEEE80211_CHAN_HT40D &&
 			    (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT40)) {
 				vhtflags = IEEE80211_CHAN_VHT40D
 				    | IEEE80211_CHAN_HT40D;
 			} else if (htflags == IEEE80211_CHAN_HT20) {
 				vhtflags = IEEE80211_CHAN_VHT20
 				    | IEEE80211_CHAN_HT20;
 			}
 		} else {
 			vhtflags = IEEE80211_CHAN_VHT20;
 		}
 	}
 	return (vhtflags);
 }
 
 /*
  * Final part of updating the HT parameters.
  *
  * This is called from the STA management path and
  * the ieee80211_node_join() path.  It will take into
  * account the IEs discovered during scanning and
  * adjust things accordingly.
  *
  * This is done after a call to ieee80211_ht_updateparams()
  * because it (and the upcoming VHT version of updateparams)
  * needs to ensure everything is parsed before htinfo_update_chw()
  * is called - which will change the channel config for the
  * node for us.
  */
 int
 ieee80211_ht_updateparams_final(struct ieee80211_node *ni,
 	const uint8_t *htcapie, const uint8_t *htinfoie)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	const struct ieee80211_ie_htinfo *htinfo;
 	int htflags, vhtflags;
 	int ret = 0;
 
 	htinfo = (const struct ieee80211_ie_htinfo *) htinfoie;
 
 	htflags = (vap->iv_flags_ht & IEEE80211_FHT_HT) ?
 	    IEEE80211_CHAN_HT20 : 0;
 
 	/* NB: honor operating mode constraint */
 	if ((htinfo->hi_byte1 & IEEE80211_HTINFO_TXWIDTH_2040) &&
 	    (vap->iv_flags_ht & IEEE80211_FHT_USEHT40)) {
 		if (ni->ni_ht2ndchan == IEEE80211_HTINFO_2NDCHAN_ABOVE)
 			htflags = IEEE80211_CHAN_HT40U;
 		else if (ni->ni_ht2ndchan == IEEE80211_HTINFO_2NDCHAN_BELOW)
 			htflags = IEEE80211_CHAN_HT40D;
 	}
 
 	/*
 	 * VHT flags - do much the same; check whether VHT is available
 	 * and if so, what our ideal channel use would be based on our
 	 * capabilities and the (pre-parsed) VHT info IE.
 	 */
 	vhtflags = ieee80211_vht_get_vhtflags(ni, htflags);
 
 	if (htinfo_update_chw(ni, htflags, vhtflags))
 		ret = 1;
 
 	return (ret);
 }
 
 /*
  * Parse and update HT-related state extracted from the HT cap ie
  * for a station joining an HT BSS.
  *
  * This is called from the hostap path for each station.
  */
 void
 ieee80211_ht_updatehtcap(struct ieee80211_node *ni, const uint8_t *htcapie)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	ieee80211_parse_htcap(ni, htcapie);
 	if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS)
 		htcap_update_mimo_ps(ni);
 	htcap_update_shortgi(ni);
 	htcap_update_ldpc(ni);
 }
 
 /*
  * Called once HT and VHT capabilities are parsed in hostap mode -
  * this will adjust the channel configuration of the given node
  * based on the configuration and capabilities.
  */
 void
 ieee80211_ht_updatehtcap_final(struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	int htflags;
 	int vhtflags;
 
 	/* NB: honor operating mode constraint */
 	/* XXX 40 MHz intolerant */
 	htflags = (vap->iv_flags_ht & IEEE80211_FHT_HT) ?
 	    IEEE80211_CHAN_HT20 : 0;
 	if ((ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) &&
 	    (vap->iv_flags_ht & IEEE80211_FHT_USEHT40)) {
 		if (IEEE80211_IS_CHAN_HT40U(vap->iv_bss->ni_chan))
 			htflags = IEEE80211_CHAN_HT40U;
 		else if (IEEE80211_IS_CHAN_HT40D(vap->iv_bss->ni_chan))
 			htflags = IEEE80211_CHAN_HT40D;
 	}
 	/*
 	 * VHT flags - do much the same; check whether VHT is available
 	 * and if so, what our ideal channel use would be based on our
 	 * capabilities and the (pre-parsed) VHT info IE.
 	 */
 	vhtflags = ieee80211_vht_get_vhtflags(ni, htflags);
 
 	(void) htinfo_update_chw(ni, htflags, vhtflags);
 }
 
 /*
  * Install received HT rate set by parsing the HT cap ie.
  */
 int
 ieee80211_setup_htrates(struct ieee80211_node *ni, const uint8_t *ie, int flags)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211vap *vap = ni->ni_vap;
 	const struct ieee80211_ie_htcap *htcap;
 	struct ieee80211_htrateset *rs;
 	int i, maxequalmcs, maxunequalmcs;
 
 	maxequalmcs = ic->ic_txstream * 8 - 1;
 	maxunequalmcs = 0;
 	if (ic->ic_htcaps & IEEE80211_HTC_TXUNEQUAL) {
 		if (ic->ic_txstream >= 2)
 			maxunequalmcs = 38;
 		if (ic->ic_txstream >= 3)
 			maxunequalmcs = 52;
 		if (ic->ic_txstream >= 4)
 			maxunequalmcs = 76;
 	}
 
 	rs = &ni->ni_htrates;
 	memset(rs, 0, sizeof(*rs));
 	if (ie != NULL) {
 		if (ie[0] == IEEE80211_ELEMID_VENDOR)
 			ie += 4;
 		htcap = (const struct ieee80211_ie_htcap *) ie;
 		for (i = 0; i < IEEE80211_HTRATE_MAXSIZE; i++) {
 			if (isclr(htcap->hc_mcsset, i))
 				continue;
 			if (rs->rs_nrates == IEEE80211_HTRATE_MAXSIZE) {
 				IEEE80211_NOTE(vap,
 				    IEEE80211_MSG_XRATE | IEEE80211_MSG_11N, ni,
 				    "WARNING, HT rate set too large; only "
 				    "using %u rates", IEEE80211_HTRATE_MAXSIZE);
 				vap->iv_stats.is_rx_rstoobig++;
 				break;
 			}
 			if (i <= 31 && i > maxequalmcs)
 				continue;
 			if (i == 32 &&
 			    (ic->ic_htcaps & IEEE80211_HTC_TXMCS32) == 0)
 				continue;
 			if (i > 32 && i > maxunequalmcs)
 				continue;
 			rs->rs_rates[rs->rs_nrates++] = i;
 		}
 	}
 	return ieee80211_fix_rate(ni, (struct ieee80211_rateset *) rs, flags);
 }
 
 /*
  * Mark rates in a node's HT rate set as basic according
  * to the information in the supplied HT info ie.
  */
 void
 ieee80211_setup_basic_htrates(struct ieee80211_node *ni, const uint8_t *ie)
 {
 	const struct ieee80211_ie_htinfo *htinfo;
 	struct ieee80211_htrateset *rs;
 	int i, j;
 
 	if (ie[0] == IEEE80211_ELEMID_VENDOR)
 		ie += 4;
 	htinfo = (const struct ieee80211_ie_htinfo *) ie;
 	rs = &ni->ni_htrates;
 	if (rs->rs_nrates == 0) {
 		IEEE80211_NOTE(ni->ni_vap,
 		    IEEE80211_MSG_XRATE | IEEE80211_MSG_11N, ni,
 		    "%s", "WARNING, empty HT rate set");
 		return;
 	}
 	for (i = 0; i < IEEE80211_HTRATE_MAXSIZE; i++) {
 		if (isclr(htinfo->hi_basicmcsset, i))
 			continue;
 		for (j = 0; j < rs->rs_nrates; j++)
 			if ((rs->rs_rates[j] & IEEE80211_RATE_VAL) == i)
 				rs->rs_rates[j] |= IEEE80211_RATE_BASIC;
 	}
 }
 
 static void
 ampdu_tx_setup(struct ieee80211_tx_ampdu *tap)
 {
 	callout_init(&tap->txa_timer, 1);
 	tap->txa_flags |= IEEE80211_AGGR_SETUP;
 	tap->txa_lastsample = ticks;
 }
 
 static void
 ampdu_tx_stop(struct ieee80211_tx_ampdu *tap)
 {
 	struct ieee80211_node *ni = tap->txa_ni;
 	struct ieee80211com *ic = ni->ni_ic;
 
 	IEEE80211_NOTE(tap->txa_ni->ni_vap, IEEE80211_MSG_11N,
 	    tap->txa_ni,
 	    "%s: called",
 	    __func__);
 
 	KASSERT(tap->txa_flags & IEEE80211_AGGR_SETUP,
 	    ("txa_flags 0x%x tid %d ac %d", tap->txa_flags, tap->txa_tid,
 	    TID_TO_WME_AC(tap->txa_tid)));
 
 	/*
 	 * Stop BA stream if setup so driver has a chance
 	 * to reclaim any resources it might have allocated.
 	 */
 	ic->ic_addba_stop(ni, tap);
 	/*
 	 * Stop any pending BAR transmit.
 	 */
 	bar_stop_timer(tap);
 
 	/*
 	 * Reset packet estimate.
 	 */
 	ieee80211_txampdu_init_pps(tap);
 
 	/* NB: clearing NAK means we may re-send ADDBA */ 
 	tap->txa_flags &= ~(IEEE80211_AGGR_SETUP | IEEE80211_AGGR_NAK);
 }
 
 /*
  * ADDBA response timeout.
  *
  * If software aggregation and per-TID queue management was done here,
  * that queue would be unpaused after the ADDBA timeout occurs.
  */
 static void
 addba_timeout(void *arg)
 {
 	struct ieee80211_tx_ampdu *tap = arg;
 	struct ieee80211_node *ni = tap->txa_ni;
 	struct ieee80211com *ic = ni->ni_ic;
 
 	/* XXX ? */
 	tap->txa_flags &= ~IEEE80211_AGGR_XCHGPEND;
 	tap->txa_attempts++;
 	ic->ic_addba_response_timeout(ni, tap);
 }
 
 static void
 addba_start_timeout(struct ieee80211_tx_ampdu *tap)
 {
 	/* XXX use CALLOUT_PENDING instead? */
 	callout_reset(&tap->txa_timer, ieee80211_addba_timeout,
 	    addba_timeout, tap);
 	tap->txa_flags |= IEEE80211_AGGR_XCHGPEND;
 	tap->txa_nextrequest = ticks + ieee80211_addba_timeout;
 }
 
 static void
 addba_stop_timeout(struct ieee80211_tx_ampdu *tap)
 {
 	/* XXX use CALLOUT_PENDING instead? */
 	if (tap->txa_flags & IEEE80211_AGGR_XCHGPEND) {
 		callout_stop(&tap->txa_timer);
 		tap->txa_flags &= ~IEEE80211_AGGR_XCHGPEND;
 	}
 }
 
 static void
 null_addba_response_timeout(struct ieee80211_node *ni,
     struct ieee80211_tx_ampdu *tap)
 {
 }
 
 /*
  * Default method for requesting A-MPDU tx aggregation.
  * We setup the specified state block and start a timer
  * to wait for an ADDBA response frame.
  */
 static int
 ieee80211_addba_request(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap,
 	int dialogtoken, int baparamset, int batimeout)
 {
 	int bufsiz;
 
 	/* XXX locking */
 	tap->txa_token = dialogtoken;
 	tap->txa_flags |= IEEE80211_AGGR_IMMEDIATE;
 	bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ);
 	tap->txa_wnd = (bufsiz == 0) ?
 	    IEEE80211_AGGR_BAWMAX : min(bufsiz, IEEE80211_AGGR_BAWMAX);
 	addba_start_timeout(tap);
 	return 1;
 }
 
 /*
  * Called by drivers that wish to request an ADDBA session be
  * setup.  This brings it up and starts the request timer.
  */
 int
 ieee80211_ampdu_tx_request_ext(struct ieee80211_node *ni, int tid)
 {
 	struct ieee80211_tx_ampdu *tap;
 
 	if (tid < 0 || tid > 15)
 		return (0);
 	tap = &ni->ni_tx_ampdu[tid];
 
 	/* XXX locking */
 	if ((tap->txa_flags & IEEE80211_AGGR_SETUP) == 0) {
 		/* do deferred setup of state */
 		ampdu_tx_setup(tap);
 	}
 	/* XXX hack for not doing proper locking */
 	tap->txa_flags &= ~IEEE80211_AGGR_NAK;
 	addba_start_timeout(tap);
 	return (1);
 }
 
 /*
  * Called by drivers that have marked a session as active.
  */
 int
 ieee80211_ampdu_tx_request_active_ext(struct ieee80211_node *ni, int tid,
     int status)
 {
 	struct ieee80211_tx_ampdu *tap;
 
 	if (tid < 0 || tid > 15)
 		return (0);
 	tap = &ni->ni_tx_ampdu[tid];
 
 	/* XXX locking */
 	addba_stop_timeout(tap);
 	if (status == 1) {
 		tap->txa_flags |= IEEE80211_AGGR_RUNNING;
 		tap->txa_attempts = 0;
 	} else {
 		/* mark tid so we don't try again */
 		tap->txa_flags |= IEEE80211_AGGR_NAK;
 	}
 	return (1);
 }
 
 /*
  * Default method for processing an A-MPDU tx aggregation
  * response.  We shutdown any pending timer and update the
  * state block according to the reply.
  */
 static int
 ieee80211_addba_response(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap,
 	int status, int baparamset, int batimeout)
 {
 	int bufsiz, tid;
 
 	/* XXX locking */
 	addba_stop_timeout(tap);
 	if (status == IEEE80211_STATUS_SUCCESS) {
 		bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ);
 		/* XXX override our request? */
 		tap->txa_wnd = (bufsiz == 0) ?
 		    IEEE80211_AGGR_BAWMAX : min(bufsiz, IEEE80211_AGGR_BAWMAX);
 		/* XXX AC/TID */
 		tid = MS(baparamset, IEEE80211_BAPS_TID);
 		tap->txa_flags |= IEEE80211_AGGR_RUNNING;
 		tap->txa_attempts = 0;
 	} else {
 		/* mark tid so we don't try again */
 		tap->txa_flags |= IEEE80211_AGGR_NAK;
 	}
 	return 1;
 }
 
 /*
  * Default method for stopping A-MPDU tx aggregation.
  * Any timer is cleared and we drain any pending frames.
  */
 static void
 ieee80211_addba_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap)
 {
 	/* XXX locking */
 	addba_stop_timeout(tap);
 	if (tap->txa_flags & IEEE80211_AGGR_RUNNING) {
 		/* XXX clear aggregation queue */
 		tap->txa_flags &= ~IEEE80211_AGGR_RUNNING;
 	}
 	tap->txa_attempts = 0;
 }
 
 /*
  * Process a received action frame using the default aggregation
  * policy.  We intercept ADDBA-related frames and use them to
  * update our aggregation state.  All other frames are passed up
  * for processing by ieee80211_recv_action.
  */
 static int
 ht_recv_action_ba_addba_request(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_rx_ampdu *rap;
 	uint8_t dialogtoken;
 	uint16_t baparamset, batimeout, baseqctl;
 	uint16_t args[5];
 	int tid;
 
 	dialogtoken = frm[2];
 	baparamset = le16dec(frm+3);
 	batimeout = le16dec(frm+5);
 	baseqctl = le16dec(frm+7);
 
 	tid = MS(baparamset, IEEE80211_BAPS_TID);
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
 	    "recv ADDBA request: dialogtoken %u baparamset 0x%x "
 	    "(tid %d bufsiz %d) batimeout %d baseqctl %d:%d",
 	    dialogtoken, baparamset,
 	    tid, MS(baparamset, IEEE80211_BAPS_BUFSIZ),
 	    batimeout,
 	    MS(baseqctl, IEEE80211_BASEQ_START),
 	    MS(baseqctl, IEEE80211_BASEQ_FRAG));
 
 	rap = &ni->ni_rx_ampdu[tid];
 
 	/* Send ADDBA response */
 	args[0] = dialogtoken;
 	/*
 	 * NB: We ack only if the sta associated with HT and
 	 * the ap is configured to do AMPDU rx (the latter
 	 * violates the 11n spec and is mostly for testing).
 	 */
 	if ((ni->ni_flags & IEEE80211_NODE_AMPDU_RX) &&
 	    (vap->iv_flags_ht & IEEE80211_FHT_AMPDU_RX)) {
 		/* XXX handle ampdu_rx_start failure */
 		ic->ic_ampdu_rx_start(ni, rap,
 		    baparamset, batimeout, baseqctl);
 
 		args[1] = IEEE80211_STATUS_SUCCESS;
 	} else {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N,
 		    ni, "reject ADDBA request: %s",
 		    ni->ni_flags & IEEE80211_NODE_AMPDU_RX ?
 		       "administratively disabled" :
 		       "not negotiated for station");
 		vap->iv_stats.is_addba_reject++;
 		args[1] = IEEE80211_STATUS_UNSPECIFIED;
 	}
 	/* XXX honor rap flags? */
 	args[2] = IEEE80211_BAPS_POLICY_IMMEDIATE
 		| SM(tid, IEEE80211_BAPS_TID)
 		| SM(rap->rxa_wnd, IEEE80211_BAPS_BUFSIZ)
 		;
 	args[3] = 0;
 	args[4] = 0;
 	ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA,
 		IEEE80211_ACTION_BA_ADDBA_RESPONSE, args);
 	return 0;
 }
 
 static int
 ht_recv_action_ba_addba_response(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_tx_ampdu *tap;
 	uint8_t dialogtoken, policy;
 	uint16_t baparamset, batimeout, code;
 	int tid, bufsiz;
 
 	dialogtoken = frm[2];
 	code = le16dec(frm+3);
 	baparamset = le16dec(frm+5);
 	tid = MS(baparamset, IEEE80211_BAPS_TID);
 	bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ);
 	policy = MS(baparamset, IEEE80211_BAPS_POLICY);
 	batimeout = le16dec(frm+7);
 
 	tap = &ni->ni_tx_ampdu[tid];
 	if ((tap->txa_flags & IEEE80211_AGGR_XCHGPEND) == 0) {
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_ACTION | IEEE80211_MSG_11N,
 		    ni->ni_macaddr, "ADDBA response",
 		    "no pending ADDBA, tid %d dialogtoken %u "
 		    "code %d", tid, dialogtoken, code);
 		vap->iv_stats.is_addba_norequest++;
 		return 0;
 	}
 	if (dialogtoken != tap->txa_token) {
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_ACTION | IEEE80211_MSG_11N,
 		    ni->ni_macaddr, "ADDBA response",
 		    "dialogtoken mismatch: waiting for %d, "
 		    "received %d, tid %d code %d",
 		    tap->txa_token, dialogtoken, tid, code);
 		vap->iv_stats.is_addba_badtoken++;
 		return 0;
 	}
 	/* NB: assumes IEEE80211_AGGR_IMMEDIATE is 1 */
 	if (policy != (tap->txa_flags & IEEE80211_AGGR_IMMEDIATE)) {
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_ACTION | IEEE80211_MSG_11N,
 		    ni->ni_macaddr, "ADDBA response",
 		    "policy mismatch: expecting %s, "
 		    "received %s, tid %d code %d",
 		    tap->txa_flags & IEEE80211_AGGR_IMMEDIATE,
 		    policy, tid, code);
 		vap->iv_stats.is_addba_badpolicy++;
 		return 0;
 	}
 #if 0
 	/* XXX we take MIN in ieee80211_addba_response */
 	if (bufsiz > IEEE80211_AGGR_BAWMAX) {
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_ACTION | IEEE80211_MSG_11N,
 		    ni->ni_macaddr, "ADDBA response",
 		    "BA window too large: max %d, "
 		    "received %d, tid %d code %d",
 		    bufsiz, IEEE80211_AGGR_BAWMAX, tid, code);
 		vap->iv_stats.is_addba_badbawinsize++;
 		return 0;
 	}
 #endif
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
 	    "recv ADDBA response: dialogtoken %u code %d "
 	    "baparamset 0x%x (tid %d bufsiz %d) batimeout %d",
 	    dialogtoken, code, baparamset, tid, bufsiz,
 	    batimeout);
 	ic->ic_addba_response(ni, tap, code, baparamset, batimeout);
 	return 0;
 }
 
 static int
 ht_recv_action_ba_delba(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_rx_ampdu *rap;
 	struct ieee80211_tx_ampdu *tap;
 	uint16_t baparamset, code;
 	int tid;
 
 	baparamset = le16dec(frm+2);
 	code = le16dec(frm+4);
 
 	tid = MS(baparamset, IEEE80211_DELBAPS_TID);
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
 	    "recv DELBA: baparamset 0x%x (tid %d initiator %d) "
 	    "code %d", baparamset, tid,
 	    MS(baparamset, IEEE80211_DELBAPS_INIT), code);
 
 	if ((baparamset & IEEE80211_DELBAPS_INIT) == 0) {
 		tap = &ni->ni_tx_ampdu[tid];
 		ic->ic_addba_stop(ni, tap);
 	} else {
 		rap = &ni->ni_rx_ampdu[tid];
 		ic->ic_ampdu_rx_stop(ni, rap);
 	}
 	return 0;
 }
 
 static int
 ht_recv_action_ht_txchwidth(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	int chw;
 
 	chw = (frm[2] == IEEE80211_A_HT_TXCHWIDTH_2040) ? 40 : 20;
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
 	    "%s: HT txchwidth, width %d%s",
 	    __func__, chw, ni->ni_chw != chw ? "*" : "");
 	if (chw != ni->ni_chw) {
 		/* XXX does this need to change the ht40 station count? */
 		ni->ni_chw = chw;
 		/* XXX notify on change */
 	}
 	return 0;
 }
 
 static int
 ht_recv_action_ht_mimopwrsave(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	const struct ieee80211_action_ht_mimopowersave *mps =
 	    (const struct ieee80211_action_ht_mimopowersave *) frm;
 
 	/* XXX check iv_htcaps */
 	if (mps->am_control & IEEE80211_A_HT_MIMOPWRSAVE_ENA)
 		ni->ni_flags |= IEEE80211_NODE_MIMO_PS;
 	else
 		ni->ni_flags &= ~IEEE80211_NODE_MIMO_PS;
 	if (mps->am_control & IEEE80211_A_HT_MIMOPWRSAVE_MODE)
 		ni->ni_flags |= IEEE80211_NODE_MIMO_RTS;
 	else
 		ni->ni_flags &= ~IEEE80211_NODE_MIMO_RTS;
 	/* XXX notify on change */
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
 	    "%s: HT MIMO PS (%s%s)", __func__,
 	    (ni->ni_flags & IEEE80211_NODE_MIMO_PS) ?  "on" : "off",
 	    (ni->ni_flags & IEEE80211_NODE_MIMO_RTS) ?  "+rts" : ""
 	);
 	return 0;
 }
 
 /*
  * Transmit processing.
  */
 
 /*
  * Check if A-MPDU should be requested/enabled for a stream.
  * We require a traffic rate above a per-AC threshold and we
  * also handle backoff from previous failed attempts.
  *
  * Drivers may override this method to bring in information
  * such as link state conditions in making the decision.
  */
 static int
 ieee80211_ampdu_enable(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	if (tap->txa_avgpps <
 	    vap->iv_ampdu_mintraffic[TID_TO_WME_AC(tap->txa_tid)])
 		return 0;
 	/* XXX check rssi? */
 	if (tap->txa_attempts >= ieee80211_addba_maxtries &&
 	    ieee80211_time_after(ticks, tap->txa_nextrequest)) {
 		/*
 		 * Don't retry too often; txa_nextrequest is set
 		 * to the minimum interval we'll retry after
 		 * ieee80211_addba_maxtries failed attempts are made.
 		 */
 		return 0;
 	}
 	IEEE80211_NOTE(vap, IEEE80211_MSG_11N, ni,
 	    "enable AMPDU on tid %d (%s), avgpps %d pkts %d attempt %d",
 	    tap->txa_tid, ieee80211_wme_acnames[TID_TO_WME_AC(tap->txa_tid)],
 	    tap->txa_avgpps, tap->txa_pkts, tap->txa_attempts);
 	return 1;
 }
 
 /*
  * Request A-MPDU tx aggregation.  Setup local state and
  * issue an ADDBA request.  BA use will only happen after
  * the other end replies with ADDBA response.
  */
 int
 ieee80211_ampdu_request(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	uint16_t args[5];
 	int tid, dialogtoken;
 	static int tokens = 0;	/* XXX */
 
 	/* XXX locking */
 	if ((tap->txa_flags & IEEE80211_AGGR_SETUP) == 0) {
 		/* do deferred setup of state */
 		ampdu_tx_setup(tap);
 	}
 	/* XXX hack for not doing proper locking */
 	tap->txa_flags &= ~IEEE80211_AGGR_NAK;
 
 	dialogtoken = (tokens+1) % 63;		/* XXX */
 	tid = tap->txa_tid;
 
 	/*
 	 * XXX TODO: This is racy with any other parallel TX going on. :(
 	 */
 	tap->txa_start = ni->ni_txseqs[tid];
 
 	args[0] = dialogtoken;
 	args[1] = 0;	/* NB: status code not used */
 	args[2]	= IEEE80211_BAPS_POLICY_IMMEDIATE
 		| SM(tid, IEEE80211_BAPS_TID)
 		| SM(IEEE80211_AGGR_BAWMAX, IEEE80211_BAPS_BUFSIZ)
 		;
 	args[3] = 0;	/* batimeout */
 	/* NB: do first so there's no race against reply */
 	if (!ic->ic_addba_request(ni, tap, dialogtoken, args[2], args[3])) {
 		/* unable to setup state, don't make request */
 		IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N,
 		    ni, "%s: could not setup BA stream for TID %d AC %d",
 		    __func__, tap->txa_tid, TID_TO_WME_AC(tap->txa_tid));
 		/* defer next try so we don't slam the driver with requests */
 		tap->txa_attempts = ieee80211_addba_maxtries;
 		/* NB: check in case driver wants to override */
 		if (tap->txa_nextrequest <= ticks)
 			tap->txa_nextrequest = ticks + ieee80211_addba_backoff;
 		return 0;
 	}
 	tokens = dialogtoken;			/* allocate token */
 	/* NB: after calling ic_addba_request so driver can set txa_start */
 	args[4] = SM(tap->txa_start, IEEE80211_BASEQ_START)
 		| SM(0, IEEE80211_BASEQ_FRAG)
 		;
 	return ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA,
 		IEEE80211_ACTION_BA_ADDBA_REQUEST, args);
 }
 
 /*
  * Terminate an AMPDU tx stream.  State is reclaimed
  * and the peer notified with a DelBA Action frame.
  */
 void
 ieee80211_ampdu_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap,
 	int reason)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211vap *vap = ni->ni_vap;
 	uint16_t args[4];
 
 	/* XXX locking */
 	tap->txa_flags &= ~IEEE80211_AGGR_BARPEND;
 	if (IEEE80211_AMPDU_RUNNING(tap)) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N,
 		    ni, "%s: stop BA stream for TID %d (reason: %d (%s))",
 		    __func__, tap->txa_tid, reason,
 		    ieee80211_reason_to_string(reason));
 		vap->iv_stats.is_ampdu_stop++;
 
 		ic->ic_addba_stop(ni, tap);
 		args[0] = tap->txa_tid;
 		args[1] = IEEE80211_DELBAPS_INIT;
 		args[2] = reason;			/* XXX reason code */
 		ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA,
 			IEEE80211_ACTION_BA_DELBA, args);
 	} else {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N,
 		    ni, "%s: BA stream for TID %d not running "
 		    "(reason: %d (%s))", __func__, tap->txa_tid, reason,
 		    ieee80211_reason_to_string(reason));
 		vap->iv_stats.is_ampdu_stop_failed++;
 	}
 }
 
 /* XXX */
 static void bar_start_timer(struct ieee80211_tx_ampdu *tap);
 
 static void
 bar_timeout(void *arg)
 {
 	struct ieee80211_tx_ampdu *tap = arg;
 	struct ieee80211_node *ni = tap->txa_ni;
 
 	KASSERT((tap->txa_flags & IEEE80211_AGGR_XCHGPEND) == 0,
 	    ("bar/addba collision, flags 0x%x", tap->txa_flags));
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N,
 	    ni, "%s: tid %u flags 0x%x attempts %d", __func__,
 	    tap->txa_tid, tap->txa_flags, tap->txa_attempts);
 
 	/* guard against race with bar_tx_complete */
 	if ((tap->txa_flags & IEEE80211_AGGR_BARPEND) == 0)
 		return;
 	/* XXX ? */
 	if (tap->txa_attempts >= ieee80211_bar_maxtries) {
 		struct ieee80211com *ic = ni->ni_ic;
 
 		ni->ni_vap->iv_stats.is_ampdu_bar_tx_fail++;
 		/*
 		 * If (at least) the last BAR TX timeout was due to
 		 * an ieee80211_send_bar() failures, then we need
 		 * to make sure we notify the driver that a BAR
 		 * TX did occur and fail.  This gives the driver
 		 * a chance to undo any queue pause that may
 		 * have occurred.
 		 */
 		ic->ic_bar_response(ni, tap, 1);
 		ieee80211_ampdu_stop(ni, tap, IEEE80211_REASON_TIMEOUT);
 	} else {
 		ni->ni_vap->iv_stats.is_ampdu_bar_tx_retry++;
 		if (ieee80211_send_bar(ni, tap, tap->txa_seqpending) != 0) {
 			IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N,
 			    ni, "%s: failed to TX, starting timer\n",
 			    __func__);
 			/*
 			 * If ieee80211_send_bar() fails here, the
 			 * timer may have stopped and/or the pending
 			 * flag may be clear.  Because of this,
 			 * fake the BARPEND and reset the timer.
 			 * A retransmission attempt will then occur
 			 * during the next timeout.
 			 */
 			/* XXX locking */
 			tap->txa_flags |= IEEE80211_AGGR_BARPEND;
 			bar_start_timer(tap);
 		}
 	}
 }
 
 static void
 bar_start_timer(struct ieee80211_tx_ampdu *tap)
 {
 	IEEE80211_NOTE(tap->txa_ni->ni_vap, IEEE80211_MSG_11N,
 	    tap->txa_ni,
 	    "%s: called",
 	    __func__);
 	callout_reset(&tap->txa_timer, ieee80211_bar_timeout, bar_timeout, tap);
 }
 
 static void
 bar_stop_timer(struct ieee80211_tx_ampdu *tap)
 {
 	IEEE80211_NOTE(tap->txa_ni->ni_vap, IEEE80211_MSG_11N,
 	    tap->txa_ni,
 	    "%s: called",
 	    __func__);
 	callout_stop(&tap->txa_timer);
 }
 
 static void
 bar_tx_complete(struct ieee80211_node *ni, void *arg, int status)
 {
 	struct ieee80211_tx_ampdu *tap = arg;
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N,
 	    ni, "%s: tid %u flags 0x%x pending %d status %d",
 	    __func__, tap->txa_tid, tap->txa_flags,
 	    callout_pending(&tap->txa_timer), status);
 
 	ni->ni_vap->iv_stats.is_ampdu_bar_tx++;
 	/* XXX locking */
 	if ((tap->txa_flags & IEEE80211_AGGR_BARPEND) &&
 	    callout_pending(&tap->txa_timer)) {
 		struct ieee80211com *ic = ni->ni_ic;
 
 		if (status == 0)		/* ACK'd */
 			bar_stop_timer(tap);
 		ic->ic_bar_response(ni, tap, status);
 		/* NB: just let timer expire so we pace requests */
 	}
 }
 
 static void
 ieee80211_bar_response(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap, int status)
 {
 
 	IEEE80211_NOTE(tap->txa_ni->ni_vap, IEEE80211_MSG_11N,
 	    tap->txa_ni,
 	    "%s: called",
 	    __func__);
 	if (status == 0) {		/* got ACK */
 		IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N,
 		    ni, "BAR moves BA win <%u:%u> (%u frames) txseq %u tid %u",
 		    tap->txa_start,
 		    IEEE80211_SEQ_ADD(tap->txa_start, tap->txa_wnd-1),
 		    tap->txa_qframes, tap->txa_seqpending,
 		    tap->txa_tid);
 
 		/* NB: timer already stopped in bar_tx_complete */
 		tap->txa_start = tap->txa_seqpending;
 		tap->txa_flags &= ~IEEE80211_AGGR_BARPEND;
 	}
 }
 
 /*
  * Transmit a BAR frame to the specified node.  The
  * BAR contents are drawn from the supplied aggregation
  * state associated with the node.
  *
  * NB: we only handle immediate ACK w/ compressed bitmap.
  */
 int
 ieee80211_send_bar(struct ieee80211_node *ni,
 	struct ieee80211_tx_ampdu *tap, ieee80211_seq seq)
 {
 #define	senderr(_x, _v)	do { vap->iv_stats._v++; ret = _x; goto bad; } while (0)
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_frame_bar *bar;
 	struct mbuf *m;
 	uint16_t barctl, barseqctl;
 	uint8_t *frm;
 	int tid, ret;
 
 
 	IEEE80211_NOTE(tap->txa_ni->ni_vap, IEEE80211_MSG_11N,
 	    tap->txa_ni,
 	    "%s: called",
 	    __func__);
 
 	if ((tap->txa_flags & IEEE80211_AGGR_RUNNING) == 0) {
 		/* no ADDBA response, should not happen */
 		/* XXX stat+msg */
 		return EINVAL;
 	}
 	/* XXX locking */
 	bar_stop_timer(tap);
 
 	ieee80211_ref_node(ni);
 
 	m = ieee80211_getmgtframe(&frm, ic->ic_headroom, sizeof(*bar));
 	if (m == NULL)
 		senderr(ENOMEM, is_tx_nobuf);
 
 	if (!ieee80211_add_callback(m, bar_tx_complete, tap)) {
 		m_freem(m);
 		senderr(ENOMEM, is_tx_nobuf);	/* XXX */
 		/* NOTREACHED */
 	}
 
 	bar = mtod(m, struct ieee80211_frame_bar *);
 	bar->i_fc[0] = IEEE80211_FC0_VERSION_0 |
 		IEEE80211_FC0_TYPE_CTL | IEEE80211_FC0_SUBTYPE_BAR;
 	bar->i_fc[1] = 0;
 	IEEE80211_ADDR_COPY(bar->i_ra, ni->ni_macaddr);
 	IEEE80211_ADDR_COPY(bar->i_ta, vap->iv_myaddr);
 
 	tid = tap->txa_tid;
 	barctl 	= (tap->txa_flags & IEEE80211_AGGR_IMMEDIATE ?
 			0 : IEEE80211_BAR_NOACK)
 		| IEEE80211_BAR_COMP
 		| SM(tid, IEEE80211_BAR_TID)
 		;
 	barseqctl = SM(seq, IEEE80211_BAR_SEQ_START);
 	/* NB: known to have proper alignment */
 	bar->i_ctl = htole16(barctl);
 	bar->i_seq = htole16(barseqctl);
 	m->m_pkthdr.len = m->m_len = sizeof(struct ieee80211_frame_bar);
 
 	M_WME_SETAC(m, WME_AC_VO);
 
 	IEEE80211_NODE_STAT(ni, tx_mgmt);	/* XXX tx_ctl? */
 
 	/* XXX locking */
 	/* init/bump attempts counter */
 	if ((tap->txa_flags & IEEE80211_AGGR_BARPEND) == 0)
 		tap->txa_attempts = 1;
 	else
 		tap->txa_attempts++;
 	tap->txa_seqpending = seq;
 	tap->txa_flags |= IEEE80211_AGGR_BARPEND;
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_11N,
 	    ni, "send BAR: tid %u ctl 0x%x start %u (attempt %d)",
 	    tid, barctl, seq, tap->txa_attempts);
 
 	/*
 	 * ic_raw_xmit will free the node reference
 	 * regardless of queue/TX success or failure.
 	 */
 	IEEE80211_TX_LOCK(ic);
 	ret = ieee80211_raw_output(vap, ni, m, NULL);
 	IEEE80211_TX_UNLOCK(ic);
 	if (ret != 0) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_11N,
 		    ni, "send BAR: failed: (ret = %d)\n",
 		    ret);
 		/* xmit failed, clear state flag */
 		tap->txa_flags &= ~IEEE80211_AGGR_BARPEND;
 		vap->iv_stats.is_ampdu_bar_tx_fail++;
 		return ret;
 	}
 	/* XXX hack against tx complete happening before timer is started */
 	if (tap->txa_flags & IEEE80211_AGGR_BARPEND)
 		bar_start_timer(tap);
 	return 0;
 bad:
 	IEEE80211_NOTE(tap->txa_ni->ni_vap, IEEE80211_MSG_11N,
 	    tap->txa_ni,
 	    "%s: bad! ret=%d",
 	    __func__, ret);
 	vap->iv_stats.is_ampdu_bar_tx_fail++;
 	ieee80211_free_node(ni);
 	return ret;
 #undef senderr
 }
 
 static int
 ht_action_output(struct ieee80211_node *ni, struct mbuf *m)
 {
 	struct ieee80211_bpf_params params;
 
 	memset(&params, 0, sizeof(params));
 	params.ibp_pri = WME_AC_VO;
 	params.ibp_rate0 = ni->ni_txparms->mgmtrate;
 	/* NB: we know all frames are unicast */
 	params.ibp_try0 = ni->ni_txparms->maxretry;
 	params.ibp_power = ni->ni_txpower;
 	return ieee80211_mgmt_output(ni, m, IEEE80211_FC0_SUBTYPE_ACTION,
 	     &params);
 }
 
 #define	ADDSHORT(frm, v) do {			\
 	frm[0] = (v) & 0xff;			\
 	frm[1] = (v) >> 8;			\
 	frm += 2;				\
 } while (0)
 
 /*
  * Send an action management frame.  The arguments are stuff
  * into a frame without inspection; the caller is assumed to
  * prepare them carefully (e.g. based on the aggregation state).
  */
 static int
 ht_send_action_ba_addba(struct ieee80211_node *ni,
 	int category, int action, void *arg0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	uint16_t *args = arg0;
 	struct mbuf *m;
 	uint8_t *frm;
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
 	    "send ADDBA %s: dialogtoken %d status %d "
 	    "baparamset 0x%x (tid %d) batimeout 0x%x baseqctl 0x%x",
 	    (action == IEEE80211_ACTION_BA_ADDBA_REQUEST) ?
 		"request" : "response",
 	    args[0], args[1], args[2], MS(args[2], IEEE80211_BAPS_TID),
 	    args[3], args[4]);
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
 	    "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", __func__, __LINE__,
 	    ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1);
 	ieee80211_ref_node(ni);
 
 	m = ieee80211_getmgtframe(&frm,
 	    ic->ic_headroom + sizeof(struct ieee80211_frame),
 	    sizeof(uint16_t)	/* action+category */
 	    /* XXX may action payload */
 	    + sizeof(struct ieee80211_action_ba_addbaresponse)
 	);
 	if (m != NULL) {
 		*frm++ = category;
 		*frm++ = action;
 		*frm++ = args[0];		/* dialog token */
 		if (action == IEEE80211_ACTION_BA_ADDBA_RESPONSE)
 			ADDSHORT(frm, args[1]);	/* status code */
 		ADDSHORT(frm, args[2]);		/* baparamset */
 		ADDSHORT(frm, args[3]);		/* batimeout */
 		if (action == IEEE80211_ACTION_BA_ADDBA_REQUEST)
 			ADDSHORT(frm, args[4]);	/* baseqctl */
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
 		return ht_action_output(ni, m);
 	} else {
 		vap->iv_stats.is_tx_nobuf++;
 		ieee80211_free_node(ni);
 		return ENOMEM;
 	}
 }
 
 static int
 ht_send_action_ba_delba(struct ieee80211_node *ni,
 	int category, int action, void *arg0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	uint16_t *args = arg0;
 	struct mbuf *m;
 	uint16_t baparamset;
 	uint8_t *frm;
 
 	baparamset = SM(args[0], IEEE80211_DELBAPS_TID)
 		   | args[1]
 		   ;
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
 	    "send DELBA action: tid %d, initiator %d reason %d (%s)",
 	    args[0], args[1], args[2], ieee80211_reason_to_string(args[2]));
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
 	    "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", __func__, __LINE__,
 	    ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1);
 	ieee80211_ref_node(ni);
 
 	m = ieee80211_getmgtframe(&frm,
 	    ic->ic_headroom + sizeof(struct ieee80211_frame),
 	    sizeof(uint16_t)	/* action+category */
 	    /* XXX may action payload */
 	    + sizeof(struct ieee80211_action_ba_addbaresponse)
 	);
 	if (m != NULL) {
 		*frm++ = category;
 		*frm++ = action;
 		ADDSHORT(frm, baparamset);
 		ADDSHORT(frm, args[2]);		/* reason code */
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
 		return ht_action_output(ni, m);
 	} else {
 		vap->iv_stats.is_tx_nobuf++;
 		ieee80211_free_node(ni);
 		return ENOMEM;
 	}
 }
 
 static int
 ht_send_action_ht_txchwidth(struct ieee80211_node *ni,
 	int category, int action, void *arg0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct mbuf *m;
 	uint8_t *frm;
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
 	    "send HT txchwidth: width %d",
 	    IEEE80211_IS_CHAN_HT40(ni->ni_chan) ? 40 : 20);
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
 	    "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", __func__, __LINE__,
 	    ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1);
 	ieee80211_ref_node(ni);
 
 	m = ieee80211_getmgtframe(&frm,
 	    ic->ic_headroom + sizeof(struct ieee80211_frame),
 	    sizeof(uint16_t)	/* action+category */
 	    /* XXX may action payload */
 	    + sizeof(struct ieee80211_action_ba_addbaresponse)
 	);
 	if (m != NULL) {
 		*frm++ = category;
 		*frm++ = action;
 		*frm++ = IEEE80211_IS_CHAN_HT40(ni->ni_chan) ? 
 			IEEE80211_A_HT_TXCHWIDTH_2040 :
 			IEEE80211_A_HT_TXCHWIDTH_20;
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
 		return ht_action_output(ni, m);
 	} else {
 		vap->iv_stats.is_tx_nobuf++;
 		ieee80211_free_node(ni);
 		return ENOMEM;
 	}
 }
 #undef ADDSHORT
 
 /*
  * Construct the MCS bit mask for inclusion in an HT capabilities
  * information element.
  */
 static void
 ieee80211_set_mcsset(struct ieee80211com *ic, uint8_t *frm)
 {
 	int i;
 	uint8_t txparams;
 
 	KASSERT((ic->ic_rxstream > 0 && ic->ic_rxstream <= 4),
 	    ("ic_rxstream %d out of range", ic->ic_rxstream));
 	KASSERT((ic->ic_txstream > 0 && ic->ic_txstream <= 4),
 	    ("ic_txstream %d out of range", ic->ic_txstream));
 
 	for (i = 0; i < ic->ic_rxstream * 8; i++)
 		setbit(frm, i);
 	if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) &&
 	    (ic->ic_htcaps & IEEE80211_HTC_RXMCS32))
 		setbit(frm, 32);
 	if (ic->ic_htcaps & IEEE80211_HTC_RXUNEQUAL) {
 		if (ic->ic_rxstream >= 2) {
 			for (i = 33; i <= 38; i++)
 				setbit(frm, i);
 		}
 		if (ic->ic_rxstream >= 3) {
 			for (i = 39; i <= 52; i++)
 				setbit(frm, i);
 		}
 		if (ic->ic_txstream >= 4) {
 			for (i = 53; i <= 76; i++)
 				setbit(frm, i);
 		}
 	}
 
 	if (ic->ic_rxstream != ic->ic_txstream) {
 		txparams = 0x1;			/* TX MCS set defined */
 		txparams |= 0x2;		/* TX RX MCS not equal */
 		txparams |= (ic->ic_txstream - 1) << 2;	/* num TX streams */
 		if (ic->ic_htcaps & IEEE80211_HTC_TXUNEQUAL)
 			txparams |= 0x16;	/* TX unequal modulation sup */
 	} else
 		txparams = 0;
 	frm[12] = txparams;
 }
 
 /*
  * Add body of an HTCAP information element.
  */
 static uint8_t *
 ieee80211_add_htcap_body(uint8_t *frm, struct ieee80211_node *ni)
 {
 #define	ADDSHORT(frm, v) do {			\
 	frm[0] = (v) & 0xff;			\
 	frm[1] = (v) >> 8;			\
 	frm += 2;				\
 } while (0)
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211vap *vap = ni->ni_vap;
 	uint16_t caps, extcaps;
 	int rxmax, density;
 
 	/* HT capabilities */
 	caps = vap->iv_htcaps & 0xffff;
 	/*
 	 * Note channel width depends on whether we are operating as
 	 * a sta or not.  When operating as a sta we are generating
 	 * a request based on our desired configuration.  Otherwise
 	 * we are operational and the channel attributes identify
 	 * how we've been setup (which might be different if a fixed
 	 * channel is specified).
 	 */
 	if (vap->iv_opmode == IEEE80211_M_STA) {
 		/* override 20/40 use based on config */
 		if (vap->iv_flags_ht & IEEE80211_FHT_USEHT40)
 			caps |= IEEE80211_HTCAP_CHWIDTH40;
 		else
 			caps &= ~IEEE80211_HTCAP_CHWIDTH40;
 
 		/* Start by using the advertised settings */
 		rxmax = MS(ni->ni_htparam, IEEE80211_HTCAP_MAXRXAMPDU);
 		density = MS(ni->ni_htparam, IEEE80211_HTCAP_MPDUDENSITY);
 
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_11N,
 		    "%s: advertised rxmax=%d, density=%d, vap rxmax=%d, density=%d\n",
 		    __func__,
 		    rxmax,
 		    density,
 		    vap->iv_ampdu_rxmax,
 		    vap->iv_ampdu_density);
 
 		/* Cap at VAP rxmax */
 		if (rxmax > vap->iv_ampdu_rxmax)
 			rxmax = vap->iv_ampdu_rxmax;
 
 		/*
 		 * If the VAP ampdu density value greater, use that.
 		 *
 		 * (Larger density value == larger minimum gap between A-MPDU
 		 * subframes.)
 		 */
 		if (vap->iv_ampdu_density > density)
 			density = vap->iv_ampdu_density;
 
 		/*
 		 * NB: Hardware might support HT40 on some but not all
 		 * channels. We can't determine this earlier because only
 		 * after association the channel is upgraded to HT based
 		 * on the negotiated capabilities.
 		 */
 		if (ni->ni_chan != IEEE80211_CHAN_ANYC &&
 		    findhtchan(ic, ni->ni_chan, IEEE80211_CHAN_HT40U) == NULL &&
 		    findhtchan(ic, ni->ni_chan, IEEE80211_CHAN_HT40D) == NULL)
 			caps &= ~IEEE80211_HTCAP_CHWIDTH40;
 	} else {
 		/* override 20/40 use based on current channel */
 		if (IEEE80211_IS_CHAN_HT40(ni->ni_chan))
 			caps |= IEEE80211_HTCAP_CHWIDTH40;
 		else
 			caps &= ~IEEE80211_HTCAP_CHWIDTH40;
 
 		/* XXX TODO should it start by using advertised settings? */
 		rxmax = vap->iv_ampdu_rxmax;
 		density = vap->iv_ampdu_density;
 	}
 
 	/* adjust short GI based on channel and config */
 	if ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20) == 0)
 		caps &= ~IEEE80211_HTCAP_SHORTGI20;
 	if ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40) == 0 ||
 	    (caps & IEEE80211_HTCAP_CHWIDTH40) == 0)
 		caps &= ~IEEE80211_HTCAP_SHORTGI40;
 
 	/* adjust STBC based on receive capabilities */
 	if ((vap->iv_flags_ht & IEEE80211_FHT_STBC_RX) == 0)
 		caps &= ~IEEE80211_HTCAP_RXSTBC;
 
 	/* adjust LDPC based on receive capabilites */
 	if ((vap->iv_flags_ht & IEEE80211_FHT_LDPC_RX) == 0)
 		caps &= ~IEEE80211_HTCAP_LDPC;
 
 	ADDSHORT(frm, caps);
 
 	/* HT parameters */
 	*frm = SM(rxmax, IEEE80211_HTCAP_MAXRXAMPDU)
 	     | SM(density, IEEE80211_HTCAP_MPDUDENSITY)
 	     ;
 	frm++;
 
 	/* pre-zero remainder of ie */
 	memset(frm, 0, sizeof(struct ieee80211_ie_htcap) - 
 		__offsetof(struct ieee80211_ie_htcap, hc_mcsset));
 
 	/* supported MCS set */
 	/*
 	 * XXX: For sta mode the rate set should be restricted based
 	 * on the AP's capabilities, but ni_htrates isn't setup when
 	 * we're called to form an AssocReq frame so for now we're
 	 * restricted to the device capabilities.
 	 */
 	ieee80211_set_mcsset(ni->ni_ic, frm);
 
 	frm += __offsetof(struct ieee80211_ie_htcap, hc_extcap) -
 		__offsetof(struct ieee80211_ie_htcap, hc_mcsset);
 
 	/* HT extended capabilities */
 	extcaps = vap->iv_htextcaps & 0xffff;
 
 	ADDSHORT(frm, extcaps);
 
 	frm += sizeof(struct ieee80211_ie_htcap) -
 		__offsetof(struct ieee80211_ie_htcap, hc_txbf);
 
 	return frm;
 #undef ADDSHORT
 }
 
 /*
  * Add 802.11n HT capabilities information element
  */
 uint8_t *
 ieee80211_add_htcap(uint8_t *frm, struct ieee80211_node *ni)
 {
 	frm[0] = IEEE80211_ELEMID_HTCAP;
 	frm[1] = sizeof(struct ieee80211_ie_htcap) - 2;
 	return ieee80211_add_htcap_body(frm + 2, ni);
 }
 
 /*
  * Non-associated probe request - add HT capabilities based on
  * the current channel configuration.
  */
 static uint8_t *
 ieee80211_add_htcap_body_ch(uint8_t *frm, struct ieee80211vap *vap,
     struct ieee80211_channel *c)
 {
 #define	ADDSHORT(frm, v) do {			\
 	frm[0] = (v) & 0xff;			\
 	frm[1] = (v) >> 8;			\
 	frm += 2;				\
 } while (0)
 	struct ieee80211com *ic = vap->iv_ic;
 	uint16_t caps, extcaps;
 	int rxmax, density;
 
 	/* HT capabilities */
 	caps = vap->iv_htcaps & 0xffff;
 
 	/*
 	 * We don't use this in STA mode; only in IBSS mode.
 	 * So in IBSS mode we base our HTCAP flags on the
 	 * given channel.
 	 */
 
 	/* override 20/40 use based on current channel */
 	if (IEEE80211_IS_CHAN_HT40(c))
 		caps |= IEEE80211_HTCAP_CHWIDTH40;
 	else
 		caps &= ~IEEE80211_HTCAP_CHWIDTH40;
 
 	/* Use the currently configured values */
 	rxmax = vap->iv_ampdu_rxmax;
 	density = vap->iv_ampdu_density;
 
 	/* adjust short GI based on channel and config */
 	if ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20) == 0)
 		caps &= ~IEEE80211_HTCAP_SHORTGI20;
 	if ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40) == 0 ||
 	    (caps & IEEE80211_HTCAP_CHWIDTH40) == 0)
 		caps &= ~IEEE80211_HTCAP_SHORTGI40;
 	ADDSHORT(frm, caps);
 
 	/* HT parameters */
 	*frm = SM(rxmax, IEEE80211_HTCAP_MAXRXAMPDU)
 	     | SM(density, IEEE80211_HTCAP_MPDUDENSITY)
 	     ;
 	frm++;
 
 	/* pre-zero remainder of ie */
 	memset(frm, 0, sizeof(struct ieee80211_ie_htcap) - 
 		__offsetof(struct ieee80211_ie_htcap, hc_mcsset));
 
 	/* supported MCS set */
 	/*
 	 * XXX: For sta mode the rate set should be restricted based
 	 * on the AP's capabilities, but ni_htrates isn't setup when
 	 * we're called to form an AssocReq frame so for now we're
 	 * restricted to the device capabilities.
 	 */
 	ieee80211_set_mcsset(ic, frm);
 
 	frm += __offsetof(struct ieee80211_ie_htcap, hc_extcap) -
 		__offsetof(struct ieee80211_ie_htcap, hc_mcsset);
 
 	/* HT extended capabilities */
 	extcaps = vap->iv_htextcaps & 0xffff;
 
 	ADDSHORT(frm, extcaps);
 
 	frm += sizeof(struct ieee80211_ie_htcap) -
 		__offsetof(struct ieee80211_ie_htcap, hc_txbf);
 
 	return frm;
 #undef ADDSHORT
 }
 
 /*
  * Add 802.11n HT capabilities information element
  */
 uint8_t *
 ieee80211_add_htcap_ch(uint8_t *frm, struct ieee80211vap *vap,
     struct ieee80211_channel *c)
 {
 	frm[0] = IEEE80211_ELEMID_HTCAP;
 	frm[1] = sizeof(struct ieee80211_ie_htcap) - 2;
 	return ieee80211_add_htcap_body_ch(frm + 2, vap, c);
 }
 
 /*
  * Add Broadcom OUI wrapped standard HTCAP ie; this is
  * used for compatibility w/ pre-draft implementations.
  */
 uint8_t *
 ieee80211_add_htcap_vendor(uint8_t *frm, struct ieee80211_node *ni)
 {
 	frm[0] = IEEE80211_ELEMID_VENDOR;
 	frm[1] = 4 + sizeof(struct ieee80211_ie_htcap) - 2;
 	frm[2] = (BCM_OUI >> 0) & 0xff;
 	frm[3] = (BCM_OUI >> 8) & 0xff;
 	frm[4] = (BCM_OUI >> 16) & 0xff;
 	frm[5] = BCM_OUI_HTCAP;
 	return ieee80211_add_htcap_body(frm + 6, ni);
 }
 
 /*
  * Construct the MCS bit mask of basic rates
  * for inclusion in an HT information element.
  */
 static void
 ieee80211_set_basic_htrates(uint8_t *frm, const struct ieee80211_htrateset *rs)
 {
 	int i;
 
 	for (i = 0; i < rs->rs_nrates; i++) {
 		int r = rs->rs_rates[i] & IEEE80211_RATE_VAL;
 		if ((rs->rs_rates[i] & IEEE80211_RATE_BASIC) &&
 		    r < IEEE80211_HTRATE_MAXSIZE) {
 			/* NB: this assumes a particular implementation */
 			setbit(frm, r);
 		}
 	}
 }
 
 /*
  * Update the HTINFO ie for a beacon frame.
  */
 void
 ieee80211_ht_update_beacon(struct ieee80211vap *vap,
 	struct ieee80211_beacon_offsets *bo)
 {
 #define	PROTMODE	(IEEE80211_HTINFO_OPMODE|IEEE80211_HTINFO_NONHT_PRESENT)
 	struct ieee80211_node *ni;
 	const struct ieee80211_channel *bsschan;
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_ie_htinfo *ht =
 	   (struct ieee80211_ie_htinfo *) bo->bo_htinfo;
 
 	ni = ieee80211_ref_node(vap->iv_bss);
 	bsschan = ni->ni_chan;
 
 	/* XXX only update on channel change */
 	ht->hi_ctrlchannel = ieee80211_chan2ieee(ic, bsschan);
 	if (vap->iv_flags_ht & IEEE80211_FHT_RIFS)
 		ht->hi_byte1 = IEEE80211_HTINFO_RIFSMODE_PERM;
 	else
 		ht->hi_byte1 = IEEE80211_HTINFO_RIFSMODE_PROH;
 	if (IEEE80211_IS_CHAN_HT40U(bsschan))
 		ht->hi_byte1 |= IEEE80211_HTINFO_2NDCHAN_ABOVE;
 	else if (IEEE80211_IS_CHAN_HT40D(bsschan))
 		ht->hi_byte1 |= IEEE80211_HTINFO_2NDCHAN_BELOW;
 	else
 		ht->hi_byte1 |= IEEE80211_HTINFO_2NDCHAN_NONE;
 	if (IEEE80211_IS_CHAN_HT40(bsschan))
 		ht->hi_byte1 |= IEEE80211_HTINFO_TXWIDTH_2040;
 
 	/* protection mode */
 	ht->hi_byte2 = (ht->hi_byte2 &~ PROTMODE) | ic->ic_curhtprotmode;
 
 	ieee80211_free_node(ni);
 
 	/* XXX propagate to vendor ie's */
 #undef PROTMODE
 }
 
 /*
  * Add body of an HTINFO information element.
  *
  * NB: We don't use struct ieee80211_ie_htinfo because we can
  * be called to fillin both a standard ie and a compat ie that
  * has a vendor OUI at the front.
  */
 static uint8_t *
 ieee80211_add_htinfo_body(uint8_t *frm, struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 
 	/* pre-zero remainder of ie */
 	memset(frm, 0, sizeof(struct ieee80211_ie_htinfo) - 2);
 
 	/* primary/control channel center */
 	*frm++ = ieee80211_chan2ieee(ic, ni->ni_chan);
 
 	if (vap->iv_flags_ht & IEEE80211_FHT_RIFS)
 		frm[0] = IEEE80211_HTINFO_RIFSMODE_PERM;
 	else
 		frm[0] = IEEE80211_HTINFO_RIFSMODE_PROH;
 	if (IEEE80211_IS_CHAN_HT40U(ni->ni_chan))
 		frm[0] |= IEEE80211_HTINFO_2NDCHAN_ABOVE;
 	else if (IEEE80211_IS_CHAN_HT40D(ni->ni_chan))
 		frm[0] |= IEEE80211_HTINFO_2NDCHAN_BELOW;
 	else
 		frm[0] |= IEEE80211_HTINFO_2NDCHAN_NONE;
 	if (IEEE80211_IS_CHAN_HT40(ni->ni_chan))
 		frm[0] |= IEEE80211_HTINFO_TXWIDTH_2040;
 
 	frm[1] = ic->ic_curhtprotmode;
 
 	frm += 5;
 
 	/* basic MCS set */
 	ieee80211_set_basic_htrates(frm, &ni->ni_htrates);
 	frm += sizeof(struct ieee80211_ie_htinfo) -
 		__offsetof(struct ieee80211_ie_htinfo, hi_basicmcsset);
 	return frm;
 }
 
 /*
  * Add 802.11n HT information information element.
  */
 uint8_t *
 ieee80211_add_htinfo(uint8_t *frm, struct ieee80211_node *ni)
 {
 	frm[0] = IEEE80211_ELEMID_HTINFO;
 	frm[1] = sizeof(struct ieee80211_ie_htinfo) - 2;
 	return ieee80211_add_htinfo_body(frm + 2, ni);
 }
 
 /*
  * Add Broadcom OUI wrapped standard HTINFO ie; this is
  * used for compatibility w/ pre-draft implementations.
  */
 uint8_t *
 ieee80211_add_htinfo_vendor(uint8_t *frm, struct ieee80211_node *ni)
 {
 	frm[0] = IEEE80211_ELEMID_VENDOR;
 	frm[1] = 4 + sizeof(struct ieee80211_ie_htinfo) - 2;
 	frm[2] = (BCM_OUI >> 0) & 0xff;
 	frm[3] = (BCM_OUI >> 8) & 0xff;
 	frm[4] = (BCM_OUI >> 16) & 0xff;
 	frm[5] = BCM_OUI_HTINFO;
 	return ieee80211_add_htinfo_body(frm + 6, ni);
 }
Index: projects/clang500-import/sys/net80211/ieee80211_ht.h
===================================================================
--- projects/clang500-import/sys/net80211/ieee80211_ht.h	(revision 318657)
+++ projects/clang500-import/sys/net80211/ieee80211_ht.h	(revision 318658)
@@ -1,231 +1,232 @@
 /*-
  * 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 _NET80211_IEEE80211_HT_H_
 #define _NET80211_IEEE80211_HT_H_
 
 /*
  * 802.11n protocol implementation definitions.
  */
 
 #define	IEEE80211_AGGR_BAWMAX	64	/* max block ack window size */
 /* threshold for aging overlapping non-HT bss */
 #define	IEEE80211_NONHT_PRESENT_AGE	msecs_to_ticks(60*1000)
 
 struct ieee80211_tx_ampdu {
 	struct ieee80211_node *txa_ni;	/* back pointer */
 	u_short		txa_flags;
 #define	IEEE80211_AGGR_IMMEDIATE	0x0001	/* BA policy */
 #define	IEEE80211_AGGR_XCHGPEND		0x0002	/* ADDBA response pending */
 #define	IEEE80211_AGGR_RUNNING		0x0004	/* ADDBA response received */
 #define	IEEE80211_AGGR_SETUP		0x0008	/* deferred state setup */
 #define	IEEE80211_AGGR_NAK		0x0010	/* peer NAK'd ADDBA request */
 #define	IEEE80211_AGGR_BARPEND		0x0020	/* BAR response pending */
 #define	IEEE80211_AGGR_WAITRX		0x0040	/* Wait for first RX frame to define BAW */
 	uint8_t		txa_tid;
 	uint8_t		txa_token;	/* dialog token */
 	int		txa_lastsample;	/* ticks @ last traffic sample */
 	int		txa_pkts;	/* packets over last sample interval */
 	int		txa_avgpps;	/* filtered traffic over window */
 	int		txa_qbytes;	/* data queued (bytes) */
 	short		txa_qframes;	/* data queued (frames) */
 	ieee80211_seq	txa_start;	/* BA window left edge */
 	ieee80211_seq	txa_seqpending;	/* new txa_start pending BAR response */
 	uint16_t	txa_wnd;	/* BA window size */
 	uint8_t		txa_attempts;	/* # ADDBA/BAR requests w/o a response*/
 	int		txa_nextrequest;/* soonest to make next request */
 	struct callout	txa_timer;
 	void		*txa_private;	/* driver-private storage */
 	uint64_t	txa_pad[4];
 };
 
 /* return non-zero if AMPDU tx for the TID is running */
 #define	IEEE80211_AMPDU_RUNNING(tap) \
 	(((tap)->txa_flags & IEEE80211_AGGR_RUNNING) != 0)
 
 /* return non-zero if AMPDU tx for the TID was NACKed */
 #define	IEEE80211_AMPDU_NACKED(tap)\
 	(!! ((tap)->txa_flags & IEEE80211_AGGR_NAK))
 
 /* return non-zero if AMPDU tx for the TID is running or started */
 #define	IEEE80211_AMPDU_REQUESTED(tap) \
 	(((tap)->txa_flags & \
 	 (IEEE80211_AGGR_RUNNING|IEEE80211_AGGR_XCHGPEND|IEEE80211_AGGR_NAK)) != 0)
 
 #define	IEEE80211_AGGR_BITS \
 	"\20\1IMMEDIATE\2XCHGPEND\3RUNNING\4SETUP\5NAK"
 
 /*
  * Traffic estimator support.  We estimate packets/sec for
  * each AC that is setup for AMPDU or will potentially be
  * setup for AMPDU.  The traffic rate can be used to decide
  * when AMPDU should be setup (according to a threshold)
  * and is available for drivers to do things like cache
  * eviction when only a limited number of BA streams are
  * available and more streams are requested than available.
  */
 
 static __inline void
 ieee80211_txampdu_init_pps(struct ieee80211_tx_ampdu *tap)
 {
 	/*
 	 * Reset packet estimate.
 	 */
 	tap->txa_lastsample = ticks;
 	tap->txa_avgpps = 0;
 }
 
 static __inline void
 ieee80211_txampdu_update_pps(struct ieee80211_tx_ampdu *tap)
 {
 
 	/* NB: scale factor of 2 was picked heuristically */
 	tap->txa_avgpps = ((tap->txa_avgpps << 2) -
 	     tap->txa_avgpps + tap->txa_pkts) >> 2;
 }
 
 /*
  * Count a packet towards the pps estimate.
  */
 static __inline void
 ieee80211_txampdu_count_packet(struct ieee80211_tx_ampdu *tap)
 {
 
 	/* XXX bound loop/do more crude estimate? */
 	while (ticks - tap->txa_lastsample >= hz) {
 		ieee80211_txampdu_update_pps(tap);
 		/* reset to start new sample interval */
 		tap->txa_pkts = 0;
 		if (tap->txa_avgpps == 0) {
 			tap->txa_lastsample = ticks;
 			break;
 		}
 		tap->txa_lastsample += hz;
 	}
 	tap->txa_pkts++;
 }
 
 /*
  * Get the current pps estimate.  If the average is out of
  * date due to lack of traffic then we decay the estimate
  * to account for the idle time.
  */
 static __inline int
 ieee80211_txampdu_getpps(struct ieee80211_tx_ampdu *tap)
 {
 	/* XXX bound loop/do more crude estimate? */
 	while (ticks - tap->txa_lastsample >= hz) {
 		ieee80211_txampdu_update_pps(tap);
 		tap->txa_pkts = 0;
 		if (tap->txa_avgpps == 0) {
 			tap->txa_lastsample = ticks;
 			break;
 		}
 		tap->txa_lastsample += hz;
 	}
 	return tap->txa_avgpps;
 }
 
 struct ieee80211_rx_ampdu {
 	int		rxa_flags;
 	int		rxa_qbytes;	/* data queued (bytes) */
 	short		rxa_qframes;	/* data queued (frames) */
 	ieee80211_seq	rxa_seqstart;
 	ieee80211_seq	rxa_start;	/* start of current BA window */
 	uint16_t	rxa_wnd;	/* BA window size */
 	int		rxa_age;	/* age of oldest frame in window */
 	int		rxa_nframes;	/* frames since ADDBA */
 	struct mbuf *rxa_m[IEEE80211_AGGR_BAWMAX];
 	void		*rxa_private;
 	uint64_t	rxa_pad[3];
 };
 
 void	ieee80211_ht_attach(struct ieee80211com *);
 void	ieee80211_ht_detach(struct ieee80211com *);
 void	ieee80211_ht_vattach(struct ieee80211vap *);
 void	ieee80211_ht_vdetach(struct ieee80211vap *);
 
 void	ieee80211_ht_announce(struct ieee80211com *);
 
 struct ieee80211_mcs_rates {
 	uint16_t	ht20_rate_800ns;
 	uint16_t	ht20_rate_400ns;
 	uint16_t	ht40_rate_800ns;
 	uint16_t	ht40_rate_400ns;
 };
 extern const struct ieee80211_mcs_rates ieee80211_htrates[];
 void	ieee80211_init_suphtrates(struct ieee80211com *);
 
 struct ieee80211_node;
 int	ieee80211_setup_htrates(struct ieee80211_node *,
 		const uint8_t *htcap, int flags);
 void	ieee80211_setup_basic_htrates(struct ieee80211_node *,
 		const uint8_t *htinfo);
 struct mbuf *ieee80211_decap_amsdu(struct ieee80211_node *, struct mbuf *);
-int	ieee80211_ampdu_reorder(struct ieee80211_node *, struct mbuf *);
+int	ieee80211_ampdu_reorder(struct ieee80211_node *, struct mbuf *,
+	    const struct ieee80211_rx_stats *);
 void	ieee80211_recv_bar(struct ieee80211_node *, struct mbuf *);
 void	ieee80211_ht_node_init(struct ieee80211_node *);
 void	ieee80211_ht_node_cleanup(struct ieee80211_node *);
 void	ieee80211_ht_node_age(struct ieee80211_node *);
 
 struct ieee80211_channel *ieee80211_ht_adjust_channel(struct ieee80211com *,
 		struct ieee80211_channel *, int);
 void	ieee80211_ht_wds_init(struct ieee80211_node *);
 void	ieee80211_ht_node_join(struct ieee80211_node *);
 void	ieee80211_ht_node_leave(struct ieee80211_node *);
 void	ieee80211_htprot_update(struct ieee80211com *, int protmode);
 void	ieee80211_ht_timeout(struct ieee80211com *);
 void	ieee80211_parse_htcap(struct ieee80211_node *, const uint8_t *);
 void	ieee80211_parse_htinfo(struct ieee80211_node *, const uint8_t *);
 void	ieee80211_ht_updateparams(struct ieee80211_node *, const uint8_t *,
 		const uint8_t *);
 int	ieee80211_ht_updateparams_final(struct ieee80211_node *,
 	    const uint8_t *, const uint8_t *);
 void	ieee80211_ht_updatehtcap(struct ieee80211_node *, const uint8_t *);
 void	ieee80211_ht_updatehtcap_final(struct ieee80211_node *);
 int	ieee80211_ampdu_request(struct ieee80211_node *,
 		struct ieee80211_tx_ampdu *);
 void	ieee80211_ampdu_stop(struct ieee80211_node *,
 		struct ieee80211_tx_ampdu *, int);
 int	ieee80211_send_bar(struct ieee80211_node *, struct ieee80211_tx_ampdu *,
 		ieee80211_seq);
 uint8_t	*ieee80211_add_htcap(uint8_t *, struct ieee80211_node *);
 uint8_t	*ieee80211_add_htcap_ch(uint8_t *, struct ieee80211vap *,
 	    struct ieee80211_channel *);
 uint8_t	*ieee80211_add_htcap_vendor(uint8_t *, struct ieee80211_node *);
 uint8_t	*ieee80211_add_htinfo(uint8_t *, struct ieee80211_node *);
 uint8_t	*ieee80211_add_htinfo_vendor(uint8_t *, struct ieee80211_node *);
 struct ieee80211_beacon_offsets;
 void	ieee80211_ht_update_beacon(struct ieee80211vap *,
 		struct ieee80211_beacon_offsets *);
 int	ieee80211_ampdu_rx_start_ext(struct ieee80211_node *ni, int tid,
 	    int seq, int baw);
 void	ieee80211_ampdu_rx_stop_ext(struct ieee80211_node *ni, int tid);
 int	ieee80211_ampdu_tx_request_ext(struct ieee80211_node *ni, int tid);
 int	ieee80211_ampdu_tx_request_active_ext(struct ieee80211_node *ni,
 	    int tid, int status);
 
 #endif /* _NET80211_IEEE80211_HT_H_ */
Index: projects/clang500-import/sys/net80211/ieee80211_input.h
===================================================================
--- projects/clang500-import/sys/net80211/ieee80211_input.h	(revision 318657)
+++ projects/clang500-import/sys/net80211/ieee80211_input.h	(revision 318658)
@@ -1,277 +1,277 @@
 /*-
  * Copyright (c) 2007-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_INPUT_H_
 #define _NET80211_IEEE80211_INPUT_H_
 
 /* Verify the existence and length of __elem or get out. */
 #define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen, _action) do {	\
 	if ((__elem) == NULL) {						\
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID,		\
 		    wh, NULL, "%s", "no " #__elem );			\
 		vap->iv_stats.is_rx_elem_missing++;			\
 		_action;						\
 	} else if ((__elem)[1] > (__maxlen)) {				\
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID,		\
 		    wh, NULL, "bad " #__elem " len %d", (__elem)[1]);	\
 		vap->iv_stats.is_rx_elem_toobig++;			\
 		_action;						\
 	}								\
 } while (0)
 
 #define	IEEE80211_VERIFY_LENGTH(_len, _minlen, _action) do {		\
 	if ((_len) < (_minlen)) {					\
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID,		\
 		    wh, NULL, "ie too short, got %d, expected %d",	\
 		    (_len), (_minlen));					\
 		vap->iv_stats.is_rx_elem_toosmall++;			\
 		_action;						\
 	}								\
 } while (0)
 
 #ifdef IEEE80211_DEBUG
 void	ieee80211_ssid_mismatch(struct ieee80211vap *, const char *tag,
 	uint8_t mac[IEEE80211_ADDR_LEN], uint8_t *ssid);
 
 #define	IEEE80211_VERIFY_SSID(_ni, _ssid, _action) do {			\
 	if ((_ssid)[1] != 0 &&						\
 	    ((_ssid)[1] != (_ni)->ni_esslen ||				\
 	    memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) {	\
 		if (ieee80211_msg_input(vap))				\
 			ieee80211_ssid_mismatch(vap, 			\
 			    ieee80211_mgt_subtype_name(subtype),	\
 				wh->i_addr2, _ssid);			\
 		vap->iv_stats.is_rx_ssidmismatch++;			\
 		_action;						\
 	}								\
 } while (0)
 #else /* !IEEE80211_DEBUG */
 #define	IEEE80211_VERIFY_SSID(_ni, _ssid, _action) do {			\
 	if ((_ssid)[1] != 0 &&						\
 	    ((_ssid)[1] != (_ni)->ni_esslen ||				\
 	    memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) {	\
 		vap->iv_stats.is_rx_ssidmismatch++;			\
 		_action;						\
 	}								\
 } while (0)
 #endif /* !IEEE80211_DEBUG */
 
 #include <sys/endian.h>		/* For le16toh() / le32dec() */
 
 static __inline int
 iswpaoui(const uint8_t *frm)
 {
 	return frm[1] > 3 && le32dec(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI);
 }
 
 static __inline int
 iswmeoui(const uint8_t *frm)
 {
 	return frm[1] > 3 && le32dec(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI);
 }
 
 static __inline int
 iswmeparam(const uint8_t *frm)
 {
 	return frm[1] > 5 && le32dec(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) &&
 		frm[6] == WME_PARAM_OUI_SUBTYPE;
 }
 
 static __inline int
 iswmeinfo(const uint8_t *frm)
 {
 	return frm[1] > 5 && le32dec(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) &&
 		frm[6] == WME_INFO_OUI_SUBTYPE;
 }
 
 static __inline int
 isatherosoui(const uint8_t *frm)
 {
 	return frm[1] > 3 && le32dec(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI);
 }
 
 static __inline int
 istdmaoui(const uint8_t *frm)
 {
 	return frm[1] > 3 && le32dec(frm+2) == ((TDMA_OUI_TYPE<<24)|TDMA_OUI);
 }
 
 static __inline int
 ishtcapoui(const uint8_t *frm)
 {
 	return frm[1] > 3 && le32dec(frm+2) == ((BCM_OUI_HTCAP<<24)|BCM_OUI);
 }
 
 static __inline int
 ishtinfooui(const uint8_t *frm)
 {
 	return frm[1] > 3 && le32dec(frm+2) == ((BCM_OUI_HTINFO<<24)|BCM_OUI);
 }
 
 /*
  * Check the current frame sequence number against the current TID
  * state and return whether it's in sequence or should be dropped.
  *
  * Since out of order packet and duplicate packet eliminations should
  * be done by the AMPDU RX code, this routine blindly accepts all
  * frames from a HT station w/ a TID that is currently doing AMPDU-RX.
  * HT stations without WME or where the TID is not doing AMPDU-RX
  * are checked like non-HT stations.
  *
  * The routine only eliminates packets whose sequence/fragment
  * match or are less than the last seen sequence/fragment number
  * AND are retransmits It doesn't try to eliminate out of order packets.
  *
  * Since all frames after sequence number 4095 will be less than 4095
  * (as the seqnum wraps), handle that special case so packets aren't
  * incorrectly dropped - ie, if the next packet is sequence number 0
  * but a retransmit since the initial packet didn't make it.
  *
  * XXX TODO: handle sequence number space wrapping with dropped frames;
  * especially in high interference conditions under high traffic load
  * The RX AMPDU reorder code also needs it.
  *
  * XXX TODO: update for 802.11-2012 9.3.2.10 Duplicate Detection and Recovery.
  */
 static __inline int
 ieee80211_check_rxseq(struct ieee80211_node *ni, struct ieee80211_frame *wh,
-    uint8_t *bssid)
+    uint8_t *bssid, const struct ieee80211_rx_stats *rxs)
 {
 #define	SEQ_LEQ(a,b)	((int)((a)-(b)) <= 0)
 #define	SEQ_EQ(a,b)	((int)((a)-(b)) == 0)
 #define	SEQNO(a)	((a) >> IEEE80211_SEQ_SEQ_SHIFT)
 #define	FRAGNO(a)	((a) & IEEE80211_SEQ_FRAG_MASK)
 	struct ieee80211vap *vap = ni->ni_vap;
 	uint16_t rxseq;
 	uint8_t type, subtype;
 	uint8_t tid;
 	struct ieee80211_rx_ampdu *rap;
 
 	rxseq = le16toh(*(uint16_t *)wh->i_seq);
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 
 	/*
 	 * Types with no sequence number (or QoS (+)Null frames)
 	 * are always treated valid.
 	 */
 	if (! IEEE80211_HAS_SEQ(type, subtype))
 		return 1;
 
 	/*
 	 * Always allow multicast frames for now - QoS (any TID)
 	 * or not.
 	 */
 	if (IEEE80211_IS_MULTICAST(wh->i_addr1))
 		return 1;
 
 	tid = ieee80211_gettid(wh);
 
 	/*
 	 * Only do the HT AMPDU check for WME stations; non-WME HT stations
 	 * shouldn't exist outside of debugging. We should at least
 	 * handle that.
 	 */
 	if (tid < WME_NUM_TID) {
 		rap = &ni->ni_rx_ampdu[tid];
 		/* HT nodes currently doing RX AMPDU are always valid */
 		if ((ni->ni_flags & IEEE80211_NODE_HT) &&
 		    (rap->rxa_flags & IEEE80211_AGGR_RUNNING))
 			goto ok;
 	}
 
 	/*	
 	 * Otherwise, retries for packets below or equal to the last
 	 * seen sequence number should be dropped.
 	 */
 
 	/*
 	 * Treat frame seqnum 4095 as special due to boundary
 	 * wrapping conditions.
 	 */
 	if (SEQNO(ni->ni_rxseqs[tid]) == 4095) {
 		/*
 		 * Drop retransmits on seqnum 4095/current fragment for itself.
 		 */
 		if (SEQ_EQ(rxseq, ni->ni_rxseqs[tid]) &&
 		    (wh->i_fc[1] & IEEE80211_FC1_RETRY))
 			goto fail;
 		/*
 		 * Treat any subsequent frame as fine if the last seen frame
 		 * is 4095 and it's not a retransmit for the same sequence
 		 * number. However, this doesn't capture incorrectly ordered
 	 	 * fragments w/ sequence number 4095. It shouldn't be seen
 		 * in practice, but see the comment above for further info.
 		 */
 		goto ok;
 	}
 
 	/*
 	 * At this point we assume that retransmitted seq/frag numbers below
 	 * the current can simply be eliminated.
 	 */
 	if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) &&
 	    SEQ_LEQ(rxseq, ni->ni_rxseqs[tid]))
 		goto fail;
 
 ok:
 	ni->ni_rxseqs[tid] = rxseq;
 
 	return 1;
 
 fail:
 	/* duplicate, discard */
 	IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, bssid, "duplicate",
 	    "seqno <%u,%u> fragno <%u,%u> tid %u",
 	     SEQNO(rxseq),  SEQNO(ni->ni_rxseqs[tid]),
 	    FRAGNO(rxseq), FRAGNO(ni->ni_rxseqs[tid]), tid);
 	vap->iv_stats.is_rx_dup++;
 	IEEE80211_NODE_STAT(ni, rx_dup);
 
 	return 0;
 #undef	SEQ_LEQ
 #undef	SEQ_EQ
 #undef	SEQNO
 #undef	FRAGNO
 }
 
 void	ieee80211_deliver_data(struct ieee80211vap *,
 		struct ieee80211_node *, struct mbuf *);
 struct mbuf *ieee80211_defrag(struct ieee80211_node *,
 		struct mbuf *, int);
 struct mbuf *ieee80211_realign(struct ieee80211vap *, struct mbuf *, size_t);
 struct mbuf *ieee80211_decap(struct ieee80211vap *, struct mbuf *, int);
 struct mbuf *ieee80211_decap1(struct mbuf *, int *);
 int	ieee80211_setup_rates(struct ieee80211_node *ni,
 		const uint8_t *rates, const uint8_t *xrates, int flags);
 void ieee80211_send_error(struct ieee80211_node *,
 		const uint8_t mac[IEEE80211_ADDR_LEN], int subtype, int arg);
 int	ieee80211_alloc_challenge(struct ieee80211_node *);
 int	ieee80211_parse_beacon(struct ieee80211_node *, struct mbuf *,
 		struct ieee80211_channel *,
 		struct ieee80211_scanparams *);
 int	ieee80211_parse_action(struct ieee80211_node *, struct mbuf *);
 #endif /* _NET80211_IEEE80211_INPUT_H_ */
Index: projects/clang500-import/sys/net80211/ieee80211_mesh.c
===================================================================
--- projects/clang500-import/sys/net80211/ieee80211_mesh.c	(revision 318657)
+++ projects/clang500-import/sys/net80211/ieee80211_mesh.c	(revision 318658)
@@ -1,3611 +1,3611 @@
 /*- 
  * Copyright (c) 2009 The FreeBSD Foundation 
  * All rights reserved. 
  * 
  * This software was developed by Rui Paulo under sponsorship from the
  * FreeBSD Foundation. 
  *  
  * 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>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD$");
 #endif
 
 /*
  * IEEE 802.11s Mesh Point (MBSS) support.
  *
  * Based on March 2009, D3.0 802.11s draft spec.
  */
 #include "opt_inet.h"
 #include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_action.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
 #include <net80211/ieee80211_superg.h>
 #endif
 #include <net80211/ieee80211_input.h>
 #include <net80211/ieee80211_mesh.h>
 
 static void	mesh_rt_flush_invalid(struct ieee80211vap *);
 static int	mesh_select_proto_path(struct ieee80211vap *, const char *);
 static int	mesh_select_proto_metric(struct ieee80211vap *, const char *);
 static void	mesh_vattach(struct ieee80211vap *);
 static int	mesh_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static void	mesh_rt_cleanup_cb(void *);
 static void	mesh_gatemode_setup(struct ieee80211vap *);
 static void	mesh_gatemode_cb(void *);
 static void	mesh_linkchange(struct ieee80211_node *,
 		    enum ieee80211_mesh_mlstate);
 static void	mesh_checkid(void *, struct ieee80211_node *);
 static uint32_t	mesh_generateid(struct ieee80211vap *);
 static int	mesh_checkpseq(struct ieee80211vap *,
 		    const uint8_t [IEEE80211_ADDR_LEN], uint32_t);
 static void	mesh_transmit_to_gate(struct ieee80211vap *, struct mbuf *,
 		    struct ieee80211_mesh_route *);
 static void	mesh_forward(struct ieee80211vap *, struct mbuf *,
 		    const struct ieee80211_meshcntl *);
 static int	mesh_input(struct ieee80211_node *, struct mbuf *,
 		    const struct ieee80211_rx_stats *rxs, int, int);
 static void	mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int,
 		    const struct ieee80211_rx_stats *rxs, int, int);
 static void	mesh_recv_ctl(struct ieee80211_node *, struct mbuf *, int);
 static void	mesh_peer_timeout_setup(struct ieee80211_node *);
 static void	mesh_peer_timeout_backoff(struct ieee80211_node *);
 static void	mesh_peer_timeout_cb(void *);
 static __inline void
 		mesh_peer_timeout_stop(struct ieee80211_node *);
 static int	mesh_verify_meshid(struct ieee80211vap *, const uint8_t *);
 static int	mesh_verify_meshconf(struct ieee80211vap *, const uint8_t *);
 static int	mesh_verify_meshpeer(struct ieee80211vap *, uint8_t,
     		    const uint8_t *);
 uint32_t	mesh_airtime_calc(struct ieee80211_node *);
 
 /*
  * Timeout values come from the specification and are in milliseconds.
  */
 static SYSCTL_NODE(_net_wlan, OID_AUTO, mesh, CTLFLAG_RD, 0,
     "IEEE 802.11s parameters");
 static int	ieee80211_mesh_gateint = -1;
 SYSCTL_PROC(_net_wlan_mesh, OID_AUTO, gateint, CTLTYPE_INT | CTLFLAG_RW,
     &ieee80211_mesh_gateint, 0, ieee80211_sysctl_msecs_ticks, "I",
     "mesh gate interval (ms)");
 static int ieee80211_mesh_retrytimeout = -1;
 SYSCTL_PROC(_net_wlan_mesh, OID_AUTO, retrytimeout, CTLTYPE_INT | CTLFLAG_RW,
     &ieee80211_mesh_retrytimeout, 0, ieee80211_sysctl_msecs_ticks, "I",
     "Retry timeout (msec)");
 static int ieee80211_mesh_holdingtimeout = -1;
 
 SYSCTL_PROC(_net_wlan_mesh, OID_AUTO, holdingtimeout, CTLTYPE_INT | CTLFLAG_RW,
     &ieee80211_mesh_holdingtimeout, 0, ieee80211_sysctl_msecs_ticks, "I",
     "Holding state timeout (msec)");
 static int ieee80211_mesh_confirmtimeout = -1;
 SYSCTL_PROC(_net_wlan_mesh, OID_AUTO, confirmtimeout, CTLTYPE_INT | CTLFLAG_RW,
     &ieee80211_mesh_confirmtimeout, 0, ieee80211_sysctl_msecs_ticks, "I",
     "Confirm state timeout (msec)");
 static int ieee80211_mesh_backofftimeout = -1;
 SYSCTL_PROC(_net_wlan_mesh, OID_AUTO, backofftimeout, CTLTYPE_INT | CTLFLAG_RW,
     &ieee80211_mesh_backofftimeout, 0, ieee80211_sysctl_msecs_ticks, "I",
     "Backoff timeout (msec). This is to throutles peering forever when "
     "not receiving answer or is rejected by a neighbor");
 static int ieee80211_mesh_maxretries = 2;
 SYSCTL_INT(_net_wlan_mesh, OID_AUTO, maxretries, CTLFLAG_RW,
     &ieee80211_mesh_maxretries, 0,
     "Maximum retries during peer link establishment");
 static int ieee80211_mesh_maxholding = 2;
 SYSCTL_INT(_net_wlan_mesh, OID_AUTO, maxholding, CTLFLAG_RW,
     &ieee80211_mesh_maxholding, 0,
     "Maximum times we are allowed to transition to HOLDING state before "
     "backinoff during peer link establishment");
 
 static const uint8_t broadcastaddr[IEEE80211_ADDR_LEN] =
 	{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 static	ieee80211_recv_action_func mesh_recv_action_meshpeering_open;
 static	ieee80211_recv_action_func mesh_recv_action_meshpeering_confirm;
 static	ieee80211_recv_action_func mesh_recv_action_meshpeering_close;
 static	ieee80211_recv_action_func mesh_recv_action_meshlmetric;
 static	ieee80211_recv_action_func mesh_recv_action_meshgate;
 
 static	ieee80211_send_action_func mesh_send_action_meshpeering_open;
 static	ieee80211_send_action_func mesh_send_action_meshpeering_confirm;
 static	ieee80211_send_action_func mesh_send_action_meshpeering_close;
 static	ieee80211_send_action_func mesh_send_action_meshlmetric;
 static	ieee80211_send_action_func mesh_send_action_meshgate;
 
 static const struct ieee80211_mesh_proto_metric mesh_metric_airtime = {
 	.mpm_descr	= "AIRTIME",
 	.mpm_ie		= IEEE80211_MESHCONF_METRIC_AIRTIME,
 	.mpm_metric	= mesh_airtime_calc,
 };
 
 static struct ieee80211_mesh_proto_path		mesh_proto_paths[4];
 static struct ieee80211_mesh_proto_metric	mesh_proto_metrics[4];
 
 MALLOC_DEFINE(M_80211_MESH_PREQ, "80211preq", "802.11 MESH Path Request frame");
 MALLOC_DEFINE(M_80211_MESH_PREP, "80211prep", "802.11 MESH Path Reply frame");
 MALLOC_DEFINE(M_80211_MESH_PERR, "80211perr", "802.11 MESH Path Error frame");
 
 /* The longer one of the lifetime should be stored as new lifetime */
 #define MESH_ROUTE_LIFETIME_MAX(a, b)	(a > b ? a : b)
 
 MALLOC_DEFINE(M_80211_MESH_RT, "80211mesh_rt", "802.11s routing table");
 MALLOC_DEFINE(M_80211_MESH_GT_RT, "80211mesh_gt", "802.11s known gates table");
 
 /*
  * Helper functions to manipulate the Mesh routing table.
  */
 
 static struct ieee80211_mesh_route *
 mesh_rt_find_locked(struct ieee80211_mesh_state *ms,
     const uint8_t dest[IEEE80211_ADDR_LEN])
 {
 	struct ieee80211_mesh_route *rt;
 
 	MESH_RT_LOCK_ASSERT(ms);
 
 	TAILQ_FOREACH(rt, &ms->ms_routes, rt_next) {
 		if (IEEE80211_ADDR_EQ(dest, rt->rt_dest))
 			return rt;
 	}
 	return NULL;
 }
 
 static struct ieee80211_mesh_route *
 mesh_rt_add_locked(struct ieee80211vap *vap,
     const uint8_t dest[IEEE80211_ADDR_LEN])
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt;
 
 	KASSERT(!IEEE80211_ADDR_EQ(broadcastaddr, dest),
 	    ("%s: adding broadcast to the routing table", __func__));
 
 	MESH_RT_LOCK_ASSERT(ms);
 
 	rt = IEEE80211_MALLOC(ALIGN(sizeof(struct ieee80211_mesh_route)) +
 	    ms->ms_ppath->mpp_privlen, M_80211_MESH_RT,
 	    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (rt != NULL) {
 		rt->rt_vap = vap;
 		IEEE80211_ADDR_COPY(rt->rt_dest, dest);
 		rt->rt_priv = (void *)ALIGN(&rt[1]);
 		MESH_RT_ENTRY_LOCK_INIT(rt, "MBSS_RT");
 		callout_init(&rt->rt_discovery, 1);
 		rt->rt_updtime = ticks;	/* create time */
 		TAILQ_INSERT_TAIL(&ms->ms_routes, rt, rt_next);
 	}
 	return rt;
 }
 
 struct ieee80211_mesh_route *
 ieee80211_mesh_rt_find(struct ieee80211vap *vap,
     const uint8_t dest[IEEE80211_ADDR_LEN])
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt;
 
 	MESH_RT_LOCK(ms);
 	rt = mesh_rt_find_locked(ms, dest);
 	MESH_RT_UNLOCK(ms);
 	return rt;
 }
 
 struct ieee80211_mesh_route *
 ieee80211_mesh_rt_add(struct ieee80211vap *vap,
     const uint8_t dest[IEEE80211_ADDR_LEN])
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt;
 
 	KASSERT(ieee80211_mesh_rt_find(vap, dest) == NULL,
 	    ("%s: duplicate entry in the routing table", __func__));
 	KASSERT(!IEEE80211_ADDR_EQ(vap->iv_myaddr, dest),
 	    ("%s: adding self to the routing table", __func__));
 
 	MESH_RT_LOCK(ms);
 	rt = mesh_rt_add_locked(vap, dest);
 	MESH_RT_UNLOCK(ms);
 	return rt;
 }
 
 /*
  * Update the route lifetime and returns the updated lifetime.
  * If new_lifetime is zero and route is timedout it will be invalidated.
  * new_lifetime is in msec
  */
 int
 ieee80211_mesh_rt_update(struct ieee80211_mesh_route *rt, int new_lifetime)
 {
 	int timesince, now;
 	uint32_t lifetime = 0;
 
 	KASSERT(rt != NULL, ("route is NULL"));
 
 	now = ticks;
 	MESH_RT_ENTRY_LOCK(rt);
 
 	/* dont clobber a proxy entry gated by us */
 	if (rt->rt_flags & IEEE80211_MESHRT_FLAGS_PROXY && rt->rt_nhops == 0) {
 		MESH_RT_ENTRY_UNLOCK(rt);
 		return rt->rt_lifetime;
 	}
 
 	timesince = ticks_to_msecs(now - rt->rt_updtime);
 	rt->rt_updtime = now;
 	if (timesince >= rt->rt_lifetime) {
 		if (new_lifetime != 0) {
 			rt->rt_lifetime = new_lifetime;
 		}
 		else {
 			rt->rt_flags &= ~IEEE80211_MESHRT_FLAGS_VALID;
 			rt->rt_lifetime = 0;
 		}
 	} else {
 		/* update what is left of lifetime */
 		rt->rt_lifetime = rt->rt_lifetime - timesince;
 		rt->rt_lifetime  = MESH_ROUTE_LIFETIME_MAX(
 			new_lifetime, rt->rt_lifetime);
 	}
 	lifetime = rt->rt_lifetime;
 	MESH_RT_ENTRY_UNLOCK(rt);
 
 	return lifetime;
 }
 
 /*
  * Add a proxy route (as needed) for the specified destination.
  */
 void
 ieee80211_mesh_proxy_check(struct ieee80211vap *vap,
     const uint8_t dest[IEEE80211_ADDR_LEN])
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt;
 
 	MESH_RT_LOCK(ms);
 	rt = mesh_rt_find_locked(ms, dest);
 	if (rt == NULL) {
 		rt = mesh_rt_add_locked(vap, dest);
 		if (rt == NULL) {
 			IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest,
 			    "%s", "unable to add proxy entry");
 			vap->iv_stats.is_mesh_rtaddfailed++;
 		} else {
 			IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest,
 			    "%s", "add proxy entry");
 			IEEE80211_ADDR_COPY(rt->rt_mesh_gate, vap->iv_myaddr);
 			IEEE80211_ADDR_COPY(rt->rt_nexthop, vap->iv_myaddr);
 			rt->rt_flags |= IEEE80211_MESHRT_FLAGS_VALID
 				     |  IEEE80211_MESHRT_FLAGS_PROXY;
 		}
 	} else if ((rt->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) == 0) {
 		KASSERT(rt->rt_flags & IEEE80211_MESHRT_FLAGS_PROXY,
 		    ("no proxy flag for poxy entry"));
 		struct ieee80211com *ic = vap->iv_ic;
 		/*
 		 * Fix existing entry created by received frames from
 		 * stations that have some memory of dest.  We also
 		 * flush any frames held on the staging queue; delivering
 		 * them is too much trouble right now.
 		 */
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest,
 		    "%s", "fix proxy entry");
 		IEEE80211_ADDR_COPY(rt->rt_nexthop, vap->iv_myaddr);
 		rt->rt_flags |= IEEE80211_MESHRT_FLAGS_VALID
 			     |  IEEE80211_MESHRT_FLAGS_PROXY;
 		/* XXX belongs in hwmp */
 		ieee80211_ageq_drain_node(&ic->ic_stageq,
 		   (void *)(uintptr_t) ieee80211_mac_hash(ic, dest));
 		/* XXX stat? */
 	}
 	MESH_RT_UNLOCK(ms);
 }
 
 static __inline void
 mesh_rt_del(struct ieee80211_mesh_state *ms, struct ieee80211_mesh_route *rt)
 {
 	TAILQ_REMOVE(&ms->ms_routes, rt, rt_next);
 	/*
 	 * Grab the lock before destroying it, to be sure no one else
 	 * is holding the route.
 	 */
 	MESH_RT_ENTRY_LOCK(rt);
 	callout_drain(&rt->rt_discovery);
 	MESH_RT_ENTRY_LOCK_DESTROY(rt);
 	IEEE80211_FREE(rt, M_80211_MESH_RT);
 }
 
 void
 ieee80211_mesh_rt_del(struct ieee80211vap *vap,
     const uint8_t dest[IEEE80211_ADDR_LEN])
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt, *next;
 
 	MESH_RT_LOCK(ms);
 	TAILQ_FOREACH_SAFE(rt, &ms->ms_routes, rt_next, next) {
 		if (IEEE80211_ADDR_EQ(rt->rt_dest, dest)) {
 			if (rt->rt_flags & IEEE80211_MESHRT_FLAGS_PROXY) {
 				ms->ms_ppath->mpp_senderror(vap, dest, rt,
 				    IEEE80211_REASON_MESH_PERR_NO_PROXY);
 			} else {
 				ms->ms_ppath->mpp_senderror(vap, dest, rt,
 				    IEEE80211_REASON_MESH_PERR_DEST_UNREACH);
 			}
 			mesh_rt_del(ms, rt);
 			MESH_RT_UNLOCK(ms);
 			return;
 		}
 	}
 	MESH_RT_UNLOCK(ms);
 }
 
 void
 ieee80211_mesh_rt_flush(struct ieee80211vap *vap)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt, *next;
 
 	if (ms == NULL)
 		return;
 	MESH_RT_LOCK(ms);
 	TAILQ_FOREACH_SAFE(rt, &ms->ms_routes, rt_next, next)
 		mesh_rt_del(ms, rt);
 	MESH_RT_UNLOCK(ms);
 }
 
 void
 ieee80211_mesh_rt_flush_peer(struct ieee80211vap *vap,
     const uint8_t peer[IEEE80211_ADDR_LEN])
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt, *next;
 
 	MESH_RT_LOCK(ms);
 	TAILQ_FOREACH_SAFE(rt, &ms->ms_routes, rt_next, next) {
 		if (IEEE80211_ADDR_EQ(rt->rt_nexthop, peer))
 			mesh_rt_del(ms, rt);
 	}
 	MESH_RT_UNLOCK(ms);
 }
 
 /*
  * Flush expired routing entries, i.e. those in invalid state for
  * some time.
  */
 static void
 mesh_rt_flush_invalid(struct ieee80211vap *vap)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt, *next;
 
 	if (ms == NULL)
 		return;
 	MESH_RT_LOCK(ms);
 	TAILQ_FOREACH_SAFE(rt, &ms->ms_routes, rt_next, next) {
 		/* Discover paths will be deleted by their own callout */
 		if (rt->rt_flags & IEEE80211_MESHRT_FLAGS_DISCOVER)
 			continue;
 		ieee80211_mesh_rt_update(rt, 0);
 		if ((rt->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) == 0)
 			mesh_rt_del(ms, rt);
 	}
 	MESH_RT_UNLOCK(ms);
 }
 
 int
 ieee80211_mesh_register_proto_path(const struct ieee80211_mesh_proto_path *mpp)
 {
 	int i, firstempty = -1;
 
 	for (i = 0; i < nitems(mesh_proto_paths); i++) {
 		if (strncmp(mpp->mpp_descr, mesh_proto_paths[i].mpp_descr,
 		    IEEE80211_MESH_PROTO_DSZ) == 0)
 			return EEXIST;
 		if (!mesh_proto_paths[i].mpp_active && firstempty == -1)
 			firstempty = i;
 	}
 	if (firstempty < 0)
 		return ENOSPC;
 	memcpy(&mesh_proto_paths[firstempty], mpp, sizeof(*mpp));
 	mesh_proto_paths[firstempty].mpp_active = 1;
 	return 0;
 }
 
 int
 ieee80211_mesh_register_proto_metric(const struct
     ieee80211_mesh_proto_metric *mpm)
 {
 	int i, firstempty = -1;
 
 	for (i = 0; i < nitems(mesh_proto_metrics); i++) {
 		if (strncmp(mpm->mpm_descr, mesh_proto_metrics[i].mpm_descr,
 		    IEEE80211_MESH_PROTO_DSZ) == 0)
 			return EEXIST;
 		if (!mesh_proto_metrics[i].mpm_active && firstempty == -1)
 			firstempty = i;
 	}
 	if (firstempty < 0)
 		return ENOSPC;
 	memcpy(&mesh_proto_metrics[firstempty], mpm, sizeof(*mpm));
 	mesh_proto_metrics[firstempty].mpm_active = 1;
 	return 0;
 }
 
 static int
 mesh_select_proto_path(struct ieee80211vap *vap, const char *name)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	int i;
 
 	for (i = 0; i < nitems(mesh_proto_paths); i++) {
 		if (strcasecmp(mesh_proto_paths[i].mpp_descr, name) == 0) {
 			ms->ms_ppath = &mesh_proto_paths[i];
 			return 0;
 		}
 	}
 	return ENOENT;
 }
 
 static int
 mesh_select_proto_metric(struct ieee80211vap *vap, const char *name)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	int i;
 
 	for (i = 0; i < nitems(mesh_proto_metrics); i++) {
 		if (strcasecmp(mesh_proto_metrics[i].mpm_descr, name) == 0) {
 			ms->ms_pmetric = &mesh_proto_metrics[i];
 			return 0;
 		}
 	}
 	return ENOENT;
 }
 
 static void
 mesh_gatemode_setup(struct ieee80211vap *vap)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 
 	/*
 	 * NB: When a mesh gate is running as a ROOT it shall
 	 * not send out periodic GANNs but instead mark the
 	 * mesh gate flag for the corresponding proactive PREQ
 	 * and RANN frames.
 	 */
 	if (ms->ms_flags & IEEE80211_MESHFLAGS_ROOT ||
 	    (ms->ms_flags & IEEE80211_MESHFLAGS_GATE) == 0) {
 		callout_drain(&ms->ms_gatetimer);
 		return ;
 	}
 	callout_reset(&ms->ms_gatetimer, ieee80211_mesh_gateint,
 	    mesh_gatemode_cb, vap);
 }
 
 static void
 mesh_gatemode_cb(void *arg)
 {
 	struct ieee80211vap *vap = (struct ieee80211vap *)arg;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_meshgann_ie gann;
 
 	gann.gann_flags = 0; /* Reserved */
 	gann.gann_hopcount = 0;
 	gann.gann_ttl = ms->ms_ttl;
 	IEEE80211_ADDR_COPY(gann.gann_addr, vap->iv_myaddr);
 	gann.gann_seq = ms->ms_gateseq++;
 	gann.gann_interval = ieee80211_mesh_gateint;
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, vap->iv_bss,
 	    "send broadcast GANN (seq %u)", gann.gann_seq);
 
 	ieee80211_send_action(vap->iv_bss, IEEE80211_ACTION_CAT_MESH,
 	    IEEE80211_ACTION_MESH_GANN, &gann);
 	mesh_gatemode_setup(vap);
 }
 
 static void
 ieee80211_mesh_init(void)
 {
 
 	memset(mesh_proto_paths, 0, sizeof(mesh_proto_paths));
 	memset(mesh_proto_metrics, 0, sizeof(mesh_proto_metrics));
 
 	/*
 	 * Setup mesh parameters that depends on the clock frequency.
 	 */
 	ieee80211_mesh_gateint = msecs_to_ticks(10000);
 	ieee80211_mesh_retrytimeout = msecs_to_ticks(40);
 	ieee80211_mesh_holdingtimeout = msecs_to_ticks(40);
 	ieee80211_mesh_confirmtimeout = msecs_to_ticks(40);
 	ieee80211_mesh_backofftimeout = msecs_to_ticks(5000);
 
 	/*
 	 * Register action frame handlers.
 	 */
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_SELF_PROT,
 	    IEEE80211_ACTION_MESHPEERING_OPEN,
 	    mesh_recv_action_meshpeering_open);
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_SELF_PROT,
 	    IEEE80211_ACTION_MESHPEERING_CONFIRM,
 	    mesh_recv_action_meshpeering_confirm);
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_SELF_PROT,
 	    IEEE80211_ACTION_MESHPEERING_CLOSE,
 	    mesh_recv_action_meshpeering_close);
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_MESH,
 	    IEEE80211_ACTION_MESH_LMETRIC, mesh_recv_action_meshlmetric);
 	ieee80211_recv_action_register(IEEE80211_ACTION_CAT_MESH,
 	    IEEE80211_ACTION_MESH_GANN, mesh_recv_action_meshgate);
 
 	ieee80211_send_action_register(IEEE80211_ACTION_CAT_SELF_PROT,
 	    IEEE80211_ACTION_MESHPEERING_OPEN,
 	    mesh_send_action_meshpeering_open);
 	ieee80211_send_action_register(IEEE80211_ACTION_CAT_SELF_PROT,
 	    IEEE80211_ACTION_MESHPEERING_CONFIRM,
 	    mesh_send_action_meshpeering_confirm);
 	ieee80211_send_action_register(IEEE80211_ACTION_CAT_SELF_PROT,
 	    IEEE80211_ACTION_MESHPEERING_CLOSE,
 	    mesh_send_action_meshpeering_close);
 	ieee80211_send_action_register(IEEE80211_ACTION_CAT_MESH,
 	    IEEE80211_ACTION_MESH_LMETRIC,
 	    mesh_send_action_meshlmetric);
 	ieee80211_send_action_register(IEEE80211_ACTION_CAT_MESH,
 	    IEEE80211_ACTION_MESH_GANN,
 	    mesh_send_action_meshgate);
 
 	/*
 	 * Register Airtime Link Metric.
 	 */
 	ieee80211_mesh_register_proto_metric(&mesh_metric_airtime);
 
 }
 SYSINIT(wlan_mesh, SI_SUB_DRIVERS, SI_ORDER_FIRST, ieee80211_mesh_init, NULL);
 
 void
 ieee80211_mesh_attach(struct ieee80211com *ic)
 {
 	ic->ic_vattach[IEEE80211_M_MBSS] = mesh_vattach;
 }
 
 void
 ieee80211_mesh_detach(struct ieee80211com *ic)
 {
 }
 
 static void
 mesh_vdetach_peers(void *arg, struct ieee80211_node *ni)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	uint16_t args[3];
 
 	if (ni->ni_mlstate == IEEE80211_NODE_MESH_ESTABLISHED) {
 		args[0] = ni->ni_mlpid;
 		args[1] = ni->ni_mllid;
 		args[2] = IEEE80211_REASON_PEER_LINK_CANCELED;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CLOSE,
 		    args);
 	}
 	callout_drain(&ni->ni_mltimer);
 	/* XXX belongs in hwmp */
 	ieee80211_ageq_drain_node(&ic->ic_stageq,
 	   (void *)(uintptr_t) ieee80211_mac_hash(ic, ni->ni_macaddr));
 }
 
 static void
 mesh_vdetach(struct ieee80211vap *vap)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 
 	callout_drain(&ms->ms_cleantimer);
 	ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, mesh_vdetach_peers,
 	    NULL);
 	ieee80211_mesh_rt_flush(vap);
 	MESH_RT_LOCK_DESTROY(ms);
 	ms->ms_ppath->mpp_vdetach(vap);
 	IEEE80211_FREE(vap->iv_mesh, M_80211_VAP);
 	vap->iv_mesh = NULL;
 }
 
 static void
 mesh_vattach(struct ieee80211vap *vap)
 {
 	struct ieee80211_mesh_state *ms;
 	vap->iv_newstate = mesh_newstate;
 	vap->iv_input = mesh_input;
 	vap->iv_opdetach = mesh_vdetach;
 	vap->iv_recv_mgmt = mesh_recv_mgmt;
 	vap->iv_recv_ctl = mesh_recv_ctl;
 	ms = IEEE80211_MALLOC(sizeof(struct ieee80211_mesh_state), M_80211_VAP,
 	    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 	if (ms == NULL) {
 		printf("%s: couldn't alloc MBSS state\n", __func__);
 		return;
 	}
 	vap->iv_mesh = ms;
 	ms->ms_seq = 0;
 	ms->ms_flags = (IEEE80211_MESHFLAGS_AP | IEEE80211_MESHFLAGS_FWD);
 	ms->ms_ttl = IEEE80211_MESH_DEFAULT_TTL;
 	TAILQ_INIT(&ms->ms_known_gates);
 	TAILQ_INIT(&ms->ms_routes);
 	MESH_RT_LOCK_INIT(ms, "MBSS");
 	callout_init(&ms->ms_cleantimer, 1);
 	callout_init(&ms->ms_gatetimer, 1);
 	ms->ms_gateseq = 0;
 	mesh_select_proto_metric(vap, "AIRTIME");
 	KASSERT(ms->ms_pmetric, ("ms_pmetric == NULL"));
 	mesh_select_proto_path(vap, "HWMP");
 	KASSERT(ms->ms_ppath, ("ms_ppath == NULL"));
 	ms->ms_ppath->mpp_vattach(vap);
 }
 
 /*
  * IEEE80211_M_MBSS vap state machine handler.
  */
 static int
 mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_node *ni;
 	enum ieee80211_state ostate;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	ostate = vap->iv_state;
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
 	    __func__, ieee80211_state_name[ostate],
 	    ieee80211_state_name[nstate], arg);
 	vap->iv_state = nstate;		/* state transition */
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
 	ni = vap->iv_bss;			/* NB: no reference held */
 	if (nstate != IEEE80211_S_RUN && ostate == IEEE80211_S_RUN) {
 		callout_drain(&ms->ms_cleantimer);
 		callout_drain(&ms->ms_gatetimer);
 	}
 	switch (nstate) {
 	case IEEE80211_S_INIT:
 		switch (ostate) {
 		case IEEE80211_S_SCAN:
 			ieee80211_cancel_scan(vap);
 			break;
 		case IEEE80211_S_CAC:
 			ieee80211_dfs_cac_stop(vap);
 			break;
 		case IEEE80211_S_RUN:
 			ieee80211_iterate_nodes(&ic->ic_sta,
 			    mesh_vdetach_peers, NULL);
 			break;
 		default:
 			break;
 		}
 		if (ostate != IEEE80211_S_INIT) {
 			/* NB: optimize INIT -> INIT case */
 			ieee80211_reset_bss(vap);
 			ieee80211_mesh_rt_flush(vap);
 		}
 		break;
 	case IEEE80211_S_SCAN:
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 			if (vap->iv_des_chan != IEEE80211_CHAN_ANYC &&
 			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan) &&
 			    ms->ms_idlen != 0) {
 				/*
 				 * Already have a channel and a mesh ID; bypass
 				 * the scan and startup immediately.
 				 */
 				ieee80211_create_ibss(vap, vap->iv_des_chan);
 				break;
 			}
 			/*
 			 * Initiate a scan.  We can come here as a result
 			 * of an IEEE80211_IOC_SCAN_REQ too in which case
 			 * the vap will be marked with IEEE80211_FEXT_SCANREQ
 			 * and the scan request parameters will be present
 			 * in iv_scanreq.  Otherwise we do the default.
 			*/
 			if (vap->iv_flags_ext & IEEE80211_FEXT_SCANREQ) {
 				ieee80211_check_scan(vap,
 				    vap->iv_scanreq_flags,
 				    vap->iv_scanreq_duration,
 				    vap->iv_scanreq_mindwell,
 				    vap->iv_scanreq_maxdwell,
 				    vap->iv_scanreq_nssid, vap->iv_scanreq_ssid);
 				vap->iv_flags_ext &= ~IEEE80211_FEXT_SCANREQ;
 			} else
 				ieee80211_check_scan_current(vap);
 			break;
 		default:
 			break;
 		}
 		break;
 	case IEEE80211_S_CAC:
 		/*
 		 * Start CAC on a DFS channel.  We come here when starting
 		 * a bss on a DFS channel (see ieee80211_create_ibss).
 		 */
 		ieee80211_dfs_cac_start(vap);
 		break;
 	case IEEE80211_S_RUN:
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 			/*
 			 * Already have a channel; bypass the
 			 * scan and startup immediately.
 			 * Note that ieee80211_create_ibss will call
 			 * back to do a RUN->RUN state change.
 			 */
 			ieee80211_create_ibss(vap,
 			    ieee80211_ht_adjust_channel(ic,
 				ic->ic_curchan, vap->iv_flags_ht));
 			/* NB: iv_bss is changed on return */
 			break;
 		case IEEE80211_S_CAC:
 			/*
 			 * NB: This is the normal state change when CAC
 			 * expires and no radar was detected; no need to
 			 * clear the CAC timer as it's already expired.
 			 */
 			/* fall thru... */
 		case IEEE80211_S_CSA:
 #if 0
 			/*
 			 * Shorten inactivity timer of associated stations
 			 * to weed out sta's that don't follow a CSA.
 			 */
 			ieee80211_iterate_nodes(&ic->ic_sta, sta_csa, vap);
 #endif
 			/*
 			 * Update bss node channel to reflect where
 			 * we landed after CSA.
 			 */
 			ieee80211_node_set_chan(ni,
 			    ieee80211_ht_adjust_channel(ic, ic->ic_curchan,
 				ieee80211_htchanflags(ni->ni_chan)));
 			/* XXX bypass debug msgs */
 			break;
 		case IEEE80211_S_SCAN:
 		case IEEE80211_S_RUN:
 #ifdef IEEE80211_DEBUG
 			if (ieee80211_msg_debug(vap)) {
 				ieee80211_note(vap,
 				    "synchronized with %s meshid ",
 				    ether_sprintf(ni->ni_meshid));
 				ieee80211_print_essid(ni->ni_meshid,
 				    ni->ni_meshidlen);
 				/* XXX MCS/HT */
 				printf(" channel %d\n",
 				    ieee80211_chan2ieee(ic, ic->ic_curchan));
 			}
 #endif
 			break;
 		default:
 			break;
 		}
 		ieee80211_node_authorize(ni);
 		callout_reset(&ms->ms_cleantimer, ms->ms_ppath->mpp_inact,
                     mesh_rt_cleanup_cb, vap);
 		mesh_gatemode_setup(vap);
 		break;
 	default:
 		break;
 	}
 	/* NB: ostate not nstate */
 	ms->ms_ppath->mpp_newstate(vap, ostate, arg);
 	return 0;
 }
 
 static void
 mesh_rt_cleanup_cb(void *arg)
 {
 	struct ieee80211vap *vap = arg;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 
 	mesh_rt_flush_invalid(vap);
 	callout_reset(&ms->ms_cleantimer, ms->ms_ppath->mpp_inact,
 	    mesh_rt_cleanup_cb, vap);
 }
 
 /*
  * Mark a mesh STA as gate and return a pointer to it.
  * If this is first time, we create a new gate route.
  * Always update the path route to this mesh gate.
  */
 struct ieee80211_mesh_gate_route *
 ieee80211_mesh_mark_gate(struct ieee80211vap *vap, const uint8_t *addr,
     struct ieee80211_mesh_route *rt)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_gate_route *gr = NULL, *next;
 	int found = 0;
 
 	MESH_RT_LOCK(ms);
 	TAILQ_FOREACH_SAFE(gr, &ms->ms_known_gates, gr_next, next) {
 		if (IEEE80211_ADDR_EQ(gr->gr_addr, addr)) {
 			found = 1;
 			break;
 		}
 	}
 
 	if (!found) {
 		/* New mesh gate add it to known table. */
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, addr,
 		    "%s", "stored new gate information from pro-PREQ.");
 		gr = IEEE80211_MALLOC(ALIGN(sizeof(struct ieee80211_mesh_gate_route)),
 		    M_80211_MESH_GT_RT,
 		    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 		IEEE80211_ADDR_COPY(gr->gr_addr, addr);
 		TAILQ_INSERT_TAIL(&ms->ms_known_gates, gr, gr_next);
 	}
 	gr->gr_route = rt;
 	/* TODO: link from path route to gate route */
 	MESH_RT_UNLOCK(ms);
 
 	return gr;
 }
 
 
 /*
  * Helper function to note the Mesh Peer Link FSM change.
  */
 static void
 mesh_linkchange(struct ieee80211_node *ni, enum ieee80211_mesh_mlstate state)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 #ifdef IEEE80211_DEBUG
 	static const char *meshlinkstates[] = {
 		[IEEE80211_NODE_MESH_IDLE]		= "IDLE",
 		[IEEE80211_NODE_MESH_OPENSNT]		= "OPEN SENT",
 		[IEEE80211_NODE_MESH_OPENRCV]		= "OPEN RECEIVED",
 		[IEEE80211_NODE_MESH_CONFIRMRCV]	= "CONFIRM RECEIVED",
 		[IEEE80211_NODE_MESH_ESTABLISHED]	= "ESTABLISHED",
 		[IEEE80211_NODE_MESH_HOLDING]		= "HOLDING"
 	};
 #endif
 	IEEE80211_NOTE(vap, IEEE80211_MSG_MESH,
 	    ni, "peer link: %s -> %s",
 	    meshlinkstates[ni->ni_mlstate], meshlinkstates[state]);
 
 	/* track neighbor count */
 	if (state == IEEE80211_NODE_MESH_ESTABLISHED &&
 	    ni->ni_mlstate != IEEE80211_NODE_MESH_ESTABLISHED) {
 		KASSERT(ms->ms_neighbors < 65535, ("neighbor count overflow"));
 		ms->ms_neighbors++;
 		ieee80211_beacon_notify(vap, IEEE80211_BEACON_MESHCONF);
 	} else if (ni->ni_mlstate == IEEE80211_NODE_MESH_ESTABLISHED &&
 	    state != IEEE80211_NODE_MESH_ESTABLISHED) {
 		KASSERT(ms->ms_neighbors > 0, ("neighbor count 0"));
 		ms->ms_neighbors--;
 		ieee80211_beacon_notify(vap, IEEE80211_BEACON_MESHCONF);
 	}
 	ni->ni_mlstate = state;
 	switch (state) {
 	case IEEE80211_NODE_MESH_HOLDING:
 		ms->ms_ppath->mpp_peerdown(ni);
 		break;
 	case IEEE80211_NODE_MESH_ESTABLISHED:
 		ieee80211_mesh_discover(vap, ni->ni_macaddr, NULL);
 		break;
 	default:
 		break;
 	}
 }
 
 /*
  * Helper function to generate a unique local ID required for mesh
  * peer establishment.
  */
 static void
 mesh_checkid(void *arg, struct ieee80211_node *ni)
 {
 	uint16_t *r = arg;
 	
 	if (*r == ni->ni_mllid)
 		*(uint16_t *)arg = 0;
 }
 
 static uint32_t
 mesh_generateid(struct ieee80211vap *vap)
 {
 	int maxiter = 4;
 	uint16_t r;
 
 	do {
 		get_random_bytes(&r, 2);
 		ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, mesh_checkid, &r);
 		maxiter--;
 	} while (r == 0 && maxiter > 0);
 	return r;
 }
 
 /*
  * Verifies if we already received this packet by checking its
  * sequence number.
  * Returns 0 if the frame is to be accepted, 1 otherwise.
  */
 static int
 mesh_checkpseq(struct ieee80211vap *vap,
     const uint8_t source[IEEE80211_ADDR_LEN], uint32_t seq)
 {
 	struct ieee80211_mesh_route *rt;
 
 	rt = ieee80211_mesh_rt_find(vap, source);
 	if (rt == NULL) {
 		rt = ieee80211_mesh_rt_add(vap, source);
 		if (rt == NULL) {
 			IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, source,
 			    "%s", "add mcast route failed");
 			vap->iv_stats.is_mesh_rtaddfailed++;
 			return 1;
 		}
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, source,
 		    "add mcast route, mesh seqno %d", seq);
 		rt->rt_lastmseq = seq;
 		return 0;
 	}
 	if (IEEE80211_MESH_SEQ_GEQ(rt->rt_lastmseq, seq)) {
 		return 1;
 	} else {
 		rt->rt_lastmseq = seq;
 		return 0;
 	}
 }
 
 /*
  * Iterate the routing table and locate the next hop.
  */
 struct ieee80211_node *
 ieee80211_mesh_find_txnode(struct ieee80211vap *vap,
     const uint8_t dest[IEEE80211_ADDR_LEN])
 {
 	struct ieee80211_mesh_route *rt;
 
 	rt = ieee80211_mesh_rt_find(vap, dest);
 	if (rt == NULL)
 		return NULL;
 	if ((rt->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) == 0) {
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest,
 		    "%s: !valid, flags 0x%x", __func__, rt->rt_flags);
 		/* XXX stat */
 		return NULL;
 	}
 	if (rt->rt_flags & IEEE80211_MESHRT_FLAGS_PROXY) {
 		rt = ieee80211_mesh_rt_find(vap, rt->rt_mesh_gate);
 		if (rt == NULL) return NULL;
 		if ((rt->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) == 0) {
 			IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest,
 			    "%s: meshgate !valid, flags 0x%x", __func__,
 			    rt->rt_flags);
 			/* XXX stat */
 			return NULL;
 		}
 	}
 	return ieee80211_find_txnode(vap, rt->rt_nexthop);
 }
 
 static void
 mesh_transmit_to_gate(struct ieee80211vap *vap, struct mbuf *m,
     struct ieee80211_mesh_route *rt_gate)
 {
 	struct ifnet *ifp = vap->iv_ifp;
 	struct ieee80211_node *ni;
 
 	IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic);
 
 	ni = ieee80211_mesh_find_txnode(vap, rt_gate->rt_dest);
 	if (ni == NULL) {
 		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		m_freem(m);
 		return;
 	}
 
 	/*
 	 * Send through the VAP packet transmit path.
 	 * This consumes the node ref grabbed above and
 	 * the mbuf, regardless of whether there's a problem
 	 * or not.
 	 */
 	(void) ieee80211_vap_pkt_send_dest(vap, m, ni);
 }
 
 /*
  * Forward the queued frames to known valid mesh gates.
  * Assume destination to be outside the MBSS (i.e. proxy entry),
  * If no valid mesh gates are known silently discard queued frames.
  * After transmitting frames to all known valid mesh gates, this route
  * will be marked invalid, and a new path discovery will happen in the hopes
  * that (at least) one of the mesh gates have a new proxy entry for us to use.
  */
 void
 ieee80211_mesh_forward_to_gates(struct ieee80211vap *vap,
     struct ieee80211_mesh_route *rt_dest)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt_gate;
 	struct ieee80211_mesh_gate_route *gr = NULL, *gr_next;
 	struct mbuf *m, *mcopy, *next;
 
 	IEEE80211_TX_UNLOCK_ASSERT(ic);
 
 	KASSERT( rt_dest->rt_flags == IEEE80211_MESHRT_FLAGS_DISCOVER,
 	    ("Route is not marked with IEEE80211_MESHRT_FLAGS_DISCOVER"));
 
 	/* XXX: send to more than one valid mash gate */
 	MESH_RT_LOCK(ms);
 
 	m = ieee80211_ageq_remove(&ic->ic_stageq,
 	    (struct ieee80211_node *)(uintptr_t)
 	    ieee80211_mac_hash(ic, rt_dest->rt_dest));
 
 	TAILQ_FOREACH_SAFE(gr, &ms->ms_known_gates, gr_next, gr_next) {
 		rt_gate = gr->gr_route;
 		if (rt_gate == NULL) {
 			IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_HWMP,
 				rt_dest->rt_dest,
 				"mesh gate with no path %6D",
 				gr->gr_addr, ":");
 			continue;
 		}
 		if ((rt_gate->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) == 0)
 			continue;
 		KASSERT(rt_gate->rt_flags & IEEE80211_MESHRT_FLAGS_GATE,
 		    ("route not marked as a mesh gate"));
 		KASSERT((rt_gate->rt_flags &
 			IEEE80211_MESHRT_FLAGS_PROXY) == 0,
 			("found mesh gate that is also marked porxy"));
 		/*
 		 * convert route to a proxy route gated by the current
 		 * mesh gate, this is needed so encap can built data
 		 * frame with correct address.
 		 */
 		rt_dest->rt_flags = IEEE80211_MESHRT_FLAGS_PROXY |
 			IEEE80211_MESHRT_FLAGS_VALID;
 		rt_dest->rt_ext_seq = 1; /* random value */
 		IEEE80211_ADDR_COPY(rt_dest->rt_mesh_gate, rt_gate->rt_dest);
 		IEEE80211_ADDR_COPY(rt_dest->rt_nexthop, rt_gate->rt_nexthop);
 		rt_dest->rt_metric = rt_gate->rt_metric;
 		rt_dest->rt_nhops = rt_gate->rt_nhops;
 		ieee80211_mesh_rt_update(rt_dest, ms->ms_ppath->mpp_inact);
 		MESH_RT_UNLOCK(ms);
 		/* XXX: lock?? */
 		mcopy = m_dup(m, M_NOWAIT);
 		for (; mcopy != NULL; mcopy = next) {
 			next = mcopy->m_nextpkt;
 			mcopy->m_nextpkt = NULL;
 			IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_HWMP,
 			    rt_dest->rt_dest,
 			    "flush queued frame %p len %d", mcopy,
 			    mcopy->m_pkthdr.len);
 			mesh_transmit_to_gate(vap, mcopy, rt_gate);
 		}
 		MESH_RT_LOCK(ms);
 	}
 	rt_dest->rt_flags = 0; /* Mark invalid */
 	m_freem(m);
 	MESH_RT_UNLOCK(ms);
 }
 
 /*
  * Forward the specified frame.
  * Decrement the TTL and set TA to our MAC address.
  */
 static void
 mesh_forward(struct ieee80211vap *vap, struct mbuf *m,
     const struct ieee80211_meshcntl *mc)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ifnet *ifp = vap->iv_ifp;
 	const struct ieee80211_frame *wh =
 	    mtod(m, const struct ieee80211_frame *);
 	struct mbuf *mcopy;
 	struct ieee80211_meshcntl *mccopy;
 	struct ieee80211_frame *whcopy;
 	struct ieee80211_node *ni;
 	int err;
 
 	/* This is called from the RX path - don't hold this lock */
 	IEEE80211_TX_UNLOCK_ASSERT(ic);
 
 	/*
 	 * mesh ttl of 1 means we are the last one receiving it,
 	 * according to amendment we decrement and then check if
 	 * 0, if so we dont forward.
 	 */
 	if (mc->mc_ttl < 1) {
 		IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_MESH, wh,
 		    "%s", "frame not fwd'd, ttl 1");
 		vap->iv_stats.is_mesh_fwd_ttl++;
 		return;
 	}
 	if (!(ms->ms_flags & IEEE80211_MESHFLAGS_FWD)) {
 		IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_MESH, wh,
 		    "%s", "frame not fwd'd, fwding disabled");
 		vap->iv_stats.is_mesh_fwd_disabled++;
 		return;
 	}
 	mcopy = m_dup(m, M_NOWAIT);
 	if (mcopy == NULL) {
 		IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_MESH, wh,
 		    "%s", "frame not fwd'd, cannot dup");
 		vap->iv_stats.is_mesh_fwd_nobuf++;
 		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return;
 	}
 	mcopy = m_pullup(mcopy, ieee80211_hdrspace(ic, wh) +
 	    sizeof(struct ieee80211_meshcntl));
 	if (mcopy == NULL) {
 		IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_MESH, wh,
 		    "%s", "frame not fwd'd, too short");
 		vap->iv_stats.is_mesh_fwd_tooshort++;
 		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		m_freem(mcopy);
 		return;
 	}
 	whcopy = mtod(mcopy, struct ieee80211_frame *);
 	mccopy = (struct ieee80211_meshcntl *)
 	    (mtod(mcopy, uint8_t *) + ieee80211_hdrspace(ic, wh));
 	/* XXX clear other bits? */
 	whcopy->i_fc[1] &= ~IEEE80211_FC1_RETRY;
 	IEEE80211_ADDR_COPY(whcopy->i_addr2, vap->iv_myaddr);
 	if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 		ni = ieee80211_ref_node(vap->iv_bss);
 		mcopy->m_flags |= M_MCAST;
 	} else {
 		ni = ieee80211_mesh_find_txnode(vap, whcopy->i_addr3);
 		if (ni == NULL) {
 			/*
 			 * [Optional] any of the following three actions:
 			 * o silently discard
 			 * o trigger a path discovery
 			 * o inform TA that meshDA is unknown.
 			 */
 			IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_MESH, wh,
 			    "%s", "frame not fwd'd, no path");
 			ms->ms_ppath->mpp_senderror(vap, whcopy->i_addr3, NULL,
 			    IEEE80211_REASON_MESH_PERR_NO_FI);
 			vap->iv_stats.is_mesh_fwd_nopath++;
 			m_freem(mcopy);
 			return;
 		}
 		IEEE80211_ADDR_COPY(whcopy->i_addr1, ni->ni_macaddr);
 	}
 	KASSERT(mccopy->mc_ttl > 0, ("%s called with wrong ttl", __func__));
 	mccopy->mc_ttl--;
 
 	/* XXX calculate priority so drivers can find the tx queue */
 	M_WME_SETAC(mcopy, WME_AC_BE);
 
 	/* XXX do we know m_nextpkt is NULL? */
 	mcopy->m_pkthdr.rcvif = (void *) ni;
 
 	/*
 	 * XXX this bypasses all of the VAP TX handling; it passes frames
 	 * directly to the parent interface.
 	 *
 	 * Because of this, there's no TX lock being held as there's no
 	 * encaps state being used.
 	 *
 	 * Doing a direct parent transmit may not be the correct thing
 	 * to do here; we'll have to re-think this soon.
 	 */
 	IEEE80211_TX_LOCK(ic);
 	err = ieee80211_parent_xmitpkt(ic, mcopy);
 	IEEE80211_TX_UNLOCK(ic);
 	if (!err)
 		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 }
 
 static struct mbuf *
 mesh_decap(struct ieee80211vap *vap, struct mbuf *m, int hdrlen, int meshdrlen)
 {
 #define	WHDIR(wh)	((wh)->i_fc[1] & IEEE80211_FC1_DIR_MASK)
 #define	MC01(mc)	((const struct ieee80211_meshcntl_ae01 *)mc)
 	uint8_t b[sizeof(struct ieee80211_qosframe_addr4) +
 		  sizeof(struct ieee80211_meshcntl_ae10)];
 	const struct ieee80211_qosframe_addr4 *wh;
 	const struct ieee80211_meshcntl_ae10 *mc;
 	struct ether_header *eh;
 	struct llc *llc;
 	int ae;
 
 	if (m->m_len < hdrlen + sizeof(*llc) &&
 	    (m = m_pullup(m, hdrlen + sizeof(*llc))) == NULL) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_ANY,
 		    "discard data frame: %s", "m_pullup failed");
 		vap->iv_stats.is_rx_tooshort++;
 		return NULL;
 	}
 	memcpy(b, mtod(m, caddr_t), hdrlen);
 	wh = (const struct ieee80211_qosframe_addr4 *)&b[0];
 	mc = (const struct ieee80211_meshcntl_ae10 *)&b[hdrlen - meshdrlen];
 	KASSERT(WHDIR(wh) == IEEE80211_FC1_DIR_FROMDS ||
 		WHDIR(wh) == IEEE80211_FC1_DIR_DSTODS,
 	    ("bogus dir, fc 0x%x:0x%x", wh->i_fc[0], wh->i_fc[1]));
 
 	llc = (struct llc *)(mtod(m, caddr_t) + hdrlen);
 	if (llc->llc_dsap == LLC_SNAP_LSAP && llc->llc_ssap == LLC_SNAP_LSAP &&
 	    llc->llc_control == LLC_UI && llc->llc_snap.org_code[0] == 0 &&
 	    llc->llc_snap.org_code[1] == 0 && llc->llc_snap.org_code[2] == 0 &&
 	    /* NB: preserve AppleTalk frames that have a native SNAP hdr */
 	    !(llc->llc_snap.ether_type == htons(ETHERTYPE_AARP) ||
 	      llc->llc_snap.ether_type == htons(ETHERTYPE_IPX))) {
 		m_adj(m, hdrlen + sizeof(struct llc) - sizeof(*eh));
 		llc = NULL;
 	} else {
 		m_adj(m, hdrlen - sizeof(*eh));
 	}
 	eh = mtod(m, struct ether_header *);
 	ae = mc->mc_flags & IEEE80211_MESH_AE_MASK;
 	if (WHDIR(wh) == IEEE80211_FC1_DIR_FROMDS) {
 		IEEE80211_ADDR_COPY(eh->ether_dhost, wh->i_addr1);
 		if (ae == IEEE80211_MESH_AE_00) {
 			IEEE80211_ADDR_COPY(eh->ether_shost, wh->i_addr3);
 		} else if (ae == IEEE80211_MESH_AE_01) {
 			IEEE80211_ADDR_COPY(eh->ether_shost,
 			    MC01(mc)->mc_addr4);
 		} else {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 			    (const struct ieee80211_frame *)wh, NULL,
 			    "bad AE %d", ae);
 			vap->iv_stats.is_mesh_badae++;
 			m_freem(m);
 			return NULL;
 		}
 	} else {
 		if (ae == IEEE80211_MESH_AE_00) {
 			IEEE80211_ADDR_COPY(eh->ether_dhost, wh->i_addr3);
 			IEEE80211_ADDR_COPY(eh->ether_shost, wh->i_addr4);
 		} else if (ae == IEEE80211_MESH_AE_10) {
 			IEEE80211_ADDR_COPY(eh->ether_dhost, mc->mc_addr5);
 			IEEE80211_ADDR_COPY(eh->ether_shost, mc->mc_addr6);
 		} else {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 			    (const struct ieee80211_frame *)wh, NULL,
 			    "bad AE %d", ae);
 			vap->iv_stats.is_mesh_badae++;
 			m_freem(m);
 			return NULL;
 		}
 	}
 #ifndef __NO_STRICT_ALIGNMENT
 	if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), uint32_t)) {
 		m = ieee80211_realign(vap, m, sizeof(*eh));
 		if (m == NULL)
 			return NULL;
 	}
 #endif /* !__NO_STRICT_ALIGNMENT */
 	if (llc != NULL) {
 		eh = mtod(m, struct ether_header *);
 		eh->ether_type = htons(m->m_pkthdr.len - sizeof(*eh));
 	}
 	return m;
 #undef	WDIR
 #undef	MC01
 }
 
 /*
  * Return non-zero if the unicast mesh data frame should be processed
  * locally.  Frames that are not proxy'd have our address, otherwise
  * we need to consult the routing table to look for a proxy entry.
  */
 static __inline int
 mesh_isucastforme(struct ieee80211vap *vap, const struct ieee80211_frame *wh,
     const struct ieee80211_meshcntl *mc)
 {
 	int ae = mc->mc_flags & 3;
 
 	KASSERT((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS,
 	    ("bad dir 0x%x:0x%x", wh->i_fc[0], wh->i_fc[1]));
 	KASSERT(ae == IEEE80211_MESH_AE_00 || ae == IEEE80211_MESH_AE_10,
 	    ("bad AE %d", ae));
 	if (ae == IEEE80211_MESH_AE_10) {	/* ucast w/ proxy */
 		const struct ieee80211_meshcntl_ae10 *mc10 =
 		    (const struct ieee80211_meshcntl_ae10 *) mc;
 		struct ieee80211_mesh_route *rt =
 		    ieee80211_mesh_rt_find(vap, mc10->mc_addr5);
 		/* check for proxy route to ourself */
 		return (rt != NULL &&
 		    (rt->rt_flags & IEEE80211_MESHRT_FLAGS_PROXY));
 	} else					/* ucast w/o proxy */
 		return IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_myaddr);
 }
 
 /*
  * Verifies transmitter, updates lifetime, precursor list and forwards data.
  * > 0 means we have forwarded data and no need to process locally
  * == 0 means we want to process locally (and we may have forwarded data
  * < 0 means there was an error and data should be discarded
  */
 static int
 mesh_recv_indiv_data_to_fwrd(struct ieee80211vap *vap, struct mbuf *m,
     struct ieee80211_frame *wh, const struct ieee80211_meshcntl *mc)
 {
 	struct ieee80211_qosframe_addr4 *qwh;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt_meshda, *rt_meshsa;
 
 	/* This is called from the RX path - don't hold this lock */
 	IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic);
 
 	qwh = (struct ieee80211_qosframe_addr4 *)wh;
 
 	/*
 	 * TODO:
 	 * o verify addr2 is  a legitimate transmitter
 	 * o lifetime of precursor of addr3 (addr2) is max(init, curr)
 	 * o lifetime of precursor of addr4 (nexthop) is max(init, curr)
 	 */
 
 	/* set lifetime of addr3 (meshDA) to initial value */
 	rt_meshda = ieee80211_mesh_rt_find(vap, qwh->i_addr3);
 	if (rt_meshda == NULL) {
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, qwh->i_addr2,
 		    "no route to meshDA(%6D)", qwh->i_addr3, ":");
 		/*
 		 * [Optional] any of the following three actions:
 		 * o silently discard 				[X]
 		 * o trigger a path discovery			[ ]
 		 * o inform TA that meshDA is unknown.		[ ]
 		 */
 		/* XXX: stats */
 		return (-1);
 	}
 
 	ieee80211_mesh_rt_update(rt_meshda, ticks_to_msecs(
 	    ms->ms_ppath->mpp_inact));
 
 	/* set lifetime of addr4 (meshSA) to initial value */
 	rt_meshsa = ieee80211_mesh_rt_find(vap, qwh->i_addr4);
 	KASSERT(rt_meshsa != NULL, ("no route"));
 	ieee80211_mesh_rt_update(rt_meshsa, ticks_to_msecs(
 	    ms->ms_ppath->mpp_inact));
 
 	mesh_forward(vap, m, mc);
 	return (1); /* dont process locally */
 }
 
 /*
  * Verifies transmitter, updates lifetime, precursor list and process data
  * locally, if data is proxy with AE = 10 it could mean data should go
  * on another mesh path or data should be forwarded to the DS.
  *
  * > 0 means we have forwarded data and no need to process locally
  * == 0 means we want to process locally (and we may have forwarded data
  * < 0 means there was an error and data should be discarded
  */
 static int
 mesh_recv_indiv_data_to_me(struct ieee80211vap *vap, struct mbuf *m,
     struct ieee80211_frame *wh, const struct ieee80211_meshcntl *mc)
 {
 	struct ieee80211_qosframe_addr4 *qwh;
 	const struct ieee80211_meshcntl_ae10 *mc10;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt;
 	int ae;
 
 	/* This is called from the RX path - don't hold this lock */
 	IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic);
 
 	qwh = (struct ieee80211_qosframe_addr4 *)wh;
 	mc10 = (const struct ieee80211_meshcntl_ae10 *)mc;
 
 	/*
 	 * TODO:
 	 * o verify addr2 is  a legitimate transmitter
 	 * o lifetime of precursor entry is max(init, curr)
 	 */
 
 	/* set lifetime of addr4 (meshSA) to initial value */
 	rt = ieee80211_mesh_rt_find(vap, qwh->i_addr4);
 	KASSERT(rt != NULL, ("no route"));
 	ieee80211_mesh_rt_update(rt, ticks_to_msecs(ms->ms_ppath->mpp_inact));
 	rt = NULL;
 
 	ae = mc10->mc_flags & IEEE80211_MESH_AE_MASK;
 	KASSERT(ae == IEEE80211_MESH_AE_00 ||
 	    ae == IEEE80211_MESH_AE_10, ("bad AE %d", ae));
 	if (ae == IEEE80211_MESH_AE_10) {
 		if (IEEE80211_ADDR_EQ(mc10->mc_addr5, qwh->i_addr3)) {
 			return (0); /* process locally */
 		}
 
 		rt =  ieee80211_mesh_rt_find(vap, mc10->mc_addr5);
 		if (rt != NULL &&
 		    (rt->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) &&
 		    (rt->rt_flags & IEEE80211_MESHRT_FLAGS_PROXY) == 0) {
 			/*
 			 * Forward on another mesh-path, according to
 			 * amendment as specified in 9.32.4.1
 			 */
 			IEEE80211_ADDR_COPY(qwh->i_addr3, mc10->mc_addr5);
 			mesh_forward(vap, m,
 			    (const struct ieee80211_meshcntl *)mc10);
 			return (1); /* dont process locally */
 		}
 		/*
 		 * All other cases: forward of MSDUs from the MBSS to DS indiv.
 		 * addressed according to 13.11.3.2.
 		 */
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_OUTPUT, qwh->i_addr2,
 		    "forward frame to DS, SA(%6D) DA(%6D)",
 		    mc10->mc_addr6, ":", mc10->mc_addr5, ":");
 	}
 	return (0); /* process locally */
 }
 
 /*
  * Try to forward the group addressed data on to other mesh STAs, and
  * also to the DS.
  *
  * > 0 means we have forwarded data and no need to process locally
  * == 0 means we want to process locally (and we may have forwarded data
  * < 0 means there was an error and data should be discarded
  */
 static int
 mesh_recv_group_data(struct ieee80211vap *vap, struct mbuf *m,
     struct ieee80211_frame *wh, const struct ieee80211_meshcntl *mc)
 {
 #define	MC01(mc)	((const struct ieee80211_meshcntl_ae01 *)mc)
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 
 	/* This is called from the RX path - don't hold this lock */
 	IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic);
 
 	mesh_forward(vap, m, mc);
 
 	if(mc->mc_ttl > 0) {
 		if (mc->mc_flags & IEEE80211_MESH_AE_01) {
 			/*
 			 * Forward of MSDUs from the MBSS to DS group addressed
 			 * (according to 13.11.3.2)
 			 * This happens by delivering the packet, and a bridge
 			 * will sent it on another port member.
 			 */
 			if (ms->ms_flags & IEEE80211_MESHFLAGS_GATE &&
 			    ms->ms_flags & IEEE80211_MESHFLAGS_FWD) {
 				IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH,
 				    MC01(mc)->mc_addr4, "%s",
 				    "forward from MBSS to the DS");
 			}
 		}
 	}
 	return (0); /* process locally */
 #undef	MC01
 }
 
 static int
 mesh_input(struct ieee80211_node *ni, struct mbuf *m,
     const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 #define	HAS_SEQ(type)	((type & 0x4) == 0)
 #define	MC01(mc)	((const struct ieee80211_meshcntl_ae01 *)mc)
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ifnet *ifp = vap->iv_ifp;
 	struct ieee80211_frame *wh;
 	const struct ieee80211_meshcntl *mc;
 	int hdrspace, meshdrlen, need_tap, error;
 	uint8_t dir, type, subtype, ae;
 	uint32_t seq;
 	const uint8_t *addr;
 	uint8_t qos[2];
 
 	KASSERT(ni != NULL, ("null node"));
 	ni->ni_inact = ni->ni_inact_reload;
 
 	need_tap = 1;			/* mbuf need to be tapped. */
 	type = -1;			/* undefined */
 
 	/* This is called from the RX path - don't hold this lock */
 	IEEE80211_TX_UNLOCK_ASSERT(ic);
 
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL,
 		    "too short (1): len %u", m->m_pkthdr.len);
 		vap->iv_stats.is_rx_tooshort++;
 		goto out;
 	}
 	/*
 	 * Bit of a cheat here, we use a pointer for a 3-address
 	 * frame format but don't reference fields past outside
 	 * ieee80211_frame_min w/o first validating the data is
 	 * present.
 	*/
 	wh = mtod(m, struct ieee80211_frame *);
 
 	if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) !=
 	    IEEE80211_FC0_VERSION_0) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL, "wrong version %x", wh->i_fc[0]);
 		vap->iv_stats.is_rx_badversion++;
 		goto err;
 	}
 	dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 	if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) {
 		IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
 		ni->ni_noise = nf;
 		if (HAS_SEQ(type)) {
 			uint8_t tid = ieee80211_gettid(wh);
 
 			if (IEEE80211_QOS_HAS_SEQ(wh) &&
 			    TID_TO_WME_AC(tid) >= WME_AC_VI)
 				ic->ic_wme.wme_hipri_traffic++;
-			if (! ieee80211_check_rxseq(ni, wh, wh->i_addr1))
+			if (! ieee80211_check_rxseq(ni, wh, wh->i_addr1, rxs))
 				goto out;
 		}
 	}
 #ifdef IEEE80211_DEBUG
 	/*
 	 * It's easier, but too expensive, to simulate different mesh
 	 * topologies by consulting the ACL policy very early, so do this
 	 * only under DEBUG.
 	 *
 	 * NB: this check is also done upon peering link initiation.
 	 */
 	if (vap->iv_acl != NULL && !vap->iv_acl->iac_check(vap, wh)) {
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
 		    wh, NULL, "%s", "disallowed by ACL");
 		vap->iv_stats.is_rx_acl++;
 		goto out;
 	}
 #endif
 	switch (type) {
 	case IEEE80211_FC0_TYPE_DATA:
 		if (ni == vap->iv_bss)
 			goto out;
 		if (ni->ni_mlstate != IEEE80211_NODE_MESH_ESTABLISHED) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
 			    ni->ni_macaddr, NULL,
 			    "peer link not yet established (%d)",
 			    ni->ni_mlstate);
 			vap->iv_stats.is_mesh_nolink++;
 			goto out;
 		}
 		if (dir != IEEE80211_FC1_DIR_FROMDS &&
 		    dir != IEEE80211_FC1_DIR_DSTODS) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "incorrect dir 0x%x", dir);
 			vap->iv_stats.is_rx_wrongdir++;
 			goto err;
 		}
 
 		/* All Mesh data frames are QoS subtype */
 		if (!HAS_SEQ(type)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "incorrect subtype 0x%x", subtype);
 			vap->iv_stats.is_rx_badsubtype++;
 			goto err;
 		}
 
 		/*
 		 * Next up, any fragmentation.
 		 * XXX: we defrag before we even try to forward,
 		 * Mesh Control field is not present in sub-sequent
 		 * fragmented frames. This is in contrast to Draft 4.0.
 		 */
 		hdrspace = ieee80211_hdrspace(ic, wh);
 		if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			m = ieee80211_defrag(ni, m, hdrspace);
 			if (m == NULL) {
 				/* Fragment dropped or frame not complete yet */
 				goto out;
 			}
 		}
 		wh = mtod(m, struct ieee80211_frame *); /* NB: after defrag */
 
 		/*
 		 * Now we have a complete Mesh Data frame.
 		 */
 
 		/*
 		 * Only fromDStoDS data frames use 4 address qos frames
 		 * as specified in amendment. Otherwise addr4 is located
 		 * in the Mesh Control field and a 3 address qos frame
 		 * is used.
 		 */
 		if (IEEE80211_IS_DSTODS(wh))
 			*(uint16_t *)qos = *(uint16_t *)
 			    ((struct ieee80211_qosframe_addr4 *)wh)->i_qos;
 		else
 			*(uint16_t *)qos = *(uint16_t *)
 			    ((struct ieee80211_qosframe *)wh)->i_qos;
 
 		/*
 		 * NB: The mesh STA sets the Mesh Control Present
 		 * subfield to 1 in the Mesh Data frame containing
 		 * an unfragmented MSDU, an A-MSDU, or the first
 		 * fragment of an MSDU.
 		 * After defrag it should always be present.
 		 */
 		if (!(qos[1] & IEEE80211_QOS_MC)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
 			    ni->ni_macaddr, NULL,
 			    "%s", "Mesh control field not present");
 			vap->iv_stats.is_rx_elem_missing++; /* XXX: kinda */
 			goto err;
 		}
 
 		/* pull up enough to get to the mesh control */
 		if (m->m_len < hdrspace + sizeof(struct ieee80211_meshcntl) &&
 		    (m = m_pullup(m, hdrspace +
 		        sizeof(struct ieee80211_meshcntl))) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, NULL,
 			    "data too short: expecting %u", hdrspace);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
 		/*
 		 * Now calculate the full extent of the headers. Note
 		 * mesh_decap will pull up anything we didn't get
 		 * above when it strips the 802.11 headers.
 		 */
 		mc = (const struct ieee80211_meshcntl *)
 		    (mtod(m, const uint8_t *) + hdrspace);
 		ae = mc->mc_flags & IEEE80211_MESH_AE_MASK;
 		meshdrlen = sizeof(struct ieee80211_meshcntl) +
 		    ae * IEEE80211_ADDR_LEN;
 		hdrspace += meshdrlen;
 
 		/* pull complete hdrspace = ieee80211_hdrspace + meshcontrol */
 		if ((meshdrlen > sizeof(struct ieee80211_meshcntl)) &&
 		    (m->m_len < hdrspace) &&
 		    ((m = m_pullup(m, hdrspace)) == NULL)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, NULL,
 			    "data too short: expecting %u", hdrspace);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
 		/* XXX: are we sure there is no reallocating after m_pullup? */
 
 		seq = le32dec(mc->mc_seq);
 		if (IEEE80211_IS_MULTICAST(wh->i_addr1))
 			addr = wh->i_addr3;
 		else if (ae == IEEE80211_MESH_AE_01)
 			addr = MC01(mc)->mc_addr4;
 		else
 			addr = ((struct ieee80211_qosframe_addr4 *)wh)->i_addr4;
 		if (IEEE80211_ADDR_EQ(vap->iv_myaddr, addr)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    addr, "data", "%s", "not to me");
 			vap->iv_stats.is_rx_wrongbss++;	/* XXX kinda */
 			goto out;
 		}
 		if (mesh_checkpseq(vap, addr, seq) != 0) {
 			vap->iv_stats.is_rx_dup++;
 			goto out;
 		}
 
 		/* This code "routes" the frame to the right control path */
 		if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			if (IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr3))
 				error =
 				    mesh_recv_indiv_data_to_me(vap, m, wh, mc);
 			else if (IEEE80211_IS_MULTICAST(wh->i_addr3))
 				error = mesh_recv_group_data(vap, m, wh, mc);
 			else
 				error = mesh_recv_indiv_data_to_fwrd(vap, m,
 				    wh, mc);
 		} else
 			error = mesh_recv_group_data(vap, m, wh, mc);
 		if (error < 0)
 			goto err;
 		else if (error > 0)
 			goto out;
 
 		if (ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		need_tap = 0;
 
 		/*
 		 * Finally, strip the 802.11 header.
 		 */
 		m = mesh_decap(vap, m, hdrspace, meshdrlen);
 		if (m == NULL) {
 			/* XXX mask bit to check for both */
 			/* don't count Null data frames as errors */
 			if (subtype == IEEE80211_FC0_SUBTYPE_NODATA ||
 			    subtype == IEEE80211_FC0_SUBTYPE_QOS_NULL)
 				goto out;
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "decap error");
 			vap->iv_stats.is_rx_decap++;
 			IEEE80211_NODE_STAT(ni, rx_decap);
 			goto err;
 		}
 		if (qos[0] & IEEE80211_QOS_AMSDU) {
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
 		}
 		ieee80211_deliver_data(vap, ni, m);
 		return type;
 	case IEEE80211_FC0_TYPE_MGT:
 		vap->iv_stats.is_rx_mgmt++;
 		IEEE80211_NODE_STAT(ni, rx_mgmt);
 		if (dir != IEEE80211_FC1_DIR_NODS) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "mgt", "incorrect dir 0x%x", dir);
 			vap->iv_stats.is_rx_wrongdir++;
 			goto err;
 		}
 		if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, "mgt", "too short: len %u",
 			    m->m_pkthdr.len);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;
 		}
 #ifdef IEEE80211_DEBUG
 		if ((ieee80211_msg_debug(vap) && 
 		    (vap->iv_ic->ic_flags & IEEE80211_F_SCAN)) ||
 		    ieee80211_msg_dumppkts(vap)) {
 			if_printf(ifp, "received %s from %s rssi %d\n",
 			    ieee80211_mgt_subtype_name(subtype),
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
 		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "WEP set but not permitted");
 			vap->iv_stats.is_rx_mgtdiscard++; /* XXX */
 			goto out;
 		}
 		vap->iv_recv_mgmt(ni, m, subtype, rxs, rssi, nf);
 		goto out;
 	case IEEE80211_FC0_TYPE_CTL:
 		vap->iv_stats.is_rx_ctl++;
 		IEEE80211_NODE_STAT(ni, rx_ctrl);
 		goto out;
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, "bad", "frame type 0x%x", type);
 		/* should not come here */
 		break;
 	}
 err:
 	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		m_freem(m);
 	}
 	return type;
 #undef	HAS_SEQ
 #undef	MC01
 }
 
 static void
 mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype,
     const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_channel *rxchan = ic->ic_curchan;
 	struct ieee80211_frame *wh;
 	struct ieee80211_mesh_route *rt;
 	uint8_t *frm, *efrm;
 
 	wh = mtod(m0, struct ieee80211_frame *);
 	frm = (uint8_t *)&wh[1];
 	efrm = mtod(m0, uint8_t *) + m0->m_len;
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 	case IEEE80211_FC0_SUBTYPE_BEACON:
 	{
 		struct ieee80211_scanparams scan;
 		struct ieee80211_channel *c;
 		/*
 		 * We process beacon/probe response
 		 * frames to discover neighbors.
 		 */
 		if (rxs != NULL) {
 			c = ieee80211_lookup_channel_rxstatus(vap, rxs);
 			if (c != NULL)
 				rxchan = c;
 		}
 		if (ieee80211_parse_beacon(ni, m0, rxchan, &scan) != 0)
 			return;
 		/*
 		 * Count frame now that we know it's to be processed.
 		 */
 		if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) {
 			vap->iv_stats.is_rx_beacon++;	/* XXX remove */
 			IEEE80211_NODE_STAT(ni, rx_beacons);
 		} else
 			IEEE80211_NODE_STAT(ni, rx_proberesp);
 		/*
 		 * If scanning, just pass information to the scan module.
 		 */
 		if (ic->ic_flags & IEEE80211_F_SCAN) {
 			if (ic->ic_flags_ext & IEEE80211_FEXT_PROBECHAN) {
 				/*
 				 * Actively scanning a channel marked passive;
 				 * send a probe request now that we know there
 				 * is 802.11 traffic present.
 				 *
 				 * XXX check if the beacon we recv'd gives
 				 * us what we need and suppress the probe req
 				 */
 				ieee80211_probe_curchan(vap, 1);
 				ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN;
 			}
 			ieee80211_add_scan(vap, rxchan, &scan, wh,
 			    subtype, rssi, nf);
 			return;
 		}
 
 		/* The rest of this code assumes we are running */
 		if (vap->iv_state != IEEE80211_S_RUN)
 			return;
 		/*
 		 * Ignore non-mesh STAs.
 		 */
 		if ((scan.capinfo &
 		     (IEEE80211_CAPINFO_ESS|IEEE80211_CAPINFO_IBSS)) ||
 		    scan.meshid == NULL || scan.meshconf == NULL) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "beacon", "%s", "not a mesh sta");
 			vap->iv_stats.is_mesh_wrongmesh++;
 			return;
 		}
 		/*
 		 * Ignore STAs for other mesh networks.
 		 */
 		if (memcmp(scan.meshid+2, ms->ms_id, ms->ms_idlen) != 0 ||
 		    mesh_verify_meshconf(vap, scan.meshconf)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "beacon", "%s", "not for our mesh");
 			vap->iv_stats.is_mesh_wrongmesh++;
 			return;
 		}
 		/*
 		 * Peer only based on the current ACL policy.
 		 */
 		if (vap->iv_acl != NULL && !vap->iv_acl->iac_check(vap, wh)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
 			    wh, NULL, "%s", "disallowed by ACL");
 			vap->iv_stats.is_rx_acl++;
 			return;
 		}
 		/*
 		 * Do neighbor discovery.
 		 */
 		if (!IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) {
 			/*
 			 * Create a new entry in the neighbor table.
 			 */
 			ni = ieee80211_add_neighbor(vap, wh, &scan);
 		}
 		/*
 		 * Automatically peer with discovered nodes if possible.
 		 */
 		if (ni != vap->iv_bss &&
 		    (ms->ms_flags & IEEE80211_MESHFLAGS_AP)) {
 			switch (ni->ni_mlstate) {
 			case IEEE80211_NODE_MESH_IDLE:
 			{
 				uint16_t args[1];
 
 				/* Wait for backoff callout to reset counter */
 				if (ni->ni_mlhcnt >= ieee80211_mesh_maxholding)
 					return;
 
 				ni->ni_mlpid = mesh_generateid(vap);
 				if (ni->ni_mlpid == 0)
 					return;
 				mesh_linkchange(ni, IEEE80211_NODE_MESH_OPENSNT);
 				args[0] = ni->ni_mlpid;
 				ieee80211_send_action(ni,
 				IEEE80211_ACTION_CAT_SELF_PROT,
 				IEEE80211_ACTION_MESHPEERING_OPEN, args);
 				ni->ni_mlrcnt = 0;
 				mesh_peer_timeout_setup(ni);
 				break;
 			}
 			case IEEE80211_NODE_MESH_ESTABLISHED:
 			{
 				/*
 				 * Valid beacon from a peer mesh STA
 				 * bump TA lifetime
 				 */
 				rt = ieee80211_mesh_rt_find(vap, wh->i_addr2);
 				if(rt != NULL) {
 					ieee80211_mesh_rt_update(rt,
 					    ticks_to_msecs(
 					    ms->ms_ppath->mpp_inact));
 				}
 				break;
 			}
 			default:
 				break; /* ignore */
 			}
 		}
 		break;
 	}
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 	{
 		uint8_t *ssid, *meshid, *rates, *xrates;
 
 		if (vap->iv_state != IEEE80211_S_RUN) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "wrong state %s",
 			    ieee80211_state_name[vap->iv_state]);
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 		if (IEEE80211_IS_MULTICAST(wh->i_addr2)) {
 			/* frame must be directed */
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "not unicast");
 			vap->iv_stats.is_rx_mgtdiscard++;	/* XXX stat */
 			return;
 		}
 		/*
 		 * prreq frame format
 		 *      [tlv] ssid
 		 *      [tlv] supported rates
 		 *      [tlv] extended supported rates
 		 *	[tlv] mesh id
 		 */
 		ssid = meshid = rates = xrates = NULL;
 		while (efrm - frm > 1) {
 			IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
 			switch (*frm) {
 			case IEEE80211_ELEMID_SSID:
 				ssid = frm;
 				break;
 			case IEEE80211_ELEMID_RATES:
 				rates = frm;
 				break;
 			case IEEE80211_ELEMID_XRATES:
 				xrates = frm;
 				break;
 			case IEEE80211_ELEMID_MESHID:
 				meshid = frm;
 				break;
 			}
 			frm += frm[1] + 2;
 		}
 		IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN, return);
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE, return);
 		if (xrates != NULL)
 			IEEE80211_VERIFY_ELEMENT(xrates,
 			    IEEE80211_RATE_MAXSIZE - rates[1], return);
 		if (meshid != NULL) {
 			IEEE80211_VERIFY_ELEMENT(meshid,
 			    IEEE80211_MESHID_LEN, return);
 			/* NB: meshid, not ssid */
 			IEEE80211_VERIFY_SSID(vap->iv_bss, meshid, return);
 		}
 
 		/* XXX find a better class or define it's own */
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2,
 		    "%s", "recv probe req");
 		/*
 		 * Some legacy 11b clients cannot hack a complete
 		 * probe response frame.  When the request includes
 		 * only a bare-bones rate set, communicate this to
 		 * the transmit side.
 		 */
 		ieee80211_send_proberesp(vap, wh->i_addr2, 0);
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_ACTION:
 	case IEEE80211_FC0_SUBTYPE_ACTION_NOACK:
 		if (ni == vap->iv_bss) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "unknown node");
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) &&
 		    !IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "not for us");
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else if (vap->iv_state != IEEE80211_S_RUN) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "wrong state %s",
 			    ieee80211_state_name[vap->iv_state]);
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else {
 			if (ieee80211_parse_action(ni, m0) == 0)
 				(void)ic->ic_recv_action(ni, wh, frm, efrm);
 		}
 		break;
 
 	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
 	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_TIMING_ADV:
 	case IEEE80211_FC0_SUBTYPE_ATIM:
 	case IEEE80211_FC0_SUBTYPE_DISASSOC:
 	case IEEE80211_FC0_SUBTYPE_AUTH:
 	case IEEE80211_FC0_SUBTYPE_DEAUTH:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 		    wh, NULL, "%s", "not handled");
 		vap->iv_stats.is_rx_mgtdiscard++;
 		break;
 
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, "mgt", "subtype 0x%x not handled", subtype);
 		vap->iv_stats.is_rx_badsubtype++;
 		break;
 	}
 }
 
 static void
 mesh_recv_ctl(struct ieee80211_node *ni, struct mbuf *m, int subtype)
 {
 
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_BAR:
 		ieee80211_recv_bar(ni, m);
 		break;
 	}
 }
 
 /*
  * Parse meshpeering action ie's for MPM frames
  */
 static const struct ieee80211_meshpeer_ie *
 mesh_parse_meshpeering_action(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,	/* XXX for VERIFY_LENGTH */
 	const uint8_t *frm, const uint8_t *efrm,
 	struct ieee80211_meshpeer_ie *mp, uint8_t subtype)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	const struct ieee80211_meshpeer_ie *mpie;
 	uint16_t args[3];
 	const uint8_t *meshid, *meshconf;
 	uint8_t sendclose = 0; /* 1 = MPM frame rejected, close will be sent */
 
 	meshid = meshconf = NULL;
 	while (efrm - frm > 1) {
 		IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return NULL);
 		switch (*frm) {
 		case IEEE80211_ELEMID_MESHID:
 			meshid = frm;
 			break;
 		case IEEE80211_ELEMID_MESHCONF:
 			meshconf = frm;
 			break;
 		case IEEE80211_ELEMID_MESHPEER:
 			mpie = (const struct ieee80211_meshpeer_ie *) frm;
 			memset(mp, 0, sizeof(*mp));
 			mp->peer_len = mpie->peer_len;
 			mp->peer_proto = le16dec(&mpie->peer_proto);
 			mp->peer_llinkid = le16dec(&mpie->peer_llinkid);
 			switch (subtype) {
 			case IEEE80211_ACTION_MESHPEERING_CONFIRM:
 				mp->peer_linkid =
 				    le16dec(&mpie->peer_linkid);
 				break;
 			case IEEE80211_ACTION_MESHPEERING_CLOSE:
 				/* NB: peer link ID is optional */
 				if (mpie->peer_len ==
 				    (IEEE80211_MPM_BASE_SZ + 2)) {
 					mp->peer_linkid = 0;
 					mp->peer_rcode =
 					    le16dec(&mpie->peer_linkid);
 				} else {
 					mp->peer_linkid =
 					    le16dec(&mpie->peer_linkid);
 					mp->peer_rcode =
 					    le16dec(&mpie->peer_rcode);
 				}
 				break;
 			}
 			break;
 		}
 		frm += frm[1] + 2;
 	}
 
 	/*
 	 * Verify the contents of the frame.
 	 * If it fails validation, close the peer link.
 	 */
 	if (mesh_verify_meshpeer(vap, subtype, (const uint8_t *)mp)) {
 		sendclose = 1;
 		IEEE80211_DISCARD(vap,
 		    IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
 		    wh, NULL, "%s", "MPM validation failed");
 	}
 
 	/* If meshid is not the same reject any frames type. */
 	if (sendclose == 0 && mesh_verify_meshid(vap, meshid)) {
 		sendclose = 1;
 		IEEE80211_DISCARD(vap,
 		    IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
 		    wh, NULL, "%s", "not for our mesh");
 		if (subtype == IEEE80211_ACTION_MESHPEERING_CLOSE) {
 			/*
 			 * Standard not clear about this, if we dont ignore
 			 * there will be an endless loop between nodes sending
 			 * CLOSE frames between each other with wrong meshid.
 			 * Discard and timers will bring FSM to IDLE state.
 			 */
 			return NULL;
 		}
 	}
 	
 	/*
 	 * Close frames are accepted if meshid is the same.
 	 * Verify the other two types.
 	 */
 	if (sendclose == 0 && subtype != IEEE80211_ACTION_MESHPEERING_CLOSE &&
 	    mesh_verify_meshconf(vap, meshconf)) {
 		sendclose = 1;
 		IEEE80211_DISCARD(vap,
 		    IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
 		    wh, NULL, "%s", "configuration missmatch");
 	}
 
 	if (sendclose) {
 		vap->iv_stats.is_rx_mgtdiscard++;
 		switch (ni->ni_mlstate) {
 		case IEEE80211_NODE_MESH_IDLE:
 		case IEEE80211_NODE_MESH_ESTABLISHED:
 		case IEEE80211_NODE_MESH_HOLDING:
 			/* ignore */
 			break;
 		case IEEE80211_NODE_MESH_OPENSNT:
 		case IEEE80211_NODE_MESH_OPENRCV:
 		case IEEE80211_NODE_MESH_CONFIRMRCV:
 			args[0] = ni->ni_mlpid;
 			args[1] = ni->ni_mllid;
 			/* Reason codes for rejection */
 			switch (subtype) {
 			case IEEE80211_ACTION_MESHPEERING_OPEN:
 				args[2] = IEEE80211_REASON_MESH_CPVIOLATION;
 				break;
 			case IEEE80211_ACTION_MESHPEERING_CONFIRM:
 				args[2] = IEEE80211_REASON_MESH_INCONS_PARAMS;
 				break;
 			}
 			ieee80211_send_action(ni,
 			    IEEE80211_ACTION_CAT_SELF_PROT,
 			    IEEE80211_ACTION_MESHPEERING_CLOSE,
 			    args);
 			mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING);
 			mesh_peer_timeout_setup(ni);
 			break;
 		}
 		return NULL;
 	}
 	
 	return (const struct ieee80211_meshpeer_ie *) mp;
 }
 
 static int
 mesh_recv_action_meshpeering_open(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_meshpeer_ie ie;
 	const struct ieee80211_meshpeer_ie *meshpeer;
 	uint16_t args[3];
 
 	/* +2+2 for action + code + capabilites */
 	meshpeer = mesh_parse_meshpeering_action(ni, wh, frm+2+2, efrm, &ie,
 	    IEEE80211_ACTION_MESHPEERING_OPEN);
 	if (meshpeer == NULL) {
 		return 0;
 	}
 
 	/* XXX move up */
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
 	    "recv PEER OPEN, lid 0x%x", meshpeer->peer_llinkid);
 
 	switch (ni->ni_mlstate) {
 	case IEEE80211_NODE_MESH_IDLE:
 		/* Reject open request if reached our maximum neighbor count */
 		if (ms->ms_neighbors >= IEEE80211_MESH_MAX_NEIGHBORS) {
 			args[0] = meshpeer->peer_llinkid;
 			args[1] = 0;
 			args[2] = IEEE80211_REASON_MESH_MAX_PEERS;
 			ieee80211_send_action(ni,
 			    IEEE80211_ACTION_CAT_SELF_PROT,
 			    IEEE80211_ACTION_MESHPEERING_CLOSE,
 			    args);
 			/* stay in IDLE state */
 			return (0);
 		}
 		/* Open frame accepted */
 		mesh_linkchange(ni, IEEE80211_NODE_MESH_OPENRCV);
 		ni->ni_mllid = meshpeer->peer_llinkid;
 		ni->ni_mlpid = mesh_generateid(vap);
 		if (ni->ni_mlpid == 0)
 			return 0;		/* XXX */
 		args[0] = ni->ni_mlpid;
 		/* Announce we're open too... */
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_OPEN, args);
 		/* ...and confirm the link. */
 		args[0] = ni->ni_mlpid;
 		args[1] = ni->ni_mllid;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CONFIRM,
 		    args);
 		mesh_peer_timeout_setup(ni);
 		break;
 	case IEEE80211_NODE_MESH_OPENRCV:
 		/* Wrong Link ID */
 		if (ni->ni_mllid != meshpeer->peer_llinkid) {
 			args[0] = ni->ni_mllid;
 			args[1] = ni->ni_mlpid;
 			args[2] = IEEE80211_REASON_PEER_LINK_CANCELED;
 			ieee80211_send_action(ni,
 			    IEEE80211_ACTION_CAT_SELF_PROT,
 			    IEEE80211_ACTION_MESHPEERING_CLOSE,
 			    args);
 			mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING);
 			mesh_peer_timeout_setup(ni);
 			break;
 		}
 		/* Duplicate open, confirm again. */
 		args[0] = ni->ni_mlpid;
 		args[1] = ni->ni_mllid;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CONFIRM,
 		    args);
 		break;
 	case IEEE80211_NODE_MESH_OPENSNT:
 		ni->ni_mllid = meshpeer->peer_llinkid;
 		mesh_linkchange(ni, IEEE80211_NODE_MESH_OPENRCV);
 		args[0] = ni->ni_mlpid;
 		args[1] = ni->ni_mllid;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CONFIRM,
 		    args);
 		/* NB: don't setup/clear any timeout */
 		break;
 	case IEEE80211_NODE_MESH_CONFIRMRCV:
 		if (ni->ni_mlpid != meshpeer->peer_linkid ||
 		    ni->ni_mllid != meshpeer->peer_llinkid) {
 			args[0] = ni->ni_mlpid;
 			args[1] = ni->ni_mllid;
 			args[2] = IEEE80211_REASON_PEER_LINK_CANCELED;
 			ieee80211_send_action(ni,
 			    IEEE80211_ACTION_CAT_SELF_PROT,
 			    IEEE80211_ACTION_MESHPEERING_CLOSE,
 			    args);
 			mesh_linkchange(ni,
 			    IEEE80211_NODE_MESH_HOLDING);
 			mesh_peer_timeout_setup(ni);
 			break;
 		}
 		mesh_linkchange(ni, IEEE80211_NODE_MESH_ESTABLISHED);
 		ni->ni_mllid = meshpeer->peer_llinkid;
 		args[0] = ni->ni_mlpid;
 		args[1] = ni->ni_mllid;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CONFIRM,
 		    args);
 		mesh_peer_timeout_stop(ni);
 		break;
 	case IEEE80211_NODE_MESH_ESTABLISHED:
 		if (ni->ni_mllid != meshpeer->peer_llinkid) {
 			args[0] = ni->ni_mllid;
 			args[1] = ni->ni_mlpid;
 			args[2] = IEEE80211_REASON_PEER_LINK_CANCELED;
 			ieee80211_send_action(ni,
 			    IEEE80211_ACTION_CAT_SELF_PROT,
 			    IEEE80211_ACTION_MESHPEERING_CLOSE,
 			    args);
 			mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING);
 			mesh_peer_timeout_setup(ni);
 			break;
 		}
 		args[0] = ni->ni_mlpid;
 		args[1] = ni->ni_mllid;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CONFIRM,
 		    args);
 		break;
 	case IEEE80211_NODE_MESH_HOLDING:
 		args[0] = ni->ni_mlpid;
 		args[1] = meshpeer->peer_llinkid;
 		/* Standard not clear about what the reaason code should be */
 		args[2] = IEEE80211_REASON_PEER_LINK_CANCELED;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CLOSE,
 		    args);
 		break;
 	}
 	return 0;
 }
 
 static int
 mesh_recv_action_meshpeering_confirm(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_meshpeer_ie ie;
 	const struct ieee80211_meshpeer_ie *meshpeer;
 	uint16_t args[3];
 
 	/* +2+2+2+2 for action + code + capabilites + status code + AID */
 	meshpeer = mesh_parse_meshpeering_action(ni, wh, frm+2+2+2+2, efrm, &ie,
 	    IEEE80211_ACTION_MESHPEERING_CONFIRM);
 	if (meshpeer == NULL) {
 		return 0;
 	}
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
 	    "recv PEER CONFIRM, local id 0x%x, peer id 0x%x",
 	    meshpeer->peer_llinkid, meshpeer->peer_linkid);
 
 	switch (ni->ni_mlstate) {
 	case IEEE80211_NODE_MESH_OPENRCV:
 		mesh_linkchange(ni, IEEE80211_NODE_MESH_ESTABLISHED);
 		mesh_peer_timeout_stop(ni);
 		break;
 	case IEEE80211_NODE_MESH_OPENSNT:
 		mesh_linkchange(ni, IEEE80211_NODE_MESH_CONFIRMRCV);
 		mesh_peer_timeout_setup(ni);
 		break;
 	case IEEE80211_NODE_MESH_HOLDING:
 		args[0] = ni->ni_mlpid;
 		args[1] = meshpeer->peer_llinkid;
 		/* Standard not clear about what the reaason code should be */
 		args[2] = IEEE80211_REASON_PEER_LINK_CANCELED;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CLOSE,
 		    args);
 		break;
 	case IEEE80211_NODE_MESH_CONFIRMRCV:
 		if (ni->ni_mllid != meshpeer->peer_llinkid) {
 			args[0] = ni->ni_mlpid;
 			args[1] = ni->ni_mllid;
 			args[2] = IEEE80211_REASON_PEER_LINK_CANCELED;
 			ieee80211_send_action(ni,
 			    IEEE80211_ACTION_CAT_SELF_PROT,
 			    IEEE80211_ACTION_MESHPEERING_CLOSE,
 			    args);
 			mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING);
 			mesh_peer_timeout_setup(ni);
 		}
 		break;
 	default:
 		IEEE80211_DISCARD(vap,
 		    IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
 		    wh, NULL, "received confirm in invalid state %d",
 		    ni->ni_mlstate);
 		vap->iv_stats.is_rx_mgtdiscard++;
 		break;
 	}
 	return 0;
 }
 
 static int
 mesh_recv_action_meshpeering_close(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	struct ieee80211_meshpeer_ie ie;
 	const struct ieee80211_meshpeer_ie *meshpeer;
 	uint16_t args[3];
 
 	/* +2 for action + code */
 	meshpeer = mesh_parse_meshpeering_action(ni, wh, frm+2, efrm, &ie,
 	    IEEE80211_ACTION_MESHPEERING_CLOSE);
 	if (meshpeer == NULL) {
 		return 0;
 	}
 
 	/*
 	 * XXX: check reason code, for example we could receive
 	 * IEEE80211_REASON_MESH_MAX_PEERS then we should not attempt
 	 * to peer again.
 	 */
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
 	    ni, "%s", "recv PEER CLOSE");
 
 	switch (ni->ni_mlstate) {
 	case IEEE80211_NODE_MESH_IDLE:
 		/* ignore */
 		break;
 	case IEEE80211_NODE_MESH_OPENRCV:
 	case IEEE80211_NODE_MESH_OPENSNT:
 	case IEEE80211_NODE_MESH_CONFIRMRCV:
 	case IEEE80211_NODE_MESH_ESTABLISHED:
 		args[0] = ni->ni_mlpid;
 		args[1] = ni->ni_mllid;
 		args[2] = IEEE80211_REASON_MESH_CLOSE_RCVD;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CLOSE,
 		    args);
 		mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING);
 		mesh_peer_timeout_setup(ni);
 		break;
 	case IEEE80211_NODE_MESH_HOLDING:
 		mesh_linkchange(ni, IEEE80211_NODE_MESH_IDLE);
 		mesh_peer_timeout_stop(ni);
 		break;
 	}
 	return 0;
 }
 
 /*
  * Link Metric handling.
  */
 static int
 mesh_recv_action_meshlmetric(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	const struct ieee80211_meshlmetric_ie *ie =
 	    (const struct ieee80211_meshlmetric_ie *)
 	    (frm+2); /* action + code */
 	struct ieee80211_meshlmetric_ie lm_rep;
 	
 	if (ie->lm_flags & IEEE80211_MESH_LMETRIC_FLAGS_REQ) {
 		lm_rep.lm_flags = 0;
 		lm_rep.lm_metric = mesh_airtime_calc(ni);
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_MESH,
 		    IEEE80211_ACTION_MESH_LMETRIC,
 		    &lm_rep);
 	}
 	/* XXX: else do nothing for now */
 	return 0;
 }
 
 /*
  * Parse meshgate action ie's for GANN frames.
  * Returns -1 if parsing fails, otherwise 0.
  */
 static int
 mesh_parse_meshgate_action(struct ieee80211_node *ni,
     const struct ieee80211_frame *wh,	/* XXX for VERIFY_LENGTH */
     struct ieee80211_meshgann_ie *ie, const uint8_t *frm, const uint8_t *efrm)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	const struct ieee80211_meshgann_ie *gannie;
 
 	while (efrm - frm > 1) {
 		IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return -1);
 		switch (*frm) {
 		case IEEE80211_ELEMID_MESHGANN:
 			gannie = (const struct ieee80211_meshgann_ie *) frm;
 			memset(ie, 0, sizeof(*ie));
 			ie->gann_ie = gannie->gann_ie;
 			ie->gann_len = gannie->gann_len;
 			ie->gann_flags = gannie->gann_flags;
 			ie->gann_hopcount = gannie->gann_hopcount;
 			ie->gann_ttl = gannie->gann_ttl;
 			IEEE80211_ADDR_COPY(ie->gann_addr, gannie->gann_addr);
 			ie->gann_seq = le32dec(&gannie->gann_seq);
 			ie->gann_interval = le16dec(&gannie->gann_interval);
 			break;
 		}
 		frm += frm[1] + 2;
 	}
 
 	return 0;
 }
 
 /*
  * Mesh Gate Announcement handling.
  */
 static int
 mesh_recv_action_meshgate(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_gate_route *gr, *next;
 	struct ieee80211_mesh_route *rt_gate;
 	struct ieee80211_meshgann_ie pgann;
 	struct ieee80211_meshgann_ie ie;
 	int found = 0;
 
 	/* +2 for action + code */
 	if (mesh_parse_meshgate_action(ni, wh, &ie, frm+2, efrm) != 0) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
 		    ni->ni_macaddr, NULL, "%s",
 		    "GANN parsing failed");
 		vap->iv_stats.is_rx_mgtdiscard++;
 		return (0);
 	}
 
 	if (IEEE80211_ADDR_EQ(vap->iv_myaddr, ie.gann_addr))
 		return 0;
 
 	IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, ni->ni_macaddr,
 	    "received GANN, meshgate: %6D (seq %u)", ie.gann_addr, ":",
 	    ie.gann_seq);
 
 	if (ms == NULL)
 		return (0);
 	MESH_RT_LOCK(ms);
 	TAILQ_FOREACH_SAFE(gr, &ms->ms_known_gates, gr_next, next) {
 		if (!IEEE80211_ADDR_EQ(gr->gr_addr, ie.gann_addr))
 			continue;
 		if (ie.gann_seq <= gr->gr_lastseq) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
 			    ni->ni_macaddr, NULL,
 			    "GANN old seqno %u <= %u",
 			    ie.gann_seq, gr->gr_lastseq);
 			MESH_RT_UNLOCK(ms);
 			return (0);
 		}
 		/* corresponding mesh gate found & GANN accepted */
 		found = 1;
 		break;
 
 	}
 	if (found == 0) {
 		/* this GANN is from a new mesh Gate add it to known table. */
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, ie.gann_addr,
 		    "stored new GANN information, seq %u.", ie.gann_seq);
 		gr = IEEE80211_MALLOC(ALIGN(sizeof(struct ieee80211_mesh_gate_route)),
 		    M_80211_MESH_GT_RT,
 		    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 		IEEE80211_ADDR_COPY(gr->gr_addr, ie.gann_addr);
 		TAILQ_INSERT_TAIL(&ms->ms_known_gates, gr, gr_next);
 	}
 	gr->gr_lastseq = ie.gann_seq;
 
 	/* check if we have a path to this gate */
 	rt_gate = mesh_rt_find_locked(ms, gr->gr_addr);
 	if (rt_gate != NULL &&
 	    rt_gate->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) {
 		gr->gr_route = rt_gate;
 		rt_gate->rt_flags |= IEEE80211_MESHRT_FLAGS_GATE;
 	}
 
 	MESH_RT_UNLOCK(ms);
 
 	/* popagate only if decremented ttl >= 1 && forwarding is enabled */
 	if ((ie.gann_ttl - 1) < 1 && !(ms->ms_flags & IEEE80211_MESHFLAGS_FWD))
 		return 0;
 		pgann.gann_flags = ie.gann_flags; /* Reserved */
 	pgann.gann_hopcount = ie.gann_hopcount + 1;
 	pgann.gann_ttl = ie.gann_ttl - 1;
 	IEEE80211_ADDR_COPY(pgann.gann_addr, ie.gann_addr);
 	pgann.gann_seq = ie.gann_seq;
 	pgann.gann_interval = ie.gann_interval;
 
 	IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, ie.gann_addr,
 	    "%s", "propagate GANN");
 
 	ieee80211_send_action(vap->iv_bss, IEEE80211_ACTION_CAT_MESH,
 	    IEEE80211_ACTION_MESH_GANN, &pgann);
 
 	return 0;
 }
 
 static int
 mesh_send_action(struct ieee80211_node *ni,
     const uint8_t sa[IEEE80211_ADDR_LEN],
     const uint8_t da[IEEE80211_ADDR_LEN],
     struct mbuf *m)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_bpf_params params;
 	int ret;
 
 	KASSERT(ni != NULL, ("null node"));
 
 	if (vap->iv_state == IEEE80211_S_CAC) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT, ni,
 		    "block %s frame in CAC state", "Mesh action");
 		vap->iv_stats.is_tx_badstate++;
 		ieee80211_free_node(ni);
 		m_freem(m);
 		return EIO;		/* XXX */
 	}
 
 	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
 	if (m == NULL) {
 		ieee80211_free_node(ni);
 		return ENOMEM;
 	}
 
 	IEEE80211_TX_LOCK(ic);
 	ieee80211_send_setup(ni, m,
 	     IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_ACTION,
 	     IEEE80211_NONQOS_TID, sa, da, sa);
 	m->m_flags |= M_ENCAP;		/* mark encapsulated */
 
 	memset(&params, 0, sizeof(params));
 	params.ibp_pri = WME_AC_VO;
 	params.ibp_rate0 = ni->ni_txparms->mgmtrate;
 	if (IEEE80211_IS_MULTICAST(da))
 		params.ibp_try0 = 1;
 	else
 		params.ibp_try0 = ni->ni_txparms->maxretry;
 	params.ibp_power = ni->ni_txpower;
 
 	IEEE80211_NODE_STAT(ni, tx_mgmt);
 
 	ret = ieee80211_raw_output(vap, ni, m, &params);
 	IEEE80211_TX_UNLOCK(ic);
 	return (ret);
 }
 
 #define	ADDSHORT(frm, v) do {			\
 	frm[0] = (v) & 0xff;			\
 	frm[1] = (v) >> 8;			\
 	frm += 2;				\
 } while (0)
 #define	ADDWORD(frm, v) do {			\
 	frm[0] = (v) & 0xff;			\
 	frm[1] = ((v) >> 8) & 0xff;		\
 	frm[2] = ((v) >> 16) & 0xff;		\
 	frm[3] = ((v) >> 24) & 0xff;		\
 	frm += 4;				\
 } while (0)
 
 static int
 mesh_send_action_meshpeering_open(struct ieee80211_node *ni,
 	int category, int action, void *args0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	uint16_t *args = args0;
 	const struct ieee80211_rateset *rs;
 	struct mbuf *m;
 	uint8_t *frm;
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
 	    "send PEER OPEN action: localid 0x%x", args[0]);
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
 	    "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", __func__, __LINE__,
 	    ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1);
 	ieee80211_ref_node(ni);
 
 	m = ieee80211_getmgtframe(&frm,
 	    ic->ic_headroom + sizeof(struct ieee80211_frame),
 	    sizeof(uint16_t)	/* action+category */
 	    + sizeof(uint16_t)	/* capabilites */
 	    + 2 + IEEE80211_RATE_SIZE
 	    + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE)
 	    + 2 + IEEE80211_MESHID_LEN
 	    + sizeof(struct ieee80211_meshconf_ie)
 	    + sizeof(struct ieee80211_meshpeer_ie)
 	);
 	if (m != NULL) {
 		/*
 		 * mesh peer open action frame format:
 		 *   [1] category
 		 *   [1] action
 		 *   [2] capabilities
 		 *   [tlv] rates
 		 *   [tlv] xrates
 		 *   [tlv] mesh id
 		 *   [tlv] mesh conf
 		 *   [tlv] mesh peer link mgmt
 		 */
 		*frm++ = category;
 		*frm++ = action;
 		ADDSHORT(frm, ieee80211_getcapinfo(vap, ni->ni_chan));
 		rs = ieee80211_get_suprates(ic, ic->ic_curchan);
 		frm = ieee80211_add_rates(frm, rs);
 		frm = ieee80211_add_xrates(frm, rs);
 		frm = ieee80211_add_meshid(frm, vap);
 		frm = ieee80211_add_meshconf(frm, vap);
 		frm = ieee80211_add_meshpeer(frm, IEEE80211_ACTION_MESHPEERING_OPEN,
 		    args[0], 0, 0);
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
 		return mesh_send_action(ni, vap->iv_myaddr, ni->ni_macaddr, m);
 	} else {
 		vap->iv_stats.is_tx_nobuf++;
 		ieee80211_free_node(ni);
 		return ENOMEM;
 	}
 }
 
 static int
 mesh_send_action_meshpeering_confirm(struct ieee80211_node *ni,
 	int category, int action, void *args0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	uint16_t *args = args0;
 	const struct ieee80211_rateset *rs;
 	struct mbuf *m;
 	uint8_t *frm;
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
 	    "send PEER CONFIRM action: localid 0x%x, peerid 0x%x",
 	    args[0], args[1]);
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
 	    "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", __func__, __LINE__,
 	    ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1);
 	ieee80211_ref_node(ni);
 
 	m = ieee80211_getmgtframe(&frm,
 	    ic->ic_headroom + sizeof(struct ieee80211_frame),
 	    sizeof(uint16_t)	/* action+category */
 	    + sizeof(uint16_t)	/* capabilites */
 	    + sizeof(uint16_t)	/* status code */
 	    + sizeof(uint16_t)	/* AID */
 	    + 2 + IEEE80211_RATE_SIZE
 	    + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE)
 	    + 2 + IEEE80211_MESHID_LEN
 	    + sizeof(struct ieee80211_meshconf_ie)
 	    + sizeof(struct ieee80211_meshpeer_ie)
 	);
 	if (m != NULL) {
 		/*
 		 * mesh peer confirm action frame format:
 		 *   [1] category
 		 *   [1] action
 		 *   [2] capabilities
 		 *   [2] status code
 		 *   [2] association id (peer ID)
 		 *   [tlv] rates
 		 *   [tlv] xrates
 		 *   [tlv] mesh id
 		 *   [tlv] mesh conf
 		 *   [tlv] mesh peer link mgmt
 		 */
 		*frm++ = category;
 		*frm++ = action;
 		ADDSHORT(frm, ieee80211_getcapinfo(vap, ni->ni_chan));
 		ADDSHORT(frm, 0);		/* status code */
 		ADDSHORT(frm, args[1]);		/* AID */
 		rs = ieee80211_get_suprates(ic, ic->ic_curchan);
 		frm = ieee80211_add_rates(frm, rs);
 		frm = ieee80211_add_xrates(frm, rs);
 		frm = ieee80211_add_meshid(frm, vap);
 		frm = ieee80211_add_meshconf(frm, vap);
 		frm = ieee80211_add_meshpeer(frm,
 		    IEEE80211_ACTION_MESHPEERING_CONFIRM,
 		    args[0], args[1], 0);
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
 		return mesh_send_action(ni, vap->iv_myaddr, ni->ni_macaddr, m);
 	} else {
 		vap->iv_stats.is_tx_nobuf++;
 		ieee80211_free_node(ni);
 		return ENOMEM;
 	}
 }
 
 static int
 mesh_send_action_meshpeering_close(struct ieee80211_node *ni,
 	int category, int action, void *args0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	uint16_t *args = args0;
 	struct mbuf *m;
 	uint8_t *frm;
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
 	    "send PEER CLOSE action: localid 0x%x, peerid 0x%x reason %d (%s)",
 	    args[0], args[1], args[2], ieee80211_reason_to_string(args[2]));
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
 	    "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", __func__, __LINE__,
 	    ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1);
 	ieee80211_ref_node(ni);
 
 	m = ieee80211_getmgtframe(&frm,
 	    ic->ic_headroom + sizeof(struct ieee80211_frame),
 	    sizeof(uint16_t)	/* action+category */
 	    + sizeof(uint16_t)	/* reason code */
 	    + 2 + IEEE80211_MESHID_LEN
 	    + sizeof(struct ieee80211_meshpeer_ie)
 	);
 	if (m != NULL) {
 		/*
 		 * mesh peer close action frame format:
 		 *   [1] category
 		 *   [1] action
 		 *   [tlv] mesh id
 		 *   [tlv] mesh peer link mgmt
 		 */
 		*frm++ = category;
 		*frm++ = action;
 		frm = ieee80211_add_meshid(frm, vap);
 		frm = ieee80211_add_meshpeer(frm,
 		    IEEE80211_ACTION_MESHPEERING_CLOSE,
 		    args[0], args[1], args[2]);
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
 		return mesh_send_action(ni, vap->iv_myaddr, ni->ni_macaddr, m);
 	} else {
 		vap->iv_stats.is_tx_nobuf++;
 		ieee80211_free_node(ni);
 		return ENOMEM;
 	}
 }
 
 static int
 mesh_send_action_meshlmetric(struct ieee80211_node *ni,
 	int category, int action, void *arg0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_meshlmetric_ie *ie = arg0;
 	struct mbuf *m;
 	uint8_t *frm;
 
 	if (ie->lm_flags & IEEE80211_MESH_LMETRIC_FLAGS_REQ) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
 		    ni, "%s", "send LINK METRIC REQUEST action");
 	} else {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
 		    ni, "send LINK METRIC REPLY action: metric 0x%x",
 		    ie->lm_metric);
 	}
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
 	    "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", __func__, __LINE__,
 	    ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1);
 	ieee80211_ref_node(ni);
 
 	m = ieee80211_getmgtframe(&frm,
 	    ic->ic_headroom + sizeof(struct ieee80211_frame),
 	    sizeof(uint16_t) +	/* action+category */
 	    sizeof(struct ieee80211_meshlmetric_ie)
 	);
 	if (m != NULL) {
 		/*
 		 * mesh link metric
 		 *   [1] category
 		 *   [1] action
 		 *   [tlv] mesh link metric
 		 */
 		*frm++ = category;
 		*frm++ = action;
 		frm = ieee80211_add_meshlmetric(frm,
 		    ie->lm_flags, ie->lm_metric);
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
 		return mesh_send_action(ni, vap->iv_myaddr, ni->ni_macaddr, m);
 	} else {
 		vap->iv_stats.is_tx_nobuf++;
 		ieee80211_free_node(ni);
 		return ENOMEM;
 	}
 }
 
 static int
 mesh_send_action_meshgate(struct ieee80211_node *ni,
 	int category, int action, void *arg0)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_meshgann_ie *ie = arg0;
 	struct mbuf *m;
 	uint8_t *frm;
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
 	    "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", __func__, __LINE__,
 	    ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1);
 	ieee80211_ref_node(ni);
 
 	m = ieee80211_getmgtframe(&frm,
 	    ic->ic_headroom + sizeof(struct ieee80211_frame),
 	    sizeof(uint16_t) +	/* action+category */
 	    IEEE80211_MESHGANN_BASE_SZ
 	);
 	if (m != NULL) {
 		/*
 		 * mesh link metric
 		 *   [1] category
 		 *   [1] action
 		 *   [tlv] mesh gate annoucement
 		 */
 		*frm++ = category;
 		*frm++ = action;
 		frm = ieee80211_add_meshgate(frm, ie);
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
 		return mesh_send_action(ni, vap->iv_myaddr, broadcastaddr, m);
 	} else {
 		vap->iv_stats.is_tx_nobuf++;
 		ieee80211_free_node(ni);
 		return ENOMEM;
 	}
 }
 
 static void
 mesh_peer_timeout_setup(struct ieee80211_node *ni)
 {
 	switch (ni->ni_mlstate) {
 	case IEEE80211_NODE_MESH_HOLDING:
 		ni->ni_mltval = ieee80211_mesh_holdingtimeout;
 		break;
 	case IEEE80211_NODE_MESH_CONFIRMRCV:
 		ni->ni_mltval = ieee80211_mesh_confirmtimeout;
 		break;
 	case IEEE80211_NODE_MESH_IDLE:
 		ni->ni_mltval = 0;
 		break;
 	default:
 		ni->ni_mltval = ieee80211_mesh_retrytimeout;
 		break;
 	}
 	if (ni->ni_mltval)
 		callout_reset(&ni->ni_mltimer, ni->ni_mltval,
 		    mesh_peer_timeout_cb, ni);
 }
 
 /*
  * Same as above but backoffs timer statisically 50%.
  */
 static void
 mesh_peer_timeout_backoff(struct ieee80211_node *ni)
 {
 	uint32_t r;
 	
 	r = arc4random();
 	ni->ni_mltval += r % ni->ni_mltval;
 	callout_reset(&ni->ni_mltimer, ni->ni_mltval, mesh_peer_timeout_cb,
 	    ni);
 }
 
 static __inline void
 mesh_peer_timeout_stop(struct ieee80211_node *ni)
 {
 	callout_drain(&ni->ni_mltimer);
 }
 
 static void
 mesh_peer_backoff_cb(void *arg)
 {
 	struct ieee80211_node *ni = (struct ieee80211_node *)arg;
 
 	/* After backoff timeout, try to peer automatically again. */
 	ni->ni_mlhcnt = 0;
 }
 
 /*
  * Mesh Peer Link Management FSM timeout handling.
  */
 static void
 mesh_peer_timeout_cb(void *arg)
 {
 	struct ieee80211_node *ni = (struct ieee80211_node *)arg;
 	uint16_t args[3];
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_MESH,
 	    ni, "mesh link timeout, state %d, retry counter %d",
 	    ni->ni_mlstate, ni->ni_mlrcnt);
 	
 	switch (ni->ni_mlstate) {
 	case IEEE80211_NODE_MESH_IDLE:
 	case IEEE80211_NODE_MESH_ESTABLISHED:
 		break;
 	case IEEE80211_NODE_MESH_OPENSNT:
 	case IEEE80211_NODE_MESH_OPENRCV:
 		if (ni->ni_mlrcnt == ieee80211_mesh_maxretries) {
 			args[0] = ni->ni_mlpid;
 			args[2] = IEEE80211_REASON_MESH_MAX_RETRIES;
 			ieee80211_send_action(ni,
 			    IEEE80211_ACTION_CAT_SELF_PROT,
 			    IEEE80211_ACTION_MESHPEERING_CLOSE, args);
 			ni->ni_mlrcnt = 0;
 			mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING);
 			mesh_peer_timeout_setup(ni);
 		} else {
 			args[0] = ni->ni_mlpid;
 			ieee80211_send_action(ni,
 			    IEEE80211_ACTION_CAT_SELF_PROT,
 			    IEEE80211_ACTION_MESHPEERING_OPEN, args);
 			ni->ni_mlrcnt++;
 			mesh_peer_timeout_backoff(ni);
 		}
 		break;
 	case IEEE80211_NODE_MESH_CONFIRMRCV:
 		args[0] = ni->ni_mlpid;
 		args[2] = IEEE80211_REASON_MESH_CONFIRM_TIMEOUT;
 		ieee80211_send_action(ni,
 		    IEEE80211_ACTION_CAT_SELF_PROT,
 		    IEEE80211_ACTION_MESHPEERING_CLOSE, args);
 		mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING);
 		mesh_peer_timeout_setup(ni);
 		break;
 	case IEEE80211_NODE_MESH_HOLDING:
 		ni->ni_mlhcnt++;
 		if (ni->ni_mlhcnt >= ieee80211_mesh_maxholding)
 			callout_reset(&ni->ni_mlhtimer,
 			    ieee80211_mesh_backofftimeout,
 			    mesh_peer_backoff_cb, ni);
 		mesh_linkchange(ni, IEEE80211_NODE_MESH_IDLE);
 		break;
 	}
 }
 
 static int
 mesh_verify_meshid(struct ieee80211vap *vap, const uint8_t *ie)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 
 	if (ie == NULL || ie[1] != ms->ms_idlen)
 		return 1;
 	return memcmp(ms->ms_id, ie + 2, ms->ms_idlen);
 }
 
 /*
  * Check if we are using the same algorithms for this mesh.
  */
 static int
 mesh_verify_meshconf(struct ieee80211vap *vap, const uint8_t *ie)
 {
 	const struct ieee80211_meshconf_ie *meshconf =
 	    (const struct ieee80211_meshconf_ie *) ie;
 	const struct ieee80211_mesh_state *ms = vap->iv_mesh;
 
 	if (meshconf == NULL)
 		return 1;
 	if (meshconf->conf_pselid != ms->ms_ppath->mpp_ie) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
 		    "unknown path selection algorithm: 0x%x\n",
 		    meshconf->conf_pselid);
 		return 1;
 	}
 	if (meshconf->conf_pmetid != ms->ms_pmetric->mpm_ie) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
 		    "unknown path metric algorithm: 0x%x\n",
 		    meshconf->conf_pmetid);
 		return 1;
 	}
 	if (meshconf->conf_ccid != 0) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
 		    "unknown congestion control algorithm: 0x%x\n",
 		    meshconf->conf_ccid);
 		return 1;
 	}
 	if (meshconf->conf_syncid != IEEE80211_MESHCONF_SYNC_NEIGHOFF) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
 		    "unknown sync algorithm: 0x%x\n",
 		    meshconf->conf_syncid);
 		return 1;
 	}
 	if (meshconf->conf_authid != 0) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
 		    "unknown auth auth algorithm: 0x%x\n",
 		    meshconf->conf_pselid);
 		return 1;
 	}
 	/* Not accepting peers */
 	if (!(meshconf->conf_cap & IEEE80211_MESHCONF_CAP_AP)) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
 		    "not accepting peers: 0x%x\n", meshconf->conf_cap);
 		return 1;
 	}
 	return 0;
 }
 
 static int
 mesh_verify_meshpeer(struct ieee80211vap *vap, uint8_t subtype,
     const uint8_t *ie)
 {
 	const struct ieee80211_meshpeer_ie *meshpeer =
 	    (const struct ieee80211_meshpeer_ie *) ie;
 
 	if (meshpeer == NULL ||
 	    meshpeer->peer_len < IEEE80211_MPM_BASE_SZ ||
 	    meshpeer->peer_len > IEEE80211_MPM_MAX_SZ)
 		return 1;
 	if (meshpeer->peer_proto != IEEE80211_MPPID_MPM) {
 		IEEE80211_DPRINTF(vap,
 		    IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
 		    "Only MPM protocol is supported (proto: 0x%02X)",
 		    meshpeer->peer_proto);
 		return 1;
 	}
 	switch (subtype) {
 	case IEEE80211_ACTION_MESHPEERING_OPEN:
 		if (meshpeer->peer_len != IEEE80211_MPM_BASE_SZ)
 			return 1;
 		break;
 	case IEEE80211_ACTION_MESHPEERING_CONFIRM:
 		if (meshpeer->peer_len != IEEE80211_MPM_BASE_SZ + 2)
 			return 1;
 		break;
 	case IEEE80211_ACTION_MESHPEERING_CLOSE:
 		if (meshpeer->peer_len < IEEE80211_MPM_BASE_SZ + 2)
 			return 1;
 		if (meshpeer->peer_len == (IEEE80211_MPM_BASE_SZ + 2) &&
 		    meshpeer->peer_linkid != 0)
 			return 1;
 		if (meshpeer->peer_rcode == 0)
 			return 1;
 		break;
 	}
 	return 0;
 }
 
 /*
  * Add a Mesh ID IE to a frame.
  */
 uint8_t *
 ieee80211_add_meshid(uint8_t *frm, struct ieee80211vap *vap)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 
 	KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, ("not a mbss vap"));
 
 	*frm++ = IEEE80211_ELEMID_MESHID;
 	*frm++ = ms->ms_idlen;
 	memcpy(frm, ms->ms_id, ms->ms_idlen);
 	return frm + ms->ms_idlen;
 }
 
 /*
  * Add a Mesh Configuration IE to a frame.
  * For now just use HWMP routing, Airtime link metric, Null Congestion
  * Signaling, Null Sync Protocol and Null Authentication.
  */
 uint8_t *
 ieee80211_add_meshconf(uint8_t *frm, struct ieee80211vap *vap)
 {
 	const struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	uint16_t caps;
 
 	KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, ("not a MBSS vap"));
 
 	*frm++ = IEEE80211_ELEMID_MESHCONF;
 	*frm++ = IEEE80211_MESH_CONF_SZ;
 	*frm++ = ms->ms_ppath->mpp_ie;		/* path selection */
 	*frm++ = ms->ms_pmetric->mpm_ie;	/* link metric */
 	*frm++ = IEEE80211_MESHCONF_CC_DISABLED;
 	*frm++ = IEEE80211_MESHCONF_SYNC_NEIGHOFF;
 	*frm++ = IEEE80211_MESHCONF_AUTH_DISABLED;
 	/* NB: set the number of neighbors before the rest */
 	*frm = (ms->ms_neighbors > IEEE80211_MESH_MAX_NEIGHBORS ?
 	    IEEE80211_MESH_MAX_NEIGHBORS : ms->ms_neighbors) << 1;
 	if (ms->ms_flags & IEEE80211_MESHFLAGS_GATE)
 		*frm |= IEEE80211_MESHCONF_FORM_GATE;
 	frm += 1;
 	caps = 0;
 	if (ms->ms_flags & IEEE80211_MESHFLAGS_AP)
 		caps |= IEEE80211_MESHCONF_CAP_AP;
 	if (ms->ms_flags & IEEE80211_MESHFLAGS_FWD)
 		caps |= IEEE80211_MESHCONF_CAP_FWRD;
 	*frm++ = caps;
 	return frm;
 }
 
 /*
  * Add a Mesh Peer Management IE to a frame.
  */
 uint8_t *
 ieee80211_add_meshpeer(uint8_t *frm, uint8_t subtype, uint16_t localid,
     uint16_t peerid, uint16_t reason)
 {
 
 	KASSERT(localid != 0, ("localid == 0"));
 
 	*frm++ = IEEE80211_ELEMID_MESHPEER;
 	switch (subtype) {
 	case IEEE80211_ACTION_MESHPEERING_OPEN:
 		*frm++ = IEEE80211_MPM_BASE_SZ;		/* length */
 		ADDSHORT(frm, IEEE80211_MPPID_MPM);	/* proto */
 		ADDSHORT(frm, localid);			/* local ID */
 		break;
 	case IEEE80211_ACTION_MESHPEERING_CONFIRM:
 		KASSERT(peerid != 0, ("sending peer confirm without peer id"));
 		*frm++ = IEEE80211_MPM_BASE_SZ + 2;	/* length */
 		ADDSHORT(frm, IEEE80211_MPPID_MPM);	/* proto */
 		ADDSHORT(frm, localid);			/* local ID */
 		ADDSHORT(frm, peerid);			/* peer ID */
 		break;
 	case IEEE80211_ACTION_MESHPEERING_CLOSE:
 		if (peerid)
 			*frm++ = IEEE80211_MPM_MAX_SZ;	/* length */
 		else
 			*frm++ = IEEE80211_MPM_BASE_SZ + 2; /* length */
 		ADDSHORT(frm, IEEE80211_MPPID_MPM);	/* proto */
 		ADDSHORT(frm, localid);	/* local ID */
 		if (peerid)
 			ADDSHORT(frm, peerid);	/* peer ID */
 		ADDSHORT(frm, reason);
 		break;
 	}
 	return frm;
 }
 
 /*
  * Compute an Airtime Link Metric for the link with this node.
  *
  * Based on Draft 3.0 spec (11B.10, p.149).
  */
 /*
  * Max 802.11s overhead.
  */
 #define IEEE80211_MESH_MAXOVERHEAD \
 	(sizeof(struct ieee80211_qosframe_addr4) \
 	 + sizeof(struct ieee80211_meshcntl_ae10) \
 	+ sizeof(struct llc) \
 	+ IEEE80211_ADDR_LEN \
 	+ IEEE80211_WEP_IVLEN \
 	+ IEEE80211_WEP_KIDLEN \
 	+ IEEE80211_WEP_CRCLEN \
 	+ IEEE80211_WEP_MICLEN \
 	+ IEEE80211_CRC_LEN)
 uint32_t
 mesh_airtime_calc(struct ieee80211_node *ni)
 {
 #define M_BITS 8
 #define S_FACTOR (2 * M_BITS)
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ifnet *ifp = ni->ni_vap->iv_ifp;
 	const static int nbits = 8192 << M_BITS;
 	uint32_t overhead, rate, errrate;
 	uint64_t res;
 
 	/* Time to transmit a frame */
 	rate = ni->ni_txrate;
 	overhead = ieee80211_compute_duration(ic->ic_rt,
 	    ifp->if_mtu + IEEE80211_MESH_MAXOVERHEAD, rate, 0) << M_BITS;
 	/* Error rate in percentage */
 	/* XXX assuming small failures are ok */
 	errrate = (((ifp->if_get_counter(ifp, IFCOUNTER_OERRORS) +
 	    ifp->if_get_counter(ifp, IFCOUNTER_IERRORS)) / 100) << M_BITS)
 	    / 100;
 	res = (overhead + (nbits / rate)) *
 	    ((1 << S_FACTOR) / ((1 << M_BITS) - errrate));
 
 	return (uint32_t)(res >> S_FACTOR);
 #undef M_BITS
 #undef S_FACTOR
 }
 
 /*
  * Add a Mesh Link Metric report IE to a frame.
  */
 uint8_t *
 ieee80211_add_meshlmetric(uint8_t *frm, uint8_t flags, uint32_t metric)
 {
 	*frm++ = IEEE80211_ELEMID_MESHLINK;
 	*frm++ = 5;
 	*frm++ = flags;
 	ADDWORD(frm, metric);
 	return frm;
 }
 
 /*
  * Add a Mesh Gate Announcement IE to a frame.
  */
 uint8_t *
 ieee80211_add_meshgate(uint8_t *frm, struct ieee80211_meshgann_ie *ie)
 {
 	*frm++ = IEEE80211_ELEMID_MESHGANN; /* ie */
 	*frm++ = IEEE80211_MESHGANN_BASE_SZ; /* len */
 	*frm++ = ie->gann_flags;
 	*frm++ = ie->gann_hopcount;
 	*frm++ = ie->gann_ttl;
 	IEEE80211_ADDR_COPY(frm, ie->gann_addr);
 	frm += 6;
 	ADDWORD(frm, ie->gann_seq);
 	ADDSHORT(frm, ie->gann_interval);
 	return frm;
 }
 #undef ADDSHORT
 #undef ADDWORD
 
 /*
  * Initialize any mesh-specific node state.
  */
 void
 ieee80211_mesh_node_init(struct ieee80211vap *vap, struct ieee80211_node *ni)
 {
 	ni->ni_flags |= IEEE80211_NODE_QOS;
 	callout_init(&ni->ni_mltimer, 1);
 	callout_init(&ni->ni_mlhtimer, 1);
 }
 
 /*
  * Cleanup any mesh-specific node state.
  */
 void
 ieee80211_mesh_node_cleanup(struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 
 	callout_drain(&ni->ni_mltimer);
 	callout_drain(&ni->ni_mlhtimer);
 	/* NB: short-circuit callbacks after mesh_vdetach */
 	if (vap->iv_mesh != NULL)
 		ms->ms_ppath->mpp_peerdown(ni);
 }
 
 void
 ieee80211_parse_meshid(struct ieee80211_node *ni, const uint8_t *ie)
 {
 	ni->ni_meshidlen = ie[1];
 	memcpy(ni->ni_meshid, ie + 2, ie[1]);
 }
 
 /*
  * Setup mesh-specific node state on neighbor discovery.
  */
 void
 ieee80211_mesh_init_neighbor(struct ieee80211_node *ni,
 	const struct ieee80211_frame *wh,
 	const struct ieee80211_scanparams *sp)
 {
 	ieee80211_parse_meshid(ni, sp->meshid);
 }
 
 void
 ieee80211_mesh_update_beacon(struct ieee80211vap *vap,
 	struct ieee80211_beacon_offsets *bo)
 {
 	KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, ("not a MBSS vap"));
 
 	if (isset(bo->bo_flags, IEEE80211_BEACON_MESHCONF)) {
 		(void)ieee80211_add_meshconf(bo->bo_meshconf, vap);
 		clrbit(bo->bo_flags, IEEE80211_BEACON_MESHCONF);
 	}
 }
 
 static int
 mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	uint8_t tmpmeshid[IEEE80211_NWID_LEN];
 	struct ieee80211_mesh_route *rt;
 	struct ieee80211req_mesh_route *imr;
 	size_t len, off;
 	uint8_t *p;
 	int error;
 
 	if (vap->iv_opmode != IEEE80211_M_MBSS)
 		return ENOSYS;
 
 	error = 0;
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_MESH_ID:
 		ireq->i_len = ms->ms_idlen;
 		memcpy(tmpmeshid, ms->ms_id, ireq->i_len);
 		error = copyout(tmpmeshid, ireq->i_data, ireq->i_len);
 		break;
 	case IEEE80211_IOC_MESH_AP:
 		ireq->i_val = (ms->ms_flags & IEEE80211_MESHFLAGS_AP) != 0;
 		break;
 	case IEEE80211_IOC_MESH_FWRD:
 		ireq->i_val = (ms->ms_flags & IEEE80211_MESHFLAGS_FWD) != 0;
 		break;
 	case IEEE80211_IOC_MESH_GATE:
 		ireq->i_val = (ms->ms_flags & IEEE80211_MESHFLAGS_GATE) != 0;
 		break;
 	case IEEE80211_IOC_MESH_TTL:
 		ireq->i_val = ms->ms_ttl;
 		break;
 	case IEEE80211_IOC_MESH_RTCMD:
 		switch (ireq->i_val) {
 		case IEEE80211_MESH_RTCMD_LIST:
 			len = 0;
 			MESH_RT_LOCK(ms);
 			TAILQ_FOREACH(rt, &ms->ms_routes, rt_next) {
 				len += sizeof(*imr);
 			}
 			MESH_RT_UNLOCK(ms);
 			if (len > ireq->i_len || ireq->i_len < sizeof(*imr)) {
 				ireq->i_len = len;
 				return ENOMEM;
 			}
 			ireq->i_len = len;
 			/* XXX M_WAIT? */
 			p = IEEE80211_MALLOC(len, M_TEMP,
 			    IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
 			if (p == NULL)
 				return ENOMEM;
 			off = 0;
 			MESH_RT_LOCK(ms);
 			TAILQ_FOREACH(rt, &ms->ms_routes, rt_next) {
 				if (off >= len)
 					break;
 				imr = (struct ieee80211req_mesh_route *)
 				    (p + off);
 				IEEE80211_ADDR_COPY(imr->imr_dest,
 				    rt->rt_dest);
 				IEEE80211_ADDR_COPY(imr->imr_nexthop,
 				    rt->rt_nexthop);
 				imr->imr_metric = rt->rt_metric;
 				imr->imr_nhops = rt->rt_nhops;
 				imr->imr_lifetime =
 				    ieee80211_mesh_rt_update(rt, 0);
 				imr->imr_lastmseq = rt->rt_lastmseq;
 				imr->imr_flags = rt->rt_flags; /* last */
 				off += sizeof(*imr);
 			}
 			MESH_RT_UNLOCK(ms);
 			error = copyout(p, (uint8_t *)ireq->i_data,
 			    ireq->i_len);
 			IEEE80211_FREE(p, M_TEMP);
 			break;
 		case IEEE80211_MESH_RTCMD_FLUSH:
 		case IEEE80211_MESH_RTCMD_ADD:
 		case IEEE80211_MESH_RTCMD_DELETE:
 			return EINVAL;
 		default:
 			return ENOSYS;
 		}
 		break;
 	case IEEE80211_IOC_MESH_PR_METRIC:
 		len = strlen(ms->ms_pmetric->mpm_descr);
 		if (ireq->i_len < len)
 			return EINVAL;
 		ireq->i_len = len;
 		error = copyout(ms->ms_pmetric->mpm_descr,
 		    (uint8_t *)ireq->i_data, len);
 		break;
 	case IEEE80211_IOC_MESH_PR_PATH:
 		len = strlen(ms->ms_ppath->mpp_descr);
 		if (ireq->i_len < len)
 			return EINVAL;
 		ireq->i_len = len;
 		error = copyout(ms->ms_ppath->mpp_descr,
 		    (uint8_t *)ireq->i_data, len);
 		break;
 	default:
 		return ENOSYS;
 	}
 
 	return error;
 }
 IEEE80211_IOCTL_GET(mesh, mesh_ioctl_get80211);
 
 static int
 mesh_ioctl_set80211(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	uint8_t tmpmeshid[IEEE80211_NWID_LEN];
 	uint8_t tmpaddr[IEEE80211_ADDR_LEN];
 	char tmpproto[IEEE80211_MESH_PROTO_DSZ];
 	int error;
 
 	if (vap->iv_opmode != IEEE80211_M_MBSS)
 		return ENOSYS;
 
 	error = 0;
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_MESH_ID:
 		if (ireq->i_val != 0 || ireq->i_len > IEEE80211_MESHID_LEN)
 			return EINVAL;
 		error = copyin(ireq->i_data, tmpmeshid, ireq->i_len);
 		if (error != 0)
 			break;
 		memset(ms->ms_id, 0, IEEE80211_NWID_LEN);
 		ms->ms_idlen = ireq->i_len;
 		memcpy(ms->ms_id, tmpmeshid, ireq->i_len);
 		error = ENETRESET;
 		break;
 	case IEEE80211_IOC_MESH_AP:
 		if (ireq->i_val)
 			ms->ms_flags |= IEEE80211_MESHFLAGS_AP;
 		else
 			ms->ms_flags &= ~IEEE80211_MESHFLAGS_AP;
 		error = ENETRESET;
 		break;
 	case IEEE80211_IOC_MESH_FWRD:
 		if (ireq->i_val)
 			ms->ms_flags |= IEEE80211_MESHFLAGS_FWD;
 		else
 			ms->ms_flags &= ~IEEE80211_MESHFLAGS_FWD;
 		mesh_gatemode_setup(vap);
 		break;
 	case IEEE80211_IOC_MESH_GATE:
 		if (ireq->i_val)
 			ms->ms_flags |= IEEE80211_MESHFLAGS_GATE;
 		else
 			ms->ms_flags &= ~IEEE80211_MESHFLAGS_GATE;
 		break;
 	case IEEE80211_IOC_MESH_TTL:
 		ms->ms_ttl = (uint8_t) ireq->i_val;
 		break;
 	case IEEE80211_IOC_MESH_RTCMD:
 		switch (ireq->i_val) {
 		case IEEE80211_MESH_RTCMD_LIST:
 			return EINVAL;
 		case IEEE80211_MESH_RTCMD_FLUSH:
 			ieee80211_mesh_rt_flush(vap);
 			break;
 		case IEEE80211_MESH_RTCMD_ADD:
 			if (IEEE80211_ADDR_EQ(vap->iv_myaddr, ireq->i_data) ||
 			    IEEE80211_ADDR_EQ(broadcastaddr, ireq->i_data))
 				return EINVAL;
 			error = copyin(ireq->i_data, &tmpaddr,
 			    IEEE80211_ADDR_LEN);
 			if (error == 0)
 				ieee80211_mesh_discover(vap, tmpaddr, NULL);
 			break;
 		case IEEE80211_MESH_RTCMD_DELETE:
 			ieee80211_mesh_rt_del(vap, ireq->i_data);
 			break;
 		default:
 			return ENOSYS;
 		}
 		break;
 	case IEEE80211_IOC_MESH_PR_METRIC:
 		error = copyin(ireq->i_data, tmpproto, sizeof(tmpproto));
 		if (error == 0) {
 			error = mesh_select_proto_metric(vap, tmpproto);
 			if (error == 0)
 				error = ENETRESET;
 		}
 		break;
 	case IEEE80211_IOC_MESH_PR_PATH:
 		error = copyin(ireq->i_data, tmpproto, sizeof(tmpproto));
 		if (error == 0) {
 			error = mesh_select_proto_path(vap, tmpproto);
 			if (error == 0)
 				error = ENETRESET;
 		}
 		break;
 	default:
 		return ENOSYS;
 	}
 	return error;
 }
 IEEE80211_IOCTL_SET(mesh, mesh_ioctl_set80211);
Index: projects/clang500-import/sys/net80211/ieee80211_sta.c
===================================================================
--- projects/clang500-import/sys/net80211/ieee80211_sta.c	(revision 318657)
+++ projects/clang500-import/sys/net80211/ieee80211_sta.c	(revision 318658)
@@ -1,1997 +1,1997 @@
 /*-
  * 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.
  */
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD$");
 #endif
 
 /*
  * IEEE 802.11 Station mode support.
  */
 #include "opt_inet.h"
 #include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/if_dl.h>
 #include <net/if_var.h>
 #include <net/ethernet.h>
 
 #include <net/bpf.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_sta.h>
 #include <net80211/ieee80211_input.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
 #include <net80211/ieee80211_superg.h>
 #endif
 #include <net80211/ieee80211_ratectl.h>
 #include <net80211/ieee80211_sta.h>
 #include <net80211/ieee80211_vht.h>
 
 #define	IEEE80211_RATE2MBS(r)	(((r) & IEEE80211_RATE_VAL) / 2)
 
 static	void sta_vattach(struct ieee80211vap *);
 static	void sta_beacon_miss(struct ieee80211vap *);
 static	int sta_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static	int sta_input(struct ieee80211_node *, struct mbuf *,
 	    const struct ieee80211_rx_stats *, int, int);
 static void sta_recv_mgmt(struct ieee80211_node *, struct mbuf *,
 	    int subtype, const struct ieee80211_rx_stats *, int rssi, int nf);
 static void sta_recv_ctl(struct ieee80211_node *, struct mbuf *, int subtype);
 
 void
 ieee80211_sta_attach(struct ieee80211com *ic)
 {
 	ic->ic_vattach[IEEE80211_M_STA] = sta_vattach;
 }
 
 void
 ieee80211_sta_detach(struct ieee80211com *ic)
 {
 }
 
 static void
 sta_vdetach(struct ieee80211vap *vap)
 {
 }
 
 static void
 sta_vattach(struct ieee80211vap *vap)
 {
 	vap->iv_newstate = sta_newstate;
 	vap->iv_input = sta_input;
 	vap->iv_recv_mgmt = sta_recv_mgmt;
 	vap->iv_recv_ctl = sta_recv_ctl;
 	vap->iv_opdetach = sta_vdetach;
 	vap->iv_bmiss = sta_beacon_miss;
 }
 
 /*
  * Handle a beacon miss event.  The common code filters out
  * spurious events that can happen when scanning and/or before
  * reaching RUN state.
  */
 static void
 sta_beacon_miss(struct ieee80211vap *vap)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	KASSERT((ic->ic_flags & IEEE80211_F_SCAN) == 0, ("scanning"));
 	KASSERT(vap->iv_state >= IEEE80211_S_RUN,
 	    ("wrong state %s", ieee80211_state_name[vap->iv_state]));
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG,
 	    "beacon miss, mode %s state %s\n",
 	    ieee80211_opmode_name[vap->iv_opmode],
 	    ieee80211_state_name[vap->iv_state]);
 
 	if (vap->iv_state == IEEE80211_S_CSA) {
 		/*
 		 * A Channel Switch is pending; assume we missed the
 		 * beacon that would've completed the process and just
 		 * force the switch.  If we made a mistake we'll not
 		 * find the AP on the new channel and fall back to a
 		 * normal scan.
 		 */
 		ieee80211_csa_completeswitch(ic);
 		return;
 	}
 	if (++vap->iv_bmiss_count < vap->iv_bmiss_max) {
 		/*
 		 * Send a directed probe req before falling back to a
 		 * scan; if we receive a response ic_bmiss_count will
 		 * be reset.  Some cards mistakenly report beacon miss
 		 * so this avoids the expensive scan if the ap is
 		 * still there.
 		 */
 		ieee80211_send_probereq(vap->iv_bss, vap->iv_myaddr,
 			vap->iv_bss->ni_bssid, vap->iv_bss->ni_bssid,
 			vap->iv_bss->ni_essid, vap->iv_bss->ni_esslen);
 		return;
 	}
 
 	callout_stop(&vap->iv_swbmiss);
 	vap->iv_bmiss_count = 0;
 	vap->iv_stats.is_beacon_miss++;
 	if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) {
 #ifdef IEEE80211_SUPPORT_SUPERG
 
 		/*
 		 * If we receive a beacon miss interrupt when using
 		 * dynamic turbo, attempt to switch modes before
 		 * reassociating.
 		 */
 		if (IEEE80211_ATH_CAP(vap, vap->iv_bss, IEEE80211_NODE_TURBOP))
 			ieee80211_dturbo_switch(vap,
 			    ic->ic_bsschan->ic_flags ^ IEEE80211_CHAN_TURBO);
 #endif
 		/*
 		 * Try to reassociate before scanning for a new ap.
 		 */
 		ieee80211_new_state(vap, IEEE80211_S_ASSOC, 1);
 	} else {
 		/*
 		 * Somebody else is controlling state changes (e.g.
 		 * a user-mode app) don't do anything that would
 		 * confuse them; just drop into scan mode so they'll
 		 * notified of the state change and given control.
 		 */
 		ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
 	}
 }
 
 /*
  * Handle deauth with reason.  We retry only for
  * the cases where we might succeed.  Otherwise
  * we downgrade the ap and scan.
  */
 static void
 sta_authretry(struct ieee80211vap *vap, struct ieee80211_node *ni, int reason)
 {
 	switch (reason) {
 	case IEEE80211_STATUS_SUCCESS:		/* NB: MLME assoc */
 	case IEEE80211_STATUS_TIMEOUT:
 	case IEEE80211_REASON_ASSOC_EXPIRE:
 	case IEEE80211_REASON_NOT_AUTHED:
 	case IEEE80211_REASON_NOT_ASSOCED:
 	case IEEE80211_REASON_ASSOC_LEAVE:
 	case IEEE80211_REASON_ASSOC_NOT_AUTHED:
 		IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, 1);
 		break;
 	default:
 		ieee80211_scan_assoc_fail(vap, vap->iv_bss->ni_macaddr, reason);
 		if (vap->iv_roaming == IEEE80211_ROAMING_AUTO)
 			ieee80211_check_scan_current(vap);
 		break;
 	}
 }
 
 static void
 sta_swbmiss_start(struct ieee80211vap *vap)
 {
 
 	if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) {
 		/*
 		 * Start s/w beacon miss timer for devices w/o
 		 * hardware support.  We fudge a bit here since
 		 * we're doing this in software.
 		 */
 		vap->iv_swbmiss_period = IEEE80211_TU_TO_TICKS(
 		    2 * vap->iv_bmissthreshold * vap->iv_bss->ni_intval);
 		vap->iv_swbmiss_count = 0;
 		callout_reset(&vap->iv_swbmiss, vap->iv_swbmiss_period,
 		    ieee80211_swbmiss, vap);
 	}
 }
 
 /*
  * IEEE80211_M_STA vap state machine handler.
  * This routine handles the main states in the 802.11 protocol.
  */
 static int
 sta_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_node *ni;
 	enum ieee80211_state ostate;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	ostate = vap->iv_state;
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
 	    __func__, ieee80211_state_name[ostate],
 	    ieee80211_state_name[nstate], arg);
 	vap->iv_state = nstate;			/* state transition */
 	callout_stop(&vap->iv_mgtsend);		/* XXX callout_drain */
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
 	ni = vap->iv_bss;			/* NB: no reference held */
 	if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS)
 		callout_stop(&vap->iv_swbmiss);
 	switch (nstate) {
 	case IEEE80211_S_INIT:
 		switch (ostate) {
 		case IEEE80211_S_SLEEP:
 			/* XXX wakeup */
 			/* XXX driver hook to wakeup the hardware? */
 		case IEEE80211_S_RUN:
 			IEEE80211_SEND_MGMT(ni,
 			    IEEE80211_FC0_SUBTYPE_DISASSOC,
 			    IEEE80211_REASON_ASSOC_LEAVE);
 			ieee80211_sta_leave(ni);
 			break;
 		case IEEE80211_S_ASSOC:
 			IEEE80211_SEND_MGMT(ni,
 			    IEEE80211_FC0_SUBTYPE_DEAUTH,
 			    IEEE80211_REASON_AUTH_LEAVE);
 			break;
 		case IEEE80211_S_SCAN:
 			ieee80211_cancel_scan(vap);
 			break;
 		default:
 			break;
 		}
 		if (ostate != IEEE80211_S_INIT) {
 			/* NB: optimize INIT -> INIT case */
 			ieee80211_reset_bss(vap);
 		}
 		if (vap->iv_auth->ia_detach != NULL)
 			vap->iv_auth->ia_detach(vap);
 		break;
 	case IEEE80211_S_SCAN:
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 			/*
 			 * Initiate a scan.  We can come here as a result
 			 * of an IEEE80211_IOC_SCAN_REQ too in which case
 			 * the vap will be marked with IEEE80211_FEXT_SCANREQ
 			 * and the scan request parameters will be present
 			 * in iv_scanreq.  Otherwise we do the default.
 			 */
 			if (vap->iv_flags_ext & IEEE80211_FEXT_SCANREQ) {
 				ieee80211_check_scan(vap,
 				    vap->iv_scanreq_flags,
 				    vap->iv_scanreq_duration,
 				    vap->iv_scanreq_mindwell,
 				    vap->iv_scanreq_maxdwell,
 				    vap->iv_scanreq_nssid, vap->iv_scanreq_ssid);
 				vap->iv_flags_ext &= ~IEEE80211_FEXT_SCANREQ;
 			} else
 				ieee80211_check_scan_current(vap);
 			break;
 		case IEEE80211_S_SCAN:
 		case IEEE80211_S_AUTH:
 		case IEEE80211_S_ASSOC:
 			/*
 			 * These can happen either because of a timeout
 			 * on an assoc/auth response or because of a
 			 * change in state that requires a reset.  For
 			 * the former we're called with a non-zero arg
 			 * that is the cause for the failure; pass this
 			 * to the scan code so it can update state.
 			 * Otherwise trigger a new scan unless we're in
 			 * manual roaming mode in which case an application
 			 * must issue an explicit scan request.
 			 */
 			if (arg != 0)
 				ieee80211_scan_assoc_fail(vap,
 					vap->iv_bss->ni_macaddr, arg);
 			if (vap->iv_roaming == IEEE80211_ROAMING_AUTO)
 				ieee80211_check_scan_current(vap);
 			break;
 		case IEEE80211_S_SLEEP:		/* beacon miss */
 			/*
 			 * XXX if in sleep we need to wakeup the hardware.
 			 */
 			/* FALLTHROUGH */
 		case IEEE80211_S_RUN:		/* beacon miss */
 			/*
 			 * Beacon miss.  Notify user space and if not
 			 * under control of a user application (roaming
 			 * manual) kick off a scan to re-connect.
 			 */
 
 			ieee80211_sta_leave(ni);
 			if (vap->iv_roaming == IEEE80211_ROAMING_AUTO)
 				ieee80211_check_scan_current(vap);
 			break;
 		default:
 			goto invalid;
 		}
 		break;
 	case IEEE80211_S_AUTH:
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 		case IEEE80211_S_SCAN:
 			IEEE80211_SEND_MGMT(ni,
 			    IEEE80211_FC0_SUBTYPE_AUTH, 1);
 			break;
 		case IEEE80211_S_AUTH:
 		case IEEE80211_S_ASSOC:
 			switch (arg & 0xff) {
 			case IEEE80211_FC0_SUBTYPE_AUTH:
 				/* ??? */
 				IEEE80211_SEND_MGMT(ni,
 				    IEEE80211_FC0_SUBTYPE_AUTH, 2);
 				break;
 			case IEEE80211_FC0_SUBTYPE_DEAUTH:
 				sta_authretry(vap, ni, arg>>8);
 				break;
 			}
 			break;
 		case IEEE80211_S_SLEEP:
 		case IEEE80211_S_RUN:
 			switch (arg & 0xff) {
 			case IEEE80211_FC0_SUBTYPE_AUTH:
 				IEEE80211_SEND_MGMT(ni,
 				    IEEE80211_FC0_SUBTYPE_AUTH, 2);
 				vap->iv_state = IEEE80211_S_RUN; /* stay RUN */
 				break;
 			case IEEE80211_FC0_SUBTYPE_DEAUTH:
 				ieee80211_sta_leave(ni);
 				if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) {
 					/* try to reauth */
 					IEEE80211_SEND_MGMT(ni,
 					    IEEE80211_FC0_SUBTYPE_AUTH, 1);
 				}
 				break;
 			}
 			break;
 		default:
 			goto invalid;
 		}
 		break;
 	case IEEE80211_S_ASSOC:
 		switch (ostate) {
 		case IEEE80211_S_AUTH:
 		case IEEE80211_S_ASSOC:
 			IEEE80211_SEND_MGMT(ni,
 			    IEEE80211_FC0_SUBTYPE_ASSOC_REQ, 0);
 			break;
 		case IEEE80211_S_SLEEP:		/* cannot happen */
 		case IEEE80211_S_RUN:
 			ieee80211_sta_leave(ni);
 			if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) {
 				IEEE80211_SEND_MGMT(ni, arg ?
 				    IEEE80211_FC0_SUBTYPE_REASSOC_REQ :
 				    IEEE80211_FC0_SUBTYPE_ASSOC_REQ, 0);
 			}
 			break;
 		default:
 			goto invalid;
 		}
 		break;
 	case IEEE80211_S_RUN:
 		if (vap->iv_flags & IEEE80211_F_WPA) {
 			/* XXX validate prerequisites */
 		}
 		switch (ostate) {
 		case IEEE80211_S_RUN:
 		case IEEE80211_S_CSA:
 			break;
 		case IEEE80211_S_AUTH:		/* when join is done in fw */
 		case IEEE80211_S_ASSOC:
 #ifdef IEEE80211_DEBUG
 			if (ieee80211_msg_debug(vap)) {
 				ieee80211_note(vap, "%s with %s ssid ",
 				    (vap->iv_opmode == IEEE80211_M_STA ?
 				    "associated" : "synchronized"),
 				    ether_sprintf(ni->ni_bssid));
 				ieee80211_print_essid(vap->iv_bss->ni_essid,
 				    ni->ni_esslen);
 				/* XXX MCS/HT */
 				printf(" channel %d start %uMb\n",
 				    ieee80211_chan2ieee(ic, ic->ic_curchan),
 				    IEEE80211_RATE2MBS(ni->ni_txrate));
 			}
 #endif
 			ieee80211_scan_assoc_success(vap, ni->ni_macaddr);
 			ieee80211_notify_node_join(ni, 
 			    arg == IEEE80211_FC0_SUBTYPE_ASSOC_RESP);
 			break;
 		case IEEE80211_S_SLEEP:
 			/* Wake up from sleep */
 			vap->iv_sta_ps(vap, 0);
 			break;
 		default:
 			goto invalid;
 		}
 		ieee80211_sync_curchan(ic);
 		if (ostate != IEEE80211_S_RUN)
 			sta_swbmiss_start(vap);
 		/*
 		 * 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)
 			ieee80211_node_authorize(ni);
 		/*
 		 * Fake association when joining an existing bss.
 		 *
 		 * Don't do this if we're doing SLEEP->RUN.
 		 */
 		if (ic->ic_newassoc != NULL && ostate != IEEE80211_S_SLEEP)
 			ic->ic_newassoc(vap->iv_bss, (ostate != IEEE80211_S_RUN));
 		break;
 	case IEEE80211_S_CSA:
 		if (ostate != IEEE80211_S_RUN)
 			goto invalid;
 		break;
 	case IEEE80211_S_SLEEP:
 		sta_swbmiss_start(vap);
 		vap->iv_sta_ps(vap, 1);
 		break;
 	default:
 	invalid:
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE,
 		    "%s: unexpected state transition %s -> %s\n", __func__,
 		    ieee80211_state_name[ostate], ieee80211_state_name[nstate]);
 		break;
 	}
 	return 0;
 }
 
 /*
  * Return non-zero if the frame is an echo of a multicast
  * frame sent by ourself.  The dir is known to be DSTODS.
  */
 static __inline int
 isdstods_mcastecho(struct ieee80211vap *vap, const struct ieee80211_frame *wh)
 {
 #define	QWH4(wh)	((const struct ieee80211_qosframe_addr4 *)wh)
 #define	WH4(wh)		((const struct ieee80211_frame_addr4 *)wh)
 	const uint8_t *sa;
 
 	KASSERT(vap->iv_opmode == IEEE80211_M_STA, ("wrong mode"));
 
 	if (!IEEE80211_IS_MULTICAST(wh->i_addr3))
 		return 0;
 	sa = IEEE80211_QOS_HAS_SEQ(wh) ? QWH4(wh)->i_addr4 : WH4(wh)->i_addr4;
 	return IEEE80211_ADDR_EQ(sa, vap->iv_myaddr);
 #undef WH4
 #undef QWH4
 }
 
 /*
  * Return non-zero if the frame is an echo of a multicast
  * frame sent by ourself.  The dir is known to be FROMDS.
  */
 static __inline int
 isfromds_mcastecho(struct ieee80211vap *vap, const struct ieee80211_frame *wh)
 {
 	KASSERT(vap->iv_opmode == IEEE80211_M_STA, ("wrong mode"));
 
 	if (!IEEE80211_IS_MULTICAST(wh->i_addr1))
 		return 0;
 	return IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_myaddr);
 }
 
 /*
  * Decide if a received management frame should be
  * printed when debugging is enabled.  This filters some
  * of the less interesting frames that come frequently
  * (e.g. beacons).
  */
 static __inline int
 doprint(struct ieee80211vap *vap, int subtype)
 {
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_BEACON:
 		return (vap->iv_ic->ic_flags & IEEE80211_F_SCAN);
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 		return 0;
 	}
 	return 1;
 }
 
 /*
  * Process a received frame.  The node associated with the sender
  * should be supplied.  If nothing was found in the node table then
  * the caller is assumed to supply a reference to iv_bss instead.
  * The RSSI and a timestamp are also supplied.  The RSSI data is used
  * during AP scanning to select a AP to associate with; it can have
  * any units so long as values have consistent units and higher values
  * mean ``better signal''.  The receive timestamp is currently not used
  * by the 802.11 layer.
  */
 static int
 sta_input(struct ieee80211_node *ni, struct mbuf *m,
     const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ifnet *ifp = vap->iv_ifp;
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
 	int hdrspace, need_tap = 1;	/* mbuf need to be tapped. */
 	uint8_t dir, type, subtype, qos;
 	uint8_t *bssid;
 	int is_hw_decrypted = 0;
 	int has_decrypted = 0;
 
 	/*
 	 * Some devices do hardware decryption all the way through
 	 * to pretending the frame wasn't encrypted in the first place.
 	 * So, tag it appropriately so it isn't discarded inappropriately.
 	 */
 	if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_DECRYPTED))
 		is_hw_decrypted = 1;
 
 	if (m->m_flags & M_AMPDU_MPDU) {
 		/*
 		 * Fastpath for A-MPDU reorder q resubmission.  Frames
 		 * w/ M_AMPDU_MPDU marked have already passed through
 		 * here but were received out of order and been held on
 		 * the reorder queue.  When resubmitted they are marked
 		 * with the M_AMPDU_MPDU flag and we can bypass most of
 		 * the normal processing.
 		 */
 		wh = mtod(m, struct ieee80211_frame *);
 		type = IEEE80211_FC0_TYPE_DATA;
 		dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 		subtype = IEEE80211_FC0_SUBTYPE_QOS;
 		hdrspace = ieee80211_hdrspace(ic, wh);	/* XXX optimize? */
 		goto resubmit_ampdu;
 	}
 
 	KASSERT(ni != NULL, ("null node"));
 	ni->ni_inact = ni->ni_inact_reload;
 
 	type = -1;			/* undefined */
 
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL,
 		    "too short (1): len %u", m->m_pkthdr.len);
 		vap->iv_stats.is_rx_tooshort++;
 		goto out;
 	}
 	/*
 	 * Bit of a cheat here, we use a pointer for a 3-address
 	 * frame format but don't reference fields past outside
 	 * ieee80211_frame_min w/o first validating the data is
 	 * present.
 	 */
 	wh = mtod(m, struct ieee80211_frame *);
 
 	if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) !=
 	    IEEE80211_FC0_VERSION_0) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL, "wrong version, fc %02x:%02x",
 		    wh->i_fc[0], wh->i_fc[1]);
 		vap->iv_stats.is_rx_badversion++;
 		goto err;
 	}
 
 	dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 	if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) {
 		bssid = wh->i_addr2;
 		if (!IEEE80211_ADDR_EQ(bssid, ni->ni_bssid)) {
 			/* not interested in */
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    bssid, NULL, "%s", "not to bss");
 			vap->iv_stats.is_rx_wrongbss++;
 			goto out;
 		}
 
 		/*
 		 * Some devices may be in a promiscuous mode
 		 * where they receive frames for multiple station
 		 * addresses.
 		 *
 		 * If we receive a data frame that isn't
 		 * destined to our VAP MAC, drop it.
 		 *
 		 * XXX TODO: This is only enforced when not scanning;
 		 * XXX it assumes a software-driven scan will put the NIC
 		 * XXX into a "no data frames" mode before setting this
 		 * XXX flag. Otherwise it may be possible that we'll still
 		 * XXX process data frames whilst scanning.
 		 */
 		if ((! IEEE80211_IS_MULTICAST(wh->i_addr1))
 		    && (! IEEE80211_ADDR_EQ(wh->i_addr1, IF_LLADDR(ifp)))) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    bssid, NULL, "not to cur sta: lladdr=%6D, addr1=%6D",
 			    IF_LLADDR(ifp), ":", wh->i_addr1, ":");
 			vap->iv_stats.is_rx_wrongbss++;
 			goto out;
 		}
 
 		IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
 		ni->ni_noise = nf;
 		if ( IEEE80211_HAS_SEQ(type, subtype) &&
 		    !IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			uint8_t tid = ieee80211_gettid(wh);
 			if (IEEE80211_QOS_HAS_SEQ(wh) &&
 			    TID_TO_WME_AC(tid) >= WME_AC_VI)
 				ic->ic_wme.wme_hipri_traffic++;
-			if (! ieee80211_check_rxseq(ni, wh, bssid))
+			if (! ieee80211_check_rxseq(ni, wh, bssid, rxs))
 				goto out;
 		}
 	}
 
 	switch (type) {
 	case IEEE80211_FC0_TYPE_DATA:
 		hdrspace = ieee80211_hdrspace(ic, wh);
 		if (m->m_len < hdrspace &&
 		    (m = m_pullup(m, hdrspace)) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, NULL,
 			    "data too short: expecting %u", hdrspace);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
 		/*
 		 * Handle A-MPDU re-ordering.  If the frame is to be
 		 * processed directly then ieee80211_ampdu_reorder
 		 * will return 0; otherwise it has consumed the mbuf
 		 * and we should do nothing more with it.
 		 */
 		if ((m->m_flags & M_AMPDU) &&
 		    (dir == IEEE80211_FC1_DIR_FROMDS ||
 		     dir == IEEE80211_FC1_DIR_DSTODS) &&
-		    ieee80211_ampdu_reorder(ni, m) != 0) {
+		    ieee80211_ampdu_reorder(ni, m, rxs) != 0) {
 			m = NULL;
 			goto out;
 		}
 	resubmit_ampdu:
 		if (dir == IEEE80211_FC1_DIR_FROMDS) {
 			if ((ifp->if_flags & IFF_SIMPLEX) &&
 			    isfromds_mcastecho(vap, wh)) {
 				/*
 				 * In IEEE802.11 network, multicast
 				 * packets sent from "me" are broadcast
 				 * from the AP; silently discard for
 				 * SIMPLEX interface.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, "data", "%s", "multicast echo");
 				vap->iv_stats.is_rx_mcastecho++;
 				goto out;
 			}
 			if ((vap->iv_flags & IEEE80211_F_DWDS) &&
 			    IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 				/*
 				 * DWDS sta's must drop 3-address mcast frames
 				 * as they will be sent separately as a 4-addr
 				 * frame.  Accepting the 3-addr frame will
 				 * confuse the bridge into thinking the sending
 				 * sta is located at the end of WDS link.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh,
 				    "3-address data", "%s", "DWDS enabled");
 				vap->iv_stats.is_rx_mcastecho++;
 				goto out;
 			}
 		} else if (dir == IEEE80211_FC1_DIR_DSTODS) {
 			if ((vap->iv_flags & IEEE80211_F_DWDS) == 0) {
 				IEEE80211_DISCARD(vap,
 				    IEEE80211_MSG_INPUT, wh, "4-address data",
 				    "%s", "DWDS not enabled");
 				vap->iv_stats.is_rx_wrongdir++;
 				goto out;
 			}
 			if ((ifp->if_flags & IFF_SIMPLEX) &&
 			    isdstods_mcastecho(vap, wh)) {
 				/*
 				 * In IEEE802.11 network, multicast
 				 * packets sent from "me" are broadcast
 				 * from the AP; silently discard for
 				 * SIMPLEX interface.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh,
 				    "4-address data", "%s", "multicast echo");
 				vap->iv_stats.is_rx_mcastecho++;
 				goto out;
 			}
 		} else {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh,
 			    "data", "incorrect dir 0x%x", dir);
 			vap->iv_stats.is_rx_wrongdir++;
 			goto out;
 		}
 
 		/*
 		 * Handle privacy requirements for hardware decryption
 		 * devices.
 		 *
 		 * For those devices, a handful of things happen.
 		 *
 		 * + If IV has been stripped, then we can't run
 		 *   ieee80211_crypto_decap() - none of the key
 		 * + If MIC has been stripped, we can't validate
 		 *   MIC here.
 		 * + If MIC fails, then we need to communicate a
 		 *   MIC failure up to the stack - but we don't know
 		 *   which key was used.
 		 */
 
 		/*
 		 * Handle privacy requirements.  Note that we
 		 * must not be preempted from here until after
 		 * we (potentially) call ieee80211_crypto_demic;
 		 * otherwise we may violate assumptions in the
 		 * crypto cipher modules used to do delayed update
 		 * of replay sequence numbers.
 		 */
 		if (is_hw_decrypted || wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, "WEP", "%s", "PRIVACY off");
 				vap->iv_stats.is_rx_noprivacy++;
 				IEEE80211_NODE_STAT(ni, rx_noprivacy);
 				goto out;
 			}
 			if (ieee80211_crypto_decap(ni, m, hdrspace, &key) == 0) {
 				/* NB: stats+msgs handled in crypto_decap */
 				IEEE80211_NODE_STAT(ni, rx_wepfail);
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
 			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 			has_decrypted = 1;
 		} else {
 			/* XXX M_WEP and IEEE80211_F_PRIVACY */
 			key = NULL;
 		}
 
 		/*
 		 * Save QoS bits for use below--before we strip the header.
 		 */
 		if (subtype == IEEE80211_FC0_SUBTYPE_QOS) {
 			qos = (dir == IEEE80211_FC1_DIR_DSTODS) ?
 			    ((struct ieee80211_qosframe_addr4 *)wh)->i_qos[0] :
 			    ((struct ieee80211_qosframe *)wh)->i_qos[0];
 		} else
 			qos = 0;
 
 		/*
 		 * Next up, any fragmentation.
 		 */
 		if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			m = ieee80211_defrag(ni, m, hdrspace);
 			if (m == NULL) {
 				/* Fragment dropped or frame not complete yet */
 				goto out;
 			}
 		}
 		wh = NULL;		/* no longer valid, catch any uses */
 
 		/*
 		 * Next strip any MSDU crypto bits.
 		 *
 		 * Note: we can't do MIC stripping/verification if the
 		 * upper layer has stripped it.  We have to check MIC
 		 * ourselves.  So, key may be NULL, but we have to check
 		 * the RX status.
 		 */
 		if (!ieee80211_crypto_demic(vap, key, m, 0)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "demic error");
 			vap->iv_stats.is_rx_demicfail++;
 			IEEE80211_NODE_STAT(ni, rx_demicfail);
 			goto out;
 		}
 
 		/* copy to listener after decrypt */
 		if (ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		need_tap = 0;
 
 		/*
 		 * Finally, strip the 802.11 header.
 		 */
 		m = ieee80211_decap(vap, m, hdrspace);
 		if (m == NULL) {
 			/* XXX mask bit to check for both */
 			/* don't count Null data frames as errors */
 			if (subtype == IEEE80211_FC0_SUBTYPE_NODATA ||
 			    subtype == IEEE80211_FC0_SUBTYPE_QOS_NULL)
 				goto out;
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "decap error");
 			vap->iv_stats.is_rx_decap++;
 			IEEE80211_NODE_STAT(ni, rx_decap);
 			goto err;
 		}
 		eh = mtod(m, struct ether_header *);
 		if (!ieee80211_node_is_authorized(ni)) {
 			/*
 			 * Deny any non-PAE frames received prior to
 			 * authorization.  For open/shared-key
 			 * authentication the port is mark authorized
 			 * after authentication completes.  For 802.1x
 			 * the port is not marked authorized by the
 			 * authenticator until the handshake has completed.
 			 */
 			if (eh->ether_type != htons(ETHERTYPE_PAE)) {
 				IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 				    eh->ether_shost, "data",
 				    "unauthorized port: ether type 0x%x len %u",
 				    eh->ether_type, m->m_pkthdr.len);
 				vap->iv_stats.is_rx_unauth++;
 				IEEE80211_NODE_STAT(ni, rx_unauth);
 				goto err;
 			}
 		} else {
 			/*
 			 * When denying unencrypted frames, discard
 			 * any non-PAE frames received without encryption.
 			 */
 			if ((vap->iv_flags & IEEE80211_F_DROPUNENC) &&
 			    ((has_decrypted == 0) && (m->m_flags & M_WEP) == 0) &&
 			    (is_hw_decrypted == 0) &&
 			    eh->ether_type != htons(ETHERTYPE_PAE)) {
 				/*
 				 * Drop unencrypted frames.
 				 */
 				vap->iv_stats.is_rx_unencrypted++;
 				IEEE80211_NODE_STAT(ni, rx_unencrypted);
 				goto out;
 			}
 		}
 		/* XXX require HT? */
 		if (qos & IEEE80211_QOS_AMSDU) {
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
 		} else {
 #ifdef IEEE80211_SUPPORT_SUPERG
 			m = ieee80211_decap_fastframe(vap, ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
 #endif
 		}
 		ieee80211_deliver_data(vap, ni, m);
 		return IEEE80211_FC0_TYPE_DATA;
 
 	case IEEE80211_FC0_TYPE_MGT:
 		vap->iv_stats.is_rx_mgmt++;
 		IEEE80211_NODE_STAT(ni, rx_mgmt);
 		if (dir != IEEE80211_FC1_DIR_NODS) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "incorrect dir 0x%x", dir);
 			vap->iv_stats.is_rx_wrongdir++;
 			goto err;
 		}
 		if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, "mgt", "too short: len %u",
 			    m->m_pkthdr.len);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;
 		}
 #ifdef IEEE80211_DEBUG
 		if ((ieee80211_msg_debug(vap) && doprint(vap, subtype)) ||
 		    ieee80211_msg_dumppkts(vap)) {
 			if_printf(ifp, "received %s from %s rssi %d\n",
 			    ieee80211_mgt_subtype_name(subtype),
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
 
 		/*
 		 * Note: See above for hardware offload privacy requirements.
 		 *       It also applies here.
 		 */
 
 		/*
 		 * Again, having encrypted flag set check would be good, but
 		 * then we have to also handle crypto_decap() like above.
 		 */
 		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if (subtype != IEEE80211_FC0_SUBTYPE_AUTH) {
 				/*
 				 * Only shared key auth frames with a challenge
 				 * should be encrypted, discard all others.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, ieee80211_mgt_subtype_name(subtype),
 				    "%s", "WEP set but not permitted");
 				vap->iv_stats.is_rx_mgtdiscard++; /* XXX */
 				goto out;
 			}
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, "mgt", "%s", "WEP set but PRIVACY off");
 				vap->iv_stats.is_rx_noprivacy++;
 				goto out;
 			}
 			hdrspace = ieee80211_hdrspace(ic, wh);
 
 			/*
 			 * Again, if IV/MIC was stripped, then this whole
 			 * setup will fail.  That's going to need some poking.
 			 */
 			if (ieee80211_crypto_decap(ni, m, hdrspace, &key) == 0) {
 				/* NB: stats+msgs handled in crypto_decap */
 				goto out;
 			}
 			has_decrypted = 1;
 			wh = mtod(m, struct ieee80211_frame *);
 			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 		}
 		vap->iv_recv_mgmt(ni, m, subtype, rxs, rssi, nf);
 		goto out;
 
 	case IEEE80211_FC0_TYPE_CTL:
 		vap->iv_stats.is_rx_ctl++;
 		IEEE80211_NODE_STAT(ni, rx_ctrl);
 		vap->iv_recv_ctl(ni, m, subtype);
 		goto out;
 
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, NULL, "bad frame type 0x%x", type);
 		/* should not come here */
 		break;
 	}
 err:
 	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		m_freem(m);
 	}
 	return type;
 }
 
 static void
 sta_auth_open(struct ieee80211_node *ni, struct ieee80211_frame *wh,
     int rssi, int nf, uint16_t seq, uint16_t status)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	if (ni->ni_authmode == IEEE80211_AUTH_SHARED) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 		    ni->ni_macaddr, "open auth",
 		    "bad sta auth mode %u", ni->ni_authmode);
 		vap->iv_stats.is_rx_bad_auth++;	/* XXX */
 		return;
 	}
 	if (vap->iv_state != IEEE80211_S_AUTH ||
 	    seq != IEEE80211_AUTH_OPEN_RESPONSE) {
 		vap->iv_stats.is_rx_bad_auth++;
 		return;
 	}
 	if (status != 0) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH,
 		    ni, "open auth failed (reason %d)", status);
 		vap->iv_stats.is_rx_auth_fail++;
 		vap->iv_stats.is_rx_authfail_code = status;
 		ieee80211_new_state(vap, IEEE80211_S_SCAN,
 		    IEEE80211_SCAN_FAIL_STATUS);
 	} else
 		ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
 }
 
 static void
 sta_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh,
     uint8_t *frm, uint8_t *efrm, int rssi, int nf,
     uint16_t seq, uint16_t status)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	uint8_t *challenge;
 
 	/*
 	 * NB: this can happen as we allow pre-shared key
 	 * authentication to be enabled w/o wep being turned
 	 * on so that configuration of these can be done
 	 * in any order.  It may be better to enforce the
 	 * ordering in which case this check would just be
 	 * for sanity/consistency.
 	 */
 	if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 		    ni->ni_macaddr, "shared key auth",
 		    "%s", " PRIVACY is disabled");
 		goto bad;
 	}
 	/*
 	 * Pre-shared key authentication is evil; accept
 	 * it only if explicitly configured (it is supported
 	 * mainly for compatibility with clients like OS X).
 	 */
 	if (ni->ni_authmode != IEEE80211_AUTH_AUTO &&
 	    ni->ni_authmode != IEEE80211_AUTH_SHARED) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 		    ni->ni_macaddr, "shared key auth",
 		    "bad sta auth mode %u", ni->ni_authmode);
 		vap->iv_stats.is_rx_bad_auth++;	/* XXX maybe a unique error? */
 		goto bad;
 	}
 
 	challenge = NULL;
 	if (frm + 1 < efrm) {
 		if ((frm[1] + 2) > (efrm - frm)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 			    ni->ni_macaddr, "shared key auth",
 			    "ie %d/%d too long",
 			    frm[0], (frm[1] + 2) - (efrm - frm));
 			vap->iv_stats.is_rx_bad_auth++;
 			goto bad;
 		}
 		if (*frm == IEEE80211_ELEMID_CHALLENGE)
 			challenge = frm;
 		frm += frm[1] + 2;
 	}
 	switch (seq) {
 	case IEEE80211_AUTH_SHARED_CHALLENGE:
 	case IEEE80211_AUTH_SHARED_RESPONSE:
 		if (challenge == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 			    ni->ni_macaddr, "shared key auth",
 			    "%s", "no challenge");
 			vap->iv_stats.is_rx_bad_auth++;
 			goto bad;
 		}
 		if (challenge[1] != IEEE80211_CHALLENGE_LEN) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
 			    ni->ni_macaddr, "shared key auth",
 			    "bad challenge len %d", challenge[1]);
 			vap->iv_stats.is_rx_bad_auth++;
 			goto bad;
 		}
 	default:
 		break;
 	}
 	if (vap->iv_state != IEEE80211_S_AUTH)
 		return;
 	switch (seq) {
 	case IEEE80211_AUTH_SHARED_PASS:
 		if (ni->ni_challenge != NULL) {
 			IEEE80211_FREE(ni->ni_challenge, M_80211_NODE);
 			ni->ni_challenge = NULL;
 		}
 		if (status != 0) {
 			IEEE80211_NOTE_FRAME(vap,
 			    IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, wh,
 			    "shared key auth failed (reason %d)", status);
 			vap->iv_stats.is_rx_auth_fail++;
 			vap->iv_stats.is_rx_authfail_code = status;
 			return;
 		}
 		ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
 		break;
 	case IEEE80211_AUTH_SHARED_CHALLENGE:
 		if (!ieee80211_alloc_challenge(ni))
 			return;
 		/* XXX could optimize by passing recvd challenge */
 		memcpy(ni->ni_challenge, &challenge[2], challenge[1]);
 		IEEE80211_SEND_MGMT(ni,
 			IEEE80211_FC0_SUBTYPE_AUTH, seq + 1);
 		break;
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_AUTH,
 		    wh, "shared key auth", "bad seq %d", seq);
 		vap->iv_stats.is_rx_bad_auth++;
 		return;
 	}
 	return;
 bad:
 	/*
 	 * Kick the state machine.  This short-circuits
 	 * using the mgt frame timeout to trigger the
 	 * state transition.
 	 */
 	if (vap->iv_state == IEEE80211_S_AUTH)
 		ieee80211_new_state(vap, IEEE80211_S_SCAN,
 		    IEEE80211_SCAN_FAIL_STATUS);
 }
 
 int
 ieee80211_parse_wmeparams(struct ieee80211vap *vap, uint8_t *frm,
 	const struct ieee80211_frame *wh)
 {
 #define	MS(_v, _f)	(((_v) & _f) >> _f##_S)
 	struct ieee80211_wme_state *wme = &vap->iv_ic->ic_wme;
 	u_int len = frm[1], qosinfo;
 	int i;
 
 	if (len < sizeof(struct ieee80211_wme_param)-2) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME,
 		    wh, "WME", "too short, len %u", len);
 		return -1;
 	}
 	qosinfo = frm[__offsetof(struct ieee80211_wme_param, param_qosInfo)];
 	qosinfo &= WME_QOSINFO_COUNT;
 	/* XXX do proper check for wraparound */
 	if (qosinfo == wme->wme_wmeChanParams.cap_info)
 		return 0;
 	frm += __offsetof(struct ieee80211_wme_param, params_acParams);
 	for (i = 0; i < WME_NUM_AC; i++) {
 		struct wmeParams *wmep =
 			&wme->wme_wmeChanParams.cap_wmeParams[i];
 		/* NB: ACI not used */
 		wmep->wmep_acm = MS(frm[0], WME_PARAM_ACM);
 		wmep->wmep_aifsn = MS(frm[0], WME_PARAM_AIFSN);
 		wmep->wmep_logcwmin = MS(frm[1], WME_PARAM_LOGCWMIN);
 		wmep->wmep_logcwmax = MS(frm[1], WME_PARAM_LOGCWMAX);
 		wmep->wmep_txopLimit = le16dec(frm+2);
 		frm += 4;
 	}
 	wme->wme_wmeChanParams.cap_info = qosinfo;
 	return 1;
 #undef MS
 }
 
 /*
  * Process 11h Channel Switch Announcement (CSA) ie.  If this
  * is the first CSA then initiate the switch.  Otherwise we
  * track state and trigger completion and/or cancel of the switch.
  * XXX should be public for IBSS use
  */
 static void
 ieee80211_parse_csaparams(struct ieee80211vap *vap, uint8_t *frm,
 	const struct ieee80211_frame *wh)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	const struct ieee80211_csa_ie *csa =
 	    (const struct ieee80211_csa_ie *) frm;
 
 	KASSERT(vap->iv_state >= IEEE80211_S_RUN,
 	    ("state %s", ieee80211_state_name[vap->iv_state]));
 
 	if (csa->csa_mode > 1) {
 		IEEE80211_DISCARD_IE(vap,
 		    IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH,
 		    wh, "CSA", "invalid mode %u", csa->csa_mode);
 		return;
 	}
 	IEEE80211_LOCK(ic);
 	if ((ic->ic_flags & IEEE80211_F_CSAPENDING) == 0) {
 		/*
 		 * Convert the channel number to a channel reference.  We
 		 * try first to preserve turbo attribute of the current
 		 * channel then fallback.  Note this will not work if the
 		 * CSA specifies a channel that requires a band switch (e.g.
 		 * 11a => 11g).  This is intentional as 11h is defined only
 		 * for 5GHz/11a and because the switch does not involve a
 		 * reassociation, protocol state (capabilities, negotated
 		 * rates, etc) may/will be wrong.
 		 */
 		struct ieee80211_channel *c =
 		    ieee80211_find_channel_byieee(ic, csa->csa_newchan,
 			(ic->ic_bsschan->ic_flags & IEEE80211_CHAN_ALLTURBO));
 		if (c == NULL) {
 			c = ieee80211_find_channel_byieee(ic,
 			    csa->csa_newchan,
 			    (ic->ic_bsschan->ic_flags & IEEE80211_CHAN_ALL));
 			if (c == NULL) {
 				IEEE80211_DISCARD_IE(vap,
 				    IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH,
 				    wh, "CSA", "invalid channel %u",
 				    csa->csa_newchan);
 				goto done;
 			}
 		}
 #if IEEE80211_CSA_COUNT_MIN > 0
 		if (csa->csa_count < IEEE80211_CSA_COUNT_MIN) {
 			/*
 			 * Require at least IEEE80211_CSA_COUNT_MIN count to
 			 * reduce the risk of being redirected by a fabricated
 			 * CSA.  If a valid CSA is dropped we'll still get a
 			 * beacon miss when the AP leaves the channel so we'll
 			 * eventually follow to the new channel.
 			 *
 			 * NOTE: this violates the 11h spec that states that
 			 * count may be any value and if 0 then a switch
 			 * should happen asap.
 			 */
 			IEEE80211_DISCARD_IE(vap,
 			    IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH,
 			    wh, "CSA", "count %u too small, must be >= %u",
 			    csa->csa_count, IEEE80211_CSA_COUNT_MIN);
 			goto done;
 		}
 #endif
 		ieee80211_csa_startswitch(ic, c, csa->csa_mode, csa->csa_count);
 	} else {
 		/*
 		 * Validate this ie against the initial CSA.  We require
 		 * mode and channel not change and the count must be
 		 * monotonically decreasing.  This may be pointless and
 		 * canceling the switch as a result may be too paranoid but
 		 * in the worst case if we drop out of CSA because of this
 		 * and the AP does move then we'll just end up taking a
 		 * beacon miss and scan to find the AP.
 		 *
 		 * XXX may want <= on count as we also process ProbeResp
 		 * frames and those may come in w/ the same count as the
 		 * previous beacon; but doing so leaves us open to a stuck
 		 * count until we add a dead-man timer
 		 */
 		if (!(csa->csa_count < ic->ic_csa_count &&
 		      csa->csa_mode == ic->ic_csa_mode &&
 		      csa->csa_newchan == ieee80211_chan2ieee(ic, ic->ic_csa_newchan))) {
 			IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_DOTH, wh,
 			    "CSA ie mismatch, initial ie <%d,%d,%d>, "
 			    "this ie <%d,%d,%d>", ic->ic_csa_mode,
 			    ic->ic_csa_newchan, ic->ic_csa_count,
 			    csa->csa_mode, csa->csa_newchan, csa->csa_count);
 			ieee80211_csa_cancelswitch(ic);
 		} else {
 			if (csa->csa_count <= 1)
 				ieee80211_csa_completeswitch(ic);
 			else
 				ic->ic_csa_count = csa->csa_count;
 		}
 	}
 done:
 	IEEE80211_UNLOCK(ic);
 }
 
 /*
  * Return non-zero if a background scan may be continued:
  * o bg scan is active
  * o no channel switch is pending
  * o there has not been any traffic recently
  * o no full-offload scan support (no need for explicitly continuing scan then)
  *
  * Note we do not check if there is an administrative enable;
  * this is only done to start the scan.  We assume that any
  * change in state will be accompanied by a request to cancel
  * active scans which will otherwise cause this test to fail.
  */
 static __inline int
 contbgscan(struct ieee80211vap *vap)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	return ((ic->ic_flags_ext & IEEE80211_FEXT_BGSCAN) &&
 	    (ic->ic_flags & IEEE80211_F_CSAPENDING) == 0 &&
 	    !(vap->iv_flags_ext & IEEE80211_FEXT_SCAN_OFFLOAD) &&
 	    vap->iv_state == IEEE80211_S_RUN &&		/* XXX? */
 	    ieee80211_time_after(ticks, ic->ic_lastdata + vap->iv_bgscanidle));
 }
 
 /*
  * Return non-zero if a backgrond scan may be started:
  * o bg scanning is administratively enabled
  * o no channel switch is pending
  * o we are not boosted on a dynamic turbo channel
  * o there has not been a scan recently
  * o there has not been any traffic recently (don't check if full-offload scan)
  */
 static __inline int
 startbgscan(struct ieee80211vap *vap)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 
 	return ((vap->iv_flags & IEEE80211_F_BGSCAN) &&
 	    (ic->ic_flags & IEEE80211_F_CSAPENDING) == 0 &&
 #ifdef IEEE80211_SUPPORT_SUPERG
 	    !IEEE80211_IS_CHAN_DTURBO(ic->ic_curchan) &&
 #endif
 	    ieee80211_time_after(ticks, ic->ic_lastscan + vap->iv_bgscanintvl) &&
 	    ((vap->iv_flags_ext & IEEE80211_FEXT_SCAN_OFFLOAD) ||
 	     ieee80211_time_after(ticks, ic->ic_lastdata + vap->iv_bgscanidle)));
 }
 
 #ifdef	notyet
 /*
  * Compare two quiet IEs and return if they are equivalent.
  *
  * The tbttcount isnt checked - that's not part of the configuration.
  */
 static int
 compare_quiet_ie(const struct ieee80211_quiet_ie *q1,
     const struct ieee80211_quiet_ie *q2)
 {
 
 	if (q1->period != q2->period)
 		return (0);
 	if (le16dec(&q1->duration) != le16dec(&q2->duration))
 		return (0);
 	if (le16dec(&q1->offset) != le16dec(&q2->offset))
 		return (0);
 	return (1);
 }
 #endif
 
 static void
 sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype,
     const struct ieee80211_rx_stats *rxs,
     int rssi, int nf)
 {
 #define	ISREASSOC(_st)	((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP)
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_channel *rxchan = ic->ic_curchan;
 	struct ieee80211_frame *wh;
 	uint8_t *frm, *efrm;
 	uint8_t *rates, *xrates, *wme, *htcap, *htinfo;
 	uint8_t *vhtcap, *vhtopmode;
 	uint8_t rate;
 	int ht_state_change = 0, do_ht = 0;
 
 	wh = mtod(m0, struct ieee80211_frame *);
 	frm = (uint8_t *)&wh[1];
 	efrm = mtod(m0, uint8_t *) + m0->m_len;
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 	case IEEE80211_FC0_SUBTYPE_BEACON: {
 		struct ieee80211_scanparams scan;
 		struct ieee80211_channel *c;
 		/*
 		 * We process beacon/probe response frames:
 		 *    o when scanning, or
 		 *    o station mode when associated (to collect state
 		 *      updates such as 802.11g slot time)
 		 * Frames otherwise received are discarded.
 		 */ 
 		if (!((ic->ic_flags & IEEE80211_F_SCAN) || ni->ni_associd)) {
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 
 		/* Override RX channel as appropriate */
 		if (rxs != NULL) {
 			c = ieee80211_lookup_channel_rxstatus(vap, rxs);
 			if (c != NULL)
 				rxchan = c;
 		}
 
 		/* XXX probe response in sta mode when !scanning? */
 		if (ieee80211_parse_beacon(ni, m0, rxchan, &scan) != 0) {
 			if (! (ic->ic_flags & IEEE80211_F_SCAN))
 				vap->iv_stats.is_beacon_bad++;
 			return;
 		}
 
 		/*
 		 * Count frame now that we know it's to be processed.
 		 */
 		if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) {
 			vap->iv_stats.is_rx_beacon++;		/* XXX remove */
 			IEEE80211_NODE_STAT(ni, rx_beacons);
 		} else
 			IEEE80211_NODE_STAT(ni, rx_proberesp);
 		/*
 		 * When operating in station mode, check for state updates.
 		 * Be careful to ignore beacons received while doing a
 		 * background scan.  We consider only 11g/WMM stuff right now.
 		 */
 		if (ni->ni_associd != 0 &&
 		    ((ic->ic_flags & IEEE80211_F_SCAN) == 0 ||
 		     IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid))) {
 			/* record tsf of last beacon */
 			memcpy(ni->ni_tstamp.data, scan.tstamp,
 				sizeof(ni->ni_tstamp));
 			/* count beacon frame for s/w bmiss handling */
 			vap->iv_swbmiss_count++;
 			vap->iv_bmiss_count = 0;
 			if (ni->ni_erp != scan.erp) {
 				IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC,
 				    wh->i_addr2,
 				    "erp change: was 0x%x, now 0x%x",
 				    ni->ni_erp, scan.erp);
 				if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) &&
 				    (ni->ni_erp & IEEE80211_ERP_USE_PROTECTION))
 					ic->ic_flags |= IEEE80211_F_USEPROT;
 				else
 					ic->ic_flags &= ~IEEE80211_F_USEPROT;
 				ni->ni_erp = scan.erp;
 				/* XXX statistic */
 				/* XXX driver notification */
 			}
 			if ((ni->ni_capinfo ^ scan.capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME) {
 				IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC,
 				    wh->i_addr2,
 				    "capabilities change: was 0x%x, now 0x%x",
 				    ni->ni_capinfo, scan.capinfo);
 				/*
 				 * NB: we assume short preamble doesn't
 				 *     change dynamically
 				 */
 				ieee80211_set_shortslottime(ic,
 					IEEE80211_IS_CHAN_A(ic->ic_bsschan) ||
 					(scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME));
 				ni->ni_capinfo = (ni->ni_capinfo &~ IEEE80211_CAPINFO_SHORT_SLOTTIME)
 					       | (scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME);
 				/* XXX statistic */
 			}
 			if (scan.wme != NULL &&
 			    (ni->ni_flags & IEEE80211_NODE_QOS) &&
 			    ieee80211_parse_wmeparams(vap, scan.wme, wh) > 0)
 				ieee80211_wme_updateparams(vap);
 #ifdef IEEE80211_SUPPORT_SUPERG
 			if (scan.ath != NULL)
 				ieee80211_parse_athparams(ni, scan.ath, wh);
 #endif
 			if (scan.htcap != NULL && scan.htinfo != NULL &&
 			    (vap->iv_flags_ht & IEEE80211_FHT_HT)) {
 				/* XXX state changes? */
 				ieee80211_ht_updateparams(ni,
 				    scan.htcap, scan.htinfo);
 				do_ht = 1;
 			}
 			if (scan.vhtcap != NULL && scan.vhtopmode != NULL &&
 			    (vap->iv_flags_vht & IEEE80211_FVHT_VHT)) {
 				/* XXX state changes? */
 				ieee80211_vht_updateparams(ni,
 				    scan.vhtcap, scan.vhtopmode);
 				do_ht = 1;
 			}
 			if (do_ht) {
 				if (ieee80211_ht_updateparams_final(ni,
 				    scan.htcap, scan.htinfo))
 					ht_state_change = 1;
 			}
 
 			/*
 			 * If we have a quiet time IE then report it up to
 			 * the driver.
 			 *
 			 * Otherwise, inform the driver that the quiet time
 			 * IE has disappeared - only do that once rather than
 			 * spamming it each time.
 			 */
 			if (scan.quiet) {
 				ic->ic_set_quiet(ni, scan.quiet);
 				ni->ni_quiet_ie_set = 1;
 				memcpy(&ni->ni_quiet_ie, scan.quiet,
 				    sizeof(struct ieee80211_quiet_ie));
 			} else {
 				if (ni->ni_quiet_ie_set == 1)
 					ic->ic_set_quiet(ni, NULL);
 				ni->ni_quiet_ie_set = 0;
 				bzero(&ni->ni_quiet_ie,
 				    sizeof(struct ieee80211_quiet_ie));
 			}
 
 			if (scan.tim != NULL) {
 				struct ieee80211_tim_ie *tim =
 				    (struct ieee80211_tim_ie *) scan.tim;
 				/*
 				 * XXX Check/debug this code; see if it's about
 				 * the right time to force the VAP awake if we
 				 * receive a frame destined for us?
 				 */
 				int aid = IEEE80211_AID(ni->ni_associd);
 				int ix = aid / NBBY;
 				int min = tim->tim_bitctl &~ 1;
 				int max = tim->tim_len + min - 4;
 				int tim_ucast = 0, tim_mcast = 0;
 
 				/*
 				 * Only do this for unicast traffic in the TIM
 				 * The multicast traffic notification for
 				 * the scan notification stuff should occur
 				 * differently.
 				 */
 				if (min <= ix && ix <= max &&
 				     isset(tim->tim_bitmap - min, aid)) {
 					tim_ucast = 1;
 				}
 
 				/*
 				 * Do a separate notification
 				 * for the multicast bit being set.
 				 */
 				if (tim->tim_bitctl & 1) {
 					tim_mcast = 1;
 				}
 
 				/*
 				 * If the TIM indicates there's traffic for
 				 * us then get us out of STA mode powersave.
 				 */
 				if (tim_ucast == 1) {
 
 					/*
 					 * Wake us out of SLEEP state if we're
 					 * in it; and if we're doing bgscan
 					 * then wake us out of STA powersave.
 					 */
 					ieee80211_sta_tim_notify(vap, 1);
 
 					/*
 					 * This is preventing us from
 					 * continuing a bgscan; because it
 					 * tricks the contbgscan()
 					 * routine to think there's always
 					 * traffic for us.
 					 *
 					 * I think we need both an RX and
 					 * TX ic_lastdata field.
 					 */
 					ic->ic_lastdata = ticks;
 				}
 
 				ni->ni_dtim_count = tim->tim_count;
 				ni->ni_dtim_period = tim->tim_period;
 			}
 			if (scan.csa != NULL &&
 			    (vap->iv_flags & IEEE80211_F_DOTH))
 				ieee80211_parse_csaparams(vap, scan.csa, wh);
 			else if (ic->ic_flags & IEEE80211_F_CSAPENDING) {
 				/*
 				 * No CSA ie or 11h disabled, but a channel
 				 * switch is pending; drop out so we aren't
 				 * stuck in CSA state.  If the AP really is
 				 * moving we'll get a beacon miss and scan.
 				 */
 				IEEE80211_LOCK(ic);
 				ieee80211_csa_cancelswitch(ic);
 				IEEE80211_UNLOCK(ic);
 			}
 			/*
 			 * If scanning, pass the info to the scan module.
 			 * Otherwise, check if it's the right time to do
 			 * a background scan.  Background scanning must
 			 * be enabled and we must not be operating in the
 			 * turbo phase of dynamic turbo mode.  Then,
 			 * it's been a while since the last background
 			 * scan and if no data frames have come through
 			 * recently, kick off a scan.  Note that this
 			 * is the mechanism by which a background scan
 			 * is started _and_ continued each time we
 			 * return on-channel to receive a beacon from
 			 * our ap.
 			 */
 			if (ic->ic_flags & IEEE80211_F_SCAN) {
 				ieee80211_add_scan(vap, rxchan,
 				    &scan, wh, subtype, rssi, nf);
 			} else if (contbgscan(vap)) {
 				ieee80211_bg_scan(vap, 0);
 			} else if (startbgscan(vap)) {
 				vap->iv_stats.is_scan_bg++;
 #if 0
 				/* wakeup if we are sleeing */
 				ieee80211_set_pwrsave(vap, 0);
 #endif
 				ieee80211_bg_scan(vap, 0);
 			}
 
 			/*
 			 * Put the station to sleep if we haven't seen
 			 * traffic in a while.
 			 */
 			IEEE80211_LOCK(ic);
 			ieee80211_sta_ps_timer_check(vap);
 			IEEE80211_UNLOCK(ic);
 
 			/*
 			 * If we've had a channel width change (eg HT20<->HT40)
 			 * then schedule a delayed driver notification.
 			 */
 			if (ht_state_change)
 				ieee80211_update_chw(ic);
 			return;
 		}
 		/*
 		 * If scanning, just pass information to the scan module.
 		 */
 		if (ic->ic_flags & IEEE80211_F_SCAN) {
 			if (ic->ic_flags_ext & IEEE80211_FEXT_PROBECHAN) {
 				/*
 				 * Actively scanning a channel marked passive;
 				 * send a probe request now that we know there
 				 * is 802.11 traffic present.
 				 *
 				 * XXX check if the beacon we recv'd gives
 				 * us what we need and suppress the probe req
 				 */
 				ieee80211_probe_curchan(vap, 1);
 				ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN;
 			}
 			ieee80211_add_scan(vap, rxchan, &scan, wh,
 			    subtype, rssi, nf);
 			return;
 		}
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_AUTH: {
 		uint16_t algo, seq, status;
 		/*
 		 * auth frame format
 		 *	[2] algorithm
 		 *	[2] sequence
 		 *	[2] status
 		 *	[tlv*] challenge
 		 */
 		IEEE80211_VERIFY_LENGTH(efrm - frm, 6, return);
 		algo   = le16toh(*(uint16_t *)frm);
 		seq    = le16toh(*(uint16_t *)(frm + 2));
 		status = le16toh(*(uint16_t *)(frm + 4));
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr2,
 		    "recv auth frame with algorithm %d seq %d", algo, seq);
 
 		if (vap->iv_flags & IEEE80211_F_COUNTERM) {
 			IEEE80211_DISCARD(vap,
 			    IEEE80211_MSG_AUTH | IEEE80211_MSG_CRYPTO,
 			    wh, "auth", "%s", "TKIP countermeasures enabled");
 			vap->iv_stats.is_rx_auth_countermeasures++;
 			if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
 				ieee80211_send_error(ni, wh->i_addr2,
 					IEEE80211_FC0_SUBTYPE_AUTH,
 					IEEE80211_REASON_MIC_FAILURE);
 			}
 			return;
 		}
 		if (algo == IEEE80211_AUTH_ALG_SHARED)
 			sta_auth_shared(ni, wh, frm + 6, efrm, rssi, nf,
 			    seq, status);
 		else if (algo == IEEE80211_AUTH_ALG_OPEN)
 			sta_auth_open(ni, wh, rssi, nf, seq, status);
 		else {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 			    wh, "auth", "unsupported alg %d", algo);
 			vap->iv_stats.is_rx_auth_unsupported++;
 			return;
 		} 
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: {
 		uint16_t capinfo, associd;
 		uint16_t status;
 
 		if (vap->iv_state != IEEE80211_S_ASSOC) {
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 
 		/*
 		 * asresp frame format
 		 *	[2] capability information
 		 *	[2] status
 		 *	[2] association ID
 		 *	[tlv] supported rates
 		 *	[tlv] extended supported rates
 		 *	[tlv] WME
 		 *	[tlv] HT capabilities
 		 *	[tlv] HT info
 		 */
 		IEEE80211_VERIFY_LENGTH(efrm - frm, 6, return);
 		ni = vap->iv_bss;
 		capinfo = le16toh(*(uint16_t *)frm);
 		frm += 2;
 		status = le16toh(*(uint16_t *)frm);
 		frm += 2;
 		if (status != 0) {
 			IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC,
 			    wh->i_addr2, "%sassoc failed (reason %d)",
 			    ISREASSOC(subtype) ?  "re" : "", status);
 			vap->iv_stats.is_rx_auth_fail++;	/* XXX */
 			return;
 		}
 		associd = le16toh(*(uint16_t *)frm);
 		frm += 2;
 
 		rates = xrates = wme = htcap = htinfo = NULL;
 		vhtcap = vhtopmode = NULL;
 		while (efrm - frm > 1) {
 			IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
 			switch (*frm) {
 			case IEEE80211_ELEMID_RATES:
 				rates = frm;
 				break;
 			case IEEE80211_ELEMID_XRATES:
 				xrates = frm;
 				break;
 			case IEEE80211_ELEMID_HTCAP:
 				htcap = frm;
 				break;
 			case IEEE80211_ELEMID_HTINFO:
 				htinfo = frm;
 				break;
 			case IEEE80211_ELEMID_VENDOR:
 				if (iswmeoui(frm))
 					wme = frm;
 				else if (vap->iv_flags_ht & IEEE80211_FHT_HTCOMPAT) {
 					/*
 					 * Accept pre-draft HT ie's if the
 					 * standard ones have not been seen.
 					 */
 					if (ishtcapoui(frm)) {
 						if (htcap == NULL)
 							htcap = frm;
 					} else if (ishtinfooui(frm)) {
 						if (htinfo == NULL)
 							htinfo = frm;
 					}
 				}
 				/* XXX Atheros OUI support */
 				break;
 			case IEEE80211_ELEMID_VHT_CAP:
 				vhtcap = frm;
 				break;
 			case IEEE80211_ELEMID_VHT_OPMODE:
 				vhtopmode = frm;
 				break;
 			}
 			frm += frm[1] + 2;
 		}
 
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE, return);
 		if (xrates != NULL)
 			IEEE80211_VERIFY_ELEMENT(xrates,
 				IEEE80211_RATE_MAXSIZE - rates[1], return);
 		rate = ieee80211_setup_rates(ni, rates, xrates,
 				IEEE80211_F_JOIN |
 				IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE |
 				IEEE80211_F_DONEGO | IEEE80211_F_DODEL);
 		if (rate & IEEE80211_RATE_BASIC) {
 			IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC,
 			    wh->i_addr2,
 			    "%sassoc failed (rate set mismatch)",
 			    ISREASSOC(subtype) ?  "re" : "");
 			vap->iv_stats.is_rx_assoc_norate++;
 			ieee80211_new_state(vap, IEEE80211_S_SCAN,
 			    IEEE80211_SCAN_FAIL_STATUS);
 			return;
 		}
 
 		ni->ni_capinfo = capinfo;
 		ni->ni_associd = associd;
 		if (ni->ni_jointime == 0)
 			ni->ni_jointime = time_uptime;
 		if (wme != NULL &&
 		    ieee80211_parse_wmeparams(vap, wme, wh) >= 0) {
 			ni->ni_flags |= IEEE80211_NODE_QOS;
 			ieee80211_wme_updateparams(vap);
 		} else
 			ni->ni_flags &= ~IEEE80211_NODE_QOS;
 		/*
 		 * Setup HT state according to the negotiation.
 		 *
 		 * NB: shouldn't need to check if HT use is enabled but some
 		 *     ap's send back HT ie's even when we don't indicate we
 		 *     are HT capable in our AssocReq.
 		 */
 		if (htcap != NULL && htinfo != NULL &&
 		    (vap->iv_flags_ht & IEEE80211_FHT_HT)) {
 			ieee80211_ht_node_init(ni);
 			ieee80211_ht_updateparams(ni, htcap, htinfo);
 
 			if ((vhtcap != NULL) && (vhtopmode != NULL) &
 			    (vap->iv_flags_vht & IEEE80211_FVHT_VHT)) {
 				/*
 				 * Log if we get a VHT assoc/reassoc response.
 				 * We aren't ready for 2GHz VHT support.
 				 */
 				if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) {
 					printf("%s: peer %6D: VHT on 2GHz, ignoring\n",
 					    __func__,
 					    ni->ni_macaddr,
 					    ":");
 				} else {
 					ieee80211_vht_node_init(ni);
 					ieee80211_vht_updateparams(ni, vhtcap, vhtopmode);
 					ieee80211_setup_vht_rates(ni, vhtcap, vhtopmode);
 				}
 			}
 
 			ieee80211_ht_updateparams_final(ni, htcap, htinfo);
 			ieee80211_setup_htrates(ni, htcap,
 			     IEEE80211_F_JOIN | IEEE80211_F_DOBRS);
 			ieee80211_setup_basic_htrates(ni, htinfo);
 
 			ieee80211_node_setuptxparms(ni);
 			ieee80211_ratectl_node_init(ni);
 		}
 
 		/*
 		 * Always initialise FF/superg state; we can use this
 		 * for doing A-MSDU encapsulation as well.
 		 */
 #ifdef	IEEE80211_SUPPORT_SUPERG
 		ieee80211_ff_node_init(ni);
 #endif
 
 		/*
 		 * Configure state now that we are associated.
 		 *
 		 * XXX may need different/additional driver callbacks?
 		 */
 		if (IEEE80211_IS_CHAN_A(ic->ic_curchan) ||
 		    (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE)) {
 			ic->ic_flags |= IEEE80211_F_SHPREAMBLE;
 			ic->ic_flags &= ~IEEE80211_F_USEBARKER;
 		} else {
 			ic->ic_flags &= ~IEEE80211_F_SHPREAMBLE;
 			ic->ic_flags |= IEEE80211_F_USEBARKER;
 		}
 		ieee80211_set_shortslottime(ic,
 			IEEE80211_IS_CHAN_A(ic->ic_curchan) ||
 			(ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME));
 		/*
 		 * Honor ERP protection.
 		 *
 		 * NB: ni_erp should zero for non-11g operation.
 		 */
 		if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) &&
 		    (ni->ni_erp & IEEE80211_ERP_USE_PROTECTION))
 			ic->ic_flags |= IEEE80211_F_USEPROT;
 		else
 			ic->ic_flags &= ~IEEE80211_F_USEPROT;
 		IEEE80211_NOTE_MAC(vap,
 		    IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, wh->i_addr2,
 		    "%sassoc success at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s",
 		    ISREASSOC(subtype) ? "re" : "",
 		    IEEE80211_NODE_AID(ni),
 		    ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long",
 		    ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long",
 		    ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "",
 		    ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",
 		    ni->ni_flags & IEEE80211_NODE_HT ?
 			(ni->ni_chw == 40 ? ", HT40" : ", HT20") : "",
 		    ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "",
 		    ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" :
 			ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "",
 		    ni->ni_flags & IEEE80211_NODE_RIFS ? " (+RIFS)" : "",
 		    IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ?
 			", fast-frames" : "",
 		    IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ?
 			", turbo" : ""
 		);
 		ieee80211_new_state(vap, IEEE80211_S_RUN, subtype);
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_DEAUTH: {
 		uint16_t reason;
 
 		if (vap->iv_state == IEEE80211_S_SCAN) {
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 		if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr)) {
 			/* NB: can happen when in promiscuous mode */
 			vap->iv_stats.is_rx_mgtdiscard++;
 			break;
 		}
 
 		/*
 		 * deauth frame format
 		 *	[2] reason
 		 */
 		IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return);
 		reason = le16toh(*(uint16_t *)frm);
 
 		vap->iv_stats.is_rx_deauth++;
 		vap->iv_stats.is_rx_deauth_code = reason;
 		IEEE80211_NODE_STAT(ni, rx_deauth);
 
 		IEEE80211_NOTE(vap, IEEE80211_MSG_AUTH, ni,
 		    "recv deauthenticate (reason: %d (%s))", reason,
 		    ieee80211_reason_to_string(reason));
 		ieee80211_new_state(vap, IEEE80211_S_AUTH,
 		    (reason << 8) | IEEE80211_FC0_SUBTYPE_DEAUTH);
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_DISASSOC: {
 		uint16_t reason;
 
 		if (vap->iv_state != IEEE80211_S_RUN &&
 		    vap->iv_state != IEEE80211_S_ASSOC &&
 		    vap->iv_state != IEEE80211_S_AUTH) {
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
 		if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr)) {
 			/* NB: can happen when in promiscuous mode */
 			vap->iv_stats.is_rx_mgtdiscard++;
 			break;
 		}
 
 		/*
 		 * disassoc frame format
 		 *	[2] reason
 		 */
 		IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return);
 		reason = le16toh(*(uint16_t *)frm);
 
 		vap->iv_stats.is_rx_disassoc++;
 		vap->iv_stats.is_rx_disassoc_code = reason;
 		IEEE80211_NODE_STAT(ni, rx_disassoc);
 
 		IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
 		    "recv disassociate (reason: %d (%s))", reason,
 		    ieee80211_reason_to_string(reason));
 		ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
 		break;
 	}
 
 	case IEEE80211_FC0_SUBTYPE_ACTION:
 	case IEEE80211_FC0_SUBTYPE_ACTION_NOACK:
 		if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) &&
 		    !IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "not for us");
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else if (vap->iv_state != IEEE80211_S_RUN) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "wrong state %s",
 			    ieee80211_state_name[vap->iv_state]);
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else {
 			if (ieee80211_parse_action(ni, m0) == 0)
 				(void)ic->ic_recv_action(ni, wh, frm, efrm);
 		}
 		break;
 
 	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 	case IEEE80211_FC0_SUBTYPE_TIMING_ADV:
 	case IEEE80211_FC0_SUBTYPE_ATIM:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 		    wh, NULL, "%s", "not handled");
 		vap->iv_stats.is_rx_mgtdiscard++;
 		break;
 
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, "mgt", "subtype 0x%x not handled", subtype);
 		vap->iv_stats.is_rx_badsubtype++;
 		break;
 	}
 #undef ISREASSOC
 }
 
 static void
 sta_recv_ctl(struct ieee80211_node *ni, struct mbuf *m, int subtype)
 {
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_BAR:
 		ieee80211_recv_bar(ni, m);
 		break;
 	}
 }
Index: projects/clang500-import/sys/net80211/ieee80211_wds.c
===================================================================
--- projects/clang500-import/sys/net80211/ieee80211_wds.c	(revision 318657)
+++ projects/clang500-import/sys/net80211/ieee80211_wds.c	(revision 318658)
@@ -1,798 +1,798 @@
 /*-
  * 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.
  */
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD$");
 #endif
 
 /*
  * IEEE 802.11 WDS mode support.
  */
 #include "opt_inet.h"
 #include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
 
 #include <net/bpf.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_wds.h>
 #include <net80211/ieee80211_input.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
 #include <net80211/ieee80211_superg.h>
 #endif
 
 static void wds_vattach(struct ieee80211vap *);
 static int wds_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static	int wds_input(struct ieee80211_node *ni, struct mbuf *m,
 	    const struct ieee80211_rx_stats *rxs, int, int);
 static void wds_recv_mgmt(struct ieee80211_node *, struct mbuf *, int subtype,
 	const struct ieee80211_rx_stats *, int, int);
 
 void
 ieee80211_wds_attach(struct ieee80211com *ic)
 {
 	ic->ic_vattach[IEEE80211_M_WDS] = wds_vattach;
 }
 
 void
 ieee80211_wds_detach(struct ieee80211com *ic)
 {
 }
 
 static void
 wds_vdetach(struct ieee80211vap *vap)
 {
 	if (vap->iv_bss != NULL) {
 		/* XXX locking? */
 		if (vap->iv_bss->ni_wdsvap == vap)
 			vap->iv_bss->ni_wdsvap = NULL;
 	}
 }
 
 static void
 wds_vattach(struct ieee80211vap *vap)
 {
 	vap->iv_newstate = wds_newstate;
 	vap->iv_input = wds_input;
 	vap->iv_recv_mgmt = wds_recv_mgmt;
 	vap->iv_opdetach = wds_vdetach;
 }
 
 static void
 wds_flush(struct ieee80211_node *ni)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct mbuf *m, *next;
 	int8_t rssi, nf;
 
 	m = ieee80211_ageq_remove(&ic->ic_stageq,
 	    (void *)(uintptr_t) ieee80211_mac_hash(ic, ni->ni_macaddr));
 	if (m == NULL)
 		return;
 
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_WDS, ni,
 	    "%s", "flush wds queue");
 	ic->ic_node_getsignal(ni, &rssi, &nf);
 	for (; m != NULL; m = next) {
 		next = m->m_nextpkt;
 		m->m_nextpkt = NULL;
 		ieee80211_input(ni, m, rssi, nf);
 	}
 }
 
 static int
 ieee80211_create_wds(struct ieee80211vap *vap, struct ieee80211_channel *chan)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_node_table *nt = &ic->ic_sta;
 	struct ieee80211_node *ni, *obss;
 
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_WDS,
 	     "%s: creating link to %s on channel %u\n", __func__,
 	     ether_sprintf(vap->iv_des_bssid), ieee80211_chan2ieee(ic, chan));
 
 	/* NB: vap create must specify the bssid for the link */
 	KASSERT(vap->iv_flags & IEEE80211_F_DESBSSID, ("no bssid"));
 	/* NB: we should only be called on RUN transition */
 	KASSERT(vap->iv_state == IEEE80211_S_RUN, ("!RUN state"));
 
 	if ((vap->iv_flags_ext & IEEE80211_FEXT_WDSLEGACY) == 0) {
 		/*
 		 * Dynamic/non-legacy WDS.  Reference the associated
 		 * station specified by the desired bssid setup at vap
 		 * create.  Point ni_wdsvap at the WDS vap so 4-address
 		 * frames received through the associated AP vap will
 		 * be dispatched upward (e.g. to a bridge) as though
 		 * they arrived on the WDS vap.
 		 */
 		IEEE80211_NODE_LOCK(nt);
 		obss = NULL;
 		ni = ieee80211_find_node_locked(&ic->ic_sta, vap->iv_des_bssid);
 		if (ni == NULL) {
 			/*
 			 * Node went away before we could hookup.  This
 			 * should be ok; no traffic will flow and a leave
 			 * event will be dispatched that should cause
 			 * the vap to be destroyed.
 			 */
 			IEEE80211_DPRINTF(vap, IEEE80211_MSG_WDS,
 			    "%s: station %s went away\n",
 			    __func__, ether_sprintf(vap->iv_des_bssid));
 			/* XXX stat? */
 		} else if (ni->ni_wdsvap != NULL) {
 			/*
 			 * Node already setup with a WDS vap; we cannot
 			 * allow multiple references so disallow.  If
 			 * ni_wdsvap points at us that's ok; we should
 			 * do nothing anyway.
 			 */
 			/* XXX printf instead? */
 			IEEE80211_DPRINTF(vap, IEEE80211_MSG_WDS,
 			    "%s: station %s in use with %s\n",
 			    __func__, ether_sprintf(vap->iv_des_bssid),
 			    ni->ni_wdsvap->iv_ifp->if_xname);
 			/* XXX stat? */
 		} else {
 			/*
 			 * Committed to new node, setup state.
 			 */
 			obss = vap->iv_bss;
 			vap->iv_bss = ni;
 			ni->ni_wdsvap = vap;
 		}
 		IEEE80211_NODE_UNLOCK(nt);
 		if (obss != NULL) {
 			/* NB: deferred to avoid recursive lock */
 			ieee80211_free_node(obss);
 		}
 	} else {
 		/*
 		 * Legacy WDS vap setup.
 		 */
 		/*
 		 * The far end does not associate so we just create
 		 * create a new node and install it as the vap's
 		 * bss node.  We must simulate an association and
 		 * authorize the port for traffic to flow.
 		 * XXX check if node already in sta table?
 		 */
 		ni = ieee80211_node_create_wds(vap, vap->iv_des_bssid, chan);
 		if (ni != NULL) {
 			obss = vap->iv_bss;
 			vap->iv_bss = ieee80211_ref_node(ni);
 			ni->ni_flags |= IEEE80211_NODE_AREF;
 			if (obss != NULL)
 				ieee80211_free_node(obss);
 			/* give driver a chance to setup state like ni_txrate */
 			if (ic->ic_newassoc != NULL)
 				ic->ic_newassoc(ni, 1);
 			/* tell the authenticator about new station */
 			if (vap->iv_auth->ia_node_join != NULL)
 				vap->iv_auth->ia_node_join(ni);
 			if (ni->ni_authmode != IEEE80211_AUTH_8021X)
 				ieee80211_node_authorize(ni);
 
 			ieee80211_notify_node_join(ni, 1 /*newassoc*/);
 			/* XXX inject l2uf frame */
 		}
 	}
 
 	/*
 	 * Flush any pending frames now that were setup.
 	 */
 	if (ni != NULL)
 		wds_flush(ni);
 	return (ni == NULL ? ENOENT : 0);
 }
 
 /*
  * Propagate multicast frames of an ap vap to all DWDS links.
  * The caller is assumed to have verified this frame is multicast.
  */
 void
 ieee80211_dwds_mcast(struct ieee80211vap *vap0, struct mbuf *m)
 {
 	struct ieee80211com *ic = vap0->iv_ic;
 	const struct ether_header *eh = mtod(m, const struct ether_header *);
 	struct ieee80211_node *ni;
 	struct ieee80211vap *vap;
 	struct ifnet *ifp;
 	struct mbuf *mcopy;
 	int err;
 
 	KASSERT(ETHER_IS_MULTICAST(eh->ether_dhost),
 	    ("%s not mcast", ether_sprintf(eh->ether_dhost)));
 
 	/* XXX locking */
 	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
 		/* only DWDS vaps are interesting */
 		if (vap->iv_opmode != IEEE80211_M_WDS ||
 		    (vap->iv_flags_ext & IEEE80211_FEXT_WDSLEGACY))
 			continue;
 		/* if it came in this interface, don't send it back out */
 		ifp = vap->iv_ifp;
 		if (ifp == m->m_pkthdr.rcvif)
 			continue;
 		/*
 		 * Duplicate the frame and send it.
 		 */
 		mcopy = m_copypacket(m, M_NOWAIT);
 		if (mcopy == NULL) {
 			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			/* XXX stat + msg */
 			continue;
 		}
 		ni = ieee80211_find_txnode(vap, eh->ether_dhost);
 		if (ni == NULL) {
 			/* NB: ieee80211_find_txnode does stat+msg */
 			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			m_freem(mcopy);
 			continue;
 		}
 		/* calculate priority so drivers can find the tx queue */
 		if (ieee80211_classify(ni, mcopy)) {
 			IEEE80211_DISCARD_MAC(vap,
 			    IEEE80211_MSG_OUTPUT | IEEE80211_MSG_WDS,
 			    eh->ether_dhost, NULL,
 			    "%s", "classification failure");
 			vap->iv_stats.is_tx_classify++;
 			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			m_freem(mcopy);
 			ieee80211_free_node(ni);
 			continue;
 		}
 
 		BPF_MTAP(ifp, m);		/* 802.3 tx */
 
 		/*
 		 * Encapsulate the packet in prep for transmission.
 		 */
 		IEEE80211_TX_LOCK(ic);
 		mcopy = ieee80211_encap(vap, ni, mcopy);
 		if (mcopy == NULL) {
 			/* NB: stat+msg handled in ieee80211_encap */
 			IEEE80211_TX_UNLOCK(ic);
 			ieee80211_free_node(ni);
 			continue;
 		}
 		mcopy->m_flags |= M_MCAST;
 		mcopy->m_pkthdr.rcvif = (void *) ni;
 
 		err = ieee80211_parent_xmitpkt(ic, mcopy);
 		IEEE80211_TX_UNLOCK(ic);
 		if (!err) {
 			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 			if_inc_counter(ifp, IFCOUNTER_OBYTES,
 			    m->m_pkthdr.len);
 		}
 	}
 }
 
 /*
  * Handle DWDS discovery on receipt of a 4-address frame in
  * ap mode.  Queue the frame and post an event for someone
  * to plumb the necessary WDS vap for this station.  Frames
  * received prior to the vap set running will then be reprocessed
  * as if they were just received.
  */
 void
 ieee80211_dwds_discover(struct ieee80211_node *ni, struct mbuf *m)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 
 	/*
 	 * Save the frame with an aging interval 4 times
 	 * the listen interval specified by the station. 
 	 * Frames that sit around too long are reclaimed
 	 * using this information.
 	 * XXX handle overflow?
 	 * XXX per/vap beacon interval?
 	 */
 	m->m_pkthdr.rcvif = (void *)(uintptr_t)
 	    ieee80211_mac_hash(ic, ni->ni_macaddr);
 	(void) ieee80211_ageq_append(&ic->ic_stageq, m,
 	    ((ni->ni_intval * ic->ic_lintval) << 2) / 1024);
 	ieee80211_notify_wds_discover(ni);
 }
 
 /*
  * IEEE80211_M_WDS vap state machine handler.
  */
 static int
 wds_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	enum ieee80211_state ostate;
 	int error;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
 	ostate = vap->iv_state;
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s\n", __func__,
 		ieee80211_state_name[ostate], ieee80211_state_name[nstate]);
 	vap->iv_state = nstate;			/* state transition */
 	callout_stop(&vap->iv_mgtsend);		/* XXX callout_drain */
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
 	error = 0;
 	switch (nstate) {
 	case IEEE80211_S_INIT:
 		switch (ostate) {
 		case IEEE80211_S_SCAN:
 			ieee80211_cancel_scan(vap);
 			break;
 		default:
 			break;
 		}
 		if (ostate != IEEE80211_S_INIT) {
 			/* NB: optimize INIT -> INIT case */
 			ieee80211_reset_bss(vap);
 		}
 		break;
 	case IEEE80211_S_SCAN:
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 			ieee80211_check_scan_current(vap);
 			break;
 		default:
 			break;
 		}
 		break;
 	case IEEE80211_S_RUN:
 		if (ostate == IEEE80211_S_INIT) {
 			/*
 			 * Already have a channel; bypass the scan
 			 * and startup immediately.
 			 */
 			error = ieee80211_create_wds(vap, ic->ic_curchan);
 		}
 		break;
 	default:
 		break;
 	}
 	return error;
 }
 
 /*
  * Process a received frame.  The node associated with the sender
  * should be supplied.  If nothing was found in the node table then
  * the caller is assumed to supply a reference to iv_bss instead.
  * The RSSI and a timestamp are also supplied.  The RSSI data is used
  * during AP scanning to select a AP to associate with; it can have
  * any units so long as values have consistent units and higher values
  * mean ``better signal''.  The receive timestamp is currently not used
  * by the 802.11 layer.
  */
 static int
 wds_input(struct ieee80211_node *ni, struct mbuf *m,
     const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ifnet *ifp = vap->iv_ifp;
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
 	int hdrspace, need_tap = 1;	/* mbuf need to be tapped. */
 	uint8_t dir, type, subtype, qos;
 	int is_hw_decrypted = 0;
 	int has_decrypted = 0;
 
 	/*
 	 * Some devices do hardware decryption all the way through
 	 * to pretending the frame wasn't encrypted in the first place.
 	 * So, tag it appropriately so it isn't discarded inappropriately.
 	 */
 	if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_DECRYPTED))
 		is_hw_decrypted = 1;
 
 	if (m->m_flags & M_AMPDU_MPDU) {
 		/*
 		 * Fastpath for A-MPDU reorder q resubmission.  Frames
 		 * w/ M_AMPDU_MPDU marked have already passed through
 		 * here but were received out of order and been held on
 		 * the reorder queue.  When resubmitted they are marked
 		 * with the M_AMPDU_MPDU flag and we can bypass most of
 		 * the normal processing.
 		 */
 		wh = mtod(m, struct ieee80211_frame *);
 		type = IEEE80211_FC0_TYPE_DATA;
 		dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 		subtype = IEEE80211_FC0_SUBTYPE_QOS;
 		hdrspace = ieee80211_hdrspace(ic, wh);	/* XXX optimize? */
 		goto resubmit_ampdu;
 	}
 
 	KASSERT(ni != NULL, ("null node"));
 
 	type = -1;			/* undefined */
 
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL,
 		    "too short (1): len %u", m->m_pkthdr.len);
 		vap->iv_stats.is_rx_tooshort++;
 		goto out;
 	}
 	/*
 	 * Bit of a cheat here, we use a pointer for a 3-address
 	 * frame format but don't reference fields past outside
 	 * ieee80211_frame_min w/o first validating the data is
 	 * present.
 	 */
 	wh = mtod(m, struct ieee80211_frame *);
 
 	if (!IEEE80211_IS_MULTICAST(wh->i_addr1))
 		ni->ni_inact = ni->ni_inact_reload;
 
 	if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) !=
 	    IEEE80211_FC0_VERSION_0) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, NULL, "wrong version, fc %02x:%02x",
 		    wh->i_fc[0], wh->i_fc[1]);
 		vap->iv_stats.is_rx_badversion++;
 		goto err;
 	}
 
 	dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 
 	/* NB: WDS vap's do not scan */
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_addr4)) {
 		IEEE80211_DISCARD_MAC(vap,
 		    IEEE80211_MSG_ANY, ni->ni_macaddr, NULL,
 		    "too short (3): len %u", m->m_pkthdr.len);
 		vap->iv_stats.is_rx_tooshort++;
 		goto out;
 	}
 	/* NB: the TA is implicitly verified by finding the wds peer node */
 	if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr) &&
 	    !IEEE80211_ADDR_EQ(wh->i_addr1, ifp->if_broadcastaddr)) {
 		/* not interested in */
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 		    wh->i_addr1, NULL, "%s", "not to bss");
 		vap->iv_stats.is_rx_wrongbss++;
 		goto out;
 	}
 	IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
 	ni->ni_noise = nf;
 	if (IEEE80211_HAS_SEQ(type, subtype)) {
 		uint8_t tid = ieee80211_gettid(wh);
 		if (IEEE80211_QOS_HAS_SEQ(wh) &&
 		    TID_TO_WME_AC(tid) >= WME_AC_VI)
 			ic->ic_wme.wme_hipri_traffic++;
-		if (! ieee80211_check_rxseq(ni, wh, wh->i_addr1))
+		if (! ieee80211_check_rxseq(ni, wh, wh->i_addr1, rxs))
 			goto out;
 	}
 	switch (type) {
 	case IEEE80211_FC0_TYPE_DATA:
 		hdrspace = ieee80211_hdrspace(ic, wh);
 		if (m->m_len < hdrspace &&
 		    (m = m_pullup(m, hdrspace)) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, NULL,
 			    "data too short: expecting %u", hdrspace);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
 		if (dir != IEEE80211_FC1_DIR_DSTODS) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "incorrect dir 0x%x", dir);
 			vap->iv_stats.is_rx_wrongdir++;
 			goto out;
 		}
 		/*
 		 * Only legacy WDS traffic should take this path.
 		 */
 		if ((vap->iv_flags_ext & IEEE80211_FEXT_WDSLEGACY) == 0) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "%s", "not legacy wds");
 			vap->iv_stats.is_rx_wrongdir++;/*XXX*/
 			goto out;
 		}
 		/*
 		 * Handle A-MPDU re-ordering.  If the frame is to be
 		 * processed directly then ieee80211_ampdu_reorder
 		 * will return 0; otherwise it has consumed the mbuf
 		 * and we should do nothing more with it.
 		 */
 		if ((m->m_flags & M_AMPDU) &&
-		    ieee80211_ampdu_reorder(ni, m) != 0) {
+		    ieee80211_ampdu_reorder(ni, m, rxs) != 0) {
 			m = NULL;
 			goto out;
 		}
 	resubmit_ampdu:
 
 		/*
 		 * Handle privacy requirements.  Note that we
 		 * must not be preempted from here until after
 		 * we (potentially) call ieee80211_crypto_demic;
 		 * otherwise we may violate assumptions in the
 		 * crypto cipher modules used to do delayed update
 		 * of replay sequence numbers.
 		 */
 		if (is_hw_decrypted || wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
 				 */
 				IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 				    wh, "WEP", "%s", "PRIVACY off");
 				vap->iv_stats.is_rx_noprivacy++;
 				IEEE80211_NODE_STAT(ni, rx_noprivacy);
 				goto out;
 			}
 			if (ieee80211_crypto_decap(ni, m, hdrspace, &key) == 0) {
 				/* NB: stats+msgs handled in crypto_decap */
 				IEEE80211_NODE_STAT(ni, rx_wepfail);
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
 			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 			has_decrypted = 1;
 		} else {
 			/* XXX M_WEP and IEEE80211_F_PRIVACY */
 			key = NULL;
 		}
 
 		/*
 		 * Save QoS bits for use below--before we strip the header.
 		 */
 		if (subtype == IEEE80211_FC0_SUBTYPE_QOS) {
 			qos = (dir == IEEE80211_FC1_DIR_DSTODS) ?
 			    ((struct ieee80211_qosframe_addr4 *)wh)->i_qos[0] :
 			    ((struct ieee80211_qosframe *)wh)->i_qos[0];
 		} else
 			qos = 0;
 
 		/*
 		 * Next up, any fragmentation.
 		 */
 		if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			m = ieee80211_defrag(ni, m, hdrspace);
 			if (m == NULL) {
 				/* Fragment dropped or frame not complete yet */
 				goto out;
 			}
 		}
 		wh = NULL;		/* no longer valid, catch any uses */
 
 		/*
 		 * Next strip any MSDU crypto bits.
 		 */
 		if (!ieee80211_crypto_demic(vap, key, m, 0)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "demic error");
 			vap->iv_stats.is_rx_demicfail++;
 			IEEE80211_NODE_STAT(ni, rx_demicfail);
 			goto out;
 		}
 
 		/* copy to listener after decrypt */
 		if (ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		need_tap = 0;
 
 		/*
 		 * Finally, strip the 802.11 header.
 		 */
 		m = ieee80211_decap(vap, m, hdrspace);
 		if (m == NULL) {
 			/* XXX mask bit to check for both */
 			/* don't count Null data frames as errors */
 			if (subtype == IEEE80211_FC0_SUBTYPE_NODATA ||
 			    subtype == IEEE80211_FC0_SUBTYPE_QOS_NULL)
 				goto out;
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "decap error");
 			vap->iv_stats.is_rx_decap++;
 			IEEE80211_NODE_STAT(ni, rx_decap);
 			goto err;
 		}
 		eh = mtod(m, struct ether_header *);
 		if (!ieee80211_node_is_authorized(ni)) {
 			/*
 			 * Deny any non-PAE frames received prior to
 			 * authorization.  For open/shared-key
 			 * authentication the port is mark authorized
 			 * after authentication completes.  For 802.1x
 			 * the port is not marked authorized by the
 			 * authenticator until the handshake has completed.
 			 */
 			if (eh->ether_type != htons(ETHERTYPE_PAE)) {
 				IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 				    eh->ether_shost, "data",
 				    "unauthorized port: ether type 0x%x len %u",
 				    eh->ether_type, m->m_pkthdr.len);
 				vap->iv_stats.is_rx_unauth++;
 				IEEE80211_NODE_STAT(ni, rx_unauth);
 				goto err;
 			}
 		} else {
 			/*
 			 * When denying unencrypted frames, discard
 			 * any non-PAE frames received without encryption.
 			 */
 			if ((vap->iv_flags & IEEE80211_F_DROPUNENC) &&
 			    ((has_decrypted == 0) && (m->m_flags & M_WEP) == 0) &&
 			    (is_hw_decrypted == 0) &&
 			    eh->ether_type != htons(ETHERTYPE_PAE)) {
 				/*
 				 * Drop unencrypted frames.
 				 */
 				vap->iv_stats.is_rx_unencrypted++;
 				IEEE80211_NODE_STAT(ni, rx_unencrypted);
 				goto out;
 			}
 		}
 		/* XXX require HT? */
 		if (qos & IEEE80211_QOS_AMSDU) {
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
 		} else {
 #ifdef IEEE80211_SUPPORT_SUPERG
 			m = ieee80211_decap_fastframe(vap, ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
 #endif
 		}
 		ieee80211_deliver_data(vap, ni, m);
 		return IEEE80211_FC0_TYPE_DATA;
 
 	case IEEE80211_FC0_TYPE_MGT:
 		vap->iv_stats.is_rx_mgmt++;
 		IEEE80211_NODE_STAT(ni, rx_mgmt);
 		if (dir != IEEE80211_FC1_DIR_NODS) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, "data", "incorrect dir 0x%x", dir);
 			vap->iv_stats.is_rx_wrongdir++;
 			goto err;
 		}
 		if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, "mgt", "too short: len %u",
 			    m->m_pkthdr.len);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;
 		}
 #ifdef IEEE80211_DEBUG
 		if (ieee80211_msg_debug(vap) || ieee80211_msg_dumppkts(vap)) {
 			if_printf(ifp, "received %s from %s rssi %d\n",
 			    ieee80211_mgt_subtype_name(subtype),
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
 		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "WEP set but not permitted");
 			vap->iv_stats.is_rx_mgtdiscard++; /* XXX */
 			goto out;
 		}
 		vap->iv_recv_mgmt(ni, m, subtype, rxs, rssi, nf);
 		goto out;
 
 	case IEEE80211_FC0_TYPE_CTL:
 		vap->iv_stats.is_rx_ctl++;
 		IEEE80211_NODE_STAT(ni, rx_ctrl);
 		goto out;
 
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, "bad", "frame type 0x%x", type);
 		/* should not come here */
 		break;
 	}
 err:
 	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
 			ieee80211_radiotap_rx(vap, m);
 		m_freem(m);
 	}
 	return type;
 }
 
 static void
 wds_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype,
     const struct ieee80211_rx_stats *rxs, int rssi, int nf)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_frame *wh;
 	u_int8_t *frm, *efrm;
 
 	wh = mtod(m0, struct ieee80211_frame *);
 	frm = (u_int8_t *)&wh[1];
 	efrm = mtod(m0, u_int8_t *) + m0->m_len;
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_ACTION:
 	case IEEE80211_FC0_SUBTYPE_ACTION_NOACK:
 		if (ni == vap->iv_bss) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "unknown node");
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1)) {
 			/* NB: not interested in multicast frames. */
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "not for us");
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else if (vap->iv_state != IEEE80211_S_RUN) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "wrong state %s",
 			    ieee80211_state_name[vap->iv_state]);
 			vap->iv_stats.is_rx_mgtdiscard++;
 		} else {
 			if (ieee80211_parse_action(ni, m0) == 0)
 				(void)ic->ic_recv_action(ni, wh, frm, efrm);
 		}
 		break;
 
 	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
 	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 	case IEEE80211_FC0_SUBTYPE_TIMING_ADV:
 	case IEEE80211_FC0_SUBTYPE_BEACON:
 	case IEEE80211_FC0_SUBTYPE_ATIM:
 	case IEEE80211_FC0_SUBTYPE_DISASSOC:
 	case IEEE80211_FC0_SUBTYPE_AUTH:
 	case IEEE80211_FC0_SUBTYPE_DEAUTH:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 		    wh, NULL, "%s", "not handled");
 		vap->iv_stats.is_rx_mgtdiscard++;
 		break;
 
 	default:
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
 		    wh, "mgt", "subtype 0x%x not handled", subtype);
 		vap->iv_stats.is_rx_badsubtype++;
 		break;
 	}
 }
Index: projects/clang500-import/sys/netinet/tcp_usrreq.c
===================================================================
--- projects/clang500-import/sys/netinet/tcp_usrreq.c	(revision 318657)
+++ projects/clang500-import/sys/netinet/tcp_usrreq.c	(revision 318658)
@@ -1,2343 +1,2352 @@
 /*-
  * Copyright (c) 1982, 1986, 1988, 1993
  *	The Regents of the University of California.
  * Copyright (c) 2006-2007 Robert N. M. Watson
  * Copyright (c) 2010-2011 Juniper Networks, Inc.
  * All rights reserved.
  *
  * Portions of this software were developed by Robert N. M. Watson under
  * contract to Juniper Networks, Inc.
  *
  * 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.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/limits.h>
 #include <sys/malloc.h>
 #include <sys/refcount.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #ifdef INET6
 #include <sys/domain.h>
 #endif /* INET6 */
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/proc.h>
 #include <sys/jail.h>
 #include <sys/syslog.h>
 
 #ifdef DDB
 #include <ddb/ddb.h>
 #endif
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_kdtrace.h>
 #include <netinet/in_pcb.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/scope6_var.h>
 #endif
 #ifdef TCP_RFC7413
 #include <netinet/tcp_fastopen.h>
 #endif
 #include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
 #include <netinet/cc/cc.h>
 #ifdef TCPPCAP
 #include <netinet/tcp_pcap.h>
 #endif
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif
 #ifdef TCP_OFFLOAD
 #include <netinet/tcp_offload.h>
 #endif
 #include <netipsec/ipsec_support.h>
 
 /*
  * TCP protocol interface to socket abstraction.
  */
 static int	tcp_attach(struct socket *);
 #ifdef INET
 static int	tcp_connect(struct tcpcb *, struct sockaddr *,
 		    struct thread *td);
 #endif /* INET */
 #ifdef INET6
 static int	tcp6_connect(struct tcpcb *, struct sockaddr *,
 		    struct thread *td);
 #endif /* INET6 */
 static void	tcp_disconnect(struct tcpcb *);
 static void	tcp_usrclosed(struct tcpcb *);
 static void	tcp_fill_info(struct tcpcb *, struct tcp_info *);
 
 #ifdef TCPDEBUG
 #define	TCPDEBUG0	int ostate = 0
 #define	TCPDEBUG1()	ostate = tp ? tp->t_state : 0
 #define	TCPDEBUG2(req)	if (tp && (so->so_options & SO_DEBUG)) \
 				tcp_trace(TA_USER, ostate, tp, 0, 0, req)
 #else
 #define	TCPDEBUG0
 #define	TCPDEBUG1()
 #define	TCPDEBUG2(req)
 #endif
 
 /*
  * TCP attaches to socket via pru_attach(), reserving space,
  * and an internet control block.
  */
 static int
 tcp_usr_attach(struct socket *so, int proto, struct thread *td)
 {
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 	int error;
 	TCPDEBUG0;
 
 	inp = sotoinpcb(so);
 	KASSERT(inp == NULL, ("tcp_usr_attach: inp != NULL"));
 	TCPDEBUG1();
 
 	error = tcp_attach(so);
 	if (error)
 		goto out;
 
 	if ((so->so_options & SO_LINGER) && so->so_linger == 0)
 		so->so_linger = TCP_LINGERTIME;
 
 	inp = sotoinpcb(so);
 	tp = intotcpcb(inp);
 out:
 	TCPDEBUG2(PRU_ATTACH);
 	TCP_PROBE2(debug__user, tp, PRU_ATTACH);
 	return error;
 }
 
 /*
  * tcp_detach is called when the socket layer loses its final reference
  * to the socket, be it a file descriptor reference, a reference from TCP,
  * etc.  At this point, there is only one case in which we will keep around
  * inpcb state: time wait.
  *
  * This function can probably be re-absorbed back into tcp_usr_detach() now
  * that there is a single detach path.
  */
 static void
 tcp_detach(struct socket *so, struct inpcb *inp)
 {
 	struct tcpcb *tp;
 
 	INP_INFO_LOCK_ASSERT(&V_tcbinfo);
 	INP_WLOCK_ASSERT(inp);
 
 	KASSERT(so->so_pcb == inp, ("tcp_detach: so_pcb != inp"));
 	KASSERT(inp->inp_socket == so, ("tcp_detach: inp_socket != so"));
 
 	tp = intotcpcb(inp);
 
 	if (inp->inp_flags & INP_TIMEWAIT) {
 		/*
 		 * There are two cases to handle: one in which the time wait
 		 * state is being discarded (INP_DROPPED), and one in which
 		 * this connection will remain in timewait.  In the former,
 		 * it is time to discard all state (except tcptw, which has
 		 * already been discarded by the timewait close code, which
 		 * should be further up the call stack somewhere).  In the
 		 * latter case, we detach from the socket, but leave the pcb
 		 * present until timewait ends.
 		 *
 		 * XXXRW: Would it be cleaner to free the tcptw here?
 		 *
 		 * Astute question indeed, from twtcp perspective there are
 		 * three cases to consider:
 		 *
 		 * #1 tcp_detach is called at tcptw creation time by
 		 *  tcp_twstart, then do not discard the newly created tcptw
 		 *  and leave inpcb present until timewait ends
 		 * #2 tcp_detach is called at timewait end (or reuse) by
 		 *  tcp_twclose, then the tcptw has already been discarded
 		 *  (or reused) and inpcb is freed here
 		 * #3 tcp_detach is called() after timewait ends (or reuse)
 		 *  (e.g. by soclose), then tcptw has already been discarded
 		 *  (or reused) and inpcb is freed here
 		 *
 		 *  In all three cases the tcptw should not be freed here.
 		 */
 		if (inp->inp_flags & INP_DROPPED) {
 			in_pcbdetach(inp);
 			if (__predict_true(tp == NULL)) {
 				in_pcbfree(inp);
 			} else {
 				/*
 				 * This case should not happen as in TIMEWAIT
 				 * state the inp should not be destroyed before
 				 * its tcptw.  If INVARIANTS is defined, panic.
 				 */
 #ifdef INVARIANTS
 				panic("%s: Panic before an inp double-free: "
 				    "INP_TIMEWAIT && INP_DROPPED && tp != NULL"
 				    , __func__);
 #else
 				log(LOG_ERR, "%s: Avoid an inp double-free: "
 				    "INP_TIMEWAIT && INP_DROPPED && tp != NULL"
 				    , __func__);
 #endif
 				INP_WUNLOCK(inp);
 			}
 		} else {
 			in_pcbdetach(inp);
 			INP_WUNLOCK(inp);
 		}
 	} else {
 		/*
 		 * If the connection is not in timewait, we consider two
 		 * two conditions: one in which no further processing is
 		 * necessary (dropped || embryonic), and one in which TCP is
 		 * not yet done, but no longer requires the socket, so the
 		 * pcb will persist for the time being.
 		 *
 		 * XXXRW: Does the second case still occur?
 		 */
 		if (inp->inp_flags & INP_DROPPED ||
 		    tp->t_state < TCPS_SYN_SENT) {
 			tcp_discardcb(tp);
 			in_pcbdetach(inp);
 			in_pcbfree(inp);
 		} else {
 			in_pcbdetach(inp);
 			INP_WUNLOCK(inp);
 		}
 	}
 }
 
 /*
  * pru_detach() detaches the TCP protocol from the socket.
  * If the protocol state is non-embryonic, then can't
  * do this directly: have to initiate a pru_disconnect(),
  * which may finish later; embryonic TCB's can just
  * be discarded here.
  */
 static void
 tcp_usr_detach(struct socket *so)
 {
 	struct inpcb *inp;
 	int rlock = 0;
 
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_detach: inp == NULL"));
 	if (!INP_INFO_WLOCKED(&V_tcbinfo)) {
 		INP_INFO_RLOCK(&V_tcbinfo);
 		rlock = 1;
 	}
 	INP_WLOCK(inp);
 	KASSERT(inp->inp_socket != NULL,
 	    ("tcp_usr_detach: inp_socket == NULL"));
 	tcp_detach(so, inp);
 	if (rlock)
 		INP_INFO_RUNLOCK(&V_tcbinfo);
 }
 
 #ifdef INET
 /*
  * Give the socket an address.
  */
 static int
 tcp_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	int error = 0;
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 	struct sockaddr_in *sinp;
 
 	sinp = (struct sockaddr_in *)nam;
 	if (nam->sa_len != sizeof (*sinp))
 		return (EINVAL);
 	/*
 	 * Must check for multicast addresses and disallow binding
 	 * to them.
 	 */
 	if (sinp->sin_family == AF_INET &&
 	    IN_MULTICAST(ntohl(sinp->sin_addr.s_addr)))
 		return (EAFNOSUPPORT);
 
 	TCPDEBUG0;
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_bind: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		error = EINVAL;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 	INP_HASH_WLOCK(&V_tcbinfo);
 	error = in_pcbbind(inp, nam, td->td_ucred);
 	INP_HASH_WUNLOCK(&V_tcbinfo);
 out:
 	TCPDEBUG2(PRU_BIND);
 	TCP_PROBE2(debug__user, tp, PRU_BIND);
 	INP_WUNLOCK(inp);
 
 	return (error);
 }
 #endif /* INET */
 
 #ifdef INET6
 static int
 tcp6_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	int error = 0;
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 	struct sockaddr_in6 *sin6p;
 
 	sin6p = (struct sockaddr_in6 *)nam;
 	if (nam->sa_len != sizeof (*sin6p))
 		return (EINVAL);
 	/*
 	 * Must check for multicast addresses and disallow binding
 	 * to them.
 	 */
 	if (sin6p->sin6_family == AF_INET6 &&
 	    IN6_IS_ADDR_MULTICAST(&sin6p->sin6_addr))
 		return (EAFNOSUPPORT);
 
 	TCPDEBUG0;
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp6_usr_bind: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		error = EINVAL;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 	INP_HASH_WLOCK(&V_tcbinfo);
 	inp->inp_vflag &= ~INP_IPV4;
 	inp->inp_vflag |= INP_IPV6;
 #ifdef INET
 	if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) {
 		if (IN6_IS_ADDR_UNSPECIFIED(&sin6p->sin6_addr))
 			inp->inp_vflag |= INP_IPV4;
 		else if (IN6_IS_ADDR_V4MAPPED(&sin6p->sin6_addr)) {
 			struct sockaddr_in sin;
 
 			in6_sin6_2_sin(&sin, sin6p);
 			inp->inp_vflag |= INP_IPV4;
 			inp->inp_vflag &= ~INP_IPV6;
 			error = in_pcbbind(inp, (struct sockaddr *)&sin,
 			    td->td_ucred);
 			INP_HASH_WUNLOCK(&V_tcbinfo);
 			goto out;
 		}
 	}
 #endif
 	error = in6_pcbbind(inp, nam, td->td_ucred);
 	INP_HASH_WUNLOCK(&V_tcbinfo);
 out:
 	TCPDEBUG2(PRU_BIND);
 	TCP_PROBE2(debug__user, tp, PRU_BIND);
 	INP_WUNLOCK(inp);
 	return (error);
 }
 #endif /* INET6 */
 
 #ifdef INET
 /*
  * Prepare to accept connections.
  */
 static int
 tcp_usr_listen(struct socket *so, int backlog, struct thread *td)
 {
 	int error = 0;
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 
 	TCPDEBUG0;
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_listen: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		error = EINVAL;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 	SOCK_LOCK(so);
 	error = solisten_proto_check(so);
 	INP_HASH_WLOCK(&V_tcbinfo);
 	if (error == 0 && inp->inp_lport == 0)
 		error = in_pcbbind(inp, (struct sockaddr *)0, td->td_ucred);
 	INP_HASH_WUNLOCK(&V_tcbinfo);
 	if (error == 0) {
 		tcp_state_change(tp, TCPS_LISTEN);
 		solisten_proto(so, backlog);
 #ifdef TCP_OFFLOAD
 		if ((so->so_options & SO_NO_OFFLOAD) == 0)
 			tcp_offload_listen_start(tp);
 #endif
 	}
 	SOCK_UNLOCK(so);
 
 #ifdef TCP_RFC7413
 	if (IS_FASTOPEN(tp->t_flags))
 		tp->t_tfo_pending = tcp_fastopen_alloc_counter();
 #endif
 out:
 	TCPDEBUG2(PRU_LISTEN);
 	TCP_PROBE2(debug__user, tp, PRU_LISTEN);
 	INP_WUNLOCK(inp);
 	return (error);
 }
 #endif /* INET */
 
 #ifdef INET6
 static int
 tcp6_usr_listen(struct socket *so, int backlog, struct thread *td)
 {
 	int error = 0;
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 
 	TCPDEBUG0;
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp6_usr_listen: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		error = EINVAL;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 	SOCK_LOCK(so);
 	error = solisten_proto_check(so);
 	INP_HASH_WLOCK(&V_tcbinfo);
 	if (error == 0 && inp->inp_lport == 0) {
 		inp->inp_vflag &= ~INP_IPV4;
 		if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0)
 			inp->inp_vflag |= INP_IPV4;
 		error = in6_pcbbind(inp, (struct sockaddr *)0, td->td_ucred);
 	}
 	INP_HASH_WUNLOCK(&V_tcbinfo);
 	if (error == 0) {
 		tcp_state_change(tp, TCPS_LISTEN);
 		solisten_proto(so, backlog);
 #ifdef TCP_OFFLOAD
 		if ((so->so_options & SO_NO_OFFLOAD) == 0)
 			tcp_offload_listen_start(tp);
 #endif
 	}
 	SOCK_UNLOCK(so);
 
 #ifdef TCP_RFC7413
 	if (IS_FASTOPEN(tp->t_flags))
 		tp->t_tfo_pending = tcp_fastopen_alloc_counter();
 #endif
 out:
 	TCPDEBUG2(PRU_LISTEN);
 	TCP_PROBE2(debug__user, tp, PRU_LISTEN);
 	INP_WUNLOCK(inp);
 	return (error);
 }
 #endif /* INET6 */
 
 #ifdef INET
 /*
  * Initiate connection to peer.
  * Create a template for use in transmissions on this connection.
  * Enter SYN_SENT state, and mark socket as connecting.
  * Start keep-alive timer, and seed output sequence space.
  * Send initial segment on connection.
  */
 static int
 tcp_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	int error = 0;
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 	struct sockaddr_in *sinp;
 
 	sinp = (struct sockaddr_in *)nam;
 	if (nam->sa_len != sizeof (*sinp))
 		return (EINVAL);
 	/*
 	 * Must disallow TCP ``connections'' to multicast addresses.
 	 */
 	if (sinp->sin_family == AF_INET
 	    && IN_MULTICAST(ntohl(sinp->sin_addr.s_addr)))
 		return (EAFNOSUPPORT);
 	if ((error = prison_remote_ip4(td->td_ucred, &sinp->sin_addr)) != 0)
 		return (error);
 
 	TCPDEBUG0;
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_connect: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & INP_TIMEWAIT) {
 		error = EADDRINUSE;
 		goto out;
 	}
 	if (inp->inp_flags & INP_DROPPED) {
 		error = ECONNREFUSED;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 	if ((error = tcp_connect(tp, nam, td)) != 0)
 		goto out;
 #ifdef TCP_OFFLOAD
 	if (registered_toedevs > 0 &&
 	    (so->so_options & SO_NO_OFFLOAD) == 0 &&
 	    (error = tcp_offload_connect(so, nam)) == 0)
 		goto out;
 #endif
 	tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
 	error = tp->t_fb->tfb_tcp_output(tp);
 out:
 	TCPDEBUG2(PRU_CONNECT);
 	TCP_PROBE2(debug__user, tp, PRU_CONNECT);
 	INP_WUNLOCK(inp);
 	return (error);
 }
 #endif /* INET */
 
 #ifdef INET6
 static int
 tcp6_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	int error = 0;
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 	struct sockaddr_in6 *sin6p;
 
 	TCPDEBUG0;
 
 	sin6p = (struct sockaddr_in6 *)nam;
 	if (nam->sa_len != sizeof (*sin6p))
 		return (EINVAL);
 	/*
 	 * Must disallow TCP ``connections'' to multicast addresses.
 	 */
 	if (sin6p->sin6_family == AF_INET6
 	    && IN6_IS_ADDR_MULTICAST(&sin6p->sin6_addr))
 		return (EAFNOSUPPORT);
 
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp6_usr_connect: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & INP_TIMEWAIT) {
 		error = EADDRINUSE;
 		goto out;
 	}
 	if (inp->inp_flags & INP_DROPPED) {
 		error = ECONNREFUSED;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 #ifdef INET
 	/*
 	 * XXXRW: Some confusion: V4/V6 flags relate to binding, and
 	 * therefore probably require the hash lock, which isn't held here.
 	 * Is this a significant problem?
 	 */
 	if (IN6_IS_ADDR_V4MAPPED(&sin6p->sin6_addr)) {
 		struct sockaddr_in sin;
 
 		if ((inp->inp_flags & IN6P_IPV6_V6ONLY) != 0) {
 			error = EINVAL;
 			goto out;
 		}
+		if ((inp->inp_vflag & INP_IPV4) == 0) {
+			error = EAFNOSUPPORT;
+			goto out;
+		}
 
 		in6_sin6_2_sin(&sin, sin6p);
 		inp->inp_vflag |= INP_IPV4;
 		inp->inp_vflag &= ~INP_IPV6;
 		if ((error = prison_remote_ip4(td->td_ucred,
 		    &sin.sin_addr)) != 0)
 			goto out;
 		if ((error = tcp_connect(tp, (struct sockaddr *)&sin, td)) != 0)
 			goto out;
 #ifdef TCP_OFFLOAD
 		if (registered_toedevs > 0 &&
 		    (so->so_options & SO_NO_OFFLOAD) == 0 &&
 		    (error = tcp_offload_connect(so, nam)) == 0)
 			goto out;
 #endif
 		error = tp->t_fb->tfb_tcp_output(tp);
 		goto out;
+	} else {
+		if ((inp->inp_vflag & INP_IPV6) == 0) {
+			error = EAFNOSUPPORT;
+			goto out;
+		}
 	}
 #endif
 	inp->inp_vflag &= ~INP_IPV4;
 	inp->inp_vflag |= INP_IPV6;
 	inp->inp_inc.inc_flags |= INC_ISIPV6;
 	if ((error = prison_remote_ip6(td->td_ucred, &sin6p->sin6_addr)) != 0)
 		goto out;
 	if ((error = tcp6_connect(tp, nam, td)) != 0)
 		goto out;
 #ifdef TCP_OFFLOAD
 	if (registered_toedevs > 0 &&
 	    (so->so_options & SO_NO_OFFLOAD) == 0 &&
 	    (error = tcp_offload_connect(so, nam)) == 0)
 		goto out;
 #endif
 	tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
 	error = tp->t_fb->tfb_tcp_output(tp);
 
 out:
 	TCPDEBUG2(PRU_CONNECT);
 	TCP_PROBE2(debug__user, tp, PRU_CONNECT);
 	INP_WUNLOCK(inp);
 	return (error);
 }
 #endif /* INET6 */
 
 /*
  * Initiate disconnect from peer.
  * If connection never passed embryonic stage, just drop;
  * else if don't need to let data drain, then can just drop anyways,
  * else have to begin TCP shutdown process: mark socket disconnecting,
  * drain unread data, state switch to reflect user close, and
  * send segment (e.g. FIN) to peer.  Socket will be really disconnected
  * when peer sends FIN and acks ours.
  *
  * SHOULD IMPLEMENT LATER PRU_CONNECT VIA REALLOC TCPCB.
  */
 static int
 tcp_usr_disconnect(struct socket *so)
 {
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 	int error = 0;
 
 	TCPDEBUG0;
 	INP_INFO_RLOCK(&V_tcbinfo);
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_disconnect: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & INP_TIMEWAIT)
 		goto out;
 	if (inp->inp_flags & INP_DROPPED) {
 		error = ECONNRESET;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 	tcp_disconnect(tp);
 out:
 	TCPDEBUG2(PRU_DISCONNECT);
 	TCP_PROBE2(debug__user, tp, PRU_DISCONNECT);
 	INP_WUNLOCK(inp);
 	INP_INFO_RUNLOCK(&V_tcbinfo);
 	return (error);
 }
 
 #ifdef INET
 /*
  * Accept a connection.  Essentially all the work is done at higher levels;
  * just return the address of the peer, storing through addr.
  */
 static int
 tcp_usr_accept(struct socket *so, struct sockaddr **nam)
 {
 	int error = 0;
 	struct inpcb *inp = NULL;
 	struct tcpcb *tp = NULL;
 	struct in_addr addr;
 	in_port_t port = 0;
 	TCPDEBUG0;
 
 	if (so->so_state & SS_ISDISCONNECTED)
 		return (ECONNABORTED);
 
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_accept: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		error = ECONNABORTED;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 
 	/*
 	 * We inline in_getpeeraddr and COMMON_END here, so that we can
 	 * copy the data of interest and defer the malloc until after we
 	 * release the lock.
 	 */
 	port = inp->inp_fport;
 	addr = inp->inp_faddr;
 
 out:
 	TCPDEBUG2(PRU_ACCEPT);
 	TCP_PROBE2(debug__user, tp, PRU_ACCEPT);
 	INP_WUNLOCK(inp);
 	if (error == 0)
 		*nam = in_sockaddr(port, &addr);
 	return error;
 }
 #endif /* INET */
 
 #ifdef INET6
 static int
 tcp6_usr_accept(struct socket *so, struct sockaddr **nam)
 {
 	struct inpcb *inp = NULL;
 	int error = 0;
 	struct tcpcb *tp = NULL;
 	struct in_addr addr;
 	struct in6_addr addr6;
 	in_port_t port = 0;
 	int v4 = 0;
 	TCPDEBUG0;
 
 	if (so->so_state & SS_ISDISCONNECTED)
 		return (ECONNABORTED);
 
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp6_usr_accept: inp == NULL"));
 	INP_INFO_RLOCK(&V_tcbinfo);
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		error = ECONNABORTED;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 
 	/*
 	 * We inline in6_mapped_peeraddr and COMMON_END here, so that we can
 	 * copy the data of interest and defer the malloc until after we
 	 * release the lock.
 	 */
 	if (inp->inp_vflag & INP_IPV4) {
 		v4 = 1;
 		port = inp->inp_fport;
 		addr = inp->inp_faddr;
 	} else {
 		port = inp->inp_fport;
 		addr6 = inp->in6p_faddr;
 	}
 
 out:
 	TCPDEBUG2(PRU_ACCEPT);
 	TCP_PROBE2(debug__user, tp, PRU_ACCEPT);
 	INP_WUNLOCK(inp);
 	INP_INFO_RUNLOCK(&V_tcbinfo);
 	if (error == 0) {
 		if (v4)
 			*nam = in6_v4mapsin6_sockaddr(port, &addr);
 		else
 			*nam = in6_sockaddr(port, &addr6);
 	}
 	return error;
 }
 #endif /* INET6 */
 
 /*
  * Mark the connection as being incapable of further output.
  */
 static int
 tcp_usr_shutdown(struct socket *so)
 {
 	int error = 0;
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 
 	TCPDEBUG0;
 	INP_INFO_RLOCK(&V_tcbinfo);
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		error = ECONNRESET;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 	socantsendmore(so);
 	tcp_usrclosed(tp);
 	if (!(inp->inp_flags & INP_DROPPED))
 		error = tp->t_fb->tfb_tcp_output(tp);
 
 out:
 	TCPDEBUG2(PRU_SHUTDOWN);
 	TCP_PROBE2(debug__user, tp, PRU_SHUTDOWN);
 	INP_WUNLOCK(inp);
 	INP_INFO_RUNLOCK(&V_tcbinfo);
 
 	return (error);
 }
 
 /*
  * After a receive, possibly send window update to peer.
  */
 static int
 tcp_usr_rcvd(struct socket *so, int flags)
 {
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 	int error = 0;
 
 	TCPDEBUG0;
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_rcvd: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		error = ECONNRESET;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 #ifdef TCP_RFC7413
 	/*
 	 * For passively-created TFO connections, don't attempt a window
 	 * update while still in SYN_RECEIVED as this may trigger an early
 	 * SYN|ACK.  It is preferable to have the SYN|ACK be sent along with
 	 * application response data, or failing that, when the DELACK timer
 	 * expires.
 	 */
 	if (IS_FASTOPEN(tp->t_flags) &&
 	    (tp->t_state == TCPS_SYN_RECEIVED))
 		goto out;
 #endif
 #ifdef TCP_OFFLOAD
 	if (tp->t_flags & TF_TOE)
 		tcp_offload_rcvd(tp);
 	else
 #endif
 	tp->t_fb->tfb_tcp_output(tp);
 
 out:
 	TCPDEBUG2(PRU_RCVD);
 	TCP_PROBE2(debug__user, tp, PRU_RCVD);
 	INP_WUNLOCK(inp);
 	return (error);
 }
 
 /*
  * Do a send by putting data in output queue and updating urgent
  * marker if URG set.  Possibly send more data.  Unlike the other
  * pru_*() routines, the mbuf chains are our responsibility.  We
  * must either enqueue them or free them.  The other pru_* routines
  * generally are caller-frees.
  */
 static int
 tcp_usr_send(struct socket *so, int flags, struct mbuf *m,
     struct sockaddr *nam, struct mbuf *control, struct thread *td)
 {
 	int error = 0;
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 #ifdef INET6
 	int isipv6;
 #endif
 	TCPDEBUG0;
 
 	/*
 	 * We require the pcbinfo lock if we will close the socket as part of
 	 * this call.
 	 */
 	if (flags & PRUS_EOF)
 		INP_INFO_RLOCK(&V_tcbinfo);
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_send: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		if (control)
 			m_freem(control);
 		/*
 		 * In case of PRUS_NOTREADY, tcp_usr_ready() is responsible
 		 * for freeing memory.
 		 */
 		if (m && (flags & PRUS_NOTREADY) == 0)
 			m_freem(m);
 		error = ECONNRESET;
 		goto out;
 	}
 #ifdef INET6
 	isipv6 = nam && nam->sa_family == AF_INET6;
 #endif /* INET6 */
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 	if (control) {
 		/* TCP doesn't do control messages (rights, creds, etc) */
 		if (control->m_len) {
 			m_freem(control);
 			if (m)
 				m_freem(m);
 			error = EINVAL;
 			goto out;
 		}
 		m_freem(control);	/* empty control, just free it */
 	}
 	if (!(flags & PRUS_OOB)) {
 		sbappendstream(&so->so_snd, m, flags);
 		if (nam && tp->t_state < TCPS_SYN_SENT) {
 			/*
 			 * Do implied connect if not yet connected,
 			 * initialize window to default value, and
 			 * initialize maxseg using peer's cached MSS.
 			 */
 #ifdef INET6
 			if (isipv6)
 				error = tcp6_connect(tp, nam, td);
 #endif /* INET6 */
 #if defined(INET6) && defined(INET)
 			else
 #endif
 #ifdef INET
 				error = tcp_connect(tp, nam, td);
 #endif
 			if (error)
 				goto out;
 			tp->snd_wnd = TTCP_CLIENT_SND_WND;
 			tcp_mss(tp, -1);
 		}
 		if (flags & PRUS_EOF) {
 			/*
 			 * Close the send side of the connection after
 			 * the data is sent.
 			 */
 			INP_INFO_RLOCK_ASSERT(&V_tcbinfo);
 			socantsendmore(so);
 			tcp_usrclosed(tp);
 		}
 		if (!(inp->inp_flags & INP_DROPPED) &&
 		    !(flags & PRUS_NOTREADY)) {
 			if (flags & PRUS_MORETOCOME)
 				tp->t_flags |= TF_MORETOCOME;
 			error = tp->t_fb->tfb_tcp_output(tp);
 			if (flags & PRUS_MORETOCOME)
 				tp->t_flags &= ~TF_MORETOCOME;
 		}
 	} else {
 		/*
 		 * XXXRW: PRUS_EOF not implemented with PRUS_OOB?
 		 */
 		SOCKBUF_LOCK(&so->so_snd);
 		if (sbspace(&so->so_snd) < -512) {
 			SOCKBUF_UNLOCK(&so->so_snd);
 			m_freem(m);
 			error = ENOBUFS;
 			goto out;
 		}
 		/*
 		 * According to RFC961 (Assigned Protocols),
 		 * the urgent pointer points to the last octet
 		 * of urgent data.  We continue, however,
 		 * to consider it to indicate the first octet
 		 * of data past the urgent section.
 		 * Otherwise, snd_up should be one lower.
 		 */
 		sbappendstream_locked(&so->so_snd, m, flags);
 		SOCKBUF_UNLOCK(&so->so_snd);
 		if (nam && tp->t_state < TCPS_SYN_SENT) {
 			/*
 			 * Do implied connect if not yet connected,
 			 * initialize window to default value, and
 			 * initialize maxseg using peer's cached MSS.
 			 */
 #ifdef INET6
 			if (isipv6)
 				error = tcp6_connect(tp, nam, td);
 #endif /* INET6 */
 #if defined(INET6) && defined(INET)
 			else
 #endif
 #ifdef INET
 				error = tcp_connect(tp, nam, td);
 #endif
 			if (error)
 				goto out;
 			tp->snd_wnd = TTCP_CLIENT_SND_WND;
 			tcp_mss(tp, -1);
 		}
 		tp->snd_up = tp->snd_una + sbavail(&so->so_snd);
 		if (!(flags & PRUS_NOTREADY)) {
 			tp->t_flags |= TF_FORCEDATA;
 			error = tp->t_fb->tfb_tcp_output(tp);
 			tp->t_flags &= ~TF_FORCEDATA;
 		}
 	}
 out:
 	TCPDEBUG2((flags & PRUS_OOB) ? PRU_SENDOOB :
 		  ((flags & PRUS_EOF) ? PRU_SEND_EOF : PRU_SEND));
 	TCP_PROBE2(debug__user, tp, (flags & PRUS_OOB) ? PRU_SENDOOB :
 		   ((flags & PRUS_EOF) ? PRU_SEND_EOF : PRU_SEND));
 	INP_WUNLOCK(inp);
 	if (flags & PRUS_EOF)
 		INP_INFO_RUNLOCK(&V_tcbinfo);
 	return (error);
 }
 
 static int
 tcp_usr_ready(struct socket *so, struct mbuf *m, int count)
 {
 	struct inpcb *inp;
 	struct tcpcb *tp;
 	int error;
 
 	inp = sotoinpcb(so);
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		INP_WUNLOCK(inp);
 		for (int i = 0; i < count; i++)
 			m = m_free(m);
 		return (ECONNRESET);
 	}
 	tp = intotcpcb(inp);
 
 	SOCKBUF_LOCK(&so->so_snd);
 	error = sbready(&so->so_snd, m, count);
 	SOCKBUF_UNLOCK(&so->so_snd);
 	if (error == 0)
 		error = tp->t_fb->tfb_tcp_output(tp);
 	INP_WUNLOCK(inp);
 
 	return (error);
 }
 
 /*
  * Abort the TCP.  Drop the connection abruptly.
  */
 static void
 tcp_usr_abort(struct socket *so)
 {
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 	TCPDEBUG0;
 
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_abort: inp == NULL"));
 
 	INP_INFO_RLOCK(&V_tcbinfo);
 	INP_WLOCK(inp);
 	KASSERT(inp->inp_socket != NULL,
 	    ("tcp_usr_abort: inp_socket == NULL"));
 
 	/*
 	 * If we still have full TCP state, and we're not dropped, drop.
 	 */
 	if (!(inp->inp_flags & INP_TIMEWAIT) &&
 	    !(inp->inp_flags & INP_DROPPED)) {
 		tp = intotcpcb(inp);
 		TCPDEBUG1();
 		tcp_drop(tp, ECONNABORTED);
 		TCPDEBUG2(PRU_ABORT);
 		TCP_PROBE2(debug__user, tp, PRU_ABORT);
 	}
 	if (!(inp->inp_flags & INP_DROPPED)) {
 		SOCK_LOCK(so);
 		so->so_state |= SS_PROTOREF;
 		SOCK_UNLOCK(so);
 		inp->inp_flags |= INP_SOCKREF;
 	}
 	INP_WUNLOCK(inp);
 	INP_INFO_RUNLOCK(&V_tcbinfo);
 }
 
 /*
  * TCP socket is closed.  Start friendly disconnect.
  */
 static void
 tcp_usr_close(struct socket *so)
 {
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 	TCPDEBUG0;
 
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_close: inp == NULL"));
 
 	INP_INFO_RLOCK(&V_tcbinfo);
 	INP_WLOCK(inp);
 	KASSERT(inp->inp_socket != NULL,
 	    ("tcp_usr_close: inp_socket == NULL"));
 
 	/*
 	 * If we still have full TCP state, and we're not dropped, initiate
 	 * a disconnect.
 	 */
 	if (!(inp->inp_flags & INP_TIMEWAIT) &&
 	    !(inp->inp_flags & INP_DROPPED)) {
 		tp = intotcpcb(inp);
 		TCPDEBUG1();
 		tcp_disconnect(tp);
 		TCPDEBUG2(PRU_CLOSE);
 		TCP_PROBE2(debug__user, tp, PRU_CLOSE);
 	}
 	if (!(inp->inp_flags & INP_DROPPED)) {
 		SOCK_LOCK(so);
 		so->so_state |= SS_PROTOREF;
 		SOCK_UNLOCK(so);
 		inp->inp_flags |= INP_SOCKREF;
 	}
 	INP_WUNLOCK(inp);
 	INP_INFO_RUNLOCK(&V_tcbinfo);
 }
 
 /*
  * Receive out-of-band data.
  */
 static int
 tcp_usr_rcvoob(struct socket *so, struct mbuf *m, int flags)
 {
 	int error = 0;
 	struct inpcb *inp;
 	struct tcpcb *tp = NULL;
 
 	TCPDEBUG0;
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_rcvoob: inp == NULL"));
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		error = ECONNRESET;
 		goto out;
 	}
 	tp = intotcpcb(inp);
 	TCPDEBUG1();
 	if ((so->so_oobmark == 0 &&
 	     (so->so_rcv.sb_state & SBS_RCVATMARK) == 0) ||
 	    so->so_options & SO_OOBINLINE ||
 	    tp->t_oobflags & TCPOOB_HADDATA) {
 		error = EINVAL;
 		goto out;
 	}
 	if ((tp->t_oobflags & TCPOOB_HAVEDATA) == 0) {
 		error = EWOULDBLOCK;
 		goto out;
 	}
 	m->m_len = 1;
 	*mtod(m, caddr_t) = tp->t_iobc;
 	if ((flags & MSG_PEEK) == 0)
 		tp->t_oobflags ^= (TCPOOB_HAVEDATA | TCPOOB_HADDATA);
 
 out:
 	TCPDEBUG2(PRU_RCVOOB);
 	TCP_PROBE2(debug__user, tp, PRU_RCVOOB);
 	INP_WUNLOCK(inp);
 	return (error);
 }
 
 #ifdef INET
 struct pr_usrreqs tcp_usrreqs = {
 	.pru_abort =		tcp_usr_abort,
 	.pru_accept =		tcp_usr_accept,
 	.pru_attach =		tcp_usr_attach,
 	.pru_bind =		tcp_usr_bind,
 	.pru_connect =		tcp_usr_connect,
 	.pru_control =		in_control,
 	.pru_detach =		tcp_usr_detach,
 	.pru_disconnect =	tcp_usr_disconnect,
 	.pru_listen =		tcp_usr_listen,
 	.pru_peeraddr =		in_getpeeraddr,
 	.pru_rcvd =		tcp_usr_rcvd,
 	.pru_rcvoob =		tcp_usr_rcvoob,
 	.pru_send =		tcp_usr_send,
 	.pru_ready =		tcp_usr_ready,
 	.pru_shutdown =		tcp_usr_shutdown,
 	.pru_sockaddr =		in_getsockaddr,
 	.pru_sosetlabel =	in_pcbsosetlabel,
 	.pru_close =		tcp_usr_close,
 };
 #endif /* INET */
 
 #ifdef INET6
 struct pr_usrreqs tcp6_usrreqs = {
 	.pru_abort =		tcp_usr_abort,
 	.pru_accept =		tcp6_usr_accept,
 	.pru_attach =		tcp_usr_attach,
 	.pru_bind =		tcp6_usr_bind,
 	.pru_connect =		tcp6_usr_connect,
 	.pru_control =		in6_control,
 	.pru_detach =		tcp_usr_detach,
 	.pru_disconnect =	tcp_usr_disconnect,
 	.pru_listen =		tcp6_usr_listen,
 	.pru_peeraddr =		in6_mapped_peeraddr,
 	.pru_rcvd =		tcp_usr_rcvd,
 	.pru_rcvoob =		tcp_usr_rcvoob,
 	.pru_send =		tcp_usr_send,
 	.pru_ready =		tcp_usr_ready,
 	.pru_shutdown =		tcp_usr_shutdown,
 	.pru_sockaddr =		in6_mapped_sockaddr,
 	.pru_sosetlabel =	in_pcbsosetlabel,
 	.pru_close =		tcp_usr_close,
 };
 #endif /* INET6 */
 
 #ifdef INET
 /*
  * Common subroutine to open a TCP connection to remote host specified
  * by struct sockaddr_in in mbuf *nam.  Call in_pcbbind to assign a local
  * port number if needed.  Call in_pcbconnect_setup to do the routing and
  * to choose a local host address (interface).  If there is an existing
  * incarnation of the same connection in TIME-WAIT state and if the remote
  * host was sending CC options and if the connection duration was < MSL, then
  * truncate the previous TIME-WAIT state and proceed.
  * Initialize connection parameters and enter SYN-SENT state.
  */
 static int
 tcp_connect(struct tcpcb *tp, struct sockaddr *nam, struct thread *td)
 {
 	struct inpcb *inp = tp->t_inpcb, *oinp;
 	struct socket *so = inp->inp_socket;
 	struct in_addr laddr;
 	u_short lport;
 	int error;
 
 	INP_WLOCK_ASSERT(inp);
 	INP_HASH_WLOCK(&V_tcbinfo);
 
 	if (inp->inp_lport == 0) {
 		error = in_pcbbind(inp, (struct sockaddr *)0, td->td_ucred);
 		if (error)
 			goto out;
 	}
 
 	/*
 	 * Cannot simply call in_pcbconnect, because there might be an
 	 * earlier incarnation of this same connection still in
 	 * TIME_WAIT state, creating an ADDRINUSE error.
 	 */
 	laddr = inp->inp_laddr;
 	lport = inp->inp_lport;
 	error = in_pcbconnect_setup(inp, nam, &laddr.s_addr, &lport,
 	    &inp->inp_faddr.s_addr, &inp->inp_fport, &oinp, td->td_ucred);
 	if (error && oinp == NULL)
 		goto out;
 	if (oinp) {
 		error = EADDRINUSE;
 		goto out;
 	}
 	inp->inp_laddr = laddr;
 	in_pcbrehash(inp);
 	INP_HASH_WUNLOCK(&V_tcbinfo);
 
 	/*
 	 * Compute window scaling to request:
 	 * Scale to fit into sweet spot.  See tcp_syncache.c.
 	 * XXX: This should move to tcp_output().
 	 */
 	while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
 	    (TCP_MAXWIN << tp->request_r_scale) < sb_max)
 		tp->request_r_scale++;
 
 	soisconnecting(so);
 	TCPSTAT_INC(tcps_connattempt);
 	tcp_state_change(tp, TCPS_SYN_SENT);
 	tp->iss = tcp_new_isn(tp);
 	tcp_sendseqinit(tp);
 
 	return 0;
 
 out:
 	INP_HASH_WUNLOCK(&V_tcbinfo);
 	return (error);
 }
 #endif /* INET */
 
 #ifdef INET6
 static int
 tcp6_connect(struct tcpcb *tp, struct sockaddr *nam, struct thread *td)
 {
 	struct inpcb *inp = tp->t_inpcb;
 	int error;
 
 	INP_WLOCK_ASSERT(inp);
 	INP_HASH_WLOCK(&V_tcbinfo);
 
 	if (inp->inp_lport == 0) {
 		error = in6_pcbbind(inp, (struct sockaddr *)0, td->td_ucred);
 		if (error)
 			goto out;
 	}
 	error = in6_pcbconnect(inp, nam, td->td_ucred);
 	if (error != 0)
 		goto out;
 	INP_HASH_WUNLOCK(&V_tcbinfo);
 
 	/* Compute window scaling to request.  */
 	while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
 	    (TCP_MAXWIN << tp->request_r_scale) < sb_max)
 		tp->request_r_scale++;
 
 	soisconnecting(inp->inp_socket);
 	TCPSTAT_INC(tcps_connattempt);
 	tcp_state_change(tp, TCPS_SYN_SENT);
 	tp->iss = tcp_new_isn(tp);
 	tcp_sendseqinit(tp);
 
 	return 0;
 
 out:
 	INP_HASH_WUNLOCK(&V_tcbinfo);
 	return error;
 }
 #endif /* INET6 */
 
 /*
  * Export TCP internal state information via a struct tcp_info, based on the
  * Linux 2.6 API.  Not ABI compatible as our constants are mapped differently
  * (TCP state machine, etc).  We export all information using FreeBSD-native
  * constants -- for example, the numeric values for tcpi_state will differ
  * from Linux.
  */
 static void
 tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti)
 {
 
 	INP_WLOCK_ASSERT(tp->t_inpcb);
 	bzero(ti, sizeof(*ti));
 
 	ti->tcpi_state = tp->t_state;
 	if ((tp->t_flags & TF_REQ_TSTMP) && (tp->t_flags & TF_RCVD_TSTMP))
 		ti->tcpi_options |= TCPI_OPT_TIMESTAMPS;
 	if (tp->t_flags & TF_SACK_PERMIT)
 		ti->tcpi_options |= TCPI_OPT_SACK;
 	if ((tp->t_flags & TF_REQ_SCALE) && (tp->t_flags & TF_RCVD_SCALE)) {
 		ti->tcpi_options |= TCPI_OPT_WSCALE;
 		ti->tcpi_snd_wscale = tp->snd_scale;
 		ti->tcpi_rcv_wscale = tp->rcv_scale;
 	}
 	if (tp->t_flags & TF_ECN_PERMIT)
 		ti->tcpi_options |= TCPI_OPT_ECN;
 
 	ti->tcpi_rto = tp->t_rxtcur * tick;
 	ti->tcpi_last_data_recv = ((uint32_t)ticks - tp->t_rcvtime) * tick;
 	ti->tcpi_rtt = ((u_int64_t)tp->t_srtt * tick) >> TCP_RTT_SHIFT;
 	ti->tcpi_rttvar = ((u_int64_t)tp->t_rttvar * tick) >> TCP_RTTVAR_SHIFT;
 
 	ti->tcpi_snd_ssthresh = tp->snd_ssthresh;
 	ti->tcpi_snd_cwnd = tp->snd_cwnd;
 
 	/*
 	 * FreeBSD-specific extension fields for tcp_info.
 	 */
 	ti->tcpi_rcv_space = tp->rcv_wnd;
 	ti->tcpi_rcv_nxt = tp->rcv_nxt;
 	ti->tcpi_snd_wnd = tp->snd_wnd;
 	ti->tcpi_snd_bwnd = 0;		/* Unused, kept for compat. */
 	ti->tcpi_snd_nxt = tp->snd_nxt;
 	ti->tcpi_snd_mss = tp->t_maxseg;
 	ti->tcpi_rcv_mss = tp->t_maxseg;
 	if (tp->t_flags & TF_TOE)
 		ti->tcpi_options |= TCPI_OPT_TOE;
 	ti->tcpi_snd_rexmitpack = tp->t_sndrexmitpack;
 	ti->tcpi_rcv_ooopack = tp->t_rcvoopack;
 	ti->tcpi_snd_zerowin = tp->t_sndzerowin;
 }
 
 /*
  * tcp_ctloutput() must drop the inpcb lock before performing copyin on
  * socket option arguments.  When it re-acquires the lock after the copy, it
  * has to revalidate that the connection is still valid for the socket
  * option.
  */
 #define INP_WLOCK_RECHECK_CLEANUP(inp, cleanup) do {			\
 	INP_WLOCK(inp);							\
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {		\
 		INP_WUNLOCK(inp);					\
 		cleanup;						\
 		return (ECONNRESET);					\
 	}								\
 	tp = intotcpcb(inp);						\
 } while(0)
 #define INP_WLOCK_RECHECK(inp) INP_WLOCK_RECHECK_CLEANUP((inp), /* noop */)
 
 int
 tcp_ctloutput(struct socket *so, struct sockopt *sopt)
 {
 	int	error;
 	struct	inpcb *inp;
 	struct	tcpcb *tp;
 	struct tcp_function_block *blk;
 	struct tcp_function_set fsn;
 
 	error = 0;
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_ctloutput: inp == NULL"));
 	INP_WLOCK(inp);
 	if (sopt->sopt_level != IPPROTO_TCP) {
 #ifdef INET6
 		if (inp->inp_vflag & INP_IPV6PROTO) {
 			INP_WUNLOCK(inp);
 			error = ip6_ctloutput(so, sopt);
 		}
 #endif /* INET6 */
 #if defined(INET6) && defined(INET)
 		else
 #endif
 #ifdef INET
 		{
 			INP_WUNLOCK(inp);
 			error = ip_ctloutput(so, sopt);
 		}
 #endif
 		return (error);
 	}
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		INP_WUNLOCK(inp);
 		return (ECONNRESET);
 	}
 	tp = intotcpcb(inp);
 	/*
 	 * Protect the TCP option TCP_FUNCTION_BLK so
 	 * that a sub-function can *never* overwrite this.
 	 */
 	if ((sopt->sopt_dir == SOPT_SET) && 
 	    (sopt->sopt_name == TCP_FUNCTION_BLK)) {
 		INP_WUNLOCK(inp);
 		error = sooptcopyin(sopt, &fsn, sizeof fsn,
 		    sizeof fsn);
 		if (error)
 			return (error);
 		INP_WLOCK_RECHECK(inp);
 		blk = find_and_ref_tcp_functions(&fsn);
 		if (blk == NULL) {
 			INP_WUNLOCK(inp);
 			return (ENOENT);
 		}
 		if (tp->t_fb == blk) {
 			/* You already have this */
 			refcount_release(&blk->tfb_refcnt);
 			INP_WUNLOCK(inp);
 			return (0);
 		}
 		if (tp->t_state != TCPS_CLOSED) {
 			int error=EINVAL;
 			/* 
 			 * The user has advanced the state
 			 * past the initial point, we may not
 			 * be able to switch. 
 			 */
 			if (blk->tfb_tcp_handoff_ok != NULL) {
 				/* 
 				 * Does the stack provide a
 				 * query mechanism, if so it may
 				 * still be possible?
 				 */
 				error = (*blk->tfb_tcp_handoff_ok)(tp);
 			}
 			if (error) {
 				refcount_release(&blk->tfb_refcnt);
 				INP_WUNLOCK(inp);
 				return(error);
 			}
 		}
 		if (blk->tfb_flags & TCP_FUNC_BEING_REMOVED) {
 			refcount_release(&blk->tfb_refcnt);
 			INP_WUNLOCK(inp);
 			return (ENOENT);
 		}
 		/* 
 		 * Release the old refcnt, the
 		 * lookup acquired a ref on the
 		 * new one already.
 		 */
 		if (tp->t_fb->tfb_tcp_fb_fini) {
 			/* 
 			 * Tell the stack to cleanup with 0 i.e.
 			 * the tcb is not going away.
 			 */
 			(*tp->t_fb->tfb_tcp_fb_fini)(tp, 0);
 		}
 		refcount_release(&tp->t_fb->tfb_refcnt);
 		tp->t_fb = blk;
 		if (tp->t_fb->tfb_tcp_fb_init) {
 			(*tp->t_fb->tfb_tcp_fb_init)(tp);
 		}
 #ifdef TCP_OFFLOAD
 		if (tp->t_flags & TF_TOE) {
 			tcp_offload_ctloutput(tp, sopt->sopt_dir,
 			     sopt->sopt_name);
 		}
 #endif
 		INP_WUNLOCK(inp);
 		return (error);
 	} else if ((sopt->sopt_dir == SOPT_GET) && 
 	    (sopt->sopt_name == TCP_FUNCTION_BLK)) {
 		strcpy(fsn.function_set_name, tp->t_fb->tfb_tcp_block_name);
 		fsn.pcbcnt = tp->t_fb->tfb_refcnt;
 		INP_WUNLOCK(inp);
 		error = sooptcopyout(sopt, &fsn, sizeof fsn);
 		return (error);
 	}
 	/* Pass in the INP locked, called must unlock it */
 	return (tp->t_fb->tfb_tcp_ctloutput(so, sopt, inp, tp));
 }
 
 int
 tcp_default_ctloutput(struct socket *so, struct sockopt *sopt, struct inpcb *inp, struct tcpcb *tp)
 {
 	int	error, opt, optval;
 	u_int	ui;
 	struct	tcp_info ti;
 	struct cc_algo *algo;
 	char	*pbuf, buf[TCP_CA_NAME_MAX];
 	size_t	len;
 
 	/*
 	 * For TCP_CCALGOOPT forward the control to CC module, for both
 	 * SOPT_SET and SOPT_GET.
 	 */
 	switch (sopt->sopt_name) {
 	case TCP_CCALGOOPT:
 		INP_WUNLOCK(inp);
 		pbuf = malloc(sopt->sopt_valsize, M_TEMP, M_WAITOK | M_ZERO);
 		error = sooptcopyin(sopt, pbuf, sopt->sopt_valsize,
 		    sopt->sopt_valsize);
 		if (error) {
 			free(pbuf, M_TEMP);
 			return (error);
 		}
 		INP_WLOCK_RECHECK_CLEANUP(inp, free(pbuf, M_TEMP));
 		if (CC_ALGO(tp)->ctl_output != NULL)
 			error = CC_ALGO(tp)->ctl_output(tp->ccv, sopt, pbuf);
 		else
 			error = ENOENT;
 		INP_WUNLOCK(inp);
 		if (error == 0 && sopt->sopt_dir == SOPT_GET)
 			error = sooptcopyout(sopt, pbuf, sopt->sopt_valsize);
 		free(pbuf, M_TEMP);
 		return (error);
 	}
 
 	switch (sopt->sopt_dir) {
 	case SOPT_SET:
 		switch (sopt->sopt_name) {
 #if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE)
 		case TCP_MD5SIG:
 			if (!TCPMD5_ENABLED()) {
 				INP_WUNLOCK(inp);
 				return (ENOPROTOOPT);
 			}
 			error = TCPMD5_PCBCTL(inp, sopt);
 			if (error)
 				return (error);
 			goto unlock_and_done;
 #endif /* IPSEC */
 
 		case TCP_NODELAY:
 		case TCP_NOOPT:
 			INP_WUNLOCK(inp);
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 			    sizeof optval);
 			if (error)
 				return (error);
 
 			INP_WLOCK_RECHECK(inp);
 			switch (sopt->sopt_name) {
 			case TCP_NODELAY:
 				opt = TF_NODELAY;
 				break;
 			case TCP_NOOPT:
 				opt = TF_NOOPT;
 				break;
 			default:
 				opt = 0; /* dead code to fool gcc */
 				break;
 			}
 
 			if (optval)
 				tp->t_flags |= opt;
 			else
 				tp->t_flags &= ~opt;
 unlock_and_done:
 #ifdef TCP_OFFLOAD
 			if (tp->t_flags & TF_TOE) {
 				tcp_offload_ctloutput(tp, sopt->sopt_dir,
 				    sopt->sopt_name);
 			}
 #endif
 			INP_WUNLOCK(inp);
 			break;
 
 		case TCP_NOPUSH:
 			INP_WUNLOCK(inp);
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 			    sizeof optval);
 			if (error)
 				return (error);
 
 			INP_WLOCK_RECHECK(inp);
 			if (optval)
 				tp->t_flags |= TF_NOPUSH;
 			else if (tp->t_flags & TF_NOPUSH) {
 				tp->t_flags &= ~TF_NOPUSH;
 				if (TCPS_HAVEESTABLISHED(tp->t_state))
 					error = tp->t_fb->tfb_tcp_output(tp);
 			}
 			goto unlock_and_done;
 
 		case TCP_MAXSEG:
 			INP_WUNLOCK(inp);
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 			    sizeof optval);
 			if (error)
 				return (error);
 
 			INP_WLOCK_RECHECK(inp);
 			if (optval > 0 && optval <= tp->t_maxseg &&
 			    optval + 40 >= V_tcp_minmss)
 				tp->t_maxseg = optval;
 			else
 				error = EINVAL;
 			goto unlock_and_done;
 
 		case TCP_INFO:
 			INP_WUNLOCK(inp);
 			error = EINVAL;
 			break;
 
 		case TCP_CONGESTION:
 			INP_WUNLOCK(inp);
 			error = sooptcopyin(sopt, buf, TCP_CA_NAME_MAX - 1, 1);
 			if (error)
 				break;
 			buf[sopt->sopt_valsize] = '\0';
 			INP_WLOCK_RECHECK(inp);
 			CC_LIST_RLOCK();
 			STAILQ_FOREACH(algo, &cc_list, entries)
 				if (strncmp(buf, algo->name,
 				    TCP_CA_NAME_MAX) == 0)
 					break;
 			CC_LIST_RUNLOCK();
 			if (algo == NULL) {
 				INP_WUNLOCK(inp);
 				error = EINVAL;
 				break;
 			}
 			/*
 			 * We hold a write lock over the tcb so it's safe to
 			 * do these things without ordering concerns.
 			 */
 			if (CC_ALGO(tp)->cb_destroy != NULL)
 				CC_ALGO(tp)->cb_destroy(tp->ccv);
 			CC_ALGO(tp) = algo;
 			/*
 			 * If something goes pear shaped initialising the new
 			 * algo, fall back to newreno (which does not
 			 * require initialisation).
 			 */
 			if (algo->cb_init != NULL &&
 			    algo->cb_init(tp->ccv) != 0) {
 				CC_ALGO(tp) = &newreno_cc_algo;
 				/*
 				 * The only reason init should fail is
 				 * because of malloc.
 				 */
 				error = ENOMEM;
 			}
 			INP_WUNLOCK(inp);
 			break;
 
 		case TCP_KEEPIDLE:
 		case TCP_KEEPINTVL:
 		case TCP_KEEPINIT:
 			INP_WUNLOCK(inp);
 			error = sooptcopyin(sopt, &ui, sizeof(ui), sizeof(ui));
 			if (error)
 				return (error);
 
 			if (ui > (UINT_MAX / hz)) {
 				error = EINVAL;
 				break;
 			}
 			ui *= hz;
 
 			INP_WLOCK_RECHECK(inp);
 			switch (sopt->sopt_name) {
 			case TCP_KEEPIDLE:
 				tp->t_keepidle = ui;
 				/*
 				 * XXX: better check current remaining
 				 * timeout and "merge" it with new value.
 				 */
 				if ((tp->t_state > TCPS_LISTEN) &&
 				    (tp->t_state <= TCPS_CLOSING))
 					tcp_timer_activate(tp, TT_KEEP,
 					    TP_KEEPIDLE(tp));
 				break;
 			case TCP_KEEPINTVL:
 				tp->t_keepintvl = ui;
 				if ((tp->t_state == TCPS_FIN_WAIT_2) &&
 				    (TP_MAXIDLE(tp) > 0))
 					tcp_timer_activate(tp, TT_2MSL,
 					    TP_MAXIDLE(tp));
 				break;
 			case TCP_KEEPINIT:
 				tp->t_keepinit = ui;
 				if (tp->t_state == TCPS_SYN_RECEIVED ||
 				    tp->t_state == TCPS_SYN_SENT)
 					tcp_timer_activate(tp, TT_KEEP,
 					    TP_KEEPINIT(tp));
 				break;
 			}
 			goto unlock_and_done;
 
 		case TCP_KEEPCNT:
 			INP_WUNLOCK(inp);
 			error = sooptcopyin(sopt, &ui, sizeof(ui), sizeof(ui));
 			if (error)
 				return (error);
 
 			INP_WLOCK_RECHECK(inp);
 			tp->t_keepcnt = ui;
 			if ((tp->t_state == TCPS_FIN_WAIT_2) &&
 			    (TP_MAXIDLE(tp) > 0))
 				tcp_timer_activate(tp, TT_2MSL,
 				    TP_MAXIDLE(tp));
 			goto unlock_and_done;
 
 #ifdef TCPPCAP
 		case TCP_PCAP_OUT:
 		case TCP_PCAP_IN:
 			INP_WUNLOCK(inp);
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 			    sizeof optval);
 			if (error)
 				return (error);
 
 			INP_WLOCK_RECHECK(inp);
 			if (optval >= 0)
 				tcp_pcap_set_sock_max(TCP_PCAP_OUT ?
 					&(tp->t_outpkts) : &(tp->t_inpkts),
 					optval);
 			else
 				error = EINVAL;
 			goto unlock_and_done;
 #endif
 
 #ifdef TCP_RFC7413
 		case TCP_FASTOPEN:
 			INP_WUNLOCK(inp);
 			if (!V_tcp_fastopen_enabled)
 				return (EPERM);
 
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 			    sizeof optval);
 			if (error)
 				return (error);
 
 			INP_WLOCK_RECHECK(inp);
 			if (optval) {
 				tp->t_flags |= TF_FASTOPEN;
 				if ((tp->t_state == TCPS_LISTEN) &&
 				    (tp->t_tfo_pending == NULL))
 					tp->t_tfo_pending =
 					    tcp_fastopen_alloc_counter();
 			} else
 				tp->t_flags &= ~TF_FASTOPEN;
 			goto unlock_and_done;
 #endif
 
 		default:
 			INP_WUNLOCK(inp);
 			error = ENOPROTOOPT;
 			break;
 		}
 		break;
 
 	case SOPT_GET:
 		tp = intotcpcb(inp);
 		switch (sopt->sopt_name) {
 #if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE)
 		case TCP_MD5SIG:
 			if (!TCPMD5_ENABLED()) {
 				INP_WUNLOCK(inp);
 				return (ENOPROTOOPT);
 			}
 			error = TCPMD5_PCBCTL(inp, sopt);
 			break;
 #endif
 
 		case TCP_NODELAY:
 			optval = tp->t_flags & TF_NODELAY;
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, &optval, sizeof optval);
 			break;
 		case TCP_MAXSEG:
 			optval = tp->t_maxseg;
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, &optval, sizeof optval);
 			break;
 		case TCP_NOOPT:
 			optval = tp->t_flags & TF_NOOPT;
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, &optval, sizeof optval);
 			break;
 		case TCP_NOPUSH:
 			optval = tp->t_flags & TF_NOPUSH;
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, &optval, sizeof optval);
 			break;
 		case TCP_INFO:
 			tcp_fill_info(tp, &ti);
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, &ti, sizeof ti);
 			break;
 		case TCP_CONGESTION:
 			len = strlcpy(buf, CC_ALGO(tp)->name, TCP_CA_NAME_MAX);
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, buf, len + 1);
 			break;
 		case TCP_KEEPIDLE:
 		case TCP_KEEPINTVL:
 		case TCP_KEEPINIT:
 		case TCP_KEEPCNT:
 			switch (sopt->sopt_name) {
 			case TCP_KEEPIDLE:
 				ui = TP_KEEPIDLE(tp) / hz;
 				break;
 			case TCP_KEEPINTVL:
 				ui = TP_KEEPINTVL(tp) / hz;
 				break;
 			case TCP_KEEPINIT:
 				ui = TP_KEEPINIT(tp) / hz;
 				break;
 			case TCP_KEEPCNT:
 				ui = TP_KEEPCNT(tp);
 				break;
 			}
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, &ui, sizeof(ui));
 			break;
 #ifdef TCPPCAP
 		case TCP_PCAP_OUT:
 		case TCP_PCAP_IN:
 			optval = tcp_pcap_get_sock_max(TCP_PCAP_OUT ?
 					&(tp->t_outpkts) : &(tp->t_inpkts));
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, &optval, sizeof optval);
 			break;
 #endif
 
 #ifdef TCP_RFC7413
 		case TCP_FASTOPEN:
 			optval = tp->t_flags & TF_FASTOPEN;
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, &optval, sizeof optval);
 			break;
 #endif
 		default:
 			INP_WUNLOCK(inp);
 			error = ENOPROTOOPT;
 			break;
 		}
 		break;
 	}
 	return (error);
 }
 #undef INP_WLOCK_RECHECK
 #undef INP_WLOCK_RECHECK_CLEANUP
 
 /*
  * Attach TCP protocol to socket, allocating
  * internet protocol control block, tcp control block,
  * bufer space, and entering LISTEN state if to accept connections.
  */
 static int
 tcp_attach(struct socket *so)
 {
 	struct tcpcb *tp;
 	struct inpcb *inp;
 	int error;
 
 	if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
 		error = soreserve(so, V_tcp_sendspace, V_tcp_recvspace);
 		if (error)
 			return (error);
 	}
 	so->so_rcv.sb_flags |= SB_AUTOSIZE;
 	so->so_snd.sb_flags |= SB_AUTOSIZE;
 	INP_INFO_RLOCK(&V_tcbinfo);
 	error = in_pcballoc(so, &V_tcbinfo);
 	if (error) {
 		INP_INFO_RUNLOCK(&V_tcbinfo);
 		return (error);
 	}
 	inp = sotoinpcb(so);
 #ifdef INET6
 	if (inp->inp_vflag & INP_IPV6PROTO) {
 		inp->inp_vflag |= INP_IPV6;
 		inp->in6p_hops = -1;	/* use kernel default */
 	}
 	else
 #endif
 	inp->inp_vflag |= INP_IPV4;
 	tp = tcp_newtcpcb(inp);
 	if (tp == NULL) {
 		in_pcbdetach(inp);
 		in_pcbfree(inp);
 		INP_INFO_RUNLOCK(&V_tcbinfo);
 		return (ENOBUFS);
 	}
 	tp->t_state = TCPS_CLOSED;
 	INP_WUNLOCK(inp);
 	INP_INFO_RUNLOCK(&V_tcbinfo);
 	TCPSTATES_INC(TCPS_CLOSED);
 	return (0);
 }
 
 /*
  * Initiate (or continue) disconnect.
  * If embryonic state, just send reset (once).
  * If in ``let data drain'' option and linger null, just drop.
  * Otherwise (hard), mark socket disconnecting and drop
  * current input data; switch states based on user close, and
  * send segment to peer (with FIN).
  */
 static void
 tcp_disconnect(struct tcpcb *tp)
 {
 	struct inpcb *inp = tp->t_inpcb;
 	struct socket *so = inp->inp_socket;
 
 	INP_INFO_RLOCK_ASSERT(&V_tcbinfo);
 	INP_WLOCK_ASSERT(inp);
 
 	/*
 	 * Neither tcp_close() nor tcp_drop() should return NULL, as the
 	 * socket is still open.
 	 */
 	if (tp->t_state < TCPS_ESTABLISHED) {
 		tp = tcp_close(tp);
 		KASSERT(tp != NULL,
 		    ("tcp_disconnect: tcp_close() returned NULL"));
 	} else if ((so->so_options & SO_LINGER) && so->so_linger == 0) {
 		tp = tcp_drop(tp, 0);
 		KASSERT(tp != NULL,
 		    ("tcp_disconnect: tcp_drop() returned NULL"));
 	} else {
 		soisdisconnecting(so);
 		sbflush(&so->so_rcv);
 		tcp_usrclosed(tp);
 		if (!(inp->inp_flags & INP_DROPPED))
 			tp->t_fb->tfb_tcp_output(tp);
 	}
 }
 
 /*
  * User issued close, and wish to trail through shutdown states:
  * if never received SYN, just forget it.  If got a SYN from peer,
  * but haven't sent FIN, then go to FIN_WAIT_1 state to send peer a FIN.
  * If already got a FIN from peer, then almost done; go to LAST_ACK
  * state.  In all other cases, have already sent FIN to peer (e.g.
  * after PRU_SHUTDOWN), and just have to play tedious game waiting
  * for peer to send FIN or not respond to keep-alives, etc.
  * We can let the user exit from the close as soon as the FIN is acked.
  */
 static void
 tcp_usrclosed(struct tcpcb *tp)
 {
 
 	INP_INFO_RLOCK_ASSERT(&V_tcbinfo);
 	INP_WLOCK_ASSERT(tp->t_inpcb);
 
 	switch (tp->t_state) {
 	case TCPS_LISTEN:
 #ifdef TCP_OFFLOAD
 		tcp_offload_listen_stop(tp);
 #endif
 		tcp_state_change(tp, TCPS_CLOSED);
 		/* FALLTHROUGH */
 	case TCPS_CLOSED:
 		tp = tcp_close(tp);
 		/*
 		 * tcp_close() should never return NULL here as the socket is
 		 * still open.
 		 */
 		KASSERT(tp != NULL,
 		    ("tcp_usrclosed: tcp_close() returned NULL"));
 		break;
 
 	case TCPS_SYN_SENT:
 	case TCPS_SYN_RECEIVED:
 		tp->t_flags |= TF_NEEDFIN;
 		break;
 
 	case TCPS_ESTABLISHED:
 		tcp_state_change(tp, TCPS_FIN_WAIT_1);
 		break;
 
 	case TCPS_CLOSE_WAIT:
 		tcp_state_change(tp, TCPS_LAST_ACK);
 		break;
 	}
 	if (tp->t_state >= TCPS_FIN_WAIT_2) {
 		soisdisconnected(tp->t_inpcb->inp_socket);
 		/* Prevent the connection hanging in FIN_WAIT_2 forever. */
 		if (tp->t_state == TCPS_FIN_WAIT_2) {
 			int timeout;
 
 			timeout = (tcp_fast_finwait2_recycle) ? 
 			    tcp_finwait2_timeout : TP_MAXIDLE(tp);
 			tcp_timer_activate(tp, TT_2MSL, timeout);
 		}
 	}
 }
 
 #ifdef DDB
 static void
 db_print_indent(int indent)
 {
 	int i;
 
 	for (i = 0; i < indent; i++)
 		db_printf(" ");
 }
 
 static void
 db_print_tstate(int t_state)
 {
 
 	switch (t_state) {
 	case TCPS_CLOSED:
 		db_printf("TCPS_CLOSED");
 		return;
 
 	case TCPS_LISTEN:
 		db_printf("TCPS_LISTEN");
 		return;
 
 	case TCPS_SYN_SENT:
 		db_printf("TCPS_SYN_SENT");
 		return;
 
 	case TCPS_SYN_RECEIVED:
 		db_printf("TCPS_SYN_RECEIVED");
 		return;
 
 	case TCPS_ESTABLISHED:
 		db_printf("TCPS_ESTABLISHED");
 		return;
 
 	case TCPS_CLOSE_WAIT:
 		db_printf("TCPS_CLOSE_WAIT");
 		return;
 
 	case TCPS_FIN_WAIT_1:
 		db_printf("TCPS_FIN_WAIT_1");
 		return;
 
 	case TCPS_CLOSING:
 		db_printf("TCPS_CLOSING");
 		return;
 
 	case TCPS_LAST_ACK:
 		db_printf("TCPS_LAST_ACK");
 		return;
 
 	case TCPS_FIN_WAIT_2:
 		db_printf("TCPS_FIN_WAIT_2");
 		return;
 
 	case TCPS_TIME_WAIT:
 		db_printf("TCPS_TIME_WAIT");
 		return;
 
 	default:
 		db_printf("unknown");
 		return;
 	}
 }
 
 static void
 db_print_tflags(u_int t_flags)
 {
 	int comma;
 
 	comma = 0;
 	if (t_flags & TF_ACKNOW) {
 		db_printf("%sTF_ACKNOW", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_DELACK) {
 		db_printf("%sTF_DELACK", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_NODELAY) {
 		db_printf("%sTF_NODELAY", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_NOOPT) {
 		db_printf("%sTF_NOOPT", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_SENTFIN) {
 		db_printf("%sTF_SENTFIN", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_REQ_SCALE) {
 		db_printf("%sTF_REQ_SCALE", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_RCVD_SCALE) {
 		db_printf("%sTF_RECVD_SCALE", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_REQ_TSTMP) {
 		db_printf("%sTF_REQ_TSTMP", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_RCVD_TSTMP) {
 		db_printf("%sTF_RCVD_TSTMP", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_SACK_PERMIT) {
 		db_printf("%sTF_SACK_PERMIT", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_NEEDSYN) {
 		db_printf("%sTF_NEEDSYN", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_NEEDFIN) {
 		db_printf("%sTF_NEEDFIN", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_NOPUSH) {
 		db_printf("%sTF_NOPUSH", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_MORETOCOME) {
 		db_printf("%sTF_MORETOCOME", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_LQ_OVERFLOW) {
 		db_printf("%sTF_LQ_OVERFLOW", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_LASTIDLE) {
 		db_printf("%sTF_LASTIDLE", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_RXWIN0SENT) {
 		db_printf("%sTF_RXWIN0SENT", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_FASTRECOVERY) {
 		db_printf("%sTF_FASTRECOVERY", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_CONGRECOVERY) {
 		db_printf("%sTF_CONGRECOVERY", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_WASFRECOVERY) {
 		db_printf("%sTF_WASFRECOVERY", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_SIGNATURE) {
 		db_printf("%sTF_SIGNATURE", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_FORCEDATA) {
 		db_printf("%sTF_FORCEDATA", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_TSO) {
 		db_printf("%sTF_TSO", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_ECN_PERMIT) {
 		db_printf("%sTF_ECN_PERMIT", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_flags & TF_FASTOPEN) {
 		db_printf("%sTF_FASTOPEN", comma ? ", " : "");
 		comma = 1;
 	}
 }
 
 static void
 db_print_toobflags(char t_oobflags)
 {
 	int comma;
 
 	comma = 0;
 	if (t_oobflags & TCPOOB_HAVEDATA) {
 		db_printf("%sTCPOOB_HAVEDATA", comma ? ", " : "");
 		comma = 1;
 	}
 	if (t_oobflags & TCPOOB_HADDATA) {
 		db_printf("%sTCPOOB_HADDATA", comma ? ", " : "");
 		comma = 1;
 	}
 }
 
 static void
 db_print_tcpcb(struct tcpcb *tp, const char *name, int indent)
 {
 
 	db_print_indent(indent);
 	db_printf("%s at %p\n", name, tp);
 
 	indent += 2;
 
 	db_print_indent(indent);
 	db_printf("t_segq first: %p   t_segqlen: %d   t_dupacks: %d\n",
 	   LIST_FIRST(&tp->t_segq), tp->t_segqlen, tp->t_dupacks);
 
 	db_print_indent(indent);
 	db_printf("tt_rexmt: %p   tt_persist: %p   tt_keep: %p\n",
 	    &tp->t_timers->tt_rexmt, &tp->t_timers->tt_persist, &tp->t_timers->tt_keep);
 
 	db_print_indent(indent);
 	db_printf("tt_2msl: %p   tt_delack: %p   t_inpcb: %p\n", &tp->t_timers->tt_2msl,
 	    &tp->t_timers->tt_delack, tp->t_inpcb);
 
 	db_print_indent(indent);
 	db_printf("t_state: %d (", tp->t_state);
 	db_print_tstate(tp->t_state);
 	db_printf(")\n");
 
 	db_print_indent(indent);
 	db_printf("t_flags: 0x%x (", tp->t_flags);
 	db_print_tflags(tp->t_flags);
 	db_printf(")\n");
 
 	db_print_indent(indent);
 	db_printf("snd_una: 0x%08x   snd_max: 0x%08x   snd_nxt: x0%08x\n",
 	    tp->snd_una, tp->snd_max, tp->snd_nxt);
 
 	db_print_indent(indent);
 	db_printf("snd_up: 0x%08x   snd_wl1: 0x%08x   snd_wl2: 0x%08x\n",
 	   tp->snd_up, tp->snd_wl1, tp->snd_wl2);
 
 	db_print_indent(indent);
 	db_printf("iss: 0x%08x   irs: 0x%08x   rcv_nxt: 0x%08x\n",
 	    tp->iss, tp->irs, tp->rcv_nxt);
 
 	db_print_indent(indent);
 	db_printf("rcv_adv: 0x%08x   rcv_wnd: %u   rcv_up: 0x%08x\n",
 	    tp->rcv_adv, tp->rcv_wnd, tp->rcv_up);
 
 	db_print_indent(indent);
 	db_printf("snd_wnd: %u   snd_cwnd: %u\n",
 	   tp->snd_wnd, tp->snd_cwnd);
 
 	db_print_indent(indent);
 	db_printf("snd_ssthresh: %u   snd_recover: "
 	    "0x%08x\n", tp->snd_ssthresh, tp->snd_recover);
 
 	db_print_indent(indent);
 	db_printf("t_rcvtime: %u   t_startime: %u\n",
 	    tp->t_rcvtime, tp->t_starttime);
 
 	db_print_indent(indent);
 	db_printf("t_rttime: %u   t_rtsq: 0x%08x\n",
 	    tp->t_rtttime, tp->t_rtseq);
 
 	db_print_indent(indent);
 	db_printf("t_rxtcur: %d   t_maxseg: %u   t_srtt: %d\n",
 	    tp->t_rxtcur, tp->t_maxseg, tp->t_srtt);
 
 	db_print_indent(indent);
 	db_printf("t_rttvar: %d   t_rxtshift: %d   t_rttmin: %u   "
 	    "t_rttbest: %u\n", tp->t_rttvar, tp->t_rxtshift, tp->t_rttmin,
 	    tp->t_rttbest);
 
 	db_print_indent(indent);
 	db_printf("t_rttupdated: %lu   max_sndwnd: %u   t_softerror: %d\n",
 	    tp->t_rttupdated, tp->max_sndwnd, tp->t_softerror);
 
 	db_print_indent(indent);
 	db_printf("t_oobflags: 0x%x (", tp->t_oobflags);
 	db_print_toobflags(tp->t_oobflags);
 	db_printf(")   t_iobc: 0x%02x\n", tp->t_iobc);
 
 	db_print_indent(indent);
 	db_printf("snd_scale: %u   rcv_scale: %u   request_r_scale: %u\n",
 	    tp->snd_scale, tp->rcv_scale, tp->request_r_scale);
 
 	db_print_indent(indent);
 	db_printf("ts_recent: %u   ts_recent_age: %u\n",
 	    tp->ts_recent, tp->ts_recent_age);
 
 	db_print_indent(indent);
 	db_printf("ts_offset: %u   last_ack_sent: 0x%08x   snd_cwnd_prev: "
 	    "%u\n", tp->ts_offset, tp->last_ack_sent, tp->snd_cwnd_prev);
 
 	db_print_indent(indent);
 	db_printf("snd_ssthresh_prev: %u   snd_recover_prev: 0x%08x   "
 	    "t_badrxtwin: %u\n", tp->snd_ssthresh_prev,
 	    tp->snd_recover_prev, tp->t_badrxtwin);
 
 	db_print_indent(indent);
 	db_printf("snd_numholes: %d  snd_holes first: %p\n",
 	    tp->snd_numholes, TAILQ_FIRST(&tp->snd_holes));
 
 	db_print_indent(indent);
 	db_printf("snd_fack: 0x%08x   rcv_numsacks: %d   sack_newdata: "
 	    "0x%08x\n", tp->snd_fack, tp->rcv_numsacks, tp->sack_newdata);
 
 	/* Skip sackblks, sackhint. */
 
 	db_print_indent(indent);
 	db_printf("t_rttlow: %d   rfbuf_ts: %u   rfbuf_cnt: %d\n",
 	    tp->t_rttlow, tp->rfbuf_ts, tp->rfbuf_cnt);
 }
 
 DB_SHOW_COMMAND(tcpcb, db_show_tcpcb)
 {
 	struct tcpcb *tp;
 
 	if (!have_addr) {
 		db_printf("usage: show tcpcb <addr>\n");
 		return;
 	}
 	tp = (struct tcpcb *)addr;
 
 	db_print_tcpcb(tp, "tcpcb", 0);
 }
 #endif
Index: projects/clang500-import/sys/netinet6/udp6_usrreq.c
===================================================================
--- projects/clang500-import/sys/netinet6/udp6_usrreq.c	(revision 318657)
+++ projects/clang500-import/sys/netinet6/udp6_usrreq.c	(revision 318658)
@@ -1,1315 +1,1324 @@
 /*-
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * Copyright (c) 2010-2011 Juniper Networks, Inc.
  * Copyright (c) 2014 Kevin Lo
  * All rights reserved.
  *
  * Portions of this software were developed by Robert N. M. Watson under
  * contract to Juniper Networks, Inc.
  *
  * 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 project 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 PROJECT 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 PROJECT 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.
  *
  *	$KAME: udp6_usrreq.c,v 1.27 2001/05/21 05:45:10 jinmei Exp $
  *	$KAME: udp6_output.c,v 1.31 2001/05/21 16:39:15 jinmei Exp $
  */
 
 /*-
  * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
  *	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.
  *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #include "opt_rss.h"
 
 #include <sys/param.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/sdt.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sx.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/rss_config.h>
 
 #include <netinet/in.h>
 #include <netinet/in_kdtrace.h>
 #include <netinet/in_pcb.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp_var.h>
 #include <netinet/icmp6.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/udplite.h>
 
 #include <netinet6/ip6protosw.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/in6_rss.h>
 #include <netinet6/udp6_var.h>
 #include <netinet6/scope6_var.h>
 
 #include <netipsec/ipsec_support.h>
 
 #include <security/mac/mac_framework.h>
 
 /*
  * UDP protocol implementation.
  * Per RFC 768, August, 1980.
  */
 
 extern struct protosw	inetsw[];
 static void		udp6_detach(struct socket *so);
 
 static int
 udp6_append(struct inpcb *inp, struct mbuf *n, int off,
     struct sockaddr_in6 *fromsa)
 {
 	struct socket *so;
 	struct mbuf *opts = NULL, *tmp_opts;
 	struct udpcb *up;
 
 	INP_LOCK_ASSERT(inp);
 
 	/*
 	 * Engage the tunneling protocol.
 	 */
 	up = intoudpcb(inp);
 	if (up->u_tun_func != NULL) {
 		in_pcbref(inp);
 		INP_RUNLOCK(inp);
 		(*up->u_tun_func)(n, off, inp, (struct sockaddr *)&fromsa[0],
 		    up->u_tun_ctx);
 		INP_RLOCK(inp);
 		return (in_pcbrele_rlocked(inp));
 	}
 #if defined(IPSEC) || defined(IPSEC_SUPPORT)
 	/* Check AH/ESP integrity. */
 	if (IPSEC_ENABLED(ipv6)) {
 		if (IPSEC_CHECK_POLICY(ipv6, n, inp) != 0) {
 			m_freem(n);
 			return (0);
 		}
 	}
 #endif /* IPSEC */
 #ifdef MAC
 	if (mac_inpcb_check_deliver(inp, n) != 0) {
 		m_freem(n);
 		return (0);
 	}
 #endif
 	opts = NULL;
 	if (inp->inp_flags & INP_CONTROLOPTS ||
 	    inp->inp_socket->so_options & SO_TIMESTAMP)
 		ip6_savecontrol(inp, n, &opts);
 	if ((inp->inp_vflag & INP_IPV6) && (inp->inp_flags2 & INP_ORIGDSTADDR)) {
 		tmp_opts = sbcreatecontrol((caddr_t)&fromsa[1],
                         sizeof(struct sockaddr_in6), IPV6_ORIGDSTADDR, IPPROTO_IPV6);
                 if (tmp_opts) {
                         if (opts) {
                                 tmp_opts->m_next = opts;
                                 opts = tmp_opts;
                         } else
                                 opts = tmp_opts;
                 }
 
 	}
 	m_adj(n, off + sizeof(struct udphdr));
 
 	so = inp->inp_socket;
 	SOCKBUF_LOCK(&so->so_rcv);
 	if (sbappendaddr_locked(&so->so_rcv, (struct sockaddr *)&fromsa[0], n,
 	    opts) == 0) {
 		SOCKBUF_UNLOCK(&so->so_rcv);
 		m_freem(n);
 		if (opts)
 			m_freem(opts);
 		UDPSTAT_INC(udps_fullsock);
 	} else
 		sorwakeup_locked(so);
 	return (0);
 }
 
 int
 udp6_input(struct mbuf **mp, int *offp, int proto)
 {
 	struct mbuf *m = *mp;
 	struct ifnet *ifp;
 	struct ip6_hdr *ip6;
 	struct udphdr *uh;
 	struct inpcb *inp;
 	struct inpcbinfo *pcbinfo;
 	struct udpcb *up;
 	int off = *offp;
 	int cscov_partial;
 	int plen, ulen;
 	struct sockaddr_in6 fromsa[2];
 	struct m_tag *fwd_tag;
 	uint16_t uh_sum;
 	uint8_t nxt;
 
 	ifp = m->m_pkthdr.rcvif;
 	ip6 = mtod(m, struct ip6_hdr *);
 
 #ifndef PULLDOWN_TEST
 	IP6_EXTHDR_CHECK(m, off, sizeof(struct udphdr), IPPROTO_DONE);
 	ip6 = mtod(m, struct ip6_hdr *);
 	uh = (struct udphdr *)((caddr_t)ip6 + off);
 #else
 	IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(*uh));
 	if (!uh)
 		return (IPPROTO_DONE);
 #endif
 
 	UDPSTAT_INC(udps_ipackets);
 
 	/*
 	 * Destination port of 0 is illegal, based on RFC768.
 	 */
 	if (uh->uh_dport == 0)
 		goto badunlocked;
 
 	plen = ntohs(ip6->ip6_plen) - off + sizeof(*ip6);
 	ulen = ntohs((u_short)uh->uh_ulen);
 
 	nxt = proto;
 	cscov_partial = (nxt == IPPROTO_UDPLITE) ? 1 : 0;
 	if (nxt == IPPROTO_UDPLITE) {
 		/* Zero means checksum over the complete packet. */
 		if (ulen == 0)
 			ulen = plen;
 		if (ulen == plen)
 			cscov_partial = 0;
 		if ((ulen < sizeof(struct udphdr)) || (ulen > plen)) {
 			/* XXX: What is the right UDPLite MIB counter? */
 			goto badunlocked;
 		}
 		if (uh->uh_sum == 0) {
 			/* XXX: What is the right UDPLite MIB counter? */
 			goto badunlocked;
 		}
 	} else {
 		if ((ulen < sizeof(struct udphdr)) || (plen != ulen)) {
 			UDPSTAT_INC(udps_badlen);
 			goto badunlocked;
 		}
 		if (uh->uh_sum == 0) {
 			UDPSTAT_INC(udps_nosum);
 			goto badunlocked;
 		}
 	}
 
 	if ((m->m_pkthdr.csum_flags & CSUM_DATA_VALID_IPV6) &&
 	    !cscov_partial) {
 		if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR)
 			uh_sum = m->m_pkthdr.csum_data;
 		else
 			uh_sum = in6_cksum_pseudo(ip6, ulen, nxt,
 			    m->m_pkthdr.csum_data);
 		uh_sum ^= 0xffff;
 	} else
 		uh_sum = in6_cksum_partial(m, nxt, off, plen, ulen);
 
 	if (uh_sum != 0) {
 		UDPSTAT_INC(udps_badsum);
 		goto badunlocked;
 	}
 
 	/*
 	 * Construct sockaddr format source address.
 	 */
 	init_sin6(&fromsa[0], m, 0);
 	fromsa[0].sin6_port = uh->uh_sport;
 	init_sin6(&fromsa[1], m, 1);
 	fromsa[1].sin6_port = uh->uh_dport;
 
 	pcbinfo = udp_get_inpcbinfo(nxt);
 	if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
 		struct inpcb *last;
 		struct inpcbhead *pcblist;
 		struct ip6_moptions *imo;
 
 		INP_INFO_RLOCK(pcbinfo);
 		/*
 		 * In the event that laddr should be set to the link-local
 		 * address (this happens in RIPng), the multicast address
 		 * specified in the received packet will not match laddr.  To
 		 * handle this situation, matching is relaxed if the
 		 * receiving interface is the same as one specified in the
 		 * socket and if the destination multicast address matches
 		 * one of the multicast groups specified in the socket.
 		 */
 
 		/*
 		 * KAME note: traditionally we dropped udpiphdr from mbuf
 		 * here.  We need udphdr for IPsec processing so we do that
 		 * later.
 		 */
 		pcblist = udp_get_pcblist(nxt);
 		last = NULL;
 		LIST_FOREACH(inp, pcblist, inp_list) {
 			if ((inp->inp_vflag & INP_IPV6) == 0)
 				continue;
 			if (inp->inp_lport != uh->uh_dport)
 				continue;
 			if (inp->inp_fport != 0 &&
 			    inp->inp_fport != uh->uh_sport)
 				continue;
 			if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) {
 				if (!IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr,
 							&ip6->ip6_dst))
 					continue;
 			}
 			if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
 				if (!IN6_ARE_ADDR_EQUAL(&inp->in6p_faddr,
 							&ip6->ip6_src) ||
 				    inp->inp_fport != uh->uh_sport)
 					continue;
 			}
 
 			/*
 			 * XXXRW: Because we weren't holding either the inpcb
 			 * or the hash lock when we checked for a match 
 			 * before, we should probably recheck now that the 
 			 * inpcb lock is (supposed to be) held.
 			 */
 
 			/*
 			 * Handle socket delivery policy for any-source
 			 * and source-specific multicast. [RFC3678]
 			 */
 			imo = inp->in6p_moptions;
 			if (imo && IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
 				struct sockaddr_in6	 mcaddr;
 				int			 blocked;
 
 				INP_RLOCK(inp);
 
 				bzero(&mcaddr, sizeof(struct sockaddr_in6));
 				mcaddr.sin6_len = sizeof(struct sockaddr_in6);
 				mcaddr.sin6_family = AF_INET6;
 				mcaddr.sin6_addr = ip6->ip6_dst;
 
 				blocked = im6o_mc_filter(imo, ifp,
 					(struct sockaddr *)&mcaddr,
 					(struct sockaddr *)&fromsa[0]);
 				if (blocked != MCAST_PASS) {
 					if (blocked == MCAST_NOTGMEMBER)
 						IP6STAT_INC(ip6s_notmember);
 					if (blocked == MCAST_NOTSMEMBER ||
 					    blocked == MCAST_MUTED)
 						UDPSTAT_INC(udps_filtermcast);
 					INP_RUNLOCK(inp); /* XXX */
 					continue;
 				}
 
 				INP_RUNLOCK(inp);
 			}
 			if (last != NULL) {
 				struct mbuf *n;
 
 				if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) !=
 				    NULL) {
 					INP_RLOCK(last);
 					UDP_PROBE(receive, NULL, last, ip6,
 					    last, uh);
 					if (udp6_append(last, n, off, fromsa))
 						goto inp_lost;
 					INP_RUNLOCK(last);
 				}
 			}
 			last = inp;
 			/*
 			 * Don't look for additional matches if this one does
 			 * not have either the SO_REUSEPORT or SO_REUSEADDR
 			 * socket options set.  This heuristic avoids
 			 * searching through all pcbs in the common case of a
 			 * non-shared port.  It assumes that an application
 			 * will never clear these options after setting them.
 			 */
 			if ((last->inp_socket->so_options &
 			     (SO_REUSEPORT|SO_REUSEADDR)) == 0)
 				break;
 		}
 
 		if (last == NULL) {
 			/*
 			 * No matching pcb found; discard datagram.  (No need
 			 * to send an ICMP Port Unreachable for a broadcast
 			 * or multicast datgram.)
 			 */
 			UDPSTAT_INC(udps_noport);
 			UDPSTAT_INC(udps_noportmcast);
 			goto badheadlocked;
 		}
 		INP_RLOCK(last);
 		INP_INFO_RUNLOCK(pcbinfo);
 		UDP_PROBE(receive, NULL, last, ip6, last, uh);
 		if (udp6_append(last, m, off, fromsa) == 0) 
 			INP_RUNLOCK(last);
 	inp_lost:
 		return (IPPROTO_DONE);
 	}
 	/*
 	 * Locate pcb for datagram.
 	 */
 
 	/*
 	 * Grab info from PACKET_TAG_IPFORWARD tag prepended to the chain.
 	 */
 	if ((m->m_flags & M_IP6_NEXTHOP) &&
 	    (fwd_tag = m_tag_find(m, PACKET_TAG_IPFORWARD, NULL)) != NULL) {
 		struct sockaddr_in6 *next_hop6;
 
 		next_hop6 = (struct sockaddr_in6 *)(fwd_tag + 1);
 
 		/*
 		 * Transparently forwarded. Pretend to be the destination.
 		 * Already got one like this?
 		 */
 		inp = in6_pcblookup_mbuf(pcbinfo, &ip6->ip6_src,
 		    uh->uh_sport, &ip6->ip6_dst, uh->uh_dport,
 		    INPLOOKUP_RLOCKPCB, m->m_pkthdr.rcvif, m);
 		if (!inp) {
 			/*
 			 * It's new.  Try to find the ambushing socket.
 			 * Because we've rewritten the destination address,
 			 * any hardware-generated hash is ignored.
 			 */
 			inp = in6_pcblookup(pcbinfo, &ip6->ip6_src,
 			    uh->uh_sport, &next_hop6->sin6_addr,
 			    next_hop6->sin6_port ? htons(next_hop6->sin6_port) :
 			    uh->uh_dport, INPLOOKUP_WILDCARD |
 			    INPLOOKUP_RLOCKPCB, m->m_pkthdr.rcvif);
 		}
 		/* Remove the tag from the packet. We don't need it anymore. */
 		m_tag_delete(m, fwd_tag);
 		m->m_flags &= ~M_IP6_NEXTHOP;
 	} else
 		inp = in6_pcblookup_mbuf(pcbinfo, &ip6->ip6_src,
 		    uh->uh_sport, &ip6->ip6_dst, uh->uh_dport,
 		    INPLOOKUP_WILDCARD | INPLOOKUP_RLOCKPCB,
 		    m->m_pkthdr.rcvif, m);
 	if (inp == NULL) {
 		if (udp_log_in_vain) {
 			char ip6bufs[INET6_ADDRSTRLEN];
 			char ip6bufd[INET6_ADDRSTRLEN];
 
 			log(LOG_INFO,
 			    "Connection attempt to UDP [%s]:%d from [%s]:%d\n",
 			    ip6_sprintf(ip6bufd, &ip6->ip6_dst),
 			    ntohs(uh->uh_dport),
 			    ip6_sprintf(ip6bufs, &ip6->ip6_src),
 			    ntohs(uh->uh_sport));
 		}
 		UDPSTAT_INC(udps_noport);
 		if (m->m_flags & M_MCAST) {
 			printf("UDP6: M_MCAST is set in a unicast packet.\n");
 			UDPSTAT_INC(udps_noportmcast);
 			goto badunlocked;
 		}
 		if (V_udp_blackhole)
 			goto badunlocked;
 		if (badport_bandlim(BANDLIM_ICMP6_UNREACH) < 0)
 			goto badunlocked;
 		icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0);
 		return (IPPROTO_DONE);
 	}
 	INP_RLOCK_ASSERT(inp);
 	up = intoudpcb(inp);
 	if (cscov_partial) {
 		if (up->u_rxcslen == 0 || up->u_rxcslen > ulen) {
 			INP_RUNLOCK(inp);
 			m_freem(m);
 			return (IPPROTO_DONE);
 		}
 	}
 	UDP_PROBE(receive, NULL, inp, ip6, inp, uh);
 	if (udp6_append(inp, m, off, fromsa) == 0)
 		INP_RUNLOCK(inp);
 	return (IPPROTO_DONE);
 
 badheadlocked:
 	INP_INFO_RUNLOCK(pcbinfo);
 badunlocked:
 	if (m)
 		m_freem(m);
 	return (IPPROTO_DONE);
 }
 
 static void
 udp6_common_ctlinput(int cmd, struct sockaddr *sa, void *d,
     struct inpcbinfo *pcbinfo)
 {
 	struct udphdr uh;
 	struct ip6_hdr *ip6;
 	struct mbuf *m;
 	int off = 0;
 	struct ip6ctlparam *ip6cp = NULL;
 	const struct sockaddr_in6 *sa6_src = NULL;
 	void *cmdarg;
 	struct inpcb *(*notify)(struct inpcb *, int) = udp_notify;
 	struct udp_portonly {
 		u_int16_t uh_sport;
 		u_int16_t uh_dport;
 	} *uhp;
 
 	if (sa->sa_family != AF_INET6 ||
 	    sa->sa_len != sizeof(struct sockaddr_in6))
 		return;
 
 	if ((unsigned)cmd >= PRC_NCMDS)
 		return;
 	if (PRC_IS_REDIRECT(cmd))
 		notify = in6_rtchange, d = NULL;
 	else if (cmd == PRC_HOSTDEAD)
 		d = NULL;
 	else if (inet6ctlerrmap[cmd] == 0)
 		return;
 
 	/* if the parameter is from icmp6, decode it. */
 	if (d != NULL) {
 		ip6cp = (struct ip6ctlparam *)d;
 		m = ip6cp->ip6c_m;
 		ip6 = ip6cp->ip6c_ip6;
 		off = ip6cp->ip6c_off;
 		cmdarg = ip6cp->ip6c_cmdarg;
 		sa6_src = ip6cp->ip6c_src;
 	} else {
 		m = NULL;
 		ip6 = NULL;
 		cmdarg = NULL;
 		sa6_src = &sa6_any;
 	}
 
 	if (ip6) {
 		/*
 		 * XXX: We assume that when IPV6 is non NULL,
 		 * M and OFF are valid.
 		 */
 
 		/* Check if we can safely examine src and dst ports. */
 		if (m->m_pkthdr.len < off + sizeof(*uhp))
 			return;
 
 		bzero(&uh, sizeof(uh));
 		m_copydata(m, off, sizeof(*uhp), (caddr_t)&uh);
 
 		if (!PRC_IS_REDIRECT(cmd)) {
 			/* Check to see if its tunneled */
 			struct inpcb *inp;
 			inp = in6_pcblookup_mbuf(pcbinfo, &ip6->ip6_dst,
 			    uh.uh_dport, &ip6->ip6_src, uh.uh_sport,
 			    INPLOOKUP_WILDCARD | INPLOOKUP_RLOCKPCB,
 			    m->m_pkthdr.rcvif, m);
 			if (inp != NULL) {
 				struct udpcb *up;
 				
 				up = intoudpcb(inp);
 				if (up->u_icmp_func) {
 					/* Yes it is. */
 					INP_RUNLOCK(inp);
 					(*up->u_icmp_func)(cmd, (struct sockaddr *)ip6cp->ip6c_src,
 					      d, up->u_tun_ctx);
 					return;
 				} else {
 					/* Can't find it. */
 					INP_RUNLOCK(inp);
 				}
 			}
 		}
 		(void)in6_pcbnotify(pcbinfo, sa, uh.uh_dport,
 		    (struct sockaddr *)ip6cp->ip6c_src, uh.uh_sport, cmd,
 		    cmdarg, notify);
 	} else
 		(void)in6_pcbnotify(pcbinfo, sa, 0,
 		    (const struct sockaddr *)sa6_src, 0, cmd, cmdarg, notify);
 }
 
 void
 udp6_ctlinput(int cmd, struct sockaddr *sa, void *d)
 {
 
 	return (udp6_common_ctlinput(cmd, sa, d, &V_udbinfo));
 }
 
 void
 udplite6_ctlinput(int cmd, struct sockaddr *sa, void *d)
 {
 
 	return (udp6_common_ctlinput(cmd, sa, d, &V_ulitecbinfo));
 }
 
 static int
 udp6_getcred(SYSCTL_HANDLER_ARGS)
 {
 	struct xucred xuc;
 	struct sockaddr_in6 addrs[2];
 	struct inpcb *inp;
 	int error;
 
 	error = priv_check(req->td, PRIV_NETINET_GETCRED);
 	if (error)
 		return (error);
 
 	if (req->newlen != sizeof(addrs))
 		return (EINVAL);
 	if (req->oldlen != sizeof(struct xucred))
 		return (EINVAL);
 	error = SYSCTL_IN(req, addrs, sizeof(addrs));
 	if (error)
 		return (error);
 	if ((error = sa6_embedscope(&addrs[0], V_ip6_use_defzone)) != 0 ||
 	    (error = sa6_embedscope(&addrs[1], V_ip6_use_defzone)) != 0) {
 		return (error);
 	}
 	inp = in6_pcblookup(&V_udbinfo, &addrs[1].sin6_addr,
 	    addrs[1].sin6_port, &addrs[0].sin6_addr, addrs[0].sin6_port,
 	    INPLOOKUP_WILDCARD | INPLOOKUP_RLOCKPCB, NULL);
 	if (inp != NULL) {
 		INP_RLOCK_ASSERT(inp);
 		if (inp->inp_socket == NULL)
 			error = ENOENT;
 		if (error == 0)
 			error = cr_canseesocket(req->td->td_ucred,
 			    inp->inp_socket);
 		if (error == 0)
 			cru2x(inp->inp_cred, &xuc);
 		INP_RUNLOCK(inp);
 	} else
 		error = ENOENT;
 	if (error == 0)
 		error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred));
 	return (error);
 }
 
 SYSCTL_PROC(_net_inet6_udp6, OID_AUTO, getcred, CTLTYPE_OPAQUE|CTLFLAG_RW, 0,
     0, udp6_getcred, "S,xucred", "Get the xucred of a UDP6 connection");
 
 static int
 udp6_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr6,
     struct mbuf *control, struct thread *td)
 {
 	u_int32_t ulen = m->m_pkthdr.len;
 	u_int32_t plen = sizeof(struct udphdr) + ulen;
 	struct ip6_hdr *ip6;
 	struct udphdr *udp6;
 	struct in6_addr *laddr, *faddr, in6a;
 	struct sockaddr_in6 *sin6 = NULL;
 	int cscov_partial = 0;
 	int scope_ambiguous = 0;
 	u_short fport;
 	int error = 0;
 	uint8_t nxt;
 	uint16_t cscov = 0;
 	struct ip6_pktopts *optp, opt;
 	int af = AF_INET6, hlen = sizeof(struct ip6_hdr);
 	int flags;
 	struct sockaddr_in6 tmp;
 
 	INP_WLOCK_ASSERT(inp);
 	INP_HASH_WLOCK_ASSERT(inp->inp_pcbinfo);
 
 	if (addr6) {
 		/* addr6 has been validated in udp6_send(). */
 		sin6 = (struct sockaddr_in6 *)addr6;
 
 		/* protect *sin6 from overwrites */
 		tmp = *sin6;
 		sin6 = &tmp;
 
 		/*
 		 * Application should provide a proper zone ID or the use of
 		 * default zone IDs should be enabled.  Unfortunately, some
 		 * applications do not behave as it should, so we need a
 		 * workaround.  Even if an appropriate ID is not determined,
 		 * we'll see if we can determine the outgoing interface.  If we
 		 * can, determine the zone ID based on the interface below.
 		 */
 		if (sin6->sin6_scope_id == 0 && !V_ip6_use_defzone)
 			scope_ambiguous = 1;
 		if ((error = sa6_embedscope(sin6, V_ip6_use_defzone)) != 0)
 			return (error);
 	}
 
 	nxt = (inp->inp_socket->so_proto->pr_protocol == IPPROTO_UDP) ?
 	    IPPROTO_UDP : IPPROTO_UDPLITE;
 	if (control) {
 		if ((error = ip6_setpktopts(control, &opt,
 		    inp->in6p_outputopts, td->td_ucred, nxt)) != 0)
 			goto release;
 		optp = &opt;
 	} else
 		optp = inp->in6p_outputopts;
 
 	if (sin6) {
 		faddr = &sin6->sin6_addr;
 
 		/*
 		 * Since we saw no essential reason for calling in_pcbconnect,
 		 * we get rid of such kind of logic, and call in6_selectsrc
 		 * and in6_pcbsetport in order to fill in the local address
 		 * and the local port.
 		 */
 		if (sin6->sin6_port == 0) {
 			error = EADDRNOTAVAIL;
 			goto release;
 		}
 
 		if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
 			/* how about ::ffff:0.0.0.0 case? */
 			error = EISCONN;
 			goto release;
 		}
 
 		fport = sin6->sin6_port; /* allow 0 port */
 
 		if (IN6_IS_ADDR_V4MAPPED(faddr)) {
 			if ((inp->inp_flags & IN6P_IPV6_V6ONLY)) {
 				/*
 				 * I believe we should explicitly discard the
 				 * packet when mapped addresses are disabled,
 				 * rather than send the packet as an IPv6 one.
 				 * If we chose the latter approach, the packet
 				 * might be sent out on the wire based on the
 				 * default route, the situation which we'd
 				 * probably want to avoid.
 				 * (20010421 jinmei@kame.net)
 				 */
 				error = EINVAL;
 				goto release;
 			}
 			if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr) &&
 			    !IN6_IS_ADDR_V4MAPPED(&inp->in6p_laddr)) {
 				/*
 				 * when remote addr is an IPv4-mapped address,
 				 * local addr should not be an IPv6 address,
 				 * since you cannot determine how to map IPv6
 				 * source address to IPv4.
 				 */
 				error = EINVAL;
 				goto release;
 			}
 
 			af = AF_INET;
 		}
 
 		if (!IN6_IS_ADDR_V4MAPPED(faddr)) {
 			error = in6_selectsrc_socket(sin6, optp, inp,
 			    td->td_ucred, scope_ambiguous, &in6a, NULL);
 			if (error)
 				goto release;
 			laddr = &in6a;
 		} else
 			laddr = &inp->in6p_laddr;	/* XXX */
 		if (laddr == NULL) {
 			if (error == 0)
 				error = EADDRNOTAVAIL;
 			goto release;
 		}
 		if (inp->inp_lport == 0 &&
 		    (error = in6_pcbsetport(laddr, inp, td->td_ucred)) != 0) {
 			/* Undo an address bind that may have occurred. */
 			inp->in6p_laddr = in6addr_any;
 			goto release;
 		}
 	} else {
 		if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
 			error = ENOTCONN;
 			goto release;
 		}
 		if (IN6_IS_ADDR_V4MAPPED(&inp->in6p_faddr)) {
 			if ((inp->inp_flags & IN6P_IPV6_V6ONLY)) {
 				/*
 				 * XXX: this case would happen when the
 				 * application sets the V6ONLY flag after
 				 * connecting the foreign address.
 				 * Such applications should be fixed,
 				 * so we bark here.
 				 */
 				log(LOG_INFO, "udp6_output: IPV6_V6ONLY "
 				    "option was set for a connected socket\n");
 				error = EINVAL;
 				goto release;
 			} else
 				af = AF_INET;
 		}
 		laddr = &inp->in6p_laddr;
 		faddr = &inp->in6p_faddr;
 		fport = inp->inp_fport;
 	}
 
 	if (af == AF_INET)
 		hlen = sizeof(struct ip);
 
 	/*
 	 * Calculate data length and get a mbuf
 	 * for UDP and IP6 headers.
 	 */
 	M_PREPEND(m, hlen + sizeof(struct udphdr), M_NOWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto release;
 	}
 
 	/*
 	 * Stuff checksum and output datagram.
 	 */
 	udp6 = (struct udphdr *)(mtod(m, caddr_t) + hlen);
 	udp6->uh_sport = inp->inp_lport; /* lport is always set in the PCB */
 	udp6->uh_dport = fport;
 	if (nxt == IPPROTO_UDPLITE) {
 		struct udpcb *up;
 
 		up = intoudpcb(inp);
 		cscov = up->u_txcslen;
 		if (cscov >= plen)
 			cscov = 0;
 		udp6->uh_ulen = htons(cscov);
 		/*
 		 * For UDP-Lite, checksum coverage length of zero means
 		 * the entire UDPLite packet is covered by the checksum.
 		 */
 		cscov_partial = (cscov == 0) ? 0 : 1;
 	} else if (plen <= 0xffff)
 		udp6->uh_ulen = htons((u_short)plen);
 	else
 		udp6->uh_ulen = 0;
 	udp6->uh_sum = 0;
 
 	switch (af) {
 	case AF_INET6:
 		ip6 = mtod(m, struct ip6_hdr *);
 		ip6->ip6_flow	= inp->inp_flow & IPV6_FLOWINFO_MASK;
 		ip6->ip6_vfc	&= ~IPV6_VERSION_MASK;
 		ip6->ip6_vfc	|= IPV6_VERSION;
 		ip6->ip6_plen	= htons((u_short)plen);
 		ip6->ip6_nxt	= nxt;
 		ip6->ip6_hlim	= in6_selecthlim(inp, NULL);
 		ip6->ip6_src	= *laddr;
 		ip6->ip6_dst	= *faddr;
 
 		if (cscov_partial) {
 			if ((udp6->uh_sum = in6_cksum_partial(m, nxt,
 			    sizeof(struct ip6_hdr), plen, cscov)) == 0)
 				udp6->uh_sum = 0xffff;
 		} else {
 			udp6->uh_sum = in6_cksum_pseudo(ip6, plen, nxt, 0);
 			m->m_pkthdr.csum_flags = CSUM_UDP_IPV6;
 			m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum);
 		}
 
 #ifdef	RSS
 		{
 			uint32_t hash_val, hash_type;
 			uint8_t pr;
 
 			pr = inp->inp_socket->so_proto->pr_protocol;
 			/*
 			 * Calculate an appropriate RSS hash for UDP and
 			 * UDP Lite.
 			 *
 			 * The called function will take care of figuring out
 			 * whether a 2-tuple or 4-tuple hash is required based
 			 * on the currently configured scheme.
 			 *
 			 * Later later on connected socket values should be
 			 * cached in the inpcb and reused, rather than constantly
 			 * re-calculating it.
 			 *
 			 * UDP Lite is a different protocol number and will
 			 * likely end up being hashed as a 2-tuple until
 			 * RSS / NICs grow UDP Lite protocol awareness.
 			 */
 			if (rss_proto_software_hash_v6(faddr, laddr, fport,
 			    inp->inp_lport, pr, &hash_val, &hash_type) == 0) {
 				m->m_pkthdr.flowid = hash_val;
 				M_HASHTYPE_SET(m, hash_type);
 			}
 		}
 #endif
 		flags = 0;
 #ifdef	RSS
 		/*
 		 * Don't override with the inp cached flowid.
 		 *
 		 * Until the whole UDP path is vetted, it may actually
 		 * be incorrect.
 		 */
 		flags |= IP_NODEFAULTFLOWID;
 #endif
 
 		UDP_PROBE(send, NULL, inp, ip6, inp, udp6);
 		UDPSTAT_INC(udps_opackets);
 		error = ip6_output(m, optp, &inp->inp_route6, flags,
 		    inp->in6p_moptions, NULL, inp);
 		break;
 	case AF_INET:
 		error = EAFNOSUPPORT;
 		goto release;
 	}
 	goto releaseopt;
 
 release:
 	m_freem(m);
 
 releaseopt:
 	if (control) {
 		ip6_clearpktopts(&opt, -1);
 		m_freem(control);
 	}
 	return (error);
 }
 
 static void
 udp6_abort(struct socket *so)
 {
 	struct inpcb *inp;
 	struct inpcbinfo *pcbinfo;
 
 	pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol);
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("udp6_abort: inp == NULL"));
 
 	INP_WLOCK(inp);
 #ifdef INET
 	if (inp->inp_vflag & INP_IPV4) {
 		struct pr_usrreqs *pru;
 		uint8_t nxt;
 
 		nxt = (inp->inp_socket->so_proto->pr_protocol == IPPROTO_UDP) ?
 		    IPPROTO_UDP : IPPROTO_UDPLITE;
 		INP_WUNLOCK(inp);
 		pru = inetsw[ip_protox[nxt]].pr_usrreqs;
 		(*pru->pru_abort)(so);
 		return;
 	}
 #endif
 
 	if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
 		INP_HASH_WLOCK(pcbinfo);
 		in6_pcbdisconnect(inp);
 		inp->in6p_laddr = in6addr_any;
 		INP_HASH_WUNLOCK(pcbinfo);
 		soisdisconnected(so);
 	}
 	INP_WUNLOCK(inp);
 }
 
 static int
 udp6_attach(struct socket *so, int proto, struct thread *td)
 {
 	struct inpcb *inp;
 	struct inpcbinfo *pcbinfo;
 	int error;
 
 	pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol);
 	inp = sotoinpcb(so);
 	KASSERT(inp == NULL, ("udp6_attach: inp != NULL"));
 
 	if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
 		error = soreserve(so, udp_sendspace, udp_recvspace);
 		if (error)
 			return (error);
 	}
 	INP_INFO_WLOCK(pcbinfo);
 	error = in_pcballoc(so, pcbinfo);
 	if (error) {
 		INP_INFO_WUNLOCK(pcbinfo);
 		return (error);
 	}
 	inp = (struct inpcb *)so->so_pcb;
 	inp->inp_vflag |= INP_IPV6;
 	if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0)
 		inp->inp_vflag |= INP_IPV4;
 	inp->in6p_hops = -1;	/* use kernel default */
 	inp->in6p_cksum = -1;	/* just to be sure */
 	/*
 	 * XXX: ugly!!
 	 * IPv4 TTL initialization is necessary for an IPv6 socket as well,
 	 * because the socket may be bound to an IPv6 wildcard address,
 	 * which may match an IPv4-mapped IPv6 address.
 	 */
 	inp->inp_ip_ttl = V_ip_defttl;
 
 	error = udp_newudpcb(inp);
 	if (error) {
 		in_pcbdetach(inp);
 		in_pcbfree(inp);
 		INP_INFO_WUNLOCK(pcbinfo);
 		return (error);
 	}
 	INP_WUNLOCK(inp);
 	INP_INFO_WUNLOCK(pcbinfo);
 	return (0);
 }
 
 static int
 udp6_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	struct inpcb *inp;
 	struct inpcbinfo *pcbinfo;
 	int error;
 
 	pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol);
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("udp6_bind: inp == NULL"));
 
 	INP_WLOCK(inp);
 	INP_HASH_WLOCK(pcbinfo);
 	inp->inp_vflag &= ~INP_IPV4;
 	inp->inp_vflag |= INP_IPV6;
 	if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) {
 		struct sockaddr_in6 *sin6_p;
 
 		sin6_p = (struct sockaddr_in6 *)nam;
 
 		if (IN6_IS_ADDR_UNSPECIFIED(&sin6_p->sin6_addr))
 			inp->inp_vflag |= INP_IPV4;
 #ifdef INET
 		else if (IN6_IS_ADDR_V4MAPPED(&sin6_p->sin6_addr)) {
 			struct sockaddr_in sin;
 
 			in6_sin6_2_sin(&sin, sin6_p);
 			inp->inp_vflag |= INP_IPV4;
 			inp->inp_vflag &= ~INP_IPV6;
 			error = in_pcbbind(inp, (struct sockaddr *)&sin,
 			    td->td_ucred);
 			goto out;
 		}
 #endif
 	}
 
 	error = in6_pcbbind(inp, nam, td->td_ucred);
 #ifdef INET
 out:
 #endif
 	INP_HASH_WUNLOCK(pcbinfo);
 	INP_WUNLOCK(inp);
 	return (error);
 }
 
 static void
 udp6_close(struct socket *so)
 {
 	struct inpcb *inp;
 	struct inpcbinfo *pcbinfo;
 
 	pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol);
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("udp6_close: inp == NULL"));
 
 	INP_WLOCK(inp);
 #ifdef INET
 	if (inp->inp_vflag & INP_IPV4) {
 		struct pr_usrreqs *pru;
 		uint8_t nxt;
 
 		nxt = (inp->inp_socket->so_proto->pr_protocol == IPPROTO_UDP) ?
 		    IPPROTO_UDP : IPPROTO_UDPLITE;
 		INP_WUNLOCK(inp);
 		pru = inetsw[ip_protox[nxt]].pr_usrreqs;
 		(*pru->pru_disconnect)(so);
 		return;
 	}
 #endif
 	if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
 		INP_HASH_WLOCK(pcbinfo);
 		in6_pcbdisconnect(inp);
 		inp->in6p_laddr = in6addr_any;
 		INP_HASH_WUNLOCK(pcbinfo);
 		soisdisconnected(so);
 	}
 	INP_WUNLOCK(inp);
 }
 
 static int
 udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	struct inpcb *inp;
 	struct inpcbinfo *pcbinfo;
 	struct sockaddr_in6 *sin6;
 	int error;
 
 	pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol);
 	inp = sotoinpcb(so);
 	sin6 = (struct sockaddr_in6 *)nam;
 	KASSERT(inp != NULL, ("udp6_connect: inp == NULL"));
 
 	/*
 	 * XXXRW: Need to clarify locking of v4/v6 flags.
 	 */
 	INP_WLOCK(inp);
 #ifdef INET
 	if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
 		struct sockaddr_in sin;
 
 		if ((inp->inp_flags & IN6P_IPV6_V6ONLY) != 0) {
 			error = EINVAL;
 			goto out;
 		}
+		if ((inp->inp_vflag & INP_IPV4) == 0) {
+			error = EAFNOSUPPORT;
+			goto out;
+		}
 		if (inp->inp_faddr.s_addr != INADDR_ANY) {
 			error = EISCONN;
 			goto out;
 		}
 		in6_sin6_2_sin(&sin, sin6);
 		inp->inp_vflag |= INP_IPV4;
 		inp->inp_vflag &= ~INP_IPV6;
 		error = prison_remote_ip4(td->td_ucred, &sin.sin_addr);
 		if (error != 0)
 			goto out;
 		INP_HASH_WLOCK(pcbinfo);
 		error = in_pcbconnect(inp, (struct sockaddr *)&sin,
 		    td->td_ucred);
 		INP_HASH_WUNLOCK(pcbinfo);
 		if (error == 0)
 			soisconnected(so);
 		goto out;
+	} else {
+		if ((inp->inp_vflag & INP_IPV6) == 0) {
+			error = EAFNOSUPPORT;
+			goto out;
+		}
 	}
 #endif
 	if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
 		error = EISCONN;
 		goto out;
 	}
 	inp->inp_vflag &= ~INP_IPV4;
 	inp->inp_vflag |= INP_IPV6;
 	error = prison_remote_ip6(td->td_ucred, &sin6->sin6_addr);
 	if (error != 0)
 		goto out;
 	INP_HASH_WLOCK(pcbinfo);
 	error = in6_pcbconnect(inp, nam, td->td_ucred);
 	INP_HASH_WUNLOCK(pcbinfo);
 	if (error == 0)
 		soisconnected(so);
 out:
 	INP_WUNLOCK(inp);
 	return (error);
 }
 
 static void
 udp6_detach(struct socket *so)
 {
 	struct inpcb *inp;
 	struct inpcbinfo *pcbinfo;
 	struct udpcb *up;
 
 	pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol);
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("udp6_detach: inp == NULL"));
 
 	INP_INFO_WLOCK(pcbinfo);
 	INP_WLOCK(inp);
 	up = intoudpcb(inp);
 	KASSERT(up != NULL, ("%s: up == NULL", __func__));
 	in_pcbdetach(inp);
 	in_pcbfree(inp);
 	INP_INFO_WUNLOCK(pcbinfo);
 	udp_discardcb(up);
 }
 
 static int
 udp6_disconnect(struct socket *so)
 {
 	struct inpcb *inp;
 	struct inpcbinfo *pcbinfo;
 	int error;
 
 	pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol);
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("udp6_disconnect: inp == NULL"));
 
 	INP_WLOCK(inp);
 #ifdef INET
 	if (inp->inp_vflag & INP_IPV4) {
 		struct pr_usrreqs *pru;
 		uint8_t nxt;
 
 		nxt = (inp->inp_socket->so_proto->pr_protocol == IPPROTO_UDP) ?
 		    IPPROTO_UDP : IPPROTO_UDPLITE;
 		INP_WUNLOCK(inp);
 		pru = inetsw[ip_protox[nxt]].pr_usrreqs;
 		(void)(*pru->pru_disconnect)(so);
 		return (0);
 	}
 #endif
 
 	if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
 		error = ENOTCONN;
 		goto out;
 	}
 
 	INP_HASH_WLOCK(pcbinfo);
 	in6_pcbdisconnect(inp);
 	inp->in6p_laddr = in6addr_any;
 	INP_HASH_WUNLOCK(pcbinfo);
 	SOCK_LOCK(so);
 	so->so_state &= ~SS_ISCONNECTED;		/* XXX */
 	SOCK_UNLOCK(so);
 out:
 	INP_WUNLOCK(inp);
 	return (0);
 }
 
 static int
 udp6_send(struct socket *so, int flags, struct mbuf *m,
     struct sockaddr *addr, struct mbuf *control, struct thread *td)
 {
 	struct inpcb *inp;
 	struct inpcbinfo *pcbinfo;
 	int error = 0;
 
 	pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol);
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("udp6_send: inp == NULL"));
 
 	INP_WLOCK(inp);
 	if (addr) {
 		if (addr->sa_len != sizeof(struct sockaddr_in6)) {
 			error = EINVAL;
 			goto bad;
 		}
 		if (addr->sa_family != AF_INET6) {
 			error = EAFNOSUPPORT;
 			goto bad;
 		}
 	}
 
 #ifdef INET
 	if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) {
 		int hasv4addr;
 		struct sockaddr_in6 *sin6 = NULL;
 
 		if (addr == NULL)
 			hasv4addr = (inp->inp_vflag & INP_IPV4);
 		else {
 			sin6 = (struct sockaddr_in6 *)addr;
 			hasv4addr = IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)
 			    ? 1 : 0;
 		}
 		if (hasv4addr) {
 			struct pr_usrreqs *pru;
 			uint8_t nxt;
 
 			nxt = (inp->inp_socket->so_proto->pr_protocol ==
 			    IPPROTO_UDP) ? IPPROTO_UDP : IPPROTO_UDPLITE;
 			/*
 			 * XXXRW: We release UDP-layer locks before calling
 			 * udp_send() in order to avoid recursion.  However,
 			 * this does mean there is a short window where inp's
 			 * fields are unstable.  Could this lead to a
 			 * potential race in which the factors causing us to
 			 * select the UDPv4 output routine are invalidated?
 			 */
 			INP_WUNLOCK(inp);
 			if (sin6)
 				in6_sin6_2_sin_in_sock(addr);
 			pru = inetsw[ip_protox[nxt]].pr_usrreqs;
 			/* addr will just be freed in sendit(). */
 			return ((*pru->pru_send)(so, flags, m, addr, control,
 			    td));
 		}
 	}
 #endif
 #ifdef MAC
 	mac_inpcb_create_mbuf(inp, m);
 #endif
 	INP_HASH_WLOCK(pcbinfo);
 	error = udp6_output(inp, m, addr, control, td);
 	INP_HASH_WUNLOCK(pcbinfo);
 	INP_WUNLOCK(inp);
 	return (error);
 
 bad:
 	INP_WUNLOCK(inp);
 	m_freem(m);
 	return (error);
 }
 
 struct pr_usrreqs udp6_usrreqs = {
 	.pru_abort =		udp6_abort,
 	.pru_attach =		udp6_attach,
 	.pru_bind =		udp6_bind,
 	.pru_connect =		udp6_connect,
 	.pru_control =		in6_control,
 	.pru_detach =		udp6_detach,
 	.pru_disconnect =	udp6_disconnect,
 	.pru_peeraddr =		in6_mapped_peeraddr,
 	.pru_send =		udp6_send,
 	.pru_shutdown =		udp_shutdown,
 	.pru_sockaddr =		in6_mapped_sockaddr,
 	.pru_soreceive =	soreceive_dgram,
 	.pru_sosend =		sosend_dgram,
 	.pru_sosetlabel =	in_pcbsosetlabel,
 	.pru_close =		udp6_close
 };
Index: projects/clang500-import/tests/sys/aio/aio_kqueue_test.c
===================================================================
--- projects/clang500-import/tests/sys/aio/aio_kqueue_test.c	(revision 318657)
+++ projects/clang500-import/tests/sys/aio/aio_kqueue_test.c	(revision 318658)
@@ -1,220 +1,221 @@
 /*-
  * Copyright (C) 2005 IronPort Systems, Inc. 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$
  */
 
 /* 
  * Prerequisities:
  * - AIO support must be compiled into the kernel (see sys/<arch>/NOTES for
  *   more details).
  *
  * Note: it is a good idea to run this against a physical drive to 
  * exercise the physio fast path (ie. aio_kqueue /dev/<something safe>)
  */
 
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #include <aio.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "freebsd_test_suite/macros.h"
 #include "local.h"
 
 #define PATH_TEMPLATE   "aio.XXXXXXXXXX"
 
 #define MAX_IOCBS 128
 #define MAX_RUNS 300
 /* #define DEBUG */
 
 int
 main (int argc, char *argv[])
 {
 	struct aiocb *iocb[MAX_IOCBS], *kq_iocb;
 	char *file, pathname[sizeof(PATH_TEMPLATE)+1];
 	struct kevent ke, kq_returned;
 	struct timespec ts;
 	char buffer[32768];
 #ifdef DEBUG
 	int cancel, error;
 #endif
 	int failed = 0, fd, kq, pending, result, run;
 	int tmp_file = 0;
 	unsigned i, j;
 
 	PLAIN_REQUIRE_KERNEL_MODULE("aio", 0);
 	PLAIN_REQUIRE_UNSAFE_AIO(0);
 
 	kq = kqueue();
 	if (kq < 0) {
 		perror("No kqeueue\n");
 		exit(1);
 	}
 
 	if (argc == 1) { 
 		strcpy(pathname, PATH_TEMPLATE);
 		fd = mkstemp(pathname);
 		file = pathname;
 		tmp_file = 1;
 	} else {
 		file = argv[1];
 		fd = open(file, O_RDWR|O_CREAT, 0666);
 	}
 	if (fd == -1)
 		err(1, "Can't open %s\n", file);
 
 	for (run = 0; run < MAX_RUNS; run++){
 #ifdef DEBUG
 		printf("Run %d\n", run);
 #endif
 		for (i = 0; i < nitems(iocb); i++) {
 			iocb[i] = (struct aiocb *)calloc(1,
 			    sizeof(struct aiocb));
 			if (iocb[i] == NULL)
 				err(1, "calloc");
 		}
 
 		pending = 0;
 		for (i = 0; i < nitems(iocb); i++) {
 			pending++;
 			iocb[i]->aio_nbytes = sizeof(buffer);
 			iocb[i]->aio_buf = buffer;
 			iocb[i]->aio_fildes = fd;
 			iocb[i]->aio_offset = iocb[i]->aio_nbytes * i * run;
 
 			iocb[i]->aio_sigevent.sigev_notify_kqueue = kq;
 			iocb[i]->aio_sigevent.sigev_value.sival_ptr = iocb[i];
 			iocb[i]->aio_sigevent.sigev_notify = SIGEV_KEVENT;
 
 			result = aio_write(iocb[i]);
 			if (result != 0) {
 				perror("aio_write");
 				printf("Result %d iteration %d\n", result, i);
 				exit(1);
 			}
 #ifdef DEBUG
 			printf("WRITE %d is at %p\n", i, iocb[i]);
 #endif
 			result = rand();
 			if (result < RAND_MAX/32) {
 				if (result > RAND_MAX/64) {
 					result = aio_cancel(fd, iocb[i]);
 #ifdef DEBUG
 					printf("Cancel %d %p result %d\n", i, iocb[i], result);
 #endif
 					if (result == AIO_CANCELED) {
 						aio_return(iocb[i]);
 						iocb[i] = NULL;
 						pending--;
 					}
 				}
 			}
 		}
 #ifdef DEBUG
 		cancel = nitems(iocb) - pending;
 #endif
 
 		i = 0;
 		while (pending) {
 
 			for (;;) {
 
 				bzero(&ke, sizeof(ke));
 				bzero(&kq_returned, sizeof(ke));
 				ts.tv_sec = 0;
 				ts.tv_nsec = 1;
 				result = kevent(kq, NULL, 0,
 						&kq_returned, 1, &ts);
 #ifdef DEBUG
 				error = errno;
 #endif
 				if (result < 0)
 					perror("kevent error: ");
 				kq_iocb = kq_returned.udata;
 #ifdef DEBUG
 				printf("kevent %d %d errno %d return.ident %p "
 				       "return.data %p return.udata %p %p\n",
 				       i, result, error,
-				       kq_returned.ident, kq_returned.data,
+				       (void*)kq_returned.ident,
+				       (void*)kq_returned.data,
 				       kq_returned.udata,
 				       kq_iocb);
 #endif
 
 				if (kq_iocb)
 					break;
 #ifdef DEBUG
-				printf("Try again left %d out of %d %d\n",
+				printf("Try again left %d out of %lu %d\n",
 				    pending, nitems(iocb), cancel);
 #endif
 			}
 
 			for (j = 0; j < nitems(iocb) && iocb[j] != kq_iocb;
 			   j++) ;
 #ifdef DEBUG
 			printf("kq_iocb %p\n", kq_iocb);
 
 			printf("Error Result for %d is %d pending %d\n",
 			    j, result, pending);
 #endif
 			result = aio_return(kq_iocb);
 #ifdef DEBUG
 			printf("Return Result for %d is %d\n\n", j, result);
 #endif
 			if (result != sizeof(buffer)) {
 				printf("FAIL: run %d, operation %d, result %d "
 				    " (errno=%d) should be %zu\n", run, pending,
 				    result, errno, sizeof(buffer));
 				failed++;
 			} else
 				printf("PASS: run %d, left %d\n", run,
 				    pending - 1);
 
 			free(kq_iocb);
 			iocb[j] = NULL;
 			pending--;
 			i++;
 		}
 
 		for (i = 0; i < nitems(iocb); i++)
 			free(iocb[i]);
 
 	}
 
 	if (tmp_file)
 		unlink(pathname);
 
 	if (failed != 0)
 		printf("FAIL: %d tests failed\n", failed);
 	else
 		printf("PASS: All tests passed\n");
 
 	exit (failed == 0 ? 0 : 1);
 }
Index: projects/clang500-import/tests/sys/aio/lio_kqueue_test.c
===================================================================
--- projects/clang500-import/tests/sys/aio/lio_kqueue_test.c	(revision 318657)
+++ projects/clang500-import/tests/sys/aio/lio_kqueue_test.c	(revision 318658)
@@ -1,238 +1,240 @@
 /*-
  * Copyright (C) 2005 IronPort Systems, Inc. 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$
  */
 
 /*
  * Note: it is a good idea to run this against a physical drive to
  * exercise the physio fast path (ie. lio_kqueue /dev/<something safe>)
  * This will ensure op's counting is correct.  It is currently broken.
  *
  * Also note that LIO & kqueue is not implemented in FreeBSD yet, LIO
  * is also broken with respect to op's and some paths.
  *
  * A patch to make this work is at:
  * 	http://www.ambrisko.com/doug/listio_kqueue/listio_kqueue.patch
  */
 
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #include <aio.h>
 #include <fcntl.h>
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "freebsd_test_suite/macros.h"
 #include "local.h"
 
 #define PATH_TEMPLATE   "aio.XXXXXXXXXX"
 
 #define LIO_MAX 5
-#define MAX_IOCBS LIO_MAX * 16
+#define IOCBS_PER_LIO	16
+#define MAX_IOCBS (LIO_MAX * IOCBS_PER_LIO)
 #define MAX_RUNS 300
 
 int
 main(int argc, char *argv[])
 {
 	int fd;
 	struct aiocb *iocb[MAX_IOCBS];
 	struct aiocb **lio[LIO_MAX], **kq_lio;
 	int i, result, run, error, j, k;
 	char buffer[32768];
 	int kq;
 	struct kevent ke, kq_returned;
 	struct timespec ts;
 	struct sigevent sig;
 	time_t time1, time2;
 	char *file, pathname[sizeof(PATH_TEMPLATE)];
 	int tmp_file = 0, failed = 0;
 
 	PLAIN_REQUIRE_KERNEL_MODULE("aio", 0);
 	PLAIN_REQUIRE_UNSAFE_AIO(0);
 
 	kq = kqueue();
 	if (kq < 0)
 		err(1, "kqeueue(2) failed");
 
 	if (argc == 1) {
 		strcpy(pathname, PATH_TEMPLATE);
 		fd = mkstemp(pathname);
 		file = pathname;
 		tmp_file = 1;
 	} else {
 		file = argv[1];
 		fd = open(file, O_RDWR|O_CREAT, 0666);
         }
 	if (fd < 0)
 		err(1, "can't open %s", argv[1]);
 
 #ifdef DEBUG
 	printf("Hello kq %d fd %d\n", kq, fd);
 #endif
 
 	for (run = 0; run < MAX_RUNS; run++) {
 #ifdef DEBUG
 		printf("Run %d\n", run);
 #endif
 		for (j = 0; j < LIO_MAX; j++) {
 			lio[j] =
-			    malloc(sizeof(struct aiocb *) * MAX_IOCBS/LIO_MAX);
-			for (i = 0; i < MAX_IOCBS / LIO_MAX; i++) {
-				k = (MAX_IOCBS / LIO_MAX * j) + i;
+			    malloc(sizeof(struct aiocb *) * IOCBS_PER_LIO);
+			for (i = 0; i < IOCBS_PER_LIO; i++) {
+				k = (IOCBS_PER_LIO * j) + i;
 				lio[j][i] = iocb[k] =
 				    calloc(1, sizeof(struct aiocb));
 				iocb[k]->aio_nbytes = sizeof(buffer);
 				iocb[k]->aio_buf = buffer;
 				iocb[k]->aio_fildes = fd;
 				iocb[k]->aio_offset
 				    = iocb[k]->aio_nbytes * k * (run + 1);
 
 #ifdef DEBUG
-				printf("hello iocb[k] %d\n",
+				printf("hello iocb[k] %ld\n",
 				       iocb[k]->aio_offset);
 #endif
 				iocb[k]->aio_lio_opcode = LIO_WRITE;
 			}
 			sig.sigev_notify_kqueue = kq;
 			sig.sigev_value.sival_ptr = lio[j];
 			sig.sigev_notify = SIGEV_KEVENT;
 			time(&time1);
 			result = lio_listio(LIO_NOWAIT, lio[j],
-					    MAX_IOCBS / LIO_MAX, &sig);
+					    IOCBS_PER_LIO, &sig);
 			error = errno;
 			time(&time2);
 #ifdef DEBUG
-			printf("Time %d %d %d result -> %d\n",
+			printf("Time %ld %ld %ld result -> %d\n",
 			    time1, time2, time2-time1, result);
 #endif
 			if (result != 0) {
 			        errno = error;
 				err(1, "FAIL: Result %d iteration %d\n",
 				    result, j);
 			}
 #ifdef DEBUG
 			printf("write %d is at %p\n", j, lio[j]);
 #endif
 		}
 
 		for (i = 0; i < LIO_MAX; i++) {
 			for (j = LIO_MAX - 1; j >=0; j--) {
 				if (lio[j])
 					break;
 			}
 
 			for (;;) {
 				bzero(&ke, sizeof(ke));
 				bzero(&kq_returned, sizeof(ke));
 				ts.tv_sec = 0;
 				ts.tv_nsec = 1;
 #ifdef DEBUG
 				printf("FOO lio %d -> %p\n", j, lio[j]);
 #endif
 				EV_SET(&ke, (uintptr_t)lio[j],
 				       EVFILT_LIO, EV_ONESHOT, 0, 0, iocb[j]);
 				result = kevent(kq, NULL, 0,
 						&kq_returned, 1, &ts);
 				error = errno;
 				if (result < 0) {
 					perror("kevent error: ");
 				}
 				kq_lio = kq_returned.udata;
 #ifdef DEBUG
 				printf("kevent %d %d errno %d return.ident %p "
 				       "return.data %p return.udata %p %p\n",
 				       i, result, error,
-				       kq_returned.ident, kq_returned.data,
+				       (void*)kq_returned.ident,
+				       (void*)kq_returned.data,
 				       kq_returned.udata,
 				       lio[j]);
 #endif
 
 				if (kq_lio)
 					break;
 #ifdef DEBUG
 				printf("Try again\n");
 #endif
 			}
 
 #ifdef DEBUG
 			printf("lio %p\n", lio);
 #endif
 
 			for (j = 0; j < LIO_MAX; j++) {
 				if (lio[j] == kq_lio)
 					break;
 			}
 			if (j == LIO_MAX)
 				errx(1, "FAIL: ");
 
 #ifdef DEBUG
 			printf("Error Result for %d is %d\n", j, result);
 #endif
 			if (result < 0) {
 				printf("FAIL: run %d, operation %d result %d \n", run, LIO_MAX - i -1, result);
 				failed++;
 			} else
 				printf("PASS: run %d, operation %d result %d \n", run, LIO_MAX - i -1, result);
 			for (k = 0; k < MAX_IOCBS / LIO_MAX; k++) {
 				result = aio_return(kq_lio[k]);
 #ifdef DEBUG
 				printf("Return Resulto for %d %d is %d\n", j, k, result);
 #endif
 				if (result != sizeof(buffer)) {
 					printf("FAIL: run %d, operation %d sub-opt %d  result %d (errno=%d) should be %zu\n",
 					   run, LIO_MAX - i -1, k, result, errno, sizeof(buffer));
 				} else {
 					printf("PASS: run %d, operation %d sub-opt %d  result %d\n",
 					   run, LIO_MAX - i -1, k, result);
 				}
 			}
 #ifdef DEBUG
 			printf("\n");
 #endif
 
 			for (k = 0; k < MAX_IOCBS / LIO_MAX; k++)
 				free(lio[j][k]);
 			free(lio[j]);
 			lio[j] = NULL;
 		}
 	}
 #ifdef DEBUG
 	printf("Done\n");
 #endif
 
 	if (tmp_file)
 		unlink(pathname);
 
 	if (failed)
 		errx(1, "FAIL: %d testcases failed", failed);
 	else
 		errx(0, "PASS: All\n");
 
 }
Index: projects/clang500-import/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- projects/clang500-import/tools/build/mk/OptionalObsoleteFiles.inc	(revision 318657)
+++ projects/clang500-import/tools/build/mk/OptionalObsoleteFiles.inc	(revision 318658)
@@ -1,10008 +1,10009 @@
 #
 # $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/newsyslog.conf.d/amd.conf
 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/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+=usr/bin/sscop
 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
 .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/man/man1/sscop.1.gz
 OLD_FILES+=usr/share/man/man3/libngatm.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
 .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_IS_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_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_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_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_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/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+=rescue/ccdconfig
 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/zdb
 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/5.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/5.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/5.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/5.0.0/lib
 OLD_DIRS+=usr/lib/clang/5.0.0
 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-cxxfilt
 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-lto2
 OLD_FILES+=usr/bin/llvm-mc
 OLD_FILES+=usr/bin/llvm-modextract
 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/llvm-xray
 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_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
 OLD_DIRS+=usr/share/bsdconfig
 OLD_DIRS+=usr/share/bsdconfig/media
 OLD_DIRS+=usr/share/bsdconfig/networking
 OLD_DIRS+=usr/share/bsdconfig/packages
 OLD_DIRS+=usr/share/bsdconfig/password
 OLD_DIRS+=usr/share/bsdconfig/startup
 OLD_DIRS+=usr/share/bsdconfig/timezone
 OLD_DIRS+=usr/share/bsdconfig/usermgmt
 .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/newsyslog.conf.d/ftp.conf
 OLD_FILES+=etc/pam.d/ftp
 OLD_FILES+=etc/pam.d/ftpd
 OLD_FILES+=etc/rc.d/ftpd
 OLD_FILES+=etc/syslog.d/ftp.conf
 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
 OLD_DIRS+=usr/share/examples
 OLD_DIRS+=usr/share/examples/BSD_daemon
 OLD_DIRS+=usr/share/examples/FreeBSD_version
 OLD_DIRS+=usr/share/examples/IPv6
 OLD_DIRS+=usr/share/examples/bootforth
 OLD_DIRS+=usr/share/examples/bsdconfig
 OLD_DIRS+=usr/share/examples/csh
 OLD_DIRS+=usr/share/examples/diskless
 OLD_DIRS+=usr/share/examples/dma
 OLD_DIRS+=usr/share/examples/drivers
 OLD_DIRS+=usr/share/examples/etc
 OLD_DIRS+=usr/share/examples/etc/defaults
 OLD_DIRS+=usr/share/examples/find_interface
 OLD_DIRS+=usr/share/examples/hast
 OLD_DIRS+=usr/share/examples/ibcs2
 OLD_DIRS+=usr/share/examples/indent
 OLD_DIRS+=usr/share/examples/ipfw
 OLD_DIRS+=usr/share/examples/jails
 OLD_DIRS+=usr/share/examples/kld
 OLD_DIRS+=usr/share/examples/kld/cdev
 OLD_DIRS+=usr/share/examples/kld/cdev/module
 OLD_DIRS+=usr/share/examples/kld/cdev/test
 OLD_DIRS+=usr/share/examples/kld/dyn_sysctl
 OLD_DIRS+=usr/share/examples/kld/firmware
 OLD_DIRS+=usr/share/examples/kld/firmware/fwconsumer
 OLD_DIRS+=usr/share/examples/kld/firmware/fwimage
 OLD_DIRS+=usr/share/examples/kld/khelp
 OLD_DIRS+=usr/share/examples/kld/syscall
 OLD_DIRS+=usr/share/examples/kld/syscall/module
 OLD_DIRS+=usr/share/examples/kld/syscall/test
 OLD_DIRS+=usr/share/examples/libusb20
 OLD_DIRS+=usr/share/examples/libvgl
 OLD_DIRS+=usr/share/examples/mdoc
 OLD_DIRS+=usr/share/examples/netgraph
 OLD_DIRS+=usr/share/examples/perfmon
 OLD_DIRS+=usr/share/examples/ppi
 OLD_DIRS+=usr/share/examples/ppp
 OLD_DIRS+=usr/share/examples/printing
 OLD_DIRS+=usr/share/examples/scsi_target
 OLD_DIRS+=usr/share/examples/ses
 OLD_DIRS+=usr/share/examples/ses/getencstat
 OLD_DIRS+=usr/share/examples/ses/sesd
 OLD_DIRS+=usr/share/examples/ses/setencstat
 OLD_DIRS+=usr/share/examples/ses/setobjstat
 OLD_DIRS+=usr/share/examples/ses/srcs
 OLD_DIRS+=usr/share/examples/smbfs
 OLD_DIRS+=usr/share/examples/smbfs/print
 OLD_DIRS+=usr/share/examples/sunrpc
 OLD_DIRS+=usr/share/examples/sunrpc/dir
 OLD_DIRS+=usr/share/examples/sunrpc/msg
 OLD_DIRS+=usr/share/examples/sunrpc/sort
 OLD_DIRS+=usr/share/examples/tcsh
 OLD_DIRS+=usr/share/examples/uefisign
 OLD_DIRS+=usr/share/examples/ypldap
 .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/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 || ${MK_GDB_LIBEXEC} == yes
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver
 OLD_FILES+=usr/bin/gdbtui
 OLD_FILES+=usr/bin/kgdb
 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_GDB} == no || ${MK_GDB_LIBEXEC} == no
 OLD_FILES+=usr/libexec/gdb
 OLD_FILES+=usr/libexec/kgdb
 .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/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_DIRS+=usr/share/doc/ncurses
 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
 OLD_DIRS+=usr/share/i18n
 OLD_DIRS+=usr/share/i18n/esdb
 OLD_DIRS+=usr/share/i18n/esdb/ISO-2022
 OLD_DIRS+=usr/share/i18n/esdb/BIG5
 OLD_DIRS+=usr/share/i18n/esdb/MISC
 OLD_DIRS+=usr/share/i18n/esdb/TCVN
 OLD_DIRS+=usr/share/i18n/esdb/EBCDIC
 OLD_DIRS+=usr/share/i18n/esdb/ISO-8859
 OLD_DIRS+=usr/share/i18n/esdb/GEORGIAN
 OLD_DIRS+=usr/share/i18n/esdb/AST
 OLD_DIRS+=usr/share/i18n/esdb/KAZAKH
 OLD_DIRS+=usr/share/i18n/esdb/APPLE
 OLD_DIRS+=usr/share/i18n/esdb/EUC
 OLD_DIRS+=usr/share/i18n/esdb/CP
 OLD_DIRS+=usr/share/i18n/esdb/DEC
 OLD_DIRS+=usr/share/i18n/esdb/UTF
 OLD_DIRS+=usr/share/i18n/esdb/GB
 OLD_DIRS+=usr/share/i18n/esdb/ISO646
 OLD_DIRS+=usr/share/i18n/esdb/KOI
 OLD_DIRS+=usr/share/i18n/csmapper
 OLD_DIRS+=usr/share/i18n/csmapper/KAZAKH
 OLD_DIRS+=usr/share/i18n/csmapper/CNS
 OLD_DIRS+=usr/share/i18n/csmapper/BIG5
 OLD_DIRS+=usr/share/i18n/csmapper/JIS
 OLD_DIRS+=usr/share/i18n/csmapper/KOI
 OLD_DIRS+=usr/share/i18n/csmapper/TCVN
 OLD_DIRS+=usr/share/i18n/csmapper/MISC
 OLD_DIRS+=usr/share/i18n/csmapper/EBCDIC
 OLD_DIRS+=usr/share/i18n/csmapper/ISO646
 OLD_DIRS+=usr/share/i18n/csmapper/CP
 OLD_DIRS+=usr/share/i18n/csmapper/GEORGIAN
 OLD_DIRS+=usr/share/i18n/csmapper/ISO-8859
 OLD_DIRS+=usr/share/i18n/csmapper/AST
 OLD_DIRS+=usr/share/i18n/csmapper/APPLE
 OLD_DIRS+=usr/share/i18n/csmapper/KS
 OLD_DIRS+=usr/share/i18n/csmapper/GB
 .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
 OLD_FILES+=rescue/rtsol
 .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+=rescue/iscsictl
 OLD_FILES+=rescue/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/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++experimental.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/__bsd_locale_defaults.h
 OLD_FILES+=usr/include/c++/v1/__bsd_locale_fallbacks.h
 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/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/__locale
 OLD_FILES+=usr/include/c++/v1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/__nullptr
 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/__string
 OLD_FILES+=usr/include/c++/v1/__threading_support
 OLD_FILES+=usr/include/c++/v1/__tree
 OLD_FILES+=usr/include/c++/v1/__tuple
 OLD_FILES+=usr/include/c++/v1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/algorithm
 OLD_FILES+=usr/include/c++/v1/any
 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/ctype.h
 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/errno.h
 OLD_FILES+=usr/include/c++/v1/exception
 OLD_FILES+=usr/include/c++/v1/experimental/__config
 OLD_FILES+=usr/include/c++/v1/experimental/__memory
 OLD_FILES+=usr/include/c++/v1/experimental/algorithm
 OLD_FILES+=usr/include/c++/v1/experimental/any
 OLD_FILES+=usr/include/c++/v1/experimental/chrono
 OLD_FILES+=usr/include/c++/v1/experimental/deque
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 OLD_FILES+=usr/include/c++/v1/experimental/filesystem
 OLD_FILES+=usr/include/c++/v1/experimental/forward_list
 OLD_FILES+=usr/include/c++/v1/experimental/functional
 OLD_FILES+=usr/include/c++/v1/experimental/iterator
 OLD_FILES+=usr/include/c++/v1/experimental/list
 OLD_FILES+=usr/include/c++/v1/experimental/map
 OLD_FILES+=usr/include/c++/v1/experimental/memory_resource
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/experimental/propagate_const
 OLD_FILES+=usr/include/c++/v1/experimental/ratio
 OLD_FILES+=usr/include/c++/v1/experimental/regex
 OLD_FILES+=usr/include/c++/v1/experimental/set
 OLD_FILES+=usr/include/c++/v1/experimental/string
 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/unordered_map
 OLD_FILES+=usr/include/c++/v1/experimental/unordered_set
 OLD_FILES+=usr/include/c++/v1/experimental/utility
 OLD_FILES+=usr/include/c++/v1/experimental/vector
 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/float.h
 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/inttypes.h
 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/limits.h
 OLD_FILES+=usr/include/c++/v1/list
 OLD_FILES+=usr/include/c++/v1/locale
 OLD_FILES+=usr/include/c++/v1/locale.h
 OLD_FILES+=usr/include/c++/v1/map
 OLD_FILES+=usr/include/c++/v1/math.h
 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/numeric
 OLD_FILES+=usr/include/c++/v1/optional
 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/setjmp.h
 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/stdbool.h
 OLD_FILES+=usr/include/c++/v1/stddef.h
 OLD_FILES+=usr/include/c++/v1/stdexcept
 OLD_FILES+=usr/include/c++/v1/stdint.h
 OLD_FILES+=usr/include/c++/v1/stdio.h
 OLD_FILES+=usr/include/c++/v1/stdlib.h
 OLD_FILES+=usr/include/c++/v1/streambuf
 OLD_FILES+=usr/include/c++/v1/string
 OLD_FILES+=usr/include/c++/v1/string.h
 OLD_FILES+=usr/include/c++/v1/string_view
 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/__bsd_locale_defaults.h
 OLD_FILES+=usr/include/c++/v1/tr1/__bsd_locale_fallbacks.h
 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/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/tr1/__locale
 OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/tr1/__nullptr
 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/__string
 OLD_FILES+=usr/include/c++/v1/tr1/__threading_support
 OLD_FILES+=usr/include/c++/v1/tr1/__tree
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple
 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/any
 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/ctype.h
 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/errno.h
 OLD_FILES+=usr/include/c++/v1/tr1/exception
 OLD_FILES+=usr/include/c++/v1/tr1/float.h
 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/inttypes.h
 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/limits.h
 OLD_FILES+=usr/include/c++/v1/tr1/list
 OLD_FILES+=usr/include/c++/v1/tr1/locale
 OLD_FILES+=usr/include/c++/v1/tr1/locale.h
 OLD_FILES+=usr/include/c++/v1/tr1/map
 OLD_FILES+=usr/include/c++/v1/tr1/math.h
 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/numeric
 OLD_FILES+=usr/include/c++/v1/tr1/optional
 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/setjmp.h
 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/stdbool.h
 OLD_FILES+=usr/include/c++/v1/tr1/stddef.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdexcept
 OLD_FILES+=usr/include/c++/v1/tr1/stdint.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdio.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/v1/tr1/streambuf
 OLD_FILES+=usr/include/c++/v1/tr1/string
 OLD_FILES+=usr/include/c++/v1/tr1/string.h
 OLD_FILES+=usr/include/c++/v1/tr1/string_view
 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/variant
 OLD_FILES+=usr/include/c++/v1/tr1/vector
 OLD_FILES+=usr/include/c++/v1/tr1/wchar.h
 OLD_FILES+=usr/include/c++/v1/tr1/wctype.h
 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/variant
 OLD_FILES+=usr/include/c++/v1/vector
 OLD_FILES+=usr/include/c++/v1/wchar.h
 OLD_FILES+=usr/include/c++/v1/wctype.h
 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
 OLD_LIBS+=lib/libthr.so.3
 OLD_FILES+=usr/lib/libthr.a
 OLD_FILES+=usr/lib/libthr_p.a
 OLD_FILES+=usr/share/man/man3/libthr.3.gz
 .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_DIRS+=usr/share/locale
 OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15
 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_DIRS+=usr/share/locale/af_ZA.ISO8859-1
 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_DIRS+=usr/share/locale/af_ZA.UTF-8
 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_DIRS+=usr/share/locale/am_ET.UTF-8
 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_DIRS+=usr/share/locale/ar_AE.UTF-8
 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_DIRS+=usr/share/locale/ar_EG.UTF-8
 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_DIRS+=usr/share/locale/ar_JO.UTF-8
 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_DIRS+=usr/share/locale/ar_MA.UTF-8
 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_DIRS+=usr/share/locale/ar_QA.UTF-8
 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_DIRS+=usr/share/locale/ar_SA.UTF-8
 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_DIRS+=usr/share/locale/be_BY.CP1131
 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_DIRS+=usr/share/locale/be_BY.CP1251
 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_DIRS+=usr/share/locale/be_BY.ISO8859-5
 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_DIRS+=usr/share/locale/be_BY.UTF-8
 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_DIRS+=usr/share/locale/bg_BG.CP1251
 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_DIRS+=usr/share/locale/bg_BG.UTF-8
 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_DIRS+=usr/share/locale/ca_AD.ISO8859-1
 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_DIRS+=usr/share/locale/ca_AD.ISO8859-15
 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_DIRS+=usr/share/locale/ca_AD.UTF-8
 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_DIRS+=usr/share/locale/ca_ES.ISO8859-1
 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_DIRS+=usr/share/locale/ca_ES.ISO8859-15
 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_DIRS+=usr/share/locale/ca_ES.UTF-8
 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_DIRS+=usr/share/locale/ca_FR.ISO8859-1
 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_DIRS+=usr/share/locale/ca_FR.ISO8859-15
 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_DIRS+=usr/share/locale/ca_FR.UTF-8
 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_DIRS+=usr/share/locale/ca_IT.ISO8859-1
 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_DIRS+=usr/share/locale/ca_IT.ISO8859-15
 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_DIRS+=usr/share/locale/ca_IT.UTF-8
 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_DIRS+=usr/share/locale/cs_CZ.ISO8859-2
 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_DIRS+=usr/share/locale/cs_CZ.UTF-8
 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_DIRS+=usr/share/locale/da_DK.ISO8859-1
 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_DIRS+=usr/share/locale/da_DK.ISO8859-15
 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_DIRS+=usr/share/locale/da_DK.UTF-8
 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_DIRS+=usr/share/locale/de_AT.ISO8859-1
 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_DIRS+=usr/share/locale/de_AT.ISO8859-15
 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_DIRS+=usr/share/locale/de_AT.UTF-8
 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_DIRS+=usr/share/locale/de_CH.ISO8859-1
 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_DIRS+=usr/share/locale/de_CH.ISO8859-15
 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_DIRS+=usr/share/locale/de_CH.UTF-8
 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_DIRS+=usr/share/locale/de_DE.ISO8859-1
 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_DIRS+=usr/share/locale/de_DE.ISO8859-15
 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_DIRS+=usr/share/locale/de_DE.UTF-8
 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_DIRS+=usr/share/locale/el_GR.ISO8859-7
 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_DIRS+=usr/share/locale/el_GR.UTF-8
 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_DIRS+=usr/share/locale/en_AU.ISO8859-1
 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_DIRS+=usr/share/locale/en_AU.ISO8859-15
 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_DIRS+=usr/share/locale/en_AU.US-ASCII
 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_DIRS+=usr/share/locale/en_AU.UTF-8
 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_DIRS+=usr/share/locale/en_CA.ISO8859-1
 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_DIRS+=usr/share/locale/en_CA.ISO8859-15
 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_DIRS+=usr/share/locale/en_CA.US-ASCII
 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_DIRS+=usr/share/locale/en_CA.UTF-8
 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_DIRS+=usr/share/locale/en_GB.ISO8859-1
 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_DIRS+=usr/share/locale/en_GB.ISO8859-15
 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_DIRS+=usr/share/locale/en_GB.US-ASCII
 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_DIRS+=usr/share/locale/en_GB.UTF-8
 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_DIRS+=usr/share/locale/en_HK.ISO8859-1
 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_DIRS+=usr/share/locale/en_HK.UTF-8
 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_DIRS+=usr/share/locale/en_IE.ISO8859-1
 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_DIRS+=usr/share/locale/en_IE.ISO8859-15
 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_DIRS+=usr/share/locale/en_IE.UTF-8
 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_DIRS+=usr/share/locale/en_NZ.ISO8859-1
 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_DIRS+=usr/share/locale/en_NZ.ISO8859-15
 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_DIRS+=usr/share/locale/en_NZ.US-ASCII
 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_DIRS+=usr/share/locale/en_NZ.UTF-8
 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_DIRS+=usr/share/locale/en_PH.UTF-8
 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_DIRS+=usr/share/locale/en_SG.ISO8859-1
 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_DIRS+=usr/share/locale/en_SG.UTF-8
 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_DIRS+=usr/share/locale/en_US.ISO8859-1
 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_DIRS+=usr/share/locale/en_US.ISO8859-15
 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_DIRS+=usr/share/locale/en_US.US-ASCII
 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_DIRS+=usr/share/locale/en_US.UTF-8
 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_DIRS+=usr/share/locale/en_ZA.ISO8859-1
 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_DIRS+=usr/share/locale/en_ZA.ISO8859-15
 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_DIRS+=usr/share/locale/en_ZA.US-ASCII
 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_DIRS+=usr/share/locale/en_ZA.UTF-8
 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_DIRS+=usr/share/locale/es_AR.ISO8859-1
 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_DIRS+=usr/share/locale/es_AR.UTF-8
 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_DIRS+=usr/share/locale/es_CR.UTF-8
 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_DIRS+=usr/share/locale/es_ES.ISO8859-1
 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_DIRS+=usr/share/locale/es_ES.ISO8859-15
 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_DIRS+=usr/share/locale/es_ES.UTF-8
 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_DIRS+=usr/share/locale/es_MX.ISO8859-1
 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_DIRS+=usr/share/locale/es_MX.UTF-8
 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_DIRS+=usr/share/locale/et_EE.ISO8859-1
 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_DIRS+=usr/share/locale/et_EE.ISO8859-15
 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_DIRS+=usr/share/locale/et_EE.UTF-8
 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_DIRS+=usr/share/locale/eu_ES.ISO8859-1
 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_DIRS+=usr/share/locale/eu_ES.ISO8859-15
 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_DIRS+=usr/share/locale/eu_ES.UTF-8
 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_DIRS+=usr/share/locale/fi_FI.ISO8859-1
 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_DIRS+=usr/share/locale/fi_FI.ISO8859-15
 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_DIRS+=usr/share/locale/fi_FI.UTF-8
 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_DIRS+=usr/share/locale/fr_BE.ISO8859-1
 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_DIRS+=usr/share/locale/fr_BE.ISO8859-15
 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_DIRS+=usr/share/locale/fr_BE.UTF-8
 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_DIRS+=usr/share/locale/fr_CA.ISO8859-1
 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_DIRS+=usr/share/locale/fr_CA.ISO8859-15
 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_DIRS+=usr/share/locale/fr_CA.UTF-8
 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_DIRS+=usr/share/locale/fr_CH.ISO8859-1
 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_DIRS+=usr/share/locale/fr_CH.ISO8859-15
 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_DIRS+=usr/share/locale/fr_CH.UTF-8
 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_DIRS+=usr/share/locale/fr_FR.ISO8859-1
 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_DIRS+=usr/share/locale/fr_FR.ISO8859-15
 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_DIRS+=usr/share/locale/fr_FR.UTF-8
 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_DIRS+=usr/share/locale/he_IL.UTF-8
 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_DIRS+=usr/share/locale/hi_IN.ISCII-DEV
 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_DIRS+=usr/share/locale/hi_IN.UTF-8
 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_DIRS+=usr/share/locale/hr_HR.ISO8859-2
 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_DIRS+=usr/share/locale/hr_HR.UTF-8
 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_DIRS+=usr/share/locale/hu_HU.ISO8859-2
 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_DIRS+=usr/share/locale/hu_HU.UTF-8
 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_DIRS+=usr/share/locale/hy_AM.ARMSCII-8
 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_DIRS+=usr/share/locale/hy_AM.UTF-8
 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_DIRS+=usr/share/locale/is_IS.ISO8859-1
 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_DIRS+=usr/share/locale/is_IS.ISO8859-15
 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_DIRS+=usr/share/locale/is_IS.UTF-8
 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_DIRS+=usr/share/locale/it_CH.ISO8859-1
 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_DIRS+=usr/share/locale/it_CH.ISO8859-15
 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_DIRS+=usr/share/locale/it_CH.UTF-8
 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_DIRS+=usr/share/locale/it_IT.ISO8859-1
 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_DIRS+=usr/share/locale/it_IT.ISO8859-15
 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_DIRS+=usr/share/locale/it_IT.UTF-8
 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_DIRS+=usr/share/locale/ja_JP.eucJP
 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_DIRS+=usr/share/locale/ja_JP.SJIS
 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_DIRS+=usr/share/locale/ja_JP.UTF-8
 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_DIRS+=usr/share/locale/kk_KZ.UTF-8
 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_DIRS+=usr/share/locale/ko_KR.CP949
 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_DIRS+=usr/share/locale/ko_KR.eucKR
 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_DIRS+=usr/share/locale/ko_KR.UTF-8
 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_DIRS+=usr/share/locale/lt_LT.ISO8859-13
 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_DIRS+=usr/share/locale/lt_LT.UTF-8
 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_DIRS+=usr/share/locale/lv_LV.ISO8859-13
 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_DIRS+=usr/share/locale/lv_LV.UTF-8
 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_DIRS+=usr/share/locale/mn_MN.UTF-8
 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_DIRS+=usr/share/locale/nb_NO.ISO8859-1
 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_DIRS+=usr/share/locale/nb_NO.ISO8859-15
 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_DIRS+=usr/share/locale/nb_NO.UTF-8
 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_DIRS+=usr/share/locale/nl_BE.ISO8859-1
 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_DIRS+=usr/share/locale/nl_BE.ISO8859-15
 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_DIRS+=usr/share/locale/nl_BE.UTF-8
 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_DIRS+=usr/share/locale/nl_NL.ISO8859-1
 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_DIRS+=usr/share/locale/nl_NL.ISO8859-15
 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_DIRS+=usr/share/locale/nl_NL.UTF-8
 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_DIRS+=usr/share/locale/nn_NO.ISO8859-1
 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_DIRS+=usr/share/locale/nn_NO.ISO8859-15
 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_DIRS+=usr/share/locale/nn_NO.UTF-8
 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_DIRS+=usr/share/locale/pl_PL.ISO8859-2
 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_DIRS+=usr/share/locale/pl_PL.UTF-8
 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_DIRS+=usr/share/locale/pt_BR.ISO8859-1
 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_DIRS+=usr/share/locale/pt_BR.UTF-8
 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_DIRS+=usr/share/locale/pt_PT.ISO8859-1
 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_DIRS+=usr/share/locale/pt_PT.ISO8859-15
 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_DIRS+=usr/share/locale/pt_PT.UTF-8
 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_DIRS+=usr/share/locale/ro_RO.ISO8859-2
 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_DIRS+=usr/share/locale/ro_RO.UTF-8
 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_DIRS+=usr/share/locale/ru_RU.CP1251
 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_DIRS+=usr/share/locale/ru_RU.CP866
 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_DIRS+=usr/share/locale/ru_RU.ISO8859-5
 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_DIRS+=usr/share/locale/ru_RU.KOI8-R
 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_DIRS+=usr/share/locale/ru_RU.UTF-8
 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_DIRS+=usr/share/locale/se_FI.UTF-8
 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_DIRS+=usr/share/locale/se_NO.UTF-8
 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_DIRS+=usr/share/locale/sk_SK.ISO8859-2
 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_DIRS+=usr/share/locale/sk_SK.UTF-8
 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_DIRS+=usr/share/locale/sl_SI.ISO8859-2
 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_DIRS+=usr/share/locale/sl_SI.UTF-8
 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_DIRS+=usr/share/locale/sr_RS.ISO8859-5
 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_DIRS+=usr/share/locale/sr_RS.UTF-8
 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_DIRS+=usr/share/locale/sr_RS.ISO8859-2
 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_DIRS+=usr/share/locale/sr_RS.UTF-8@latin
 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_DIRS+=usr/share/locale/sv_FI.ISO8859-1
 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_DIRS+=usr/share/locale/sv_FI.ISO8859-15
 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_DIRS+=usr/share/locale/sv_FI.UTF-8
 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_DIRS+=usr/share/locale/sv_SE.ISO8859-1
 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_DIRS+=usr/share/locale/sv_SE.ISO8859-15
 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_DIRS+=usr/share/locale/sv_SE.UTF-8
 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_DIRS+=usr/share/locale/tr_TR.ISO8859-9
 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_DIRS+=usr/share/locale/tr_TR.UTF-8
 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_DIRS+=usr/share/locale/uk_UA.CP1251
 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_DIRS+=usr/share/locale/uk_UA.ISO8859-5
 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_DIRS+=usr/share/locale/uk_UA.KOI8-U
 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_DIRS+=usr/share/locale/uk_UA.UTF-8
 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_DIRS+=usr/share/locale/zh_CN.eucCN
 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_DIRS+=usr/share/locale/zh_CN.GB18030
 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_DIRS+=usr/share/locale/zh_CN.GB2312
 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_DIRS+=usr/share/locale/zh_CN.GBK
 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_DIRS+=usr/share/locale/zh_CN.UTF-8
 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_DIRS+=usr/share/locale/zh_HK.UTF-8
 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_DIRS+=usr/share/locale/zh_TW.Big5
 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_DIRS+=usr/share/locale/zh_TW.UTF-8
 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/newsyslog.conf.d/lpr.conf
 OLD_FILES+=etc/rc.d/lpd
 OLD_FILES+=etc/syslog.d/lpr.conf
 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}
 MAN_DIRS!=find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${MAN_DIRS}
 .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_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+=rescue/nc
 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/drivers
 OLD_DIRS+=usr/share/doc/ntp/drivers/scripts
 OLD_DIRS+=usr/share/doc/ntp/drivers/icons
 OLD_DIRS+=usr/share/doc/ntp/hints
 OLD_DIRS+=usr/share/doc/ntp/icons
 OLD_DIRS+=usr/share/doc/ntp/pic
 OLD_DIRS+=usr/share/doc/ntp/scripts
 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_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/newsyslog.conf.d/pf.conf
 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/newsyslog.conf.d/ppp.conf
 OLD_FILES+=etc/ppp/ppp.conf
 OLD_FILES+=etc/syslog.d/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
 . if exists(${DESTDIR}${TESTSBASE})
 RESCUE_DIRS!=find ${DESTDIR}/rescue -type d 2>/dev/null | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${RESCUE_DIRS}
 RESCUE_FILES!=find ${DESTDIR}/rescue \! -type d 2>/dev/null | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${RESCUE_FILES}
 . endif
 .endif
 
 .if ${MK_ROUTED} == no
 OLD_FILES+=rescue/routed
 OLD_FILES+=rescue/rtquery
 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/newsyslog.conf.d/sendmail.conf
 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/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
 OLD_DIRS+=usr/share/syscons/fonts
 OLD_DIRS+=usr/share/syscons/scrnmaps
 OLD_DIRS+=usr/share/syscons/keymaps
 OLD_DIRS+=usr/share/syscons
 .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+=etc/pam.d/telnetd
 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/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/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/clang500-import/usr.bin/catman/catman.1
===================================================================
--- projects/clang500-import/usr.bin/catman/catman.1	(revision 318657)
+++ projects/clang500-import/usr.bin/catman/catman.1	(revision 318658)
@@ -1,109 +1,112 @@
 .\" Copyright (c) 2002 John Rochester
 .\" 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$
 .\"
-.Dd December 3, 2005
+.Dd May 22, 2017
 .Dt CATMAN 1
 .Os
 .Sh NAME
 .Nm catman
 .Nd "preformat man pages"
 .Sh SYNOPSIS
 .Nm
 .Op Fl fLnrv
 .Op Ar directories ...
 .Sh DESCRIPTION
 The
 .Nm
 utility preformats all the man pages in
 .Ar directories
 using the
+.Nm mandoc
+command when supported, falling back on the
 .Nm nroff Fl man
 command.
 Directories may be separated by colons instead of spaces.
 If no
 .Ar directories
 are specified, the contents of the
 .Ev MANPATH
 environment variable is used, or if that is not set, the default directory
 .Pa /usr/share/man
 is processed.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl f
 Force all man pages to be reformatted even if the corresponding cat page
 is newer.
 .It Fl L
 Process only localized subdirectories corresponding to the locale specified
 in the standard environment variables.
 .It Fl n
 Print out what would be done instead of performing any formatting.
 .It Fl r
 Scan for and remove
 .Dq junk
 files that are neither man pages nor their
 corresponding formatted cat pages.
 .It Fl v
 Cause
 .Nm
 to be more verbose about what it is doing.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width ".Ev MANPATH"
 .It Ev LC_ALL , LC_CTYPE , LANG
 These variables control what subdirectories will be processed if the
 .Fl L
 option is used.
 .It Ev MACHINE
 If set, overrides the current machine type when searching for
 machine specific man page subdirectories.
 .It Ev MACHINE_ARCH
 If set, overrides the current architecture when searching for
 architecture specific man page subdirectories.
 .It Ev MANPATH
 Determines the set of directories to be processed if none are given on
 the command line.
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /usr/share/man" -compact
 .It Pa /usr/share/man
 Default directory to process if the
 .Ev MANPATH
 environment variable is not set.
 .El
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr makewhatis 1 ,
 .Xr man 1 ,
+.Xr mandoc 1 ,
 .Xr nroff 1
 .Sh HISTORY
 A previous version of the
 .Nm
 command appeared in
 .Fx 2.1 .
 .Sh AUTHORS
 .An John Rochester
Index: projects/clang500-import/usr.bin/catman/catman.c
===================================================================
--- projects/clang500-import/usr.bin/catman/catman.c	(revision 318657)
+++ projects/clang500-import/usr.bin/catman/catman.c	(revision 318658)
@@ -1,819 +1,837 @@
 /*-
  * Copyright (c) 2002 John Rochester
  * 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,
  *    in this position and unchanged.
  * 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 author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
  *
  * 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/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/utsname.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <locale.h>
 #include <langinfo.h>
 #include <libgen.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #define DEFAULT_MANPATH		"/usr/share/man"
 
 #define TOP_LEVEL_DIR	0	/* signifies a top-level man directory */
 #define MAN_SECTION_DIR	1	/* signifies a man section directory */
 #define UNKNOWN		2	/* signifies an unclassifiable directory */
 
 #define TEST_EXISTS	0x01
 #define TEST_DIR	0x02
 #define TEST_FILE	0x04
 #define TEST_READABLE	0x08
 #define TEST_WRITABLE	0x10
 
 static int verbose;		/* -v flag: be verbose with warnings */
 static int pretend;		/* -n, -p flags: print out what would be done
 				   instead of actually doing it */
 static int force;		/* -f flag: force overwriting all cat pages */
 static int rm_junk;		/* -r flag: remove garbage pages */
 static char *locale;		/* user's locale if -L is used */
 static char *lang_locale;	/* short form of locale */
 static const char *machine, *machine_arch;
 static int exit_code;		/* exit code to use when finished */
 
+extern char **environ;
+
 /*
  * -T argument for nroff
  */
 static const char *nroff_device = "ascii";
 
 /*
  * Mapping from locale to nroff device
  */
 static const char *locale_device[] = {
 	"KOI8-R",	"koi8-r",
 	"ISO8859-1",	"latin1",
 	"ISO8859-15",	"latin1",
 	NULL
 };
 
 #define	BZ2_CMD		"bzip2"
 #define	BZ2_EXT		".bz2"
 #define	BZ2CAT_CMD	"bz"
 #define	GZ_CMD		"gzip"
 #define	GZ_EXT		".gz"
 #define	GZCAT_CMD	"z"
 enum Ziptype {NONE, BZIP, GZIP};
 
+static bool mandoc_locales = false;
 static uid_t uid;
 static int starting_dir;
 static char tmp_file[MAXPATHLEN];
 static struct stat test_st;
 
 /*
  * A hashtable is an array of chains composed of this entry structure.
  */
 struct hash_entry {
 	ino_t		inode_number;
 	dev_t		device_number;
 	const char	*data;
 	struct hash_entry *next;
 };
 
 #define HASHTABLE_ALLOC	16384	/* allocation for hashtable (power of 2) */
 #define HASH_MASK	(HASHTABLE_ALLOC - 1)
 
 static struct hash_entry *visited[HASHTABLE_ALLOC];
 static struct hash_entry *links[HASHTABLE_ALLOC];
 
 /*
  * Inserts a string into a hashtable keyed by inode & device number.
  */
 static void
 insert_hashtable(struct hash_entry **table,
     ino_t inode_number,
     dev_t device_number,
     const char *data)
 {
 	struct hash_entry *new_entry;
 	struct hash_entry **chain;
 
 	new_entry = (struct hash_entry *) malloc(sizeof(struct hash_entry));
 	if (new_entry == NULL)
 		err(1, "can't insert into hashtable");
 	chain = &table[inode_number & HASH_MASK];
 	new_entry->inode_number = inode_number;
 	new_entry->device_number = device_number;
 	new_entry->data = data;
 	new_entry->next = *chain;
 	*chain = new_entry;
 }
 
 /*
  * Finds a string in a hashtable keyed by inode & device number.
  */
 static const char *
 find_hashtable(struct hash_entry **table,
     ino_t inode_number,
     dev_t device_number)
 {
 	struct hash_entry *chain;
 
 	chain = table[inode_number & HASH_MASK];
 	while (chain != NULL) {
 		if (chain->inode_number == inode_number &&
 		    chain->device_number == device_number)
 			return chain->data;
 		chain = chain->next;
 	}
 	return NULL;
 }
 
 static void
 trap_signal(int sig __unused)
 {
 	if (tmp_file[0] != '\0')
 		unlink(tmp_file);
 	exit(1);
 }
 
 /*
  * Deals with junk files in the man or cat section directories.
  */
 static void
 junk(const char *mandir, const char *name, const char *reason)
 {
 	if (verbose)
 		fprintf(stderr, "%s/%s: %s\n", mandir, name, reason);
 	if (rm_junk) {
 		fprintf(stderr, "rm %s/%s\n", mandir, name);
 		if (!pretend && unlink(name) < 0)
 			warn("%s/%s", mandir, name);
 	}
 }
 
 /*
  * Returns TOP_LEVEL_DIR for .../man, MAN_SECTION_DIR for .../manXXX,
  * and UNKNOWN for everything else.
  */
 static int
 directory_type(char *dir)
 {
 	char *p;
 
 	for (;;) {
 		p = strrchr(dir, '/');
 		if (p == NULL || p[1] != '\0')
 			break;
 		*p = '\0';
 	}
 	if (p == NULL)
 		p = dir;
 	else
 		p++;
 	if (strncmp(p, "man", 3) == 0) {
 		p += 3;
 		if (*p == '\0')
 			return TOP_LEVEL_DIR;
 		while (isalnum((unsigned char)*p) || *p == '_') {
 			if (*++p == '\0')
 				return MAN_SECTION_DIR;
 		}
 	}
 	return UNKNOWN;
 }
 
 /*
  * Tests whether the given file name (without a preceding path)
  * is a proper man page name (like "mk-amd-map.8.gz").
  * Only alphanumerics and '_' are allowed after the last '.' and
  * the last '.' can't be the first or last characters.
  */
 static int
 is_manpage_name(char *name)
 {
 	char *lastdot = NULL;
 	char *n = name;
 
 	while (*n != '\0') {
 		if (!isalnum((unsigned char)*n)) {
 			switch (*n) {
 			case '_':
 				break;
 			case '-':
 			case '+':
 			case '[':
 			case ':':
 				lastdot = NULL;
 				break;
 			case '.':
 				lastdot = n;
 				break;
 			default:
 				return 0;
 			}
 		}
 		n++;
 	}
 	return lastdot > name && lastdot + 1 < n;
 }
 
 static int
 is_bzipped(char *name)
 {
 	int len = strlen(name);
 	return len >= 5 && strcmp(&name[len - 4], BZ2_EXT) == 0;
 }
 
 static int
 is_gzipped(char *name)
 {
 	int len = strlen(name);
 	return len >= 4 && strcmp(&name[len - 3], GZ_EXT) == 0;
 }
 
 /*
  * Converts manXXX to catXXX.
  */
 static char *
 get_cat_section(char *section)
 {
 	char *cat_section;
 
 	cat_section = strdup(section);
 	assert(strlen(section) > 3 && strncmp(section, "man", 3) == 0);
 	memcpy(cat_section, "cat", 3);
 	return cat_section;
 }
 
 /*
  * Tests to see if the given directory has already been visited.
  */
 static int
 already_visited(char *mandir, char *dir, int count_visit)
 {
 	struct stat st;
 
 	if (stat(dir, &st) < 0) {
 		if (mandir != NULL)
 			warn("%s/%s", mandir, dir);
 		else
 			warn("%s", dir);
 		exit_code = 1;
 		return 1;
 	}
 	if (find_hashtable(visited, st.st_ino, st.st_dev) != NULL) {
 		if (mandir != NULL)
 			warnx("already visited %s/%s", mandir, dir);
 		else
 			warnx("already visited %s", dir);
 		return 1;
 	}
 	if (count_visit)
 		insert_hashtable(visited, st.st_ino, st.st_dev, "");
 	return 0;
 }
 
 /*
  * Returns a set of TEST_* bits describing a file's type and permissions.
  * If mod_time isn't NULL, it will contain the file's modification time.
  */
 static int
 test_path(char *name, time_t *mod_time)
 {
 	int result;
 
 	if (stat(name, &test_st) < 0)
 		return 0;
 	result = TEST_EXISTS;
 	if (mod_time != NULL)
 		*mod_time = test_st.st_mtime;
 	if (S_ISDIR(test_st.st_mode))
 		result |= TEST_DIR;
 	else if (S_ISREG(test_st.st_mode))
 		result |= TEST_FILE;
 	if (access(name, R_OK))
 		result |= TEST_READABLE;
 	if (access(name, W_OK))
 		result |= TEST_WRITABLE;
 	return result;
 }
 
 /*
  * Checks whether a file is a symbolic link.
  */
 static int
 is_symlink(char *path)
 {
 	struct stat st;
 
 	return lstat(path, &st) >= 0 && S_ISLNK(st.st_mode);
 }
 
 /*
  * Tests to see if the given directory can be written to.
  */
 static void
 check_writable(char *mandir)
 {
 	if (verbose && !(test_path(mandir, NULL) & TEST_WRITABLE))
 		fprintf(stderr, "%s: not writable - will only be able to write to existing cat directories\n", mandir);
 }
 
 /*
  * If the directory exists, attempt to make it writable, otherwise
  * attempt to create it.
  */
 static int
 make_writable_dir(char *mandir, char *dir)
 {
 	int test;
 
 	if ((test = test_path(dir, NULL)) != 0) {
 		if (!(test & TEST_WRITABLE) && chmod(dir, 0755) < 0) {
 			warn("%s/%s: chmod", mandir, dir);
 			exit_code = 1;
 			return 0;
 		}
 	} else {
 		if (verbose || pretend)
 			fprintf(stderr, "mkdir %s\n", dir);
 		if (!pretend) {
 			unlink(dir);
 			if (mkdir(dir, 0755) < 0) {
 				warn("%s/%s: mkdir", mandir, dir);
 				exit_code = 1;
 				return 0;
 			}
 		}
 	}
 	return 1;
 }
 
 /*
  * Processes a single man page source by using nroff to create
  * the preformatted cat page.
  */
 static void
 process_page(char *mandir, char *src, char *cat, enum Ziptype zipped)
 {
 	int src_test, cat_test;
 	time_t src_mtime, cat_mtime;
 	char cmd[MAXPATHLEN];
 	dev_t src_dev;
 	ino_t src_ino;
 	const char *link_name;
 
 	src_test = test_path(src, &src_mtime);
 	if (!(src_test & (TEST_FILE|TEST_READABLE))) {
 		if (!(src_test & TEST_DIR)) {
 			warnx("%s/%s: unreadable", mandir, src);
 			exit_code = 1;
 			if (rm_junk && is_symlink(src))
 				junk(mandir, src, "bogus symlink");
 		}
 		return;
 	}
 	src_dev = test_st.st_dev;
 	src_ino = test_st.st_ino;
 	cat_test = test_path(cat, &cat_mtime);
 	if (cat_test & (TEST_FILE|TEST_READABLE)) {
 		if (!force && cat_mtime >= src_mtime) {
 			if (verbose) {
 				fprintf(stderr, "\t%s/%s: up to date\n",
 				    mandir, src);
 			}
 			return;
 		}
 	}
 	/*
 	 * Is the man page a link to one we've already processed?
 	 */
 	if ((link_name = find_hashtable(links, src_ino, src_dev)) != NULL) {
 		if (verbose || pretend) {
 			fprintf(stderr, "%slink %s -> %s\n",
 			    verbose ? "\t" : "", cat, link_name);
 		}
 		if (!pretend) {
 			(void) unlink(cat);
 			if (link(link_name, cat) < 0)
 				warn("%s %s: link", link_name, cat);
 		}
 		return;
 	}
 	insert_hashtable(links, src_ino, src_dev, strdup(cat));
 	if (verbose || pretend) {
 		fprintf(stderr, "%sformat %s -> %s\n",
 		    verbose ? "\t" : "", src, cat);
 		if (pretend)
 			return;
 	}
 	snprintf(tmp_file, sizeof tmp_file, "%s.tmp", cat);
 	snprintf(cmd, sizeof cmd,
-	    "%scat %s | tbl | nroff -c -T%s -man | %s > %s.tmp",
+	    "%scat %s | mandoc -Tlint -Wunsupp 2>/dev/null",
 	    zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : "",
-	    src, nroff_device,
-	    zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",
-	    cat);
+	    src);
+	if (system(cmd) == 0) {
+		snprintf(cmd, sizeof cmd,
+		    "%scat %s | mandoc -T%s | %s > %s.tmp",
+		    zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : "",
+		    src, mandoc_locales ? "locale" : "ascii",
+		    zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",
+		    cat);
+	} else {
+		snprintf(cmd, sizeof cmd,
+		    "%scat %s | tbl | nroff -c -T%s -man | %s > %s.tmp",
+		    zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : "",
+		    src, nroff_device,
+		    zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",
+		    cat);
+	}
 	if (system(cmd) != 0)
 		err(1, "formatting pipeline");
 	if (rename(tmp_file, cat) < 0)
 		warn("%s", cat);
 	tmp_file[0] = '\0';
 }
 
 /*
  * Scan the man section directory for pages and process each one,
  * then check for junk in the corresponding cat section.
  */
 static void
 scan_section(char *mandir, char *section, char *cat_section)
 {
 	struct dirent **entries;
 	char **expected = NULL;
 	int npages;
 	int nexpected = 0;
 	int i, e;
 	enum Ziptype zipped;
 	char *page_name;
 	char page_path[MAXPATHLEN];
 	char cat_path[MAXPATHLEN];
 	char zip_path[MAXPATHLEN];
 
 	/*
 	 * scan the man section directory for pages
 	 */
 	npages = scandir(section, &entries, NULL, alphasort);
 	if (npages < 0) {
 		warn("%s/%s", mandir, section);
 		exit_code = 1;
 		return;
 	}
 	if (verbose || rm_junk) {
 		/*
 		 * Maintain a list of all cat pages that should exist,
 		 * corresponding to existing man pages.
 		 */
 		expected = (char **) calloc(npages, sizeof(char *));
 	}
 	for (i = 0; i < npages; free(entries[i++])) {
 		page_name = entries[i]->d_name;
 		snprintf(page_path, sizeof page_path, "%s/%s", section,
 		    page_name);
 		if (!is_manpage_name(page_name)) {
 			if (!(test_path(page_path, NULL) & TEST_DIR)) {
 				junk(mandir, page_path,
 				    "invalid man page name");
 			}
 			continue;
 		}
 		zipped = is_bzipped(page_name) ? BZIP :
 		    is_gzipped(page_name) ? GZIP : NONE;
 		if (zipped != NONE) {
 			snprintf(cat_path, sizeof cat_path, "%s/%s",
 			    cat_section, page_name);
 			if (expected != NULL)
 				expected[nexpected++] = strdup(page_name);
 			process_page(mandir, page_path, cat_path, zipped);
 		} else {
 			/*
 			 * We've got an uncompressed man page,
 			 * check to see if there's a (preferred)
 			 * compressed one.
 			 */
 			snprintf(zip_path, sizeof zip_path, "%s%s",
 			    page_path, GZ_EXT);
 			if (test_path(zip_path, NULL) != 0) {
 				junk(mandir, page_path,
 				    "man page unused due to existing " GZ_EXT);
 			} else {
 				if (verbose) {
 					fprintf(stderr,
 						"warning, %s is uncompressed\n",
 						page_path);
 				}
 				snprintf(cat_path, sizeof cat_path, "%s/%s",
 				    cat_section, page_name);
 				if (expected != NULL) {
 					asprintf(&expected[nexpected++],
 					    "%s", page_name);
 				}
 				process_page(mandir, page_path, cat_path, NONE);
 			}
 		}
 	}
 	free(entries);
 	if (expected == NULL)
 	    return;
 	/*
 	 * scan cat sections for junk
 	 */
 	npages = scandir(cat_section, &entries, NULL, alphasort);
 	e = 0;
 	for (i = 0; i < npages; free(entries[i++])) {
 		const char *junk_reason;
 		int cmp = 1;
 
 		page_name = entries[i]->d_name;
 		if (strcmp(page_name, ".") == 0 || strcmp(page_name, "..") == 0)
 			continue;
 		/*
 		 * Keep the index into the expected cat page list
 		 * ahead of the name we've found.
 		 */
 		while (e < nexpected &&
 		    (cmp = strcmp(page_name, expected[e])) > 0)
 			free(expected[e++]);
 		if (cmp == 0)
 			continue;
 		/* we have an unexpected page */
 		snprintf(cat_path, sizeof cat_path, "%s/%s", cat_section,
 		    page_name);
 		if (!is_manpage_name(page_name)) {
 			if (test_path(cat_path, NULL) & TEST_DIR)
 				continue;
 			junk_reason = "invalid cat page name";
 		} else if (!is_gzipped(page_name) && e + 1 < nexpected &&
 		    strncmp(page_name, expected[e + 1], strlen(page_name)) == 0 &&
 		    strlen(expected[e + 1]) == strlen(page_name) + 3) {
 			junk_reason = "cat page unused due to existing " GZ_EXT;
 		} else
 			junk_reason = "cat page without man page";
 		junk(mandir, cat_path, junk_reason);
 	}
 	free(entries);
 	while (e < nexpected)
 		free(expected[e++]);
 	free(expected);
 }
 
 
 /*
  * Processes a single man section.
  */
 static void
 process_section(char *mandir, char *section)
 {
 	char *cat_section;
 
 	if (already_visited(mandir, section, 1))
 		return;
 	if (verbose)
 		fprintf(stderr, "  section %s\n", section);
 	cat_section = get_cat_section(section);
 	if (make_writable_dir(mandir, cat_section))
 		scan_section(mandir, section, cat_section);
 	free(cat_section);
 }
 
 static int
 select_sections(const struct dirent *entry)
 {
 	char *name;
 	int ret;
 
 	name = strdup(entry->d_name);
 	ret = directory_type(name) == MAN_SECTION_DIR;
 	free(name);
 	return (ret);
 }
 
 /*
  * Processes a single top-level man directory.  If section isn't NULL,
  * it will only process that section sub-directory, otherwise it will
  * process all of them.
  */
 static void
 process_mandir(char *dir_name, char *section)
 {
 	if (fchdir(starting_dir) < 0)
 		err(1, "fchdir");
 	if (already_visited(NULL, dir_name, section == NULL))
 		return;
 	check_writable(dir_name);
 	if (verbose)
 		fprintf(stderr, "man directory %s\n", dir_name);
 	if (pretend)
 		fprintf(stderr, "cd %s\n", dir_name);
 	if (chdir(dir_name) < 0) {
 		warn("%s: chdir", dir_name);
 		exit_code = 1;
 		return;
 	}
 	if (section != NULL) {
 		process_section(dir_name, section);
 	} else {
 		struct dirent **entries;
 		char *machine_dir, *arch_dir;
 		int nsections;
 		int i;
 
 		nsections = scandir(".", &entries, select_sections, alphasort);
 		if (nsections < 0) {
 			warn("%s", dir_name);
 			exit_code = 1;
 			return;
 		}
 		for (i = 0; i < nsections; i++) {
 			process_section(dir_name, entries[i]->d_name);
 			asprintf(&machine_dir, "%s/%s", entries[i]->d_name,
 			    machine);
 			if (test_path(machine_dir, NULL) & TEST_DIR)
 				process_section(dir_name, machine_dir);
 			free(machine_dir);
 			if (strcmp(machine_arch, machine) != 0) {
 				asprintf(&arch_dir, "%s/%s", entries[i]->d_name,
 				    machine_arch);
 				if (test_path(arch_dir, NULL) & TEST_DIR)
 					process_section(dir_name, arch_dir);
 				free(arch_dir);
 			}
 			free(entries[i]);
 		}
 		free(entries);
 	}
 }
 
 /*
  * Processes one argument, which may be a colon-separated list of
  * directories.
  */
 static void
 process_argument(const char *arg)
 {
 	char *dir;
 	char *mandir;
 	char *section;
 	char *parg;
 
 	parg = strdup(arg);
 	if (parg == NULL)
 		err(1, "out of memory");
 	while ((dir = strsep(&parg, ":")) != NULL) {
 		switch (directory_type(dir)) {
 		case TOP_LEVEL_DIR:
 			if (locale != NULL) {
 				asprintf(&mandir, "%s/%s", dir, locale);
 				process_mandir(mandir, NULL);
 				free(mandir);
 				if (lang_locale != NULL) {
 					asprintf(&mandir, "%s/%s", dir,
 					    lang_locale);
 					process_mandir(mandir, NULL);
 					free(mandir);
 				}
 			} else {
 				process_mandir(dir, NULL);
 			}
 			break;
 		case MAN_SECTION_DIR: {
 			mandir = strdup(dirname(dir));
 			section = strdup(basename(dir));
 			process_mandir(mandir, section);
 			free(mandir);
 			free(section);
 			break;
 			}
 		default:
 			warnx("%s: directory name not in proper man form", dir);
 			exit_code = 1;
 		}
 	}
 	free(parg);
 }
 
 static void
 determine_locale(void)
 {
 	char *sep;
 
 	if ((locale = setlocale(LC_CTYPE, "")) == NULL) {
 		warnx("-L option used, but no locale found\n");
 		return;
 	}
 	sep = strchr(locale, '_');
 	if (sep != NULL && isupper((unsigned char)sep[1])
 			&& isupper((unsigned char)sep[2])) {
 		asprintf(&lang_locale, "%.*s%s", (int)(sep - locale),
 		    locale, &sep[3]);
 	}
 	sep = nl_langinfo(CODESET);
 	if (sep != NULL && *sep != '\0' && strcmp(sep, "US-ASCII") != 0) {
 		int i;
 
 		for (i = 0; locale_device[i] != NULL; i += 2) {
 			if (strcmp(sep, locale_device[i]) == 0) {
 				nroff_device = locale_device[i + 1];
 				break;
 			}
 		}
 	}
 	if (verbose) {
 		if (lang_locale != NULL)
 			fprintf(stderr, "short locale is %s\n", lang_locale);
 		fprintf(stderr, "nroff device is %s\n", nroff_device);
 	}
 }
 
 static void
 usage(void)
 {
 	fprintf(stderr, "usage: %s [-fLnrv] [directories ...]\n",
 	    getprogname());
 	exit(1);
 }
 
 int
 main(int argc, char **argv)
 {
 	int opt;
 
 	if ((uid = getuid()) == 0) {
 		fprintf(stderr, "don't run %s as root, use:\n   echo", argv[0]);
 		for (optind = 0; optind < argc; optind++) {
 			fprintf(stderr, " %s", argv[optind]);
 		}
 		fprintf(stderr, " | nice -5 su -m man\n");
 		exit(1);
 	}
 	while ((opt = getopt(argc, argv, "vnfLrh")) != -1) {
 		switch (opt) {
 		case 'f':
 			force++;
 			break;
 		case 'L':
 			determine_locale();
+			mandoc_locales = true;
 			break;
 		case 'n':
 			pretend++;
 			break;
 		case 'r':
 			rm_junk++;
 			break;
 		case 'v':
 			verbose++;
 			break;
 		default:
 			usage();
 			/* NOTREACHED */
 		}
 	}
 	if ((starting_dir = open(".", 0)) < 0) {
 		err(1, ".");
 	}
 	umask(022);
 	signal(SIGINT, trap_signal);
 	signal(SIGHUP, trap_signal);
 	signal(SIGQUIT, trap_signal);
 	signal(SIGTERM, trap_signal);
 
 	if ((machine = getenv("MACHINE")) == NULL) {
 		static struct utsname utsname;
 
 		if (uname(&utsname) == -1)
 			err(1, "uname");
 		machine = utsname.machine;
 	}
 
 	if ((machine_arch = getenv("MACHINE_ARCH")) == NULL)
 		machine_arch = MACHINE_ARCH;
 
 	if (optind == argc) {
 		const char *manpath = getenv("MANPATH");
 		if (manpath == NULL)
 			manpath = DEFAULT_MANPATH;
 		process_argument(manpath);
 	} else {
 		while (optind < argc)
 			process_argument(argv[optind++]);
 	}
 	exit(exit_code);
 }
Index: projects/clang500-import/usr.bin/compress/Makefile
===================================================================
--- projects/clang500-import/usr.bin/compress/Makefile	(revision 318657)
+++ projects/clang500-import/usr.bin/compress/Makefile	(revision 318658)
@@ -1,12 +1,18 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/17/94
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	compress
 SRCS=	compress.c zopen.c
 LINKS=	${BINDIR}/compress ${BINDIR}/uncompress
 MLINKS=	compress.1 uncompress.1
 
 # XXX zopen is not part of libc
 # MAN=zopen.3
+
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.prog.mk>
Index: projects/clang500-import/usr.bin/compress/compress.c
===================================================================
--- projects/clang500-import/usr.bin/compress/compress.c	(revision 318657)
+++ projects/clang500-import/usr.bin/compress/compress.c	(revision 318658)
@@ -1,437 +1,437 @@
 /*-
  * Copyright (c) 1992, 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.
  */
 
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
 #endif
 #endif
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "zopen.h"
 
 static void	compress(const char *, const char *, int);
 static void	cwarn(const char *, ...) __printflike(1, 2);
 static void	cwarnx(const char *, ...) __printflike(1, 2);
 static void	decompress(const char *, const char *, int);
 static int	permission(const char *);
 static void	setfile(const char *, struct stat *);
 static void	usage(int);
 
 static int eval, force, verbose;
 
 int
 main(int argc, char *argv[])
 {
 	enum {COMPRESS, DECOMPRESS} style;
 	size_t len;
 	int bits, cat, ch;
 	char *p, newname[MAXPATHLEN];
 
 	cat = 0;
 	if ((p = strrchr(argv[0], '/')) == NULL)
 		p = argv[0];
 	else
 		++p;
 	if (!strcmp(p, "uncompress"))
 		style = DECOMPRESS;
 	else if (!strcmp(p, "compress"))
 		style = COMPRESS;
 	else if (!strcmp(p, "zcat")) {
 		cat = 1;
 		style = DECOMPRESS;
 	} else
 		errx(1, "unknown program name");
 
 	bits = 0;
 	while ((ch = getopt(argc, argv, "b:cdfv")) != -1)
 		switch(ch) {
 		case 'b':
 			bits = strtol(optarg, &p, 10);
 			if (*p)
 				errx(1, "illegal bit count -- %s", optarg);
 			break;
 		case 'c':
 			cat = 1;
 			break;
 		case 'd':		/* Backward compatible. */
 			style = DECOMPRESS;
 			break;
 		case 'f':
 			force = 1;
 			break;
 		case 'v':
 			verbose = 1;
 			break;
 		case '?':
 		default:
 			usage(style == COMPRESS);
 		}
 	argc -= optind;
 	argv += optind;
 
 	if (argc == 0) {
 		switch(style) {
 		case COMPRESS:
 			(void)compress("/dev/stdin", "/dev/stdout", bits);
 			break;
 		case DECOMPRESS:
 			(void)decompress("/dev/stdin", "/dev/stdout", bits);
 			break;
 		}
 		exit (eval);
 	}
 
-	if (cat == 1 && argc > 1)
+	if (cat == 1 && style == COMPRESS && argc > 1)
 		errx(1, "the -c option permits only a single file argument");
 
 	for (; *argv; ++argv)
 		switch(style) {
 		case COMPRESS:
 			if (strcmp(*argv, "-") == 0) {
 				compress("/dev/stdin", "/dev/stdout", bits);
 				break;
 			} else if (cat) {
 				compress(*argv, "/dev/stdout", bits);
 				break;
 			}
 			if ((p = strrchr(*argv, '.')) != NULL &&
 			    !strcmp(p, ".Z")) {
 				cwarnx("%s: name already has trailing .Z",
 				    *argv);
 				break;
 			}
 			len = strlen(*argv);
 			if (len > sizeof(newname) - 3) {
 				cwarnx("%s: name too long", *argv);
 				break;
 			}
 			memmove(newname, *argv, len);
 			newname[len] = '.';
 			newname[len + 1] = 'Z';
 			newname[len + 2] = '\0';
 			compress(*argv, newname, bits);
 			break;
 		case DECOMPRESS:
 			if (strcmp(*argv, "-") == 0) {
 				decompress("/dev/stdin", "/dev/stdout", bits);
 				break;
 			}
 			len = strlen(*argv);
 			if ((p = strrchr(*argv, '.')) == NULL ||
 			    strcmp(p, ".Z")) {
 				if (len > sizeof(newname) - 3) {
 					cwarnx("%s: name too long", *argv);
 					break;
 				}
 				memmove(newname, *argv, len);
 				newname[len] = '.';
 				newname[len + 1] = 'Z';
 				newname[len + 2] = '\0';
 				decompress(newname,
 				    cat ? "/dev/stdout" : *argv, bits);
 			} else {
 				if (len - 2 > sizeof(newname) - 1) {
 					cwarnx("%s: name too long", *argv);
 					break;
 				}
 				memmove(newname, *argv, len - 2);
 				newname[len - 2] = '\0';
 				decompress(*argv,
 				    cat ? "/dev/stdout" : newname, bits);
 			}
 			break;
 		}
 	exit (eval);
 }
 
 static void
 compress(const char *in, const char *out, int bits)
 {
 	size_t nr;
 	struct stat isb, sb;
 	FILE *ifp, *ofp;
 	int exists, isreg, oreg;
 	u_char buf[1024];
 
 	exists = !stat(out, &sb);
 	if (!force && exists && S_ISREG(sb.st_mode) && !permission(out))
 		return;
 	isreg = oreg = !exists || S_ISREG(sb.st_mode);
 
 	ifp = ofp = NULL;
 	if ((ifp = fopen(in, "r")) == NULL) {
 		cwarn("%s", in);
 		return;
 	}
 	if (stat(in, &isb)) {		/* DON'T FSTAT! */
 		cwarn("%s", in);
 		goto err;
 	}
 	if (!S_ISREG(isb.st_mode))
 		isreg = 0;
 
 	if ((ofp = zopen(out, "w", bits)) == NULL) {
 		cwarn("%s", out);
 		goto err;
 	}
 	while ((nr = fread(buf, 1, sizeof(buf), ifp)) != 0)
 		if (fwrite(buf, 1, nr, ofp) != nr) {
 			cwarn("%s", out);
 			goto err;
 		}
 
 	if (ferror(ifp) || fclose(ifp)) {
 		cwarn("%s", in);
 		goto err;
 	}
 	ifp = NULL;
 
 	if (fclose(ofp)) {
 		cwarn("%s", out);
 		goto err;
 	}
 	ofp = NULL;
 
 	if (isreg) {
 		if (stat(out, &sb)) {
 			cwarn("%s", out);
 			goto err;
 		}
 
 		if (!force && sb.st_size >= isb.st_size) {
 			if (verbose)
 		(void)fprintf(stderr, "%s: file would grow; left unmodified\n",
 		    in);
 			eval = 2;
 			if (unlink(out))
 				cwarn("%s", out);
 			goto err;
 		}
 
 		setfile(out, &isb);
 
 		if (unlink(in))
 			cwarn("%s", in);
 
 		if (verbose) {
 			(void)fprintf(stderr, "%s: ", out);
 			if (isb.st_size > sb.st_size)
 				(void)fprintf(stderr, "%.0f%% compression\n",
 				    ((float)sb.st_size / isb.st_size) * 100.0);
 			else
 				(void)fprintf(stderr, "%.0f%% expansion\n",
 				    ((float)isb.st_size / sb.st_size) * 100.0);
 		}
 	}
 	return;
 
 err:	if (ofp) {
 		if (oreg)
 			(void)unlink(out);
 		(void)fclose(ofp);
 	}
 	if (ifp)
 		(void)fclose(ifp);
 }
 
 static void
 decompress(const char *in, const char *out, int bits)
 {
 	size_t nr;
 	struct stat sb;
 	FILE *ifp, *ofp;
 	int exists, isreg, oreg;
 	u_char buf[1024];
 
 	exists = !stat(out, &sb);
 	if (!force && exists && S_ISREG(sb.st_mode) && !permission(out))
 		return;
 	isreg = oreg = !exists || S_ISREG(sb.st_mode);
 
 	ifp = ofp = NULL;
 	if ((ifp = zopen(in, "r", bits)) == NULL) {
 		cwarn("%s", in);
 		return;
 	}
 	if (stat(in, &sb)) {
 		cwarn("%s", in);
 		goto err;
 	}
 	if (!S_ISREG(sb.st_mode))
 		isreg = 0;
 
 	/*
 	 * Try to read the first few uncompressed bytes from the input file
 	 * before blindly truncating the output file.
 	 */
 	if ((nr = fread(buf, 1, sizeof(buf), ifp)) == 0) {
 		cwarn("%s", in);
 		(void)fclose(ifp);
 		return;
 	}
 	if ((ofp = fopen(out, "w")) == NULL ||
 	    (nr != 0 && fwrite(buf, 1, nr, ofp) != nr)) {
 		cwarn("%s", out);
 		(void)fclose(ifp);
 		return;
 	}
 
 	while ((nr = fread(buf, 1, sizeof(buf), ifp)) != 0)
 		if (fwrite(buf, 1, nr, ofp) != nr) {
 			cwarn("%s", out);
 			goto err;
 		}
 
 	if (ferror(ifp) || fclose(ifp)) {
 		cwarn("%s", in);
 		goto err;
 	}
 	ifp = NULL;
 
 	if (fclose(ofp)) {
 		cwarn("%s", out);
 		goto err;
 	}
 
 	if (isreg) {
 		setfile(out, &sb);
 
 		if (unlink(in))
 			cwarn("%s", in);
 	}
 	return;
 
 err:	if (ofp) {
 		if (oreg)
 			(void)unlink(out);
 		(void)fclose(ofp);
 	}
 	if (ifp)
 		(void)fclose(ifp);
 }
 
 static void
 setfile(const char *name, struct stat *fs)
 {
 	static struct timespec tspec[2];
 
 	fs->st_mode &= S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO;
 
 	tspec[0] = fs->st_atim;
 	tspec[1] = fs->st_mtim;
 	if (utimensat(AT_FDCWD, name, tspec, 0))
 		cwarn("utimensat: %s", name);
 
 	/*
 	 * Changing the ownership probably won't succeed, unless we're root
 	 * or POSIX_CHOWN_RESTRICTED is not set.  Set uid/gid before setting
 	 * the mode; current BSD behavior is to remove all setuid bits on
 	 * chown.  If chown fails, lose setuid/setgid bits.
 	 */
 	if (chown(name, fs->st_uid, fs->st_gid)) {
 		if (errno != EPERM)
 			cwarn("chown: %s", name);
 		fs->st_mode &= ~(S_ISUID|S_ISGID);
 	}
 	if (chmod(name, fs->st_mode) && errno != EOPNOTSUPP)
 		cwarn("chmod: %s", name);
 
 	if (chflags(name, fs->st_flags) && errno != EOPNOTSUPP)
 		cwarn("chflags: %s", name);
 }
 
 static int
 permission(const char *fname)
 {
 	int ch, first;
 
 	if (!isatty(fileno(stderr)))
 		return (0);
 	(void)fprintf(stderr, "overwrite %s? ", fname);
 	first = ch = getchar();
 	while (ch != '\n' && ch != EOF)
 		ch = getchar();
 	return (first == 'y');
 }
 
 static void
 usage(int iscompress)
 {
 	if (iscompress)
 		(void)fprintf(stderr,
 		    "usage: compress [-cfv] [-b bits] [file ...]\n");
 	else
 		(void)fprintf(stderr,
 		    "usage: uncompress [-c] [-b bits] [file ...]\n");
 	exit(1);
 }
 
 static void
 cwarnx(const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
 	vwarnx(fmt, ap);
 	va_end(ap);
 	eval = 1;
 }
 
 static void
 cwarn(const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
 	vwarn(fmt, ap);
 	va_end(ap);
 	eval = 1;
 }
Index: projects/clang500-import/usr.bin/compress/tests/compress_test.sh
===================================================================
--- projects/clang500-import/usr.bin/compress/tests/compress_test.sh	(nonexistent)
+++ projects/clang500-import/usr.bin/compress/tests/compress_test.sh	(revision 318658)
@@ -0,0 +1,196 @@
+# Copyright (c) 2017 Jilles Tjoelker <jilles@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.
+#
+# 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$
+
+atf_test_case uncompress_file_1
+uncompress_file_1_head()
+{
+	atf_set "descr" \
+	    "Test uncompress without options, filename with .Z"
+}
+uncompress_file_1_body()
+{
+	printf '%01000d\n' 7 >expectfile1
+	printf "\
+\037\235\220\060\002\012\034\110\260\240\301\203\010\023\052\134\
+\310\260\241\303\207\020\043\112\234\110\261\242\305\213\030\063\
+\152\334\310\261\243\307\217\040\103\212\034\111\262\244\311\223\
+\050\123\252\134\211\360\206\002" >file1.Z
+	atf_check uncompress file1.Z
+	atf_check cmp file1 expectfile1
+	atf_check test ! -e file1.Z
+}
+
+atf_test_case uncompress_file_2
+uncompress_file_2_head()
+{
+	atf_set "descr" \
+	    "Test uncompress without options, filename without .Z"
+}
+uncompress_file_2_body()
+{
+	printf '%01000d\n' 7 >expectfile1
+	printf "\
+\037\235\220\060\002\012\034\110\260\240\301\203\010\023\052\134\
+\310\260\241\303\207\020\043\112\234\110\261\242\305\213\030\063\
+\152\334\310\261\243\307\217\040\103\212\034\111\262\244\311\223\
+\050\123\252\134\211\360\206\002" >file1.Z
+	atf_check uncompress file1
+	atf_check cmp file1 expectfile1
+	atf_check test ! -e file1.Z
+}
+
+atf_test_case uncompress_stdio_1
+uncompress_stdio_1_head()
+{
+	atf_set "descr" \
+	    "Test uncompress without parameters"
+}
+uncompress_stdio_1_body()
+{
+	printf '%01000d\n' 7 >expectfile1
+	printf "\
+\037\235\220\060\002\012\034\110\260\240\301\203\010\023\052\134\
+\310\260\241\303\207\020\043\112\234\110\261\242\305\213\030\063\
+\152\334\310\261\243\307\217\040\103\212\034\111\262\244\311\223\
+\050\123\252\134\211\360\206\002" >file1.Z
+	atf_check -o file:expectfile1 -x 'uncompress <file1.Z'
+}
+
+atf_test_case uncompress_minusc_1
+uncompress_minusc_1_head()
+{
+	atf_set "descr" \
+	    "Test uncompress with -c"
+}
+uncompress_minusc_1_body()
+{
+	printf '%01000d\n' 7 >expectfile1
+	printf "\
+\037\235\220\060\002\012\034\110\260\240\301\203\010\023\052\134\
+\310\260\241\303\207\020\043\112\234\110\261\242\305\213\030\063\
+\152\334\310\261\243\307\217\040\103\212\034\111\262\244\311\223\
+\050\123\252\134\211\360\206\002" >file1.Z
+	atf_check -o file:expectfile1 uncompress -c file1.Z
+	atf_check test -e file1.Z
+	atf_check test ! -e file1
+}
+
+atf_test_case compress_uncompress_stdio_1
+compress_uncompress_stdio_1_head()
+{
+	atf_set "descr" \
+	    "Test compressing and uncompressing some data, using stdio"
+}
+compress_uncompress_stdio_1_body()
+{
+	printf '%01000d\n' 7 8 >expectfile1
+	atf_check -x 'compress <expectfile1 >file1.Z'
+	atf_check -o file:expectfile1 uncompress -c file1.Z
+}
+
+atf_test_case compress_uncompress_minusc_1
+compress_uncompress_minusc_1_head()
+{
+	atf_set "descr" \
+	    "Test compressing and uncompressing some data, using -c"
+}
+compress_uncompress_minusc_1_body()
+{
+	printf '%01000d\n' 7 8 >expectfile1
+	atf_check -x 'compress -c expectfile1 >file1.Z'
+	atf_check -o file:expectfile1 uncompress -c file1.Z
+}
+
+atf_test_case compress_uncompress_file_1
+compress_uncompress_file_1_head()
+{
+	atf_set "descr" \
+	    "Test compressing and uncompressing some data, passing one filename"
+}
+compress_uncompress_file_1_body()
+{
+	printf '%01000d\n' 7 8 >expectfile1
+	cp expectfile1 file1
+	atf_check compress file1
+	atf_check -s exit:1 cmp -s file1.Z expectfile1
+	atf_check uncompress file1.Z
+	atf_check cmp file1 expectfile1
+}
+
+atf_test_case compress_uncompress_file_2
+compress_uncompress_file_2_head()
+{
+	atf_set "descr" \
+	    "Test compressing and uncompressing some data, passing two filenames"
+}
+compress_uncompress_file_2_body()
+{
+	printf '%01000d\n' 7 8 >expectfile1
+	printf '%01000d\n' 8 7 >expectfile2
+	cp expectfile1 file1
+	cp expectfile2 file2
+	atf_check compress file1 file2
+	atf_check -s exit:1 cmp -s file1.Z expectfile1
+	atf_check -s exit:1 cmp -s file2.Z expectfile2
+	atf_check -s exit:1 cmp -s file1.Z file2.Z
+	atf_check uncompress file1.Z file2.Z
+	atf_check cmp file1 expectfile1
+	atf_check cmp file2 expectfile2
+}
+
+atf_test_case compress_uncompress_file_minusc_1
+compress_uncompress_file_minusc_1_head()
+{
+	atf_set "descr" \
+	    "Test compressing and uncompressing some data, passing two filenames to uncompress -c"
+}
+compress_uncompress_file_minusc_1_body()
+{
+	printf '%01000d\n' 7 8 >expectfile1
+	printf '%01000d\n' 8 7 >expectfile2
+	cp expectfile1 file1
+	cp expectfile2 file2
+	atf_check compress file1 file2
+	atf_check -s exit:1 cmp -s file1.Z expectfile1
+	atf_check -s exit:1 cmp -s file2.Z expectfile2
+	atf_check -s exit:1 cmp -s file1.Z file2.Z
+	atf_check -x 'uncompress -c file1.Z file2.Z >all'
+	atf_check -x 'cat expectfile1 expectfile2 >expectall'
+	atf_check cmp all expectall
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case uncompress_file_1
+	atf_add_test_case uncompress_file_2
+	atf_add_test_case uncompress_stdio_1
+	atf_add_test_case uncompress_minusc_1
+	atf_add_test_case compress_uncompress_stdio_1
+	atf_add_test_case compress_uncompress_minusc_1
+	atf_add_test_case compress_uncompress_file_1
+	atf_add_test_case compress_uncompress_file_2
+	atf_add_test_case compress_uncompress_file_minusc_1
+}

Property changes on: projects/clang500-import/usr.bin/compress/tests/compress_test.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/clang500-import/usr.bin/compress/tests/Makefile
===================================================================
--- projects/clang500-import/usr.bin/compress/tests/Makefile	(nonexistent)
+++ projects/clang500-import/usr.bin/compress/tests/Makefile	(revision 318658)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PACKAGE=	tests
+
+ATF_TESTS_SH=	compress_test
+
+.include <bsd.test.mk>

Property changes on: projects/clang500-import/usr.bin/compress/tests/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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/clang500-import/usr.bin/grep/file.c
===================================================================
--- projects/clang500-import/usr.bin/grep/file.c	(revision 318657)
+++ projects/clang500-import/usr.bin/grep/file.c	(revision 318658)
@@ -1,358 +1,358 @@
 /*	$NetBSD: file.c,v 1.5 2011/02/16 18:35:39 joerg Exp $	*/
 /*	$FreeBSD$	*/
 /*	$OpenBSD: file.c,v 1.11 2010/07/02 20:48:48 nicm Exp $	*/
 
 /*-
  * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
  * Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
  * Copyright (C) 2010 Dimitry Andric <dimitry@andric.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.
  *
  * 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 <sys/param.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <wctype.h>
 #include <zlib.h>
 
 #ifndef WITHOUT_LZMA
 #include <lzma.h>
 #endif
 
 #ifndef WITHOUT_BZIP2
 #include <bzlib.h>
 #endif
 
 #include "grep.h"
 
 #define	MAXBUFSIZ	(32 * 1024)
 #define	LNBUFBUMP	80
 
 static gzFile gzbufdesc;
 #ifndef WITHOUT_LZMA
 static lzma_stream lstrm = LZMA_STREAM_INIT;
 static lzma_action laction;
 static uint8_t lin_buf[MAXBUFSIZ];
 #endif
 #ifndef WITHOUT_BZIP2
 static BZFILE* bzbufdesc;
 #endif
 
 static unsigned char *buffer;
 static unsigned char *bufpos;
 static size_t bufrem;
 static size_t fsiz;
 
 static unsigned char *lnbuf;
 static size_t lnbuflen;
 
 static inline int
 grep_refill(struct file *f)
 {
 	ssize_t nr;
 
 	if (filebehave == FILE_MMAP)
 		return (0);
 
 	bufpos = buffer;
 	bufrem = 0;
 
 	if (filebehave == FILE_GZIP) {
 		nr = gzread(gzbufdesc, buffer, MAXBUFSIZ);
 #ifndef WITHOUT_BZIP2
 	} else if (filebehave == FILE_BZIP && bzbufdesc != NULL) {
 		int bzerr;
 
 		nr = BZ2_bzRead(&bzerr, bzbufdesc, buffer, MAXBUFSIZ);
 		switch (bzerr) {
 		case BZ_OK:
 		case BZ_STREAM_END:
 			/* No problem, nr will be okay */
 			break;
 		case BZ_DATA_ERROR_MAGIC:
 			/*
 			 * As opposed to gzread(), which simply returns the
 			 * plain file data, if it is not in the correct
 			 * compressed format, BZ2_bzRead() instead aborts.
 			 *
 			 * So, just restart at the beginning of the file again,
 			 * and use plain reads from now on.
 			 */
 			BZ2_bzReadClose(&bzerr, bzbufdesc);
 			bzbufdesc = NULL;
 			if (lseek(f->fd, 0, SEEK_SET) == -1)
 				return (-1);
 			nr = read(f->fd, buffer, MAXBUFSIZ);
 			break;
 		default:
 			/* Make sure we exit with an error */
 			nr = -1;
 		}
 #endif
 #ifndef WITHOUT_LZMA
 	} else if ((filebehave == FILE_XZ) || (filebehave == FILE_LZMA)) {
 		lzma_ret ret;
 		lstrm.next_out = buffer;
 
 		do {
 			if (lstrm.avail_in == 0) {
 				lstrm.next_in = lin_buf;
 				nr = read(f->fd, lin_buf, MAXBUFSIZ);
 
 				if (nr < 0)
 					return (-1);
 				else if (nr == 0)
 					laction = LZMA_FINISH;
 
 				lstrm.avail_in = nr;
 			}
 
 			ret = lzma_code(&lstrm, laction);
 
 			if (ret != LZMA_OK && ret != LZMA_STREAM_END)
 				return (-1);
 
 			if (lstrm.avail_out == 0 || ret == LZMA_STREAM_END) {
 				bufrem = MAXBUFSIZ - lstrm.avail_out;
 				lstrm.next_out = buffer;
 				lstrm.avail_out = MAXBUFSIZ;
 			}
 		} while (bufrem == 0 && ret != LZMA_STREAM_END);
 
 		return (0);
 #endif	/* WIHTOUT_LZMA */
 	} else
 		nr = read(f->fd, buffer, MAXBUFSIZ);
 
 	if (nr < 0)
 		return (-1);
 
 	bufrem = nr;
 	return (0);
 }
 
 static inline int
 grep_lnbufgrow(size_t newlen)
 {
 
 	if (lnbuflen < newlen) {
 		lnbuf = grep_realloc(lnbuf, newlen);
 		lnbuflen = newlen;
 	}
 
 	return (0);
 }
 
 char *
 grep_fgetln(struct file *f, size_t *lenp)
 {
 	unsigned char *p;
 	char *ret;
 	size_t len;
 	size_t off;
 	ptrdiff_t diff;
 
 	/* Fill the buffer, if necessary */
 	if (bufrem == 0 && grep_refill(f) != 0)
 		goto error;
 
 	if (bufrem == 0) {
 		/* Return zero length to indicate EOF */
 		*lenp = 0;
 		return (bufpos);
 	}
 
 	/* Look for a newline in the remaining part of the buffer */
 	if ((p = memchr(bufpos, fileeol, bufrem)) != NULL) {
 		++p; /* advance over newline */
 		ret = bufpos;
 		len = p - bufpos;
 		bufrem -= len;
 		bufpos = p;
 		*lenp = len;
 		return (ret);
 	}
 
 	/* We have to copy the current buffered data to the line buffer */
 	for (len = bufrem, off = 0; ; len += bufrem) {
 		/* Make sure there is room for more data */
 		if (grep_lnbufgrow(len + LNBUFBUMP))
 			goto error;
 		memcpy(lnbuf + off, bufpos, len - off);
+		/* With FILE_MMAP, this is EOF; there's no more to refill */
+		if (filebehave == FILE_MMAP) {
+			bufrem -= len;
+			break;
+		}
 		off = len;
+		/* Fetch more to try and find EOL/EOF */
 		if (grep_refill(f) != 0)
 			goto error;
 		if (bufrem == 0)
 			/* EOF: return partial line */
 			break;
-		if ((p = memchr(bufpos, fileeol, bufrem)) == NULL &&
-		    filebehave != FILE_MMAP)
+		if ((p = memchr(bufpos, fileeol, bufrem)) == NULL)
 			continue;
-		if (p == NULL) {
-			/* mmap EOF: return partial line, consume buffer */
-			diff = len;
-		} else {
-			/* got it: finish up the line (like code above) */
-			++p;
-			diff = p - bufpos;
-			len += diff;
-		}
+		/* got it: finish up the line (like code above) */
+		++p;
+		diff = p - bufpos;
+		len += diff;
 		if (grep_lnbufgrow(len))
 		    goto error;
 		memcpy(lnbuf + off, bufpos, diff);
 		bufrem -= diff;
 		bufpos = p;
 		break;
 	}
 	*lenp = len;
 	return (lnbuf);
 
 error:
 	*lenp = 0;
 	return (NULL);
 }
 
 /*
  * Opens a file for processing.
  */
 struct file *
 grep_open(const char *path)
 {
 	struct file *f;
 
 	f = grep_malloc(sizeof *f);
 	memset(f, 0, sizeof *f);
 	if (path == NULL) {
 		/* Processing stdin implies --line-buffered. */
 		lbflag = true;
 		f->fd = STDIN_FILENO;
 	} else if ((f->fd = open(path, O_RDONLY)) == -1)
 		goto error1;
 
 	if (filebehave == FILE_MMAP) {
 		struct stat st;
 
 		if ((fstat(f->fd, &st) == -1) || (st.st_size > OFF_MAX) ||
 		    (!S_ISREG(st.st_mode)))
 			filebehave = FILE_STDIO;
 		else {
 			int flags = MAP_PRIVATE | MAP_NOCORE | MAP_NOSYNC;
 #ifdef MAP_PREFAULT_READ
 			flags |= MAP_PREFAULT_READ;
 #endif
 			fsiz = st.st_size;
 			buffer = mmap(NULL, fsiz, PROT_READ, flags,
 			     f->fd, (off_t)0);
 			if (buffer == MAP_FAILED)
 				filebehave = FILE_STDIO;
 			else {
 				bufrem = st.st_size;
 				bufpos = buffer;
 				madvise(buffer, st.st_size, MADV_SEQUENTIAL);
 			}
 		}
 	}
 
 	if ((buffer == NULL) || (buffer == MAP_FAILED))
 		buffer = grep_malloc(MAXBUFSIZ);
 
 	if (filebehave == FILE_GZIP &&
 	    (gzbufdesc = gzdopen(f->fd, "r")) == NULL)
 		goto error2;
 
 #ifndef WITHOUT_BZIP2
 	if (filebehave == FILE_BZIP &&
 	    (bzbufdesc = BZ2_bzdopen(f->fd, "r")) == NULL)
 		goto error2;
 #endif
 #ifndef WITHOUT_LZMA
 	else if ((filebehave == FILE_XZ) || (filebehave == FILE_LZMA)) {
 		lzma_ret ret;
 
 		ret = (filebehave == FILE_XZ) ?
 			lzma_stream_decoder(&lstrm, UINT64_MAX,
 					LZMA_CONCATENATED) :
 			lzma_alone_decoder(&lstrm, UINT64_MAX);
 
 		if (ret != LZMA_OK)
 			goto error2;
 
 		lstrm.avail_in = 0;
 		lstrm.avail_out = MAXBUFSIZ;
 		laction = LZMA_RUN;
 	}
 #endif
 
 	/* Fill read buffer, also catches errors early */
 	if (bufrem == 0 && grep_refill(f) != 0)
 		goto error2;
 
 	/* Check for binary stuff, if necessary */
 	if (binbehave != BINFILE_TEXT && fileeol != '\0' &&
 	    memchr(bufpos, '\0', bufrem) != NULL)
 	f->binary = true;
 
 	return (f);
 
 error2:
 	close(f->fd);
 error1:
 	free(f);
 	return (NULL);
 }
 
 /*
  * Closes a file.
  */
 void
 grep_close(struct file *f)
 {
 
 	close(f->fd);
 
 	/* Reset read buffer and line buffer */
 	if (filebehave == FILE_MMAP) {
 		munmap(buffer, fsiz);
 		buffer = NULL;
 	}
 	bufpos = buffer;
 	bufrem = 0;
 
 	free(lnbuf);
 	lnbuf = NULL;
 	lnbuflen = 0;
 }
Index: projects/clang500-import/usr.bin/grep/grep.h
===================================================================
--- projects/clang500-import/usr.bin/grep/grep.h	(revision 318657)
+++ projects/clang500-import/usr.bin/grep/grep.h	(revision 318658)
@@ -1,157 +1,158 @@
 /*	$NetBSD: grep.h,v 1.5 2011/02/27 17:33:37 joerg Exp $	*/
 /*	$OpenBSD: grep.h,v 1.15 2010/04/05 03:03:55 tedu Exp $	*/
 /*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2008-2009 Gabor Kovesdan <gabor@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.
  *
  * 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 <bzlib.h>
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <zlib.h>
 
 #ifndef WITHOUT_FASTMATCH
 #include "fastmatch.h"
 #endif
 
 #ifdef WITHOUT_NLS
 #define	getstr(n)	 errstr[n]
 #else
 #include <nl_types.h>
 
 extern nl_catd		 catalog;
 #define	getstr(n)	 catgets(catalog, 1, n, errstr[n])
 #endif
 
 extern const char		*errstr[];
 
 #define	VERSION		"2.5.1-FreeBSD"
 
 #define	GREP_FIXED	0
 #define	GREP_BASIC	1
 #define	GREP_EXTENDED	2
 
 #define	BINFILE_BIN	0
 #define	BINFILE_SKIP	1
 #define	BINFILE_TEXT	2
 
 #define	FILE_STDIO	0
 #define	FILE_MMAP	1
 #define	FILE_GZIP	2
 #define	FILE_BZIP	3
 #define	FILE_XZ		4
 #define	FILE_LZMA	5
 
 #define	DIR_READ	0
 #define	DIR_SKIP	1
 #define	DIR_RECURSE	2
 
 #define	DEV_READ	0
 #define	DEV_SKIP	1
 
 #define	LINK_READ	0
 #define	LINK_EXPLICIT	1
 #define	LINK_SKIP	2
 
 #define	EXCL_PAT	0
 #define	INCL_PAT	1
 
 #define	MAX_LINE_MATCHES	32
 
 struct file {
 	int		 fd;
 	bool		 binary;
 };
 
 struct str {
+	off_t		 boff;
 	off_t		 off;
 	size_t		 len;
 	char		*dat;
 	char		*file;
 	int		 line_no;
 };
 
 struct pat {
 	char		*pat;
 	int		 len;
 };
 
 struct epat {
 	char		*pat;
 	int		 mode;
 };
 
 /* Flags passed to regcomp() and regexec() */
 extern int	 cflags, eflags;
 
 /* Command line flags */
 extern bool	 Eflag, Fflag, Gflag, Hflag, Lflag,
 		 bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag,
 		 qflag, sflag, vflag, wflag, xflag;
 extern bool	 dexclude, dinclude, fexclude, finclude, lbflag, nullflag;
 extern long long Aflag, Bflag;
 extern long long mcount;
 extern long long mlimit;
 extern char	 fileeol;
 extern char	*label;
 extern const char *color;
 extern int	 binbehave, devbehave, dirbehave, filebehave, grepbehave, linkbehave;
 
 extern bool	 file_err, matchall;
 extern unsigned int dpatterns, fpatterns, patterns;
 extern struct pat *pattern;
 extern struct epat *dpattern, *fpattern;
 extern regex_t	*er_pattern, *r_pattern;
 #ifndef WITHOUT_FASTMATCH
 extern fastmatch_t *fg_pattern;
 #endif
 
 /* For regex errors  */
 #define	RE_ERROR_BUF	512
 extern char	 re_error[RE_ERROR_BUF + 1];	/* Seems big enough */
 
 /* util.c */
 bool	 file_matching(const char *fname);
 int	 procfile(const char *fn);
 int	 grep_tree(char **argv);
 void	*grep_malloc(size_t size);
 void	*grep_calloc(size_t nmemb, size_t size);
 void	*grep_realloc(void *ptr, size_t size);
 char	*grep_strdup(const char *str);
 void	 grep_printline(struct str *line, int sep);
 
 /* queue.c */
 bool	 enqueue(struct str *x);
 void	 printqueue(void);
 void	 clearqueue(void);
 
 /* file.c */
 void		 grep_close(struct file *f);
 struct file	*grep_open(const char *path);
 char		*grep_fgetln(struct file *f, size_t *len);
Index: projects/clang500-import/usr.bin/grep/queue.c
===================================================================
--- projects/clang500-import/usr.bin/grep/queue.c	(revision 318657)
+++ projects/clang500-import/usr.bin/grep/queue.c	(revision 318658)
@@ -1,118 +1,119 @@
 /*	$NetBSD: queue.c,v 1.5 2011/08/31 16:24:57 plunky Exp $	*/
 /*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
  * 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.
  */
 
 /*
  * A really poor man's queue.  It does only what it has to and gets out of
  * Dodge.  It is used in place of <sys/queue.h> to get a better performance.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/queue.h>
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "grep.h"
 
 struct qentry {
 	STAILQ_ENTRY(qentry)	list;
 	struct str	 	data;
 };
 
 static STAILQ_HEAD(, qentry)	queue = STAILQ_HEAD_INITIALIZER(queue);
 static long long		count;
 
 static struct qentry	*dequeue(void);
 
 /*
  * Enqueue another line; return true if we've dequeued a line as a result
  */
 bool
 enqueue(struct str *x)
 {
 	struct qentry *item;
 
 	item = grep_malloc(sizeof(struct qentry));
 	item->data.dat = grep_malloc(sizeof(char) * x->len);
 	item->data.len = x->len;
 	item->data.line_no = x->line_no;
+	item->data.boff = x->boff;
 	item->data.off = x->off;
 	memcpy(item->data.dat, x->dat, x->len);
 	item->data.file = x->file;
 
 	STAILQ_INSERT_TAIL(&queue, item, list);
 
 	if (++count > Bflag) {
 		item = dequeue();
 		free(item->data.dat);
 		free(item);
 		return (true);
 	}
 	return (false);
 }
 
 static struct qentry *
 dequeue(void)
 {
 	struct qentry *item;
 
 	item = STAILQ_FIRST(&queue);
 	if (item == NULL)
 		return (NULL);
 
 	STAILQ_REMOVE_HEAD(&queue, list);
 	--count;
 	return (item);
 }
 
 void
 printqueue(void)
 {
 	struct qentry *item;
 
 	while ((item = dequeue()) != NULL) {
 		grep_printline(&item->data, '-');
 		free(item->data.dat);
 		free(item);
 	}
 }
 
 void
 clearqueue(void)
 {
 	struct qentry *item;
 
 	while ((item = dequeue()) != NULL) {
 		free(item->data.dat);
 		free(item);
 	}
 }
Index: projects/clang500-import/usr.bin/grep/util.c
===================================================================
--- projects/clang500-import/usr.bin/grep/util.c	(revision 318657)
+++ projects/clang500-import/usr.bin/grep/util.c	(revision 318658)
@@ -1,646 +1,677 @@
 /*	$NetBSD: util.c,v 1.9 2011/02/27 17:33:37 joerg Exp $	*/
 /*	$FreeBSD$	*/
 /*	$OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
  * Copyright (C) 2008-2010 Gabor Kovesdan <gabor@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.
  *
  * 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 <sys/stat.h>
 #include <sys/types.h>
 
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fnmatch.h>
 #include <fts.h>
 #include <libgen.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <wctype.h>
 
 #ifndef WITHOUT_FASTMATCH
 #include "fastmatch.h"
 #endif
 #include "grep.h"
 
 static bool	 first_match = true;
 
 /*
  * Parsing context; used to hold things like matches made and
  * other useful bits
  */
 struct parsec {
-	regmatch_t matches[MAX_LINE_MATCHES];	/* Matches made */
-	struct str ln;				/* Current line */
-	size_t matchidx;			/* Latest used match index */
-	bool binary;				/* Binary file? */
+	regmatch_t	matches[MAX_LINE_MATCHES];	/* Matches made */
+	struct str	ln;				/* Current line */
+	size_t		lnstart;			/* Position in line */
+	size_t		matchidx;			/* Latest match index */
+	int		printed;			/* Metadata printed? */
+	bool		binary;				/* Binary file? */
 };
 
 
 static int procline(struct parsec *pc);
 static void printline(struct parsec *pc, int sep);
 static void printline_metadata(struct str *line, int sep);
 
 bool
 file_matching(const char *fname)
 {
 	char *fname_base, *fname_buf;
 	bool ret;
 
 	ret = finclude ? false : true;
 	fname_buf = strdup(fname);
 	if (fname_buf == NULL)
 		err(2, "strdup");
 	fname_base = basename(fname_buf);
 
 	for (unsigned int i = 0; i < fpatterns; ++i) {
 		if (fnmatch(fpattern[i].pat, fname, 0) == 0 ||
 		    fnmatch(fpattern[i].pat, fname_base, 0) == 0) {
 			if (fpattern[i].mode == EXCL_PAT) {
 				ret = false;
 				break;
 			} else
 				ret = true;
 		}
 	}
 	free(fname_buf);
 	return (ret);
 }
 
 static inline bool
 dir_matching(const char *dname)
 {
 	bool ret;
 
 	ret = dinclude ? false : true;
 
 	for (unsigned int i = 0; i < dpatterns; ++i) {
 		if (dname != NULL &&
 		    fnmatch(dpattern[i].pat, dname, 0) == 0) {
 			if (dpattern[i].mode == EXCL_PAT)
 				return (false);
 			else
 				ret = true;
 		}
 	}
 	return (ret);
 }
 
 /*
  * Processes a directory when a recursive search is performed with
  * the -R option.  Each appropriate file is passed to procfile().
  */
 int
 grep_tree(char **argv)
 {
 	FTS *fts;
 	FTSENT *p;
 	int c, fts_flags;
 	bool ok;
 	const char *wd[] = { ".", NULL };
 
 	c = fts_flags = 0;
 
 	switch(linkbehave) {
 	case LINK_EXPLICIT:
 		fts_flags = FTS_COMFOLLOW;
 		break;
 	case LINK_SKIP:
 		fts_flags = FTS_PHYSICAL;
 		break;
 	default:
 		fts_flags = FTS_LOGICAL;
 			
 	}
 
 	fts_flags |= FTS_NOSTAT | FTS_NOCHDIR;
 
 	fts = fts_open((argv[0] == NULL) ?
 	    __DECONST(char * const *, wd) : argv, fts_flags, NULL);
 	if (fts == NULL)
 		err(2, "fts_open");
 	while ((p = fts_read(fts)) != NULL) {
 		switch (p->fts_info) {
 		case FTS_DNR:
 			/* FALLTHROUGH */
 		case FTS_ERR:
 			file_err = true;
 			if(!sflag)
 				warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
 			break;
 		case FTS_D:
 			/* FALLTHROUGH */
 		case FTS_DP:
 			if (dexclude || dinclude)
 				if (!dir_matching(p->fts_name) ||
 				    !dir_matching(p->fts_path))
 					fts_set(fts, p, FTS_SKIP);
 			break;
 		case FTS_DC:
 			/* Print a warning for recursive directory loop */
 			warnx("warning: %s: recursive directory loop",
 				p->fts_path);
 			break;
 		default:
 			/* Check for file exclusion/inclusion */
 			ok = true;
 			if (fexclude || finclude)
 				ok &= file_matching(p->fts_path);
 
 			if (ok)
 				c += procfile(p->fts_path);
 			break;
 		}
 	}
 
 	fts_close(fts);
 	return (c);
 }
 
 /*
  * Opens a file and processes it.  Each file is processed line-by-line
  * passing the lines to procline().
  */
 int
 procfile(const char *fn)
 {
 	struct parsec pc;
 	long long tail;
 	struct file *f;
 	struct stat sb;
 	struct str *ln;
 	mode_t s;
 	int c, last_outed, t;
 	bool doctx, printmatch, same_file;
 
 	if (strcmp(fn, "-") == 0) {
 		fn = label != NULL ? label : getstr(1);
 		f = grep_open(NULL);
 	} else {
 		if (!stat(fn, &sb)) {
 			/* Check if we need to process the file */
 			s = sb.st_mode & S_IFMT;
 			if (s == S_IFDIR && dirbehave == DIR_SKIP)
 				return (0);
 			if ((s == S_IFIFO || s == S_IFCHR || s == S_IFBLK
 				|| s == S_IFSOCK) && devbehave == DEV_SKIP)
 					return (0);
 		}
 		f = grep_open(fn);
 	}
 	if (f == NULL) {
 		file_err = true;
 		if (!sflag)
 			warn("%s", fn);
 		return (0);
 	}
 
 	/* Convenience */
 	ln = &pc.ln;
 	pc.ln.file = grep_malloc(strlen(fn) + 1);
 	strcpy(pc.ln.file, fn);
 	pc.ln.line_no = 0;
 	pc.ln.len = 0;
+	pc.ln.boff = 0;
 	pc.ln.off = -1;
 	pc.binary = f->binary;
+	pc.printed = 0;
 	tail = 0;
 	last_outed = 0;
 	same_file = false;
 	doctx = false;
 	printmatch = true;
 	if ((pc.binary && binbehave == BINFILE_BIN) || cflag || qflag ||
 	    lflag || Lflag)
 		printmatch = false;
 	if (printmatch && (Aflag != 0 || Bflag != 0))
 		doctx = true;
 	mcount = mlimit;
 
 	for (c = 0;  c == 0 || !(lflag || qflag); ) {
-		/* Reset match count for every line processed */
+		/* Reset per-line statistics */
+		pc.printed = 0;
 		pc.matchidx = 0;
+		pc.lnstart = 0;
+		pc.ln.boff = 0;
 		pc.ln.off += pc.ln.len + 1;
 		if ((pc.ln.dat = grep_fgetln(f, &pc.ln.len)) == NULL ||
 		    pc.ln.len == 0) {
 			if (pc.ln.line_no == 0 && matchall)
 				/*
 				 * An empty file with an empty pattern and the
 				 * -w flag does not match
 				 */
 				exit(matchall && wflag ? 1 : 0);
 			else
 				break;
 		}
 
 		if (pc.ln.len > 0 && pc.ln.dat[pc.ln.len - 1] == fileeol)
 			--pc.ln.len;
 		pc.ln.line_no++;
 
 		/* Return if we need to skip a binary file */
 		if (pc.binary && binbehave == BINFILE_SKIP) {
 			grep_close(f);
 			free(pc.ln.file);
 			free(f);
 			return (0);
 		}
 
 		if ((t = procline(&pc)) == 0)
 			++c;
 
 		/* Deal with any -B context or context separators */
 		if (t == 0 && doctx) {
 			if (!first_match && (!same_file || last_outed > 0))
 				printf("--\n");
 			if (Bflag > 0)
 				printqueue();
 			tail = Aflag;
 		}
 		/* Print the matching line, but only if not quiet/binary */
 		if (t == 0 && printmatch) {
 			printline(&pc, ':');
+			while (pc.matchidx >= MAX_LINE_MATCHES) {
+				/* Reset matchidx and try again */
+				pc.matchidx = 0;
+				if (procline(&pc) == 0)
+					printline(&pc, ':');
+				else
+					break;
+			}
 			first_match = false;
 			same_file = true;
 			last_outed = 0;
 		}
 		if (t != 0 && doctx) {
 			/* Deal with any -A context */
 			if (tail > 0) {
-				printline(&pc, '-');
+				grep_printline(&pc.ln, '-');
 				tail--;
 				if (Bflag > 0)
 					clearqueue();
 			} else {
 				/*
 				 * Enqueue non-matching lines for -B context.
 				 * If we're not actually doing -B context or if
 				 * the enqueue resulted in a line being rotated
 				 * out, then go ahead and increment last_outed
 				 * to signify a gap between context/match.
 				 */
 				if (Bflag == 0 || (Bflag > 0 && enqueue(ln)))
 					++last_outed;
 			}
 		}
 
 		/* Count the matches if we have a match limit */
 		if (t == 0 && mflag) {
 			--mcount;
 			if (mflag && mcount <= 0)
 				break;
 		}
 
 	}
 	if (Bflag > 0)
 		clearqueue();
 	grep_close(f);
 
 	if (cflag) {
 		if (!hflag)
 			printf("%s:", pc.ln.file);
 		printf("%u\n", c);
 	}
 	if (lflag && !qflag && c != 0)
 		printf("%s%c", fn, nullflag ? 0 : '\n');
 	if (Lflag && !qflag && c == 0)
 		printf("%s%c", fn, nullflag ? 0 : '\n');
 	if (c && !cflag && !lflag && !Lflag &&
 	    binbehave == BINFILE_BIN && f->binary && !qflag)
 		printf(getstr(8), fn);
 
 	free(pc.ln.file);
 	free(f);
 	return (c);
 }
 
 #define iswword(x)	(iswalnum((x)) || (x) == L'_')
 
 /*
  * Processes a line comparing it with the specified patterns.  Each pattern
  * is looped to be compared along with the full string, saving each and every
  * match, which is necessary to colorize the output and to count the
  * matches.  The matching lines are passed to printline() to display the
  * appropriate output.
  */
 static int
 procline(struct parsec *pc)
 {
 	regmatch_t pmatch, lastmatch, chkmatch;
 	wchar_t wbegin, wend;
-	size_t st = 0, nst = 0;
+	size_t st, nst;
 	unsigned int i;
 	int c = 0, r = 0, lastmatches = 0, leflags = eflags;
 	size_t startm = 0, matchidx;
-	int retry;
+	unsigned int retry;
 
 	matchidx = pc->matchidx;
 
 	/* Special case: empty pattern with -w flag, check first character */
 	if (matchall && wflag) {
 		if (pc->ln.len == 0)
 			return (0);
 		wend = L' ';
 		if (sscanf(&pc->ln.dat[0], "%lc", &wend) != 1 || iswword(wend))
 			return (1);
 		else
 			return (0);
 	} else if (matchall)
 		return (0);
 
+	st = pc->lnstart;
+	nst = 0;
 	/* Initialize to avoid a false positive warning from GCC. */
 	lastmatch.rm_so = lastmatch.rm_eo = 0;
 
 	/* Loop to process the whole line */
 	while (st <= pc->ln.len) {
 		lastmatches = 0;
 		startm = matchidx;
 		retry = 0;
 		if (st > 0)
 			leflags |= REG_NOTBOL;
 		/* Loop to compare with all the patterns */
 		for (i = 0; i < patterns; i++) {
 			pmatch.rm_so = st;
 			pmatch.rm_eo = pc->ln.len;
 #ifndef WITHOUT_FASTMATCH
 			if (fg_pattern[i].pattern)
 				r = fastexec(&fg_pattern[i],
 				    pc->ln.dat, 1, &pmatch, leflags);
 			else
 #endif
 				r = regexec(&r_pattern[i], pc->ln.dat, 1,
 				    &pmatch, leflags);
 			if (r != 0)
 				continue;
 			/* Check for full match */
 			if (xflag && (pmatch.rm_so != 0 ||
 			    (size_t)pmatch.rm_eo != pc->ln.len))
 				continue;
 			/* Check for whole word match */
 #ifndef WITHOUT_FASTMATCH
 			if (wflag || fg_pattern[i].word) {
 #else
 			if (wflag) {
 #endif
 				wbegin = wend = L' ';
 				if (pmatch.rm_so != 0 &&
 				    sscanf(&pc->ln.dat[pmatch.rm_so - 1],
 				    "%lc", &wbegin) != 1)
 					r = REG_NOMATCH;
 				else if ((size_t)pmatch.rm_eo !=
 				    pc->ln.len &&
 				    sscanf(&pc->ln.dat[pmatch.rm_eo],
 				    "%lc", &wend) != 1)
 					r = REG_NOMATCH;
 				else if (iswword(wbegin) ||
 				    iswword(wend))
 					r = REG_NOMATCH;
 				/*
 				 * If we're doing whole word matching and we
 				 * matched once, then we should try the pattern
 				 * again after advancing just past the start of
 				 * the earliest match. This allows the pattern
 				 * to  match later on in the line and possibly
 				 * still match a whole word.
 				 */
 				if (r == REG_NOMATCH &&
-				    (retry == 0 || pmatch.rm_so + 1 < retry))
+				    (retry == pc->lnstart ||
+				    pmatch.rm_so + 1 < retry))
 					retry = pmatch.rm_so + 1;
 				if (r == REG_NOMATCH)
 					continue;
 			}
-
 			lastmatches++;
 			lastmatch = pmatch;
 
 			if (matchidx == 0)
 				c++;
 
 			/*
 			 * Replace previous match if the new one is earlier
 			 * and/or longer. This will lead to some amount of
 			 * extra work if -o/--color are specified, but it's
 			 * worth it from a correctness point of view.
 			 */
 			if (matchidx > startm) {
 				chkmatch = pc->matches[matchidx - 1];
 				if (pmatch.rm_so < chkmatch.rm_so ||
 				    (pmatch.rm_so == chkmatch.rm_so &&
 				    (pmatch.rm_eo - pmatch.rm_so) >
 				    (chkmatch.rm_eo - chkmatch.rm_so))) {
 					pc->matches[matchidx - 1] = pmatch;
 					nst = pmatch.rm_eo;
 				}
 			} else {
 				/* Advance as normal if not */
 				pc->matches[matchidx++] = pmatch;
 				nst = pmatch.rm_eo;
 			}
 			/* avoid excessive matching - skip further patterns */
 			if ((color == NULL && !oflag) || qflag || lflag ||
-			    matchidx >= MAX_LINE_MATCHES)
+			    matchidx >= MAX_LINE_MATCHES) {
+				pc->lnstart = nst;
+				lastmatches = 0;
 				break;
+			}
 		}
 
 		/*
 		 * Advance to just past the start of the earliest match, try
 		 * again just in case we still have a chance to match later in
 		 * the string.
 		 */
-		if (lastmatches == 0 && retry > 0) {
+		if (lastmatches == 0 && retry > pc->lnstart) {
 			st = retry;
 			continue;
 		}
 
 		/* One pass if we are not recording matches */
 		if (!wflag && ((color == NULL && !oflag) || qflag || lflag || Lflag))
 			break;
 
 		/* If we didn't have any matches or REG_NOSUB set */
 		if (lastmatches == 0 || (cflags & REG_NOSUB))
 			nst = pc->ln.len;
 
 		if (lastmatches == 0)
 			/* No matches */
 			break;
 		else if (st == nst && lastmatch.rm_so == lastmatch.rm_eo)
 			/* Zero-length match -- advance one more so we don't get stuck */
 			nst++;
 
 		/* Advance st based on previous matches */
 		st = nst;
+		pc->lnstart = st;
 	}
 
 	/* Reflect the new matchidx in the context */
 	pc->matchidx = matchidx;
 	if (vflag)
 		c = !c;
 	return (c ? 0 : 1);
 }
 
 /*
  * Safe malloc() for internal use.
  */
 void *
 grep_malloc(size_t size)
 {
 	void *ptr;
 
 	if ((ptr = malloc(size)) == NULL)
 		err(2, "malloc");
 	return (ptr);
 }
 
 /*
  * Safe calloc() for internal use.
  */
 void *
 grep_calloc(size_t nmemb, size_t size)
 {
 	void *ptr;
 
 	if ((ptr = calloc(nmemb, size)) == NULL)
 		err(2, "calloc");
 	return (ptr);
 }
 
 /*
  * Safe realloc() for internal use.
  */
 void *
 grep_realloc(void *ptr, size_t size)
 {
 
 	if ((ptr = realloc(ptr, size)) == NULL)
 		err(2, "realloc");
 	return (ptr);
 }
 
 /*
  * Safe strdup() for internal use.
  */
 char *
 grep_strdup(const char *str)
 {
 	char *ret;
 
 	if ((ret = strdup(str)) == NULL)
 		err(2, "strdup");
 	return (ret);
 }
 
 /*
  * Print an entire line as-is, there are no inline matches to consider. This is
  * used for printing context.
  */
 void grep_printline(struct str *line, int sep) {
 	printline_metadata(line, sep);
 	fwrite(line->dat, line->len, 1, stdout);
 	putchar(fileeol);
 }
 
 static void
 printline_metadata(struct str *line, int sep)
 {
 	bool printsep;
 
 	printsep = false;
 	if (!hflag) {
 		if (!nullflag) {
 			fputs(line->file, stdout);
 			printsep = true;
 		} else {
 			printf("%s", line->file);
 			putchar(0);
 		}
 	}
 	if (nflag) {
 		if (printsep)
 			putchar(sep);
 		printf("%d", line->line_no);
 		printsep = true;
 	}
 	if (bflag) {
 		if (printsep)
 			putchar(sep);
-		printf("%lld", (long long)line->off);
+		printf("%lld", (long long)(line->off + line->boff));
 		printsep = true;
 	}
 	if (printsep)
 		putchar(sep);
 }
 
 /*
  * Prints a matching line according to the command line options.
  */
 static void
 printline(struct parsec *pc, int sep)
 {
 	size_t a = 0;
 	size_t i, matchidx;
 	regmatch_t match;
 
 	/* If matchall, everything matches but don't actually print for -o */
 	if (oflag && matchall)
 		return;
 
 	matchidx = pc->matchidx;
 
 	/* --color and -o */
 	if ((oflag || color) && matchidx > 0) {
-		printline_metadata(&pc->ln, sep);
+		/* Only print metadata once per line if --color */
+		if (!oflag && pc->printed == 0)
+			printline_metadata(&pc->ln, sep);
 		for (i = 0; i < matchidx; i++) {
 			match = pc->matches[i];
 			/* Don't output zero length matches */
 			if (match.rm_so == match.rm_eo)
 				continue;
-			if (!oflag)
+			/*
+			 * Metadata is printed on a per-line basis, so every
+			 * match gets file metadata with the -o flag.
+			 */
+			if (oflag) {
+				pc->ln.boff = match.rm_so;
+				printline_metadata(&pc->ln, sep);
+			} else
 				fwrite(pc->ln.dat + a, match.rm_so - a, 1,
 				    stdout);
 			if (color)
 				fprintf(stdout, "\33[%sm\33[K", color);
 			fwrite(pc->ln.dat + match.rm_so,
 			    match.rm_eo - match.rm_so, 1, stdout);
 			if (color)
 				fprintf(stdout, "\33[m\33[K");
 			a = match.rm_eo;
 			if (oflag)
 				putchar('\n');
 		}
 		if (!oflag) {
 			if (pc->ln.len - a > 0)
 				fwrite(pc->ln.dat + a, pc->ln.len - a, 1,
 				    stdout);
 			putchar('\n');
 		}
 	} else
 		grep_printline(&pc->ln, sep);
+	pc->printed++;
 }
Index: projects/clang500-import/usr.sbin/bsdinstall/scripts/script
===================================================================
--- projects/clang500-import/usr.sbin/bsdinstall/scripts/script	(revision 318657)
+++ projects/clang500-import/usr.sbin/bsdinstall/scripts/script	(revision 318658)
@@ -1,137 +1,154 @@
 #!/bin/sh
 #-
 # Copyright (c) 2013 Nathan Whitehorn
 # Copyright (c) 2013-2015 Devin Teske
 # 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$
 #
 ############################################################ INCLUDES
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/variable.subr
 
 ############################################################ CONFIGURATION
 
 # VARIABLES:
 # PARTITIONS
 # DISTRIBUTIONS
 # BSDINSTALL_DISTDIR
 
+#
+# Default name of the ZFS boot-pool
+#
+: ${ZFSBOOT_POOL_NAME:=zroot}
+
 ############################################################ GLOBALS
 
 #
 # Strings that should be moved to an i18n file and loaded with f_include_lang()
 #
 msg_installation_error="Installation Error!"
 
 ############################################################ FUNCTIONS
 
 error()
 {
-	[ -f "$PATH_FSTAB" ] && bsdinstall umount
-	
 	local file
 	f_getvar "$VAR_DEBUG_FILE#+" file
 	if [ "$file" ]; then
 		f_dialog_title "$msg_installation_error"
 		f_dialog_textbox "$file"
 		# No need to restore title, pining for the fjords
 	fi
 
+	[ -f "$PATH_FSTAB" ] || exit
+	if [ "$ZFSBOOT_DISKS" ]; then
+		zpool export $ZFSBOOT_POOL_NAME
+	else
+		bsdinstall umount
+	fi
+
 	exit 1
 }
 
 ############################################################ MAIN
 
 set -e
 trap error EXIT
 
 SCRIPT="$1"
 shift
 
 f_dprintf "Began Installation at %s" "$( date )"
 rm -rf $BSDINSTALL_TMPETC
 mkdir $BSDINSTALL_TMPETC
 
 split -a 2 -p '^#!.*' "$SCRIPT" /tmp/bsdinstall-installscript-
 
 . /tmp/bsdinstall-installscript-aa
 : ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS
 export BSDINSTALL_DISTDIR
 
 # Re-initialize a new log if preamble changed BSDINSTALL_LOG
 if [ "$BSDINSTALL_LOG" != "${debugFile#+}" ]; then
 	export debugFile="$BSDINSTALL_LOG"
 	f_quietly f_debug_init
 	# NB: Being scripted, let debug go to terminal for invalid debugFile
 	f_dprintf "Began Instalation at %s" "$( date )"
 fi
 
 # Make partitions
 rm -f $PATH_FSTAB
 touch $PATH_FSTAB
 if [ "$ZFSBOOT_DISKS" ]; then
 	bsdinstall zfsboot
 else
 	bsdinstall scriptedpart "$PARTITIONS"
+	bsdinstall mount
 fi
-bsdinstall mount
 
 # Unpack distributions
 bsdinstall checksum
-bsdinstall distextract
+for set in $DISTRIBUTIONS; do
+	f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set"
+	tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT
+done
 
 # Finalize install
 bsdinstall config
 
 # Make sure networking is functional, if we can arrange that
 if [ ! -f $BSDINSTALL_CHROOT/etc/resolv.conf -a -f /etc/resolv.conf ]; then
 	cp /etc/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf
 fi
 
 # Run post-install script
 if [ -f /tmp/bsdinstall-installscript-ab ]; then
 	cp /tmp/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/tmp/installscript
 	chmod a+x $BSDINSTALL_CHROOT/tmp/installscript
 	mount -t devfs devfs "$BSDINSTALL_CHROOT/dev"
 	chroot $BSDINSTALL_CHROOT /tmp/installscript $@ 2>&1
 	umount "$BSDINSTALL_CHROOT/dev"
 	rm $BSDINSTALL_CHROOT/tmp/installscript
 fi
 
 bsdinstall entropy
-bsdinstall umount
+if [ "$ZFSBOOT_DISKS" ]; then
+	zpool export $ZFSBOOT_POOL_NAME
+else
+	bsdinstall umount
+fi
 
 f_dprintf "Installation Completed at %s" "$( date )"
 
 trap - EXIT
 exit $SUCCESS
 
 ################################################################################
 # END
 ################################################################################
Index: projects/clang500-import/usr.sbin/efivar/efivar.8
===================================================================
--- projects/clang500-import/usr.sbin/efivar/efivar.8	(revision 318657)
+++ projects/clang500-import/usr.sbin/efivar/efivar.8	(revision 318658)
@@ -1,185 +1,183 @@
 .\" Copyright (c) 2017 Netflix, Inc
 .\" 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$
 .\"
-.Dd March 4, 2017
+.Dd May 22, 2017
 .Dt EFIVAR 8
 .Os
 .Sh NAME
 .Nm efivar
-.Nd UEFI environemnt variable interaction
+.Nd UEFI environment variable interaction
 .Sh SYNOPSIS
 .Nm
 .Op Fl abdDHlLNpRtw
 .Op Fl n Ar name
 .Op Fl f Ar file
 .Op Fl -append
 .Op Fl -ascii
 .Op Fl -attributes
 .Op Fl -binary
 .Op Fl -delete
 .Op Fl -device-path
 .Op Fl -fromfile Ar file
 .Op Fl -guid
 .Op Fl -hex
 .Op Fl -list-guids
 .Op Fl -list
 .Op Fl -name Ar name
 .Op Fl -no-name
 .Op Fl -print
 .Op Fl -print-decimal
 .Op Fl -raw-guid
 .Op Fl -write
 .Sh DESCRIPTION
 This program manages
 .Dq Unified Extensible Firmware Interface
 .Pq UEFI
 environment variables.
 UEFI variables have three part: A namespace, a name and a value.
-The namespace is a GUID that's self assigned by the group defining the
+The namespace is a GUID that is self assigned by the group defining the
 variables.
 The name is a Unicode name for the variable.
 The value is binary data.
 All Unicode data is presented to the user as UTF-8.
 .Pp
 The following options are available:
 .Bl -tag -width 20m
 .It Fl n Ar name Fl -name Ar name
 Specify the name of the variable to operate on.
 The
 .Ar name
-argument is the GUID of variable, followed by a dash, followed by the
+argument is the GUID of the variable, followed by a dash, followed by the
 UEFI variable name.
 The GUID may be in numeric format, or may be one of the well known
 symbolic name (see
 .Fl -list-guids
 for a complete list).
 .It Fl f Ar file Fl -fromfile Ar file
 When writing or appending to a variable, take the data for the
 variable's value from
 .Ar file
 instead of from the command line.
 This flag implies
 .Fl -write
 unless the
 .Fl -append
 flag is given.
-This is not well understood and currently unimplemented.
+This behavior is not well understood and is currently unimplemented.
 .It Fl a Fl -append
 Append the specified value to the UEFI variable rather than replacing
-it.p
+it.
 .It Fl t Ar attr Fl -attributes Ar attr
-Specify, in user hostile hexidecimal, the attributes for this
+Specify, in hexadecimal, the attributes for this
 variable.
 See section 7.2 (GetVariable subsection, Related Definitions) of the
 UEFI Specification for hex values to use.
 .It Fl A Fl -ascii
 Display the variable data as modified ascii: All printable characters
 are printed, while unprintable characters are rendered as a two-digit
-hexadecimal number preceeded by a % character.
+hexadecimal number preceded by a % character.
 .It Fl b Fl -binary
 Display the variable data as binary data.
 Usually will be used with the
 .Fl N
 or
 .Fl -no-name
 flag.
 Useful in scripts.
 .It Fl D Fl -delete
 Delete the specified variable.
 May not be used with either the
 .Fl -write
 or the
 .Fl -append
 flags.
 No
 .Ar value
 may be specified.
 .It Fl d Fl -device Fl -device-path
 Interpret the variables printed as UEFI device paths and print the
 UEFI standard string representation.
 .It Fl g Fl -guid
 flag is specified, guids are converted to names if they are known (and
 show up in
 .Fl -list-guids ).
 .It Fl H Fl -hex
 List variable data as a hex dump.
 .It Fl L Fl -list-guids
 Lists the well known GUIDs.
 The names listed here may be used in place of the numeric GUID values.
 These names will replace the numeric GUID values unless
 .Fl -raw-guid
 flag is specified.
 .It Fl l Fl -list
 List all the variables.
 If the
 .Fl -print
 flag is also listed, their values will be displayed.
 .It Fl N Fl -no-name
 Do not display the variable name.
 .It Fl p Fl -print
 Print the value of the variable.
 .It Fl R Fl -raw-guid
 Do not substitute well known names for GUID numeric values in output.
 .It Fl w Fl -write
 Write (replace) the variable specified with the value specified from
 standard input.
 No command line option to do this is available since UEFI variables
 are binary structures rather than strings.
 .Xr echo 1
 .Fl n
 can be used to specify simple strings.
 .It Ar name
 Display the
 .Ar name
 environment variable.
+.El
 .Sh COMPATIBILITY
 The
 .Nm
-program is intended to be compatible (strict superset) with a progam
-of the same name included in the Red Hat libefivar package.
-.Pp
-Except the
+program is intended to be compatible (strict superset) with a program
+of the same name included in the Red Hat libefivar package,
+but the
 .Fl d
 and
 .Fl -print-decimal
-flags are not implmenented and never will be.
+flags are not implemented and never will be.
+.Pp
 The
 .Fl d
-flag is a short-hand for
+flag is short for
 .Fl -device-path .
 .Sh SEE ALSO
 Appendix A of the UEFI specification has the format for GUIDs.
 All GUIDs
 .Dq Globally Unique Identifiers
 have the format described in RFC 4122.
-.El
-.Pp
-.Xr efivar 8
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
-.Fx 12.0 .
+.Fx 11.1 .
Index: projects/clang500-import/usr.sbin/mountd/exports.5
===================================================================
--- projects/clang500-import/usr.sbin/mountd/exports.5	(revision 318657)
+++ projects/clang500-import/usr.sbin/mountd/exports.5	(revision 318658)
@@ -1,515 +1,515 @@
 .\" Copyright (c) 1989, 1991, 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.
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
 .\" $FreeBSD$
 .\"
-.Dd August 14, 2014
+.Dd May 20, 2017
 .Dt EXPORTS 5
 .Os
 .Sh NAME
 .Nm exports
 .Nd define remote mount points for
 .Tn NFS
 mount requests
 .Sh SYNOPSIS
 .Nm
 .Sh DESCRIPTION
 The
 .Nm
 file specifies remote mount points for the
 .Tn NFS
 mount protocol per the
 .Tn NFS
 server specification; see
 .%T "Network File System Protocol Specification" ,
 RFC1094, Appendix A and
 .%T "NFS: Network File System Version 3 Specification" ,
 Appendix I.
 .Pp
 Each line in the file
 (other than comment lines that begin with a #)
 specifies the mount point(s) and export flags within one local server
 file system or the NFSv4 tree root for one or more hosts.
 A long line may be split over several lines by ending all but the
 last line with a backslash
 .Pq Ql \e .
 A host may be specified only once for each local file or the NFSv4 tree root on the
 server and there may be only one default entry for each server
 file system that applies to all other hosts.
 The latter exports the file system to the
 .Dq world
 and should
 be used only when the file system contains public information.
 .Pp
 In a mount entry,
 the first field(s) specify the directory path(s) within a server file system
 that can be mounted on by the corresponding client(s).
 There are three forms of this specification.
 The first is to list all mount points as absolute
 directory paths separated by whitespace.
 This list of directory paths should be considered an
 .Dq administrative control ,
 since it is only enforced by the
 .Xr mountd 8
 daemon and not the kernel.
 As such, it only applies to NFSv2 and NFSv3 mounts and only
 with respect to the client's use of the mount protocol.
 The second is to specify the pathname of the root of the file system
 followed by the
 .Fl alldirs
 flag;
 this form allows the host(s) to mount at any point within the file system,
 including regular files if the
 .Fl r
 option is used on
 .Xr mountd 8 .
 Because NFSv4 does not use the mount protocol,
 the
 .Dq administrative controls
 are not applied and all directories within this server
 file system are mountable via NFSv4 even if the
 .Fl alldirs
 flag has not been specified.
 The third form has the string ``V4:'' followed by a single absolute path
 name, to specify the NFSv4 tree root.
 This line does not export any file system, but simply marks where the root
 of the server's directory tree is for NFSv4 clients.
 The exported file systems for NFSv4 are specified via the other lines
 in the
 .Nm
 file in the same way as for NFSv2 and NFSv3.
 The pathnames must not have any symbolic links in them and should not have
 any
 .Dq Pa \&.
 or
 .Dq Pa ..
 components.
 Mount points for a file system may appear on multiple lines each with
 different sets of hosts and export options.
 .Pp
 The second component of a line specifies how the file system is to be
 exported to the host set.
 The option flags specify whether the file system
 is exported read-only or read-write and how the client UID is mapped to
 user credentials on the server.
 For the NFSv4 tree root, the only option that can be specified in this
 section is
 .Fl sec .
 .Pp
 Export options are specified as follows:
 .Pp
 .Sm off
 .Fl maproot Li = Sy user
 .Sm on
 The credential of the specified user is used for remote access by root.
 The credential includes all the groups to which the user is a member
 on the local machine (see
 .Xr id 1 ) .
 The user may be specified by name or number.
 The user string may be quoted, or use backslash escaping.
 .Pp
 .Sm off
 .Fl maproot Li = Sy user:group1:group2:...
 .Sm on
 The colon separated list is used to specify the precise credential
 to be used for remote access by root.
 The elements of the list may be either names or numbers.
 Note that user: should be used to distinguish a credential containing
 no groups from a complete credential for that user.
 The group names may be quoted, or use backslash escaping.
 .Pp
 .Sm off
 .Fl mapall Li = Sy user
 .Sm on
 or
 .Sm off
 .Fl mapall Li = Sy user:group1:group2:...
 .Sm on
 specifies a mapping for all client UIDs (including root)
 using the same semantics as
 .Fl maproot .
 .Pp
 The option
 .Fl r
 is a synonym for
 .Fl maproot
 in an effort to be backward compatible with older export file formats.
 .Pp
 In the absence of
 .Fl maproot
 and
 .Fl mapall
-options, remote accesses by root will result in using a credential of -2:-2.
+options, remote accesses by root will result in using a credential of 65534:65533.
 All other users will be mapped to their remote credential.
 If a
 .Fl maproot
 option is given,
-remote access by root will be mapped to that credential instead of -2:-2.
+remote access by root will be mapped to that credential instead of 65534:65533.
 If a
 .Fl mapall
 option is given,
 all users (including root) will be mapped to that credential in
 place of their own.
 .Pp
 .Sm off
 .Fl sec Li = Sy flavor1:flavor2...
 .Sm on
 specifies a colon separated list of acceptable security flavors to be
 used for remote access.
 Supported security flavors are sys, krb5, krb5i and krb5p.
 If multiple flavors are listed, they should be ordered with the most
 preferred flavor first.
 If this option is not present,
 the default security flavor list of just sys is used.
 .Pp
 The
 .Fl ro
 option specifies that the file system should be exported read-only
 (default read/write).
 The option
 .Fl o
 is a synonym for
 .Fl ro
 in an effort to be backward compatible with older export file formats.
 .Pp
 .Tn WebNFS
 exports strictly according to the spec (RFC 2054 and RFC 2055) can
 be done with the
 .Fl public
 flag.
 However, this flag in itself allows r/w access to all files in
 the file system, not requiring reserved ports and not remapping UIDs.
 It
 is only provided to conform to the spec, and should normally not be used.
 For a
 .Tn WebNFS
 export,
 use the
 .Fl webnfs
 flag, which implies
 .Fl public ,
 .Sm off
 .Fl mapall No = Sy nobody
 .Sm on
 and
 .Fl ro .
 Note that only one file system can be
 .Tn WebNFS
 exported on a server.
 .Pp
 A
 .Sm off
 .Fl index No = Pa file
 .Sm on
 option can be used to specify a file whose handle will be returned if
 a directory is looked up using the public filehandle
 .Pq Tn WebNFS .
 This is to mimic the behavior of URLs.
 If no
 .Fl index
 option is specified, a directory filehandle will be returned as usual.
 The
 .Fl index
 option only makes sense in combination with the
 .Fl public
 or
 .Fl webnfs
 flags.
 .Pp
 Specifying the
 .Fl quiet
 option will inhibit some of the syslog diagnostics for bad lines in
 .Pa /etc/exports .
 This can be useful to avoid annoying error messages for known possible
 problems (see
 .Sx EXAMPLES
 below).
 .Pp
 The third component of a line specifies the host set to which the line applies.
 The set may be specified in three ways.
 The first way is to list the host name(s) separated by white space.
 (Standard Internet
 .Dq dot
 addresses may be used in place of names.)
 The second way is to specify a
 .Dq netgroup
 as defined in the
 .Pa netgroup
 file (see
 .Xr netgroup 5 ) .
 The third way is to specify an Internet subnetwork using a network and
 network mask that is defined as the set of all hosts with addresses within
 the subnetwork.
 This latter approach requires less overhead within the
 kernel and is recommended for cases where the export line refers to a
 large number of clients within an administrative subnet.
 .Pp
 The first two cases are specified by simply listing the name(s) separated
 by whitespace.
 All names are checked to see if they are
 .Dq netgroup
 names
 first and are assumed to be hostnames otherwise.
 Using the full domain specification for a hostname can normally
 circumvent the problem of a host that has the same name as a netgroup.
 The third case is specified by the flag
 .Sm off
 .Fl network Li = Sy netname Op Li / Ar prefixlength
 .Sm on
 and optionally
 .Sm off
 .Fl mask No = Sy netmask .
 .Sm on
 The netmask may be specified either by attaching a
 .Ar prefixlength
 to the
 .Fl network
 option, or by using a separate
 .Fl mask
 option.
 If the mask is not specified, it will default to the mask for that network
 class (A, B or C; see
 .Xr inet 4 ) .
 See the
 .Sx EXAMPLES
 section below.
 .Pp
 Scoped IPv6 address must carry scope identifier as documented in
 .Xr inet6 4 .
 For example,
 .Dq Li fe80::%re2/10
 is used to specify
 .Li fe80::/10
 on
 .Li re2
 interface.
 .Pp
 For the third form which specifies the NFSv4 tree root, the directory path
 specifies the location within the server's file system tree which is the
 root of the NFSv4 tree.
 There can only be one NFSv4 root directory per server.
 As such, all entries of this form must specify the same directory path.
 For file systems other than ZFS,
 this location can be any directory and does not
 need to be within an exported file system. If it is not in an exported
 file system, a very limited set of operations are permitted, so that an
 NFSv4 client can traverse the tree to an exported file system.
 Although parts of the NFSv4 tree can be non-exported, the entire NFSv4 tree
 must consist of local file systems capable of being exported via NFS.
 All ZFS file systems in the subtree below the NFSv4 tree root must be
 exported.
 NFSv4 does not use the mount protocol and does permit clients to cross server
 mount point boundaries, although not all clients are capable of crossing the
 mount points.
 .Pp
 The
 .Fl sec
 option on these line(s) specifies what security flavors may be used for
 NFSv4 operations that do not use file handles. Since these operations
 (SetClientID, SetClientIDConfirm, Renew, DelegPurge and ReleaseLockOnwer)
 allocate/modify state in the server, it is possible to restrict some clients to
 the use of the krb5[ip] security flavors, via this option.
 See the
 .Sx EXAMPLES
 section below.
 This third form is meaningless for NFSv2 and NFSv3 and is ignored for them.
 .Pp
 The
 .Xr mountd 8
 utility can be made to re-read the
 .Nm
 file by sending it a hangup signal as follows:
 .Bd -literal -offset indent
 /etc/rc.d/mountd reload
 .Ed
 .Pp
 After sending the
 .Dv SIGHUP ,
 check the
 .Xr syslogd 8
 output to see whether
 .Xr mountd 8
 logged any parsing errors in the
 .Nm
 file.
 .Sh FILES
 .Bl -tag -width /etc/exports -compact
 .It Pa /etc/exports
 the default remote mount-point file
 .El
 .Sh EXAMPLES
 .Bd -literal -offset indent
 /usr /usr/local -maproot=0:10 friends
 /usr -maproot=daemon grumpy.cis.uoguelph.ca 131.104.48.16
 /usr -ro -mapall=nobody
 /u -maproot=bin: -network 131.104.48 -mask 255.255.255.0
 /a -network 192.168.0/24
 /a -network 3ffe:1ce1:1:fe80::/64
 /u2 -maproot=root friends
 /u2 -alldirs -network cis-net -mask cis-mask
 /cdrom -alldirs,quiet,ro -network 192.168.33.0 -mask 255.255.255.0
 /private -sec=krb5i
 /secret -sec=krb5p
 V4: /	-sec=krb5:krb5i:krb5p -network 131.104.48 -mask 255.255.255.0
 V4: /	-sec=sys:krb5:krb5i:krb5p grumpy.cis.uoguelph.ca
 .Ed
 .Pp
 Given that
 .Pa /usr , /u , /a
 and
 .Pa /u2
 are
 local file system mount points, the above example specifies the following:
 .Pp
 The file system rooted at
 .Pa /usr
 is exported to hosts
 .Em friends
 where friends is specified in the netgroup file
 with users mapped to their remote credentials and
 root mapped to UID 0 and group 10.
 It is exported read-write and the hosts in
 .Dq friends
 can mount either
 .Pa /usr
 or
 .Pa /usr/local .
 It is exported to
 .Em 131.104.48.16
 and
 .Em grumpy.cis.uoguelph.ca
 with users mapped to their remote credentials and
 root mapped to the user and groups associated with
 .Dq daemon ;
 it is exported to the rest of the world as read-only with
 all users mapped to the user and groups associated with
 .Dq nobody .
 .Pp
 The file system rooted at
 .Pa /u
 is exported to all hosts on the subnetwork
 .Em 131.104.48
 with root mapped to the UID for
 .Dq bin
 and with no group access.
 .Pp
 The file system rooted at
 .Pa /u2
 is exported to the hosts in
 .Dq friends
 with root mapped to UID and groups
 associated with
 .Dq root ;
 it is exported to all hosts on network
 .Dq cis-net
 allowing mounts at any
 directory within /u2.
 .Pp
 The file system rooted at
 .Pa /a
 is exported to the network 192.168.0.0, with a netmask of 255.255.255.0.
 However, the netmask length in the entry for
 .Pa /a
 is not specified through a
 .Fl mask
 option, but through the
 .Li / Ns Ar prefix
 notation.
 .Pp
 The file system rooted at
 .Pa /a
 is also exported to the IPv6 network
 .Li 3ffe:1ce1:1:fe80::
 address, using the upper 64 bits as the prefix.
 Note that, unlike with IPv4 network addresses, the specified network
 address must be complete, and not just contain the upper bits.
 With IPv6 addresses, the
 .Fl mask
 option must not be used.
 .Pp
 The file system rooted at
 .Pa /cdrom
 will be exported read-only to the entire network 192.168.33.0/24, including
 all its subdirectories.
 Since
 .Pa /cdrom
 is the conventional mountpoint for a CD-ROM device, this export will
 fail if no CD-ROM medium is currently mounted there since that line
 would then attempt to export a subdirectory of the root file system
 with the
 .Fl alldirs
 option which is not allowed.
 The
 .Fl quiet
 option will then suppress the error message for this condition that
 would normally be syslogged.
 As soon as an actual CD-ROM is going to be mounted,
 .Xr mount 8
 will notify
 .Xr mountd 8
 about this situation, and the
 .Pa /cdrom
 file system will be exported as intended.
 Note that without using the
 .Fl alldirs
 option, the export would always succeed.
 While there is no CD-ROM medium mounted under
 .Pa /cdrom ,
 it would export the (normally empty) directory
 .Pa /cdrom
 of the root file system instead.
 .Pp
 The file system rooted at
 .Pa /private
 will be exported using Kerberos 5 authentication and will require
 integrity protected messages for all accesses.
 The file system rooted at
 .Pa /secret
 will also be exported using Kerberos 5 authentication and all messages
 used to access it will be encrypted.
 .Pp
 For the experimental server, the NFSv4 tree is rooted at ``/'',
 and any client within the 131.104.48 subnet is permitted to perform NFSv4 state
 operations on the server, so long as valid Kerberos credentials are provided.
 The machine grumpy.cis.uoguelph.ca is permitted to perform NFSv4 state
 operations on the server using AUTH_SYS credentials, as well as Kerberos ones.
 .Sh SEE ALSO
 .Xr nfsv4 4 ,
 .Xr netgroup 5 ,
 .Xr mountd 8 ,
 .Xr nfsd 8 ,
 .Xr showmount 8
 .Sh BUGS
 The export options are tied to the local mount points in the kernel and
 must be non-contradictory for any exported subdirectory of the local
 server mount point.
 It is recommended that all exported directories within the same server
 file system be specified on adjacent lines going down the tree.
 You cannot specify a hostname that is also the name of a netgroup.
 Specifying the full domain specification for a hostname can normally
 circumvent the problem.
Index: projects/clang500-import/usr.sbin/nscd/query.c
===================================================================
--- projects/clang500-import/usr.sbin/nscd/query.c	(revision 318657)
+++ projects/clang500-import/usr.sbin/nscd/query.c	(revision 318658)
@@ -1,1277 +1,1282 @@
 /*-
  * Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
  * 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.
  *
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
 #include <assert.h>
 #include <errno.h>
 #include <nsswitch.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "config.h"
 #include "debug.h"
 #include "query.h"
 #include "log.h"
 #include "mp_ws_query.h"
 #include "mp_rs_query.h"
 #include "singletons.h"
 
 static const char negative_data[1] = { 0 };
 
 extern	void get_time_func(struct timeval *);
 
 static 	void clear_config_entry(struct configuration_entry *);
 static 	void clear_config_entry_part(struct configuration_entry *,
 	const char *, size_t);
 
 static	int on_query_startup(struct query_state *);
 static	void on_query_destroy(struct query_state *);
 
 static	int on_read_request_read1(struct query_state *);
 static	int on_read_request_read2(struct query_state *);
 static	int on_read_request_process(struct query_state *);
 static	int on_read_response_write1(struct query_state *);
 static	int on_read_response_write2(struct query_state *);
 
 static	int on_rw_mapper(struct query_state *);
 
 static	int on_transform_request_read1(struct query_state *);
 static	int on_transform_request_read2(struct query_state *);
 static	int on_transform_request_process(struct query_state *);
 static	int on_transform_response_write1(struct query_state *);
 
 static	int on_write_request_read1(struct query_state *);
 static	int on_write_request_read2(struct query_state *);
 static	int on_negative_write_request_process(struct query_state *);
 static	int on_write_request_process(struct query_state *);
 static	int on_write_response_write1(struct query_state *);
 
 /*
  * Clears the specified configuration entry (clears the cache for positive and
  * and negative entries) and also for all multipart entries.
  */
 static void
 clear_config_entry(struct configuration_entry *config_entry)
 {
 	size_t i;
 
 	TRACE_IN(clear_config_entry);
 	configuration_lock_entry(config_entry, CELT_POSITIVE);
 	if (config_entry->positive_cache_entry != NULL)
 		transform_cache_entry(
 			config_entry->positive_cache_entry,
 			CTT_CLEAR);
 	configuration_unlock_entry(config_entry, CELT_POSITIVE);
 
 	configuration_lock_entry(config_entry, CELT_NEGATIVE);
 	if (config_entry->negative_cache_entry != NULL)
 		transform_cache_entry(
 			config_entry->negative_cache_entry,
 			CTT_CLEAR);
 	configuration_unlock_entry(config_entry, CELT_NEGATIVE);
 
 	configuration_lock_entry(config_entry, CELT_MULTIPART);
 	for (i = 0; i < config_entry->mp_cache_entries_size; ++i)
 		transform_cache_entry(
 			config_entry->mp_cache_entries[i],
 			CTT_CLEAR);
 	configuration_unlock_entry(config_entry, CELT_MULTIPART);
 
 	TRACE_OUT(clear_config_entry);
 }
 
 /*
  * Clears the specified configuration entry by deleting only the elements,
  * that are owned by the user with specified eid_str.
  */
 static void
 clear_config_entry_part(struct configuration_entry *config_entry,
 	const char *eid_str, size_t eid_str_length)
 {
 	cache_entry *start, *finish, *mp_entry;
 	TRACE_IN(clear_config_entry_part);
 	configuration_lock_entry(config_entry, CELT_POSITIVE);
 	if (config_entry->positive_cache_entry != NULL)
 		transform_cache_entry_part(
 			config_entry->positive_cache_entry,
 			CTT_CLEAR, eid_str, eid_str_length, KPPT_LEFT);
 	configuration_unlock_entry(config_entry, CELT_POSITIVE);
 
 	configuration_lock_entry(config_entry, CELT_NEGATIVE);
 	if (config_entry->negative_cache_entry != NULL)
 		transform_cache_entry_part(
 			config_entry->negative_cache_entry,
 			CTT_CLEAR, eid_str, eid_str_length, KPPT_LEFT);
 	configuration_unlock_entry(config_entry, CELT_NEGATIVE);
 
 	configuration_lock_entry(config_entry, CELT_MULTIPART);
 	if (configuration_entry_find_mp_cache_entries(config_entry,
 		eid_str, &start, &finish) == 0) {
 		for (mp_entry = start; mp_entry != finish; ++mp_entry)
 			transform_cache_entry(*mp_entry, CTT_CLEAR);
 	}
 	configuration_unlock_entry(config_entry, CELT_MULTIPART);
 
 	TRACE_OUT(clear_config_entry_part);
 }
 
 /*
  * This function is assigned to the query_state structue on its creation.
  * It's main purpose is to receive credentials from the client.
  */
 static int
 on_query_startup(struct query_state *qstate)
 {
 	struct msghdr	cred_hdr;
 	struct iovec	iov;
 	struct cmsgcred *cred;
 	int elem_type;
 
 	struct {
 		struct cmsghdr	hdr;
 		char cred[CMSG_SPACE(sizeof(struct cmsgcred))];
 	} cmsg;
 
 	TRACE_IN(on_query_startup);
 	assert(qstate != NULL);
 
 	memset(&cred_hdr, 0, sizeof(struct msghdr));
 	cred_hdr.msg_iov = &iov;
 	cred_hdr.msg_iovlen = 1;
 	cred_hdr.msg_control = (caddr_t)&cmsg;
 	cred_hdr.msg_controllen = CMSG_LEN(sizeof(struct cmsgcred));
 
 	memset(&iov, 0, sizeof(struct iovec));
 	iov.iov_base = &elem_type;
 	iov.iov_len = sizeof(int);
 
 	if (recvmsg(qstate->sockfd, &cred_hdr, 0) == -1) {
 		TRACE_OUT(on_query_startup);
 		return (-1);
 	}
 
 	if (cmsg.hdr.cmsg_len < CMSG_LEN(sizeof(struct cmsgcred))
 		|| cmsg.hdr.cmsg_level != SOL_SOCKET
 		|| cmsg.hdr.cmsg_type != SCM_CREDS) {
 		TRACE_OUT(on_query_startup);
 		return (-1);
 	}
 
 	cred = (struct cmsgcred *)CMSG_DATA(&cmsg);
 	qstate->uid = cred->cmcred_uid;
 	qstate->gid = cred->cmcred_gid;
 
 #if defined(NS_NSCD_EID_CHECKING) || defined(NS_STRICT_NSCD_EID_CHECKING)
 /*
  * This check is probably a bit redundant - per-user cache is always separated
  * by the euid/egid pair
  */
 	if (check_query_eids(qstate) != 0) {
 #ifdef NS_STRICT_NSCD_EID_CHECKING
 		TRACE_OUT(on_query_startup);
 		return (-1);
 #else
 		if ((elem_type != CET_READ_REQUEST) &&
 			(elem_type != CET_MP_READ_SESSION_REQUEST) &&
 			(elem_type != CET_WRITE_REQUEST) &&
 			(elem_type != CET_MP_WRITE_SESSION_REQUEST)) {
 			TRACE_OUT(on_query_startup);
 			return (-1);
 		}
 #endif
 	}
 #endif
 
 	switch (elem_type) {
 	case CET_WRITE_REQUEST:
 		qstate->process_func = on_write_request_read1;
 		break;
 	case CET_READ_REQUEST:
 		qstate->process_func = on_read_request_read1;
 		break;
 	case CET_TRANSFORM_REQUEST:
 		qstate->process_func = on_transform_request_read1;
 		break;
 	case CET_MP_WRITE_SESSION_REQUEST:
 		qstate->process_func = on_mp_write_session_request_read1;
 		break;
 	case CET_MP_READ_SESSION_REQUEST:
 		qstate->process_func = on_mp_read_session_request_read1;
 		break;
 	default:
 		TRACE_OUT(on_query_startup);
 		return (-1);
 	}
 
 	qstate->kevent_watermark = 0;
 	TRACE_OUT(on_query_startup);
 	return (0);
 }
 
 /*
  * on_rw_mapper is used to process multiple read/write requests during
  * one connection session. It's never called in the beginning (on query_state
  * creation) as it does not process the multipart requests and does not
  * receive credentials
  */
 static int
 on_rw_mapper(struct query_state *qstate)
 {
 	ssize_t	result;
 	int	elem_type;
 
 	TRACE_IN(on_rw_mapper);
 	if (qstate->kevent_watermark == 0) {
 		qstate->kevent_watermark = sizeof(int);
 	} else {
 		result = qstate->read_func(qstate, &elem_type, sizeof(int));
 		if (result != sizeof(int)) {
 			TRACE_OUT(on_rw_mapper);
 			return (-1);
 		}
 
 		switch (elem_type) {
 		case CET_WRITE_REQUEST:
 			qstate->kevent_watermark = sizeof(size_t);
 			qstate->process_func = on_write_request_read1;
 		break;
 		case CET_READ_REQUEST:
 			qstate->kevent_watermark = sizeof(size_t);
 			qstate->process_func = on_read_request_read1;
 		break;
 		default:
 			TRACE_OUT(on_rw_mapper);
 			return (-1);
 		break;
 		}
 	}
 	TRACE_OUT(on_rw_mapper);
 	return (0);
 }
 
 /*
  * The default query_destroy function
  */
 static void
 on_query_destroy(struct query_state *qstate)
 {
 
 	TRACE_IN(on_query_destroy);
 	finalize_comm_element(&qstate->response);
 	finalize_comm_element(&qstate->request);
 	TRACE_OUT(on_query_destroy);
 }
 
 /*
  * The functions below are used to process write requests.
  * - on_write_request_read1 and on_write_request_read2 read the request itself
  * - on_write_request_process processes it (if the client requests to
  *    cache the negative result, the on_negative_write_request_process is used)
  * - on_write_response_write1 sends the response
  */
 static int
 on_write_request_read1(struct query_state *qstate)
 {
 	struct cache_write_request	*write_request;
 	ssize_t	result;
 
 	TRACE_IN(on_write_request_read1);
 	if (qstate->kevent_watermark == 0)
 		qstate->kevent_watermark = sizeof(size_t) * 3;
 	else {
 		init_comm_element(&qstate->request, CET_WRITE_REQUEST);
 		write_request = get_cache_write_request(&qstate->request);
 
 		result = qstate->read_func(qstate, &write_request->entry_length,
 	    		sizeof(size_t));
 		result += qstate->read_func(qstate,
 	    		&write_request->cache_key_size, sizeof(size_t));
 		result += qstate->read_func(qstate,
 	    		&write_request->data_size, sizeof(size_t));
 
 		if (result != sizeof(size_t) * 3) {
 			TRACE_OUT(on_write_request_read1);
 			return (-1);
 		}
 
 		if (BUFSIZE_INVALID(write_request->entry_length) ||
 			BUFSIZE_INVALID(write_request->cache_key_size) ||
 			(BUFSIZE_INVALID(write_request->data_size) &&
 			(write_request->data_size != 0))) {
 			TRACE_OUT(on_write_request_read1);
 			return (-1);
 		}
 
 		write_request->entry = calloc(1,
 			write_request->entry_length + 1);
 		assert(write_request->entry != NULL);
 
 		write_request->cache_key = calloc(1,
 			write_request->cache_key_size +
 			qstate->eid_str_length);
 		assert(write_request->cache_key != NULL);
 		memcpy(write_request->cache_key, qstate->eid_str,
 			qstate->eid_str_length);
 
 		if (write_request->data_size != 0) {
 			write_request->data = calloc(1,
 				write_request->data_size);
 			assert(write_request->data != NULL);
 		}
 
 		qstate->kevent_watermark = write_request->entry_length +
 			write_request->cache_key_size +
 			write_request->data_size;
 		qstate->process_func = on_write_request_read2;
 	}
 
 	TRACE_OUT(on_write_request_read1);
 	return (0);
 }
 
 static int
 on_write_request_read2(struct query_state *qstate)
 {
 	struct cache_write_request	*write_request;
 	ssize_t	result;
 
 	TRACE_IN(on_write_request_read2);
 	write_request = get_cache_write_request(&qstate->request);
 
 	result = qstate->read_func(qstate, write_request->entry,
 		write_request->entry_length);
 	result += qstate->read_func(qstate, write_request->cache_key +
 		qstate->eid_str_length, write_request->cache_key_size);
 	if (write_request->data_size != 0)
 		result += qstate->read_func(qstate, write_request->data,
 			write_request->data_size);
 
 	if (result != (ssize_t)qstate->kevent_watermark) {
 		TRACE_OUT(on_write_request_read2);
 		return (-1);
 	}
 	write_request->cache_key_size += qstate->eid_str_length;
 
 	qstate->kevent_watermark = 0;
 	if (write_request->data_size != 0)
 		qstate->process_func = on_write_request_process;
 	else
 	    	qstate->process_func = on_negative_write_request_process;
 	TRACE_OUT(on_write_request_read2);
 	return (0);
 }
 
 static	int
 on_write_request_process(struct query_state *qstate)
 {
 	struct cache_write_request	*write_request;
 	struct cache_write_response	*write_response;
 	cache_entry c_entry;
 
 	TRACE_IN(on_write_request_process);
 	init_comm_element(&qstate->response, CET_WRITE_RESPONSE);
 	write_response = get_cache_write_response(&qstate->response);
 	write_request = get_cache_write_request(&qstate->request);
 
 	qstate->config_entry = configuration_find_entry(
 		s_configuration, write_request->entry);
 
 	if (qstate->config_entry == NULL) {
 		write_response->error_code = ENOENT;
 
 		LOG_ERR_2("write_request", "can't find configuration"
 		    " entry '%s'. aborting request", write_request->entry);
 		goto fin;
 	}
 
 	if (qstate->config_entry->enabled == 0) {
 		write_response->error_code = EACCES;
 
 		LOG_ERR_2("write_request",
 			"configuration entry '%s' is disabled",
 			write_request->entry);
 		goto fin;
 	}
 
 	if (qstate->config_entry->perform_actual_lookups != 0) {
 		write_response->error_code = EOPNOTSUPP;
 
 		LOG_ERR_2("write_request",
 			"entry '%s' performs lookups by itself: "
 			"can't write to it", write_request->entry);
 		goto fin;
 	}
 
 	configuration_lock_rdlock(s_configuration);
 	c_entry = find_cache_entry(s_cache,
 		qstate->config_entry->positive_cache_params.cep.entry_name);
 	configuration_unlock(s_configuration);
 	if (c_entry != NULL) {
 		configuration_lock_entry(qstate->config_entry, CELT_POSITIVE);
 		qstate->config_entry->positive_cache_entry = c_entry;
 		write_response->error_code = cache_write(c_entry,
 			write_request->cache_key,
 	    		write_request->cache_key_size,
 	    		write_request->data,
 			write_request->data_size);
 		configuration_unlock_entry(qstate->config_entry, CELT_POSITIVE);
 
 		if ((qstate->config_entry->common_query_timeout.tv_sec != 0) ||
 		    (qstate->config_entry->common_query_timeout.tv_usec != 0))
 			memcpy(&qstate->timeout,
 				&qstate->config_entry->common_query_timeout,
 				sizeof(struct timeval));
 
 	} else
 		write_response->error_code = -1;
 
 fin:
 	qstate->kevent_filter = EVFILT_WRITE;
 	qstate->kevent_watermark = sizeof(int);
 	qstate->process_func = on_write_response_write1;
 
 	TRACE_OUT(on_write_request_process);
 	return (0);
 }
 
 static int
 on_negative_write_request_process(struct query_state *qstate)
 {
 	struct cache_write_request	*write_request;
 	struct cache_write_response	*write_response;
 	cache_entry c_entry;
 
 	TRACE_IN(on_negative_write_request_process);
 	init_comm_element(&qstate->response, CET_WRITE_RESPONSE);
 	write_response = get_cache_write_response(&qstate->response);
 	write_request = get_cache_write_request(&qstate->request);
 
 	qstate->config_entry = configuration_find_entry	(
 		s_configuration, write_request->entry);
 
 	if (qstate->config_entry == NULL) {
 		write_response->error_code = ENOENT;
 
 		LOG_ERR_2("negative_write_request",
 			"can't find configuration"
 		   	" entry '%s'. aborting request", write_request->entry);
 		goto fin;
 	}
 
 	if (qstate->config_entry->enabled == 0) {
 		write_response->error_code = EACCES;
 
 		LOG_ERR_2("negative_write_request",
 			"configuration entry '%s' is disabled",
 			write_request->entry);
 		goto fin;
 	}
 
 	if (qstate->config_entry->perform_actual_lookups != 0) {
 		write_response->error_code = EOPNOTSUPP;
 
 		LOG_ERR_2("negative_write_request",
 			"entry '%s' performs lookups by itself: "
 			"can't write to it", write_request->entry);
 		goto fin;
 	} else {
 #ifdef NS_NSCD_EID_CHECKING
 		if (check_query_eids(qstate) != 0) {
 			write_response->error_code = EPERM;
 			goto fin;
 		}
 #endif
 	}
 
 	configuration_lock_rdlock(s_configuration);
 	c_entry = find_cache_entry(s_cache,
 		qstate->config_entry->negative_cache_params.cep.entry_name);
 	configuration_unlock(s_configuration);
 	if (c_entry != NULL) {
 		configuration_lock_entry(qstate->config_entry, CELT_NEGATIVE);
 		qstate->config_entry->negative_cache_entry = c_entry;
 		write_response->error_code = cache_write(c_entry,
 			write_request->cache_key,
 	    		write_request->cache_key_size,
 	    		negative_data,
 			sizeof(negative_data));
 		configuration_unlock_entry(qstate->config_entry, CELT_NEGATIVE);
 
 		if ((qstate->config_entry->common_query_timeout.tv_sec != 0) ||
 		    (qstate->config_entry->common_query_timeout.tv_usec != 0))
 			memcpy(&qstate->timeout,
 				&qstate->config_entry->common_query_timeout,
 				sizeof(struct timeval));
 	} else
 		write_response->error_code = -1;
 
 fin:
 	qstate->kevent_filter = EVFILT_WRITE;
 	qstate->kevent_watermark = sizeof(int);
 	qstate->process_func = on_write_response_write1;
 
 	TRACE_OUT(on_negative_write_request_process);
 	return (0);
 }
 
 static int
 on_write_response_write1(struct query_state *qstate)
 {
 	struct cache_write_response	*write_response;
 	ssize_t	result;
 
 	TRACE_IN(on_write_response_write1);
 	write_response = get_cache_write_response(&qstate->response);
 	result = qstate->write_func(qstate, &write_response->error_code,
 		sizeof(int));
 	if (result != sizeof(int)) {
 		TRACE_OUT(on_write_response_write1);
 		return (-1);
 	}
 
 	finalize_comm_element(&qstate->request);
 	finalize_comm_element(&qstate->response);
 
 	qstate->kevent_watermark = sizeof(int);
 	qstate->kevent_filter = EVFILT_READ;
 	qstate->process_func = on_rw_mapper;
 
 	TRACE_OUT(on_write_response_write1);
 	return (0);
 }
 
 /*
  * The functions below are used to process read requests.
  * - on_read_request_read1 and on_read_request_read2 read the request itself
  * - on_read_request_process processes it
  * - on_read_response_write1 and on_read_response_write2 send the response
  */
 static int
 on_read_request_read1(struct query_state *qstate)
 {
 	struct cache_read_request *read_request;
 	ssize_t	result;
 
 	TRACE_IN(on_read_request_read1);
 	if (qstate->kevent_watermark == 0)
 		qstate->kevent_watermark = sizeof(size_t) * 2;
 	else {
 		init_comm_element(&qstate->request, CET_READ_REQUEST);
 		read_request = get_cache_read_request(&qstate->request);
 
 		result = qstate->read_func(qstate,
 	    		&read_request->entry_length, sizeof(size_t));
 		result += qstate->read_func(qstate,
 	    		&read_request->cache_key_size, sizeof(size_t));
 
 		if (result != sizeof(size_t) * 2) {
 			TRACE_OUT(on_read_request_read1);
 			return (-1);
 		}
 
 		if (BUFSIZE_INVALID(read_request->entry_length) ||
 			BUFSIZE_INVALID(read_request->cache_key_size)) {
 			TRACE_OUT(on_read_request_read1);
 			return (-1);
 		}
 
 		read_request->entry = calloc(1,
 			read_request->entry_length + 1);
 		assert(read_request->entry != NULL);
 
 		read_request->cache_key = calloc(1,
 			read_request->cache_key_size +
 			qstate->eid_str_length);
 		assert(read_request->cache_key != NULL);
 		memcpy(read_request->cache_key, qstate->eid_str,
 			qstate->eid_str_length);
 
 		qstate->kevent_watermark = read_request->entry_length +
 			read_request->cache_key_size;
 		qstate->process_func = on_read_request_read2;
 	}
 
 	TRACE_OUT(on_read_request_read1);
 	return (0);
 }
 
 static int
 on_read_request_read2(struct query_state *qstate)
 {
 	struct cache_read_request	*read_request;
 	ssize_t	result;
 
 	TRACE_IN(on_read_request_read2);
 	read_request = get_cache_read_request(&qstate->request);
 
 	result = qstate->read_func(qstate, read_request->entry,
 		read_request->entry_length);
 	result += qstate->read_func(qstate,
 		read_request->cache_key + qstate->eid_str_length,
 		read_request->cache_key_size);
 
 	if (result != (ssize_t)qstate->kevent_watermark) {
 		TRACE_OUT(on_read_request_read2);
 		return (-1);
 	}
 	read_request->cache_key_size += qstate->eid_str_length;
 
 	qstate->kevent_watermark = 0;
 	qstate->process_func = on_read_request_process;
 
 	TRACE_OUT(on_read_request_read2);
 	return (0);
 }
 
 static int
 on_read_request_process(struct query_state *qstate)
 {
 	struct cache_read_request *read_request;
 	struct cache_read_response *read_response;
 	cache_entry	c_entry, neg_c_entry;
 
 	struct agent	*lookup_agent;
 	struct common_agent *c_agent;
 	int res;
 
 	TRACE_IN(on_read_request_process);
 	init_comm_element(&qstate->response, CET_READ_RESPONSE);
 	read_response = get_cache_read_response(&qstate->response);
 	read_request = get_cache_read_request(&qstate->request);
 
 	qstate->config_entry = configuration_find_entry(
 		s_configuration, read_request->entry);
 	if (qstate->config_entry == NULL) {
 		read_response->error_code = ENOENT;
 
 		LOG_ERR_2("read_request",
 			"can't find configuration "
 	    		"entry '%s'. aborting request", read_request->entry);
 	    	goto fin;
 	}
 
 	if (qstate->config_entry->enabled == 0) {
 		read_response->error_code = EACCES;
 
 		LOG_ERR_2("read_request",
 			"configuration entry '%s' is disabled",
 			read_request->entry);
 		goto fin;
 	}
 
 	/*
 	 * if we perform lookups by ourselves, then we don't need to separate
 	 * cache entries by euid and egid
 	 */
 	if (qstate->config_entry->perform_actual_lookups != 0)
 		memset(read_request->cache_key, 0, qstate->eid_str_length);
 	else {
 #ifdef NS_NSCD_EID_CHECKING
 		if (check_query_eids(qstate) != 0) {
 		/* if the lookup is not self-performing, we check for clients euid/egid */
 			read_response->error_code = EPERM;
 			goto fin;
 		}
 #endif
 	}
 
 	configuration_lock_rdlock(s_configuration);
 	c_entry = find_cache_entry(s_cache,
 		qstate->config_entry->positive_cache_params.cep.entry_name);
 	neg_c_entry = find_cache_entry(s_cache,
 		qstate->config_entry->negative_cache_params.cep.entry_name);
 	configuration_unlock(s_configuration);
 	if ((c_entry != NULL) && (neg_c_entry != NULL)) {
 		configuration_lock_entry(qstate->config_entry, CELT_POSITIVE);
 		qstate->config_entry->positive_cache_entry = c_entry;
 		read_response->error_code = cache_read(c_entry,
 	    		read_request->cache_key,
 	    		read_request->cache_key_size, NULL,
 	    		&read_response->data_size);
 
 		if (read_response->error_code == -2) {
 			read_response->data = malloc(
 				read_response->data_size);
-			assert(read_response != NULL);
+			assert(read_response->data != NULL);
 			read_response->error_code = cache_read(c_entry,
 				read_request->cache_key,
 		    		read_request->cache_key_size,
 		    		read_response->data,
 		    		&read_response->data_size);
 		}
 		configuration_unlock_entry(qstate->config_entry, CELT_POSITIVE);
 
 		configuration_lock_entry(qstate->config_entry, CELT_NEGATIVE);
 		qstate->config_entry->negative_cache_entry = neg_c_entry;
 		if (read_response->error_code == -1) {
 			read_response->error_code = cache_read(neg_c_entry,
 				read_request->cache_key,
 				read_request->cache_key_size, NULL,
 				&read_response->data_size);
 
 			if (read_response->error_code == -2) {
-				read_response->error_code = 0;
-				read_response->data = NULL;
-				read_response->data_size = 0;
+				read_response->data = malloc(
+					read_response->data_size);
+				assert(read_response->data != NULL);
+				read_response->error_code = cache_read(neg_c_entry,
+					read_request->cache_key,
+		    			read_request->cache_key_size,
+		    			read_response->data,
+		    			&read_response->data_size);
 			}
 		}
 		configuration_unlock_entry(qstate->config_entry, CELT_NEGATIVE);
 
 		if ((read_response->error_code == -1) &&
 			(qstate->config_entry->perform_actual_lookups != 0)) {
 			free(read_response->data);
 			read_response->data = NULL;
 			read_response->data_size = 0;
 
 			lookup_agent = find_agent(s_agent_table,
 				read_request->entry, COMMON_AGENT);
 
 			if ((lookup_agent != NULL) &&
 			(lookup_agent->type == COMMON_AGENT)) {
 				c_agent = (struct common_agent *)lookup_agent;
 				res = c_agent->lookup_func(
 					read_request->cache_key +
 						qstate->eid_str_length,
 					read_request->cache_key_size -
 						qstate->eid_str_length,
 					&read_response->data,
 					&read_response->data_size);
 
 				if (res == NS_SUCCESS) {
 					read_response->error_code = 0;
 					configuration_lock_entry(
 						qstate->config_entry,
 						CELT_POSITIVE);
 					cache_write(c_entry,
 						read_request->cache_key,
 	    					read_request->cache_key_size,
 	    					read_response->data,
 						read_response->data_size);
 					configuration_unlock_entry(
 						qstate->config_entry,
 						CELT_POSITIVE);
 				} else if ((res == NS_NOTFOUND) ||
 					  (res == NS_RETURN)) {
 					configuration_lock_entry(
 						  qstate->config_entry,
 						  CELT_NEGATIVE);
 					cache_write(neg_c_entry,
 						read_request->cache_key,
 						read_request->cache_key_size,
 						negative_data,
 						sizeof(negative_data));
 					configuration_unlock_entry(
 						  qstate->config_entry,
 						  CELT_NEGATIVE);
 
 					read_response->error_code = 0;
 					read_response->data = NULL;
 					read_response->data_size = 0;
 				}
 			}
 		}
 
 		if ((qstate->config_entry->common_query_timeout.tv_sec != 0) ||
 		    (qstate->config_entry->common_query_timeout.tv_usec != 0))
 			memcpy(&qstate->timeout,
 				&qstate->config_entry->common_query_timeout,
 				sizeof(struct timeval));
 	} else
 		read_response->error_code = -1;
 
 fin:
 	qstate->kevent_filter = EVFILT_WRITE;
 	if (read_response->error_code == 0)
 		qstate->kevent_watermark = sizeof(int) + sizeof(size_t);
 	else
 		qstate->kevent_watermark = sizeof(int);
 	qstate->process_func = on_read_response_write1;
 
 	TRACE_OUT(on_read_request_process);
 	return (0);
 }
 
 static int
 on_read_response_write1(struct query_state *qstate)
 {
 	struct cache_read_response	*read_response;
 	ssize_t	result;
 
 	TRACE_IN(on_read_response_write1);
 	read_response = get_cache_read_response(&qstate->response);
 
 	result = qstate->write_func(qstate, &read_response->error_code,
 		sizeof(int));
 
 	if (read_response->error_code == 0) {
 		result += qstate->write_func(qstate, &read_response->data_size,
 			sizeof(size_t));
 		if (result != (ssize_t)qstate->kevent_watermark) {
 			TRACE_OUT(on_read_response_write1);
 			return (-1);
 		}
 
 		qstate->kevent_watermark = read_response->data_size;
 		qstate->process_func = on_read_response_write2;
 	} else {
 		if (result != (ssize_t)qstate->kevent_watermark) {
 			TRACE_OUT(on_read_response_write1);
 			return (-1);
 		}
 
 		qstate->kevent_watermark = 0;
 		qstate->process_func = NULL;
 	}
 
 	TRACE_OUT(on_read_response_write1);
 	return (0);
 }
 
 static int
 on_read_response_write2(struct query_state *qstate)
 {
 	struct cache_read_response	*read_response;
 	ssize_t	result;
 
 	TRACE_IN(on_read_response_write2);
 	read_response = get_cache_read_response(&qstate->response);
 	if (read_response->data_size > 0) {
 		result = qstate->write_func(qstate, read_response->data,
 			read_response->data_size);
 		if (result != (ssize_t)qstate->kevent_watermark) {
 			TRACE_OUT(on_read_response_write2);
 			return (-1);
 		}
 	}
 
 	finalize_comm_element(&qstate->request);
 	finalize_comm_element(&qstate->response);
 
 	qstate->kevent_watermark = sizeof(int);
 	qstate->kevent_filter = EVFILT_READ;
 	qstate->process_func = on_rw_mapper;
 	TRACE_OUT(on_read_response_write2);
 	return (0);
 }
 
 /*
  * The functions below are used to process write requests.
  * - on_transform_request_read1 and on_transform_request_read2 read the
  *   request itself
  * - on_transform_request_process processes it
  * - on_transform_response_write1 sends the response
  */
 static int
 on_transform_request_read1(struct query_state *qstate)
 {
 	struct cache_transform_request *transform_request;
 	ssize_t	result;
 
 	TRACE_IN(on_transform_request_read1);
 	if (qstate->kevent_watermark == 0)
 		qstate->kevent_watermark = sizeof(size_t) + sizeof(int);
 	else {
 		init_comm_element(&qstate->request, CET_TRANSFORM_REQUEST);
 		transform_request =
 			get_cache_transform_request(&qstate->request);
 
 		result = qstate->read_func(qstate,
 	    		&transform_request->entry_length, sizeof(size_t));
 		result += qstate->read_func(qstate,
 	    		&transform_request->transformation_type, sizeof(int));
 
 		if (result != sizeof(size_t) + sizeof(int)) {
 			TRACE_OUT(on_transform_request_read1);
 			return (-1);
 		}
 
 		if ((transform_request->transformation_type != TT_USER) &&
 		    (transform_request->transformation_type != TT_ALL)) {
 			TRACE_OUT(on_transform_request_read1);
 			return (-1);
 		}
 
 		if (transform_request->entry_length != 0) {
 			if (BUFSIZE_INVALID(transform_request->entry_length)) {
 				TRACE_OUT(on_transform_request_read1);
 				return (-1);
 			}
 
 			transform_request->entry = calloc(1,
 				transform_request->entry_length + 1);
 			assert(transform_request->entry != NULL);
 
 			qstate->process_func = on_transform_request_read2;
 		} else
 			qstate->process_func = on_transform_request_process;
 
 		qstate->kevent_watermark = transform_request->entry_length;
 	}
 
 	TRACE_OUT(on_transform_request_read1);
 	return (0);
 }
 
 static int
 on_transform_request_read2(struct query_state *qstate)
 {
 	struct cache_transform_request	*transform_request;
 	ssize_t	result;
 
 	TRACE_IN(on_transform_request_read2);
 	transform_request = get_cache_transform_request(&qstate->request);
 
 	result = qstate->read_func(qstate, transform_request->entry,
 		transform_request->entry_length);
 
 	if (result != (ssize_t)qstate->kevent_watermark) {
 		TRACE_OUT(on_transform_request_read2);
 		return (-1);
 	}
 
 	qstate->kevent_watermark = 0;
 	qstate->process_func = on_transform_request_process;
 
 	TRACE_OUT(on_transform_request_read2);
 	return (0);
 }
 
 static int
 on_transform_request_process(struct query_state *qstate)
 {
 	struct cache_transform_request *transform_request;
 	struct cache_transform_response *transform_response;
 	struct configuration_entry *config_entry;
 	size_t	i, size;
 
 	TRACE_IN(on_transform_request_process);
 	init_comm_element(&qstate->response, CET_TRANSFORM_RESPONSE);
 	transform_response = get_cache_transform_response(&qstate->response);
 	transform_request = get_cache_transform_request(&qstate->request);
 
 	switch (transform_request->transformation_type) {
 	case TT_USER:
 		if (transform_request->entry == NULL) {
 			size = configuration_get_entries_size(s_configuration);
 			for (i = 0; i < size; ++i) {
 			    config_entry = configuration_get_entry(
 				s_configuration, i);
 
 			    if (config_entry->perform_actual_lookups == 0)
 			    	clear_config_entry_part(config_entry,
 				    qstate->eid_str, qstate->eid_str_length);
 			}
 		} else {
 			qstate->config_entry = configuration_find_entry(
 				s_configuration, transform_request->entry);
 
 			if (qstate->config_entry == NULL) {
 				LOG_ERR_2("transform_request",
 					"can't find configuration"
 		   			" entry '%s'. aborting request",
 					transform_request->entry);
 				transform_response->error_code = -1;
 				goto fin;
 			}
 
 			if (qstate->config_entry->perform_actual_lookups != 0) {
 				LOG_ERR_2("transform_request",
 					"can't transform the cache entry %s"
 					", because it ised for actual lookups",
 					transform_request->entry);
 				transform_response->error_code = -1;
 				goto fin;
 			}
 
 			clear_config_entry_part(qstate->config_entry,
 				qstate->eid_str, qstate->eid_str_length);
 		}
 		break;
 	case TT_ALL:
 		if (qstate->euid != 0)
 			transform_response->error_code = -1;
 		else {
 			if (transform_request->entry == NULL) {
 				size = configuration_get_entries_size(
 					s_configuration);
 				for (i = 0; i < size; ++i) {
 				    clear_config_entry(
 					configuration_get_entry(
 						s_configuration, i));
 				}
 			} else {
 				qstate->config_entry = configuration_find_entry(
 					s_configuration,
 					transform_request->entry);
 
 				if (qstate->config_entry == NULL) {
 					LOG_ERR_2("transform_request",
 						"can't find configuration"
 		   				" entry '%s'. aborting request",
 						transform_request->entry);
 					transform_response->error_code = -1;
 					goto fin;
 				}
 
 				clear_config_entry(qstate->config_entry);
 			}
 		}
 		break;
 	default:
 		transform_response->error_code = -1;
 	}
 
 fin:
 	qstate->kevent_watermark = 0;
 	qstate->process_func = on_transform_response_write1;
 	TRACE_OUT(on_transform_request_process);
 	return (0);
 }
 
 static int
 on_transform_response_write1(struct query_state *qstate)
 {
 	struct cache_transform_response	*transform_response;
 	ssize_t	result;
 
 	TRACE_IN(on_transform_response_write1);
 	transform_response = get_cache_transform_response(&qstate->response);
 	result = qstate->write_func(qstate, &transform_response->error_code,
 		sizeof(int));
 	if (result != sizeof(int)) {
 		TRACE_OUT(on_transform_response_write1);
 		return (-1);
 	}
 
 	finalize_comm_element(&qstate->request);
 	finalize_comm_element(&qstate->response);
 
 	qstate->kevent_watermark = 0;
 	qstate->process_func = NULL;
 	TRACE_OUT(on_transform_response_write1);
 	return (0);
 }
 
 /*
  * Checks if the client's euid and egid do not differ from its uid and gid.
  * Returns 0 on success.
  */
 int
 check_query_eids(struct query_state *qstate)
 {
 
 	return ((qstate->uid != qstate->euid) || (qstate->gid != qstate->egid) ? -1 : 0);
 }
 
 /*
  * Uses the qstate fields to process an "alternate" read - when the buffer is
  * too large to be received during one socket read operation
  */
 ssize_t
 query_io_buffer_read(struct query_state *qstate, void *buf, size_t nbytes)
 {
 	size_t remaining;
 	ssize_t	result;
 
 	TRACE_IN(query_io_buffer_read);
 	if ((qstate->io_buffer_size == 0) || (qstate->io_buffer == NULL))
 		return (-1);
 
 	assert(qstate->io_buffer_p <=
 		qstate->io_buffer + qstate->io_buffer_size);
 	remaining = qstate->io_buffer + qstate->io_buffer_size -
 		qstate->io_buffer_p;
 	if (nbytes < remaining)
 		result = nbytes;
 	else
 		result = remaining;
 
 	memcpy(buf, qstate->io_buffer_p, result);
 	qstate->io_buffer_p += result;
 
 	if (remaining == 0) {
 		free(qstate->io_buffer);
 		qstate->io_buffer = NULL;
 
 		qstate->write_func = query_socket_write;
 		qstate->read_func = query_socket_read;
 	}
 
 	TRACE_OUT(query_io_buffer_read);
 	return (result);
 }
 
 /*
  * Uses the qstate fields to process an "alternate" write - when the buffer is
  * too large to be sent during one socket write operation
  */
 ssize_t
 query_io_buffer_write(struct query_state *qstate, const void *buf,
 	size_t nbytes)
 {
 	size_t remaining;
 	ssize_t	result;
 
 	TRACE_IN(query_io_buffer_write);
 	if ((qstate->io_buffer_size == 0) || (qstate->io_buffer == NULL))
 		return (-1);
 
 	assert(qstate->io_buffer_p <=
 		qstate->io_buffer + qstate->io_buffer_size);
 	remaining = qstate->io_buffer + qstate->io_buffer_size -
 		qstate->io_buffer_p;
 	if (nbytes < remaining)
 		result = nbytes;
 	else
 		result = remaining;
 
 	memcpy(qstate->io_buffer_p, buf, result);
 	qstate->io_buffer_p += result;
 
 	if (remaining == 0) {
 		qstate->use_alternate_io = 1;
 		qstate->io_buffer_p = qstate->io_buffer;
 
 		qstate->write_func = query_socket_write;
 		qstate->read_func = query_socket_read;
 	}
 
 	TRACE_OUT(query_io_buffer_write);
 	return (result);
 }
 
 /*
  * The default "read" function, which reads data directly from socket
  */
 ssize_t
 query_socket_read(struct query_state *qstate, void *buf, size_t nbytes)
 {
 	ssize_t	result;
 
 	TRACE_IN(query_socket_read);
 	if (qstate->socket_failed != 0) {
 		TRACE_OUT(query_socket_read);
 		return (-1);
 	}
 
 	result = read(qstate->sockfd, buf, nbytes);
 	if (result < 0 || (size_t)result < nbytes)
 		qstate->socket_failed = 1;
 
 	TRACE_OUT(query_socket_read);
 	return (result);
 }
 
 /*
  * The default "write" function, which writes data directly to socket
  */
 ssize_t
 query_socket_write(struct query_state *qstate, const void *buf, size_t nbytes)
 {
 	ssize_t	result;
 
 	TRACE_IN(query_socket_write);
 	if (qstate->socket_failed != 0) {
 		TRACE_OUT(query_socket_write);
 		return (-1);
 	}
 
 	result = write(qstate->sockfd, buf, nbytes);
 	if (result < 0 || (size_t)result < nbytes)
 		qstate->socket_failed = 1;
 
 	TRACE_OUT(query_socket_write);
 	return (result);
 }
 
 /*
  * Initializes the query_state structure by filling it with the default values.
  */
 struct query_state *
 init_query_state(int sockfd, size_t kevent_watermark, uid_t euid, gid_t egid)
 {
 	struct query_state	*retval;
 
 	TRACE_IN(init_query_state);
 	retval = calloc(1, sizeof(*retval));
 	assert(retval != NULL);
 
 	retval->sockfd = sockfd;
 	retval->kevent_filter = EVFILT_READ;
 	retval->kevent_watermark = kevent_watermark;
 
 	retval->euid = euid;
 	retval->egid = egid;
 	retval->uid = retval->gid = -1;
 
 	if (asprintf(&retval->eid_str, "%d_%d_", retval->euid,
 		retval->egid) == -1) {
 		free(retval);
 		return (NULL);
 	}
 	retval->eid_str_length = strlen(retval->eid_str);
 
 	init_comm_element(&retval->request, CET_UNDEFINED);
 	init_comm_element(&retval->response, CET_UNDEFINED);
 	retval->process_func = on_query_startup;
 	retval->destroy_func = on_query_destroy;
 
 	retval->write_func = query_socket_write;
 	retval->read_func = query_socket_read;
 
 	get_time_func(&retval->creation_time);
 	retval->timeout.tv_sec = s_configuration->query_timeout;
 	retval->timeout.tv_usec = 0;
 
 	TRACE_OUT(init_query_state);
 	return (retval);
 }
 
 void
 destroy_query_state(struct query_state *qstate)
 {
 
 	TRACE_IN(destroy_query_state);
 	if (qstate->eid_str != NULL)
 	    free(qstate->eid_str);
 
 	if (qstate->io_buffer != NULL)
 		free(qstate->io_buffer);
 
 	qstate->destroy_func(qstate);
 	free(qstate);
 	TRACE_OUT(destroy_query_state);
 }
Index: projects/clang500-import
===================================================================
--- projects/clang500-import	(revision 318657)
+++ projects/clang500-import	(revision 318658)

Property changes on: projects/clang500-import
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r318560-318657