From c923aa4a0a555a5a587158c2e241fe1aae4259e5 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Tue, 27 Jul 2021 17:39:20 +1000
Subject: [PATCH rtems-libbsd v4 01/19] Implement portable kernel symbol
 namespace tool

- The script's use of sort proved to not be portable

- No need to check the commits as symbols are only added

- Regenerated kernel header to reset the sort order

Update #4475
---
 CONTRIBUTING.md                               |   78 +-
 create-kernel-namespace.sh                    |  133 -
 rtems-kern-symbols                            |  505 ++++
 .../machine/rtems-bsd-kernel-namespace.h      | 2136 +++++++++--------
 4 files changed, 1651 insertions(+), 1201 deletions(-)
 delete mode 100755 create-kernel-namespace.sh
 create mode 100755 rtems-kern-symbols

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 20dc938b..5336b22e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -121,6 +121,82 @@ $ git log freebsd-org
 ```
 to figure out the current FreeBSD baseline.
 
+Updates to FreeBSD or RTEMS Kernel Support
+------------------------------------------
+
+If you update code or change any defines that effect the generated
+code in the following paths:
+
+* `freebsd/sys/*.[ch]`
+* `rtemsbsd/rtems/rtems-kernel-*.c`
+
+you need to see if any new kernel symbols have been generated or
+exposed. The tool `rtems-kern-symbols` command supports checking and
+updating the kernel symbol namespace.
+
+The public (global) kernel symbosl need to reside in a private
+namespace to avoid clashing with symbols in the user space code or
+applications. The FreeBSD kernel names functions and variables
+assuming a private kernel only symbols space. RTEMS builds FreeBSD
+kernel and user space code in the same symbols space so there can be
+clashes. We manage this by maintaining a header file that maps the
+global kernel symbols to a private namespace. For example `malloc` is
+mapped to `_bsd_malloc`.
+
+The set of symbols to map is not easy to obtain because symbols may be
+the result of complex preprocessing of the source, the code is
+specific to a BSP or the code is controlled by a buildset.
+
+The approach we use is to not remove symbols unless you are certain
+the symbols have been removed from the FreeBSD kernel source. This is
+a manual operation.
+
+You are required to check symbols with a 32bit and 64bit
+architecture.
+
+If you are working on a specific BSP and related drivers please make
+sure the kernel symbols are checked. It is too much to ask every
+developer to build all BSPs and check.
+
+RTEMS Kernel Symbols Tool
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The python tool `rtems-kern-symbols` can read a kernel header loading
+a previously generated version. This maintains the current symbol set
+without you needing to build the object files previously scanned.
+
+The kernel namespace header can be regenerated from the original
+header. This checks the kernel header is already sorted. If you think
+there is a sorting issue in the existing header please regenerate
+without adding new symbols.
+
+```
+$ ./rtems-kern-symbols --regenerate --output=tmp.h
+```
+
+This command needs access to your built RTEMS tools. You can set your
+environment `PATH` variable or you can specify the top level path as an argument:
+```
+$ ./rtems-kern-symbols --rtems-tools=/opt/work/rtems/6
+```
+
+Options:
+
+* You can provide a different kernel header using the `--kern-header`
+argument. The default is the LibbSD header.
+
+* The `--report` option provides a report.
+
+* The `--diff` option provides a unified diff of any changes.
+
+* The `--write` option is needed to write any changes
+
+* The `--output` option lets you control the output kernel header file
+  change are written too
+
+The tool manages a number of exlcuded symbols. These are symbols in
+the kernel space that are not mapped to the RTEMS kernel namespace.
+
 How to Import Code from FreeBSD
 -------------------------------
 
@@ -134,7 +210,7 @@ How to Import Code from FreeBSD
 * Immediately check in the imported files without the changes to `libbsd.py` and the buildsets.  Do not touch the imported files yourself at this point.
 * Port the imported files to RTEMS.  See 'Rules for Modifying FreeBSD Source'.
 * Add a test to the testsuite if possible.
-* Run `./create-kernel-namespace.sh` if you imported kernel space headers.  Add only your new defines via `git add -p rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h`.
+* Run `./rtems-kern-symbols` as discussed above
 * Create one commit from this.
 
 The -S or --stats option generates reports the changes we have made to
diff --git a/create-kernel-namespace.sh b/create-kernel-namespace.sh
deleted file mode 100755
index ed4efa10..00000000
--- a/create-kernel-namespace.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh -x
-
-#
-# Copyright (c) 2016 embedded brains GmbH.  All rights reserved.
-#
-#  embedded brains GmbH
-#  Dornierstr. 4
-#  82178 Puchheim
-#  Germany
-#  <rtems@embedded-brains.de>
-#
-# 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.
-#
-
-#
-# This script generates the kernel namespace header file
-# <machine/rtems-bsd-kernel-namespace.h>.
-#
-
-objdump --syms `for i in build/*rtems* ; do \
-	find $i/freebsd/sys/ -name '*.o' ; \
-	echo $i/rtemsbsd/rtems/rtems-kernel-*.o ; \
-	done` \
-	| awk '/^[0-9a-f]+[[:blank:]]+g/ {print $6}' \
-	| sed 's/^_bsd_//' \
-	| sed '/^accept$/d' \
-	| sed '/^arc4random$/d' \
-	| sed '/^bind$/d' \
-	| sed '/^blackhole$/d' \
-	| sed '/^bpf_filter$/d' \
-	| sed '/^bpf_jitter$/d' \
-	| sed '/^bpf_jitter_enable$/d' \
-	| sed '/^bpf_validate$/d' \
-	| sed '/^connect$/d' \
-	| sed '/^drop_redirect$/d' \
-	| sed '/^drop_synfin$/d' \
-	| sed '/^free$/d' \
-	| sed '/^getentropy$/d' \
-	| sed '/^getpeername$/d' \
-	| sed '/^getsockname$/d' \
-	| sed '/^getsockopt$/d' \
-	| sed '/^ifqmaxlen$/d' \
-	| sed '/^in6addr_any$/d' \
-	| sed '/^in6addr_loopback$/d' \
-	| sed '/^in6addr_nodelocal_allnodes$/d' \
-	| sed '/^in6addr_linklocal_allnodes$/d' \
-	| sed '/^kevent$/d' \
-	| sed '/^kqueue$/d' \
-	| sed '/^listen$/d' \
-	| sed '/^malloc$/d' \
-	| sed '/^max_datalen$/d' \
-	| sed '/^max_hdr$/d' \
-	| sed '/^max_linkhdr$/d' \
-	| sed '/^max_protohdr$/d' \
-	| sed '/^maxsockets$/d' \
-	| sed '/^nd6_debug$/d' \
-	| sed '/^nd6_delay$/d' \
-	| sed '/^nd6_gctimer$/d' \
-	| sed '/^nd6_maxnudhint$/d' \
-	| sed '/^nd6_mmaxtries$/d' \
-	| sed '/^nd6_onlink_ns_rfc4861$/d' \
-	| sed '/^nd6_prune$/d' \
-	| sed '/^nd6_umaxtries$/d' \
-	| sed '/^nd6_useloopback$/d' \
-	| sed '/^nmbclusters$/d' \
-	| sed '/^nmbjumbo16$/d' \
-	| sed '/^nmbjumbo9$/d' \
-	| sed '/^nmbjumbop$/d' \
-	| sed '/^nmbufs$/d' \
-	| sed '/^nolocaltimewait$/d' \
-	| sed '/^path_mtu_discovery$/d' \
-	| sed '/^pause$/d' \
-	| sed '/^pf_osfp_entry_pl$/d' \
-	| sed '/^pf_osfp_pl$/d' \
-	| sed '/^pipe$/d' \
-	| sed '/^poll$/d' \
-	| sed '/^random$/d' \
-	| sed '/^realloc$/d' \
-	| sed '/^reallocf$/d' \
-	| sed '/^recvfrom$/d' \
-	| sed '/^recvmsg$/d' \
-	| sed '/^rtems/d' \
-	| sed '/^select$/d' \
-	| sed '/^sendmsg$/d' \
-	| sed '/^sendto$/d' \
-	| sed '/^setfib$/d' \
-	| sed '/^setsockopt$/d' \
-	| sed '/^shutdown$/d' \
-	| sed '/^socket$/d' \
-	| sed '/^socketpair$/d' \
-	| sed '/^soreceive_stream$/d' \
-	| sed '/^srandom$/d' \
-	| sed '/^strdup$/d' \
-	| sed '/^sysctlbyname$/d' \
-	| sed '/^sysctl$/d' \
-	| sed '/^sysctlnametomib$/d' \
-	| sed '/sys_init/d' \
-	| sed '/^taskqueue_/d' \
-	| sed '/^tcp_offload_listen_start$/d' \
-	| sed '/^tcp_offload_listen_stop$/d' \
-	| sed '/^ticks$/d' \
-	| sed '/^useloopback$/d' \
-	| sed '/^_Watchdog_Ticks_since_boot$/d' \
-	| sort -u > symbols.txt
-
-cat << eof > rtems-bsd-kernel-namespace.h
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
-#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
-#endif
-
-eof
-sed 's/^\(.*\)/#define	\1 _bsd_\1/' < symbols.txt >> rtems-bsd-kernel-namespace.h
-rm symbols.txt
-mv rtems-bsd-kernel-namespace.h rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
diff --git a/rtems-kern-symbols b/rtems-kern-symbols
new file mode 100755
index 00000000..3d09ae87
--- /dev/null
+++ b/rtems-kern-symbols
@@ -0,0 +1,505 @@
+#! /usr/bin/env python
+
+# SPDX-License-Identifier: BSD-2-Clause
+"""RTEMS LibBBSD Kernel Symbols
+
+Generate the symbols for the kernel headers and merge in any new ones
+"""
+
+#
+# Copyright (C) 2021 Chris Johns <chrisj@rtems.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 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.
+#
+
+from __future__ import print_function
+
+import argparse
+import os
+import re
+import sys
+
+version = "1.0"
+
+kern_objects = [
+    ( 'freebsd/sys', '.*\.o' ),
+    ( 'rtemsbsd/rtems', 'rtems-kernel-.*\.o' )
+] # yapf: disable
+
+kern_excludes = [
+    '^rtems_',
+    '^accept$',
+    '^arc4random$',
+    '^bind$',
+    '^blackhole$',
+    '^bootverbose$',
+    '^bpf_filter$',
+    '^bpf_jitter$',
+    '^bpf_jitter_enable$',
+    '^bpf_validate$',
+    '^cache_enter$',
+    '^connect$',
+    '^drop_redirect$',
+    '^drop_synfin$',
+    '^free$',
+    '^getentropy$',
+    '^getpeername$',
+    '^getsockname$',
+    '^getsockopt$',
+    '^global_epoch$',
+    '^global_epoch_preempt$',
+    '^ifqmaxlen$',
+    '^in6addr_any$',
+    '^in6addr_linklocal_allnodes$',
+    '^in6addr_loopback$',
+    '^in6addr_nodelocal_allnodes$',
+    '^in_epoch$',
+    '^kevent$',
+    '^kqueue$',
+    '^listen$',
+    '^malloc$',
+    '^max_datalen$',
+    '^max_hdr$',
+    '^max_linkhdr$',
+    '^max_protohdr$',
+    '^maxsockets$',
+    '^nd6_debug$',
+    '^nd6_delay$',
+    '^nd6_gctimer$',
+    '^nd6_maxnudhint$',
+    '^nd6_mmaxtries$',
+    '^nd6_onlink_ns_rfc4861$',
+    '^nd6_prune$',
+    '^nd6_umaxtries$',
+    '^nd6_useloopback$',
+    '^net_epoch$',
+    '^net_epoch_preempt$',
+    '^nmbclusters$',
+    '^nmbjumbo16$',
+    '^nmbjumbo9$',
+    '^nmbjumbop$',
+    '^nmbufs$',
+    '^nolocaltimewait$',
+    '^path_mtu_discovery$',
+    '^pause$',
+    '^pf_osfp_entry_pl$',
+    '^pf_osfp_pl$',
+    '^pipe$',
+    '^poll$',
+    '^pselect$',
+    '^random$',
+    '^realloc$',
+    '^reallocf$',
+    '^recvfrom$',
+    '^recvmsg$',
+    '^rtems',
+    '^select$',
+    '^sendmsg$',
+    '^sendto$',
+    '^setfib$',
+    '^setsockopt$',
+    '^shutdown$',
+    '^socket$',
+    '^socketpair$',
+    '^soreceive_stream$',
+    '^srandom$',
+    '^strdup$',
+    '^sysctlbyname$',
+    '^sysctl$',
+    '^sysctlnametomib$',
+    'sys_init',
+    '^taskqueue_',
+    '^tcp_offload_listen_start$',
+    '^tcp_offload_listen_stop$',
+    '^ticks$',
+    '^useloopback$',
+    '^_Watchdog_Ticks_since_boot$'
+] # yapf: disable
+
+kern_header = 'rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h'
+
+
+class exit(Exception):
+    """Base class for exceptions."""
+    def __init__(self, code):
+        self.code = code
+
+
+class error(Exception):
+    """Base class for exceptions."""
+    def set_output(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg
+
+
+class general_error(error):
+    """Raise for a general error."""
+    def __init__(self, what):
+        self.set_output('error: ' + str(what))
+
+
+class command:
+    def __init__(self, cmd, cwd='.'):
+        self.exit_code = 0
+        self.output = None
+        self.cmd = cmd
+        self.cwd = cwd
+        self.result = None
+
+    def run(self):
+
+        import subprocess
+
+        #
+        # Support Python 2.6
+        #
+        if "check_output" not in dir(subprocess):
+
+            def f(*popenargs, **kwargs):
+                if 'stdout' in kwargs:
+                    raise ValueError(
+                        'stdout argument not allowed, it will be overridden.')
+                process = subprocess.Popen(stdout=subprocess.PIPE,
+                                           *popenargs,
+                                           **kwargs)
+                output, unused_err = process.communicate()
+                retcode = process.poll()
+                if retcode:
+                    cmd = kwargs.get("args")
+                    if cmd is None:
+                        cmd = popenargs[0]
+                    raise subprocess.CalledProcessError(retcode, cmd)
+                return output
+
+            subprocess.check_output = f
+
+        self.exit_code = 0
+        try:
+            if os.name == 'nt':
+                cmd = ['sh', '-c'] + self.cmd
+            else:
+                cmd = self.cmd
+                output = subprocess.check_output(cmd,
+                                                 cwd=self.cwd).decode("utf-8")
+                self.output = output.split(os.linesep)
+        except subprocess.CalledProcessError as cpe:
+            self.exit_code = cpe.returncode
+            output = cpe.output.decode("utf-8")
+            self.output = output.split(os.linesep)
+        except OSError as ose:
+            cs = ' '.join(cmd)
+            if len(cs) > 80:
+                cs = cs[:80] + '...'
+            raise general_error('bootstrap failed: %s in %s: %s' % \
+                                (cs, self.cwd, (str(ose))))
+        except KeyboardInterrupt:
+            pass
+        except:
+            raise
+
+
+class kernel_symbols:
+    def __init__(self, excludes):
+        self.bsd_tag = '_bsd_'
+        self.excludes = [re.compile(exc) for exc in excludes]
+        self.bsps = {}
+        self.header = {'source': [], 'symbols': []}
+        self.output = {'source': [], 'symbols': []}
+        self.analysis = {'mapped': [], 'unmapped': [], 'new': []}
+
+    @staticmethod
+    def _find(base, spec):
+        found = []
+        filter = re.compile(spec[1])
+        for root, dirs, files in os.walk(os.path.join(base, spec[0]),
+                                         topdown=True):
+            for f in files:
+                if filter.match(f):
+                    found += [os.path.join(root, f)]
+        return found
+
+    @staticmethod
+    def _find_bsps(build):
+        bsps = []
+        filter = re.compile('^.*-rtems[0-9].*-.*')
+        with os.scandir(build) as sdir:
+            for entry in sdir:
+                if entry.is_dir() and filter.match(entry.name) != None:
+                    bsps += [entry.name]
+        return bsps
+
+    @staticmethod
+    def bsp_arch(bsp):
+        bs = bsp.split('-')
+        return bs[0] + '-' + bs[1]
+
+    def _clean(self, symbols):
+        syms = []
+        for sym in symbols:
+            add = True
+            for exclude in self.excludes:
+                if exclude.search(sym) is not None:
+                    add = False
+                    break
+            if add:
+                syms += [sym]
+        return sorted(list(set(syms)))
+
+    def load_header(self, header):
+        with open(header, 'r') as h:
+            self.header['source'] = h.read().splitlines()
+        filter = re.compile('^#define\s')
+        for line in self.header['source']:
+            if filter.match(line) != None:
+                ls = line.split()
+                if len(ls) == 3:
+                    self.header['symbols'] += [ls[1]]
+        self.header['symbols'] = self._clean(self.header['symbols'])
+
+    def load_symbols(self, specs, excludes, build, tools):
+        bsps = self._find_bsps(build)
+        for bsp in bsps:
+            self.bsps[bsp] = {'output': [], 'objects': [], 'symbols': []}
+            for spec in specs:
+                self.bsps[bsp]['objects'] += self._find(
+                    os.path.join(build, bsp), spec)
+            arch = self.bsp_arch(bsp)
+            if tools is not None:
+                cmd = os.path.join(tools, 'bin', arch + '-nm')
+            else:
+                cmd = arch + '-nm'
+            nm = command([cmd] + self.bsps[bsp]['objects'])
+            nm.run()
+            self.bsps[bsp]['output'] = nm.output
+            object = '-'
+            syms = []
+            for line in nm.output:
+                if len(line) == 0:
+                    continue
+                if line[-1] == ':':
+                    object = os.path.basename(line[:-1])
+                    continue
+                ls = line.split()
+                if len(ls) == 3:
+                    ls = ls[1:]
+                if ls[0] in ['A', 'B', 'C', 'D', 'R', 'T', 'W']:
+                    sym = ls[1]
+                    if sym.startswith(self.bsd_tag):
+                        sym = sym[len(self.bsd_tag):]
+                    if sym in syms:
+                        print('warning: duplicate symbol: %s:%s: %s (%s)' %
+                              (bsp, object, sym, ls[1]))
+                    syms += [sym]
+            self.bsps[bsp]['symbols'] += syms
+
+    def generate_header(self):
+        self.output['source'] = [
+            '/*', '* RTEMS Libbsd, this file is generated. Do not edit.', '*/',
+            '#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_',
+            '#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"',
+            '#endif', ''
+        ] + ['#define\t%s %s%s' % (sym, self.bsd_tag, sym) for sym in self.output['symbols']]
+
+    def write_header(self, header):
+        with open(header, 'wb') as o:
+            o.write(
+                os.linesep.join(self.output['source'] + ['']).encode("utf-8"))
+
+    def write_sym_data(self):
+        for bsp in self.bsps:
+            arch = self.bsp_arch(bsp)
+            with open('sym-data-' + arch + '.txt', 'w') as o:
+                o.writelines(os.linesep.join(self.bsps[bsp]['output']))
+
+    def merge(self, symbols):
+        self.output['symbols'] = \
+            self._clean(self.output['symbols'] + symbols)
+
+    def merge_bsp(self):
+        for bsp in self.bsps:
+            self.merge(self.bsps[bsp]['symbols'])
+
+    def analyse(self):
+        for bsp in self.bsps:
+            for sym in self.bsps[bsp]['symbols']:
+                if sym in self.header['symbols']:
+                    key = 'mapped'
+                else:
+                    key = 'new'
+                self.analysis[key] += [sym]
+        for key in self.analysis:
+            self.analysis[key] = self._clean(self.analysis[key])
+        self.analysis['unmapped'] = [sym for sym in self.header['symbols'] if sym not in self.analysis['mapped']]
+
+    def diff(self):
+        import difflib
+        return list(
+            difflib.unified_diff(self.header['source'], self.output['source']))
+
+    def report(self):
+        out = [
+            'Symbols:',
+            ' header   : %d' % (len(self.header['symbols'])),
+            ' mapped   : %d' % (len(self.analysis['mapped'])),
+            ' unmapped : %d' % (len(self.analysis['unmapped'])),
+            ' new      : %d' % (len(self.analysis['new']))
+        ]
+        max_len = 0
+        for bsp in self.bsps:
+            if max_len < len(bsp):
+                max_len = len(bsp)
+        out += ['BSPs: %*s Unmapped Total' % (max_len - 4, ' ')]
+        for bsp in self.bsps:
+            unmapped = len(self._clean(self.bsps[bsp]['symbols']))
+            total = len(self.bsps[bsp]['symbols'])
+            out += [' %-*s: %-8d %d' % (max_len, bsp, unmapped, total)]
+        out += ['New:'] + [' ' + sym for sym in self.analysis['new']]
+        out += ['Unmapped:'] + [' ' + sym for sym in self.analysis['unmapped']]
+        return out
+
+
+def run(args):
+    try:
+        argsp = argparse.ArgumentParser(
+            prog='rtems-kern-symbols',
+            description="RTEMS LibBSD Kernel Symbols")
+        argsp.add_argument('-t',
+                           '--rtems-tools',
+                           help='RTEMS Tools (default: %(default)s).',
+                           type=str,
+                           default=None)
+        argsp.add_argument(
+            '-w',
+            '--write',
+            action='store_true',
+            help=
+            'Write the header to the output file name (default: %(default)s).')
+        argsp.add_argument(
+            '-d',
+            '--diff',
+            action='store_true',
+            help='Show a diff if the header has changed (default: %(default)s).'
+        )
+        argsp.add_argument(
+            '-o',
+            '--output',
+            type=str,
+            default=kern_header,
+            help='output path to the write the header (default: %(default)s).')
+        argsp.add_argument(
+            '-b',
+            '--build',
+            type=str,
+            default='build',
+            help='path to the rtems libbsd build output (default: %(default)s).'
+        )
+        argsp.add_argument(
+            '-K',
+            '--kern-header',
+            type=str,
+            default=kern_header,
+            help=
+            'kernel header to load existing symbols from(default: %(default)s).'
+        )
+        argsp.add_argument(
+            '-S',
+            '--sym-data',
+            action="store_true",
+            help=
+            'Write the BSP symbol data that is parsed (default: %(default)s).')
+        argsp.add_argument(
+            '-r',
+            '--regenerate',
+            action="store_true",
+            help=
+            'Regenerate the header file from the symbols in it, write option ignored (default: %(default)s).'
+        )
+        argsp.add_argument('-R',
+                           '--report',
+                           action="store_true",
+                           help='Generate a report (default: %(default)s).')
+        argopts = argsp.parse_args(args[1:])
+
+        print('RTEMS LibBSD Kernel Symbols, %s' % (version))
+
+        if not os.path.exists(argopts.build):
+            raise general_error('path does not exist: %s' % (argopts.build))
+
+        ks = kernel_symbols(kern_excludes)
+
+        ks.load_header(argopts.kern_header)
+
+        if argopts.regenerate:
+            ks.merge(ks.header['symbols'])
+            print('Regenerating: symbols: %d: %s' %
+                  (len(ks.output['symbols']), argopts.output))
+            ks.generate_header()
+            diff = ks.diff()
+            if len(diff) == 0:
+                print('info: no changes; header not updated')
+            else:
+                print('info: writing: %s' % (argopts.output))
+                ks.write_header(argopts.output)
+            raise exit(0)
+
+        ks.load_symbols(kern_objects, kern_excludes, argopts.build,
+                        argopts.rtems_tools)
+
+        if argopts.sym_data:
+            ks.write_sym_data()
+
+        ks.analyse()
+        ks.merge(ks.header['symbols'])
+        ks.merge_bsp()
+        ks.generate_header()
+
+        diff = ks.diff()
+        if argopts.write:
+            if len(diff) == 0:
+                print('info: no changes; header not updated')
+            else:
+                print('info: writing: %s' % (argopts.output))
+                ks.write_header(argopts.output)
+
+        if argopts.report:
+            print(os.linesep.join(ks.report()))
+
+        if argopts.diff:
+            print('Diff: %d' % (len(diff)))
+            print(os.linesep.join(diff))
+
+    except general_error as gerr:
+        print(gerr)
+        print('RTEMS Kernel Symbols FAILED', file=sys.stderr)
+        sys.exit(1)
+    except KeyboardInterrupt:
+        log.notice('abort: user terminated')
+        sys.exit(1)
+    except exit as ec:
+        sys.exit(ec.code)
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    run(sys.argv)
diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
index 3300b3fd..70bcd29a 100644
--- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
@@ -1,19 +1,10 @@
+/*
+* RTEMS Libbsd, this file is generated. Do not edit.
+*/
 #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
 #error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
-#define	accept_filt_add _bsd_accept_filt_add
-#define	accept_filt_del _bsd_accept_filt_del
-#define	accept_filt_generic_mod_event _bsd_accept_filt_generic_mod_event
-#define	accept_filt_get _bsd_accept_filt_get
-#define	accept_filt_getopt _bsd_accept_filt_getopt
-#define	accept_filt_setopt _bsd_accept_filt_setopt
-#define	accept_mtx _bsd_accept_mtx
-#define	AddFragmentPtrLink _bsd_AddFragmentPtrLink
-#define	AddLink _bsd_AddLink
-#define	AddPptp _bsd_AddPptp
-#define	addrsel_policy_init _bsd_addrsel_policy_init
-#define	AddSeq _bsd_AddSeq
 #define	AES_CBC_MAC_Final _bsd_AES_CBC_MAC_Final
 #define	AES_CBC_MAC_Init _bsd_AES_CBC_MAC_Init
 #define	AES_CBC_MAC_Reinit _bsd_AES_CBC_MAC_Reinit
@@ -24,19 +15,354 @@
 #define	AES_GMAC_Reinit _bsd_AES_GMAC_Reinit
 #define	AES_GMAC_Setkey _bsd_AES_GMAC_Setkey
 #define	AES_GMAC_Update _bsd_AES_GMAC_Update
+#define	AddFragmentPtrLink _bsd_AddFragmentPtrLink
+#define	AddLink _bsd_AddLink
+#define	AddPptp _bsd_AddPptp
+#define	AddSeq _bsd_AddSeq
+#define	AliasSctpInit _bsd_AliasSctpInit
+#define	AliasSctpTerm _bsd_AliasSctpTerm
+#define	BF_decrypt _bsd_BF_decrypt
+#define	BF_ecb_encrypt _bsd_BF_ecb_encrypt
+#define	BF_encrypt _bsd_BF_encrypt
+#define	BF_set_key _bsd_BF_set_key
+#define	Camellia_DecryptBlock _bsd_Camellia_DecryptBlock
+#define	Camellia_Ekeygen _bsd_Camellia_Ekeygen
+#define	Camellia_EncryptBlock _bsd_Camellia_EncryptBlock
+#define	ClearCheckNewLink _bsd_ClearCheckNewLink
+#define	DELAY _bsd_DELAY
+#define	DifferentialChecksum _bsd_DifferentialChecksum
+#define	FindAliasAddress _bsd_FindAliasAddress
+#define	FindFragmentIn1 _bsd_FindFragmentIn1
+#define	FindFragmentIn2 _bsd_FindFragmentIn2
+#define	FindFragmentPtr _bsd_FindFragmentPtr
+#define	FindIcmpIn _bsd_FindIcmpIn
+#define	FindIcmpOut _bsd_FindIcmpOut
+#define	FindNewPortGroup _bsd_FindNewPortGroup
+#define	FindOriginalAddress _bsd_FindOriginalAddress
+#define	FindPptpInByCallId _bsd_FindPptpInByCallId
+#define	FindPptpInByPeerCallId _bsd_FindPptpInByPeerCallId
+#define	FindPptpOutByCallId _bsd_FindPptpOutByCallId
+#define	FindPptpOutByPeerCallId _bsd_FindPptpOutByPeerCallId
+#define	FindProtoIn _bsd_FindProtoIn
+#define	FindProtoOut _bsd_FindProtoOut
+#define	FindRtspOut _bsd_FindRtspOut
+#define	FindSctpRedirectAddress _bsd_FindSctpRedirectAddress
+#define	FindUdpTcpIn _bsd_FindUdpTcpIn
+#define	FindUdpTcpOut _bsd_FindUdpTcpOut
+#define	GetAckModified _bsd_GetAckModified
+#define	GetAliasAddress _bsd_GetAliasAddress
+#define	GetAliasPort _bsd_GetAliasPort
+#define	GetDefaultAliasAddress _bsd_GetDefaultAliasAddress
+#define	GetDeltaAckIn _bsd_GetDeltaAckIn
+#define	GetDeltaSeqOut _bsd_GetDeltaSeqOut
+#define	GetDestAddress _bsd_GetDestAddress
+#define	GetFragmentAddr _bsd_GetFragmentAddr
+#define	GetFragmentPtr _bsd_GetFragmentPtr
+#define	GetOriginalAddress _bsd_GetOriginalAddress
+#define	GetOriginalPort _bsd_GetOriginalPort
+#define	GetProtocolFlags _bsd_GetProtocolFlags
+#define	GetProxyAddress _bsd_GetProxyAddress
+#define	GetProxyPort _bsd_GetProxyPort
+#define	GetStateIn _bsd_GetStateIn
+#define	GetStateOut _bsd_GetStateOut
+#define	Giant _bsd_Giant
+#define	HouseKeeping _bsd_HouseKeeping
+#define	LibAliasAddServer _bsd_LibAliasAddServer
+#define	LibAliasAttachHandlers _bsd_LibAliasAttachHandlers
+#define	LibAliasCheckNewLink _bsd_LibAliasCheckNewLink
+#define	LibAliasDetachHandlers _bsd_LibAliasDetachHandlers
+#define	LibAliasFragmentIn _bsd_LibAliasFragmentIn
+#define	LibAliasGetFragment _bsd_LibAliasGetFragment
+#define	LibAliasIn _bsd_LibAliasIn
+#define	LibAliasInit _bsd_LibAliasInit
+#define	LibAliasInternetChecksum _bsd_LibAliasInternetChecksum
+#define	LibAliasOut _bsd_LibAliasOut
+#define	LibAliasOutTry _bsd_LibAliasOutTry
+#define	LibAliasProxyRule _bsd_LibAliasProxyRule
+#define	LibAliasRedirectAddr _bsd_LibAliasRedirectAddr
+#define	LibAliasRedirectDelete _bsd_LibAliasRedirectDelete
+#define	LibAliasRedirectDynamic _bsd_LibAliasRedirectDynamic
+#define	LibAliasRedirectPort _bsd_LibAliasRedirectPort
+#define	LibAliasRedirectProto _bsd_LibAliasRedirectProto
+#define	LibAliasSaveFragment _bsd_LibAliasSaveFragment
+#define	LibAliasSetAddress _bsd_LibAliasSetAddress
+#define	LibAliasSetFWBase _bsd_LibAliasSetFWBase
+#define	LibAliasSetMode _bsd_LibAliasSetMode
+#define	LibAliasSetSkinnyPort _bsd_LibAliasSetSkinnyPort
+#define	LibAliasSetTarget _bsd_LibAliasSetTarget
+#define	LibAliasUnaliasOut _bsd_LibAliasUnaliasOut
+#define	LibAliasUninit _bsd_LibAliasUninit
+#define	M_80211_CRYPTO _bsd_M_80211_CRYPTO
+#define	M_80211_MESH_GT_RT _bsd_M_80211_MESH_GT_RT
+#define	M_80211_MESH_PERR _bsd_M_80211_MESH_PERR
+#define	M_80211_MESH_PREP _bsd_M_80211_MESH_PREP
+#define	M_80211_MESH_PREQ _bsd_M_80211_MESH_PREQ
+#define	M_80211_MESH_RT _bsd_M_80211_MESH_RT
+#define	M_80211_NODE _bsd_M_80211_NODE
+#define	M_80211_NODE_IE _bsd_M_80211_NODE_IE
+#define	M_80211_RATECTL _bsd_M_80211_RATECTL
+#define	M_80211_SCAN _bsd_M_80211_SCAN
+#define	M_80211_VAP _bsd_M_80211_VAP
+#define	M_ACCF _bsd_M_ACCF
+#define	M_ALIAS _bsd_M_ALIAS
+#define	M_BPF _bsd_M_BPF
+#define	M_BPFJIT _bsd_M_BPFJIT
+#define	M_CAMSIM _bsd_M_CAMSIM
+#define	M_CRYPTO_DATA _bsd_M_CRYPTO_DATA
+#define	M_DEVBUF _bsd_M_DEVBUF
+#define	M_EVDEV _bsd_M_EVDEV
+#define	M_GIF _bsd_M_GIF
+#define	M_GRE _bsd_M_GRE
+#define	M_IFADDR _bsd_M_IFADDR
+#define	M_IFMADDR _bsd_M_IFMADDR
+#define	M_IOV _bsd_M_IOV
+#define	M_IP6MADDR _bsd_M_IP6MADDR
+#define	M_IP6NDP _bsd_M_IP6NDP
+#define	M_IPSEC_INPCB _bsd_M_IPSEC_INPCB
+#define	M_IPSEC_MISC _bsd_M_IPSEC_MISC
+#define	M_IPSEC_SA _bsd_M_IPSEC_SA
+#define	M_IPSEC_SAH _bsd_M_IPSEC_SAH
+#define	M_IPSEC_SAQ _bsd_M_IPSEC_SAQ
+#define	M_IPSEC_SAR _bsd_M_IPSEC_SAR
+#define	M_IPSEC_SP _bsd_M_IPSEC_SP
+#define	M_IPSEC_SPDCACHE _bsd_M_IPSEC_SPDCACHE
+#define	M_IPSEC_SR _bsd_M_IPSEC_SR
+#define	M_LLTABLE _bsd_M_LLTABLE
+#define	M_NVME _bsd_M_NVME
+#define	M_OFWPROP _bsd_M_OFWPROP
+#define	M_PCB _bsd_M_PCB
+#define	M_PFHASH _bsd_M_PFHASH
+#define	M_RTABLE _bsd_M_RTABLE
+#define	M_RTWN_PRIV _bsd_M_RTWN_PRIV
+#define	M_SONAME _bsd_M_SONAME
+#define	M_TAP _bsd_M_TAP
+#define	M_TCPFUNCTIONS _bsd_M_TCPFUNCTIONS
+#define	M_TCPLOG _bsd_M_TCPLOG
+#define	M_TEMP _bsd_M_TEMP
+#define	M_USB _bsd_M_USB
+#define	M_USBDEV _bsd_M_USBDEV
+#define	M_XDATA _bsd_M_XDATA
+#define	OF_call_method _bsd_OF_call_method
+#define	OF_canon _bsd_OF_canon
+#define	OF_child _bsd_OF_child
+#define	OF_claim _bsd_OF_claim
+#define	OF_close _bsd_OF_close
+#define	OF_device_from_xref _bsd_OF_device_from_xref
+#define	OF_device_register_xref _bsd_OF_device_register_xref
+#define	OF_enter _bsd_OF_enter
+#define	OF_exit _bsd_OF_exit
+#define	OF_finddevice _bsd_OF_finddevice
+#define	OF_getencprop _bsd_OF_getencprop
+#define	OF_getencprop_alloc _bsd_OF_getencprop_alloc
+#define	OF_getencprop_alloc_multi _bsd_OF_getencprop_alloc_multi
+#define	OF_getprop _bsd_OF_getprop
+#define	OF_getprop_alloc _bsd_OF_getprop_alloc
+#define	OF_getprop_alloc_multi _bsd_OF_getprop_alloc_multi
+#define	OF_getproplen _bsd_OF_getproplen
+#define	OF_hasprop _bsd_OF_hasprop
+#define	OF_init _bsd_OF_init
+#define	OF_install _bsd_OF_install
+#define	OF_instance_to_package _bsd_OF_instance_to_package
+#define	OF_instance_to_path _bsd_OF_instance_to_path
+#define	OF_interpret _bsd_OF_interpret
+#define	OF_nextprop _bsd_OF_nextprop
+#define	OF_node_from_xref _bsd_OF_node_from_xref
+#define	OF_open _bsd_OF_open
+#define	OF_package_to_path _bsd_OF_package_to_path
+#define	OF_parent _bsd_OF_parent
+#define	OF_peer _bsd_OF_peer
+#define	OF_printf _bsd_OF_printf
+#define	OF_prop_free _bsd_OF_prop_free
+#define	OF_read _bsd_OF_read
+#define	OF_release _bsd_OF_release
+#define	OF_searchencprop _bsd_OF_searchencprop
+#define	OF_searchprop _bsd_OF_searchprop
+#define	OF_seek _bsd_OF_seek
+#define	OF_setprop _bsd_OF_setprop
+#define	OF_test _bsd_OF_test
+#define	OF_write _bsd_OF_write
+#define	OF_xref_from_device _bsd_OF_xref_from_device
+#define	OF_xref_from_node _bsd_OF_xref_from_node
+#define	PFI_MTYPE _bsd_PFI_MTYPE
+#define	Poly1305_Final _bsd_Poly1305_Final
+#define	Poly1305_Init _bsd_Poly1305_Init
+#define	Poly1305_Setkey _bsd_Poly1305_Setkey
+#define	Poly1305_Update _bsd_Poly1305_Update
+#define	ProxyCheck _bsd_ProxyCheck
+#define	ProxyModify _bsd_ProxyModify
+#define	RMD160Final _bsd_RMD160Final
+#define	RMD160Init _bsd_RMD160Init
+#define	RMD160Transform _bsd_RMD160Transform
+#define	RMD160Update _bsd_RMD160Update
+#define	SCTP6_ARE_ADDR_EQUAL _bsd_SCTP6_ARE_ADDR_EQUAL
+#define	SCTP_M_ASC_ADDR _bsd_SCTP_M_ASC_ADDR
+#define	SCTP_M_ASC_IT _bsd_SCTP_M_ASC_IT
+#define	SCTP_M_AUTH_CL _bsd_SCTP_M_AUTH_CL
+#define	SCTP_M_AUTH_HL _bsd_SCTP_M_AUTH_HL
+#define	SCTP_M_AUTH_IF _bsd_SCTP_M_AUTH_IF
+#define	SCTP_M_AUTH_KY _bsd_SCTP_M_AUTH_KY
+#define	SCTP_M_CMSG _bsd_SCTP_M_CMSG
+#define	SCTP_M_COPYAL _bsd_SCTP_M_COPYAL
+#define	SCTP_M_IFA _bsd_SCTP_M_IFA
+#define	SCTP_M_IFN _bsd_SCTP_M_IFN
+#define	SCTP_M_ITER _bsd_SCTP_M_ITER
+#define	SCTP_M_MAP _bsd_SCTP_M_MAP
+#define	SCTP_M_MCORE _bsd_SCTP_M_MCORE
+#define	SCTP_M_MVRF _bsd_SCTP_M_MVRF
+#define	SCTP_M_SOCKOPT _bsd_SCTP_M_SOCKOPT
+#define	SCTP_M_STRESET _bsd_SCTP_M_STRESET
+#define	SCTP_M_STRMI _bsd_SCTP_M_STRMI
+#define	SCTP_M_STRMO _bsd_SCTP_M_STRMO
+#define	SCTP_M_TIMW _bsd_SCTP_M_TIMW
+#define	SCTP_M_VRF _bsd_SCTP_M_VRF
+#define	SHA256_Final _bsd_SHA256_Final
+#define	SHA256_Init _bsd_SHA256_Init
+#define	SHA256_Update _bsd_SHA256_Update
+#define	SHA384_Final _bsd_SHA384_Final
+#define	SHA384_Init _bsd_SHA384_Init
+#define	SHA384_Update _bsd_SHA384_Update
+#define	SHA512_Final _bsd_SHA512_Final
+#define	SHA512_Init _bsd_SHA512_Init
+#define	SHA512_Update _bsd_SHA512_Update
+#define	SKEIN1024_IV_1024 _bsd_SKEIN1024_IV_1024
+#define	SKEIN1024_IV_384 _bsd_SKEIN1024_IV_384
+#define	SKEIN1024_IV_512 _bsd_SKEIN1024_IV_512
+#define	SKEIN_256_IV_128 _bsd_SKEIN_256_IV_128
+#define	SKEIN_256_IV_160 _bsd_SKEIN_256_IV_160
+#define	SKEIN_256_IV_224 _bsd_SKEIN_256_IV_224
+#define	SKEIN_256_IV_256 _bsd_SKEIN_256_IV_256
+#define	SKEIN_512_IV_128 _bsd_SKEIN_512_IV_128
+#define	SKEIN_512_IV_160 _bsd_SKEIN_512_IV_160
+#define	SKEIN_512_IV_224 _bsd_SKEIN_512_IV_224
+#define	SKEIN_512_IV_256 _bsd_SKEIN_512_IV_256
+#define	SKEIN_512_IV_384 _bsd_SKEIN_512_IV_384
+#define	SKEIN_512_IV_512 _bsd_SKEIN_512_IV_512
+#define	SctpAlias _bsd_SctpAlias
+#define	SctpShowAliasStats _bsd_SctpShowAliasStats
+#define	SetAckModified _bsd_SetAckModified
+#define	SetDefaultAliasAddress _bsd_SetDefaultAliasAddress
+#define	SetDestCallId _bsd_SetDestCallId
+#define	SetExpire _bsd_SetExpire
+#define	SetFragmentAddr _bsd_SetFragmentAddr
+#define	SetFragmentPtr _bsd_SetFragmentPtr
+#define	SetProtocolFlags _bsd_SetProtocolFlags
+#define	SetProxyAddress _bsd_SetProxyAddress
+#define	SetProxyPort _bsd_SetProxyPort
+#define	SetStateIn _bsd_SetStateIn
+#define	SetStateOut _bsd_SetStateOut
+#define	SipHashX _bsd_SipHashX
+#define	SipHash_End _bsd_SipHash_End
+#define	SipHash_Final _bsd_SipHash_Final
+#define	SipHash_InitX _bsd_SipHash_InitX
+#define	SipHash_SetKey _bsd_SipHash_SetKey
+#define	SipHash_Update _bsd_SipHash_Update
+#define	Skein1024_Final _bsd_Skein1024_Final
+#define	Skein1024_Final_Pad _bsd_Skein1024_Final_Pad
+#define	Skein1024_Init _bsd_Skein1024_Init
+#define	Skein1024_InitExt _bsd_Skein1024_InitExt
+#define	Skein1024_Output _bsd_Skein1024_Output
+#define	Skein1024_Process_Block _bsd_Skein1024_Process_Block
+#define	Skein1024_Update _bsd_Skein1024_Update
+#define	Skein_256_Final _bsd_Skein_256_Final
+#define	Skein_256_Final_Pad _bsd_Skein_256_Final_Pad
+#define	Skein_256_Init _bsd_Skein_256_Init
+#define	Skein_256_InitExt _bsd_Skein_256_InitExt
+#define	Skein_256_Output _bsd_Skein_256_Output
+#define	Skein_256_Process_Block _bsd_Skein_256_Process_Block
+#define	Skein_256_Update _bsd_Skein_256_Update
+#define	Skein_512_Final _bsd_Skein_512_Final
+#define	Skein_512_Final_Pad _bsd_Skein_512_Final_Pad
+#define	Skein_512_Init _bsd_Skein_512_Init
+#define	Skein_512_InitExt _bsd_Skein_512_InitExt
+#define	Skein_512_Output _bsd_Skein_512_Output
+#define	Skein_512_Process_Block _bsd_Skein_512_Process_Block
+#define	Skein_512_Update _bsd_Skein_512_Update
+#define	TB_DRAIN_WAITER _bsd_TB_DRAIN_WAITER
+#define	X_ip6_mforward _bsd_X_ip6_mforward
+#define	X_ip6_mrouter_done _bsd_X_ip6_mrouter_done
+#define	X_ip6_mrouter_get _bsd_X_ip6_mrouter_get
+#define	X_ip6_mrouter_set _bsd_X_ip6_mrouter_set
+#define	X_mrt6_ioctl _bsd_X_mrt6_ioctl
+#define	_callout_init_lock _bsd__callout_init_lock
+#define	_callout_stop_safe _bsd__callout_stop_safe
+#define	_ck_epoch_addref _bsd__ck_epoch_addref
+#define	_ck_epoch_delref _bsd__ck_epoch_delref
+#define	_crypto_onetimeauth_poly1305_pick_best_implementation _bsd__crypto_onetimeauth_poly1305_pick_best_implementation
+#define	_cv_timedwait_sbt _bsd__cv_timedwait_sbt
+#define	_cv_wait _bsd__cv_wait
+#define	_cv_wait_sig _bsd__cv_wait_sig
+#define	_cv_wait_unlock _bsd__cv_wait_unlock
+#define	_libmd_SHA224_Final _bsd__libmd_SHA224_Final
+#define	_libmd_SHA224_Init _bsd__libmd_SHA224_Init
+#define	_libmd_SHA224_Update _bsd__libmd_SHA224_Update
+#define	_libmd_SHA512_224_Final _bsd__libmd_SHA512_224_Final
+#define	_libmd_SHA512_224_Init _bsd__libmd_SHA512_224_Init
+#define	_libmd_SHA512_224_Update _bsd__libmd_SHA512_224_Update
+#define	_libmd_SHA512_256_Final _bsd__libmd_SHA512_256_Final
+#define	_libmd_SHA512_256_Init _bsd__libmd_SHA512_256_Init
+#define	_libmd_SHA512_256_Update _bsd__libmd_SHA512_256_Update
+#define	_libmd_SKEIN1024_Final _bsd__libmd_SKEIN1024_Final
+#define	_libmd_SKEIN1024_Init _bsd__libmd_SKEIN1024_Init
+#define	_libmd_SKEIN1024_Update _bsd__libmd_SKEIN1024_Update
+#define	_libmd_SKEIN256_Final _bsd__libmd_SKEIN256_Final
+#define	_libmd_SKEIN256_Init _bsd__libmd_SKEIN256_Init
+#define	_libmd_SKEIN256_Update _bsd__libmd_SKEIN256_Update
+#define	_libmd_SKEIN512_Final _bsd__libmd_SKEIN512_Final
+#define	_libmd_SKEIN512_Init _bsd__libmd_SKEIN512_Init
+#define	_libmd_SKEIN512_Update _bsd__libmd_SKEIN512_Update
+#define	_mtx_lock_flags _bsd__mtx_lock_flags
+#define	_mtx_unlock_flags _bsd__mtx_unlock_flags
+#define	_rw_downgrade _bsd__rw_downgrade
+#define	_rw_rlock _bsd__rw_rlock
+#define	_rw_runlock _bsd__rw_runlock
+#define	_rw_try_rlock _bsd__rw_try_rlock
+#define	_rw_try_upgrade _bsd__rw_try_upgrade
+#define	_rw_try_wlock _bsd__rw_try_wlock
+#define	_rw_wlock _bsd__rw_wlock
+#define	_rw_wunlock _bsd__rw_wunlock
+#define	_sleep _bsd__sleep
+#define	_start_set_crypto_set _bsd__start_set_crypto_set
+#define	_start_set_ieee80211_ioctl_getset _bsd__start_set_ieee80211_ioctl_getset
+#define	_start_set_ieee80211_ioctl_setset _bsd__start_set_ieee80211_ioctl_setset
+#define	_start_set_kbddriver_set _bsd__start_set_kbddriver_set
+#define	_start_set_modmetadata_set _bsd__start_set_modmetadata_set
+#define	_start_set_nexus _bsd__start_set_nexus
+#define	_start_set_ratectl_set _bsd__start_set_ratectl_set
+#define	_start_set_scanner_set _bsd__start_set_scanner_set
+#define	_start_set_sysctl_set _bsd__start_set_sysctl_set
+#define	_start_set_sysinit_set _bsd__start_set_sysinit_set
+#define	_stop_set_crypto_set _bsd__stop_set_crypto_set
+#define	_stop_set_ieee80211_ioctl_getset _bsd__stop_set_ieee80211_ioctl_getset
+#define	_stop_set_ieee80211_ioctl_setset _bsd__stop_set_ieee80211_ioctl_setset
+#define	_stop_set_kbddriver_set _bsd__stop_set_kbddriver_set
+#define	_stop_set_modmetadata_set _bsd__stop_set_modmetadata_set
+#define	_stop_set_nexus _bsd__stop_set_nexus
+#define	_stop_set_ratectl_set _bsd__stop_set_ratectl_set
+#define	_stop_set_scanner_set _bsd__stop_set_scanner_set
+#define	_stop_set_sysctl_set _bsd__stop_set_sysctl_set
+#define	_stop_set_sysinit_set _bsd__stop_set_sysinit_set
+#define	_sx_slock_int _bsd__sx_slock_int
+#define	_sx_sunlock_int _bsd__sx_sunlock_int
+#define	_timeout_task_init _bsd__timeout_task_init
+#define	accept_filt_add _bsd_accept_filt_add
+#define	accept_filt_del _bsd_accept_filt_del
+#define	accept_filt_generic_mod_event _bsd_accept_filt_generic_mod_event
+#define	accept_filt_get _bsd_accept_filt_get
+#define	accept_filt_getopt _bsd_accept_filt_getopt
+#define	accept_filt_setopt _bsd_accept_filt_setopt
+#define	accept_mtx _bsd_accept_mtx
+#define	addrsel_policy_init _bsd_addrsel_policy_init
 #define	ah_cleartos _bsd_ah_cleartos
 #define	ah_enable _bsd_ah_enable
 #define	ah_hdrsiz _bsd_ah_hdrsiz
 #define	ah_init0 _bsd_ah_init0
-#define	ahstat _bsd_ahstat
 #define	ah_zeroize _bsd_ah_zeroize
+#define	ahstat _bsd_ahstat
 #define	aio_swake _bsd_aio_swake
-#define	AliasSctpInit _bsd_AliasSctpInit
-#define	AliasSctpTerm _bsd_AliasSctpTerm
 #define	alloc_unr _bsd_alloc_unr
 #define	alloc_unr64 _bsd_alloc_unr64
-#define	alloc_unrl _bsd_alloc_unrl
 #define	alloc_unr_specific _bsd_alloc_unr_specific
+#define	alloc_unrl _bsd_alloc_unrl
 #define	altq_add _bsd_altq_add
 #define	altq_add_queue _bsd_altq_add_queue
 #define	altq_attach _bsd_altq_attach
@@ -99,12 +425,12 @@
 #define	bce_COM_b06FwRodata _bsd_bce_COM_b06FwRodata
 #define	bce_COM_b06FwRodataAddr _bsd_bce_COM_b06FwRodataAddr
 #define	bce_COM_b06FwRodataLen _bsd_bce_COM_b06FwRodataLen
+#define	bce_COM_b06FwSDataAddr _bsd_bce_COM_b06FwSDataAddr
+#define	bce_COM_b06FwSDataLen _bsd_bce_COM_b06FwSDataLen
 #define	bce_COM_b06FwSbss _bsd_bce_COM_b06FwSbss
 #define	bce_COM_b06FwSbssAddr _bsd_bce_COM_b06FwSbssAddr
 #define	bce_COM_b06FwSbssLen _bsd_bce_COM_b06FwSbssLen
 #define	bce_COM_b06FwSdata _bsd_bce_COM_b06FwSdata
-#define	bce_COM_b06FwSDataAddr _bsd_bce_COM_b06FwSDataAddr
-#define	bce_COM_b06FwSDataLen _bsd_bce_COM_b06FwSDataLen
 #define	bce_COM_b06FwStartAddr _bsd_bce_COM_b06FwStartAddr
 #define	bce_COM_b06FwText _bsd_bce_COM_b06FwText
 #define	bce_COM_b06FwTextAddr _bsd_bce_COM_b06FwTextAddr
@@ -121,12 +447,12 @@
 #define	bce_COM_b09FwRodata _bsd_bce_COM_b09FwRodata
 #define	bce_COM_b09FwRodataAddr _bsd_bce_COM_b09FwRodataAddr
 #define	bce_COM_b09FwRodataLen _bsd_bce_COM_b09FwRodataLen
+#define	bce_COM_b09FwSDataAddr _bsd_bce_COM_b09FwSDataAddr
+#define	bce_COM_b09FwSDataLen _bsd_bce_COM_b09FwSDataLen
 #define	bce_COM_b09FwSbss _bsd_bce_COM_b09FwSbss
 #define	bce_COM_b09FwSbssAddr _bsd_bce_COM_b09FwSbssAddr
 #define	bce_COM_b09FwSbssLen _bsd_bce_COM_b09FwSbssLen
 #define	bce_COM_b09FwSdata _bsd_bce_COM_b09FwSdata
-#define	bce_COM_b09FwSDataAddr _bsd_bce_COM_b09FwSDataAddr
-#define	bce_COM_b09FwSDataLen _bsd_bce_COM_b09FwSDataLen
 #define	bce_COM_b09FwStartAddr _bsd_bce_COM_b09FwStartAddr
 #define	bce_COM_b09FwText _bsd_bce_COM_b09FwText
 #define	bce_COM_b09FwTextAddr _bsd_bce_COM_b09FwTextAddr
@@ -143,12 +469,12 @@
 #define	bce_CP_b06FwRodata _bsd_bce_CP_b06FwRodata
 #define	bce_CP_b06FwRodataAddr _bsd_bce_CP_b06FwRodataAddr
 #define	bce_CP_b06FwRodataLen _bsd_bce_CP_b06FwRodataLen
+#define	bce_CP_b06FwSDataAddr _bsd_bce_CP_b06FwSDataAddr
+#define	bce_CP_b06FwSDataLen _bsd_bce_CP_b06FwSDataLen
 #define	bce_CP_b06FwSbss _bsd_bce_CP_b06FwSbss
 #define	bce_CP_b06FwSbssAddr _bsd_bce_CP_b06FwSbssAddr
 #define	bce_CP_b06FwSbssLen _bsd_bce_CP_b06FwSbssLen
 #define	bce_CP_b06FwSdata _bsd_bce_CP_b06FwSdata
-#define	bce_CP_b06FwSDataAddr _bsd_bce_CP_b06FwSDataAddr
-#define	bce_CP_b06FwSDataLen _bsd_bce_CP_b06FwSDataLen
 #define	bce_CP_b06FwStartAddr _bsd_bce_CP_b06FwStartAddr
 #define	bce_CP_b06FwText _bsd_bce_CP_b06FwText
 #define	bce_CP_b06FwTextAddr _bsd_bce_CP_b06FwTextAddr
@@ -165,18 +491,16 @@
 #define	bce_CP_b09FwRodata _bsd_bce_CP_b09FwRodata
 #define	bce_CP_b09FwRodataAddr _bsd_bce_CP_b09FwRodataAddr
 #define	bce_CP_b09FwRodataLen _bsd_bce_CP_b09FwRodataLen
+#define	bce_CP_b09FwSDataAddr _bsd_bce_CP_b09FwSDataAddr
+#define	bce_CP_b09FwSDataLen _bsd_bce_CP_b09FwSDataLen
 #define	bce_CP_b09FwSbss _bsd_bce_CP_b09FwSbss
 #define	bce_CP_b09FwSbssAddr _bsd_bce_CP_b09FwSbssAddr
 #define	bce_CP_b09FwSbssLen _bsd_bce_CP_b09FwSbssLen
 #define	bce_CP_b09FwSdata _bsd_bce_CP_b09FwSdata
-#define	bce_CP_b09FwSDataAddr _bsd_bce_CP_b09FwSDataAddr
-#define	bce_CP_b09FwSDataLen _bsd_bce_CP_b09FwSDataLen
 #define	bce_CP_b09FwStartAddr _bsd_bce_CP_b09FwStartAddr
 #define	bce_CP_b09FwText _bsd_bce_CP_b09FwText
 #define	bce_CP_b09FwTextAddr _bsd_bce_CP_b09FwTextAddr
 #define	bce_CP_b09FwTextLen _bsd_bce_CP_b09FwTextLen
-#define	bce_rv2p_proc1 _bsd_bce_rv2p_proc1
-#define	bce_rv2p_proc2 _bsd_bce_rv2p_proc2
 #define	bce_RXP_b06FwBss _bsd_bce_RXP_b06FwBss
 #define	bce_RXP_b06FwBssAddr _bsd_bce_RXP_b06FwBssAddr
 #define	bce_RXP_b06FwBssLen _bsd_bce_RXP_b06FwBssLen
@@ -189,12 +513,12 @@
 #define	bce_RXP_b06FwRodata _bsd_bce_RXP_b06FwRodata
 #define	bce_RXP_b06FwRodataAddr _bsd_bce_RXP_b06FwRodataAddr
 #define	bce_RXP_b06FwRodataLen _bsd_bce_RXP_b06FwRodataLen
+#define	bce_RXP_b06FwSDataAddr _bsd_bce_RXP_b06FwSDataAddr
+#define	bce_RXP_b06FwSDataLen _bsd_bce_RXP_b06FwSDataLen
 #define	bce_RXP_b06FwSbss _bsd_bce_RXP_b06FwSbss
 #define	bce_RXP_b06FwSbssAddr _bsd_bce_RXP_b06FwSbssAddr
 #define	bce_RXP_b06FwSbssLen _bsd_bce_RXP_b06FwSbssLen
 #define	bce_RXP_b06FwSdata _bsd_bce_RXP_b06FwSdata
-#define	bce_RXP_b06FwSDataAddr _bsd_bce_RXP_b06FwSDataAddr
-#define	bce_RXP_b06FwSDataLen _bsd_bce_RXP_b06FwSDataLen
 #define	bce_RXP_b06FwStartAddr _bsd_bce_RXP_b06FwStartAddr
 #define	bce_RXP_b06FwText _bsd_bce_RXP_b06FwText
 #define	bce_RXP_b06FwTextAddr _bsd_bce_RXP_b06FwTextAddr
@@ -211,12 +535,12 @@
 #define	bce_RXP_b09FwRodata _bsd_bce_RXP_b09FwRodata
 #define	bce_RXP_b09FwRodataAddr _bsd_bce_RXP_b09FwRodataAddr
 #define	bce_RXP_b09FwRodataLen _bsd_bce_RXP_b09FwRodataLen
+#define	bce_RXP_b09FwSDataAddr _bsd_bce_RXP_b09FwSDataAddr
+#define	bce_RXP_b09FwSDataLen _bsd_bce_RXP_b09FwSDataLen
 #define	bce_RXP_b09FwSbss _bsd_bce_RXP_b09FwSbss
 #define	bce_RXP_b09FwSbssAddr _bsd_bce_RXP_b09FwSbssAddr
 #define	bce_RXP_b09FwSbssLen _bsd_bce_RXP_b09FwSbssLen
 #define	bce_RXP_b09FwSdata _bsd_bce_RXP_b09FwSdata
-#define	bce_RXP_b09FwSDataAddr _bsd_bce_RXP_b09FwSDataAddr
-#define	bce_RXP_b09FwSDataLen _bsd_bce_RXP_b09FwSDataLen
 #define	bce_RXP_b09FwStartAddr _bsd_bce_RXP_b09FwStartAddr
 #define	bce_RXP_b09FwText _bsd_bce_RXP_b09FwText
 #define	bce_RXP_b09FwTextAddr _bsd_bce_RXP_b09FwTextAddr
@@ -233,12 +557,12 @@
 #define	bce_TPAT_b06FwRodata _bsd_bce_TPAT_b06FwRodata
 #define	bce_TPAT_b06FwRodataAddr _bsd_bce_TPAT_b06FwRodataAddr
 #define	bce_TPAT_b06FwRodataLen _bsd_bce_TPAT_b06FwRodataLen
+#define	bce_TPAT_b06FwSDataAddr _bsd_bce_TPAT_b06FwSDataAddr
+#define	bce_TPAT_b06FwSDataLen _bsd_bce_TPAT_b06FwSDataLen
 #define	bce_TPAT_b06FwSbss _bsd_bce_TPAT_b06FwSbss
 #define	bce_TPAT_b06FwSbssAddr _bsd_bce_TPAT_b06FwSbssAddr
 #define	bce_TPAT_b06FwSbssLen _bsd_bce_TPAT_b06FwSbssLen
 #define	bce_TPAT_b06FwSdata _bsd_bce_TPAT_b06FwSdata
-#define	bce_TPAT_b06FwSDataAddr _bsd_bce_TPAT_b06FwSDataAddr
-#define	bce_TPAT_b06FwSDataLen _bsd_bce_TPAT_b06FwSDataLen
 #define	bce_TPAT_b06FwStartAddr _bsd_bce_TPAT_b06FwStartAddr
 #define	bce_TPAT_b06FwText _bsd_bce_TPAT_b06FwText
 #define	bce_TPAT_b06FwTextAddr _bsd_bce_TPAT_b06FwTextAddr
@@ -255,12 +579,12 @@
 #define	bce_TPAT_b09FwRodata _bsd_bce_TPAT_b09FwRodata
 #define	bce_TPAT_b09FwRodataAddr _bsd_bce_TPAT_b09FwRodataAddr
 #define	bce_TPAT_b09FwRodataLen _bsd_bce_TPAT_b09FwRodataLen
+#define	bce_TPAT_b09FwSDataAddr _bsd_bce_TPAT_b09FwSDataAddr
+#define	bce_TPAT_b09FwSDataLen _bsd_bce_TPAT_b09FwSDataLen
 #define	bce_TPAT_b09FwSbss _bsd_bce_TPAT_b09FwSbss
 #define	bce_TPAT_b09FwSbssAddr _bsd_bce_TPAT_b09FwSbssAddr
 #define	bce_TPAT_b09FwSbssLen _bsd_bce_TPAT_b09FwSbssLen
 #define	bce_TPAT_b09FwSdata _bsd_bce_TPAT_b09FwSdata
-#define	bce_TPAT_b09FwSDataAddr _bsd_bce_TPAT_b09FwSDataAddr
-#define	bce_TPAT_b09FwSDataLen _bsd_bce_TPAT_b09FwSDataLen
 #define	bce_TPAT_b09FwStartAddr _bsd_bce_TPAT_b09FwStartAddr
 #define	bce_TPAT_b09FwText _bsd_bce_TPAT_b09FwText
 #define	bce_TPAT_b09FwTextAddr _bsd_bce_TPAT_b09FwTextAddr
@@ -277,12 +601,12 @@
 #define	bce_TXP_b06FwRodata _bsd_bce_TXP_b06FwRodata
 #define	bce_TXP_b06FwRodataAddr _bsd_bce_TXP_b06FwRodataAddr
 #define	bce_TXP_b06FwRodataLen _bsd_bce_TXP_b06FwRodataLen
+#define	bce_TXP_b06FwSDataAddr _bsd_bce_TXP_b06FwSDataAddr
+#define	bce_TXP_b06FwSDataLen _bsd_bce_TXP_b06FwSDataLen
 #define	bce_TXP_b06FwSbss _bsd_bce_TXP_b06FwSbss
 #define	bce_TXP_b06FwSbssAddr _bsd_bce_TXP_b06FwSbssAddr
 #define	bce_TXP_b06FwSbssLen _bsd_bce_TXP_b06FwSbssLen
 #define	bce_TXP_b06FwSdata _bsd_bce_TXP_b06FwSdata
-#define	bce_TXP_b06FwSDataAddr _bsd_bce_TXP_b06FwSDataAddr
-#define	bce_TXP_b06FwSDataLen _bsd_bce_TXP_b06FwSDataLen
 #define	bce_TXP_b06FwStartAddr _bsd_bce_TXP_b06FwStartAddr
 #define	bce_TXP_b06FwText _bsd_bce_TXP_b06FwText
 #define	bce_TXP_b06FwTextAddr _bsd_bce_TXP_b06FwTextAddr
@@ -299,26 +623,24 @@
 #define	bce_TXP_b09FwRodata _bsd_bce_TXP_b09FwRodata
 #define	bce_TXP_b09FwRodataAddr _bsd_bce_TXP_b09FwRodataAddr
 #define	bce_TXP_b09FwRodataLen _bsd_bce_TXP_b09FwRodataLen
+#define	bce_TXP_b09FwSDataAddr _bsd_bce_TXP_b09FwSDataAddr
+#define	bce_TXP_b09FwSDataLen _bsd_bce_TXP_b09FwSDataLen
 #define	bce_TXP_b09FwSbss _bsd_bce_TXP_b09FwSbss
 #define	bce_TXP_b09FwSbssAddr _bsd_bce_TXP_b09FwSbssAddr
 #define	bce_TXP_b09FwSbssLen _bsd_bce_TXP_b09FwSbssLen
 #define	bce_TXP_b09FwSdata _bsd_bce_TXP_b09FwSdata
-#define	bce_TXP_b09FwSDataAddr _bsd_bce_TXP_b09FwSDataAddr
-#define	bce_TXP_b09FwSDataLen _bsd_bce_TXP_b09FwSDataLen
 #define	bce_TXP_b09FwStartAddr _bsd_bce_TXP_b09FwStartAddr
 #define	bce_TXP_b09FwText _bsd_bce_TXP_b09FwText
 #define	bce_TXP_b09FwTextAddr _bsd_bce_TXP_b09FwTextAddr
 #define	bce_TXP_b09FwTextLen _bsd_bce_TXP_b09FwTextLen
+#define	bce_rv2p_proc1 _bsd_bce_rv2p_proc1
+#define	bce_rv2p_proc2 _bsd_bce_rv2p_proc2
 #define	bce_xi90_rv2p_proc1 _bsd_bce_xi90_rv2p_proc1
 #define	bce_xi90_rv2p_proc2 _bsd_bce_xi90_rv2p_proc2
 #define	bce_xi_rv2p_proc1 _bsd_bce_xi_rv2p_proc1
 #define	bce_xi_rv2p_proc2 _bsd_bce_xi_rv2p_proc2
 #define	be_uuid_dec _bsd_be_uuid_dec
 #define	be_uuid_enc _bsd_be_uuid_enc
-#define	BF_decrypt _bsd_BF_decrypt
-#define	BF_ecb_encrypt _bsd_BF_ecb_encrypt
-#define	BF_encrypt _bsd_BF_encrypt
-#define	BF_set_key _bsd_BF_set_key
 #define	bin2bcd_data _bsd_bin2bcd_data
 #define	blake2b_final_ref _bsd_blake2b_final_ref
 #define	blake2b_init_key_ref _bsd_blake2b_init_key_ref
@@ -340,8 +662,6 @@
 #define	blist_free _bsd_blist_free
 #define	blist_resize _bsd_blist_resize
 #define	blist_stats _bsd_blist_stats
-#define	bpfattach _bsd_bpfattach
-#define	bpfattach2 _bsd_bpfattach2
 #define	bpf_buffer_append_bytes _bsd_bpf_buffer_append_bytes
 #define	bpf_buffer_append_mbuf _bsd_bpf_buffer_append_mbuf
 #define	bpf_buffer_free _bsd_bpf_buffer_free
@@ -350,12 +670,14 @@
 #define	bpf_buffer_uiomove _bsd_bpf_buffer_uiomove
 #define	bpf_bufheld _bsd_bpf_bufheld
 #define	bpf_destroy_jit_filter _bsd_bpf_destroy_jit_filter
-#define	bpfdetach _bsd_bpfdetach
 #define	bpf_ifdetach_cookie _bsd_bpf_ifdetach_cookie
 #define	bpf_maxinsns _bsd_bpf_maxinsns
 #define	bpf_mtap _bsd_bpf_mtap
 #define	bpf_mtap2 _bsd_bpf_mtap2
 #define	bpf_tap _bsd_bpf_tap
+#define	bpfattach _bsd_bpfattach
+#define	bpfattach2 _bsd_bpfattach2
+#define	bpfdetach _bsd_bpfdetach
 #define	bridge_control_table _bsd_bridge_control_table
 #define	bridge_control_table_size _bsd_bridge_control_table_size
 #define	bridge_dn_p _bsd_bridge_dn_p
@@ -404,7 +726,8 @@
 #define	bus_delayed_attach_children _bsd_bus_delayed_attach_children
 #define	bus_delete_resource _bsd_bus_delete_resource
 #define	bus_describe_intr _bsd_bus_describe_intr
-#define	busdma_lock_mutex _bsd_busdma_lock_mutex
+#define	bus_dma_tag_create _bsd_bus_dma_tag_create
+#define	bus_dma_tag_destroy _bsd_bus_dma_tag_destroy
 #define	bus_dmamap_create _bsd_bus_dmamap_create
 #define	bus_dmamap_destroy _bsd_bus_dmamap_destroy
 #define	bus_dmamap_load _bsd_bus_dmamap_load
@@ -415,8 +738,6 @@
 #define	bus_dmamap_unload _bsd_bus_dmamap_unload
 #define	bus_dmamem_alloc _bsd_bus_dmamem_alloc
 #define	bus_dmamem_free _bsd_bus_dmamem_free
-#define	bus_dma_tag_create _bsd_bus_dma_tag_create
-#define	bus_dma_tag_destroy _bsd_bus_dma_tag_destroy
 #define	bus_enumerate_hinted_children _bsd_bus_enumerate_hinted_children
 #define	bus_generic_activate_resource _bsd_bus_generic_activate_resource
 #define	bus_generic_add_child _bsd_bus_generic_add_child
@@ -480,29 +801,15 @@
 #define	bus_suspend_intr _bsd_bus_suspend_intr
 #define	bus_teardown_intr _bsd_bus_teardown_intr
 #define	bus_unmap_resource _bsd_bus_unmap_resource
+#define	busdma_lock_mutex _bsd_busdma_lock_mutex
 #define	calculate_crc32c _bsd_calculate_crc32c
 #define	callout_handle_init _bsd_callout_handle_init
 #define	callout_init _bsd_callout_init
-#define	_callout_init_lock _bsd__callout_init_lock
 #define	callout_process _bsd_callout_process
 #define	callout_reset_sbt_on _bsd_callout_reset_sbt_on
 #define	callout_schedule _bsd_callout_schedule
 #define	callout_schedule_on _bsd_callout_schedule_on
-#define	_callout_stop_safe _bsd__callout_stop_safe
 #define	callout_when _bsd_callout_when
-#define	camellia_decrypt _bsd_camellia_decrypt
-#define	camellia_decrypt128 _bsd_camellia_decrypt128
-#define	camellia_decrypt256 _bsd_camellia_decrypt256
-#define	Camellia_DecryptBlock _bsd_Camellia_DecryptBlock
-#define	Camellia_Ekeygen _bsd_Camellia_Ekeygen
-#define	camellia_encrypt _bsd_camellia_encrypt
-#define	camellia_encrypt128 _bsd_camellia_encrypt128
-#define	camellia_encrypt256 _bsd_camellia_encrypt256
-#define	Camellia_EncryptBlock _bsd_Camellia_EncryptBlock
-#define	camellia_set_key _bsd_camellia_set_key
-#define	camellia_setup128 _bsd_camellia_setup128
-#define	camellia_setup192 _bsd_camellia_setup192
-#define	camellia_setup256 _bsd_camellia_setup256
 #define	cam_fetch_status_entry _bsd_cam_fetch_status_entry
 #define	cam_quirkmatch _bsd_cam_quirkmatch
 #define	cam_sim_alloc _bsd_cam_sim_alloc
@@ -514,6 +821,16 @@
 #define	cam_strmatch _bsd_cam_strmatch
 #define	cam_strvis _bsd_cam_strvis
 #define	cam_strvis_sbuf _bsd_cam_strvis_sbuf
+#define	camellia_decrypt _bsd_camellia_decrypt
+#define	camellia_decrypt128 _bsd_camellia_decrypt128
+#define	camellia_decrypt256 _bsd_camellia_decrypt256
+#define	camellia_encrypt _bsd_camellia_encrypt
+#define	camellia_encrypt128 _bsd_camellia_encrypt128
+#define	camellia_encrypt256 _bsd_camellia_encrypt256
+#define	camellia_set_key _bsd_camellia_set_key
+#define	camellia_setup128 _bsd_camellia_setup128
+#define	camellia_setup192 _bsd_camellia_setup192
+#define	camellia_setup256 _bsd_camellia_setup256
 #define	carp6_input _bsd_carp6_input
 #define	carp_attach _bsd_carp_attach
 #define	carp_attach_p _bsd_carp_attach_p
@@ -558,10 +875,8 @@
 #define	chacha_encrypt_bytes _bsd_chacha_encrypt_bytes
 #define	chacha_ivsetup _bsd_chacha_ivsetup
 #define	chacha_keysetup _bsd_chacha_keysetup
-#define	_ck_epoch_addref _bsd__ck_epoch_addref
 #define	ck_epoch_barrier _bsd_ck_epoch_barrier
 #define	ck_epoch_barrier_wait _bsd_ck_epoch_barrier_wait
-#define	_ck_epoch_delref _bsd__ck_epoch_delref
 #define	ck_epoch_init _bsd_ck_epoch_init
 #define	ck_epoch_poll _bsd_ck_epoch_poll
 #define	ck_epoch_poll_deferred _bsd_ck_epoch_poll_deferred
@@ -573,7 +888,6 @@
 #define	ck_epoch_unregister _bsd_ck_epoch_unregister
 #define	clean_unrhdr _bsd_clean_unrhdr
 #define	clean_unrhdrl _bsd_clean_unrhdrl
-#define	ClearCheckNewLink _bsd_ClearCheckNewLink
 #define	clear_unrhdr _bsd_clear_unrhdr
 #define	clk_intr_event _bsd_clk_intr_event
 #define	comp_algo_deflate _bsd_comp_algo_deflate
@@ -599,9 +913,9 @@
 #define	crypto_find_driver _bsd_crypto_find_driver
 #define	crypto_freereq _bsd_crypto_freereq
 #define	crypto_freesession _bsd_crypto_freesession
-#define	crypto_getcaps _bsd_crypto_getcaps
-#define	crypto_get_driverid _bsd_crypto_get_driverid
 #define	crypto_get_driver_session _bsd_crypto_get_driver_session
+#define	crypto_get_driverid _bsd_crypto_get_driverid
+#define	crypto_getcaps _bsd_crypto_getcaps
 #define	crypto_getfeat _bsd_crypto_getfeat
 #define	crypto_getreq _bsd_crypto_getreq
 #define	crypto_kdispatch _bsd_crypto_kdispatch
@@ -616,7 +930,6 @@
 #define	crypto_onetimeauth_poly1305_final _bsd_crypto_onetimeauth_poly1305_final
 #define	crypto_onetimeauth_poly1305_init _bsd_crypto_onetimeauth_poly1305_init
 #define	crypto_onetimeauth_poly1305_keybytes _bsd_crypto_onetimeauth_poly1305_keybytes
-#define	_crypto_onetimeauth_poly1305_pick_best_implementation _bsd__crypto_onetimeauth_poly1305_pick_best_implementation
 #define	crypto_onetimeauth_poly1305_statebytes _bsd_crypto_onetimeauth_poly1305_statebytes
 #define	crypto_onetimeauth_poly1305_update _bsd_crypto_onetimeauth_poly1305_update
 #define	crypto_onetimeauth_poly1305_verify _bsd_crypto_onetimeauth_poly1305_verify
@@ -643,10 +956,6 @@
 #define	cv_destroy _bsd_cv_destroy
 #define	cv_init _bsd_cv_init
 #define	cv_signal _bsd_cv_signal
-#define	_cv_timedwait_sbt _bsd__cv_timedwait_sbt
-#define	_cv_wait _bsd__cv_wait
-#define	_cv_wait_sig _bsd__cv_wait_sig
-#define	_cv_wait_unlock _bsd__cv_wait_unlock
 #define	deembed_scopeid _bsd_deembed_scopeid
 #define	default_cc_ptr _bsd_default_cc_ptr
 #define	deflate_global _bsd_deflate_global
@@ -660,10 +969,10 @@
 #define	defrouter_select _bsd_defrouter_select
 #define	defrouter_select_fib _bsd_defrouter_select_fib
 #define	defrouter_unlink _bsd_defrouter_unlink
-#define	DELAY _bsd_DELAY
 #define	delete_unrhdr _bsd_delete_unrhdr
 #define	delist_dev _bsd_delist_dev
 #define	deregister_tcp_functions _bsd_deregister_tcp_functions
+#define	des_SPtrans _bsd_des_SPtrans
 #define	des_check_key _bsd_des_check_key
 #define	des_check_key_parity _bsd_des_check_key_parity
 #define	des_decrypt3 _bsd_des_decrypt3
@@ -680,11 +989,17 @@
 #define	des_set_key_checked _bsd_des_set_key_checked
 #define	des_set_key_unchecked _bsd_des_set_key_unchecked
 #define	des_set_odd_parity _bsd_des_set_odd_parity
-#define	des_SPtrans _bsd_des_SPtrans
 #define	dest6_input _bsd_dest6_input
 #define	destroy_dev _bsd_destroy_dev
 #define	destroy_dev_sched _bsd_destroy_dev_sched
 #define	destroy_dev_sched_cb _bsd_destroy_dev_sched_cb
+#define	dev_depends _bsd_dev_depends
+#define	dev_lock _bsd_dev_lock
+#define	dev_refl _bsd_dev_refl
+#define	dev_refthread _bsd_dev_refthread
+#define	dev_rel _bsd_dev_rel
+#define	dev_relthread _bsd_dev_relthread
+#define	dev_unlock _bsd_dev_unlock
 #define	devclass_add_driver _bsd_devclass_add_driver
 #define	devclass_create _bsd_devclass_create
 #define	devclass_delete_driver _bsd_devclass_delete_driver
@@ -705,7 +1020,6 @@
 #define	devctl_notify_f _bsd_devctl_notify_f
 #define	devctl_queue_data _bsd_devctl_queue_data
 #define	devctl_queue_data_f _bsd_devctl_queue_data_f
-#define	dev_depends _bsd_dev_depends
 #define	devfs_clear_cdevpriv _bsd_devfs_clear_cdevpriv
 #define	devfs_destroy_cdevpriv _bsd_devfs_destroy_cdevpriv
 #define	devfs_fpdrop _bsd_devfs_fpdrop
@@ -744,8 +1058,8 @@
 #define	device_is_enabled _bsd_device_is_enabled
 #define	device_is_quiet _bsd_device_is_quiet
 #define	device_is_suspended _bsd_device_is_suspended
-#define	device_printf _bsd_device_printf
 #define	device_print_prettyname _bsd_device_print_prettyname
+#define	device_printf _bsd_device_printf
 #define	device_probe _bsd_device_probe
 #define	device_probe_and_attach _bsd_device_probe_and_attach
 #define	device_probe_child _bsd_device_probe_child
@@ -765,15 +1079,8 @@
 #define	device_shutdown _bsd_device_shutdown
 #define	device_unbusy _bsd_device_unbusy
 #define	device_verbose _bsd_device_verbose
-#define	dev_lock _bsd_dev_lock
 #define	devmtx _bsd_devmtx
-#define	dev_refl _bsd_dev_refl
-#define	dev_refthread _bsd_dev_refthread
-#define	dev_rel _bsd_dev_rel
-#define	dev_relthread _bsd_dev_relthread
 #define	devtoname _bsd_devtoname
-#define	dev_unlock _bsd_dev_unlock
-#define	DifferentialChecksum _bsd_DifferentialChecksum
 #define	div_protosw _bsd_div_protosw
 #define	div_usrreqs _bsd_div_usrreqs
 #define	domain_add _bsd_domain_add
@@ -847,8 +1154,8 @@
 #define	e1000_force_mac_fc_generic _bsd_e1000_force_mac_fc_generic
 #define	e1000_get_auto_rd_done_generic _bsd_e1000_get_auto_rd_done_generic
 #define	e1000_get_bus_info _bsd_e1000_get_bus_info
-#define	e1000_get_bus_info_pcie_generic _bsd_e1000_get_bus_info_pcie_generic
 #define	e1000_get_bus_info_pci_generic _bsd_e1000_get_bus_info_pci_generic
+#define	e1000_get_bus_info_pcie_generic _bsd_e1000_get_bus_info_pcie_generic
 #define	e1000_get_cable_length _bsd_e1000_get_cable_length
 #define	e1000_get_cable_length_82577 _bsd_e1000_get_cable_length_82577
 #define	e1000_get_cable_length_igp_2 _bsd_e1000_get_cable_length_igp_2
@@ -891,8 +1198,6 @@
 #define	e1000_init_hw _bsd_e1000_init_hw
 #define	e1000_init_hw_82575 _bsd_e1000_init_hw_82575
 #define	e1000_init_hw_i210 _bsd_e1000_init_hw_i210
-#define	e1000_initialize_M88E1512_phy _bsd_e1000_initialize_M88E1512_phy
-#define	e1000_initialize_M88E1543_phy _bsd_e1000_initialize_M88E1543_phy
 #define	e1000_init_mac_ops_generic _bsd_e1000_init_mac_ops_generic
 #define	e1000_init_mac_params _bsd_e1000_init_mac_params
 #define	e1000_init_mbx_ops_generic _bsd_e1000_init_mbx_ops_generic
@@ -906,6 +1211,8 @@
 #define	e1000_init_phy_params _bsd_e1000_init_phy_params
 #define	e1000_init_rx_addrs_generic _bsd_e1000_init_rx_addrs_generic
 #define	e1000_init_script_state_82541 _bsd_e1000_init_script_state_82541
+#define	e1000_initialize_M88E1512_phy _bsd_e1000_initialize_M88E1512_phy
+#define	e1000_initialize_M88E1543_phy _bsd_e1000_initialize_M88E1543_phy
 #define	e1000_is_mphy_ready _bsd_e1000_is_mphy_ready
 #define	e1000_led_off _bsd_e1000_led_off
 #define	e1000_led_off_generic _bsd_e1000_led_off_generic
@@ -1053,12 +1360,12 @@
 #define	e1000_update_nvm_checksum _bsd_e1000_update_nvm_checksum
 #define	e1000_update_nvm_checksum_generic _bsd_e1000_update_nvm_checksum_generic
 #define	e1000_update_nvm_checksum_i210 _bsd_e1000_update_nvm_checksum_i210
+#define	e1000_valid_led_default_generic _bsd_e1000_valid_led_default_generic
 #define	e1000_validate_mdi_setting _bsd_e1000_validate_mdi_setting
 #define	e1000_validate_mdi_setting_crossover_generic _bsd_e1000_validate_mdi_setting_crossover_generic
 #define	e1000_validate_nvm_checksum _bsd_e1000_validate_nvm_checksum
 #define	e1000_validate_nvm_checksum_generic _bsd_e1000_validate_nvm_checksum_generic
 #define	e1000_validate_nvm_checksum_i210 _bsd_e1000_validate_nvm_checksum_i210
-#define	e1000_valid_led_default_generic _bsd_e1000_valid_led_default_generic
 #define	e1000_vfta_set_vf _bsd_e1000_vfta_set_vf
 #define	e1000_vmdq_set_anti_spoofing_pf _bsd_e1000_vmdq_set_anti_spoofing_pf
 #define	e1000_vmdq_set_loopback_pf _bsd_e1000_vmdq_set_loopback_pf
@@ -1121,8 +1428,6 @@
 #define	em_sctx _bsd_em_sctx
 #define	em_txrx _bsd_em_txrx
 #define	enc_algorithm_lookup _bsd_enc_algorithm_lookup
-#define	encap4_input _bsd_encap4_input
-#define	encap6_input _bsd_encap6_input
 #define	enc_xform_3des _bsd_enc_xform_3des
 #define	enc_xform_aes_icm _bsd_enc_xform_aes_icm
 #define	enc_xform_aes_nist_gcm _bsd_enc_xform_aes_nist_gcm
@@ -1138,6 +1443,8 @@
 #define	enc_xform_null _bsd_enc_xform_null
 #define	enc_xform_rijndael128 _bsd_enc_xform_rijndael128
 #define	enc_xform_skipjack _bsd_enc_xform_skipjack
+#define	encap4_input _bsd_encap4_input
+#define	encap6_input _bsd_encap6_input
 #define	eopnotsupp _bsd_eopnotsupp
 #define	epoch_call _bsd_epoch_call
 #define	epoch_drain_callbacks _bsd_epoch_drain_callbacks
@@ -1160,12 +1467,12 @@
 #define	ether_ifattach _bsd_ether_ifattach
 #define	ether_ifdetach _bsd_ether_ifdetach
 #define	ether_ioctl _bsd_ether_ioctl
-#define	ethermulticastaddr_slowprotocols _bsd_ethermulticastaddr_slowprotocols
 #define	ether_output _bsd_ether_output
 #define	ether_output_frame _bsd_ether_output_frame
 #define	ether_sprintf _bsd_ether_sprintf
-#define	ether_vlanencap _bsd_ether_vlanencap
 #define	ether_vlan_mtap _bsd_ether_vlan_mtap
+#define	ether_vlanencap _bsd_ether_vlanencap
+#define	ethermulticastaddr_slowprotocols _bsd_ethermulticastaddr_slowprotocols
 #define	evdev_alloc _bsd_evdev_alloc
 #define	evdev_cdev_create _bsd_evdev_cdev_create
 #define	evdev_cdev_destroy _bsd_evdev_cdev_destroy
@@ -1234,15 +1541,15 @@
 #define	eventhandler_prune_list _bsd_eventhandler_prune_list
 #define	eventhandler_register _bsd_eventhandler_register
 #define	fb_commonioctl _bsd_fb_commonioctl
+#define	fb_dump_adp_info _bsd_fb_dump_adp_info
+#define	fb_dump_mode_info _bsd_fb_dump_mode_info
+#define	fb_list_head _bsd_fb_list_head
+#define	fb_type _bsd_fb_type
 #define	fbd_devclass _bsd_fbd_devclass
 #define	fbd_driver _bsd_fbd_driver
 #define	fbd_list _bsd_fbd_list
 #define	fbd_register _bsd_fbd_register
-#define	fb_dump_adp_info _bsd_fb_dump_adp_info
-#define	fb_dump_mode_info _bsd_fb_dump_mode_info
 #define	fbd_unregister _bsd_fbd_unregister
-#define	fb_list_head _bsd_fb_list_head
-#define	fb_type _bsd_fb_type
 #define	fdt_addrsize_cells _bsd_fdt_addrsize_cells
 #define	fdt_data_get _bsd_fdt_data_get
 #define	fdt_data_to_res _bsd_fdt_data_to_res
@@ -1272,27 +1579,9 @@
 #define	fib6_free_nh_ext _bsd_fib6_free_nh_ext
 #define	fib6_lookup_nh_basic _bsd_fib6_lookup_nh_basic
 #define	fib6_lookup_nh_ext _bsd_fib6_lookup_nh_ext
-#define	FindAliasAddress _bsd_FindAliasAddress
 #define	find_and_ref_tcp_fb _bsd_find_and_ref_tcp_fb
 #define	find_and_ref_tcp_functions _bsd_find_and_ref_tcp_functions
-#define	FindFragmentIn1 _bsd_FindFragmentIn1
-#define	FindFragmentIn2 _bsd_FindFragmentIn2
-#define	FindFragmentPtr _bsd_FindFragmentPtr
 #define	find_handler _bsd_find_handler
-#define	FindIcmpIn _bsd_FindIcmpIn
-#define	FindIcmpOut _bsd_FindIcmpOut
-#define	FindNewPortGroup _bsd_FindNewPortGroup
-#define	FindOriginalAddress _bsd_FindOriginalAddress
-#define	FindPptpInByCallId _bsd_FindPptpInByCallId
-#define	FindPptpInByPeerCallId _bsd_FindPptpInByPeerCallId
-#define	FindPptpOutByCallId _bsd_FindPptpOutByCallId
-#define	FindPptpOutByPeerCallId _bsd_FindPptpOutByPeerCallId
-#define	FindProtoIn _bsd_FindProtoIn
-#define	FindProtoOut _bsd_FindProtoOut
-#define	FindRtspOut _bsd_FindRtspOut
-#define	FindSctpRedirectAddress _bsd_FindSctpRedirectAddress
-#define	FindUdpTcpIn _bsd_FindUdpTcpIn
-#define	FindUdpTcpOut _bsd_FindUdpTcpOut
 #define	firewire_broadcastaddr _bsd_firewire_broadcastaddr
 #define	firewire_busreset _bsd_firewire_busreset
 #define	firewire_ifattach _bsd_firewire_ifattach
@@ -1315,45 +1604,19 @@
 #define	genkbd_diag _bsd_genkbd_diag
 #define	genkbd_get_fkeystr _bsd_genkbd_get_fkeystr
 #define	genkbd_keyaction _bsd_genkbd_keyaction
-#define	GetAckModified _bsd_GetAckModified
-#define	GetAliasAddress _bsd_GetAliasAddress
-#define	GetAliasPort _bsd_GetAliasPort
-#define	getcredhostuuid _bsd_getcredhostuuid
-#define	GetDefaultAliasAddress _bsd_GetDefaultAliasAddress
-#define	GetDeltaAckIn _bsd_GetDeltaAckIn
-#define	GetDeltaSeqOut _bsd_GetDeltaSeqOut
-#define	GetDestAddress _bsd_GetDestAddress
-#define	GetFragmentAddr _bsd_GetFragmentAddr
-#define	GetFragmentPtr _bsd_GetFragmentPtr
 #define	get_keybuf _bsd_get_keybuf
-#define	GetOriginalAddress _bsd_GetOriginalAddress
-#define	GetOriginalPort _bsd_GetOriginalPort
-#define	GetProtocolFlags _bsd_GetProtocolFlags
-#define	GetProxyAddress _bsd_GetProxyAddress
-#define	GetProxyPort _bsd_GetProxyPort
 #define	get_random_bytes _bsd_get_random_bytes
-#define	GetStateIn _bsd_GetStateIn
-#define	GetStateOut _bsd_GetStateOut
+#define	getcredhostuuid _bsd_getcredhostuuid
 #define	gf128_genmultable _bsd_gf128_genmultable
 #define	gf128_genmultable4 _bsd_gf128_genmultable4
 #define	gf128_mul _bsd_gf128_mul
 #define	gf128_mul4 _bsd_gf128_mul4
 #define	gf128_mul4b _bsd_gf128_mul4b
-#define	Giant _bsd_Giant
 #define	gif_hashdestroy _bsd_gif_hashdestroy
 #define	gif_hashinit _bsd_gif_hashinit
 #define	gif_input _bsd_gif_input
 #define	gif_output _bsd_gif_output
 #define	gpio_alloc_intr_resource _bsd_gpio_alloc_intr_resource
-#define	gpiobus_acquire_pin _bsd_gpiobus_acquire_pin
-#define	gpiobus_alloc_ivars _bsd_gpiobus_alloc_ivars
-#define	gpiobus_attach_bus _bsd_gpiobus_attach_bus
-#define	gpiobus_detach_bus _bsd_gpiobus_detach_bus
-#define	gpiobus_devclass _bsd_gpiobus_devclass
-#define	gpiobus_driver _bsd_gpiobus_driver
-#define	gpiobus_free_ivars _bsd_gpiobus_free_ivars
-#define	gpiobus_init_softc _bsd_gpiobus_init_softc
-#define	gpiobus_release_pin _bsd_gpiobus_release_pin
 #define	gpio_check_flags _bsd_gpio_check_flags
 #define	gpio_pin_get_by_bus_pinnum _bsd_gpio_pin_get_by_bus_pinnum
 #define	gpio_pin_get_by_child_index _bsd_gpio_pin_get_by_child_index
@@ -1366,6 +1629,15 @@
 #define	gpio_pin_release _bsd_gpio_pin_release
 #define	gpio_pin_set_active _bsd_gpio_pin_set_active
 #define	gpio_pin_setflags _bsd_gpio_pin_setflags
+#define	gpiobus_acquire_pin _bsd_gpiobus_acquire_pin
+#define	gpiobus_alloc_ivars _bsd_gpiobus_alloc_ivars
+#define	gpiobus_attach_bus _bsd_gpiobus_attach_bus
+#define	gpiobus_detach_bus _bsd_gpiobus_detach_bus
+#define	gpiobus_devclass _bsd_gpiobus_devclass
+#define	gpiobus_driver _bsd_gpiobus_driver
+#define	gpiobus_free_ivars _bsd_gpiobus_free_ivars
+#define	gpiobus_init_softc _bsd_gpiobus_init_softc
+#define	gpiobus_release_pin _bsd_gpiobus_release_pin
 #define	gre_hashdestroy _bsd_gre_hashdestroy
 #define	gre_hashinit _bsd_gre_hashinit
 #define	gre_input _bsd_gre_input
@@ -1373,8 +1645,8 @@
 #define	gre_update_hdr _bsd_gre_update_hdr
 #define	gre_update_udphdr _bsd_gre_update_udphdr
 #define	grouptask_block _bsd_grouptask_block
-#define	grouptaskqueue_enqueue _bsd_grouptaskqueue_enqueue
 #define	grouptask_unblock _bsd_grouptask_unblock
+#define	grouptaskqueue_enqueue _bsd_grouptaskqueue_enqueue
 #define	gtaskqueue_block _bsd_gtaskqueue_block
 #define	gtaskqueue_cancel _bsd_gtaskqueue_cancel
 #define	gtaskqueue_drain _bsd_gtaskqueue_drain
@@ -1414,12 +1686,11 @@
 #define	hid_start_parse _bsd_hid_start_parse
 #define	hmac_ipad_buffer _bsd_hmac_ipad_buffer
 #define	hmac_opad_buffer _bsd_hmac_opad_buffer
-#define	HouseKeeping _bsd_HouseKeeping
 #define	hz _bsd_hz
+#define	ic_printf _bsd_ic_printf
 #define	icmp6_ctloutput _bsd_icmp6_ctloutput
 #define	icmp6_error _bsd_icmp6_error
 #define	icmp6_error2 _bsd_icmp6_error2
-#define	icmp6errppslim _bsd_icmp6errppslim
 #define	icmp6_fasttimo _bsd_icmp6_fasttimo
 #define	icmp6_input _bsd_icmp6_input
 #define	icmp6_mtudisc_update _bsd_icmp6_mtudisc_update
@@ -1431,15 +1702,14 @@
 #define	icmp6_redirtimeout _bsd_icmp6_redirtimeout
 #define	icmp6_reflect _bsd_icmp6_reflect
 #define	icmp6_slowtimo _bsd_icmp6_slowtimo
+#define	icmp6errppslim _bsd_icmp6errppslim
 #define	icmp6stat _bsd_icmp6stat
 #define	icmp_error _bsd_icmp_error
 #define	icmp_input _bsd_icmp_input
 #define	icmpstat _bsd_icmpstat
-#define	ic_printf _bsd_ic_printf
 #define	ieee80211_aclator_get _bsd_ieee80211_aclator_get
 #define	ieee80211_aclator_register _bsd_ieee80211_aclator_register
 #define	ieee80211_aclator_unregister _bsd_ieee80211_aclator_unregister
-#define	ieee80211_addbasicrates _bsd_ieee80211_addbasicrates
 #define	ieee80211_add_callback _bsd_ieee80211_add_callback
 #define	ieee80211_add_channel _bsd_ieee80211_add_channel
 #define	ieee80211_add_channel_ht40 _bsd_ieee80211_add_channel_ht40
@@ -1470,6 +1740,7 @@
 #define	ieee80211_add_wpa _bsd_ieee80211_add_wpa
 #define	ieee80211_add_xmit_params _bsd_ieee80211_add_xmit_params
 #define	ieee80211_add_xrates _bsd_ieee80211_add_xrates
+#define	ieee80211_addbasicrates _bsd_ieee80211_addbasicrates
 #define	ieee80211_adhoc_attach _bsd_ieee80211_adhoc_attach
 #define	ieee80211_adhoc_detach _bsd_ieee80211_adhoc_detach
 #define	ieee80211_ageq_age _bsd_ieee80211_ageq_age
@@ -1504,7 +1775,6 @@
 #define	ieee80211_beacon_miss _bsd_ieee80211_beacon_miss
 #define	ieee80211_beacon_update _bsd_ieee80211_beacon_update
 #define	ieee80211_bg_scan _bsd_ieee80211_bg_scan
-#define	ieee80211broadcastaddr _bsd_ieee80211broadcastaddr
 #define	ieee80211_cac_completeswitch _bsd_ieee80211_cac_completeswitch
 #define	ieee80211_cancel_anyscan _bsd_ieee80211_cancel_anyscan
 #define	ieee80211_cancel_scan _bsd_ieee80211_cancel_scan
@@ -1516,11 +1786,11 @@
 #define	ieee80211_check_scan_current _bsd_ieee80211_check_scan_current
 #define	ieee80211_cipher_none _bsd_ieee80211_cipher_none
 #define	ieee80211_classify _bsd_ieee80211_classify
-#define	ieee80211_compute_duration _bsd_ieee80211_compute_duration
-#define	ieee80211_compute_duration_ht _bsd_ieee80211_compute_duration_ht
 #define	ieee80211_com_vdecref _bsd_ieee80211_com_vdecref
 #define	ieee80211_com_vdetach _bsd_ieee80211_com_vdetach
 #define	ieee80211_com_vincref _bsd_ieee80211_com_vincref
+#define	ieee80211_compute_duration _bsd_ieee80211_compute_duration
+#define	ieee80211_compute_duration_ht _bsd_ieee80211_compute_duration_ht
 #define	ieee80211_create_ibss _bsd_ieee80211_create_ibss
 #define	ieee80211_crypto_attach _bsd_ieee80211_crypto_attach
 #define	ieee80211_crypto_available _bsd_ieee80211_crypto_available
@@ -1530,8 +1800,8 @@
 #define	ieee80211_crypto_demic _bsd_ieee80211_crypto_demic
 #define	ieee80211_crypto_detach _bsd_ieee80211_crypto_detach
 #define	ieee80211_crypto_encap _bsd_ieee80211_crypto_encap
-#define	ieee80211_crypto_get_keyid _bsd_ieee80211_crypto_get_keyid
 #define	ieee80211_crypto_get_key_wepidx _bsd_ieee80211_crypto_get_key_wepidx
+#define	ieee80211_crypto_get_keyid _bsd_ieee80211_crypto_get_keyid
 #define	ieee80211_crypto_get_txkey _bsd_ieee80211_crypto_get_txkey
 #define	ieee80211_crypto_newkey _bsd_ieee80211_crypto_newkey
 #define	ieee80211_crypto_register _bsd_ieee80211_crypto_register
@@ -1582,20 +1852,20 @@
 #define	ieee80211_flush_ifq _bsd_ieee80211_flush_ifq
 #define	ieee80211_free_mbuf _bsd_ieee80211_free_mbuf
 #define	ieee80211_free_node _bsd_ieee80211_free_node
-#define	ieee80211_getcapinfo _bsd_ieee80211_getcapinfo
 #define	ieee80211_get_channel_center_freq _bsd_ieee80211_get_channel_center_freq
 #define	ieee80211_get_channel_center_freq1 _bsd_ieee80211_get_channel_center_freq1
 #define	ieee80211_get_channel_center_freq2 _bsd_ieee80211_get_channel_center_freq2
-#define	ieee80211_getmgtframe _bsd_ieee80211_getmgtframe
 #define	ieee80211_get_ratetable _bsd_ieee80211_get_ratetable
-#define	ieee80211_getrssi _bsd_ieee80211_getrssi
 #define	ieee80211_get_rx_params _bsd_ieee80211_get_rx_params
 #define	ieee80211_get_rx_params_ptr _bsd_ieee80211_get_rx_params_ptr
-#define	ieee80211_getsignal _bsd_ieee80211_getsignal
 #define	ieee80211_get_suphtrates _bsd_ieee80211_get_suphtrates
 #define	ieee80211_get_suprates _bsd_ieee80211_get_suprates
 #define	ieee80211_get_toa_params _bsd_ieee80211_get_toa_params
 #define	ieee80211_get_xmit_params _bsd_ieee80211_get_xmit_params
+#define	ieee80211_getcapinfo _bsd_ieee80211_getcapinfo
+#define	ieee80211_getmgtframe _bsd_ieee80211_getmgtframe
+#define	ieee80211_getrssi _bsd_ieee80211_getrssi
+#define	ieee80211_getsignal _bsd_ieee80211_getsignal
 #define	ieee80211_hostap_attach _bsd_ieee80211_hostap_attach
 #define	ieee80211_hostap_detach _bsd_ieee80211_hostap_detach
 #define	ieee80211_ht_adjust_channel _bsd_ieee80211_ht_adjust_channel
@@ -1607,8 +1877,6 @@
 #define	ieee80211_ht_node_init _bsd_ieee80211_ht_node_init
 #define	ieee80211_ht_node_join _bsd_ieee80211_ht_node_join
 #define	ieee80211_ht_node_leave _bsd_ieee80211_ht_node_leave
-#define	ieee80211_htprot_update _bsd_ieee80211_htprot_update
-#define	ieee80211_htrates _bsd_ieee80211_htrates
 #define	ieee80211_ht_timeout _bsd_ieee80211_ht_timeout
 #define	ieee80211_ht_update_beacon _bsd_ieee80211_ht_update_beacon
 #define	ieee80211_ht_updatehtcap _bsd_ieee80211_ht_updatehtcap
@@ -1618,6 +1886,8 @@
 #define	ieee80211_ht_vattach _bsd_ieee80211_ht_vattach
 #define	ieee80211_ht_vdetach _bsd_ieee80211_ht_vdetach
 #define	ieee80211_ht_wds_init _bsd_ieee80211_ht_wds_init
+#define	ieee80211_htprot_update _bsd_ieee80211_htprot_update
+#define	ieee80211_htrates _bsd_ieee80211_htrates
 #define	ieee80211_ibss_merge _bsd_ieee80211_ibss_merge
 #define	ieee80211_ibss_merge_check _bsd_ieee80211_ibss_merge_check
 #define	ieee80211_ibss_node_check_new _bsd_ieee80211_ibss_node_check_new
@@ -1774,16 +2044,16 @@
 #define	ieee80211_scan_dump_channels _bsd_ieee80211_scan_dump_channels
 #define	ieee80211_scan_flush _bsd_ieee80211_scan_flush
 #define	ieee80211_scan_iterate _bsd_ieee80211_scan_iterate
-#define	ieee80211_scanner_get _bsd_ieee80211_scanner_get
-#define	ieee80211_scanner_register _bsd_ieee80211_scanner_register
-#define	ieee80211_scanner_unregister _bsd_ieee80211_scanner_unregister
-#define	ieee80211_scanner_unregister_all _bsd_ieee80211_scanner_unregister_all
 #define	ieee80211_scan_next _bsd_ieee80211_scan_next
 #define	ieee80211_scan_pickchannel _bsd_ieee80211_scan_pickchannel
 #define	ieee80211_scan_timeout _bsd_ieee80211_scan_timeout
 #define	ieee80211_scan_update_locked _bsd_ieee80211_scan_update_locked
 #define	ieee80211_scan_vattach _bsd_ieee80211_scan_vattach
 #define	ieee80211_scan_vdetach _bsd_ieee80211_scan_vdetach
+#define	ieee80211_scanner_get _bsd_ieee80211_scanner_get
+#define	ieee80211_scanner_register _bsd_ieee80211_scanner_register
+#define	ieee80211_scanner_unregister _bsd_ieee80211_scanner_unregister
+#define	ieee80211_scanner_unregister_all _bsd_ieee80211_scanner_unregister_all
 #define	ieee80211_send_action _bsd_ieee80211_send_action
 #define	ieee80211_send_action_register _bsd_ieee80211_send_action_register
 #define	ieee80211_send_action_unregister _bsd_ieee80211_send_action_unregister
@@ -1794,16 +2064,16 @@
 #define	ieee80211_send_probereq _bsd_ieee80211_send_probereq
 #define	ieee80211_send_proberesp _bsd_ieee80211_send_proberesp
 #define	ieee80211_send_setup _bsd_ieee80211_send_setup
+#define	ieee80211_set_shortslottime _bsd_ieee80211_set_shortslottime
 #define	ieee80211_setbasicrates _bsd_ieee80211_setbasicrates
 #define	ieee80211_setcurchan _bsd_ieee80211_setcurchan
 #define	ieee80211_setmode _bsd_ieee80211_setmode
 #define	ieee80211_setregdomain _bsd_ieee80211_setregdomain
-#define	ieee80211_set_shortslottime _bsd_ieee80211_set_shortslottime
 #define	ieee80211_setup_basic_htrates _bsd_ieee80211_setup_basic_htrates
-#define	ieee80211_setupcurchan _bsd_ieee80211_setupcurchan
 #define	ieee80211_setup_htrates _bsd_ieee80211_setup_htrates
 #define	ieee80211_setup_rates _bsd_ieee80211_setup_rates
 #define	ieee80211_setup_vht_rates _bsd_ieee80211_setup_vht_rates
+#define	ieee80211_setupcurchan _bsd_ieee80211_setupcurchan
 #define	ieee80211_sort_channels _bsd_ieee80211_sort_channels
 #define	ieee80211_sta_attach _bsd_ieee80211_sta_attach
 #define	ieee80211_sta_detach _bsd_ieee80211_sta_detach
@@ -1811,11 +2081,11 @@
 #define	ieee80211_sta_leave _bsd_ieee80211_sta_leave
 #define	ieee80211_sta_ps_timer_check _bsd_ieee80211_sta_ps_timer_check
 #define	ieee80211_sta_pwrsave _bsd_ieee80211_sta_pwrsave
+#define	ieee80211_sta_tim_notify _bsd_ieee80211_sta_tim_notify
 #define	ieee80211_start_all _bsd_ieee80211_start_all
 #define	ieee80211_start_locked _bsd_ieee80211_start_locked
 #define	ieee80211_start_scan _bsd_ieee80211_start_scan
 #define	ieee80211_state_name _bsd_ieee80211_state_name
-#define	ieee80211_sta_tim_notify _bsd_ieee80211_sta_tim_notify
 #define	ieee80211_stop _bsd_ieee80211_stop
 #define	ieee80211_stop_all _bsd_ieee80211_stop_all
 #define	ieee80211_stop_locked _bsd_ieee80211_stop_locked
@@ -1867,36 +2137,18 @@
 #define	ieee80211_wme_updateparams _bsd_ieee80211_wme_updateparams
 #define	ieee80211_wme_updateparams_locked _bsd_ieee80211_wme_updateparams_locked
 #define	ieee80211_wme_vap_ac_is_noack _bsd_ieee80211_wme_vap_ac_is_noack
-#define	ieee80211_wme_vap_getparams _bsd_ieee80211_wme_vap_getparams
-#define	ifa_add_loopback_route _bsd_ifa_add_loopback_route
-#define	ifa_alloc _bsd_ifa_alloc
+#define	ieee80211_wme_vap_getparams _bsd_ieee80211_wme_vap_getparams
+#define	ieee80211broadcastaddr _bsd_ieee80211broadcastaddr
 #define	if_addgroup _bsd_if_addgroup
 #define	if_addmulti _bsd_if_addmulti
-#define	ifaddr_byindex _bsd_ifaddr_byindex
 #define	if_addr_rlock _bsd_if_addr_rlock
 #define	if_addr_runlock _bsd_if_addr_runlock
-#define	ifa_del_loopback_route _bsd_ifa_del_loopback_route
-#define	ifa_free _bsd_ifa_free
-#define	ifa_ifwithaddr _bsd_ifa_ifwithaddr
-#define	ifa_ifwithaddr_check _bsd_ifa_ifwithaddr_check
-#define	ifa_ifwithbroadaddr _bsd_ifa_ifwithbroadaddr
-#define	ifa_ifwithdstaddr _bsd_ifa_ifwithdstaddr
-#define	ifa_ifwithnet _bsd_ifa_ifwithnet
-#define	ifa_ifwithroute _bsd_ifa_ifwithroute
 #define	if_allmulti _bsd_if_allmulti
 #define	if_alloc _bsd_if_alloc
 #define	if_alloc_dev _bsd_if_alloc_dev
 #define	if_alloc_domain _bsd_if_alloc_domain
-#define	ifaof_ifpforaddr _bsd_ifaof_ifpforaddr
-#define	ifa_preferred _bsd_ifa_preferred
-#define	ifa_ref _bsd_ifa_ref
-#define	ifa_switch_loopback_route _bsd_ifa_switch_loopback_route
 #define	if_attach _bsd_if_attach
 #define	if_bpfmtap _bsd_if_bpfmtap
-#define	ifc_alloc_unit _bsd_ifc_alloc_unit
-#define	ifc_flags_get _bsd_ifc_flags_get
-#define	ifc_flags_set _bsd_ifc_flags_set
-#define	ifc_free_unit _bsd_ifc_free_unit
 #define	if_clearhwassist _bsd_if_clearhwassist
 #define	if_clone_addgroup _bsd_if_clone_addgroup
 #define	if_clone_addif _bsd_if_clone_addif
@@ -1907,10 +2159,8 @@
 #define	if_clone_detach _bsd_if_clone_detach
 #define	if_clone_findifc _bsd_if_clone_findifc
 #define	if_clone_list _bsd_if_clone_list
-#define	if_cloners _bsd_if_cloners
 #define	if_clone_simple _bsd_if_clone_simple
-#define	ifc_name _bsd_ifc_name
-#define	ifc_name2unit _bsd_ifc_name2unit
+#define	if_cloners _bsd_if_cloners
 #define	if_data_copy _bsd_if_data_copy
 #define	if_dead _bsd_if_dead
 #define	if_delallmulti _bsd_if_delallmulti
@@ -1926,11 +2176,11 @@
 #define	if_findmulti _bsd_if_findmulti
 #define	if_free _bsd_if_free
 #define	if_freemulti _bsd_if_freemulti
+#define	if_get_counter_default _bsd_if_get_counter_default
 #define	if_getamcount _bsd_if_getamcount
 #define	if_getbaudrate _bsd_if_getbaudrate
 #define	if_getcapabilities _bsd_if_getcapabilities
 #define	if_getcapenable _bsd_if_getcapenable
-#define	if_get_counter_default _bsd_if_get_counter_default
 #define	if_getdname _bsd_if_getdname
 #define	if_getdrvflags _bsd_if_getdrvflags
 #define	if_getflags _bsd_if_getflags
@@ -1946,44 +2196,22 @@
 #define	if_getmtu_family _bsd_if_getmtu_family
 #define	if_getsoftc _bsd_if_getsoftc
 #define	if_getvtag _bsd_if_getvtag
-#define	ifg_head _bsd_ifg_head
 #define	if_handoff _bsd_if_handoff
-#define	ifhwioctl _bsd_ifhwioctl
 #define	if_hw_tsomax_common _bsd_if_hw_tsomax_common
 #define	if_hw_tsomax_update _bsd_if_hw_tsomax_update
 #define	if_inc_counter _bsd_if_inc_counter
 #define	if_index _bsd_if_index
-#define	ifindex_table _bsd_ifindex_table
 #define	if_initname _bsd_if_initname
 #define	if_input _bsd_if_input
-#define	ifioctl _bsd_ifioctl
 #define	if_link_state_change _bsd_if_link_state_change
 #define	if_maddr_rlock _bsd_if_maddr_rlock
 #define	if_maddr_runlock _bsd_if_maddr_runlock
-#define	ifma_restart _bsd_ifma_restart
-#define	ifmedia_add _bsd_ifmedia_add
-#define	ifmedia_baudrate _bsd_ifmedia_baudrate
-#define	ifmedia_init _bsd_ifmedia_init
-#define	ifmedia_ioctl _bsd_ifmedia_ioctl
-#define	ifmedia_list_add _bsd_ifmedia_list_add
-#define	ifmedia_removeall _bsd_ifmedia_removeall
-#define	ifmedia_set _bsd_ifmedia_set
+#define	if_multi_apply _bsd_if_multi_apply
 #define	if_multiaddr_array _bsd_if_multiaddr_array
 #define	if_multiaddr_count _bsd_if_multiaddr_count
-#define	if_multi_apply _bsd_if_multi_apply
-#define	ifnet _bsd_ifnet
-#define	ifnet_byindex _bsd_ifnet_byindex
-#define	ifnet_byindex_locked _bsd_ifnet_byindex_locked
-#define	ifnet_byindex_ref _bsd_ifnet_byindex_ref
-#define	ifnet_rwlock _bsd_ifnet_rwlock
-#define	ifnet_sxlock _bsd_ifnet_sxlock
 #define	if_printf _bsd_if_printf
-#define	ifpromisc _bsd_ifpromisc
 #define	if_purgeaddrs _bsd_if_purgeaddrs
-#define	ifq_delete _bsd_ifq_delete
 #define	if_qflush _bsd_if_qflush
-#define	ifq_init _bsd_ifq_init
-#define	ifr_data_get_ptr _bsd_ifr_data_get_ptr
 #define	if_ref _bsd_if_ref
 #define	if_register_com_alloc _bsd_if_register_com_alloc
 #define	if_rele _bsd_if_rele
@@ -2023,11 +2251,54 @@
 #define	if_start _bsd_if_start
 #define	if_togglecapenable _bsd_if_togglecapenable
 #define	if_tunnel_check_nesting _bsd_if_tunnel_check_nesting
-#define	ifunit _bsd_ifunit
-#define	ifunit_ref _bsd_ifunit_ref
 #define	if_up _bsd_if_up
 #define	if_vlancap _bsd_if_vlancap
 #define	if_vlantrunkinuse _bsd_if_vlantrunkinuse
+#define	ifa_add_loopback_route _bsd_ifa_add_loopback_route
+#define	ifa_alloc _bsd_ifa_alloc
+#define	ifa_del_loopback_route _bsd_ifa_del_loopback_route
+#define	ifa_free _bsd_ifa_free
+#define	ifa_ifwithaddr _bsd_ifa_ifwithaddr
+#define	ifa_ifwithaddr_check _bsd_ifa_ifwithaddr_check
+#define	ifa_ifwithbroadaddr _bsd_ifa_ifwithbroadaddr
+#define	ifa_ifwithdstaddr _bsd_ifa_ifwithdstaddr
+#define	ifa_ifwithnet _bsd_ifa_ifwithnet
+#define	ifa_ifwithroute _bsd_ifa_ifwithroute
+#define	ifa_preferred _bsd_ifa_preferred
+#define	ifa_ref _bsd_ifa_ref
+#define	ifa_switch_loopback_route _bsd_ifa_switch_loopback_route
+#define	ifaddr_byindex _bsd_ifaddr_byindex
+#define	ifaof_ifpforaddr _bsd_ifaof_ifpforaddr
+#define	ifc_alloc_unit _bsd_ifc_alloc_unit
+#define	ifc_flags_get _bsd_ifc_flags_get
+#define	ifc_flags_set _bsd_ifc_flags_set
+#define	ifc_free_unit _bsd_ifc_free_unit
+#define	ifc_name _bsd_ifc_name
+#define	ifc_name2unit _bsd_ifc_name2unit
+#define	ifg_head _bsd_ifg_head
+#define	ifhwioctl _bsd_ifhwioctl
+#define	ifindex_table _bsd_ifindex_table
+#define	ifioctl _bsd_ifioctl
+#define	ifma_restart _bsd_ifma_restart
+#define	ifmedia_add _bsd_ifmedia_add
+#define	ifmedia_baudrate _bsd_ifmedia_baudrate
+#define	ifmedia_init _bsd_ifmedia_init
+#define	ifmedia_ioctl _bsd_ifmedia_ioctl
+#define	ifmedia_list_add _bsd_ifmedia_list_add
+#define	ifmedia_removeall _bsd_ifmedia_removeall
+#define	ifmedia_set _bsd_ifmedia_set
+#define	ifnet _bsd_ifnet
+#define	ifnet_byindex _bsd_ifnet_byindex
+#define	ifnet_byindex_locked _bsd_ifnet_byindex_locked
+#define	ifnet_byindex_ref _bsd_ifnet_byindex_ref
+#define	ifnet_rwlock _bsd_ifnet_rwlock
+#define	ifnet_sxlock _bsd_ifnet_sxlock
+#define	ifpromisc _bsd_ifpromisc
+#define	ifq_delete _bsd_ifq_delete
+#define	ifq_init _bsd_ifq_init
+#define	ifr_data_get_ptr _bsd_ifr_data_get_ptr
+#define	ifunit _bsd_ifunit
+#define	ifunit_ref _bsd_ifunit_ref
 #define	igb_sctx _bsd_igb_sctx
 #define	igb_txrx _bsd_igb_txrx
 #define	igmp_change_state _bsd_igmp_change_state
@@ -2066,8 +2337,6 @@
 #define	im6o_mc_filter _bsd_im6o_mc_filter
 #define	imo_multi_filter _bsd_imo_multi_filter
 #define	in4_cksum _bsd_in4_cksum
-#define	in6addr_linklocal_allrouters _bsd_in6addr_linklocal_allrouters
-#define	in6addr_linklocal_allv2routers _bsd_in6addr_linklocal_allv2routers
 #define	in6_addrscope _bsd_in6_addrscope
 #define	in6_are_prefix_equal _bsd_in6_are_prefix_equal
 #define	in6_cksum _bsd_in6_cksum
@@ -2080,34 +2349,29 @@
 #define	in6_domifdetach _bsd_in6_domifdetach
 #define	in6_domifmtu _bsd_in6_domifmtu
 #define	in6_get_hw_ifid _bsd_in6_get_hw_ifid
+#define	in6_get_tmpifid _bsd_in6_get_tmpifid
 #define	in6_getlinkifnet _bsd_in6_getlinkifnet
 #define	in6_getpeeraddr _bsd_in6_getpeeraddr
 #define	in6_getscope _bsd_in6_getscope
 #define	in6_getscopezone _bsd_in6_getscopezone
 #define	in6_getsockaddr _bsd_in6_getsockaddr
-#define	in6_get_tmpifid _bsd_in6_get_tmpifid
 #define	in6_gif_init _bsd_in6_gif_init
 #define	in6_gif_ioctl _bsd_in6_gif_ioctl
 #define	in6_gif_output _bsd_in6_gif_output
 #define	in6_gif_setopts _bsd_in6_gif_setopts
 #define	in6_gif_uninit _bsd_in6_gif_uninit
 #define	in6_if2idlen _bsd_in6_if2idlen
+#define	in6_if_up _bsd_in6_if_up
+#define	in6_ifaddr_lock _bsd_in6_ifaddr_lock
 #define	in6_ifaddrhashtbl _bsd_in6_ifaddrhashtbl
 #define	in6_ifaddrhead _bsd_in6_ifaddrhead
 #define	in6_ifaddrhmask _bsd_in6_ifaddrhmask
-#define	in6_ifaddr_lock _bsd_in6_ifaddr_lock
-#define	in6ifa_ifpforlinklocal _bsd_in6ifa_ifpforlinklocal
-#define	in6ifa_ifpwithaddr _bsd_in6ifa_ifpwithaddr
-#define	in6ifa_ifwithaddr _bsd_in6ifa_ifwithaddr
-#define	in6ifa_llaonifp _bsd_in6ifa_llaonifp
 #define	in6_ifattach _bsd_in6_ifattach
 #define	in6_ifattach_destroy _bsd_in6_ifattach_destroy
 #define	in6_ifawithifp _bsd_in6_ifawithifp
 #define	in6_ifdetach _bsd_in6_ifdetach
 #define	in6_ifdetach_destroy _bsd_in6_ifdetach_destroy
-#define	in6if_do_dad _bsd_in6if_do_dad
 #define	in6_ifhasaddr _bsd_in6_ifhasaddr
-#define	in6_if_up _bsd_in6_if_up
 #define	in6_inithead _bsd_in6_inithead
 #define	in6_is_addr_deprecated _bsd_in6_is_addr_deprecated
 #define	in6_joingroup _bsd_in6_joingroup
@@ -2119,22 +2383,10 @@
 #define	in6_losing _bsd_in6_losing
 #define	in6_mapped_peeraddr _bsd_in6_mapped_peeraddr
 #define	in6_mapped_sockaddr _bsd_in6_mapped_sockaddr
-#define	in6mask0 _bsd_in6mask0
-#define	in6mask128 _bsd_in6mask128
 #define	in6_mask2len _bsd_in6_mask2len
-#define	in6mask32 _bsd_in6mask32
-#define	in6mask64 _bsd_in6mask64
-#define	in6mask96 _bsd_in6mask96
 #define	in6_matchlen _bsd_in6_matchlen
 #define	in6_maxmtu _bsd_in6_maxmtu
 #define	in6_mcast_loop _bsd_in6_mcast_loop
-#define	in6m_clear_recorded _bsd_in6m_clear_recorded
-#define	in6m_commit _bsd_in6m_commit
-#define	in6m_disconnect_locked _bsd_in6m_disconnect_locked
-#define	in6m_print _bsd_in6m_print
-#define	in6m_record_source _bsd_in6m_record_source
-#define	in6m_release_list_deferred _bsd_in6m_release_list_deferred
-#define	in6m_release_wait _bsd_in6m_release_wait
 #define	in6_multi_free_mtx _bsd_in6_multi_free_mtx
 #define	in6_multi_list_mtx _bsd_in6_multi_list_mtx
 #define	in6_multi_sx _bsd_in6_multi_sx
@@ -2167,10 +2419,10 @@
 #define	in6_selectsrc_socket _bsd_in6_selectsrc_socket
 #define	in6_setmaxmtu _bsd_in6_setmaxmtu
 #define	in6_setscope _bsd_in6_setscope
-#define	in6_sin_2_v4mapsin6 _bsd_in6_sin_2_v4mapsin6
-#define	in6_sin_2_v4mapsin6_in_sock _bsd_in6_sin_2_v4mapsin6_in_sock
 #define	in6_sin6_2_sin _bsd_in6_sin6_2_sin
 #define	in6_sin6_2_sin_in_sock _bsd_in6_sin6_2_sin_in_sock
+#define	in6_sin_2_v4mapsin6 _bsd_in6_sin_2_v4mapsin6
+#define	in6_sin_2_v4mapsin6_in_sock _bsd_in6_sin_2_v4mapsin6_in_sock
 #define	in6_sockaddr _bsd_in6_sockaddr
 #define	in6_splitscope _bsd_in6_splitscope
 #define	in6_src_ioctl _bsd_in6_src_ioctl
@@ -2179,6 +2431,25 @@
 #define	in6_tmpifadd _bsd_in6_tmpifadd
 #define	in6_update_ifa _bsd_in6_update_ifa
 #define	in6_v4mapsin6_sockaddr _bsd_in6_v4mapsin6_sockaddr
+#define	in6addr_linklocal_allrouters _bsd_in6addr_linklocal_allrouters
+#define	in6addr_linklocal_allv2routers _bsd_in6addr_linklocal_allv2routers
+#define	in6if_do_dad _bsd_in6if_do_dad
+#define	in6ifa_ifpforlinklocal _bsd_in6ifa_ifpforlinklocal
+#define	in6ifa_ifpwithaddr _bsd_in6ifa_ifpwithaddr
+#define	in6ifa_ifwithaddr _bsd_in6ifa_ifwithaddr
+#define	in6ifa_llaonifp _bsd_in6ifa_llaonifp
+#define	in6m_clear_recorded _bsd_in6m_clear_recorded
+#define	in6m_commit _bsd_in6m_commit
+#define	in6m_disconnect_locked _bsd_in6m_disconnect_locked
+#define	in6m_print _bsd_in6m_print
+#define	in6m_record_source _bsd_in6m_record_source
+#define	in6m_release_list_deferred _bsd_in6m_release_list_deferred
+#define	in6m_release_wait _bsd_in6m_release_wait
+#define	in6mask0 _bsd_in6mask0
+#define	in6mask128 _bsd_in6mask128
+#define	in6mask32 _bsd_in6mask32
+#define	in6mask64 _bsd_in6mask64
+#define	in6mask96 _bsd_in6mask96
 #define	in_addmulti _bsd_in_addmulti
 #define	in_addprefix _bsd_in_addprefix
 #define	in_addword _bsd_in_addword
@@ -2190,17 +2461,6 @@
 #define	in_delayed_cksum _bsd_in_delayed_cksum
 #define	in_domifattach _bsd_in_domifattach
 #define	in_domifdetach _bsd_in_domifdetach
-#define	inet6ctlerrmap _bsd_inet6ctlerrmap
-#define	inet6domain _bsd_inet6domain
-#define	inet6_pfil_head _bsd_inet6_pfil_head
-#define	inet6_pfil_hook _bsd_inet6_pfil_hook
-#define	inet6sw _bsd_inet6sw
-#define	inetctlerrmap _bsd_inetctlerrmap
-#define	inetdomain _bsd_inetdomain
-#define	inet_ntoa_r _bsd_inet_ntoa_r
-#define	inet_pfil_head _bsd_inet_pfil_head
-#define	inet_pfil_hook _bsd_inet_pfil_hook
-#define	inetsw _bsd_inetsw
 #define	in_getpeeraddr _bsd_in_getpeeraddr
 #define	in_getsockaddr _bsd_in_getsockaddr
 #define	in_gif_init _bsd_in_gif_init
@@ -2214,19 +2474,15 @@
 #define	in_gre_setopts _bsd_in_gre_setopts
 #define	in_gre_uninit _bsd_in_gre_uninit
 #define	in_ifaddr_broadcast _bsd_in_ifaddr_broadcast
+#define	in_ifaddr_lock _bsd_in_ifaddr_lock
 #define	in_ifaddrhashtbl _bsd_in_ifaddrhashtbl
 #define	in_ifaddrhead _bsd_in_ifaddrhead
 #define	in_ifaddrhmask _bsd_in_ifaddrhmask
-#define	in_ifaddr_lock _bsd_in_ifaddr_lock
 #define	in_ifadown _bsd_in_ifadown
 #define	in_ifdetach _bsd_in_ifdetach
 #define	in_ifhasaddr _bsd_in_ifhasaddr
 #define	in_ifscrub_all _bsd_in_ifscrub_all
 #define	in_inithead _bsd_in_inithead
-#define	init_machclk _bsd_init_machclk
-#define	init_sin6 _bsd_init_sin6
-#define	init_sleepqueues _bsd_init_sleepqueues
-#define	init_unrhdr _bsd_init_unrhdr
 #define	in_joingroup _bsd_in_joingroup
 #define	in_joingroup_locked _bsd_in_joingroup_locked
 #define	in_leavegroup _bsd_in_leavegroup
@@ -2235,20 +2491,10 @@
 #define	in_localip _bsd_in_localip
 #define	in_losing _bsd_in_losing
 #define	in_mcast_loop _bsd_in_mcast_loop
-#define	inm_clear_recorded _bsd_inm_clear_recorded
-#define	inm_commit _bsd_inm_commit
-#define	inm_disconnect _bsd_inm_disconnect
-#define	inm_lookup _bsd_inm_lookup
-#define	inm_lookup_locked _bsd_inm_lookup_locked
-#define	inm_print _bsd_inm_print
-#define	inm_record_source _bsd_inm_record_source
-#define	inm_release_deferred _bsd_inm_release_deferred
-#define	inm_release_list_deferred _bsd_inm_release_list_deferred
 #define	in_multi_free_mtx _bsd_in_multi_free_mtx
 #define	in_multi_list_mtx _bsd_in_multi_list_mtx
 #define	in_multi_sx _bsd_in_multi_sx
-#define	inp_4tuple_get _bsd_inp_4tuple_get
-#define	inp_apply_all _bsd_inp_apply_all
+#define	in_pcb_lport _bsd_in_pcb_lport
 #define	in_pcballoc _bsd_in_pcballoc
 #define	in_pcbbind _bsd_in_pcbbind
 #define	in_pcbbind_check_bindmulti _bsd_in_pcbbind_check_bindmulti
@@ -2269,7 +2515,6 @@
 #define	in_pcblookup _bsd_in_pcblookup
 #define	in_pcblookup_local _bsd_in_pcblookup_local
 #define	in_pcblookup_mbuf _bsd_in_pcblookup_mbuf
-#define	in_pcb_lport _bsd_in_pcb_lport
 #define	in_pcbnotifyall _bsd_in_pcbnotifyall
 #define	in_pcbpurgeif0 _bsd_in_pcbpurgeif0
 #define	in_pcbref _bsd_in_pcbref
@@ -2280,6 +2525,37 @@
 #define	in_pcbrele_wlocked _bsd_in_pcbrele_wlocked
 #define	in_pcbsosetlabel _bsd_in_pcbsosetlabel
 #define	in_pcbtoxinpcb _bsd_in_pcbtoxinpcb
+#define	in_pseudo _bsd_in_pseudo
+#define	in_rtalloc_ign _bsd_in_rtalloc_ign
+#define	in_rtredirect _bsd_in_rtredirect
+#define	in_scrubprefix _bsd_in_scrubprefix
+#define	in_sockaddr _bsd_in_sockaddr
+#define	inet6_pfil_head _bsd_inet6_pfil_head
+#define	inet6_pfil_hook _bsd_inet6_pfil_hook
+#define	inet6ctlerrmap _bsd_inet6ctlerrmap
+#define	inet6domain _bsd_inet6domain
+#define	inet6sw _bsd_inet6sw
+#define	inet_ntoa_r _bsd_inet_ntoa_r
+#define	inet_pfil_head _bsd_inet_pfil_head
+#define	inet_pfil_hook _bsd_inet_pfil_hook
+#define	inetctlerrmap _bsd_inetctlerrmap
+#define	inetdomain _bsd_inetdomain
+#define	inetsw _bsd_inetsw
+#define	init_machclk _bsd_init_machclk
+#define	init_sin6 _bsd_init_sin6
+#define	init_sleepqueues _bsd_init_sleepqueues
+#define	init_unrhdr _bsd_init_unrhdr
+#define	inm_clear_recorded _bsd_inm_clear_recorded
+#define	inm_commit _bsd_inm_commit
+#define	inm_disconnect _bsd_inm_disconnect
+#define	inm_lookup _bsd_inm_lookup
+#define	inm_lookup_locked _bsd_inm_lookup_locked
+#define	inm_print _bsd_inm_print
+#define	inm_record_source _bsd_inm_record_source
+#define	inm_release_deferred _bsd_inm_release_deferred
+#define	inm_release_list_deferred _bsd_inm_release_list_deferred
+#define	inp_4tuple_get _bsd_inp_4tuple_get
+#define	inp_apply_all _bsd_inp_apply_all
 #define	inp_freemoptions _bsd_inp_freemoptions
 #define	inp_getmoptions _bsd_inp_getmoptions
 #define	inp_inpcbtosocket _bsd_inp_inpcbtosocket
@@ -2289,15 +2565,10 @@
 #define	inp_rlock _bsd_inp_rlock
 #define	inp_runlock _bsd_inp_runlock
 #define	inp_setmoptions _bsd_inp_setmoptions
-#define	in_pseudo _bsd_in_pseudo
 #define	inp_so_options _bsd_inp_so_options
 #define	inp_to_cpuid _bsd_inp_to_cpuid
 #define	inp_wlock _bsd_inp_wlock
 #define	inp_wunlock _bsd_inp_wunlock
-#define	in_rtalloc_ign _bsd_in_rtalloc_ign
-#define	in_rtredirect _bsd_in_rtredirect
-#define	in_scrubprefix _bsd_in_scrubprefix
-#define	in_sockaddr _bsd_in_sockaddr
 #define	intr_event_add_handler _bsd_intr_event_add_handler
 #define	intr_event_create _bsd_intr_event_create
 #define	ip4_ah_net_deflev _bsd_ip4_ah_net_deflev
@@ -2332,8 +2603,8 @@
 #define	ip6_fragment _bsd_ip6_fragment
 #define	ip6_freemoptions _bsd_ip6_freemoptions
 #define	ip6_freepcbopts _bsd_ip6_freepcbopts
-#define	ip6_getmoptions _bsd_ip6_getmoptions
 #define	ip6_get_prevhdr _bsd_ip6_get_prevhdr
+#define	ip6_getmoptions _bsd_ip6_getmoptions
 #define	ip6_hdrnestlimit _bsd_ip6_hdrnestlimit
 #define	ip6_init _bsd_ip6_init
 #define	ip6_initpktopts _bsd_ip6_initpktopts
@@ -2372,8 +2643,6 @@
 #define	ip6_output _bsd_ip6_output
 #define	ip6_prefer_tempaddr _bsd_ip6_prefer_tempaddr
 #define	ip6_process_hopopts _bsd_ip6_process_hopopts
-#define	ip6proto_register _bsd_ip6proto_register
-#define	ip6proto_unregister _bsd_ip6proto_unregister
 #define	ip6_protox _bsd_ip6_protox
 #define	ip6_randomflowlabel _bsd_ip6_randomflowlabel
 #define	ip6_randomid _bsd_ip6_randomid
@@ -2386,7 +2655,6 @@
 #define	ip6_setmoptions _bsd_ip6_setmoptions
 #define	ip6_setpktopts _bsd_ip6_setpktopts
 #define	ip6_sprintf _bsd_ip6_sprintf
-#define	ip6stat _bsd_ip6stat
 #define	ip6_temp_preferred_lifetime _bsd_ip6_temp_preferred_lifetime
 #define	ip6_temp_regen_advance _bsd_ip6_temp_regen_advance
 #define	ip6_temp_valid_lifetime _bsd_ip6_temp_valid_lifetime
@@ -2396,9 +2664,10 @@
 #define	ip6_use_deprecated _bsd_ip6_use_deprecated
 #define	ip6_use_tempaddr _bsd_ip6_use_tempaddr
 #define	ip6_v6only _bsd_ip6_v6only
+#define	ip6proto_register _bsd_ip6proto_register
+#define	ip6proto_unregister _bsd_ip6proto_unregister
+#define	ip6stat _bsd_ip6stat
 #define	ip_checkrouteralert _bsd_ip_checkrouteralert
-#define	ipcomp_enable _bsd_ipcomp_enable
-#define	ipcompstat _bsd_ipcompstat
 #define	ip_ctloutput _bsd_ip_ctloutput
 #define	ip_defttl _bsd_ip_defttl
 #define	ip_divert_ptr _bsd_ip_divert_ptr
@@ -2415,7 +2684,6 @@
 #define	ip_encap_unregister_srcaddr _bsd_ip_encap_unregister_srcaddr
 #define	ip_fillid _bsd_ip_fillid
 #define	ip_forward _bsd_ip_forward
-#define	ipforwarding _bsd_ipforwarding
 #define	ip_fragment _bsd_ip_fragment
 #define	ip_fw_chk_ptr _bsd_ip_fw_chk_ptr
 #define	ip_fw_ctl_ptr _bsd_ip_fw_ctl_ptr
@@ -2444,6 +2712,21 @@
 #define	ip_optcopy _bsd_ip_optcopy
 #define	ip_output _bsd_ip_output
 #define	ip_pcbopts _bsd_ip_pcbopts
+#define	ip_protox _bsd_ip_protox
+#define	ip_reass _bsd_ip_reass
+#define	ip_rsvp_done _bsd_ip_rsvp_done
+#define	ip_rsvp_force_done _bsd_ip_rsvp_force_done
+#define	ip_rsvp_init _bsd_ip_rsvp_init
+#define	ip_rsvp_vif _bsd_ip_rsvp_vif
+#define	ip_rsvpd _bsd_ip_rsvpd
+#define	ip_savecontrol _bsd_ip_savecontrol
+#define	ip_slowtimo _bsd_ip_slowtimo
+#define	ip_srcroute _bsd_ip_srcroute
+#define	ip_stripoptions _bsd_ip_stripoptions
+#define	ip_tryforward _bsd_ip_tryforward
+#define	ipcomp_enable _bsd_ipcomp_enable
+#define	ipcompstat _bsd_ipcompstat
+#define	ipforwarding _bsd_ipforwarding
 #define	ipport_firstauto _bsd_ipport_firstauto
 #define	ipport_hifirstauto _bsd_ipport_hifirstauto
 #define	ipport_hilastauto _bsd_ipport_hilastauto
@@ -2459,23 +2742,15 @@
 #define	ipport_tcpallocs _bsd_ipport_tcpallocs
 #define	ipproto_register _bsd_ipproto_register
 #define	ipproto_unregister _bsd_ipproto_unregister
-#define	ip_protox _bsd_ip_protox
-#define	ip_reass _bsd_ip_reass
 #define	ipreass_drain _bsd_ipreass_drain
 #define	ipreass_init _bsd_ipreass_init
 #define	ipreass_slowtimo _bsd_ipreass_slowtimo
-#define	ip_rsvpd _bsd_ip_rsvpd
-#define	ip_rsvp_done _bsd_ip_rsvp_done
-#define	ip_rsvp_force_done _bsd_ip_rsvp_force_done
-#define	ip_rsvp_init _bsd_ip_rsvp_init
-#define	ip_rsvp_vif _bsd_ip_rsvp_vif
-#define	ip_savecontrol _bsd_ip_savecontrol
 #define	ipsec4_capability _bsd_ipsec4_capability
 #define	ipsec4_checkpolicy _bsd_ipsec4_checkpolicy
 #define	ipsec4_common_input_cb _bsd_ipsec4_common_input_cb
 #define	ipsec4_forward _bsd_ipsec4_forward
-#define	ipsec4_input _bsd_ipsec4_input
 #define	ipsec4_in_reject _bsd_ipsec4_in_reject
+#define	ipsec4_input _bsd_ipsec4_input
 #define	ipsec4_output _bsd_ipsec4_output
 #define	ipsec4_pcbctl _bsd_ipsec4_pcbctl
 #define	ipsec4_process_packet _bsd_ipsec4_process_packet
@@ -2485,8 +2760,8 @@
 #define	ipsec6_checkpolicy _bsd_ipsec6_checkpolicy
 #define	ipsec6_common_input_cb _bsd_ipsec6_common_input_cb
 #define	ipsec6_forward _bsd_ipsec6_forward
-#define	ipsec6_input _bsd_ipsec6_input
 #define	ipsec6_in_reject _bsd_ipsec6_in_reject
+#define	ipsec6_input _bsd_ipsec6_input
 #define	ipsec6_output _bsd_ipsec6_output
 #define	ipsec6_pcbctl _bsd_ipsec6_pcbctl
 #define	ipsec6_process_packet _bsd_ipsec6_process_packet
@@ -2505,8 +2780,8 @@
 #define	ipsec_hhh_in _bsd_ipsec_hhh_in
 #define	ipsec_hhh_out _bsd_ipsec_hhh_out
 #define	ipsec_if_input _bsd_ipsec_if_input
-#define	ipsec_initialized _bsd_ipsec_initialized
 #define	ipsec_init_pcbpolicy _bsd_ipsec_init_pcbpolicy
+#define	ipsec_initialized _bsd_ipsec_initialized
 #define	ipsec_newisr _bsd_ipsec_newisr
 #define	ipsec_process_done _bsd_ipsec_process_done
 #define	ipsec_run_hhooks _bsd_ipsec_run_hhooks
@@ -2515,12 +2790,8 @@
 #define	ipsec_updateid _bsd_ipsec_updateid
 #define	ipsec_updatereplay _bsd_ipsec_updatereplay
 #define	ipsec_warn_interval _bsd_ipsec_warn_interval
-#define	ip_slowtimo _bsd_ip_slowtimo
-#define	ip_srcroute _bsd_ip_srcroute
 #define	ipstat _bsd_ipstat
-#define	ip_stripoptions _bsd_ip_stripoptions
 #define	iptime _bsd_iptime
-#define	ip_tryforward _bsd_ip_tryforward
 #define	ipv4_ipsec_support _bsd_ipv4_ipsec_support
 #define	ipv6_ipsec_support _bsd_ipv6_ipsec_support
 #define	itimerfix _bsd_itimerfix
@@ -2542,8 +2813,8 @@
 #define	kbd_register _bsd_kbd_register
 #define	kbd_release _bsd_kbd_release
 #define	kbd_set_maps _bsd_kbd_set_maps
-#define	kbdsw _bsd_kbdsw
 #define	kbd_unregister _bsd_kbd_unregister
+#define	kbdsw _bsd_kbdsw
 #define	kdebug_ipsecrequest_level _bsd_kdebug_ipsecrequest_level
 #define	kdebug_mbuf _bsd_kdebug_mbuf
 #define	kdebug_mbufhdr _bsd_kdebug_mbufhdr
@@ -2555,10 +2826,10 @@
 #define	kdebug_secasv _bsd_kdebug_secasv
 #define	kdebug_secasv_state _bsd_kdebug_secasv_state
 #define	kdebug_secpolicy _bsd_kdebug_secpolicy
-#define	kdebug_secpolicyindex _bsd_kdebug_secpolicyindex
-#define	kdebug_secpolicyindex_dir _bsd_kdebug_secpolicyindex_dir
 #define	kdebug_secpolicy_policy _bsd_kdebug_secpolicy_policy
 #define	kdebug_secpolicy_state _bsd_kdebug_secpolicy_state
+#define	kdebug_secpolicyindex _bsd_kdebug_secpolicyindex
+#define	kdebug_secpolicyindex_dir _bsd_kdebug_secpolicyindex_dir
 #define	kdebug_sockaddr _bsd_kdebug_sockaddr
 #define	kernel_sysctl _bsd_kernel_sysctl
 #define	key_addref _bsd_key_addref
@@ -2570,7 +2841,6 @@
 #define	key_bumpspgen _bsd_key_bumpspgen
 #define	key_debug_level _bsd_key_debug_level
 #define	key_delete_xform _bsd_key_delete_xform
-#define	keydomain _bsd_keydomain
 #define	key_freereg _bsd_key_freereg
 #define	key_freesav _bsd_key_freesav
 #define	key_freesp _bsd_key_freesp
@@ -2593,10 +2863,11 @@
 #define	key_sockaddrcmp_withmask _bsd_key_sockaddrcmp_withmask
 #define	key_sp2msg _bsd_key_sp2msg
 #define	key_spdacquire _bsd_key_spdacquire
-#define	keystat _bsd_keystat
-#define	keysw _bsd_keysw
 #define	key_unregister_ifnet _bsd_key_unregister_ifnet
 #define	key_usrreqs _bsd_key_usrreqs
+#define	keydomain _bsd_keydomain
+#define	keystat _bsd_keystat
+#define	keysw _bsd_keysw
 #define	khelp_add_hhook _bsd_khelp_add_hhook
 #define	khelp_deregister_helper _bsd_khelp_deregister_helper
 #define	khelp_destroy_osd _bsd_khelp_destroy_osd
@@ -2659,57 +2930,14 @@
 #define	lagg_input_p _bsd_lagg_input_p
 #define	lagg_linkstate_p _bsd_lagg_linkstate_p
 #define	lagg_list _bsd_lagg_list
+#define	le_uuid_dec _bsd_le_uuid_dec
+#define	le_uuid_enc _bsd_le_uuid_enc
 #define	led_create _bsd_led_create
 #define	led_create_state _bsd_led_create_state
 #define	led_destroy _bsd_led_destroy
 #define	led_set _bsd_led_set
 #define	legal_vif_num _bsd_legal_vif_num
 #define	lem_txrx _bsd_lem_txrx
-#define	le_uuid_dec _bsd_le_uuid_dec
-#define	le_uuid_enc _bsd_le_uuid_enc
-#define	LibAliasAddServer _bsd_LibAliasAddServer
-#define	LibAliasAttachHandlers _bsd_LibAliasAttachHandlers
-#define	LibAliasCheckNewLink _bsd_LibAliasCheckNewLink
-#define	LibAliasDetachHandlers _bsd_LibAliasDetachHandlers
-#define	LibAliasFragmentIn _bsd_LibAliasFragmentIn
-#define	LibAliasGetFragment _bsd_LibAliasGetFragment
-#define	LibAliasIn _bsd_LibAliasIn
-#define	LibAliasInit _bsd_LibAliasInit
-#define	LibAliasInternetChecksum _bsd_LibAliasInternetChecksum
-#define	LibAliasOut _bsd_LibAliasOut
-#define	LibAliasOutTry _bsd_LibAliasOutTry
-#define	LibAliasProxyRule _bsd_LibAliasProxyRule
-#define	LibAliasRedirectAddr _bsd_LibAliasRedirectAddr
-#define	LibAliasRedirectDelete _bsd_LibAliasRedirectDelete
-#define	LibAliasRedirectDynamic _bsd_LibAliasRedirectDynamic
-#define	LibAliasRedirectPort _bsd_LibAliasRedirectPort
-#define	LibAliasRedirectProto _bsd_LibAliasRedirectProto
-#define	LibAliasSaveFragment _bsd_LibAliasSaveFragment
-#define	LibAliasSetAddress _bsd_LibAliasSetAddress
-#define	LibAliasSetFWBase _bsd_LibAliasSetFWBase
-#define	LibAliasSetMode _bsd_LibAliasSetMode
-#define	LibAliasSetSkinnyPort _bsd_LibAliasSetSkinnyPort
-#define	LibAliasSetTarget _bsd_LibAliasSetTarget
-#define	LibAliasUnaliasOut _bsd_LibAliasUnaliasOut
-#define	LibAliasUninit _bsd_LibAliasUninit
-#define	_libmd_SHA224_Final _bsd__libmd_SHA224_Final
-#define	_libmd_SHA224_Init _bsd__libmd_SHA224_Init
-#define	_libmd_SHA224_Update _bsd__libmd_SHA224_Update
-#define	_libmd_SHA512_224_Final _bsd__libmd_SHA512_224_Final
-#define	_libmd_SHA512_224_Init _bsd__libmd_SHA512_224_Init
-#define	_libmd_SHA512_224_Update _bsd__libmd_SHA512_224_Update
-#define	_libmd_SHA512_256_Final _bsd__libmd_SHA512_256_Final
-#define	_libmd_SHA512_256_Init _bsd__libmd_SHA512_256_Init
-#define	_libmd_SHA512_256_Update _bsd__libmd_SHA512_256_Update
-#define	_libmd_SKEIN1024_Final _bsd__libmd_SKEIN1024_Final
-#define	_libmd_SKEIN1024_Init _bsd__libmd_SKEIN1024_Init
-#define	_libmd_SKEIN1024_Update _bsd__libmd_SKEIN1024_Update
-#define	_libmd_SKEIN256_Final _bsd__libmd_SKEIN256_Final
-#define	_libmd_SKEIN256_Init _bsd__libmd_SKEIN256_Init
-#define	_libmd_SKEIN256_Update _bsd__libmd_SKEIN256_Update
-#define	_libmd_SKEIN512_Final _bsd__libmd_SKEIN512_Final
-#define	_libmd_SKEIN512_Init _bsd__libmd_SKEIN512_Init
-#define	_libmd_SKEIN512_Update _bsd__libmd_SKEIN512_Update
 #define	link_alloc_sdl _bsd_link_alloc_sdl
 #define	link_free_sdl _bsd_link_free_sdl
 #define	link_init_sdl _bsd_link_init_sdl
@@ -2718,8 +2946,8 @@
 #define	lla_rt_output _bsd_lla_rt_output
 #define	llentry_alloc _bsd_llentry_alloc
 #define	llentry_free _bsd_llentry_free
-#define	lltable_allocate_htbl _bsd_lltable_allocate_htbl
 #define	lltable_alloc_entry _bsd_lltable_alloc_entry
+#define	lltable_allocate_htbl _bsd_lltable_allocate_htbl
 #define	lltable_calc_llheader _bsd_lltable_calc_llheader
 #define	lltable_delete_addr _bsd_lltable_delete_addr
 #define	lltable_drop_entry_queue _bsd_lltable_drop_entry_queue
@@ -2737,11 +2965,11 @@
 #define	lltable_try_set_entry_addr _bsd_lltable_try_set_entry_addr
 #define	lltable_unlink_entry _bsd_lltable_unlink_entry
 #define	lltable_update_ifaddr _bsd_lltable_update_ifaddr
-#define	lock_classes _bsd_lock_classes
 #define	lock_class_mtx_sleep _bsd_lock_class_mtx_sleep
 #define	lock_class_mtx_spin _bsd_lock_class_mtx_spin
 #define	lock_class_rw _bsd_lock_class_rw
 #define	lock_class_sx _bsd_lock_class_sx
+#define	lock_classes _bsd_lock_classes
 #define	lock_destroy _bsd_lock_destroy
 #define	lock_init _bsd_lock_init
 #define	log _bsd_log
@@ -2750,40 +2978,9 @@
 #define	looutput _bsd_looutput
 #define	lpc_pwr_read _bsd_lpc_pwr_read
 #define	lpc_pwr_write _bsd_lpc_pwr_write
-#define	M_80211_CRYPTO _bsd_M_80211_CRYPTO
-#define	M_80211_MESH_GT_RT _bsd_M_80211_MESH_GT_RT
-#define	M_80211_MESH_PERR _bsd_M_80211_MESH_PERR
-#define	M_80211_MESH_PREP _bsd_M_80211_MESH_PREP
-#define	M_80211_MESH_PREQ _bsd_M_80211_MESH_PREQ
-#define	M_80211_MESH_RT _bsd_M_80211_MESH_RT
-#define	M_80211_NODE _bsd_M_80211_NODE
-#define	M_80211_NODE_IE _bsd_M_80211_NODE_IE
-#define	M_80211_RATECTL _bsd_M_80211_RATECTL
-#define	M_80211_SCAN _bsd_M_80211_SCAN
-#define	M_80211_VAP _bsd_M_80211_VAP
-#define	M_ACCF _bsd_M_ACCF
-#define	machclk_freq _bsd_machclk_freq
-#define	machclk_per_tick _bsd_machclk_per_tick
-#define	machclk_usepcc _bsd_machclk_usepcc
 #define	m_adj _bsd_m_adj
-#define	make_dev _bsd_make_dev
-#define	make_dev_alias _bsd_make_dev_alias
-#define	make_dev_args_init_impl _bsd_make_dev_args_init_impl
-#define	make_dev_s _bsd_make_dev_s
-#define	M_ALIAS _bsd_M_ALIAS
-#define	mallocarray _bsd_mallocarray
-#define	malloc_init _bsd_malloc_init
-#define	malloc_uninit _bsd_malloc_uninit
 #define	m_append _bsd_m_append
 #define	m_apply _bsd_m_apply
-#define	maxpipekva _bsd_maxpipekva
-#define	mb_dupcl _bsd_mb_dupcl
-#define	mb_free_ext _bsd_mb_free_ext
-#define	mb_free_notready _bsd_mb_free_notready
-#define	M_BPF _bsd_M_BPF
-#define	M_BPFJIT _bsd_M_BPFJIT
-#define	mb_use_ext_pgs _bsd_mb_use_ext_pgs
-#define	M_CAMSIM _bsd_M_CAMSIM
 #define	m_cat _bsd_m_cat
 #define	m_catpkt _bsd_m_catpkt
 #define	m_checkalignment _bsd_m_checkalignment
@@ -2795,19 +2992,15 @@
 #define	m_copym _bsd_m_copym
 #define	m_copypacket _bsd_m_copypacket
 #define	m_copyup _bsd_m_copyup
-#define	M_CRYPTO_DATA _bsd_M_CRYPTO_DATA
 #define	m_defrag _bsd_m_defrag
 #define	m_demote _bsd_m_demote
 #define	m_demote_pkthdr _bsd_m_demote_pkthdr
-#define	M_DEVBUF _bsd_M_DEVBUF
 #define	m_devget _bsd_m_devget
 #define	m_dispose_extcontrolm _bsd_m_dispose_extcontrolm
 #define	m_dup _bsd_m_dup
 #define	m_dup_pkthdr _bsd_m_dup_pkthdr
-#define	mesh_airtime_calc _bsd_mesh_airtime_calc
 #define	m_ether_tcpip_hash _bsd_m_ether_tcpip_hash
 #define	m_ether_tcpip_hash_init _bsd_m_ether_tcpip_hash_init
-#define	M_EVDEV _bsd_M_EVDEV
 #define	m_extadd _bsd_m_extadd
 #define	m_fixhdr _bsd_m_fixhdr
 #define	m_freem _bsd_m_freem
@@ -2815,17 +3008,56 @@
 #define	m_getjcl _bsd_m_getjcl
 #define	m_getm2 _bsd_m_getm2
 #define	m_getptr _bsd_m_getptr
-#define	M_GIF _bsd_M_GIF
-#define	M_GRE _bsd_M_GRE
+#define	m_length _bsd_m_length
+#define	m_makespace _bsd_m_makespace
+#define	m_mbuftouio _bsd_m_mbuftouio
+#define	m_megapullup _bsd_m_megapullup
+#define	m_move_pkthdr _bsd_m_move_pkthdr
+#define	m_pad _bsd_m_pad
+#define	m_pkthdr_init _bsd_m_pkthdr_init
+#define	m_prepend _bsd_m_prepend
+#define	m_print _bsd_m_print
+#define	m_pulldown _bsd_m_pulldown
+#define	m_pullup _bsd_m_pullup
+#define	m_raopt _bsd_m_raopt
+#define	m_sanity _bsd_m_sanity
+#define	m_snd_tag_destroy _bsd_m_snd_tag_destroy
+#define	m_snd_tag_init _bsd_m_snd_tag_init
+#define	m_split _bsd_m_split
+#define	m_striphdr _bsd_m_striphdr
+#define	m_tag_alloc _bsd_m_tag_alloc
+#define	m_tag_copy _bsd_m_tag_copy
+#define	m_tag_copy_chain _bsd_m_tag_copy_chain
+#define	m_tag_delete _bsd_m_tag_delete
+#define	m_tag_delete_chain _bsd_m_tag_delete_chain
+#define	m_tag_delete_nonpersistent _bsd_m_tag_delete_nonpersistent
+#define	m_tag_free_default _bsd_m_tag_free_default
+#define	m_tag_locate _bsd_m_tag_locate
+#define	m_uiotombuf _bsd_m_uiotombuf
+#define	m_unmappedtouio _bsd_m_unmappedtouio
+#define	m_unshare _bsd_m_unshare
+#define	machclk_freq _bsd_machclk_freq
+#define	machclk_per_tick _bsd_machclk_per_tick
+#define	machclk_usepcc _bsd_machclk_usepcc
+#define	make_dev _bsd_make_dev
+#define	make_dev_alias _bsd_make_dev_alias
+#define	make_dev_args_init_impl _bsd_make_dev_args_init_impl
+#define	make_dev_s _bsd_make_dev_s
+#define	malloc_init _bsd_malloc_init
+#define	malloc_uninit _bsd_malloc_uninit
+#define	mallocarray _bsd_mallocarray
+#define	maxpipekva _bsd_maxpipekva
+#define	mb_dupcl _bsd_mb_dupcl
+#define	mb_free_ext _bsd_mb_free_ext
+#define	mb_free_notready _bsd_mb_free_notready
+#define	mb_use_ext_pgs _bsd_mb_use_ext_pgs
+#define	mesh_airtime_calc _bsd_mesh_airtime_calc
 #define	mgt_subtype_name _bsd_mgt_subtype_name
-#define	M_IFADDR _bsd_M_IFADDR
-#define	M_IFMADDR _bsd_M_IFMADDR
+#define	mi_startup _bsd_mi_startup
 #define	mii_attach _bsd_mii_attach
 #define	mii_bitbang_readreg _bsd_mii_bitbang_readreg
 #define	mii_bitbang_sync _bsd_mii_bitbang_sync
 #define	mii_bitbang_writereg _bsd_mii_bitbang_writereg
-#define	miibus_devclass _bsd_miibus_devclass
-#define	miibus_driver _bsd_miibus_driver
 #define	mii_dev_mac_match _bsd_mii_dev_mac_match
 #define	mii_dev_mac_softc _bsd_mii_dev_mac_softc
 #define	mii_fdt_contype_from_name _bsd_mii_fdt_contype_from_name
@@ -2851,19 +3083,8 @@
 #define	mii_phy_update _bsd_mii_phy_update
 #define	mii_pollstat _bsd_mii_pollstat
 #define	mii_tick _bsd_mii_tick
-#define	M_IOV _bsd_M_IOV
-#define	M_IP6MADDR _bsd_M_IP6MADDR
-#define	M_IP6NDP _bsd_M_IP6NDP
-#define	M_IPSEC_INPCB _bsd_M_IPSEC_INPCB
-#define	M_IPSEC_MISC _bsd_M_IPSEC_MISC
-#define	M_IPSEC_SA _bsd_M_IPSEC_SA
-#define	M_IPSEC_SAH _bsd_M_IPSEC_SAH
-#define	M_IPSEC_SAQ _bsd_M_IPSEC_SAQ
-#define	M_IPSEC_SAR _bsd_M_IPSEC_SAR
-#define	M_IPSEC_SP _bsd_M_IPSEC_SP
-#define	M_IPSEC_SPDCACHE _bsd_M_IPSEC_SPDCACHE
-#define	M_IPSEC_SR _bsd_M_IPSEC_SR
-#define	mi_startup _bsd_mi_startup
+#define	miibus_devclass _bsd_miibus_devclass
+#define	miibus_driver _bsd_miibus_driver
 #define	mld_change_state _bsd_mld_change_state
 #define	mld_domifattach _bsd_mld_domifattach
 #define	mld_domifdetach _bsd_mld_domifdetach
@@ -2871,10 +3092,6 @@
 #define	mld_ifdetach _bsd_mld_ifdetach
 #define	mld_input _bsd_mld_input
 #define	mld_slowtimo _bsd_mld_slowtimo
-#define	m_length _bsd_m_length
-#define	M_LLTABLE _bsd_M_LLTABLE
-#define	m_makespace _bsd_m_makespace
-#define	m_mbuftouio _bsd_m_mbuftouio
 #define	mmc_devclass _bsd_mmc_devclass
 #define	mmc_driver _bsd_mmc_driver
 #define	mmc_send_ext_csd _bsd_mmc_send_ext_csd
@@ -2883,77 +3100,36 @@
 #define	mmc_switch_status _bsd_mmc_switch_status
 #define	mmc_wait_for_app_cmd _bsd_mmc_wait_for_app_cmd
 #define	mmc_wait_for_cmd _bsd_mmc_wait_for_cmd
-#define	m_megapullup _bsd_m_megapullup
-#define	m_move_pkthdr _bsd_m_move_pkthdr
-#define	M_NVME _bsd_M_NVME
 #define	module_lookupbyname _bsd_module_lookupbyname
 #define	module_register _bsd_module_register
 #define	module_register_init _bsd_module_register_init
 #define	module_release _bsd_module_release
 #define	modules_sx _bsd_modules_sx
-#define	M_OFWPROP _bsd_M_OFWPROP
-#define	m_pad _bsd_m_pad
-#define	M_PCB _bsd_M_PCB
-#define	M_PFHASH _bsd_M_PFHASH
-#define	m_pkthdr_init _bsd_m_pkthdr_init
-#define	m_prepend _bsd_m_prepend
-#define	m_print _bsd_m_print
-#define	m_pulldown _bsd_m_pulldown
-#define	m_pullup _bsd_m_pullup
-#define	m_raopt _bsd_m_raopt
 #define	mrt6_ioctl _bsd_mrt6_ioctl
-#define	M_RTABLE _bsd_M_RTABLE
 #define	mrt_ioctl _bsd_mrt_ioctl
-#define	M_RTWN_PRIV _bsd_M_RTWN_PRIV
-#define	m_sanity _bsd_m_sanity
-#define	m_snd_tag_destroy _bsd_m_snd_tag_destroy
-#define	m_snd_tag_init _bsd_m_snd_tag_init
-#define	M_SONAME _bsd_M_SONAME
-#define	m_split _bsd_m_split
-#define	m_striphdr _bsd_m_striphdr
-#define	m_tag_alloc _bsd_m_tag_alloc
-#define	m_tag_copy _bsd_m_tag_copy
-#define	m_tag_copy_chain _bsd_m_tag_copy_chain
-#define	m_tag_delete _bsd_m_tag_delete
-#define	m_tag_delete_chain _bsd_m_tag_delete_chain
-#define	m_tag_delete_nonpersistent _bsd_m_tag_delete_nonpersistent
-#define	m_tag_free_default _bsd_m_tag_free_default
-#define	m_tag_locate _bsd_m_tag_locate
-#define	M_TAP _bsd_M_TAP
-#define	M_TCPFUNCTIONS _bsd_M_TCPFUNCTIONS
-#define	M_TCPLOG _bsd_M_TCPLOG
-#define	M_TEMP _bsd_M_TEMP
 #define	mtrash_ctor _bsd_mtrash_ctor
 #define	mtrash_dtor _bsd_mtrash_dtor
 #define	mtrash_fini _bsd_mtrash_fini
 #define	mtrash_init _bsd_mtrash_init
 #define	mtx_destroy _bsd_mtx_destroy
 #define	mtx_init _bsd_mtx_init
-#define	_mtx_lock_flags _bsd__mtx_lock_flags
 #define	mtx_owned _bsd_mtx_owned
 #define	mtx_pool_alloc _bsd_mtx_pool_alloc
 #define	mtx_pool_create _bsd_mtx_pool_create
 #define	mtx_pool_destroy _bsd_mtx_pool_destroy
 #define	mtx_pool_find _bsd_mtx_pool_find
-#define	mtxpool_sleep _bsd_mtxpool_sleep
 #define	mtx_recursed _bsd_mtx_recursed
 #define	mtx_sysinit _bsd_mtx_sysinit
 #define	mtx_trylock_flags_ _bsd_mtx_trylock_flags_
-#define	_mtx_unlock_flags _bsd__mtx_unlock_flags
-#define	m_uiotombuf _bsd_m_uiotombuf
-#define	m_unmappedtouio _bsd_m_unmappedtouio
-#define	m_unshare _bsd_m_unshare
+#define	mtxpool_sleep _bsd_mtxpool_sleep
 #define	murmur3_32_hash _bsd_murmur3_32_hash
 #define	murmur3_32_hash32 _bsd_murmur3_32_hash32
-#define	M_USB _bsd_M_USB
-#define	M_USBDEV _bsd_M_USBDEV
 #define	musbotg_connect_interrupt _bsd_musbotg_connect_interrupt
 #define	musbotg_init _bsd_musbotg_init
 #define	musbotg_interrupt _bsd_musbotg_interrupt
 #define	musbotg_uninit _bsd_musbotg_uninit
 #define	musbotg_vbus_interrupt _bsd_musbotg_vbus_interrupt
 #define	mutex_init _bsd_mutex_init
-#define	M_XDATA _bsd_M_XDATA
 #define	natt_cksum_policy _bsd_natt_cksum_policy
 #define	nd6_add_ifa_lle _bsd_nd6_add_ifa_lle
 #define	nd6_alloc _bsd_nd6_alloc
@@ -3020,9 +3196,9 @@
 #define	netisr_register _bsd_netisr_register
 #define	netisr_setqlimit _bsd_netisr_setqlimit
 #define	netisr_unregister _bsd_netisr_unregister
+#define	new_unrhdr _bsd_new_unrhdr
 #define	newpacket _bsd_newpacket
 #define	newreno_cc_algo _bsd_newreno_cc_algo
-#define	new_unrhdr _bsd_new_unrhdr
 #define	ng_ether_attach_p _bsd_ng_ether_attach_p
 #define	ng_ether_detach_p _bsd_ng_ether_detach_p
 #define	ng_ether_input_orphan_p _bsd_ng_ether_input_orphan_p
@@ -3121,46 +3297,7 @@
 #define	nvme_unregister_consumer _bsd_nvme_unregister_consumer
 #define	nvme_use_nvd _bsd_nvme_use_nvd
 #define	nvme_verbose_cmd_dump _bsd_nvme_verbose_cmd_dump
-#define	OF_call_method _bsd_OF_call_method
-#define	OF_canon _bsd_OF_canon
-#define	OF_child _bsd_OF_child
-#define	OF_claim _bsd_OF_claim
-#define	OF_close _bsd_OF_close
-#define	OF_device_from_xref _bsd_OF_device_from_xref
-#define	OF_device_register_xref _bsd_OF_device_register_xref
-#define	OF_enter _bsd_OF_enter
-#define	OF_exit _bsd_OF_exit
-#define	OF_finddevice _bsd_OF_finddevice
-#define	OF_getencprop _bsd_OF_getencprop
-#define	OF_getencprop_alloc _bsd_OF_getencprop_alloc
-#define	OF_getencprop_alloc_multi _bsd_OF_getencprop_alloc_multi
-#define	OF_getprop _bsd_OF_getprop
-#define	OF_getprop_alloc _bsd_OF_getprop_alloc
-#define	OF_getprop_alloc_multi _bsd_OF_getprop_alloc_multi
-#define	OF_getproplen _bsd_OF_getproplen
-#define	OF_hasprop _bsd_OF_hasprop
-#define	OF_init _bsd_OF_init
-#define	OF_install _bsd_OF_install
-#define	OF_instance_to_package _bsd_OF_instance_to_package
-#define	OF_instance_to_path _bsd_OF_instance_to_path
-#define	OF_interpret _bsd_OF_interpret
-#define	OF_nextprop _bsd_OF_nextprop
-#define	OF_node_from_xref _bsd_OF_node_from_xref
-#define	OF_open _bsd_OF_open
-#define	OF_package_to_path _bsd_OF_package_to_path
-#define	OF_parent _bsd_OF_parent
-#define	OF_peer _bsd_OF_peer
-#define	OF_printf _bsd_OF_printf
-#define	OF_prop_free _bsd_OF_prop_free
-#define	OF_read _bsd_OF_read
-#define	OF_release _bsd_OF_release
-#define	OF_searchencprop _bsd_OF_searchencprop
-#define	OF_searchprop _bsd_OF_searchprop
-#define	OF_seek _bsd_OF_seek
-#define	OF_setprop _bsd_OF_setprop
-#define	OF_test _bsd_OF_test
 #define	ofw_bus_assigned_addresses_to_rl _bsd_ofw_bus_assigned_addresses_to_rl
-#define	ofwbus_driver _bsd_ofwbus_driver
 #define	ofw_bus_find_child _bsd_ofw_bus_find_child
 #define	ofw_bus_find_child_device_by_phandle _bsd_ofw_bus_find_child_device_by_phandle
 #define	ofw_bus_find_compatible _bsd_ofw_bus_find_compatible
@@ -3194,18 +3331,16 @@
 #define	ofw_bus_string_list_to_array _bsd_ofw_bus_string_list_to_array
 #define	ofw_fdt _bsd_ofw_fdt
 #define	ofw_gpiobus_add_fdt_child _bsd_ofw_gpiobus_add_fdt_child
-#define	ofwgpiobus_devclass _bsd_ofwgpiobus_devclass
 #define	ofw_gpiobus_driver _bsd_ofw_gpiobus_driver
 #define	ofw_gpiobus_parse_gpios _bsd_ofw_gpiobus_parse_gpios
 #define	ofw_gpiobus_register_provider _bsd_ofw_gpiobus_register_provider
 #define	ofw_gpiobus_unregister_provider _bsd_ofw_gpiobus_unregister_provider
 #define	ofw_iicbus_devclass _bsd_ofw_iicbus_devclass
 #define	ofw_iicbus_driver _bsd_ofw_iicbus_driver
-#define	ofw_parse_bootargs _bsd_ofw_parse_bootargs
-#define	ofw_reg_to_paddr _bsd_ofw_reg_to_paddr
-#define	OF_write _bsd_OF_write
-#define	OF_xref_from_device _bsd_OF_xref_from_device
-#define	OF_xref_from_node _bsd_OF_xref_from_node
+#define	ofw_parse_bootargs _bsd_ofw_parse_bootargs
+#define	ofw_reg_to_paddr _bsd_ofw_reg_to_paddr
+#define	ofwbus_driver _bsd_ofwbus_driver
+#define	ofwgpiobus_devclass _bsd_ofwgpiobus_devclass
 #define	ohci_detach _bsd_ohci_detach
 #define	ohci_init _bsd_ohci_init
 #define	ohci_interrupt _bsd_ohci_interrupt
@@ -3216,11 +3351,11 @@
 #define	osd_exit _bsd_osd_exit
 #define	osd_free_reserved _bsd_osd_free_reserved
 #define	osd_get _bsd_osd_get
-#define	osdm _bsd_osdm
 #define	osd_register _bsd_osd_register
 #define	osd_reserve _bsd_osd_reserve
 #define	osd_set _bsd_osd_set
 #define	osd_set_reserved _bsd_osd_set_reserved
+#define	osdm _bsd_osdm
 #define	panic _bsd_panic
 #define	parse_uuid _bsd_parse_uuid
 #define	pause_sbt _bsd_pause_sbt
@@ -3238,36 +3373,12 @@
 #define	pci_assign_interrupt_method _bsd_pci_assign_interrupt_method
 #define	pci_attach _bsd_pci_attach
 #define	pci_attach_common _bsd_pci_attach_common
-#define	pcib_alloc_msi _bsd_pcib_alloc_msi
-#define	pcib_alloc_msix _bsd_pcib_alloc_msix
-#define	pcib_alloc_resource _bsd_pcib_alloc_resource
 #define	pci_bar_enabled _bsd_pci_bar_enabled
-#define	pcib_attach _bsd_pcib_attach
-#define	pcib_attach_child _bsd_pcib_attach_child
-#define	pcib_attach_common _bsd_pcib_attach_common
-#define	pcib_bridge_init _bsd_pcib_bridge_init
-#define	pcib_child_present _bsd_pcib_child_present
-#define	pcib_decode_rid _bsd_pcib_decode_rid
-#define	pcib_detach _bsd_pcib_detach
-#define	pcib_driver _bsd_pcib_driver
-#define	pcib_get_id _bsd_pcib_get_id
-#define	pcibios_pcib_route_interrupt _bsd_pcibios_pcib_route_interrupt
-#define	pcib_map_msi _bsd_pcib_map_msi
-#define	pcib_maxfuncs _bsd_pcib_maxfuncs
-#define	pcib_maxslots _bsd_pcib_maxslots
-#define	pcib_read_ivar _bsd_pcib_read_ivar
-#define	pcib_release_msi _bsd_pcib_release_msi
-#define	pcib_release_msix _bsd_pcib_release_msix
-#define	pcib_request_feature _bsd_pcib_request_feature
-#define	pcib_request_feature_allow _bsd_pcib_request_feature_allow
-#define	pcib_route_interrupt _bsd_pcib_route_interrupt
-#define	pcib_write_ivar _bsd_pcib_write_ivar
-#define	pcicdev _bsd_pcicdev
+#define	pci_cfg_restore _bsd_pci_cfg_restore
+#define	pci_cfg_save _bsd_pci_cfg_save
 #define	pci_cfgregopen _bsd_pci_cfgregopen
 #define	pci_cfgregread _bsd_pci_cfgregread
 #define	pci_cfgregwrite _bsd_pci_cfgregwrite
-#define	pci_cfg_restore _bsd_pci_cfg_restore
-#define	pci_cfg_save _bsd_pci_cfg_save
 #define	pci_child_added_method _bsd_pci_child_added_method
 #define	pci_child_deleted _bsd_pci_child_deleted
 #define	pci_child_detached _bsd_pci_child_detached
@@ -3284,18 +3395,11 @@
 #define	pci_do_power_suspend _bsd_pci_do_power_suspend
 #define	pci_driver _bsd_pci_driver
 #define	pci_driver_added _bsd_pci_driver_added
-#define	pcie_adjust_config _bsd_pcie_adjust_config
 #define	pci_ea_is_enabled _bsd_pci_ea_is_enabled
-#define	pcie_flr _bsd_pcie_flr
-#define	pcie_get_max_completion_timeout _bsd_pcie_get_max_completion_timeout
-#define	pcie_link_reset _bsd_pcie_link_reset
 #define	pci_enable_busmaster_method _bsd_pci_enable_busmaster_method
 #define	pci_enable_io_method _bsd_pci_enable_io_method
 #define	pci_enable_msi_method _bsd_pci_enable_msi_method
 #define	pci_enable_msix_method _bsd_pci_enable_msix_method
-#define	pcie_read_config _bsd_pcie_read_config
-#define	pcie_wait_for_pending_transactions _bsd_pcie_wait_for_pending_transactions
-#define	pcie_write_config _bsd_pcie_write_config
 #define	pci_fetch_vpd_list _bsd_pci_fetch_vpd_list
 #define	pci_find_bar _bsd_pci_find_bar
 #define	pci_find_bsf _bsd_pci_find_bsf
@@ -3352,13 +3456,44 @@
 #define	pci_teardown_intr _bsd_pci_teardown_intr
 #define	pci_write_config_method _bsd_pci_write_config_method
 #define	pci_write_ivar _bsd_pci_write_ivar
+#define	pcib_alloc_msi _bsd_pcib_alloc_msi
+#define	pcib_alloc_msix _bsd_pcib_alloc_msix
+#define	pcib_alloc_resource _bsd_pcib_alloc_resource
+#define	pcib_attach _bsd_pcib_attach
+#define	pcib_attach_child _bsd_pcib_attach_child
+#define	pcib_attach_common _bsd_pcib_attach_common
+#define	pcib_bridge_init _bsd_pcib_bridge_init
+#define	pcib_child_present _bsd_pcib_child_present
+#define	pcib_decode_rid _bsd_pcib_decode_rid
+#define	pcib_detach _bsd_pcib_detach
+#define	pcib_driver _bsd_pcib_driver
+#define	pcib_get_id _bsd_pcib_get_id
+#define	pcib_map_msi _bsd_pcib_map_msi
+#define	pcib_maxfuncs _bsd_pcib_maxfuncs
+#define	pcib_maxslots _bsd_pcib_maxslots
+#define	pcib_read_ivar _bsd_pcib_read_ivar
+#define	pcib_release_msi _bsd_pcib_release_msi
+#define	pcib_release_msix _bsd_pcib_release_msix
+#define	pcib_request_feature _bsd_pcib_request_feature
+#define	pcib_request_feature_allow _bsd_pcib_request_feature_allow
+#define	pcib_route_interrupt _bsd_pcib_route_interrupt
+#define	pcib_write_ivar _bsd_pcib_write_ivar
+#define	pcibios_pcib_route_interrupt _bsd_pcibios_pcib_route_interrupt
+#define	pcicdev _bsd_pcicdev
+#define	pcie_adjust_config _bsd_pcie_adjust_config
+#define	pcie_flr _bsd_pcie_flr
+#define	pcie_get_max_completion_timeout _bsd_pcie_get_max_completion_timeout
+#define	pcie_link_reset _bsd_pcie_link_reset
+#define	pcie_read_config _bsd_pcie_read_config
+#define	pcie_wait_for_pending_transactions _bsd_pcie_wait_for_pending_transactions
+#define	pcie_write_config _bsd_pcie_write_config
 #define	pcpu_entry_epair_dpcpu _bsd_pcpu_entry_epair_dpcpu
 #define	pcpu_zone_64 _bsd_pcpu_zone_64
 #define	pcpu_zone_int _bsd_pcpu_zone_int
 #define	pcpu_zone_ptr _bsd_pcpu_zone_ptr
 #define	pf_addr_cmp _bsd_pf_addr_cmp
-#define	pf_addrcpy _bsd_pf_addrcpy
 #define	pf_addr_inc _bsd_pf_addr_inc
+#define	pf_addrcpy _bsd_pf_addrcpy
 #define	pf_altq_ifs_active _bsd_pf_altq_ifs_active
 #define	pf_altq_ifs_inactive _bsd_pf_altq_ifs_inactive
 #define	pf_altqs _bsd_pf_altqs
@@ -3384,27 +3519,22 @@
 #define	pf_anchor_node_RB_REMOVE _bsd_pf_anchor_node_RB_REMOVE
 #define	pf_anchor_node_RB_REMOVE_COLOR _bsd_pf_anchor_node_RB_REMOVE_COLOR
 #define	pf_anchor_remove _bsd_pf_anchor_remove
-#define	pf_anchors _bsd_pf_anchors
 #define	pf_anchor_setup _bsd_pf_anchor_setup
+#define	pf_anchors _bsd_pf_anchors
 #define	pf_calc_skip_steps _bsd_pf_calc_skip_steps
 #define	pf_change_a _bsd_pf_change_a
 #define	pf_change_proto_a _bsd_pf_change_proto_a
 #define	pf_cksum_fixup _bsd_pf_cksum_fixup
 #define	pf_cleanup _bsd_pf_cleanup
-#define	pfctlinput _bsd_pfctlinput
-#define	pfctlinput2 _bsd_pfctlinput2
 #define	pf_default_rule _bsd_pf_default_rule
 #define	pf_dev _bsd_pf_dev
 #define	pf_end_lock _bsd_pf_end_lock
 #define	pf_end_threads _bsd_pf_end_threads
-#define	pffinddomain _bsd_pffinddomain
 #define	pf_find_or_create_ruleset _bsd_pf_find_or_create_ruleset
-#define	pffindproto _bsd_pffindproto
 #define	pf_find_ruleset _bsd_pf_find_ruleset
 #define	pf_find_src_node _bsd_pf_find_src_node
 #define	pf_find_state_all _bsd_pf_find_state_all
 #define	pf_find_state_byid _bsd_pf_find_state_byid
-#define	pffindtype _bsd_pffindtype
 #define	pf_frag_tree_RB_FIND _bsd_pf_frag_tree_RB_FIND
 #define	pf_frag_tree_RB_INSERT _bsd_pf_frag_tree_RB_INSERT
 #define	pf_frag_tree_RB_MINMAX _bsd_pf_frag_tree_RB_MINMAX
@@ -3423,6 +3553,89 @@
 #define	pf_get_translation _bsd_pf_get_translation
 #define	pf_hashmask _bsd_pf_hashmask
 #define	pf_hashseed _bsd_pf_hashseed
+#define	pf_idhash _bsd_pf_idhash
+#define	pf_init_ruleset _bsd_pf_init_ruleset
+#define	pf_initialize _bsd_pf_initialize
+#define	pf_intr _bsd_pf_intr
+#define	pf_ioctl_lock _bsd_pf_ioctl_lock
+#define	pf_ioctl_maxcount _bsd_pf_ioctl_maxcount
+#define	pf_keyhash _bsd_pf_keyhash
+#define	pf_limits _bsd_pf_limits
+#define	pf_main_anchor _bsd_pf_main_anchor
+#define	pf_map_addr _bsd_pf_map_addr
+#define	pf_match_addr _bsd_pf_match_addr
+#define	pf_match_addr_range _bsd_pf_match_addr_range
+#define	pf_match_port _bsd_pf_match_port
+#define	pf_match_tag _bsd_pf_match_tag
+#define	pf_mtag_cleanup _bsd_pf_mtag_cleanup
+#define	pf_mtag_initialize _bsd_pf_mtag_initialize
+#define	pf_mtag_z _bsd_pf_mtag_z
+#define	pf_normalize_cleanup _bsd_pf_normalize_cleanup
+#define	pf_normalize_init _bsd_pf_normalize_init
+#define	pf_normalize_ip _bsd_pf_normalize_ip
+#define	pf_normalize_ip6 _bsd_pf_normalize_ip6
+#define	pf_normalize_tcp _bsd_pf_normalize_tcp
+#define	pf_normalize_tcp_cleanup _bsd_pf_normalize_tcp_cleanup
+#define	pf_normalize_tcp_init _bsd_pf_normalize_tcp_init
+#define	pf_normalize_tcp_stateful _bsd_pf_normalize_tcp_stateful
+#define	pf_osfp_add _bsd_pf_osfp_add
+#define	pf_osfp_fingerprint _bsd_pf_osfp_fingerprint
+#define	pf_osfp_flush _bsd_pf_osfp_flush
+#define	pf_osfp_get _bsd_pf_osfp_get
+#define	pf_osfp_match _bsd_pf_osfp_match
+#define	pf_pabuf _bsd_pf_pabuf
+#define	pf_poolmask _bsd_pf_poolmask
+#define	pf_print_flags _bsd_pf_print_flags
+#define	pf_print_host _bsd_pf_print_host
+#define	pf_print_state _bsd_pf_print_state
+#define	pf_proto_cksum_fixup _bsd_pf_proto_cksum_fixup
+#define	pf_proto_register _bsd_pf_proto_register
+#define	pf_proto_unregister _bsd_pf_proto_unregister
+#define	pf_pull_hdr _bsd_pf_pull_hdr
+#define	pf_purge_expired_fragments _bsd_pf_purge_expired_fragments
+#define	pf_purge_expired_src_nodes _bsd_pf_purge_expired_src_nodes
+#define	pf_purge_fragments _bsd_pf_purge_fragments
+#define	pf_purge_proc _bsd_pf_purge_proc
+#define	pf_purge_thread _bsd_pf_purge_thread
+#define	pf_refragment6 _bsd_pf_refragment6
+#define	pf_remove_if_empty_ruleset _bsd_pf_remove_if_empty_ruleset
+#define	pf_routable _bsd_pf_routable
+#define	pf_rules_lock _bsd_pf_rules_lock
+#define	pf_socket_lookup _bsd_pf_socket_lookup
+#define	pf_srchash _bsd_pf_srchash
+#define	pf_srchashmask _bsd_pf_srchashmask
+#define	pf_state_expires _bsd_pf_state_expires
+#define	pf_state_insert _bsd_pf_state_insert
+#define	pf_state_key_clone _bsd_pf_state_key_clone
+#define	pf_state_key_setup _bsd_pf_state_key_setup
+#define	pf_state_key_z _bsd_pf_state_key_z
+#define	pf_state_scrub_z _bsd_pf_state_scrub_z
+#define	pf_state_z _bsd_pf_state_z
+#define	pf_stateid _bsd_pf_stateid
+#define	pf_status _bsd_pf_status
+#define	pf_step_into_anchor _bsd_pf_step_into_anchor
+#define	pf_step_out_of_anchor _bsd_pf_step_out_of_anchor
+#define	pf_swi_cookie _bsd_pf_swi_cookie
+#define	pf_tag_packet _bsd_pf_tag_packet
+#define	pf_tag_z _bsd_pf_tag_z
+#define	pf_tags _bsd_pf_tags
+#define	pf_tcp_iss_off _bsd_pf_tcp_iss_off
+#define	pf_tcp_secret _bsd_pf_tcp_secret
+#define	pf_tcp_secret_ctx _bsd_pf_tcp_secret_ctx
+#define	pf_tcp_secret_init _bsd_pf_tcp_secret_init
+#define	pf_test _bsd_pf_test
+#define	pf_test6 _bsd_pf_test6
+#define	pf_unlink_src_node _bsd_pf_unlink_src_node
+#define	pf_unlink_state _bsd_pf_unlink_state
+#define	pf_unlinked_rules _bsd_pf_unlinked_rules
+#define	pf_unlnkdrules_mtx _bsd_pf_unlnkdrules_mtx
+#define	pf_unload_vnet_purge _bsd_pf_unload_vnet_purge
+#define	pf_vnet_active _bsd_pf_vnet_active
+#define	pfctlinput _bsd_pfctlinput
+#define	pfctlinput2 _bsd_pfctlinput2
+#define	pffinddomain _bsd_pffinddomain
+#define	pffindproto _bsd_pffindproto
+#define	pffindtype _bsd_pffindtype
 #define	pfi_all _bsd_pfi_all
 #define	pfi_attach_cookie _bsd_pfi_attach_cookie
 #define	pfi_attach_group_cookie _bsd_pfi_attach_group_cookie
@@ -3432,7 +3645,6 @@
 #define	pfi_clear_flags _bsd_pfi_clear_flags
 #define	pfi_detach_cookie _bsd_pfi_detach_cookie
 #define	pfi_detach_group_cookie _bsd_pfi_detach_group_cookie
-#define	pf_idhash _bsd_pf_idhash
 #define	pfi_dynaddr_copyout _bsd_pfi_dynaddr_copyout
 #define	pfi_dynaddr_remove _bsd_pfi_dynaddr_remove
 #define	pfi_dynaddr_setup _bsd_pfi_dynaddr_setup
@@ -3454,6 +3666,9 @@
 #define	pfi_kif_purge _bsd_pfi_kif_purge
 #define	pfi_kif_ref _bsd_pfi_kif_ref
 #define	pfi_kif_unref _bsd_pfi_kif_unref
+#define	pfi_match_addr _bsd_pfi_match_addr
+#define	pfi_set_flags _bsd_pfi_set_flags
+#define	pfi_update_status _bsd_pfi_update_status
 #define	pfil_add_hook _bsd_pfil_add_hook
 #define	pfil_add_hook_flags _bsd_pfil_add_hook_flags
 #define	pfil_head_get _bsd_pfil_head_get
@@ -3471,56 +3686,9 @@
 #define	pfil_wlock _bsd_pfil_wlock
 #define	pfil_wowned _bsd_pfil_wowned
 #define	pfil_wunlock _bsd_pfil_wunlock
-#define	pfi_match_addr _bsd_pfi_match_addr
-#define	PFI_MTYPE _bsd_PFI_MTYPE
-#define	pf_initialize _bsd_pf_initialize
-#define	pf_init_ruleset _bsd_pf_init_ruleset
-#define	pf_intr _bsd_pf_intr
-#define	pf_ioctl_lock _bsd_pf_ioctl_lock
-#define	pf_ioctl_maxcount _bsd_pf_ioctl_maxcount
-#define	pfi_set_flags _bsd_pfi_set_flags
-#define	pfi_update_status _bsd_pfi_update_status
-#define	pf_keyhash _bsd_pf_keyhash
 #define	pfkeystat _bsd_pfkeystat
-#define	pf_limits _bsd_pf_limits
-#define	pflogifs _bsd_pflogifs
 #define	pflog_packet_ptr _bsd_pflog_packet_ptr
-#define	pf_main_anchor _bsd_pf_main_anchor
-#define	pf_map_addr _bsd_pf_map_addr
-#define	pf_match_addr _bsd_pf_match_addr
-#define	pf_match_addr_range _bsd_pf_match_addr_range
-#define	pf_match_port _bsd_pf_match_port
-#define	pf_match_tag _bsd_pf_match_tag
-#define	pf_mtag_cleanup _bsd_pf_mtag_cleanup
-#define	pf_mtag_initialize _bsd_pf_mtag_initialize
-#define	pf_mtag_z _bsd_pf_mtag_z
-#define	pf_normalize_cleanup _bsd_pf_normalize_cleanup
-#define	pf_normalize_init _bsd_pf_normalize_init
-#define	pf_normalize_ip _bsd_pf_normalize_ip
-#define	pf_normalize_ip6 _bsd_pf_normalize_ip6
-#define	pf_normalize_tcp _bsd_pf_normalize_tcp
-#define	pf_normalize_tcp_cleanup _bsd_pf_normalize_tcp_cleanup
-#define	pf_normalize_tcp_init _bsd_pf_normalize_tcp_init
-#define	pf_normalize_tcp_stateful _bsd_pf_normalize_tcp_stateful
-#define	pf_osfp_add _bsd_pf_osfp_add
-#define	pf_osfp_fingerprint _bsd_pf_osfp_fingerprint
-#define	pf_osfp_flush _bsd_pf_osfp_flush
-#define	pf_osfp_get _bsd_pf_osfp_get
-#define	pf_osfp_match _bsd_pf_osfp_match
-#define	pf_pabuf _bsd_pf_pabuf
-#define	pf_poolmask _bsd_pf_poolmask
-#define	pf_print_flags _bsd_pf_print_flags
-#define	pf_print_host _bsd_pf_print_host
-#define	pf_print_state _bsd_pf_print_state
-#define	pf_proto_cksum_fixup _bsd_pf_proto_cksum_fixup
-#define	pf_proto_register _bsd_pf_proto_register
-#define	pf_proto_unregister _bsd_pf_proto_unregister
-#define	pf_pull_hdr _bsd_pf_pull_hdr
-#define	pf_purge_expired_fragments _bsd_pf_purge_expired_fragments
-#define	pf_purge_expired_src_nodes _bsd_pf_purge_expired_src_nodes
-#define	pf_purge_fragments _bsd_pf_purge_fragments
-#define	pf_purge_proc _bsd_pf_purge_proc
-#define	pf_purge_thread _bsd_pf_purge_thread
+#define	pflogifs _bsd_pflogifs
 #define	pfr_add_addrs _bsd_pfr_add_addrs
 #define	pfr_add_tables _bsd_pfr_add_tables
 #define	pfr_attach_table _bsd_pfr_attach_table
@@ -3533,8 +3701,6 @@
 #define	pfr_del_tables _bsd_pfr_del_tables
 #define	pfr_detach_table _bsd_pfr_detach_table
 #define	pfr_dynaddr_update _bsd_pfr_dynaddr_update
-#define	pf_refragment6 _bsd_pf_refragment6
-#define	pf_remove_if_empty_ruleset _bsd_pf_remove_if_empty_ruleset
 #define	pfr_get_addrs _bsd_pfr_get_addrs
 #define	pfr_get_astats _bsd_pfr_get_astats
 #define	pfr_get_tables _bsd_pfr_get_tables
@@ -3554,29 +3720,12 @@
 #define	pfr_ktablehead_RB_REMOVE _bsd_pfr_ktablehead_RB_REMOVE
 #define	pfr_ktablehead_RB_REMOVE_COLOR _bsd_pfr_ktablehead_RB_REMOVE_COLOR
 #define	pfr_match_addr _bsd_pfr_match_addr
-#define	pf_routable _bsd_pf_routable
 #define	pfr_pool_get _bsd_pfr_pool_get
 #define	pfr_set_addrs _bsd_pfr_set_addrs
 #define	pfr_set_tflags _bsd_pfr_set_tflags
 #define	pfr_table_count _bsd_pfr_table_count
 #define	pfr_tst_addrs _bsd_pfr_tst_addrs
-#define	pf_rules_lock _bsd_pf_rules_lock
 #define	pfr_update_stats _bsd_pfr_update_stats
-#define	pf_socket_lookup _bsd_pf_socket_lookup
-#define	pf_srchash _bsd_pf_srchash
-#define	pf_srchashmask _bsd_pf_srchashmask
-#define	pf_state_expires _bsd_pf_state_expires
-#define	pf_stateid _bsd_pf_stateid
-#define	pf_state_insert _bsd_pf_state_insert
-#define	pf_state_key_clone _bsd_pf_state_key_clone
-#define	pf_state_key_setup _bsd_pf_state_key_setup
-#define	pf_state_key_z _bsd_pf_state_key_z
-#define	pf_state_scrub_z _bsd_pf_state_scrub_z
-#define	pf_state_z _bsd_pf_state_z
-#define	pf_status _bsd_pf_status
-#define	pf_step_into_anchor _bsd_pf_step_into_anchor
-#define	pf_step_out_of_anchor _bsd_pf_step_out_of_anchor
-#define	pf_swi_cookie _bsd_pf_swi_cookie
 #define	pfsync_clear_states_ptr _bsd_pfsync_clear_states_ptr
 #define	pfsync_cloner _bsd_pfsync_cloner
 #define	pfsync_defer_ptr _bsd_pfsync_defer_ptr
@@ -3586,21 +3735,6 @@
 #define	pfsync_state_export _bsd_pfsync_state_export
 #define	pfsync_state_import_ptr _bsd_pfsync_state_import_ptr
 #define	pfsync_update_state_ptr _bsd_pfsync_update_state_ptr
-#define	pf_tag_packet _bsd_pf_tag_packet
-#define	pf_tags _bsd_pf_tags
-#define	pf_tag_z _bsd_pf_tag_z
-#define	pf_tcp_iss_off _bsd_pf_tcp_iss_off
-#define	pf_tcp_secret _bsd_pf_tcp_secret
-#define	pf_tcp_secret_ctx _bsd_pf_tcp_secret_ctx
-#define	pf_tcp_secret_init _bsd_pf_tcp_secret_init
-#define	pf_test _bsd_pf_test
-#define	pf_test6 _bsd_pf_test6
-#define	pf_unlinked_rules _bsd_pf_unlinked_rules
-#define	pf_unlink_src_node _bsd_pf_unlink_src_node
-#define	pf_unlink_state _bsd_pf_unlink_state
-#define	pf_unlnkdrules_mtx _bsd_pf_unlnkdrules_mtx
-#define	pf_unload_vnet_purge _bsd_pf_unload_vnet_purge
-#define	pf_vnet_active _bsd_pf_vnet_active
 #define	pfxlist_onlink_check _bsd_pfxlist_onlink_check
 #define	phashinit _bsd_phashinit
 #define	phashinit_flags _bsd_phashinit_flags
@@ -3611,25 +3745,19 @@
 #define	pipeselwakeup _bsd_pipeselwakeup
 #define	pmtu_expire _bsd_pmtu_expire
 #define	pmtu_probe _bsd_pmtu_probe
-#define	poll_no_poll _bsd_poll_no_poll
-#define	Poly1305_Final _bsd_Poly1305_Final
-#define	Poly1305_Init _bsd_Poly1305_Init
-#define	Poly1305_Setkey _bsd_Poly1305_Setkey
-#define	Poly1305_Update _bsd_Poly1305_Update
+#define	poll_no_poll _bsd_poll_no_poll
 #define	ppsratecheck _bsd_ppsratecheck
 #define	printf _bsd_printf
 #define	printf_uuid _bsd_printf_uuid
 #define	prison0 _bsd_prison0
-#define	ProxyCheck _bsd_ProxyCheck
-#define	ProxyModify _bsd_ProxyModify
 #define	pru_accept_notsupp _bsd_pru_accept_notsupp
 #define	pru_aio_queue_notsupp _bsd_pru_aio_queue_notsupp
 #define	pru_attach_notsupp _bsd_pru_attach_notsupp
-#define	pru_bindat_notsupp _bsd_pru_bindat_notsupp
 #define	pru_bind_notsupp _bsd_pru_bind_notsupp
+#define	pru_bindat_notsupp _bsd_pru_bindat_notsupp
 #define	pru_connect2_notsupp _bsd_pru_connect2_notsupp
-#define	pru_connectat_notsupp _bsd_pru_connectat_notsupp
 #define	pru_connect_notsupp _bsd_pru_connect_notsupp
+#define	pru_connectat_notsupp _bsd_pru_connectat_notsupp
 #define	pru_control_notsupp _bsd_pru_control_notsupp
 #define	pru_disconnect_notsupp _bsd_pru_disconnect_notsupp
 #define	pru_listen_notsupp _bsd_pru_listen_notsupp
@@ -3692,6 +3820,7 @@
 #define	r12a_set_page_size _bsd_r12a_set_page_size
 #define	r12a_set_pwrmode _bsd_r12a_set_pwrmode
 #define	r12a_tx_radiotap_flags _bsd_r12a_tx_radiotap_flags
+#define	r12a_vap_preattach _bsd_r12a_vap_preattach
 #define	r12au_align_rx _bsd_r12au_align_rx
 #define	r12au_attach _bsd_r12au_attach
 #define	r12au_classify_intr _bsd_r12au_classify_intr
@@ -3702,7 +3831,6 @@
 #define	r12au_init_burstlen_usb2 _bsd_r12au_init_burstlen_usb2
 #define	r12au_init_rx_agg _bsd_r12au_init_rx_agg
 #define	r12au_post_init _bsd_r12au_post_init
-#define	r12a_vap_preattach _bsd_r12a_vap_preattach
 #define	r21a_beacon_init _bsd_r21a_beacon_init
 #define	r21a_beacon_select _bsd_r21a_beacon_select
 #define	r21a_check_condition _bsd_r21a_check_condition
@@ -3765,25 +3893,7 @@
 #define	r92c_check_condition _bsd_r92c_check_condition
 #define	r92c_classify_intr _bsd_r92c_classify_intr
 #define	r92c_detach_private _bsd_r92c_detach_private
-#define	r92ce_attach _bsd_r92ce_attach
-#define	r92ce_copy_tx_desc _bsd_r92ce_copy_tx_desc
-#define	r92ce_dump_tx_desc _bsd_r92ce_dump_tx_desc
-#define	r92ce_enable_intr _bsd_r92ce_enable_intr
 #define	r92c_efuse_postread _bsd_r92c_efuse_postread
-#define	r92ce_fw_reset _bsd_r92ce_fw_reset
-#define	r92ce_get_intr_status _bsd_r92ce_get_intr_status
-#define	r92ce_init_ampdu _bsd_r92ce_init_ampdu
-#define	r92ce_init_bb _bsd_r92ce_init_bb
-#define	r92ce_init_edca _bsd_r92ce_init_edca
-#define	r92ce_init_intr _bsd_r92ce_init_intr
-#define	r92ce_iq_calib _bsd_r92ce_iq_calib
-#define	r92ce_post_init _bsd_r92ce_post_init
-#define	r92ce_power_off _bsd_r92ce_power_off
-#define	r92ce_power_on _bsd_r92ce_power_on
-#define	r92ce_set_led _bsd_r92ce_set_led
-#define	r92ce_setup_tx_desc _bsd_r92ce_setup_tx_desc
-#define	r92ce_start_xfers _bsd_r92ce_start_xfers
-#define	r92ce_tx_postsetup _bsd_r92ce_tx_postsetup
 #define	r92c_fill_tx_desc _bsd_r92c_fill_tx_desc
 #define	r92c_fill_tx_desc_null _bsd_r92c_fill_tx_desc_null
 #define	r92c_fill_tx_desc_raw _bsd_r92c_fill_tx_desc_raw
@@ -3826,6 +3936,25 @@
 #define	r92c_tx_radiotap_flags _bsd_r92c_tx_radiotap_flags
 #define	r92c_tx_setup_hwseq _bsd_r92c_tx_setup_hwseq
 #define	r92c_tx_setup_macid _bsd_r92c_tx_setup_macid
+#define	r92c_write_txpower _bsd_r92c_write_txpower
+#define	r92ce_attach _bsd_r92ce_attach
+#define	r92ce_copy_tx_desc _bsd_r92ce_copy_tx_desc
+#define	r92ce_dump_tx_desc _bsd_r92ce_dump_tx_desc
+#define	r92ce_enable_intr _bsd_r92ce_enable_intr
+#define	r92ce_fw_reset _bsd_r92ce_fw_reset
+#define	r92ce_get_intr_status _bsd_r92ce_get_intr_status
+#define	r92ce_init_ampdu _bsd_r92ce_init_ampdu
+#define	r92ce_init_bb _bsd_r92ce_init_bb
+#define	r92ce_init_edca _bsd_r92ce_init_edca
+#define	r92ce_init_intr _bsd_r92ce_init_intr
+#define	r92ce_iq_calib _bsd_r92ce_iq_calib
+#define	r92ce_post_init _bsd_r92ce_post_init
+#define	r92ce_power_off _bsd_r92ce_power_off
+#define	r92ce_power_on _bsd_r92ce_power_on
+#define	r92ce_set_led _bsd_r92ce_set_led
+#define	r92ce_setup_tx_desc _bsd_r92ce_setup_tx_desc
+#define	r92ce_start_xfers _bsd_r92ce_start_xfers
+#define	r92ce_tx_postsetup _bsd_r92ce_tx_postsetup
 #define	r92cu_align_rx _bsd_r92cu_align_rx
 #define	r92cu_attach _bsd_r92cu_attach
 #define	r92cu_dump_tx_desc _bsd_r92cu_dump_tx_desc
@@ -3837,7 +3966,6 @@
 #define	r92cu_power_off _bsd_r92cu_power_off
 #define	r92cu_power_on _bsd_r92cu_power_on
 #define	r92cu_set_led _bsd_r92cu_set_led
-#define	r92c_write_txpower _bsd_r92c_write_txpower
 #define	r92e_detach_private _bsd_r92e_detach_private
 #define	r92e_fw_reset _bsd_r92e_fw_reset
 #define	r92e_get_rssi_cck _bsd_r92e_get_rssi_cck
@@ -3859,24 +3987,24 @@
 #define	r92eu_post_init _bsd_r92eu_post_init
 #define	ratecheck _bsd_ratecheck
 #define	raw_attach _bsd_raw_attach
-#define	rawcb_list _bsd_rawcb_list
-#define	rawcb_mtx _bsd_rawcb_mtx
 #define	raw_ctlinput _bsd_raw_ctlinput
 #define	raw_detach _bsd_raw_detach
 #define	raw_init _bsd_raw_init
 #define	raw_input _bsd_raw_input
 #define	raw_input_ext _bsd_raw_input_ext
 #define	raw_usrreqs _bsd_raw_usrreqs
+#define	rawcb_list _bsd_rawcb_list
+#define	rawcb_mtx _bsd_rawcb_mtx
 #define	rc4_crypt _bsd_rc4_crypt
 #define	rc4_init _bsd_rc4_init
 #define	read_dsfield _bsd_read_dsfield
 #define	read_machclk _bsd_read_machclk
 #define	refcount_release_last _bsd_refcount_release_last
 #define	refcount_sleep _bsd_refcount_sleep
-#define	registered_toedevs _bsd_registered_toedevs
 #define	register_tcp_functions _bsd_register_tcp_functions
 #define	register_tcp_functions_as_name _bsd_register_tcp_functions_as_name
 #define	register_tcp_functions_as_names _bsd_register_tcp_functions_as_names
+#define	registered_toedevs _bsd_registered_toedevs
 #define	resource_disabled _bsd_resource_disabled
 #define	resource_find_match _bsd_resource_find_match
 #define	resource_int_value _bsd_resource_int_value
@@ -3899,15 +4027,15 @@
 #define	resource_unset_value _bsd_resource_unset_value
 #define	rib_free_info _bsd_rib_free_info
 #define	rib_lookup_info _bsd_rib_lookup_info
+#define	rijndaelDecrypt _bsd_rijndaelDecrypt
+#define	rijndaelEncrypt _bsd_rijndaelEncrypt
+#define	rijndaelKeySetupDec _bsd_rijndaelKeySetupDec
+#define	rijndaelKeySetupEnc _bsd_rijndaelKeySetupEnc
 #define	rijndael_blockDecrypt _bsd_rijndael_blockDecrypt
 #define	rijndael_blockEncrypt _bsd_rijndael_blockEncrypt
 #define	rijndael_cipherInit _bsd_rijndael_cipherInit
 #define	rijndael_decrypt _bsd_rijndael_decrypt
-#define	rijndaelDecrypt _bsd_rijndaelDecrypt
 #define	rijndael_encrypt _bsd_rijndael_encrypt
-#define	rijndaelEncrypt _bsd_rijndaelEncrypt
-#define	rijndaelKeySetupDec _bsd_rijndaelKeySetupDec
-#define	rijndaelKeySetupEnc _bsd_rijndaelKeySetupEnc
 #define	rijndael_makeKey _bsd_rijndael_makeKey
 #define	rijndael_padDecrypt _bsd_rijndael_padDecrypt
 #define	rijndael_padEncrypt _bsd_rijndael_padEncrypt
@@ -3916,10 +4044,8 @@
 #define	rip6_ctloutput _bsd_rip6_ctloutput
 #define	rip6_input _bsd_rip6_input
 #define	rip6_output _bsd_rip6_output
-#define	rip6stat _bsd_rip6stat
 #define	rip6_usrreqs _bsd_rip6_usrreqs
-#define	ripcb _bsd_ripcb
-#define	ripcbinfo _bsd_ripcbinfo
+#define	rip6stat _bsd_rip6stat
 #define	rip_ctlinput _bsd_rip_ctlinput
 #define	rip_ctloutput _bsd_rip_ctloutput
 #define	rip_init _bsd_rip_init
@@ -3928,6 +4054,8 @@
 #define	rip_recvspace _bsd_rip_recvspace
 #define	rip_sendspace _bsd_rip_sendspace
 #define	rip_usrreqs _bsd_rip_usrreqs
+#define	ripcb _bsd_ripcb
+#define	ripcbinfo _bsd_ripcbinfo
 #define	rman_activate_resource _bsd_rman_activate_resource
 #define	rman_adjust_resource _bsd_rman_adjust_resource
 #define	rman_deactivate_resource _bsd_rman_deactivate_resource
@@ -3963,10 +4091,6 @@
 #define	rman_set_rid _bsd_rman_set_rid
 #define	rman_set_start _bsd_rman_set_start
 #define	rman_set_virtual _bsd_rman_set_virtual
-#define	RMD160Final _bsd_RMD160Final
-#define	RMD160Init _bsd_RMD160Init
-#define	RMD160Transform _bsd_RMD160Transform
-#define	RMD160Update _bsd_RMD160Update
 #define	rn4_mpath_inithead _bsd_rn4_mpath_inithead
 #define	rn6_mpath_inithead _bsd_rn6_mpath_inithead
 #define	rn_addroute _bsd_rn_addroute
@@ -3993,21 +4117,14 @@
 #define	rt6_flush _bsd_rt6_flush
 #define	rt_add_addr_allfibs _bsd_rt_add_addr_allfibs
 #define	rt_addrmsg _bsd_rt_addrmsg
-#define	rtalloc1 _bsd_rtalloc1
-#define	rtalloc1_fib _bsd_rtalloc1_fib
-#define	rtalloc_ign_fib _bsd_rtalloc_ign_fib
-#define	rtalloc_mpath_fib _bsd_rtalloc_mpath_fib
 #define	rt_flushifroutes _bsd_rt_flushifroutes
 #define	rt_flushifroutes_af _bsd_rt_flushifroutes_af
 #define	rt_foreach_fib_walk _bsd_rt_foreach_fib_walk
 #define	rt_foreach_fib_walk_del _bsd_rt_foreach_fib_walk_del
-#define	rtfree _bsd_rtfree
 #define	rt_getifa_fib _bsd_rt_getifa_fib
 #define	rt_ieee80211msg _bsd_rt_ieee80211msg
 #define	rt_ifannouncemsg _bsd_rt_ifannouncemsg
 #define	rt_ifmsg _bsd_rt_ifmsg
-#define	rtinit _bsd_rtinit
-#define	rtioctl_fib _bsd_rtioctl_fib
 #define	rt_maskedcopy _bsd_rt_maskedcopy
 #define	rt_missmsg _bsd_rt_missmsg
 #define	rt_missmsg_fib _bsd_rt_missmsg_fib
@@ -4020,31 +4137,38 @@
 #define	rt_newaddrmsg_fib _bsd_rt_newaddrmsg_fib
 #define	rt_newmaddrmsg _bsd_rt_newmaddrmsg
 #define	rt_numfibs _bsd_rt_numfibs
+#define	rt_routemsg _bsd_rt_routemsg
+#define	rt_setgate _bsd_rt_setgate
+#define	rt_table_destroy _bsd_rt_table_destroy
+#define	rt_table_init _bsd_rt_table_init
+#define	rt_tables _bsd_rt_tables
+#define	rt_tables_get_gen _bsd_rt_tables_get_gen
+#define	rt_tables_get_rnh _bsd_rt_tables_get_rnh
+#define	rt_updatemtu _bsd_rt_updatemtu
+#define	rtalloc1 _bsd_rtalloc1
+#define	rtalloc1_fib _bsd_rtalloc1_fib
+#define	rtalloc_ign_fib _bsd_rtalloc_ign_fib
+#define	rtalloc_mpath_fib _bsd_rtalloc_mpath_fib
+#define	rtfree _bsd_rtfree
+#define	rtinit _bsd_rtinit
+#define	rtioctl_fib _bsd_rtioctl_fib
 #define	rto_logging _bsd_rto_logging
 #define	rtredirect_fib _bsd_rtredirect_fib
 #define	rtrequest1_fib _bsd_rtrequest1_fib
 #define	rtrequest_fib _bsd_rtrequest_fib
-#define	rt_routemsg _bsd_rt_routemsg
-#define	rt_setgate _bsd_rt_setgate
 #define	rtsock_addrmsg _bsd_rtsock_addrmsg
 #define	rtsock_mtx _bsd_rtsock_mtx
 #define	rtsock_routemsg _bsd_rtsock_routemsg
 #define	rtstat _bsd_rtstat
-#define	rt_table_destroy _bsd_rt_table_destroy
-#define	rt_table_init _bsd_rt_table_init
-#define	rt_tables _bsd_rt_tables
-#define	rt_tables_get_gen _bsd_rt_tables_get_gen
-#define	rt_tables_get_rnh _bsd_rt_tables_get_rnh
 #define	rttrash _bsd_rttrash
-#define	rt_updatemtu _bsd_rt_updatemtu
 #define	rtwn_adhoc_recv_mgmt _bsd_rtwn_adhoc_recv_mgmt
 #define	rtwn_attach _bsd_rtwn_attach
 #define	rtwn_bulk_rx_callback _bsd_rtwn_bulk_rx_callback
 #define	rtwn_bulk_tx_callback _bsd_rtwn_bulk_tx_callback
 #define	rtwn_calib_to _bsd_rtwn_calib_to
+#define	rtwn_cmd_sleepable _bsd_rtwn_cmd_sleepable
 #define	rtwn_cmdq_destroy _bsd_rtwn_cmdq_destroy
 #define	rtwn_cmdq_init _bsd_rtwn_cmdq_init
-#define	rtwn_cmd_sleepable _bsd_rtwn_cmd_sleepable
 #define	rtwn_detach _bsd_rtwn_detach
 #define	rtwn_drain_mbufq _bsd_rtwn_drain_mbufq
 #define	rtwn_efuse_read_next _bsd_rtwn_efuse_read_next
@@ -4100,17 +4224,9 @@
 #define	rtwn_usb_write_region_1 _bsd_rtwn_usb_write_region_1
 #define	run_debug _bsd_run_debug
 #define	rw_destroy _bsd_rw_destroy
-#define	_rw_downgrade _bsd__rw_downgrade
 #define	rw_init_flags _bsd_rw_init_flags
-#define	_rw_rlock _bsd__rw_rlock
-#define	_rw_runlock _bsd__rw_runlock
 #define	rw_sysinit _bsd_rw_sysinit
-#define	_rw_try_rlock _bsd__rw_try_rlock
-#define	_rw_try_upgrade _bsd__rw_try_upgrade
-#define	_rw_try_wlock _bsd__rw_try_wlock
-#define	_rw_wlock _bsd__rw_wlock
 #define	rw_wowned _bsd_rw_wowned
-#define	_rw_wunlock _bsd__rw_wunlock
 #define	sa6_any _bsd_sa6_any
 #define	sa6_checkzone _bsd_sa6_checkzone
 #define	sa6_checkzone_ifp _bsd_sa6_checkzone_ifp
@@ -4122,14 +4238,16 @@
 #define	saf1761_otg_init _bsd_saf1761_otg_init
 #define	saf1761_otg_interrupt _bsd_saf1761_otg_interrupt
 #define	saf1761_otg_uninit _bsd_saf1761_otg_uninit
+#define	sb_max _bsd_sb_max
+#define	sb_max_adj _bsd_sb_max_adj
 #define	sballoc _bsd_sballoc
 #define	sbappend _bsd_sbappend
+#define	sbappend_locked _bsd_sbappend_locked
 #define	sbappendaddr _bsd_sbappendaddr
 #define	sbappendaddr_locked _bsd_sbappendaddr_locked
 #define	sbappendaddr_nospacecheck_locked _bsd_sbappendaddr_nospacecheck_locked
 #define	sbappendcontrol _bsd_sbappendcontrol
 #define	sbappendcontrol_locked _bsd_sbappendcontrol_locked
-#define	sbappend_locked _bsd_sbappend_locked
 #define	sbappendrecord _bsd_sbappendrecord
 #define	sbappendrecord_locked _bsd_sbappendrecord_locked
 #define	sbappendstream _bsd_sbappendstream
@@ -4146,8 +4264,6 @@
 #define	sbflush_locked _bsd_sbflush_locked
 #define	sbfree _bsd_sbfree
 #define	sblock _bsd_sblock
-#define	sb_max _bsd_sb_max
-#define	sb_max_adj _bsd_sb_max_adj
 #define	sbready _bsd_sbready
 #define	sbrelease _bsd_sbrelease
 #define	sbrelease_internal _bsd_sbrelease_internal
@@ -4158,9 +4274,9 @@
 #define	sbsndptr _bsd_sbsndptr
 #define	sbsndptr_adv _bsd_sbsndptr_adv
 #define	sbsndptr_noadv _bsd_sbsndptr_noadv
-#define	sbtoxsockbuf _bsd_sbtoxsockbuf
 #define	sbt_tickthreshold _bsd_sbt_tickthreshold
 #define	sbt_timethreshold _bsd_sbt_timethreshold
+#define	sbtoxsockbuf _bsd_sbtoxsockbuf
 #define	sbuf_bcat _bsd_sbuf_bcat
 #define	sbuf_bcopyin _bsd_sbuf_bcopyin
 #define	sbuf_bcpy _bsd_sbuf_bcpy
@@ -4259,38 +4375,37 @@
 #define	scsi_test_unit_ready _bsd_scsi_test_unit_ready
 #define	scsi_transportid_sbuf _bsd_scsi_transportid_sbuf
 #define	scsi_write_same _bsd_scsi_write_same
-#define	SCTP6_ARE_ADDR_EQUAL _bsd_SCTP6_ARE_ADDR_EQUAL
 #define	sctp6_ctlinput _bsd_sctp6_ctlinput
 #define	sctp6_input _bsd_sctp6_input
 #define	sctp6_input_with_port _bsd_sctp6_input_with_port
 #define	sctp6_notify _bsd_sctp6_notify
 #define	sctp6_usrreqs _bsd_sctp6_usrreqs
+#define	sctp_CheckTimers _bsd_sctp_CheckTimers
 #define	sctp_abort_an_association _bsd_sctp_abort_an_association
 #define	sctp_abort_association _bsd_sctp_abort_association
 #define	sctp_abort_notification _bsd_sctp_abort_notification
 #define	sctp_accept _bsd_sctp_accept
-#define	sctp_add_addresses_to_i_ia _bsd_sctp_add_addresses_to_i_ia
 #define	sctp_add_addr_to_vrf _bsd_sctp_add_addr_to_vrf
+#define	sctp_add_addresses_to_i_ia _bsd_sctp_add_addresses_to_i_ia
 #define	sctp_add_auth_chunk _bsd_sctp_add_auth_chunk
 #define	sctp_add_local_addr_ep _bsd_sctp_add_local_addr_ep
 #define	sctp_add_local_addr_restricted _bsd_sctp_add_local_addr_restricted
 #define	sctp_add_or_del_interfaces _bsd_sctp_add_or_del_interfaces
 #define	sctp_add_pad_tombuf _bsd_sctp_add_pad_tombuf
-#define	sctp_addr_change _bsd_sctp_addr_change
 #define	sctp_add_remote_addr _bsd_sctp_add_remote_addr
-#define	sctp_addr_mgmt_ep_sa _bsd_sctp_addr_mgmt_ep_sa
 #define	sctp_add_stream_reset_result _bsd_sctp_add_stream_reset_result
 #define	sctp_add_stream_reset_result_tsn _bsd_sctp_add_stream_reset_result_tsn
 #define	sctp_add_substate _bsd_sctp_add_substate
 #define	sctp_add_to_readq _bsd_sctp_add_to_readq
 #define	sctp_add_vtag_to_timewait _bsd_sctp_add_vtag_to_timewait
-#define	SctpAlias _bsd_SctpAlias
-#define	sctp_allocate_vrf _bsd_sctp_allocate_vrf
+#define	sctp_addr_change _bsd_sctp_addr_change
+#define	sctp_addr_mgmt_ep_sa _bsd_sctp_addr_mgmt_ep_sa
 #define	sctp_alloc_authinfo _bsd_sctp_alloc_authinfo
 #define	sctp_alloc_chunklist _bsd_sctp_alloc_chunklist
 #define	sctp_alloc_hmaclist _bsd_sctp_alloc_hmaclist
 #define	sctp_alloc_key _bsd_sctp_alloc_key
 #define	sctp_alloc_sharedkey _bsd_sctp_alloc_sharedkey
+#define	sctp_allocate_vrf _bsd_sctp_allocate_vrf
 #define	sctp_aloc_assoc _bsd_sctp_aloc_assoc
 #define	sctp_arethere_unrecognized_parameters _bsd_sctp_arethere_unrecognized_parameters
 #define	sctp_asconf_cleanup _bsd_sctp_asconf_cleanup
@@ -4323,7 +4438,6 @@
 #define	sctp_can_peel_off _bsd_sctp_can_peel_off
 #define	sctp_cc_functions _bsd_sctp_cc_functions
 #define	sctp_check_address_list _bsd_sctp_check_address_list
-#define	sctp_CheckTimers _bsd_sctp_CheckTimers
 #define	sctp_chunk_output _bsd_sctp_chunk_output
 #define	sctp_clean_up_stream _bsd_sctp_clean_up_stream
 #define	sctp_clear_cachedkeys _bsd_sctp_clear_cachedkeys
@@ -4348,13 +4462,13 @@
 #define	sctp_deact_sharedkey_ep _bsd_sctp_deact_sharedkey_ep
 #define	sctp_default_supported_hmaclist _bsd_sctp_default_supported_hmaclist
 #define	sctp_del_addr_from_vrf _bsd_sctp_del_addr_from_vrf
+#define	sctp_del_local_addr_ep _bsd_sctp_del_local_addr_ep
+#define	sctp_del_local_addr_restricted _bsd_sctp_del_local_addr_restricted
+#define	sctp_del_remote_addr _bsd_sctp_del_remote_addr
 #define	sctp_delete_from_timewait _bsd_sctp_delete_from_timewait
 #define	sctp_delete_prim_timer _bsd_sctp_delete_prim_timer
 #define	sctp_delete_sharedkey _bsd_sctp_delete_sharedkey
 #define	sctp_delete_sharedkey_ep _bsd_sctp_delete_sharedkey_ep
-#define	sctp_del_local_addr_ep _bsd_sctp_del_local_addr_ep
-#define	sctp_del_local_addr_restricted _bsd_sctp_del_local_addr_restricted
-#define	sctp_del_remote_addr _bsd_sctp_del_remote_addr
 #define	sctp_destination_is_reachable _bsd_sctp_destination_is_reachable
 #define	sctp_disconnect _bsd_sctp_disconnect
 #define	sctp_do_peeloff _bsd_sctp_do_peeloff
@@ -4367,19 +4481,19 @@
 #define	sctp_fill_random_store _bsd_sctp_fill_random_store
 #define	sctp_fill_stat_log _bsd_sctp_fill_stat_log
 #define	sctp_find_alternate_net _bsd_sctp_find_alternate_net
+#define	sctp_find_ifa_by_addr _bsd_sctp_find_ifa_by_addr
+#define	sctp_find_ifa_in_ep _bsd_sctp_find_ifa_in_ep
+#define	sctp_find_ifn _bsd_sctp_find_ifn
+#define	sctp_find_sharedkey _bsd_sctp_find_sharedkey
+#define	sctp_find_stream_reset _bsd_sctp_find_stream_reset
+#define	sctp_find_vrf _bsd_sctp_find_vrf
 #define	sctp_findasoc_ep_asocid_locked _bsd_sctp_findasoc_ep_asocid_locked
 #define	sctp_findassociation_addr _bsd_sctp_findassociation_addr
 #define	sctp_findassociation_addr_sa _bsd_sctp_findassociation_addr_sa
 #define	sctp_findassociation_ep_addr _bsd_sctp_findassociation_ep_addr
 #define	sctp_findassociation_ep_asconf _bsd_sctp_findassociation_ep_asconf
 #define	sctp_findassociation_ep_asocid _bsd_sctp_findassociation_ep_asocid
-#define	sctp_find_ifa_by_addr _bsd_sctp_find_ifa_by_addr
-#define	sctp_find_ifa_in_ep _bsd_sctp_find_ifa_in_ep
-#define	sctp_find_ifn _bsd_sctp_find_ifn
 #define	sctp_findnet _bsd_sctp_findnet
-#define	sctp_find_sharedkey _bsd_sctp_find_sharedkey
-#define	sctp_find_stream_reset _bsd_sctp_find_stream_reset
-#define	sctp_find_vrf _bsd_sctp_find_vrf
 #define	sctp_fix_ecn_echo _bsd_sctp_fix_ecn_echo
 #define	sctp_flush _bsd_sctp_flush
 #define	sctp_free_assoc _bsd_sctp_free_assoc
@@ -4417,21 +4531,21 @@
 #define	sctp_ingetaddr _bsd_sctp_ingetaddr
 #define	sctp_init _bsd_sctp_init
 #define	sctp_init_asoc _bsd_sctp_init_asoc
-#define	sctp_initialize_auth_params _bsd_sctp_initialize_auth_params
-#define	sctp_initiate_iterator _bsd_sctp_initiate_iterator
 #define	sctp_init_sysctls _bsd_sctp_init_sysctls
 #define	sctp_init_vrf_list _bsd_sctp_init_vrf_list
+#define	sctp_initialize_auth_params _bsd_sctp_initialize_auth_params
+#define	sctp_initiate_iterator _bsd_sctp_initiate_iterator
 #define	sctp_inpcb_alloc _bsd_sctp_inpcb_alloc
 #define	sctp_inpcb_bind _bsd_sctp_inpcb_bind
 #define	sctp_inpcb_free _bsd_sctp_inpcb_free
 #define	sctp_input _bsd_sctp_input
 #define	sctp_input_with_port _bsd_sctp_input_with_port
 #define	sctp_insert_sharedkey _bsd_sctp_insert_sharedkey
-#define	sctp_is_address_in_scope _bsd_sctp_is_address_in_scope
-#define	sctp_is_address_on_local_host _bsd_sctp_is_address_on_local_host
 #define	sctp_is_addr_in_ep _bsd_sctp_is_addr_in_ep
 #define	sctp_is_addr_pending _bsd_sctp_is_addr_pending
 #define	sctp_is_addr_restricted _bsd_sctp_is_addr_restricted
+#define	sctp_is_address_in_scope _bsd_sctp_is_address_in_scope
+#define	sctp_is_address_on_local_host _bsd_sctp_is_address_on_local_host
 #define	sctp_is_in_timewait _bsd_sctp_is_in_timewait
 #define	sctp_is_same_scope _bsd_sctp_is_same_scope
 #define	sctp_is_there_an_abort_here _bsd_sctp_is_there_an_abort_here
@@ -4456,35 +4570,15 @@
 #define	sctp_log_strm_del _bsd_sctp_log_strm_del
 #define	sctp_log_strm_del_alt _bsd_sctp_log_strm_del_alt
 #define	sctp_lower_sosend _bsd_sctp_lower_sosend
+#define	sctp_m_getptr _bsd_sctp_m_getptr
 #define	sctp_map_assoc_state _bsd_sctp_map_assoc_state
 #define	sctp_mark_ifa_addr_down _bsd_sctp_mark_ifa_addr_down
 #define	sctp_mark_ifa_addr_up _bsd_sctp_mark_ifa_addr_up
-#define	SCTP_M_ASC_ADDR _bsd_SCTP_M_ASC_ADDR
-#define	SCTP_M_ASC_IT _bsd_SCTP_M_ASC_IT
-#define	SCTP_M_AUTH_CL _bsd_SCTP_M_AUTH_CL
-#define	SCTP_M_AUTH_HL _bsd_SCTP_M_AUTH_HL
-#define	SCTP_M_AUTH_IF _bsd_SCTP_M_AUTH_IF
-#define	SCTP_M_AUTH_KY _bsd_SCTP_M_AUTH_KY
-#define	SCTP_M_CMSG _bsd_SCTP_M_CMSG
-#define	SCTP_M_COPYAL _bsd_SCTP_M_COPYAL
-#define	sctp_m_getptr _bsd_sctp_m_getptr
-#define	SCTP_M_IFA _bsd_SCTP_M_IFA
-#define	SCTP_M_IFN _bsd_SCTP_M_IFN
 #define	sctp_min_mtu _bsd_sctp_min_mtu
 #define	sctp_misc_ints _bsd_sctp_misc_ints
-#define	SCTP_M_ITER _bsd_SCTP_M_ITER
-#define	SCTP_M_MAP _bsd_SCTP_M_MAP
-#define	SCTP_M_MCORE _bsd_SCTP_M_MCORE
-#define	SCTP_M_MVRF _bsd_SCTP_M_MVRF
 #define	sctp_move_chunks_from_net _bsd_sctp_move_chunks_from_net
 #define	sctp_move_pcb_and_assoc _bsd_sctp_move_pcb_and_assoc
-#define	SCTP_M_SOCKOPT _bsd_SCTP_M_SOCKOPT
-#define	SCTP_M_STRESET _bsd_SCTP_M_STRESET
-#define	SCTP_M_STRMI _bsd_SCTP_M_STRMI
-#define	SCTP_M_STRMO _bsd_SCTP_M_STRMO
-#define	SCTP_M_TIMW _bsd_SCTP_M_TIMW
 #define	sctp_mtu_size_reset _bsd_sctp_mtu_size_reset
-#define	SCTP_M_VRF _bsd_SCTP_M_VRF
 #define	sctp_negotiate_hmacid _bsd_sctp_negotiate_hmacid
 #define	sctp_net_immediate_retrans _bsd_sctp_net_immediate_retrans
 #define	sctp_notify _bsd_sctp_notify
@@ -4530,7 +4624,6 @@
 #define	sctp_send_heartbeat_ack _bsd_sctp_send_heartbeat_ack
 #define	sctp_send_initiate _bsd_sctp_send_initiate
 #define	sctp_send_initiate_ack _bsd_sctp_send_initiate_ack
-#define	sctp_sendm _bsd_sctp_sendm
 #define	sctp_send_operr_to _bsd_sctp_send_operr_to
 #define	sctp_send_packet_dropped _bsd_sctp_send_packet_dropped
 #define	sctp_send_sack _bsd_sctp_send_sack
@@ -4538,8 +4631,9 @@
 #define	sctp_send_shutdown_ack _bsd_sctp_send_shutdown_ack
 #define	sctp_send_shutdown_complete _bsd_sctp_send_shutdown_complete
 #define	sctp_send_shutdown_complete2 _bsd_sctp_send_shutdown_complete2
-#define	sctp_send_stream_reset_out_if_possible _bsd_sctp_send_stream_reset_out_if_possible
 #define	sctp_send_str_reset_req _bsd_sctp_send_str_reset_req
+#define	sctp_send_stream_reset_out_if_possible _bsd_sctp_send_stream_reset_out_if_possible
+#define	sctp_sendm _bsd_sctp_sendm
 #define	sctp_serialize_auth_chunks _bsd_sctp_serialize_auth_chunks
 #define	sctp_serialize_hmaclist _bsd_sctp_serialize_hmaclist
 #define	sctp_set_key _bsd_sctp_set_key
@@ -4547,11 +4641,10 @@
 #define	sctp_set_primary_ip_address_sa _bsd_sctp_set_primary_ip_address_sa
 #define	sctp_set_rwnd _bsd_sctp_set_rwnd
 #define	sctp_set_state _bsd_sctp_set_state
-#define	SctpShowAliasStats _bsd_SctpShowAliasStats
 #define	sctp_show_key _bsd_sctp_show_key
 #define	sctp_shutdown _bsd_sctp_shutdown
-#define	sctp_shutdownack_timer _bsd_sctp_shutdownack_timer
 #define	sctp_shutdown_timer _bsd_sctp_shutdown_timer
+#define	sctp_shutdownack_timer _bsd_sctp_shutdownack_timer
 #define	sctp_slide_mapping_arrays _bsd_sctp_slide_mapping_arrays
 #define	sctp_soreceive _bsd_sctp_soreceive
 #define	sctp_sorecvmsg _bsd_sctp_sorecvmsg
@@ -4614,81 +4707,22 @@
 #define	selwakeup _bsd_selwakeup
 #define	selwakeuppri _bsd_selwakeuppri
 #define	send_forward_tsn _bsd_send_forward_tsn
-#define	send_sendso_input_hook _bsd_send_sendso_input_hook
-#define	SetAckModified _bsd_SetAckModified
-#define	SetDefaultAliasAddress _bsd_SetDefaultAliasAddress
-#define	SetDestCallId _bsd_SetDestCallId
-#define	SetExpire _bsd_SetExpire
-#define	SetFragmentAddr _bsd_SetFragmentAddr
-#define	SetFragmentPtr _bsd_SetFragmentPtr
-#define	SetProtocolFlags _bsd_SetProtocolFlags
-#define	SetProxyAddress _bsd_SetProxyAddress
-#define	SetProxyPort _bsd_SetProxyPort
-#define	SetStateIn _bsd_SetStateIn
-#define	SetStateOut _bsd_SetStateOut
-#define	sha1_init _bsd_sha1_init
-#define	sha1_loop _bsd_sha1_loop
-#define	sha1_pad _bsd_sha1_pad
-#define	sha1_result _bsd_sha1_result
-#define	SHA256_Final _bsd_SHA256_Final
-#define	SHA256_Init _bsd_SHA256_Init
-#define	SHA256_Update _bsd_SHA256_Update
-#define	SHA384_Final _bsd_SHA384_Final
-#define	SHA384_Init _bsd_SHA384_Init
-#define	SHA384_Update _bsd_SHA384_Update
-#define	SHA512_Final _bsd_SHA512_Final
-#define	SHA512_Init _bsd_SHA512_Init
-#define	SHA512_Update _bsd_SHA512_Update
-#define	simplebus_add_device _bsd_simplebus_add_device
-#define	simplebus_driver _bsd_simplebus_driver
-#define	simplebus_fill_ranges _bsd_simplebus_fill_ranges
-#define	simplebus_init _bsd_simplebus_init
-#define	simplebus_setup_dinfo _bsd_simplebus_setup_dinfo
-#define	SipHash_End _bsd_SipHash_End
-#define	SipHash_Final _bsd_SipHash_Final
-#define	SipHash_InitX _bsd_SipHash_InitX
-#define	SipHash_SetKey _bsd_SipHash_SetKey
-#define	SipHash_Update _bsd_SipHash_Update
-#define	SipHashX _bsd_SipHashX
-#define	Skein1024_Final _bsd_Skein1024_Final
-#define	Skein1024_Final_Pad _bsd_Skein1024_Final_Pad
-#define	Skein1024_Init _bsd_Skein1024_Init
-#define	Skein1024_InitExt _bsd_Skein1024_InitExt
-#define	SKEIN1024_IV_1024 _bsd_SKEIN1024_IV_1024
-#define	SKEIN1024_IV_384 _bsd_SKEIN1024_IV_384
-#define	SKEIN1024_IV_512 _bsd_SKEIN1024_IV_512
-#define	Skein1024_Output _bsd_Skein1024_Output
-#define	Skein1024_Process_Block _bsd_Skein1024_Process_Block
-#define	Skein1024_Update _bsd_Skein1024_Update
-#define	Skein_256_Final _bsd_Skein_256_Final
-#define	Skein_256_Final_Pad _bsd_Skein_256_Final_Pad
-#define	Skein_256_Init _bsd_Skein_256_Init
-#define	Skein_256_InitExt _bsd_Skein_256_InitExt
-#define	SKEIN_256_IV_128 _bsd_SKEIN_256_IV_128
-#define	SKEIN_256_IV_160 _bsd_SKEIN_256_IV_160
-#define	SKEIN_256_IV_224 _bsd_SKEIN_256_IV_224
-#define	SKEIN_256_IV_256 _bsd_SKEIN_256_IV_256
-#define	Skein_256_Output _bsd_Skein_256_Output
-#define	Skein_256_Process_Block _bsd_Skein_256_Process_Block
-#define	Skein_256_Update _bsd_Skein_256_Update
-#define	Skein_512_Final _bsd_Skein_512_Final
-#define	Skein_512_Final_Pad _bsd_Skein_512_Final_Pad
-#define	Skein_512_Init _bsd_Skein_512_Init
-#define	Skein_512_InitExt _bsd_Skein_512_InitExt
-#define	SKEIN_512_IV_128 _bsd_SKEIN_512_IV_128
-#define	SKEIN_512_IV_160 _bsd_SKEIN_512_IV_160
-#define	SKEIN_512_IV_224 _bsd_SKEIN_512_IV_224
-#define	SKEIN_512_IV_256 _bsd_SKEIN_512_IV_256
-#define	SKEIN_512_IV_384 _bsd_SKEIN_512_IV_384
-#define	SKEIN_512_IV_512 _bsd_SKEIN_512_IV_512
-#define	Skein_512_Output _bsd_Skein_512_Output
-#define	Skein_512_Process_Block _bsd_Skein_512_Process_Block
-#define	Skein_512_Update _bsd_Skein_512_Update
+#define	send_sendso_input_hook _bsd_send_sendso_input_hook
+#define	sha1_init _bsd_sha1_init
+#define	sha1_loop _bsd_sha1_loop
+#define	sha1_pad _bsd_sha1_pad
+#define	sha1_result _bsd_sha1_result
+#define	simplebus_add_device _bsd_simplebus_add_device
+#define	simplebus_driver _bsd_simplebus_driver
+#define	simplebus_fill_ranges _bsd_simplebus_fill_ranges
+#define	simplebus_init _bsd_simplebus_init
+#define	simplebus_setup_dinfo _bsd_simplebus_setup_dinfo
 #define	skipjack_backwards _bsd_skipjack_backwards
 #define	skipjack_forwards _bsd_skipjack_forwards
 #define	sl_compress_init _bsd_sl_compress_init
 #define	sl_compress_tcp _bsd_sl_compress_tcp
-#define	_sleep _bsd__sleep
+#define	sl_uncompress_tcp _bsd_sl_uncompress_tcp
+#define	sl_uncompress_tcp_core _bsd_sl_uncompress_tcp_core
 #define	sleepq_add _bsd_sleepq_add
 #define	sleepq_alloc _bsd_sleepq_alloc
 #define	sleepq_broadcast _bsd_sleepq_broadcast
@@ -4705,8 +4739,6 @@
 #define	sleepq_timedwait _bsd_sleepq_timedwait
 #define	sleepq_type _bsd_sleepq_type
 #define	sleepq_wait _bsd_sleepq_wait
-#define	sl_uncompress_tcp _bsd_sl_uncompress_tcp
-#define	sl_uncompress_tcp_core _bsd_sl_uncompress_tcp_core
 #define	smc_attach _bsd_smc_attach
 #define	smc_detach _bsd_smc_detach
 #define	smc_devclass _bsd_smc_devclass
@@ -4716,6 +4748,28 @@
 #define	smc_probe _bsd_smc_probe
 #define	snprintf _bsd_snprintf
 #define	snprintf_uuid _bsd_snprintf_uuid
+#define	so_error_get _bsd_so_error_get
+#define	so_error_set _bsd_so_error_set
+#define	so_gencnt _bsd_so_gencnt
+#define	so_linger_get _bsd_so_linger_get
+#define	so_linger_set _bsd_so_linger_set
+#define	so_lock _bsd_so_lock
+#define	so_options_get _bsd_so_options_get
+#define	so_options_set _bsd_so_options_set
+#define	so_protosw_get _bsd_so_protosw_get
+#define	so_protosw_set _bsd_so_protosw_set
+#define	so_setsockopt _bsd_so_setsockopt
+#define	so_sockbuf_rcv _bsd_so_sockbuf_rcv
+#define	so_sockbuf_snd _bsd_so_sockbuf_snd
+#define	so_sorwakeup _bsd_so_sorwakeup
+#define	so_sorwakeup_locked _bsd_so_sorwakeup_locked
+#define	so_sotoinpcb _bsd_so_sotoinpcb
+#define	so_sototcpcb _bsd_so_sototcpcb
+#define	so_sowwakeup _bsd_so_sowwakeup
+#define	so_sowwakeup_locked _bsd_so_sowwakeup_locked
+#define	so_state_get _bsd_so_state_get
+#define	so_state_set _bsd_so_state_set
+#define	so_unlock _bsd_so_unlock
 #define	soabort _bsd_soabort
 #define	soaccept _bsd_soaccept
 #define	sobind _bsd_sobind
@@ -4734,42 +4788,32 @@
 #define	sodium_memzero _bsd_sodium_memzero
 #define	sodtor_set _bsd_sodtor_set
 #define	sodupsockaddr _bsd_sodupsockaddr
-#define	so_error_get _bsd_so_error_get
-#define	so_error_set _bsd_so_error_set
 #define	sofree _bsd_sofree
-#define	so_gencnt _bsd_so_gencnt
 #define	sogetopt _bsd_sogetopt
 #define	sohasoutofband _bsd_sohasoutofband
 #define	soisconnected _bsd_soisconnected
 #define	soisconnecting _bsd_soisconnecting
 #define	soisdisconnected _bsd_soisdisconnected
 #define	soisdisconnecting _bsd_soisdisconnecting
-#define	so_linger_get _bsd_so_linger_get
-#define	so_linger_set _bsd_so_linger_set
 #define	solisten _bsd_solisten
 #define	solisten_dequeue _bsd_solisten_dequeue
 #define	solisten_proto _bsd_solisten_proto
 #define	solisten_proto_check _bsd_solisten_proto_check
 #define	solisten_upcall_set _bsd_solisten_upcall_set
 #define	solisten_wakeup _bsd_solisten_wakeup
-#define	so_lock _bsd_so_lock
 #define	sonewconn _bsd_sonewconn
 #define	soo_close _bsd_soo_close
 #define	soo_ioctl _bsd_soo_ioctl
 #define	soo_poll _bsd_soo_poll
-#define	sooptcopyin _bsd_sooptcopyin
-#define	sooptcopyout _bsd_sooptcopyout
+#define	soo_read _bsd_soo_read
+#define	soo_write _bsd_soo_write
 #define	soopt_getm _bsd_soopt_getm
-#define	so_options_get _bsd_so_options_get
-#define	so_options_set _bsd_so_options_set
 #define	soopt_mcopyin _bsd_soopt_mcopyin
 #define	soopt_mcopyout _bsd_soopt_mcopyout
-#define	soo_read _bsd_soo_read
-#define	soo_write _bsd_soo_write
+#define	sooptcopyin _bsd_sooptcopyin
+#define	sooptcopyout _bsd_sooptcopyout
 #define	sopoll _bsd_sopoll
 #define	sopoll_generic _bsd_sopoll_generic
-#define	so_protosw_get _bsd_so_protosw_get
-#define	so_protosw_set _bsd_so_protosw_set
 #define	soreceive _bsd_soreceive
 #define	soreceive_dgram _bsd_soreceive_dgram
 #define	soreceive_generic _bsd_soreceive_generic
@@ -4780,20 +4824,8 @@
 #define	sosend_dgram _bsd_sosend_dgram
 #define	sosend_generic _bsd_sosend_generic
 #define	sosetopt _bsd_sosetopt
-#define	so_setsockopt _bsd_so_setsockopt
 #define	soshutdown _bsd_soshutdown
-#define	so_sockbuf_rcv _bsd_so_sockbuf_rcv
-#define	so_sockbuf_snd _bsd_so_sockbuf_snd
-#define	so_sorwakeup _bsd_so_sorwakeup
-#define	so_sorwakeup_locked _bsd_so_sorwakeup_locked
-#define	so_sotoinpcb _bsd_so_sotoinpcb
-#define	so_sototcpcb _bsd_so_sototcpcb
-#define	so_sowwakeup _bsd_so_sowwakeup
-#define	so_sowwakeup_locked _bsd_so_sowwakeup_locked
-#define	so_state_get _bsd_so_state_get
-#define	so_state_set _bsd_so_state_set
 #define	sotoxsocket _bsd_sotoxsocket
-#define	so_unlock _bsd_so_unlock
 #define	soupcall_clear _bsd_soupcall_clear
 #define	soupcall_set _bsd_soupcall_set
 #define	sowakeup _bsd_sowakeup
@@ -4810,34 +4842,12 @@
 #define	sppp_isempty _bsd_sppp_isempty
 #define	sppp_pick _bsd_sppp_pick
 #define	sprintf _bsd_sprintf
-#define	_start_set_crypto_set _bsd__start_set_crypto_set
-#define	_start_set_ieee80211_ioctl_getset _bsd__start_set_ieee80211_ioctl_getset
-#define	_start_set_ieee80211_ioctl_setset _bsd__start_set_ieee80211_ioctl_setset
-#define	_start_set_kbddriver_set _bsd__start_set_kbddriver_set
-#define	_start_set_modmetadata_set _bsd__start_set_modmetadata_set
-#define	_start_set_nexus _bsd__start_set_nexus
-#define	_start_set_ratectl_set _bsd__start_set_ratectl_set
-#define	_start_set_scanner_set _bsd__start_set_scanner_set
-#define	_start_set_sysctl_set _bsd__start_set_sysctl_set
-#define	_start_set_sysinit_set _bsd__start_set_sysinit_set
-#define	_stop_set_crypto_set _bsd__stop_set_crypto_set
-#define	_stop_set_ieee80211_ioctl_getset _bsd__stop_set_ieee80211_ioctl_getset
-#define	_stop_set_ieee80211_ioctl_setset _bsd__stop_set_ieee80211_ioctl_setset
-#define	_stop_set_kbddriver_set _bsd__stop_set_kbddriver_set
-#define	_stop_set_modmetadata_set _bsd__stop_set_modmetadata_set
-#define	_stop_set_nexus _bsd__stop_set_nexus
-#define	_stop_set_ratectl_set _bsd__stop_set_ratectl_set
-#define	_stop_set_scanner_set _bsd__stop_set_scanner_set
-#define	_stop_set_sysctl_set _bsd__stop_set_sysctl_set
-#define	_stop_set_sysinit_set _bsd__stop_set_sysinit_set
 #define	subkey_table_gen _bsd_subkey_table_gen
 #define	swi_add _bsd_swi_add
 #define	swi_sched _bsd_swi_sched
 #define	sx_destroy _bsd_sx_destroy
 #define	sx_downgrade_int _bsd_sx_downgrade_int
 #define	sx_init_flags _bsd_sx_init_flags
-#define	_sx_slock_int _bsd__sx_slock_int
-#define	_sx_sunlock_int _bsd__sx_sunlock_int
 #define	sx_sysinit _bsd_sx_sysinit
 #define	sx_try_slock_int _bsd_sx_try_slock_int
 #define	sx_try_upgrade_int _bsd_sx_try_upgrade_int
@@ -4849,39 +4859,8 @@
 #define	syncache_init _bsd_syncache_init
 #define	syncache_pcblist _bsd_syncache_pcblist
 #define	syncache_unreach _bsd_syncache_unreach
-#define	sysctl_add_oid _bsd_sysctl_add_oid
-#define	sysctl_chg_accept_global_ootb_addip _bsd_sysctl_chg_accept_global_ootb_addip
-#define	sysctl_chg_chunk_proc_limit _bsd_sysctl_chg_chunk_proc_limit
-#define	sysctl_chg_error_on_ootb _bsd_sysctl_chg_error_on_ootb
-#define	sysctl_chg_hashtable_size _bsd_sysctl_chg_hashtable_size
-#define	sysctl_chg_initialising_chunk_proc_limit _bsd_sysctl_chg_initialising_chunk_proc_limit
-#define	sysctl_chg_loglevel _bsd_sysctl_chg_loglevel
-#define	sysctl_chg_param_proc_limit _bsd_sysctl_chg_param_proc_limit
-#define	sysctl_chg_timer _bsd_sysctl_chg_timer
-#define	sysctl_chg_track_global_addresses _bsd_sysctl_chg_track_global_addresses
-#define	sysctl__children _bsd_sysctl__children
-#define	sysctl_ctx_entry_add _bsd_sysctl_ctx_entry_add
-#define	sysctl_ctx_entry_del _bsd_sysctl_ctx_entry_del
-#define	sysctl_ctx_entry_find _bsd_sysctl_ctx_entry_find
-#define	sysctl_ctx_free _bsd_sysctl_ctx_free
-#define	sysctl_ctx_init _bsd_sysctl_ctx_init
 #define	sysctl___debug _bsd_sysctl___debug
 #define	sysctl___dev _bsd_sysctl___dev
-#define	sysctl_enable_oid _bsd_sysctl_enable_oid
-#define	sysctl_find_oid _bsd_sysctl_find_oid
-#define	sysctl_handle_16 _bsd_sysctl_handle_16
-#define	sysctl_handle_32 _bsd_sysctl_handle_32
-#define	sysctl_handle_64 _bsd_sysctl_handle_64
-#define	sysctl_handle_8 _bsd_sysctl_handle_8
-#define	sysctl_handle_bool _bsd_sysctl_handle_bool
-#define	sysctl_handle_counter_u64 _bsd_sysctl_handle_counter_u64
-#define	sysctl_handle_counter_u64_array _bsd_sysctl_handle_counter_u64_array
-#define	sysctl_handle_int _bsd_sysctl_handle_int
-#define	sysctl_handle_long _bsd_sysctl_handle_long
-#define	sysctl_handle_opaque _bsd_sysctl_handle_opaque
-#define	sysctl_handle_string _bsd_sysctl_handle_string
-#define	sysctl_handle_uma_zone_cur _bsd_sysctl_handle_uma_zone_cur
-#define	sysctl_handle_uma_zone_max _bsd_sysctl_handle_uma_zone_max
 #define	sysctl___hw _bsd_sysctl___hw
 #define	sysctl___hw_bus _bsd_sysctl___hw_bus
 #define	sysctl___hw_fdt _bsd_sysctl___hw_fdt
@@ -4898,9 +4877,6 @@
 #define	sysctl___kern_evdev_input _bsd_sysctl___kern_evdev_input
 #define	sysctl___kern_features _bsd_sysctl___kern_features
 #define	sysctl___kern_ipc _bsd_sysctl___kern_ipc
-#define	sysctl_move_oid _bsd_sysctl_move_oid
-#define	sysctl_msec_to_sbintime _bsd_sysctl_msec_to_sbintime
-#define	sysctl_msec_to_ticks _bsd_sysctl_msec_to_ticks
 #define	sysctl___net _bsd_sysctl___net
 #define	sysctl___net_accf _bsd_sysctl___net_accf
 #define	sysctl___net_bpf _bsd_sysctl___net_bpf
@@ -4941,21 +4917,57 @@
 #define	sysctl___net_pf _bsd_sysctl___net_pf
 #define	sysctl___net_pfsync _bsd_sysctl___net_pfsync
 #define	sysctl___net_wlan _bsd_sysctl___net_wlan
+#define	sysctl___security _bsd_sysctl___security
+#define	sysctl___sysctl _bsd_sysctl___sysctl
+#define	sysctl___vm _bsd_sysctl___vm
+#define	sysctl__children _bsd_sysctl__children
+#define	sysctl_add_oid _bsd_sysctl_add_oid
+#define	sysctl_chg_accept_global_ootb_addip _bsd_sysctl_chg_accept_global_ootb_addip
+#define	sysctl_chg_chunk_proc_limit _bsd_sysctl_chg_chunk_proc_limit
+#define	sysctl_chg_error_on_ootb _bsd_sysctl_chg_error_on_ootb
+#define	sysctl_chg_hashtable_size _bsd_sysctl_chg_hashtable_size
+#define	sysctl_chg_initialising_chunk_proc_limit _bsd_sysctl_chg_initialising_chunk_proc_limit
+#define	sysctl_chg_loglevel _bsd_sysctl_chg_loglevel
+#define	sysctl_chg_param_proc_limit _bsd_sysctl_chg_param_proc_limit
+#define	sysctl_chg_timer _bsd_sysctl_chg_timer
+#define	sysctl_chg_track_global_addresses _bsd_sysctl_chg_track_global_addresses
+#define	sysctl_ctx_entry_add _bsd_sysctl_ctx_entry_add
+#define	sysctl_ctx_entry_del _bsd_sysctl_ctx_entry_del
+#define	sysctl_ctx_entry_find _bsd_sysctl_ctx_entry_find
+#define	sysctl_ctx_free _bsd_sysctl_ctx_free
+#define	sysctl_ctx_init _bsd_sysctl_ctx_init
+#define	sysctl_enable_oid _bsd_sysctl_enable_oid
+#define	sysctl_find_oid _bsd_sysctl_find_oid
+#define	sysctl_handle_16 _bsd_sysctl_handle_16
+#define	sysctl_handle_32 _bsd_sysctl_handle_32
+#define	sysctl_handle_64 _bsd_sysctl_handle_64
+#define	sysctl_handle_8 _bsd_sysctl_handle_8
+#define	sysctl_handle_bool _bsd_sysctl_handle_bool
+#define	sysctl_handle_counter_u64 _bsd_sysctl_handle_counter_u64
+#define	sysctl_handle_counter_u64_array _bsd_sysctl_handle_counter_u64_array
+#define	sysctl_handle_int _bsd_sysctl_handle_int
+#define	sysctl_handle_long _bsd_sysctl_handle_long
+#define	sysctl_handle_opaque _bsd_sysctl_handle_opaque
+#define	sysctl_handle_string _bsd_sysctl_handle_string
+#define	sysctl_handle_uma_zone_cur _bsd_sysctl_handle_uma_zone_cur
+#define	sysctl_handle_uma_zone_max _bsd_sysctl_handle_uma_zone_max
+#define	sysctl_move_oid _bsd_sysctl_move_oid
+#define	sysctl_msec_to_sbintime _bsd_sysctl_msec_to_sbintime
+#define	sysctl_msec_to_ticks _bsd_sysctl_msec_to_ticks
 #define	sysctl_register_disabled_oid _bsd_sysctl_register_disabled_oid
 #define	sysctl_register_oid _bsd_sysctl_register_oid
 #define	sysctl_remove_name _bsd_sysctl_remove_name
 #define	sysctl_remove_oid _bsd_sysctl_remove_oid
 #define	sysctl_rename_oid _bsd_sysctl_rename_oid
 #define	sysctl_sec_to_timeval _bsd_sysctl_sec_to_timeval
-#define	sysctl___security _bsd_sysctl___security
-#define	sysctl___sysctl _bsd_sysctl___sysctl
 #define	sysctl_unregister_oid _bsd_sysctl_unregister_oid
 #define	sysctl_usec_to_sbintime _bsd_sysctl_usec_to_sbintime
-#define	sysctl___vm _bsd_sysctl___vm
 #define	sysctl_wire_old_buffer _bsd_sysctl_wire_old_buffer
 #define	sysctl_wlock _bsd_sysctl_wlock
 #define	sysctl_wunlock _bsd_sysctl_wunlock
 #define	system_base_info _bsd_system_base_info
+#define	t_functions _bsd_t_functions
+#define	t_functions_inited _bsd_t_functions_inited
 #define	taskqgroup_adjust _bsd_taskqgroup_adjust
 #define	taskqgroup_attach _bsd_taskqgroup_attach
 #define	taskqgroup_attach_cpu _bsd_taskqgroup_attach_cpu
@@ -4964,9 +4976,11 @@
 #define	taskqgroup_create _bsd_taskqgroup_create
 #define	taskqgroup_destroy _bsd_taskqgroup_destroy
 #define	taskqgroup_detach _bsd_taskqgroup_detach
-#define	TB_DRAIN_WAITER _bsd_TB_DRAIN_WAITER
 #define	tbr_dequeue_ptr _bsd_tbr_dequeue_ptr
 #define	tbr_set _bsd_tbr_set
+#define	tc_precexp _bsd_tc_precexp
+#define	tc_tick_bt _bsd_tc_tick_bt
+#define	tc_tick_sbt _bsd_tc_tick_sbt
 #define	tcb _bsd_tcb
 #define	tcbinfo _bsd_tcbinfo
 #define	tcp6_ctlinput _bsd_tcp6_ctlinput
@@ -4997,7 +5011,6 @@
 #define	tcp_do_autorcvbuf _bsd_tcp_do_autorcvbuf
 #define	tcp_do_autosndbuf _bsd_tcp_do_autosndbuf
 #define	tcp_do_ecn _bsd_tcp_do_ecn
-#define	tcp_dooptions _bsd_tcp_dooptions
 #define	tcp_do_rfc1323 _bsd_tcp_do_rfc1323
 #define	tcp_do_rfc3042 _bsd_tcp_do_rfc3042
 #define	tcp_do_rfc3390 _bsd_tcp_do_rfc3390
@@ -5006,6 +5019,7 @@
 #define	tcp_do_sack _bsd_tcp_do_sack
 #define	tcp_do_segment _bsd_tcp_do_segment
 #define	tcp_do_tso _bsd_tcp_do_tso
+#define	tcp_dooptions _bsd_tcp_dooptions
 #define	tcp_drain _bsd_tcp_drain
 #define	tcp_drop _bsd_tcp_drop
 #define	tcp_drop_syn_sent _bsd_tcp_drop_syn_sent
@@ -5023,19 +5037,17 @@
 #define	tcp_hc_updatemtu _bsd_tcp_hc_updatemtu
 #define	tcp_init _bsd_tcp_init
 #define	tcp_initcwnd_segments _bsd_tcp_initcwnd_segments
-#define	tcp_inpinfo_lock_del _bsd_tcp_inpinfo_lock_del
 #define	tcp_inp_lro_compressed _bsd_tcp_inp_lro_compressed
 #define	tcp_inp_lro_direct_queue _bsd_tcp_inp_lro_direct_queue
 #define	tcp_inp_lro_locks_taken _bsd_tcp_inp_lro_locks_taken
 #define	tcp_inp_lro_sack_wake _bsd_tcp_inp_lro_sack_wake
 #define	tcp_inp_lro_single_push _bsd_tcp_inp_lro_single_push
 #define	tcp_inp_lro_wokeup_queue _bsd_tcp_inp_lro_wokeup_queue
+#define	tcp_inpinfo_lock_del _bsd_tcp_inpinfo_lock_del
 #define	tcp_inptoxtp _bsd_tcp_inptoxtp
 #define	tcp_input _bsd_tcp_input
 #define	tcp_insecure_rst _bsd_tcp_insecure_rst
 #define	tcp_insecure_syn _bsd_tcp_insecure_syn
-#define	tcpip_fillheaders _bsd_tcpip_fillheaders
-#define	tcpip_maketemplate _bsd_tcpip_maketemplate
 #define	tcp_ipsec_support _bsd_tcp_ipsec_support
 #define	tcp_keepcnt _bsd_tcp_keepcnt
 #define	tcp_keepidle _bsd_tcp_keepidle
@@ -5054,21 +5066,21 @@
 #define	tcp_lro_queue_mbuf _bsd_tcp_lro_queue_mbuf
 #define	tcp_lro_reg_mbufq _bsd_tcp_lro_reg_mbufq
 #define	tcp_lro_rx _bsd_tcp_lro_rx
+#define	tcp_m_copym _bsd_tcp_m_copym
 #define	tcp_maxmtu _bsd_tcp_maxmtu
 #define	tcp_maxmtu6 _bsd_tcp_maxmtu6
 #define	tcp_maxpersistidle _bsd_tcp_maxpersistidle
 #define	tcp_maxseg _bsd_tcp_maxseg
-#define	tcp_m_copym _bsd_tcp_m_copym
 #define	tcp_minmss _bsd_tcp_minmss
 #define	tcp_msl _bsd_tcp_msl
 #define	tcp_mss _bsd_tcp_mss
+#define	tcp_mss_update _bsd_tcp_mss_update
 #define	tcp_mssdflt _bsd_tcp_mssdflt
 #define	tcp_mssopt _bsd_tcp_mssopt
-#define	tcp_mss_update _bsd_tcp_mss_update
 #define	tcp_new_isn _bsd_tcp_new_isn
+#define	tcp_new_ts_offset _bsd_tcp_new_ts_offset
 #define	tcp_newreno_partial_ack _bsd_tcp_newreno_partial_ack
 #define	tcp_newtcpcb _bsd_tcp_newtcpcb
-#define	tcp_new_ts_offset _bsd_tcp_new_ts_offset
 #define	tcp_offload_connect _bsd_tcp_offload_connect
 #define	tcp_offload_ctloutput _bsd_tcp_offload_ctloutput
 #define	tcp_offload_detach _bsd_tcp_offload_detach
@@ -5085,14 +5097,12 @@
 #define	tcp_reass _bsd_tcp_reass
 #define	tcp_reass_flush _bsd_tcp_reass_flush
 #define	tcp_reass_global_init _bsd_tcp_reass_global_init
-#define	tc_precexp _bsd_tc_precexp
 #define	tcp_recvspace _bsd_tcp_recvspace
 #define	tcp_respond _bsd_tcp_respond
 #define	tcp_rexmit_drop_options _bsd_tcp_rexmit_drop_options
 #define	tcp_rexmit_initial _bsd_tcp_rexmit_initial
 #define	tcp_rexmit_min _bsd_tcp_rexmit_min
 #define	tcp_rexmit_slop _bsd_tcp_rexmit_slop
-#define	tcprexmtthresh _bsd_tcprexmtthresh
 #define	tcp_sack_adjust _bsd_tcp_sack_adjust
 #define	tcp_sack_doack _bsd_tcp_sack_doack
 #define	tcp_sack_globalholes _bsd_tcp_sack_globalholes
@@ -5106,8 +5116,6 @@
 #define	tcp_setpersist _bsd_tcp_setpersist
 #define	tcp_slowtimo _bsd_tcp_slowtimo
 #define	tcp_sndbuf_autoscale _bsd_tcp_sndbuf_autoscale
-#define	tcps_states _bsd_tcps_states
-#define	tcpstat _bsd_tcpstat
 #define	tcp_state_change _bsd_tcp_state_change
 #define	tcp_switch_back_to_default _bsd_tcp_switch_back_to_default
 #define	tcp_timer_2msl _bsd_tcp_timer_2msl
@@ -5119,17 +5127,17 @@
 #define	tcp_timer_persist _bsd_tcp_timer_persist
 #define	tcp_timer_rexmt _bsd_tcp_timer_rexmt
 #define	tcp_timer_stop _bsd_tcp_timer_stop
-#define	tcp_timers_unsuspend _bsd_tcp_timers_unsuspend
 #define	tcp_timer_suspend _bsd_tcp_timer_suspend
+#define	tcp_timers_unsuspend _bsd_tcp_timers_unsuspend
 #define	tcp_totbackoff _bsd_tcp_totbackoff
 #define	tcp_trace _bsd_tcp_trace
 #define	tcp_ts_offset_per_conn _bsd_tcp_ts_offset_per_conn
 #define	tcp_tw_2msl_scan _bsd_tcp_tw_2msl_scan
+#define	tcp_tw_init _bsd_tcp_tw_init
+#define	tcp_tw_zone_change _bsd_tcp_tw_zone_change
 #define	tcp_twcheck _bsd_tcp_twcheck
 #define	tcp_twclose _bsd_tcp_twclose
-#define	tcp_tw_init _bsd_tcp_tw_init
 #define	tcp_twstart _bsd_tcp_twstart
-#define	tcp_tw_zone_change _bsd_tcp_tw_zone_change
 #define	tcp_update_dsack_list _bsd_tcp_update_dsack_list
 #define	tcp_update_sack_list _bsd_tcp_update_sack_list
 #define	tcp_use_hostcache _bsd_tcp_use_hostcache
@@ -5137,26 +5145,17 @@
 #define	tcp_v6mssdflt _bsd_tcp_v6mssdflt
 #define	tcp_v6pmtud_blackhole_mss _bsd_tcp_v6pmtud_blackhole_mss
 #define	tcp_xmit_timer _bsd_tcp_xmit_timer
-#define	tc_tick_bt _bsd_tc_tick_bt
-#define	tc_tick_sbt _bsd_tc_tick_sbt
-#define	t_functions _bsd_t_functions
-#define	t_functions_inited _bsd_t_functions_inited
+#define	tcpip_fillheaders _bsd_tcpip_fillheaders
+#define	tcpip_maketemplate _bsd_tcpip_maketemplate
+#define	tcprexmtthresh _bsd_tcprexmtthresh
+#define	tcps_states _bsd_tcps_states
+#define	tcpstat _bsd_tcpstat
 #define	ti_am335x_clk_devmap _bsd_ti_am335x_clk_devmap
 #define	ti_am335x_pinmux_dev _bsd_ti_am335x_pinmux_dev
-#define	tick _bsd_tick
-#define	ticket_altqs_active _bsd_ticket_altqs_active
-#define	ticket_altqs_inactive _bsd_ticket_altqs_inactive
-#define	ticket_pabuf _bsd_ticket_pabuf
-#define	ticks _bsd_ticks
-#define	tick_sbt _bsd_tick_sbt
 #define	ti_hwmods _bsd_ti_hwmods
 #define	ti_hwmods_contains _bsd_ti_hwmods_contains
 #define	ti_hwmods_get_clock _bsd_ti_hwmods_get_clock
 #define	ti_hwmods_get_unit _bsd_ti_hwmods_get_unit
-#define	timeout _bsd_timeout
-#define	_timeout_task_init _bsd__timeout_task_init
-#define	timevaladd _bsd_timevaladd
-#define	timevalsub _bsd_timevalsub
 #define	ti_pinmux_padconf_get _bsd_ti_pinmux_padconf_get
 #define	ti_pinmux_padconf_get_gpiomode _bsd_ti_pinmux_padconf_get_gpiomode
 #define	ti_pinmux_padconf_set _bsd_ti_pinmux_padconf_set
@@ -5169,6 +5168,14 @@
 #define	ti_prcm_clk_valid _bsd_ti_prcm_clk_valid
 #define	ti_scm_reg_read_4 _bsd_ti_scm_reg_read_4
 #define	ti_scm_reg_write_4 _bsd_ti_scm_reg_write_4
+#define	tick _bsd_tick
+#define	tick_sbt _bsd_tick_sbt
+#define	ticket_altqs_active _bsd_ticket_altqs_active
+#define	ticket_altqs_inactive _bsd_ticket_altqs_inactive
+#define	ticket_pabuf _bsd_ticket_pabuf
+#define	timeout _bsd_timeout
+#define	timevaladd _bsd_timevaladd
+#define	timevalsub _bsd_timevalsub
 #define	trash_ctor _bsd_trash_ctor
 #define	trash_dtor _bsd_trash_dtor
 #define	trash_fini _bsd_trash_fini
@@ -5190,6 +5197,24 @@
 #define	tty_alloc _bsd_tty_alloc
 #define	tty_alloc_mutex _bsd_tty_alloc_mutex
 #define	tty_checkoutq _bsd_tty_checkoutq
+#define	tty_flush _bsd_tty_flush
+#define	tty_hiwat_in_block _bsd_tty_hiwat_in_block
+#define	tty_hiwat_in_unblock _bsd_tty_hiwat_in_unblock
+#define	tty_init_console _bsd_tty_init_console
+#define	tty_ioctl _bsd_tty_ioctl
+#define	tty_makedevf _bsd_tty_makedevf
+#define	tty_putchar _bsd_tty_putchar
+#define	tty_putstrn _bsd_tty_putstrn
+#define	tty_rel_gone _bsd_tty_rel_gone
+#define	tty_rel_pgrp _bsd_tty_rel_pgrp
+#define	tty_rel_sess _bsd_tty_rel_sess
+#define	tty_set_winsize _bsd_tty_set_winsize
+#define	tty_signal_pgrp _bsd_tty_signal_pgrp
+#define	tty_signal_sessleader _bsd_tty_signal_sessleader
+#define	tty_timedwait _bsd_tty_timedwait
+#define	tty_wait _bsd_tty_wait
+#define	tty_wait_background _bsd_tty_wait_background
+#define	tty_wakeup _bsd_tty_wakeup
 #define	ttydisc_close _bsd_ttydisc_close
 #define	ttydisc_getc _bsd_ttydisc_getc
 #define	ttydisc_getc_poll _bsd_ttydisc_getc_poll
@@ -5204,10 +5229,6 @@
 #define	ttydisc_rint_poll _bsd_ttydisc_rint_poll
 #define	ttydisc_rint_simple _bsd_ttydisc_rint_simple
 #define	ttydisc_write _bsd_ttydisc_write
-#define	tty_flush _bsd_tty_flush
-#define	tty_hiwat_in_block _bsd_tty_hiwat_in_block
-#define	tty_hiwat_in_unblock _bsd_tty_hiwat_in_unblock
-#define	tty_init_console _bsd_tty_init_console
 #define	ttyinq_canonicalize _bsd_ttyinq_canonicalize
 #define	ttyinq_findchar _bsd_ttyinq_findchar
 #define	ttyinq_flush _bsd_ttyinq_flush
@@ -5222,8 +5243,6 @@
 #define	ttyinq_unputchar _bsd_ttyinq_unputchar
 #define	ttyinq_write _bsd_ttyinq_write
 #define	ttyinq_write_nofrag _bsd_ttyinq_write_nofrag
-#define	tty_ioctl _bsd_tty_ioctl
-#define	tty_makedevf _bsd_tty_makedevf
 #define	ttyoutq_flush _bsd_ttyoutq_flush
 #define	ttyoutq_free _bsd_ttyoutq_free
 #define	ttyoutq_read _bsd_ttyoutq_read
@@ -5231,18 +5250,6 @@
 #define	ttyoutq_setsize _bsd_ttyoutq_setsize
 #define	ttyoutq_write _bsd_ttyoutq_write
 #define	ttyoutq_write_nofrag _bsd_ttyoutq_write_nofrag
-#define	tty_putchar _bsd_tty_putchar
-#define	tty_putstrn _bsd_tty_putstrn
-#define	tty_rel_gone _bsd_tty_rel_gone
-#define	tty_rel_pgrp _bsd_tty_rel_pgrp
-#define	tty_rel_sess _bsd_tty_rel_sess
-#define	tty_set_winsize _bsd_tty_set_winsize
-#define	tty_signal_pgrp _bsd_tty_signal_pgrp
-#define	tty_signal_sessleader _bsd_tty_signal_sessleader
-#define	tty_timedwait _bsd_tty_timedwait
-#define	tty_wait _bsd_tty_wait
-#define	tty_wait_background _bsd_tty_wait_background
-#define	tty_wakeup _bsd_tty_wakeup
 #define	tvtohz _bsd_tvtohz
 #define	ucom_attach _bsd_ucom_attach
 #define	ucom_cfg_is_gone _bsd_ucom_cfg_is_gone
@@ -5273,9 +5280,6 @@
 #define	udp_ipsec_input _bsd_udp_ipsec_input
 #define	udp_ipsec_output _bsd_udp_ipsec_output
 #define	udp_ipsec_pcbctl _bsd_udp_ipsec_pcbctl
-#define	udplite6_ctlinput _bsd_udplite6_ctlinput
-#define	udplite_ctlinput _bsd_udplite_ctlinput
-#define	udplite_init _bsd_udplite_init
 #define	udp_log_in_vain _bsd_udp_log_in_vain
 #define	udp_newudpcb _bsd_udp_newudpcb
 #define	udp_notify _bsd_udp_notify
@@ -5283,8 +5287,11 @@
 #define	udp_sendspace _bsd_udp_sendspace
 #define	udp_set_kernel_tunneling _bsd_udp_set_kernel_tunneling
 #define	udp_shutdown _bsd_udp_shutdown
-#define	udpstat _bsd_udpstat
 #define	udp_usrreqs _bsd_udp_usrreqs
+#define	udplite6_ctlinput _bsd_udplite6_ctlinput
+#define	udplite_ctlinput _bsd_udplite_ctlinput
+#define	udplite_init _bsd_udplite_init
+#define	udpstat _bsd_udpstat
 #define	uether_getifp _bsd_uether_getifp
 #define	uether_getmii _bsd_uether_getmii
 #define	uether_getsc _bsd_uether_getsc
@@ -5371,11 +5378,127 @@
 #define	usb_bus_mem_free_all _bsd_usb_bus_mem_free_all
 #define	usb_bus_port_get_device _bsd_usb_bus_port_get_device
 #define	usb_bus_port_set_device _bsd_usb_bus_port_set_device
-#define	usb_bus_powerd _bsd_usb_bus_powerd
 #define	usb_bus_power_update _bsd_usb_bus_power_update
+#define	usb_bus_powerd _bsd_usb_bus_powerd
 #define	usb_bus_reset_async_locked _bsd_usb_bus_reset_async_locked
 #define	usb_bus_unload _bsd_usb_bus_unload
 #define	usb_command_wrapper _bsd_usb_command_wrapper
+#define	usb_debug _bsd_usb_debug
+#define	usb_desc_foreach _bsd_usb_desc_foreach
+#define	usb_destroy_dev _bsd_usb_destroy_dev
+#define	usb_destroy_dev_sync _bsd_usb_destroy_dev_sync
+#define	usb_detach_device _bsd_usb_detach_device
+#define	usb_devclass_ptr _bsd_usb_devclass_ptr
+#define	usb_devinfo _bsd_usb_devinfo
+#define	usb_devsw _bsd_usb_devsw
+#define	usb_dma_delay_done_cb _bsd_usb_dma_delay_done_cb
+#define	usb_dma_tag_find _bsd_usb_dma_tag_find
+#define	usb_dma_tag_setup _bsd_usb_dma_tag_setup
+#define	usb_dma_tag_unsetup _bsd_usb_dma_tag_unsetup
+#define	usb_do_clear_stall_callback _bsd_usb_do_clear_stall_callback
+#define	usb_dump_device _bsd_usb_dump_device
+#define	usb_dump_endpoint _bsd_usb_dump_endpoint
+#define	usb_dump_iface _bsd_usb_dump_iface
+#define	usb_dump_queue _bsd_usb_dump_queue
+#define	usb_dump_xfer _bsd_usb_dump_xfer
+#define	usb_dymo_eject _bsd_usb_dymo_eject
+#define	usb_ed_comp_foreach _bsd_usb_ed_comp_foreach
+#define	usb_edesc_foreach _bsd_usb_edesc_foreach
+#define	usb_endpoint_foreach _bsd_usb_endpoint_foreach
+#define	usb_extra_power_up_time _bsd_usb_extra_power_up_time
+#define	usb_fifo_alloc_buffer _bsd_usb_fifo_alloc_buffer
+#define	usb_fifo_attach _bsd_usb_fifo_attach
+#define	usb_fifo_detach _bsd_usb_fifo_detach
+#define	usb_fifo_free _bsd_usb_fifo_free
+#define	usb_fifo_free_buffer _bsd_usb_fifo_free_buffer
+#define	usb_fifo_get_data _bsd_usb_fifo_get_data
+#define	usb_fifo_get_data_buffer _bsd_usb_fifo_get_data_buffer
+#define	usb_fifo_get_data_error _bsd_usb_fifo_get_data_error
+#define	usb_fifo_get_data_linear _bsd_usb_fifo_get_data_linear
+#define	usb_fifo_put_bytes_max _bsd_usb_fifo_put_bytes_max
+#define	usb_fifo_put_data _bsd_usb_fifo_put_data
+#define	usb_fifo_put_data_buffer _bsd_usb_fifo_put_data_buffer
+#define	usb_fifo_put_data_error _bsd_usb_fifo_put_data_error
+#define	usb_fifo_put_data_linear _bsd_usb_fifo_put_data_linear
+#define	usb_fifo_reset _bsd_usb_fifo_reset
+#define	usb_fifo_set_close_zlp _bsd_usb_fifo_set_close_zlp
+#define	usb_fifo_set_write_defrag _bsd_usb_fifo_set_write_defrag
+#define	usb_fifo_signal _bsd_usb_fifo_signal
+#define	usb_fifo_softc _bsd_usb_fifo_softc
+#define	usb_fifo_wait _bsd_usb_fifo_wait
+#define	usb_fifo_wakeup _bsd_usb_fifo_wakeup
+#define	usb_free_device _bsd_usb_free_device
+#define	usb_free_symlink _bsd_usb_free_symlink
+#define	usb_get_device_state _bsd_usb_get_device_state
+#define	usb_get_manufacturer _bsd_usb_get_manufacturer
+#define	usb_get_product _bsd_usb_get_product
+#define	usb_get_serial _bsd_usb_get_serial
+#define	usb_handle_request_callback _bsd_usb_handle_request_callback
+#define	usb_hs_bandwidth_alloc _bsd_usb_hs_bandwidth_alloc
+#define	usb_hs_bandwidth_free _bsd_usb_hs_bandwidth_free
+#define	usb_idesc_foreach _bsd_usb_idesc_foreach
+#define	usb_iface_is_cdrom _bsd_usb_iface_is_cdrom
+#define	usb_isoc_time_expand _bsd_usb_isoc_time_expand
+#define	usb_make_dev _bsd_usb_make_dev
+#define	usb_make_str_desc _bsd_usb_make_str_desc
+#define	usb_msc_auto_quirk _bsd_usb_msc_auto_quirk
+#define	usb_msc_eject _bsd_usb_msc_eject
+#define	usb_msc_read_10 _bsd_usb_msc_read_10
+#define	usb_msc_read_capacity _bsd_usb_msc_read_capacity
+#define	usb_msc_write_10 _bsd_usb_msc_write_10
+#define	usb_needs_explore _bsd_usb_needs_explore
+#define	usb_needs_explore_all _bsd_usb_needs_explore_all
+#define	usb_pause_mtx _bsd_usb_pause_mtx
+#define	usb_pc_alloc_mem _bsd_usb_pc_alloc_mem
+#define	usb_pc_buffer_is_aligned _bsd_usb_pc_buffer_is_aligned
+#define	usb_pc_cpu_flush _bsd_usb_pc_cpu_flush
+#define	usb_pc_cpu_invalidate _bsd_usb_pc_cpu_invalidate
+#define	usb_pc_dmamap_create _bsd_usb_pc_dmamap_create
+#define	usb_pc_dmamap_destroy _bsd_usb_pc_dmamap_destroy
+#define	usb_pc_free_mem _bsd_usb_pc_free_mem
+#define	usb_pc_load_mem _bsd_usb_pc_load_mem
+#define	usb_peer_can_wakeup _bsd_usb_peer_can_wakeup
+#define	usb_port_powerup_delay _bsd_usb_port_powerup_delay
+#define	usb_port_reset_delay _bsd_usb_port_reset_delay
+#define	usb_port_reset_recovery _bsd_usb_port_reset_recovery
+#define	usb_port_resume_delay _bsd_usb_port_resume_delay
+#define	usb_port_root_reset_delay _bsd_usb_port_root_reset_delay
+#define	usb_printbcd _bsd_usb_printbcd
+#define	usb_probe_and_attach _bsd_usb_probe_and_attach
+#define	usb_proc_create _bsd_usb_proc_create
+#define	usb_proc_drain _bsd_usb_proc_drain
+#define	usb_proc_explore_lock _bsd_usb_proc_explore_lock
+#define	usb_proc_explore_msignal _bsd_usb_proc_explore_msignal
+#define	usb_proc_explore_mwait _bsd_usb_proc_explore_mwait
+#define	usb_proc_explore_unlock _bsd_usb_proc_explore_unlock
+#define	usb_proc_free _bsd_usb_proc_free
+#define	usb_proc_is_called_from _bsd_usb_proc_is_called_from
+#define	usb_proc_is_gone _bsd_usb_proc_is_gone
+#define	usb_proc_msignal _bsd_usb_proc_msignal
+#define	usb_proc_mwait _bsd_usb_proc_mwait
+#define	usb_proc_rewakeup _bsd_usb_proc_rewakeup
+#define	usb_quirk_ioctl_p _bsd_usb_quirk_ioctl_p
+#define	usb_quirk_unload _bsd_usb_quirk_unload
+#define	usb_read_symlink _bsd_usb_read_symlink
+#define	usb_ref_lock _bsd_usb_ref_lock
+#define	usb_reset_iface_endpoints _bsd_usb_reset_iface_endpoints
+#define	usb_resume_delay _bsd_usb_resume_delay
+#define	usb_resume_recovery _bsd_usb_resume_recovery
+#define	usb_resume_wait _bsd_usb_resume_wait
+#define	usb_set_address_settle _bsd_usb_set_address_settle
+#define	usb_set_device_state _bsd_usb_set_device_state
+#define	usb_statestr _bsd_usb_statestr
+#define	usb_string_lang_en _bsd_usb_string_lang_en
+#define	usb_suspend_resume _bsd_usb_suspend_resume
+#define	usb_temp_get_desc_p _bsd_usb_temp_get_desc_p
+#define	usb_temp_setup_by_index_p _bsd_usb_temp_setup_by_index_p
+#define	usb_temp_unload _bsd_usb_temp_unload
+#define	usb_temp_unsetup_p _bsd_usb_temp_unsetup_p
+#define	usb_template _bsd_usb_template
+#define	usb_test_quirk _bsd_usb_test_quirk
+#define	usb_test_quirk_p _bsd_usb_test_quirk_p
+#define	usb_trim_spaces _bsd_usb_trim_spaces
+#define	usb_ugen_methods _bsd_usb_ugen_methods
 #define	usbd_add_dynamic_quirk _bsd_usbd_add_dynamic_quirk
 #define	usbd_alloc_config_desc _bsd_usbd_alloc_config_desc
 #define	usbd_clear_data_toggle _bsd_usbd_clear_data_toggle
@@ -5391,19 +5514,11 @@
 #define	usbd_do_request_flags _bsd_usbd_do_request_flags
 #define	usbd_do_request_proc _bsd_usbd_do_request_proc
 #define	usbd_dummy_timeout _bsd_usbd_dummy_timeout
-#define	usb_debug _bsd_usb_debug
 #define	usbd_enum_is_locked _bsd_usbd_enum_is_locked
 #define	usbd_enum_lock _bsd_usbd_enum_lock
 #define	usbd_enum_lock_sig _bsd_usbd_enum_lock_sig
 #define	usbd_enum_unlock _bsd_usbd_enum_unlock
 #define	usbd_errstr _bsd_usbd_errstr
-#define	usb_desc_foreach _bsd_usb_desc_foreach
-#define	usb_destroy_dev _bsd_usb_destroy_dev
-#define	usb_destroy_dev_sync _bsd_usb_destroy_dev_sync
-#define	usb_detach_device _bsd_usb_detach_device
-#define	usb_devclass_ptr _bsd_usb_devclass_ptr
-#define	usb_devinfo _bsd_usb_devinfo
-#define	usb_devsw _bsd_usb_devsw
 #define	usbd_filter_power_mode _bsd_usbd_filter_power_mode
 #define	usbd_find_descriptor _bsd_usbd_find_descriptor
 #define	usbd_frame_zero _bsd_usbd_frame_zero
@@ -5430,12 +5545,7 @@
 #define	usbd_interface_count _bsd_usbd_interface_count
 #define	usbd_lookup_id_by_info _bsd_usbd_lookup_id_by_info
 #define	usbd_lookup_id_by_uaa _bsd_usbd_lookup_id_by_uaa
-#define	usb_dma_delay_done_cb _bsd_usb_dma_delay_done_cb
-#define	usb_dma_tag_find _bsd_usb_dma_tag_find
-#define	usb_dma_tag_setup _bsd_usb_dma_tag_setup
-#define	usb_dma_tag_unsetup _bsd_usb_dma_tag_unsetup
 #define	usbd_m_copy_in _bsd_usbd_m_copy_in
-#define	usb_do_clear_stall_callback _bsd_usb_do_clear_stall_callback
 #define	usbd_pipe_enter _bsd_usbd_pipe_enter
 #define	usbd_pipe_start _bsd_usbd_pipe_start
 #define	usbd_req_clear_device_feature _bsd_usbd_req_clear_device_feature
@@ -5505,11 +5615,6 @@
 #define	usbd_transfer_submit _bsd_usbd_transfer_submit
 #define	usbd_transfer_timeout_ms _bsd_usbd_transfer_timeout_ms
 #define	usbd_transfer_unsetup _bsd_usbd_transfer_unsetup
-#define	usb_dump_device _bsd_usb_dump_device
-#define	usb_dump_endpoint _bsd_usb_dump_endpoint
-#define	usb_dump_iface _bsd_usb_dump_iface
-#define	usb_dump_queue _bsd_usb_dump_queue
-#define	usb_dump_xfer _bsd_usb_dump_xfer
 #define	usbd_xfer_clr_flag _bsd_usbd_xfer_clr_flag
 #define	usbd_xfer_frame_data _bsd_usbd_xfer_frame_data
 #define	usbd_xfer_frame_len _bsd_usbd_xfer_frame_len
@@ -5536,123 +5641,25 @@
 #define	usbd_xfer_softc _bsd_usbd_xfer_softc
 #define	usbd_xfer_state _bsd_usbd_xfer_state
 #define	usbd_xfer_status _bsd_usbd_xfer_status
-#define	usb_dymo_eject _bsd_usb_dymo_eject
-#define	usb_ed_comp_foreach _bsd_usb_ed_comp_foreach
-#define	usb_edesc_foreach _bsd_usb_edesc_foreach
-#define	usb_endpoint_foreach _bsd_usb_endpoint_foreach
-#define	usb_extra_power_up_time _bsd_usb_extra_power_up_time
-#define	usb_fifo_alloc_buffer _bsd_usb_fifo_alloc_buffer
-#define	usb_fifo_attach _bsd_usb_fifo_attach
-#define	usb_fifo_detach _bsd_usb_fifo_detach
-#define	usb_fifo_free _bsd_usb_fifo_free
-#define	usb_fifo_free_buffer _bsd_usb_fifo_free_buffer
-#define	usb_fifo_get_data _bsd_usb_fifo_get_data
-#define	usb_fifo_get_data_buffer _bsd_usb_fifo_get_data_buffer
-#define	usb_fifo_get_data_error _bsd_usb_fifo_get_data_error
-#define	usb_fifo_get_data_linear _bsd_usb_fifo_get_data_linear
-#define	usb_fifo_put_bytes_max _bsd_usb_fifo_put_bytes_max
-#define	usb_fifo_put_data _bsd_usb_fifo_put_data
-#define	usb_fifo_put_data_buffer _bsd_usb_fifo_put_data_buffer
-#define	usb_fifo_put_data_error _bsd_usb_fifo_put_data_error
-#define	usb_fifo_put_data_linear _bsd_usb_fifo_put_data_linear
-#define	usb_fifo_reset _bsd_usb_fifo_reset
-#define	usb_fifo_set_close_zlp _bsd_usb_fifo_set_close_zlp
-#define	usb_fifo_set_write_defrag _bsd_usb_fifo_set_write_defrag
-#define	usb_fifo_signal _bsd_usb_fifo_signal
-#define	usb_fifo_softc _bsd_usb_fifo_softc
-#define	usb_fifo_wait _bsd_usb_fifo_wait
-#define	usb_fifo_wakeup _bsd_usb_fifo_wakeup
-#define	usb_free_device _bsd_usb_free_device
-#define	usb_free_symlink _bsd_usb_free_symlink
-#define	usb_get_device_state _bsd_usb_get_device_state
-#define	usb_get_manufacturer _bsd_usb_get_manufacturer
-#define	usb_get_product _bsd_usb_get_product
-#define	usb_get_serial _bsd_usb_get_serial
-#define	usb_handle_request_callback _bsd_usb_handle_request_callback
-#define	usb_hs_bandwidth_alloc _bsd_usb_hs_bandwidth_alloc
-#define	usb_hs_bandwidth_free _bsd_usb_hs_bandwidth_free
-#define	usb_idesc_foreach _bsd_usb_idesc_foreach
-#define	usb_iface_is_cdrom _bsd_usb_iface_is_cdrom
-#define	usb_isoc_time_expand _bsd_usb_isoc_time_expand
-#define	usb_make_dev _bsd_usb_make_dev
-#define	usb_make_str_desc _bsd_usb_make_str_desc
-#define	usb_msc_auto_quirk _bsd_usb_msc_auto_quirk
-#define	usb_msc_eject _bsd_usb_msc_eject
-#define	usb_msc_read_10 _bsd_usb_msc_read_10
-#define	usb_msc_read_capacity _bsd_usb_msc_read_capacity
-#define	usb_msc_write_10 _bsd_usb_msc_write_10
-#define	usb_needs_explore _bsd_usb_needs_explore
-#define	usb_needs_explore_all _bsd_usb_needs_explore_all
-#define	usb_pause_mtx _bsd_usb_pause_mtx
-#define	usb_pc_alloc_mem _bsd_usb_pc_alloc_mem
-#define	usb_pc_buffer_is_aligned _bsd_usb_pc_buffer_is_aligned
-#define	usb_pc_cpu_flush _bsd_usb_pc_cpu_flush
-#define	usb_pc_cpu_invalidate _bsd_usb_pc_cpu_invalidate
-#define	usb_pc_dmamap_create _bsd_usb_pc_dmamap_create
-#define	usb_pc_dmamap_destroy _bsd_usb_pc_dmamap_destroy
-#define	usb_pc_free_mem _bsd_usb_pc_free_mem
-#define	usb_pc_load_mem _bsd_usb_pc_load_mem
-#define	usb_peer_can_wakeup _bsd_usb_peer_can_wakeup
-#define	usb_port_powerup_delay _bsd_usb_port_powerup_delay
-#define	usb_port_reset_delay _bsd_usb_port_reset_delay
-#define	usb_port_reset_recovery _bsd_usb_port_reset_recovery
-#define	usb_port_resume_delay _bsd_usb_port_resume_delay
-#define	usb_port_root_reset_delay _bsd_usb_port_root_reset_delay
-#define	usb_printbcd _bsd_usb_printbcd
-#define	usb_probe_and_attach _bsd_usb_probe_and_attach
-#define	usb_proc_create _bsd_usb_proc_create
-#define	usb_proc_drain _bsd_usb_proc_drain
-#define	usb_proc_explore_lock _bsd_usb_proc_explore_lock
-#define	usb_proc_explore_msignal _bsd_usb_proc_explore_msignal
-#define	usb_proc_explore_mwait _bsd_usb_proc_explore_mwait
-#define	usb_proc_explore_unlock _bsd_usb_proc_explore_unlock
-#define	usb_proc_free _bsd_usb_proc_free
-#define	usb_proc_is_called_from _bsd_usb_proc_is_called_from
-#define	usb_proc_is_gone _bsd_usb_proc_is_gone
-#define	usb_proc_msignal _bsd_usb_proc_msignal
-#define	usb_proc_mwait _bsd_usb_proc_mwait
-#define	usb_proc_rewakeup _bsd_usb_proc_rewakeup
-#define	usb_quirk_ioctl_p _bsd_usb_quirk_ioctl_p
-#define	usb_quirk_unload _bsd_usb_quirk_unload
-#define	usb_read_symlink _bsd_usb_read_symlink
-#define	usb_ref_lock _bsd_usb_ref_lock
-#define	usb_reset_iface_endpoints _bsd_usb_reset_iface_endpoints
-#define	usb_resume_delay _bsd_usb_resume_delay
-#define	usb_resume_recovery _bsd_usb_resume_recovery
-#define	usb_resume_wait _bsd_usb_resume_wait
-#define	usb_set_address_settle _bsd_usb_set_address_settle
-#define	usb_set_device_state _bsd_usb_set_device_state
 #define	usbss_driver _bsd_usbss_driver
-#define	usb_statestr _bsd_usb_statestr
-#define	usb_string_lang_en _bsd_usb_string_lang_en
-#define	usb_suspend_resume _bsd_usb_suspend_resume
-#define	usb_temp_get_desc_p _bsd_usb_temp_get_desc_p
-#define	usb_template _bsd_usb_template
-#define	usb_temp_setup_by_index_p _bsd_usb_temp_setup_by_index_p
-#define	usb_temp_unload _bsd_usb_temp_unload
-#define	usb_temp_unsetup_p _bsd_usb_temp_unsetup_p
-#define	usb_test_quirk _bsd_usb_test_quirk
-#define	usb_test_quirk_p _bsd_usb_test_quirk_p
-#define	usb_trim_spaces _bsd_usb_trim_spaces
-#define	usb_ugen_methods _bsd_usb_ugen_methods
-#define	uuidcmp _bsd_uuidcmp
 #define	uuid_ether_add _bsd_uuid_ether_add
 #define	uuid_ether_del _bsd_uuid_ether_del
+#define	uuidcmp _bsd_uuidcmp
 #define	vesagtf_mode _bsd_vesagtf_mode
 #define	vesagtf_mode_params _bsd_vesagtf_mode_params
 #define	vht80_chan_ranges _bsd_vht80_chan_ranges
 #define	vid_allocate _bsd_vid_allocate
 #define	vid_configure _bsd_vid_configure
-#define	videomode_count _bsd_videomode_count
-#define	videomode_list _bsd_videomode_list
 #define	vid_find_adapter _bsd_vid_find_adapter
 #define	vid_get_adapter _bsd_vid_get_adapter
 #define	vid_get_switch _bsd_vid_get_switch
 #define	vid_init_struct _bsd_vid_init_struct
 #define	vid_register _bsd_vid_register
 #define	vid_release _bsd_vid_release
-#define	vidsw _bsd_vidsw
 #define	vid_unregister _bsd_vid_unregister
+#define	videomode_count _bsd_videomode_count
+#define	videomode_list _bsd_videomode_list
+#define	vidsw _bsd_vidsw
 #define	vlan_cookie_p _bsd_vlan_cookie_p
 #define	vlan_devat_p _bsd_vlan_devat_p
 #define	vlan_input_p _bsd_vlan_input_p
@@ -5679,18 +5686,13 @@
 #define	xform_attach _bsd_xform_attach
 #define	xform_detach _bsd_xform_detach
 #define	xform_init _bsd_xform_init
-#define	X_ip6_mforward _bsd_X_ip6_mforward
-#define	X_ip6_mrouter_done _bsd_X_ip6_mrouter_done
-#define	X_ip6_mrouter_get _bsd_X_ip6_mrouter_get
-#define	X_ip6_mrouter_set _bsd_X_ip6_mrouter_set
-#define	X_mrt6_ioctl _bsd_X_mrt6_ioctl
 #define	xpt_bus_deregister _bsd_xpt_bus_deregister
 #define	xpt_bus_register _bsd_xpt_bus_register
 #define	xpt_done _bsd_xpt_done
 #define	z_alloc _bsd_z_alloc
-#define	zd1211b_firmware _bsd_zd1211b_firmware
-#define	zd1211_firmware _bsd_zd1211_firmware
 #define	z_free _bsd_z_free
+#define	zd1211_firmware _bsd_zd1211_firmware
+#define	zd1211b_firmware _bsd_zd1211b_firmware
 #define	zone_clust _bsd_zone_clust
 #define	zone_drain _bsd_zone_drain
 #define	zone_extpgs _bsd_zone_extpgs
-- 
2.24.1

