Update to FreeBSD head 2016-08-23

Git mirror commit 9fe7c416e6abb28b1398fd3e5687099846800cfd.

66 files changed, 2130 insertions, 1254 deletions

diff --git a/rtemsbsd/include/bsp/nexus-devices.h b/rtemsbsd/include/bsp/nexus-devices.h
index 39d49df4..0b4ec62b 100644
--- a/rtemsbsd/include/bsp/nexus-devices.h
+++ b/rtemsbsd/include/bsp/nexus-devices.h
@@ -54,7 +54,7 @@ RTEMS_BSD_DRIVER_FEC;
 
 #include <bsp/irq.h>
 
-RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR0;
+RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR;
 RTEMS_BSD_DRIVER_XILINX_ZYNQ_CGEM0(ZYNQ_IRQ_ETHERNET_0);
 RTEMS_BSD_DRIVER_E1000PHY;
 
diff --git a/rtemsbsd/include/ddb/ddb.h b/rtemsbsd/include/ddb/ddb.h
index 936ffd88..db4c7a35 100644
--- a/rtemsbsd/include/ddb/ddb.h
+++ b/rtemsbsd/include/ddb/ddb.h
@@ -1 +1 @@
-/* EMPTY */
+#include <sys/kernel.h>
diff --git a/rtemsbsd/include/machine/counter.h b/rtemsbsd/include/machine/counter.h
new file mode 100644
index 00000000..2e38c00c
--- /dev/null
+++ b/rtemsbsd/include/machine/counter.h
@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+#ifndef __MACHINE_COUNTER_H__
+#define __MACHINE_COUNTER_H__
+
+#include <sys/pcpu.h>
+
+#include <rtems/score/isrlevel.h>
+
+#ifdef IN_SUBR_COUNTER_C
+
+static inline uint64_t
+counter_u64_read_one(uint64_t *p, int cpu)
+{
+
+	return (*((uint64_t *)((char *)p + sizeof(struct pcpu) * cpu)));
+}
+
+static inline uint64_t
+counter_u64_fetch_inline(uint64_t *p)
+{
+	uint64_t r;
+	uint32_t cpu;
+
+	r = 0;
+	for (cpu = 0; cpu < _SMP_Get_processor_count(); ++cpu) {
+		r += counter_u64_read_one((uint64_t *)p, cpu);
+	}
+
+	return (r);
+}
+
+static inline void
+counter_u64_zero_inline(counter_u64_t c)
+{
+	uint32_t cpu;
+
+	for (cpu = 0; cpu < _SMP_Get_processor_count(); ++cpu) {
+		*((uint64_t *)((char *)c + sizeof(struct pcpu) * cpu)) = 0;
+	}
+}
+#endif
+
+static inline void
+counter_u64_add_protected(counter_u64_t c, int64_t inc)
+{
+
+	*(uint64_t *)zpcpu_get(c) += inc;
+}
+
+static inline void
+counter_u64_add(counter_u64_t c, int64_t inc)
+{
+	ISR_Level level;
+
+	_ISR_Local_disable(level);
+	counter_u64_add_protected(c, inc);
+	_ISR_Local_enable(level);
+}
+
+#endif	/* ! __MACHINE_COUNTER_H__ */
diff --git a/rtemsbsd/include/machine/pcpu.h b/rtemsbsd/include/machine/pcpu.h
index b09f0942..f690b097 100644
--- a/rtemsbsd/include/machine/pcpu.h
+++ b/rtemsbsd/include/machine/pcpu.h
@@ -40,6 +40,8 @@
 #ifndef _RTEMS_BSD_MACHINE_PCPU_H_
 #define _RTEMS_BSD_MACHINE_PCPU_H_
 
+#include <rtems/score/smp.h>
+
 struct thread;
 
 struct thread *
diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
index 059ca1c2..a5642ef7 100644
--- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
@@ -2,13 +2,6 @@
 #error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
-#define	aarp_clean _bsd_aarp_clean
-#define	aarpintr _bsd_aarpintr
-#define	aarp_org_code _bsd_aarp_org_code
-#define	aarpprobe _bsd_aarpprobe
-#define	aarpresolve _bsd_aarpresolve
-#define	aarptab_mtx _bsd_aarptab_mtx
-#define	aarptnew _bsd_aarptnew
 #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
@@ -17,8 +10,18 @@
 #define	AddFragmentPtrLink _bsd_AddFragmentPtrLink
 #define	AddLink _bsd_AddLink
 #define	AddPptp _bsd_AddPptp
+#define	addr_hash _bsd_addr_hash
+#define	addr_kfib _bsd_addr_kfib
+#define	addr_radix _bsd_addr_radix
 #define	addrsel_policy_init _bsd_addrsel_policy_init
 #define	AddSeq _bsd_AddSeq
+#define	add_table_entry _bsd_add_table_entry
+#define	add_toperation_state _bsd_add_toperation_state
+#define	AES_GMAC_Final _bsd_AES_GMAC_Final
+#define	AES_GMAC_Init _bsd_AES_GMAC_Init
+#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	aio_swake _bsd_aio_swake
 #define	AliasSctpInit _bsd_AliasSctpInit
 #define	AliasSctpTerm _bsd_AliasSctpTerm
@@ -39,8 +42,6 @@
 #define	altq_remove _bsd_altq_remove
 #define	altq_remove_queue _bsd_altq_remove_queue
 #define	altqs_inactive_open _bsd_altqs_inactive_open
-#define	arc4rand _bsd_arc4rand
-#define	arc4rand_iniseed_state _bsd_arc4rand_iniseed_state
 #define	arcbroadcastaddr _bsd_arcbroadcastaddr
 #define	arc_frag_init _bsd_arc_frag_init
 #define	arc_frag_next _bsd_arc_frag_next
@@ -51,22 +52,12 @@
 #define	arc_isphds _bsd_arc_isphds
 #define	arc_output _bsd_arc_output
 #define	arc_storelladdr _bsd_arc_storelladdr
+#define	arp_announce_ifaddr _bsd_arp_announce_ifaddr
 #define	arp_ifinit _bsd_arp_ifinit
-#define	arp_ifinit2 _bsd_arp_ifinit2
-#define	arp_ifscrub _bsd_arp_ifscrub
 #define	arprequest _bsd_arprequest
 #define	arpresolve _bsd_arpresolve
+#define	arpresolve_addr _bsd_arpresolve_addr
 #define	arpstat _bsd_arpstat
-#define	at1intr _bsd_at1intr
-#define	at2intr _bsd_at2intr
-#define	at_broadcast _bsd_at_broadcast
-#define	at_cksum _bsd_at_cksum
-#define	at_control _bsd_at_control
-#define	at_ifaddrhead _bsd_at_ifaddrhead
-#define	at_ifaddr_rw _bsd_at_ifaddr_rw
-#define	at_ifawithnet _bsd_at_ifawithnet
-#define	at_ifawithnet_locked _bsd_at_ifawithnet_locked
-#define	at_inithead _bsd_at_inithead
 #define	atm_event _bsd_atm_event
 #define	atm_getvccs _bsd_atm_getvccs
 #define	atm_harp_attach_p _bsd_atm_harp_attach_p
@@ -79,14 +70,6 @@
 #define	atm_output _bsd_atm_output
 #define	atmresolve _bsd_atmresolve
 #define	atm_rtrequest _bsd_atm_rtrequest
-#define	at_org_code _bsd_at_org_code
-#define	at_pcballoc _bsd_at_pcballoc
-#define	at_pcbconnect _bsd_at_pcbconnect
-#define	at_pcbdetach _bsd_at_pcbdetach
-#define	at_pcbdisconnect _bsd_at_pcbdisconnect
-#define	at_pcbsetaddr _bsd_at_pcbsetaddr
-#define	at_sockaddr _bsd_at_sockaddr
-#define	attach_dll _bsd_attach_dll
 #define	auth_hash_hmac_md5 _bsd_auth_hash_hmac_md5
 #define	auth_hash_hmac_ripemd_160 _bsd_auth_hash_hmac_ripemd_160
 #define	auth_hash_hmac_sha1 _bsd_auth_hash_hmac_sha1
@@ -95,6 +78,9 @@
 #define	auth_hash_hmac_sha2_512 _bsd_auth_hash_hmac_sha2_512
 #define	auth_hash_key_md5 _bsd_auth_hash_key_md5
 #define	auth_hash_key_sha1 _bsd_auth_hash_key_sha1
+#define	auth_hash_nist_gmac_aes_128 _bsd_auth_hash_nist_gmac_aes_128
+#define	auth_hash_nist_gmac_aes_192 _bsd_auth_hash_nist_gmac_aes_192
+#define	auth_hash_nist_gmac_aes_256 _bsd_auth_hash_nist_gmac_aes_256
 #define	auth_hash_null _bsd_auth_hash_null
 #define	autoinc_step _bsd_autoinc_step
 #define	badport_bandlim _bsd_badport_bandlim
@@ -325,6 +311,8 @@
 #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
@@ -346,15 +334,11 @@
 #define	bpf_mtap _bsd_bpf_mtap
 #define	bpf_mtap2 _bsd_bpf_mtap2
 #define	bpf_tap _bsd_bpf_tap
-#define	bridge_cloner _bsd_bridge_cloner
-#define	bridge_cloner_data _bsd_bridge_cloner_data
 #define	bridge_control_table _bsd_bridge_control_table
 #define	bridge_control_table_size _bsd_bridge_control_table_size
-#define	bridge_detach_cookie _bsd_bridge_detach_cookie
 #define	bridge_dn_p _bsd_bridge_dn_p
 #define	bridge_input_p _bsd_bridge_input_p
 #define	bridge_linkstate_p _bsd_bridge_linkstate_p
-#define	bridge_list _bsd_bridge_list
 #define	bridge_output_p _bsd_bridge_output_p
 #define	bridge_rtable_prune_period _bsd_bridge_rtable_prune_period
 #define	bridge_rtnode_zone _bsd_bridge_rtnode_zone
@@ -382,6 +366,8 @@
 #define	bstp_set_protocol _bsd_bstp_set_protocol
 #define	bstp_set_ptp _bsd_bstp_set_ptp
 #define	bstp_stop _bsd_bstp_stop
+#define	bt_tickthreshold _bsd_bt_tickthreshold
+#define	bt_timethreshold _bsd_bt_timethreshold
 #define	bucket_zones _bsd_bucket_zones
 #define	buf_ring_alloc _bsd_buf_ring_alloc
 #define	buf_ring_free _bsd_buf_ring_free
@@ -425,14 +411,19 @@
 #define	bus_generic_describe_intr _bsd_bus_generic_describe_intr
 #define	bus_generic_detach _bsd_bus_generic_detach
 #define	bus_generic_driver_added _bsd_bus_generic_driver_added
+#define	bus_generic_get_bus_tag _bsd_bus_generic_get_bus_tag
+#define	bus_generic_get_cpus _bsd_bus_generic_get_cpus
 #define	bus_generic_get_dma_tag _bsd_bus_generic_get_dma_tag
+#define	bus_generic_get_domain _bsd_bus_generic_get_domain
 #define	bus_generic_get_resource_list _bsd_bus_generic_get_resource_list
+#define	bus_generic_map_resource _bsd_bus_generic_map_resource
 #define	bus_generic_new_pass _bsd_bus_generic_new_pass
 #define	bus_generic_print_child _bsd_bus_generic_print_child
 #define	bus_generic_probe _bsd_bus_generic_probe
 #define	bus_generic_read_ivar _bsd_bus_generic_read_ivar
 #define	bus_generic_release_resource _bsd_bus_generic_release_resource
 #define	bus_generic_resume _bsd_bus_generic_resume
+#define	bus_generic_resume_child _bsd_bus_generic_resume_child
 #define	bus_generic_rl_alloc_resource _bsd_bus_generic_rl_alloc_resource
 #define	bus_generic_rl_delete_resource _bsd_bus_generic_rl_delete_resource
 #define	bus_generic_rl_get_resource _bsd_bus_generic_rl_get_resource
@@ -441,12 +432,20 @@
 #define	bus_generic_setup_intr _bsd_bus_generic_setup_intr
 #define	bus_generic_shutdown _bsd_bus_generic_shutdown
 #define	bus_generic_suspend _bsd_bus_generic_suspend
+#define	bus_generic_suspend_child _bsd_bus_generic_suspend_child
 #define	bus_generic_teardown_intr _bsd_bus_generic_teardown_intr
+#define	bus_generic_unmap_resource _bsd_bus_generic_unmap_resource
 #define	bus_generic_write_ivar _bsd_bus_generic_write_ivar
+#define	bus_get_bus_tag _bsd_bus_get_bus_tag
+#define	bus_get_cpus _bsd_bus_get_cpus
 #define	bus_get_dma_tag _bsd_bus_get_dma_tag
+#define	bus_get_domain _bsd_bus_get_domain
 #define	bus_get_resource _bsd_bus_get_resource
 #define	bus_get_resource_count _bsd_bus_get_resource_count
 #define	bus_get_resource_start _bsd_bus_get_resource_start
+#define	bus_map_resource _bsd_bus_map_resource
+#define	bus_null_rescan _bsd_bus_null_rescan
+#define	bus_print_child_domain _bsd_bus_print_child_domain
 #define	bus_print_child_footer _bsd_bus_print_child_footer
 #define	bus_print_child_header _bsd_bus_print_child_header
 #define	bus_release_resource _bsd_bus_release_resource
@@ -455,17 +454,16 @@
 #define	bus_set_resource _bsd_bus_set_resource
 #define	bus_setup_intr _bsd_bus_setup_intr
 #define	bus_teardown_intr _bsd_bus_teardown_intr
+#define	bus_unmap_resource _bsd_bus_unmap_resource
 #define	callout_handle_init _bsd_callout_handle_init
 #define	callout_init _bsd_callout_init
 #define	_callout_init_lock _bsd__callout_init_lock
-#define	callout_new_inserted _bsd_callout_new_inserted
-#define	callout_reset_on _bsd_callout_reset_on
+#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_tick _bsd_callout_tick
-#define	callout_tickstofirst _bsd_callout_tickstofirst
-#define	callwheelbits _bsd_callwheelbits
+#define	callout_when _bsd_callout_when
 #define	callwheelmask _bsd_callwheelmask
 #define	callwheelsize _bsd_callwheelsize
 #define	camellia_decrypt _bsd_camellia_decrypt
@@ -491,48 +489,61 @@
 #define	cam_status_table _bsd_cam_status_table
 #define	cam_strmatch _bsd_cam_strmatch
 #define	cam_strvis _bsd_cam_strvis
+#define	cam_strvis_sbuf _bsd_cam_strvis_sbuf
 #define	carp6_input _bsd_carp6_input
-#define	carp_carpdev_state _bsd_carp_carpdev_state
-#define	carp_cloner _bsd_carp_cloner
-#define	carp_cloner_data _bsd_carp_cloner_data
+#define	carp_attach _bsd_carp_attach
+#define	carp_attach_p _bsd_carp_attach_p
+#define	carp_demote_adj_p _bsd_carp_demote_adj_p
+#define	carp_detach _bsd_carp_detach
+#define	carp_detach_p _bsd_carp_detach_p
 #define	carp_forus _bsd_carp_forus
 #define	carp_forus_p _bsd_carp_forus_p
+#define	carp_get_vhid_p _bsd_carp_get_vhid_p
 #define	carp_iamatch _bsd_carp_iamatch
 #define	carp_iamatch6 _bsd_carp_iamatch6
 #define	carp_iamatch6_p _bsd_carp_iamatch6_p
 #define	carp_iamatch_p _bsd_carp_iamatch_p
 #define	carp_input _bsd_carp_input
+#define	carp_ioctl _bsd_carp_ioctl
+#define	carp_ioctl_p _bsd_carp_ioctl_p
 #define	carp_linkstate_p _bsd_carp_linkstate_p
 #define	carp_macmatch6 _bsd_carp_macmatch6
 #define	carp_macmatch6_p _bsd_carp_macmatch6_p
-#define	carp_opts _bsd_carp_opts
+#define	carp_master _bsd_carp_master
+#define	carp_master_p _bsd_carp_master_p
 #define	carp_output _bsd_carp_output
 #define	carp_output_p _bsd_carp_output_p
 #define	carpstats _bsd_carpstats
-#define	carp_suppress_preempt _bsd_carp_suppress_preempt
 #define	cast_decrypt _bsd_cast_decrypt
 #define	cast_encrypt _bsd_cast_encrypt
 #define	cast_setkey _bsd_cast_setkey
+#define	cc_ack_received _bsd_cc_ack_received
 #define	cc_cong_signal _bsd_cc_cong_signal
+#define	cc_conn_init _bsd_cc_conn_init
 #define	cc_cpu _bsd_cc_cpu
 #define	cc_deregister_algo _bsd_cc_deregister_algo
 #define	cc_list _bsd_cc_list
 #define	cc_list_lock _bsd_cc_list_lock
 #define	cc_modevent _bsd_cc_modevent
+#define	cc_post_recovery _bsd_cc_post_recovery
 #define	cc_register_algo _bsd_cc_register_algo
 #define	cgem_set_ref_clk _bsd_cgem_set_ref_clk
+#define	classify_opcode_kidx _bsd_classify_opcode_kidx
 #define	clean_unrhdr _bsd_clean_unrhdr
 #define	clean_unrhdrl _bsd_clean_unrhdrl
-#define	cleanup_pf_zone _bsd_cleanup_pf_zone
 #define	ClearCheckNewLink _bsd_ClearCheckNewLink
 #define	clk_intr_event _bsd_clk_intr_event
 #define	comp_algo_deflate _bsd_comp_algo_deflate
+#define	compare_ifidx _bsd_compare_ifidx
+#define	compare_numarray _bsd_compare_numarray
 #define	config_intrhook_disestablish _bsd_config_intrhook_disestablish
 #define	config_intrhook_establish _bsd_config_intrhook_establish
-#define	convert_rule_to_7 _bsd_convert_rule_to_7
-#define	convert_rule_to_8 _bsd_convert_rule_to_8
-#define	copy_data_helper_compat _bsd_copy_data_helper_compat
 #define	copyiniov _bsd_copyiniov
+#define	counter_u64_alloc _bsd_counter_u64_alloc
+#define	counter_u64_fetch _bsd_counter_u64_fetch
+#define	counter_u64_free _bsd_counter_u64_free
+#define	counter_u64_zero _bsd_counter_u64_zero
+#define	create_objects_compat _bsd_create_objects_compat
 #define	crypto_apply _bsd_crypto_apply
 #define	crypto_copyback _bsd_crypto_copyback
 #define	crypto_copydata _bsd_crypto_copydata
@@ -550,6 +561,7 @@
 #define	crypto_kdispatch _bsd_crypto_kdispatch
 #define	crypto_kdone _bsd_crypto_kdone
 #define	crypto_kregister _bsd_crypto_kregister
+#define	crypto_mbuftoiov _bsd_crypto_mbuftoiov
 #define	crypto_modevent _bsd_crypto_modevent
 #define	crypto_newsession _bsd_crypto_newsession
 #define	crypto_register _bsd_crypto_register
@@ -557,6 +569,8 @@
 #define	crypto_unregister _bsd_crypto_unregister
 #define	crypto_unregister_all _bsd_crypto_unregister_all
 #define	crypto_userasymcrypto _bsd_crypto_userasymcrypto
+#define	ctl3_lock _bsd_ctl3_lock
+#define	ctl3_rewriters _bsd_ctl3_rewriters
 #define	cuio_apply _bsd_cuio_apply
 #define	cuio_copyback _bsd_cuio_copyback
 #define	cuio_copydata _bsd_cuio_copydata
@@ -565,31 +579,28 @@
 #define	cv_destroy _bsd_cv_destroy
 #define	cv_init _bsd_cv_init
 #define	cv_signal _bsd_cv_signal
-#define	_cv_timedwait _bsd__cv_timedwait
+#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	dad_ignore_ns _bsd_dad_ignore_ns
-#define	dad_init _bsd_dad_init
-#define	dad_maxtry _bsd_dad_maxtry
-#define	ddpcb_list _bsd_ddpcb_list
-#define	ddp_cksum _bsd_ddp_cksum
-#define	ddp_init _bsd_ddp_init
-#define	ddp_list_mtx _bsd_ddp_list_mtx
-#define	ddp_output _bsd_ddp_output
-#define	ddp_route _bsd_ddp_route
-#define	ddp_search _bsd_ddp_search
-#define	ddp_usrreqs _bsd_ddp_usrreqs
-#define	debug_pfugidhack _bsd_debug_pfugidhack
+#define	deembed_scopeid _bsd_deembed_scopeid
 #define	default_cc_ptr _bsd_default_cc_ptr
-#define	defer _bsd_defer
+#define	default_eaction_typename _bsd_default_eaction_typename
 #define	deflate_global _bsd_deflate_global
+#define	defrouter_del _bsd_defrouter_del
 #define	defrouter_lookup _bsd_defrouter_lookup
+#define	defrouter_lookup_locked _bsd_defrouter_lookup_locked
+#define	defrouter_ref _bsd_defrouter_ref
+#define	defrouter_rele _bsd_defrouter_rele
+#define	defrouter_remove _bsd_defrouter_remove
 #define	defrouter_reset _bsd_defrouter_reset
 #define	defrouter_select _bsd_defrouter_select
-#define	defrtrlist_del _bsd_defrtrlist_del
+#define	defrouter_unlink _bsd_defrouter_unlink
 #define	DELAY _bsd_DELAY
 #define	delete_unrhdr _bsd_delete_unrhdr
+#define	del_table_entry _bsd_del_table_entry
+#define	del_toperation_state _bsd_del_toperation_state
+#define	deregister_tcp_functions _bsd_deregister_tcp_functions
 #define	des_check_key _bsd_des_check_key
 #define	des_check_key_parity _bsd_des_check_key_parity
 #define	des_decrypt3 _bsd_des_decrypt3
@@ -609,8 +620,6 @@
 #define	des_SPtrans _bsd_des_SPtrans
 #define	dest6_input _bsd_dest6_input
 #define	destroy_dev _bsd_destroy_dev
-#define	detach_dll _bsd_detach_dll
-#define	detach_handler _bsd_detach_handler
 #define	devclass_add_driver _bsd_devclass_add_driver
 #define	devclass_create _bsd_devclass_create
 #define	devclass_delete_driver _bsd_devclass_delete_driver
@@ -661,6 +670,7 @@
 #define	device_is_attached _bsd_device_is_attached
 #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_probe _bsd_device_probe
@@ -671,6 +681,7 @@
 #define	device_set_desc _bsd_device_set_desc
 #define	device_set_desc_copy _bsd_device_set_desc_copy
 #define	device_set_devclass _bsd_device_set_devclass
+#define	device_set_devclass_fixed _bsd_device_set_devclass_fixed
 #define	device_set_driver _bsd_device_set_driver
 #define	device_set_flags _bsd_device_set_flags
 #define	device_set_ivars _bsd_device_set_ivars
@@ -680,43 +691,28 @@
 #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_relthread _bsd_dev_relthread
+#define	dev_unlock _bsd_dev_unlock
 #define	DifferentialChecksum _bsd_DifferentialChecksum
-#define	disc_cloner _bsd_disc_cloner
-#define	disc_cloner_data _bsd_disc_cloner_data
 #define	div_protosw _bsd_div_protosw
 #define	div_usrreqs _bsd_div_usrreqs
-#define	dll_chain _bsd_dll_chain
-#define	dn_c_copy_fs _bsd_dn_c_copy_fs
-#define	dn_c_copy_pipe _bsd_dn_c_copy_pipe
-#define	dn_c_copy_q _bsd_dn_c_copy_q
-#define	dn_cfg _bsd_dn_cfg
-#define	dn_compat_calc_size _bsd_dn_compat_calc_size
-#define	dn_compat_copy_pipe _bsd_dn_compat_copy_pipe
-#define	dn_compat_copy_queue _bsd_dn_compat_copy_queue
-#define	dn_drain_queue _bsd_dn_drain_queue
-#define	dn_drain_scheduler _bsd_dn_drain_scheduler
-#define	dn_enqueue _bsd_dn_enqueue
-#define	dn_free_pkts _bsd_dn_free_pkts
-#define	dn_ht_entries _bsd_dn_ht_entries
-#define	dn_ht_find _bsd_dn_ht_find
-#define	dn_ht_free _bsd_dn_ht_free
-#define	dn_ht_init _bsd_dn_ht_init
-#define	dn_ht_scan _bsd_dn_ht_scan
-#define	dn_ht_scan_bucket _bsd_dn_ht_scan_bucket
-#define	dn_reschedule _bsd_dn_reschedule
-#define	dn_sched_modevent _bsd_dn_sched_modevent
-#define	do_config _bsd_do_config
 #define	do_getopt_accept_filter _bsd_do_getopt_accept_filter
 #define	domain_add _bsd_domain_add
 #define	domain_init _bsd_domain_init
 #define	domain_init_status _bsd_domain_init_status
 #define	domains _bsd_domains
 #define	do_setopt_accept_filter _bsd_do_setopt_accept_filter
+#define	drbr_dequeue_drv _bsd_drbr_dequeue_drv
+#define	drbr_enqueue_drv _bsd_drbr_enqueue_drv
+#define	drbr_inuse_drv _bsd_drbr_inuse_drv
+#define	drbr_needs_enqueue_drv _bsd_drbr_needs_enqueue_drv
 #define	driver_module_handler _bsd_driver_module_handler
 #define	dummy_def _bsd_dummy_def
-#define	dummynet_get _bsd_dummynet_get
-#define	dummynet_io _bsd_dummynet_io
-#define	dummynet_task _bsd_dummynet_task
+#define	dwc_driver _bsd_dwc_driver
 #define	dwc_otg_filter_interrupt _bsd_dwc_otg_filter_interrupt
 #define	dwc_otg_init _bsd_dwc_otg_init
 #define	dwc_otg_interrupt _bsd_dwc_otg_interrupt
@@ -820,6 +816,7 @@
 #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
@@ -1024,17 +1021,9 @@
 #define	e1000_write_vfta _bsd_e1000_write_vfta
 #define	e1000_write_vfta_generic _bsd_e1000_write_vfta_generic
 #define	e1000_write_xmdio_reg _bsd_e1000_write_xmdio_reg
-#define	edsc_cloner _bsd_edsc_cloner
-#define	edsc_cloner_data _bsd_edsc_cloner_data
-#define	ef_inputp _bsd_ef_inputp
-#define	ef_outputp _bsd_ef_outputp
-#define	ehci_bus_methods _bsd_ehci_bus_methods
 #define	ehci_detach _bsd_ehci_detach
-#define	ehci_device_bulk_methods _bsd_ehci_device_bulk_methods
-#define	ehci_device_ctrl_methods _bsd_ehci_device_ctrl_methods
-#define	ehci_device_intr_methods _bsd_ehci_device_intr_methods
-#define	ehci_device_isoc_fs_methods _bsd_ehci_device_isoc_fs_methods
-#define	ehci_device_isoc_hs_methods _bsd_ehci_device_isoc_hs_methods
+#define	ehci_get_port_speed_hostc _bsd_ehci_get_port_speed_hostc
+#define	ehci_get_port_speed_portsc _bsd_ehci_get_port_speed_portsc
 #define	ehci_init _bsd_ehci_init
 #define	ehci_interrupt _bsd_ehci_interrupt
 #define	ehci_iterate_hw_softc _bsd_ehci_iterate_hw_softc
@@ -1042,7 +1031,6 @@
 #define	ehci_resume _bsd_ehci_resume
 #define	ehci_suspend _bsd_ehci_suspend
 #define	em_devclass _bsd_em_devclass
-#define	em_display_debug_stats _bsd_em_display_debug_stats
 #define	em_driver_version _bsd_em_driver_version
 #define	encap4_input _bsd_encap4_input
 #define	encap6_input _bsd_encap6_input
@@ -1051,11 +1039,10 @@
 #define	encap_detach _bsd_encap_detach
 #define	encap_getarg _bsd_encap_getarg
 #define	encap_init _bsd_encap_init
-#define	encaptab _bsd_encaptab
-#define	enc_cloner _bsd_enc_cloner
-#define	enc_cloner_data _bsd_enc_cloner_data
-#define	encif _bsd_encif
 #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
+#define	enc_xform_aes_nist_gmac _bsd_enc_xform_aes_nist_gmac
 #define	enc_xform_aes_xts _bsd_enc_xform_aes_xts
 #define	enc_xform_arc4 _bsd_enc_xform_arc4
 #define	enc_xform_blf _bsd_enc_xform_blf
@@ -1065,13 +1052,13 @@
 #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	eopnotsupp _bsd_eopnotsupp
 #define	ether_crc32_be _bsd_ether_crc32_be
 #define	ether_crc32_le _bsd_ether_crc32_le
 #define	ether_demux _bsd_ether_demux
 #define	ether_ifattach _bsd_ether_ifattach
 #define	ether_ifdetach _bsd_ether_ifdetach
 #define	ether_ioctl _bsd_ether_ioctl
-#define	ether_ipfw_chk _bsd_ether_ipfw_chk
 #define	ethermulticastaddr_slowprotocols _bsd_ethermulticastaddr_slowprotocols
 #define	ether_output _bsd_ether_output
 #define	ether_output_frame _bsd_ether_output_frame
@@ -1082,15 +1069,18 @@
 #define	eventhandler_find_list _bsd_eventhandler_find_list
 #define	eventhandler_prune_list _bsd_eventhandler_prune_list
 #define	eventhandler_register _bsd_eventhandler_register
-#define	export_pflow_ptr _bsd_export_pflow_ptr
-#define	faith_cloner _bsd_faith_cloner
-#define	faith_cloner_data _bsd_faith_cloner_data
-#define	faithoutput _bsd_faithoutput
-#define	faithprefix_p _bsd_faithprefix_p
 #define	fddi_ifattach _bsd_fddi_ifattach
 #define	fddi_ifdetach _bsd_fddi_ifdetach
 #define	fddi_ioctl _bsd_fddi_ioctl
+#define	fib4_free_nh_ext _bsd_fib4_free_nh_ext
+#define	fib4_lookup_nh_basic _bsd_fib4_lookup_nh_basic
+#define	fib4_lookup_nh_ext _bsd_fib4_lookup_nh_ext
+#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
@@ -1116,7 +1106,8 @@
 #define	firewire_input _bsd_firewire_input
 #define	firewire_ioctl _bsd_firewire_ioctl
 #define	first_handler _bsd_first_handler
-#define	fls _bsd_fls
+#define	flow_hash _bsd_flow_hash
+#define	flush_table _bsd_flush_table
 #define	frag6_drain _bsd_frag6_drain
 #define	frag6_init _bsd_frag6_init
 #define	frag6_input _bsd_frag6_input
@@ -1124,10 +1115,14 @@
 #define	free_unr _bsd_free_unr
 #define	fw_one_pass _bsd_fw_one_pass
 #define	fw_tables_max _bsd_fw_tables_max
+#define	fw_tables_sets _bsd_fw_tables_sets
 #define	fw_verbose _bsd_fw_verbose
 #define	GetAckModified _bsd_GetAckModified
 #define	GetAliasAddress _bsd_GetAliasAddress
 #define	GetAliasPort _bsd_GetAliasPort
+#define	getcreddomainname _bsd_getcreddomainname
+#define	getcredhostid _bsd_getcredhostid
+#define	getcredhostname _bsd_getcredhostname
 #define	GetDefaultAliasAddress _bsd_GetDefaultAliasAddress
 #define	GetDeltaAckIn _bsd_GetDeltaAckIn
 #define	GetDeltaSeqOut _bsd_GetDeltaSeqOut
@@ -1142,38 +1137,20 @@
 #define	getsockaddr _bsd_getsockaddr
 #define	GetStateIn _bsd_GetStateIn
 #define	GetStateOut _bsd_GetStateOut
+#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_cloner _bsd_gif_cloner
-#define	gif_cloner_data _bsd_gif_cloner_data
-#define	gif_delete_tunnel _bsd_gif_delete_tunnel
 #define	gif_encapcheck _bsd_gif_encapcheck
-#define	gif_encapcheck4 _bsd_gif_encapcheck4
-#define	gif_encapcheck6 _bsd_gif_encapcheck6
 #define	gif_input _bsd_gif_input
-#define	gif_ioctl _bsd_gif_ioctl
 #define	gif_output _bsd_gif_output
-#define	gif_set_tunnel _bsd_gif_set_tunnel
-#define	gre_cloner _bsd_gre_cloner
-#define	gre_cloner_data _bsd_gre_cloner_data
-#define	gre_in_cksum _bsd_gre_in_cksum
 #define	gre_input _bsd_gre_input
-#define	gre_mobile_input _bsd_gre_mobile_input
-#define	gre_mtx _bsd_gre_mtx
-#define	gre_softc_list _bsd_gre_softc_list
-#define	handler_chain _bsd_handler_chain
-#define	handler_chain_destroy _bsd_handler_chain_destroy
-#define	handler_chain_init _bsd_handler_chain_init
-#define	handler_rw _bsd_handler_rw
 #define	handlers _bsd_handlers
-#define	harvest _bsd_harvest
 #define	hashdestroy _bsd_hashdestroy
 #define	hashinit _bsd_hashinit
 #define	hashinit_flags _bsd_hashinit_flags
-#define	heap_extract _bsd_heap_extract
-#define	heap_free _bsd_heap_free
-#define	heap_init _bsd_heap_init
-#define	heap_insert _bsd_heap_insert
-#define	heap_scan _bsd_heap_scan
 #define	hex2ascii_data _bsd_hex2ascii_data
 #define	hhook_add_hook _bsd_hhook_add_hook
 #define	hhook_add_hook_lookup _bsd_hhook_add_hook_lookup
@@ -1188,6 +1165,7 @@
 #define	hhook_remove_hook _bsd_hhook_remove_hook
 #define	hhook_remove_hook_lookup _bsd_hhook_remove_hook_lookup
 #define	hhook_run_hooks _bsd_hhook_run_hooks
+#define	hhook_run_tcp_est_in _bsd_hhook_run_tcp_est_in
 #define	hhook_vhead_list _bsd_hhook_vhead_list
 #define	hid_end_parse _bsd_hid_end_parse
 #define	hid_get_data _bsd_hid_get_data
@@ -1203,7 +1181,6 @@
 #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	hostb_alloc_start _bsd_hostb_alloc_start
 #define	HouseKeeping _bsd_HouseKeeping
 #define	hz _bsd_hz
 #define	icmp6_ctloutput _bsd_icmp6_ctloutput
@@ -1226,6 +1203,8 @@
 #define	icmp_input _bsd_icmp_input
 #define	icmpstat _bsd_icmpstat
 #define	ifa_add_loopback_route _bsd_ifa_add_loopback_route
+#define	ifa_alloc _bsd_ifa_alloc
+#define	iface_idx _bsd_iface_idx
 #define	if_addgroup _bsd_if_addgroup
 #define	if_addmulti _bsd_if_addmulti
 #define	ifaddr_byindex _bsd_ifaddr_byindex
@@ -1237,50 +1216,68 @@
 #define	ifa_ifwithaddr_check _bsd_ifa_ifwithaddr_check
 #define	ifa_ifwithbroadaddr _bsd_ifa_ifwithbroadaddr
 #define	ifa_ifwithdstaddr _bsd_ifa_ifwithdstaddr
-#define	ifa_ifwithdstaddr_fib _bsd_ifa_ifwithdstaddr_fib
 #define	ifa_ifwithnet _bsd_ifa_ifwithnet
-#define	ifa_ifwithnet_fib _bsd_ifa_ifwithnet_fib
 #define	ifa_ifwithroute _bsd_ifa_ifwithroute
-#define	ifa_ifwithroute_fib _bsd_ifa_ifwithroute_fib
-#define	ifa_init _bsd_ifa_init
 #define	if_allmulti _bsd_if_allmulti
 #define	if_alloc _bsd_if_alloc
 #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_free_unit _bsd_ifc_free_unit
-#define	if_clone_attach _bsd_if_clone_attach
+#define	if_clearhwassist _bsd_if_clearhwassist
+#define	if_clone_addgroup _bsd_if_clone_addgroup
+#define	if_clone_advanced _bsd_if_clone_advanced
 #define	if_clone_create _bsd_if_clone_create
 #define	if_clone_destroy _bsd_if_clone_destroy
 #define	if_clone_destroyif _bsd_if_clone_destroyif
 #define	if_clone_detach _bsd_if_clone_detach
-#define	if_clone_init _bsd_if_clone_init
+#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_name2unit _bsd_ifc_name2unit
-#define	ifc_simple_attach _bsd_ifc_simple_attach
-#define	ifc_simple_create _bsd_ifc_simple_create
-#define	ifc_simple_destroy _bsd_ifc_simple_destroy
-#define	ifc_simple_match _bsd_ifc_simple_match
+#define	if_data_copy _bsd_if_data_copy
 #define	if_dead _bsd_if_dead
 #define	if_delallmulti _bsd_if_delallmulti
 #define	if_delgroup _bsd_if_delgroup
 #define	if_delmulti _bsd_if_delmulti
 #define	if_delmulti_ifma _bsd_if_delmulti_ifma
+#define	if_dequeue _bsd_if_dequeue
 #define	if_deregister_com_alloc _bsd_if_deregister_com_alloc
 #define	if_detach _bsd_if_detach
 #define	if_down _bsd_if_down
+#define	if_etherbpfmtap _bsd_if_etherbpfmtap
 #define	if_findmulti _bsd_if_findmulti
 #define	if_free _bsd_if_free
-#define	if_free_type _bsd_if_free_type
+#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
+#define	if_gethandle _bsd_if_gethandle
+#define	if_gethwassist _bsd_if_gethwassist
+#define	if_getifaddr _bsd_if_getifaddr
+#define	if_getlladdr _bsd_if_getlladdr
+#define	if_getmtu _bsd_if_getmtu
+#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	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
@@ -1292,6 +1289,9 @@
 #define	ifmedia_list_add _bsd_ifmedia_list_add
 #define	ifmedia_removeall _bsd_ifmedia_removeall
 #define	ifmedia_set _bsd_ifmedia_set
+#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
@@ -1307,13 +1307,43 @@
 #define	if_ref _bsd_if_ref
 #define	if_register_com_alloc _bsd_if_register_com_alloc
 #define	if_rele _bsd_if_rele
+#define	if_sendq_empty _bsd_if_sendq_empty
+#define	if_sendq_prepend _bsd_if_sendq_prepend
+#define	if_setbaudrate _bsd_if_setbaudrate
+#define	if_setcapabilities _bsd_if_setcapabilities
+#define	if_setcapabilitiesbit _bsd_if_setcapabilitiesbit
+#define	if_setcapenable _bsd_if_setcapenable
+#define	if_setcapenablebit _bsd_if_setcapenablebit
+#define	if_setdev _bsd_if_setdev
+#define	if_setdrvflagbits _bsd_if_setdrvflagbits
+#define	if_setdrvflags _bsd_if_setdrvflags
+#define	if_setflagbits _bsd_if_setflagbits
+#define	if_setflags _bsd_if_setflags
+#define	if_setgetcounterfn _bsd_if_setgetcounterfn
+#define	if_sethwassist _bsd_if_sethwassist
+#define	if_sethwassistbits _bsd_if_sethwassistbits
+#define	if_setifheaderlen _bsd_if_setifheaderlen
+#define	if_setinitfn _bsd_if_setinitfn
+#define	if_setioctlfn _bsd_if_setioctlfn
 #define	if_setlladdr _bsd_if_setlladdr
+#define	if_setmtu _bsd_if_setmtu
+#define	if_setqflushfn _bsd_if_setqflushfn
+#define	if_setrcvif _bsd_if_setrcvif
+#define	if_setsendqlen _bsd_if_setsendqlen
+#define	if_setsendqready _bsd_if_setsendqready
+#define	if_setsoftc _bsd_if_setsoftc
+#define	if_setstartfn _bsd_if_setstartfn
+#define	if_settransmitfn _bsd_if_settransmitfn
+#define	if_setupmultiaddr _bsd_if_setupmultiaddr
+#define	if_setvtag _bsd_if_setvtag
 #define	if_simloop _bsd_if_simloop
 #define	if_start _bsd_if_start
+#define	if_togglecapenable _bsd_if_togglecapenable
 #define	ifunit _bsd_ifunit
 #define	ifunit_ref _bsd_ifunit_ref
 #define	if_up _bsd_if_up
-#define	igb_display_debug_stats _bsd_igb_display_debug_stats
+#define	if_vlancap _bsd_if_vlancap
+#define	if_vlantrunkinuse _bsd_if_vlantrunkinuse
 #define	igb_driver_version _bsd_igb_driver_version
 #define	igmp_change_state _bsd_igmp_change_state
 #define	igmp_domifattach _bsd_igmp_domifattach
@@ -1331,33 +1361,40 @@
 #define	in6_addrscope _bsd_in6_addrscope
 #define	in6_are_prefix_equal _bsd_in6_are_prefix_equal
 #define	in6_cksum _bsd_in6_cksum
+#define	in6_cksum_partial _bsd_in6_cksum_partial
 #define	in6_cksum_pseudo _bsd_in6_cksum_pseudo
 #define	in6_clearscope _bsd_in6_clearscope
 #define	in6_control _bsd_in6_control
+#define	in6_delayed_cksum _bsd_in6_delayed_cksum
 #define	in6_domifattach _bsd_in6_domifattach
 #define	in6_domifdetach _bsd_in6_domifdetach
+#define	in6_domifmtu _bsd_in6_domifmtu
 #define	in6_get_hw_ifid _bsd_in6_get_hw_ifid
+#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_attach _bsd_in6_gif_attach
-#define	in6_gif_detach _bsd_in6_gif_detach
-#define	in6_gif_input _bsd_in6_gif_input
+#define	in6_gif_encapcheck _bsd_in6_gif_encapcheck
 #define	in6_gif_output _bsd_in6_gif_output
-#define	in6_gif_protosw _bsd_in6_gif_protosw
 #define	in6_if2idlen _bsd_in6_if2idlen
-#define	in6_ifaddloop _bsd_in6_ifaddloop
+#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_ifremloop _bsd_in6_ifremloop
+#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
@@ -1387,23 +1424,22 @@
 #define	in6m_record_source _bsd_in6m_record_source
 #define	in6m_release_locked _bsd_in6m_release_locked
 #define	in6_multi_mtx _bsd_in6_multi_mtx
+#define	in6_newaddrmsg _bsd_in6_newaddrmsg
 #define	in6_nigroup _bsd_in6_nigroup
 #define	in6_nigroup_oldmcprefix _bsd_in6_nigroup_oldmcprefix
 #define	in6_pcbbind _bsd_in6_pcbbind
 #define	in6_pcbconnect _bsd_in6_pcbconnect
 #define	in6_pcbconnect_mbuf _bsd_in6_pcbconnect_mbuf
 #define	in6_pcbdisconnect _bsd_in6_pcbdisconnect
-#define	in6_pcbladdr _bsd_in6_pcbladdr
 #define	in6_pcblookup _bsd_in6_pcblookup
-#define	in6_pcblookup_hash_locked _bsd_in6_pcblookup_hash_locked
 #define	in6_pcblookup_local _bsd_in6_pcblookup_local
 #define	in6_pcblookup_mbuf _bsd_in6_pcblookup_mbuf
 #define	in6_pcbnotify _bsd_in6_pcbnotify
 #define	in6_pcbpurgeif0 _bsd_in6_pcbpurgeif0
 #define	in6_pcbsetport _bsd_in6_pcbsetport
 #define	in6_prefixlen2mask _bsd_in6_prefixlen2mask
+#define	in6_prepare_ifra _bsd_in6_prepare_ifra
 #define	in6_purgeaddr _bsd_in6_purgeaddr
-#define	in6_purgeif _bsd_in6_purgeif
 #define	in6_rtalloc _bsd_in6_rtalloc
 #define	in6_rtalloc1 _bsd_in6_rtalloc1
 #define	in6_rtalloc_ign _bsd_in6_rtalloc_ign
@@ -1413,7 +1449,8 @@
 #define	in6_selecthlim _bsd_in6_selecthlim
 #define	in6_selectroute _bsd_in6_selectroute
 #define	in6_selectroute_fib _bsd_in6_selectroute_fib
-#define	in6_selectsrc _bsd_in6_selectsrc
+#define	in6_selectsrc_addr _bsd_in6_selectsrc_addr
+#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
@@ -1421,6 +1458,7 @@
 #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_sockaddr _bsd_in6_sockaddr
+#define	in6_splitscope _bsd_in6_splitscope
 #define	in6_src_ioctl _bsd_in6_src_ioctl
 #define	in6_tmpaddrtimer _bsd_in6_tmpaddrtimer
 #define	in6_tmpaddrtimer_ch _bsd_in6_tmpaddrtimer_ch
@@ -1428,6 +1466,7 @@
 #define	in6_update_ifa _bsd_in6_update_ifa
 #define	in6_v4mapsin6_sockaddr _bsd_in6_v4mapsin6_sockaddr
 #define	in_addmulti _bsd_in_addmulti
+#define	in_addprefix _bsd_in_addprefix
 #define	in_addword _bsd_in_addword
 #define	in_broadcast _bsd_in_broadcast
 #define	in_canforward _bsd_in_canforward
@@ -1451,31 +1490,36 @@
 #define	in_getpeeraddr _bsd_in_getpeeraddr
 #define	in_getsockaddr _bsd_in_getsockaddr
 #define	in_gif_attach _bsd_in_gif_attach
-#define	in_gif_detach _bsd_in_gif_detach
-#define	in_gif_input _bsd_in_gif_input
+#define	in_gif_encapcheck _bsd_in_gif_encapcheck
 #define	in_gif_output _bsd_in_gif_output
-#define	in_gif_protosw _bsd_in_gif_protosw
+#define	in_gre_attach _bsd_in_gre_attach
+#define	in_gre_output _bsd_in_gre_output
+#define	in_ifaddr_broadcast _bsd_in_ifaddr_broadcast
 #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_ifscrub _bsd_in_ifscrub
+#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_zone_var _bsd_init_zone_var
+#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
 #define	in_leavegroup_locked _bsd_in_leavegroup_locked
 #define	in_localaddr _bsd_in_localaddr
 #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_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_locked _bsd_inm_release_locked
@@ -1484,6 +1528,7 @@
 #define	inp_apply_all _bsd_inp_apply_all
 #define	in_pcballoc _bsd_in_pcballoc
 #define	in_pcbbind _bsd_in_pcbbind
+#define	in_pcbbind_check_bindmulti _bsd_in_pcbbind_check_bindmulti
 #define	in_pcbbind_setup _bsd_in_pcbbind_setup
 #define	in_pcbconnect _bsd_in_pcbconnect
 #define	in_pcbconnect_mbuf _bsd_in_pcbconnect_mbuf
@@ -1496,6 +1541,7 @@
 #define	in_pcbinfo_init _bsd_in_pcbinfo_init
 #define	in_pcbinshash _bsd_in_pcbinshash
 #define	in_pcbinshash_nopcbgroup _bsd_in_pcbinshash_nopcbgroup
+#define	in_pcbladdr _bsd_in_pcbladdr
 #define	in_pcblookup _bsd_in_pcblookup
 #define	in_pcblookup_local _bsd_in_pcblookup_local
 #define	in_pcblookup_mbuf _bsd_in_pcblookup_mbuf
@@ -1522,20 +1568,13 @@
 #define	inp_so_options _bsd_inp_so_options
 #define	inp_wlock _bsd_inp_wlock
 #define	inp_wunlock _bsd_inp_wunlock
-#define	in_rtalloc _bsd_in_rtalloc
-#define	in_rtalloc1 _bsd_in_rtalloc1
 #define	in_rtalloc_ign _bsd_in_rtalloc_ign
-#define	in_rtqdrain _bsd_in_rtqdrain
 #define	in_rtredirect _bsd_in_rtredirect
-#define	in_rtrequest _bsd_in_rtrequest
-#define	in_setmatchfunc _bsd_in_setmatchfunc
+#define	in_scrubprefix _bsd_in_scrubprefix
 #define	in_sockaddr _bsd_in_sockaddr
-#define	in_stf_input _bsd_in_stf_input
-#define	in_stf_protosw _bsd_in_stf_protosw
 #define	intr_event_add_handler _bsd_intr_event_add_handler
 #define	intr_event_create _bsd_intr_event_create
 #define	intr_event_execute_handlers _bsd_intr_event_execute_handlers
-#define	intrproc _bsd_intrproc
 #define	ip6_accept_rtadv _bsd_ip6_accept_rtadv
 #define	ip6_auto_flowlabel _bsd_ip6_auto_flowlabel
 #define	ip6_auto_linklocal _bsd_ip6_auto_linklocal
@@ -1545,22 +1584,21 @@
 #define	ip6_dad_count _bsd_ip6_dad_count
 #define	ip6_defhlim _bsd_ip6_defhlim
 #define	ip6_defmcasthlim _bsd_ip6_defmcasthlim
+#define	ip6_deletefraghdr _bsd_ip6_deletefraghdr
 #define	ip6_desync_factor _bsd_ip6_desync_factor
 #define	ip6_ecn_egress _bsd_ip6_ecn_egress
 #define	ip6_ecn_ingress _bsd_ip6_ecn_ingress
 #define	ip6_forward _bsd_ip6_forward
 #define	ip6_forwarding _bsd_ip6_forwarding
+#define	ip6_fragment _bsd_ip6_fragment
 #define	ip6_freemoptions _bsd_ip6_freemoptions
 #define	ip6_freepcbopts _bsd_ip6_freepcbopts
-#define	ip6_getdstifaddr _bsd_ip6_getdstifaddr
 #define	ip6_getmoptions _bsd_ip6_getmoptions
 #define	ip6_get_prevhdr _bsd_ip6_get_prevhdr
-#define	ip6_gif_hlim _bsd_ip6_gif_hlim
 #define	ip6_hdrnestlimit _bsd_ip6_hdrnestlimit
 #define	ip6_init _bsd_ip6_init
 #define	ip6_initpktopts _bsd_ip6_initpktopts
 #define	ip6_input _bsd_ip6_input
-#define	ip6_keepfaith _bsd_ip6_keepfaith
 #define	ip6_lasthdr _bsd_ip6_lasthdr
 #define	ip6_log_interval _bsd_ip6_log_interval
 #define	ip6_log_time _bsd_ip6_log_time
@@ -1617,54 +1655,135 @@
 #define	ip_ctloutput _bsd_ip_ctloutput
 #define	ip_defttl _bsd_ip_defttl
 #define	ip_divert_ptr _bsd_ip_divert_ptr
-#define	ipdn_bound_var _bsd_ipdn_bound_var
 #define	ip_dn_ctl_ptr _bsd_ip_dn_ctl_ptr
 #define	ip_dn_io_ptr _bsd_ip_dn_io_ptr
-#define	ipdn_q_find _bsd_ipdn_q_find
-#define	ipdn_si_find _bsd_ipdn_si_find
 #define	ip_dooptions _bsd_ip_dooptions
 #define	ip_doopts _bsd_ip_doopts
-#define	ip_do_randomid _bsd_ip_do_randomid
 #define	ip_drain _bsd_ip_drain
-#define	ip_dummynet_compat _bsd_ip_dummynet_compat
 #define	ip_ecn_egress _bsd_ip_ecn_egress
 #define	ip_ecn_ingress _bsd_ip_ecn_ingress
-#define	ip_fastforward _bsd_ip_fastforward
+#define	ip_fillid _bsd_ip_fillid
 #define	ip_forward _bsd_ip_forward
 #define	ipforwarding _bsd_ipforwarding
 #define	ip_fragment _bsd_ip_fragment
-#define	ipfw_add_rule _bsd_ipfw_add_rule
-#define	ipfw_add_table_entry _bsd_ipfw_add_table_entry
+#define	ipfw_add_eaction _bsd_ipfw_add_eaction
+#define	ipfw_add_obj_rewriter _bsd_ipfw_add_obj_rewriter
+#define	ipfw_add_sopt_handler _bsd_ipfw_add_sopt_handler
+#define	ipfw_add_table_algo _bsd_ipfw_add_table_algo
+#define	ipfw_alloc_rule _bsd_ipfw_alloc_rule
 #define	ipfw_attach_hooks _bsd_ipfw_attach_hooks
-#define	ipfw_check_hook _bsd_ipfw_check_hook
+#define	ipfw_bpf_init _bsd_ipfw_bpf_init
+#define	ipfw_bpf_mtap2 _bsd_ipfw_bpf_mtap2
+#define	ipfw_bpf_uninit _bsd_ipfw_bpf_uninit
+#define	ipfw_check_frame _bsd_ipfw_check_frame
+#define	ipfw_check_object_name_generic _bsd_ipfw_check_object_name_generic
+#define	ipfw_check_packet _bsd_ipfw_check_packet
 #define	ipfw_chg_hook _bsd_ipfw_chg_hook
 #define	ipfw_chk _bsd_ipfw_chk
 #define	ip_fw_chk_ptr _bsd_ip_fw_chk_ptr
 #define	ipfw_count_table _bsd_ipfw_count_table
 #define	ipfw_count_xtable _bsd_ipfw_count_xtable
-#define	ipfw_ctl _bsd_ipfw_ctl
+#define	ipfw_ctl3 _bsd_ipfw_ctl3
 #define	ip_fw_ctl_ptr _bsd_ip_fw_ctl_ptr
-#define	ipfw_del_table_entry _bsd_ipfw_del_table_entry
+#define	ipfw_del_eaction _bsd_ipfw_del_eaction
+#define	ipfw_del_obj_rewriter _bsd_ipfw_del_obj_rewriter
+#define	ipfw_del_sopt_handler _bsd_ipfw_del_sopt_handler
+#define	ipfw_del_table_algo _bsd_ipfw_del_table_algo
+#define	ipfw_destroy_counters _bsd_ipfw_destroy_counters
+#define	ipfw_destroy_obj_rewriter _bsd_ipfw_destroy_obj_rewriter
+#define	ipfw_destroy_skipto_cache _bsd_ipfw_destroy_skipto_cache
+#define	ipfw_destroy_sopt_handler _bsd_ipfw_destroy_sopt_handler
+#define	ipfw_destroy_srv _bsd_ipfw_destroy_srv
 #define	ipfw_destroy_tables _bsd_ipfw_destroy_tables
-#define	ipfw_dump_table _bsd_ipfw_dump_table
-#define	ipfw_dump_xtable _bsd_ipfw_dump_xtable
+#define	ipfw_dump_states _bsd_ipfw_dump_states
+#define	ipfw_dump_table_legacy _bsd_ipfw_dump_table_legacy
+#define	ipfw_dyn_get_count _bsd_ipfw_dyn_get_count
+#define	ipfw_dyn_init _bsd_ipfw_dyn_init
+#define	ipfw_dyn_len _bsd_ipfw_dyn_len
+#define	ipfw_dyn_uninit _bsd_ipfw_dyn_uninit
+#define	ipfw_dyn_unlock _bsd_ipfw_dyn_unlock
+#define	ipfw_eaction_init _bsd_ipfw_eaction_init
+#define	ipfw_eaction_uninit _bsd_ipfw_eaction_uninit
+#define	ipfw_expire_dyn_rules _bsd_ipfw_expire_dyn_rules
+#define	ipfw_export_obj_ntlv _bsd_ipfw_export_obj_ntlv
+#define	ipfw_export_table_ntlv _bsd_ipfw_export_table_ntlv
+#define	ipfw_export_table_value_legacy _bsd_ipfw_export_table_value_legacy
+#define	ipfw_export_table_value_v1 _bsd_ipfw_export_table_value_v1
+#define	ipfw_find_name_tlv_type _bsd_ipfw_find_name_tlv_type
 #define	ipfw_find_rule _bsd_ipfw_find_rule
-#define	ipfw_flush_table _bsd_ipfw_flush_table
+#define	ipfw_foreach_table_tentry _bsd_ipfw_foreach_table_tentry
+#define	ipfw_garbage_table_values _bsd_ipfw_garbage_table_values
+#define	ipfw_get_dynamic _bsd_ipfw_get_dynamic
+#define	ipfw_get_sopt_header _bsd_ipfw_get_sopt_header
+#define	ipfw_get_sopt_space _bsd_ipfw_get_sopt_space
+#define	ipfw_get_table_objhash _bsd_ipfw_get_table_objhash
+#define	ipfw_iface_add_notify _bsd_ipfw_iface_add_notify
+#define	ipfw_iface_del_notify _bsd_ipfw_iface_del_notify
+#define	ipfw_iface_destroy _bsd_ipfw_iface_destroy
+#define	ipfw_iface_init _bsd_ipfw_iface_init
+#define	ipfw_iface_ref _bsd_ipfw_iface_ref
+#define	ipfw_iface_unref _bsd_ipfw_iface_unref
+#define	ipfw_import_table_value_legacy _bsd_ipfw_import_table_value_legacy
+#define	ipfw_import_table_value_v1 _bsd_ipfw_import_table_value_v1
+#define	ipfw_init_counters _bsd_ipfw_init_counters
+#define	ipfw_init_obj_rewriter _bsd_ipfw_init_obj_rewriter
+#define	ipfw_init_skipto_cache _bsd_ipfw_init_skipto_cache
+#define	ipfw_init_sopt_handler _bsd_ipfw_init_sopt_handler
+#define	ipfw_init_srv _bsd_ipfw_init_srv
 #define	ipfw_init_tables _bsd_ipfw_init_tables
+#define	ipfw_install_state _bsd_ipfw_install_state
+#define	ipfw_is_dyn_rule _bsd_ipfw_is_dyn_rule
+#define	ipfw_link_table_values _bsd_ipfw_link_table_values
 #define	ipfw_log _bsd_ipfw_log
-#define	ipfw_log_bpf _bsd_ipfw_log_bpf
+#define	ipfw_lookup_dyn_rule _bsd_ipfw_lookup_dyn_rule
 #define	ipfw_lookup_table _bsd_ipfw_lookup_table
 #define	ipfw_lookup_table_extended _bsd_ipfw_lookup_table_extended
+#define	ipfw_match_range _bsd_ipfw_match_range
+#define	ipfw_nat64lsn _bsd_ipfw_nat64lsn
+#define	ipfw_nat64stl _bsd_ipfw_nat64stl
 #define	ipfw_nat_cfg_ptr _bsd_ipfw_nat_cfg_ptr
 #define	ipfw_nat_del_ptr _bsd_ipfw_nat_del_ptr
 #define	ipfw_nat_get_cfg_ptr _bsd_ipfw_nat_get_cfg_ptr
 #define	ipfw_nat_get_log_ptr _bsd_ipfw_nat_get_log_ptr
 #define	ipfw_nat_ptr _bsd_ipfw_nat_ptr
 #define	ipfw_nat_ready _bsd_ipfw_nat_ready
+#define	ipfw_objhash_add _bsd_ipfw_objhash_add
+#define	ipfw_objhash_alloc_idx _bsd_ipfw_objhash_alloc_idx
+#define	ipfw_objhash_bitmap_alloc _bsd_ipfw_objhash_bitmap_alloc
+#define	ipfw_objhash_bitmap_free _bsd_ipfw_objhash_bitmap_free
+#define	ipfw_objhash_bitmap_merge _bsd_ipfw_objhash_bitmap_merge
+#define	ipfw_objhash_bitmap_swap _bsd_ipfw_objhash_bitmap_swap
+#define	ipfw_objhash_count _bsd_ipfw_objhash_count
+#define	ipfw_objhash_count_type _bsd_ipfw_objhash_count_type
+#define	ipfw_objhash_create _bsd_ipfw_objhash_create
+#define	ipfw_objhash_del _bsd_ipfw_objhash_del
+#define	ipfw_objhash_destroy _bsd_ipfw_objhash_destroy
+#define	ipfw_objhash_find_type _bsd_ipfw_objhash_find_type
+#define	ipfw_objhash_foreach _bsd_ipfw_objhash_foreach
+#define	ipfw_objhash_foreach_type _bsd_ipfw_objhash_foreach_type
+#define	ipfw_objhash_free_idx _bsd_ipfw_objhash_free_idx
+#define	ipfw_objhash_lookup_kidx _bsd_ipfw_objhash_lookup_kidx
+#define	ipfw_objhash_lookup_name _bsd_ipfw_objhash_lookup_name
+#define	ipfw_objhash_lookup_name_type _bsd_ipfw_objhash_lookup_name_type
+#define	ipfw_objhash_lookup_table_kidx _bsd_ipfw_objhash_lookup_table_kidx
+#define	ipfw_objhash_same_name _bsd_ipfw_objhash_same_name
+#define	ipfw_objhash_set_funcs _bsd_ipfw_objhash_set_funcs
+#define	ipfw_obj_manage_sets _bsd_ipfw_obj_manage_sets
+#define	ipfw_reap_add _bsd_ipfw_reap_add
 #define	ipfw_reap_rules _bsd_ipfw_reap_rules
+#define	ipfw_ref_table _bsd_ipfw_ref_table
 #define	ipfw_resize_tables _bsd_ipfw_resize_tables
-#define	ip_gif_ttl _bsd_ip_gif_ttl
-#define	ip_id _bsd_ip_id
+#define	ipfw_run_eaction _bsd_ipfw_run_eaction
+#define	ipfw_send_pkt _bsd_ipfw_send_pkt
+#define	ipfw_switch_tables_namespace _bsd_ipfw_switch_tables_namespace
+#define	ipfw_table_algo_destroy _bsd_ipfw_table_algo_destroy
+#define	ipfw_table_algo_init _bsd_ipfw_table_algo_init
+#define	ipfw_table_value_destroy _bsd_ipfw_table_value_destroy
+#define	ipfw_table_value_init _bsd_ipfw_table_value_init
+#define	ipfw_unref_table _bsd_ipfw_unref_table
+#define	ipfw_unref_table_values _bsd_ipfw_unref_table_values
+#define	ipfw_vnet_ready _bsd_ipfw_vnet_ready
+#define	ip_gre_ttl _bsd_ip_gre_ttl
 #define	ip_init _bsd_ip_init
 #define	ip_input _bsd_ip_input
 #define	ip_insertoptions _bsd_ip_insertoptions
@@ -1703,22 +1822,24 @@
 #define	ipproto_register _bsd_ipproto_register
 #define	ipproto_unregister _bsd_ipproto_unregister
 #define	ip_protox _bsd_ip_protox
-#define	ip_randomid _bsd_ip_randomid
 #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_rtaddr _bsd_ip_rtaddr
 #define	ip_savecontrol _bsd_ip_savecontrol
-#define	ipsec_bpf _bsd_ipsec_bpf
-#define	ipsec_filter _bsd_ipsec_filter
+#define	ipsec_hhh_in _bsd_ipsec_hhh_in
+#define	ipsec_hhh_out _bsd_ipsec_hhh_out
 #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	iso88025_ifattach _bsd_iso88025_ifattach
 #define	iso88025_ifdetach _bsd_iso88025_ifdetach
 #define	iso88025_input _bsd_iso88025_input
@@ -1727,10 +1848,15 @@
 #define	itimerfix _bsd_itimerfix
 #define	jailed _bsd_jailed
 #define	jailed_without_vnet _bsd_jailed_without_vnet
+#define	jenkins_hash _bsd_jenkins_hash
+#define	jenkins_hash32 _bsd_jenkins_hash32
 #define	kernel_sysctl _bsd_kernel_sysctl
 #define	kern_getsockname _bsd_kern_getsockname
+#define	kern_kevent_anonymous _bsd_kern_kevent_anonymous
+#define	kern_pipe _bsd_kern_pipe
 #define	kern_select _bsd_kern_select
 #define	kern_socketpair _bsd_kern_socketpair
+#define	kern_uuidgen _bsd_kern_uuidgen
 #define	khelp_add_hhook _bsd_khelp_add_hhook
 #define	khelp_deregister_helper _bsd_khelp_deregister_helper
 #define	khelp_destroy_osd _bsd_khelp_destroy_osd
@@ -1747,13 +1873,14 @@
 #define	kmod_tcpstat_inc _bsd_kmod_tcpstat_inc
 #define	kmod_udpstat_inc _bsd_kmod_udpstat_inc
 #define	knlist_add _bsd_knlist_add
+#define	knlist_alloc _bsd_knlist_alloc
 #define	knlist_cleardel _bsd_knlist_cleardel
 #define	knlist_destroy _bsd_knlist_destroy
+#define	knlist_detach _bsd_knlist_detach
 #define	knlist_empty _bsd_knlist_empty
 #define	knlist_init _bsd_knlist_init
 #define	knlist_init_mtx _bsd_knlist_init_mtx
 #define	knlist_remove _bsd_knlist_remove
-#define	knlist_remove_inevent _bsd_knlist_remove_inevent
 #define	knote _bsd_knote
 #define	knote_fdclose _bsd_knote_fdclose
 #define	kobj_class_compile _bsd_kobj_class_compile
@@ -1787,11 +1914,8 @@
 #define	lacp_req _bsd_lacp_req
 #define	lacp_select_tx_port _bsd_lacp_select_tx_port
 #define	lacp_stop _bsd_lacp_stop
-#define	lagg_cloner _bsd_lagg_cloner
-#define	lagg_cloner_data _bsd_lagg_cloner_data
 #define	lagg_detach_cookie _bsd_lagg_detach_cookie
 #define	lagg_enqueue _bsd_lagg_enqueue
-#define	lagg_hashmbuf _bsd_lagg_hashmbuf
 #define	lagg_input_p _bsd_lagg_input_p
 #define	lagg_linkstate_p _bsd_lagg_linkstate_p
 #define	lagg_list _bsd_lagg_list
@@ -1800,16 +1924,10 @@
 #define	led_create_state _bsd_led_create_state
 #define	led_destroy _bsd_led_destroy
 #define	led_set _bsd_led_set
-#define	legacy_pcib_alloc_resource _bsd_legacy_pcib_alloc_resource
-#define	legacy_pcib_driver _bsd_legacy_pcib_driver
-#define	legacy_pcib_map_msi _bsd_legacy_pcib_map_msi
-#define	legacy_pcib_maxslots _bsd_legacy_pcib_maxslots
-#define	legacy_pcib_read_config _bsd_legacy_pcib_read_config
-#define	legacy_pcib_read_ivar _bsd_legacy_pcib_read_ivar
-#define	legacy_pcib_write_config _bsd_legacy_pcib_write_config
-#define	legacy_pcib_write_ivar _bsd_legacy_pcib_write_ivar
 #define	legal_vif_num _bsd_legal_vif_num
 #define	lem_driver_version _bsd_lem_driver_version
+#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
@@ -1835,14 +1953,48 @@
 #define	LibAliasSetTarget _bsd_LibAliasSetTarget
 #define	LibAliasUnaliasOut _bsd_LibAliasUnaliasOut
 #define	LibAliasUninit _bsd_LibAliasUninit
+#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
+#define	link_pfil_hook _bsd_link_pfil_hook
 #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_calc_llheader _bsd_lltable_calc_llheader
+#define	lltable_delete_addr _bsd_lltable_delete_addr
+#define	lltable_drop_entry_queue _bsd_lltable_drop_entry_queue
+#define	lltable_fill_sa_entry _bsd_lltable_fill_sa_entry
+#define	lltable_foreach_lle _bsd_lltable_foreach_lle
 #define	lltable_free _bsd_lltable_free
-#define	lltable_init _bsd_lltable_init
+#define	lltable_free_entry _bsd_lltable_free_entry
+#define	lltable_get_af _bsd_lltable_get_af
+#define	lltable_get_ifp _bsd_lltable_get_ifp
+#define	lltable_link _bsd_lltable_link
+#define	lltable_link_entry _bsd_lltable_link_entry
 #define	lltable_prefix_free _bsd_lltable_prefix_free
 #define	lltable_rwlock _bsd_lltable_rwlock
+#define	lltable_set_entry_addr _bsd_lltable_set_entry_addr
 #define	lltable_sysctl_dumparp _bsd_lltable_sysctl_dumparp
+#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
@@ -1850,8 +2002,6 @@
 #define	lock_class_sx _bsd_lock_class_sx
 #define	lock_destroy _bsd_lock_destroy
 #define	lock_init _bsd_lock_init
-#define	lo_cloner _bsd_lo_cloner
-#define	lo_cloner_data _bsd_lo_cloner_data
 #define	log _bsd_log
 #define	loif _bsd_loif
 #define	loioctl _bsd_loioctl
@@ -1861,40 +2011,47 @@
 #define	machclk_freq _bsd_machclk_freq
 #define	machclk_per_tick _bsd_machclk_per_tick
 #define	machclk_usepcc _bsd_machclk_usepcc
-#define	m_addr_chg_pf_p _bsd_m_addr_chg_pf_p
 #define	m_adj _bsd_m_adj
 #define	make_dev _bsd_make_dev
+#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	m_align _bsd_m_align
 #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	maxusers _bsd_maxusers
+#define	mb_dupcl _bsd_mb_dupcl
 #define	mb_free_ext _bsd_mb_free_ext
 #define	M_BPF _bsd_M_BPF
 #define	M_BPFJIT _bsd_M_BPFJIT
 #define	M_CAMSIM _bsd_M_CAMSIM
 #define	m_cat _bsd_m_cat
+#define	m_catpkt _bsd_m_catpkt
+#define	m_clget _bsd_m_clget
+#define	m_cljget _bsd_m_cljget
 #define	m_collapse _bsd_m_collapse
 #define	m_copyback _bsd_m_copyback
 #define	m_copydata _bsd_m_copydata
 #define	m_copym _bsd_m_copym
-#define	m_copymdata _bsd_m_copymdata
 #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_DN_HEAP _bsd_M_DN_HEAP
-#define	M_DUMMYNET _bsd_M_DUMMYNET
 #define	m_dup _bsd_m_dup
 #define	m_dup_pkthdr _bsd_m_dup_pkthdr
+#define	m_ether_tcpip_hash _bsd_m_ether_tcpip_hash
+#define	m_ether_tcpip_hash_init _bsd_m_ether_tcpip_hash_init
 #define	m_extadd _bsd_m_extadd
 #define	m_fixhdr _bsd_m_fixhdr
 #define	m_freem _bsd_m_freem
+#define	m_get2 _bsd_m_get2
+#define	m_getjcl _bsd_m_getjcl
 #define	m_getm2 _bsd_m_getm2
 #define	m_getptr _bsd_m_getptr
 #define	M_IFADDR _bsd_M_IFADDR
@@ -1905,7 +2062,8 @@
 #define	mii_bitbang_writereg _bsd_mii_bitbang_writereg
 #define	miibus_devclass _bsd_miibus_devclass
 #define	miibus_driver _bsd_miibus_driver
-#define	mii_down _bsd_mii_down
+#define	mii_dev_mac_match _bsd_mii_dev_mac_match
+#define	mii_dev_mac_softc _bsd_mii_dev_mac_softc
 #define	mii_mediachg _bsd_mii_mediachg
 #define	mii_oui _bsd_mii_oui
 #define	mii_phy_add_media _bsd_mii_phy_add_media
@@ -1913,8 +2071,9 @@
 #define	mii_phy_detach _bsd_mii_phy_detach
 #define	mii_phy_dev_attach _bsd_mii_phy_dev_attach
 #define	mii_phy_dev_probe _bsd_mii_phy_dev_probe
-#define	mii_phy_down _bsd_mii_phy_down
 #define	mii_phy_flowstatus _bsd_mii_phy_flowstatus
+#define	mii_phy_mac_match _bsd_mii_phy_mac_match
+#define	mii_phy_mac_softc _bsd_mii_phy_mac_softc
 #define	mii_phy_match _bsd_mii_phy_match
 #define	mii_phy_match_gen _bsd_mii_phy_match_gen
 #define	mii_phy_reset _bsd_mii_phy_reset
@@ -1925,7 +2084,6 @@
 #define	mii_tick _bsd_mii_tick
 #define	M_IOV _bsd_M_IOV
 #define	M_IP6NDP _bsd_M_IP6NDP
-#define	M_IP6OPT _bsd_M_IP6OPT
 #define	M_IPFW _bsd_M_IPFW
 #define	M_IPFW_TBL _bsd_M_IPFW_TBL
 #define	mi_startup _bsd_mi_startup
@@ -1939,14 +2097,16 @@
 #define	m_length _bsd_m_length
 #define	M_LLTABLE _bsd_M_LLTABLE
 #define	m_mbuftouio _bsd_m_mbuftouio
+#define	mmc_devclass _bsd_mmc_devclass
+#define	mmc_driver _bsd_mmc_driver
 #define	m_megapullup _bsd_m_megapullup
 #define	m_move_pkthdr _bsd_m_move_pkthdr
+#define	M_NAT64LSN _bsd_M_NAT64LSN
 #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_PCB _bsd_M_PCB
 #define	m_pkthdr_init _bsd_m_pkthdr_init
 #define	m_prepend _bsd_m_prepend
@@ -1958,7 +2118,6 @@
 #define	M_RTABLE _bsd_M_RTABLE
 #define	mrt_ioctl _bsd_mrt_ioctl
 #define	m_sanity _bsd_m_sanity
-#define	MSFail _bsd_MSFail
 #define	M_SONAME _bsd_M_SONAME
 #define	m_split _bsd_m_split
 #define	m_tag_alloc _bsd_m_tag_alloc
@@ -1970,6 +2129,7 @@
 #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
@@ -1986,51 +2146,72 @@
 #define	mtx_pool_find _bsd_mtx_pool_find
 #define	mtx_recursed _bsd_mtx_recursed
 #define	mtx_sysinit _bsd_mtx_sysinit
-#define	_mtx_trylock _bsd__mtx_trylock
+#define	mtx_trylock_flags_ _bsd_mtx_trylock_flags_
 #define	_mtx_unlock_flags _bsd__mtx_unlock_flags
 #define	m_uiotombuf _bsd_m_uiotombuf
 #define	m_unshare _bsd_m_unshare
+#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	M_USBHC _bsd_M_USBHC
 #define	mutex_init _bsd_mutex_init
 #define	M_XDATA _bsd_M_XDATA
+#define	nat64_allow_private _bsd_nat64_allow_private
+#define	nat64_debug _bsd_nat64_debug
+#define	nat64_do_handle_ip4 _bsd_nat64_do_handle_ip4
+#define	nat64_do_handle_ip6 _bsd_nat64_do_handle_ip6
+#define	nat64_getlasthdr _bsd_nat64_getlasthdr
+#define	nat64_handle_icmp6 _bsd_nat64_handle_icmp6
+#define	nat64lsn_destroy_instance _bsd_nat64lsn_destroy_instance
+#define	nat64lsn_dump_state _bsd_nat64lsn_dump_state
+#define	nat64lsn_eid _bsd_nat64lsn_eid
+#define	nat64lsn_init _bsd_nat64lsn_init
+#define	nat64lsn_init_instance _bsd_nat64lsn_init_instance
+#define	nat64lsn_init_internal _bsd_nat64lsn_init_internal
+#define	nat64lsn_rproto_map _bsd_nat64lsn_rproto_map
+#define	nat64lsn_start_instance _bsd_nat64lsn_start_instance
+#define	nat64lsn_uninit _bsd_nat64lsn_uninit
+#define	nat64lsn_uninit_internal _bsd_nat64lsn_uninit_internal
+#define	nat64stl_eid _bsd_nat64stl_eid
+#define	nat64stl_init _bsd_nat64stl_init
+#define	nat64stl_uninit _bsd_nat64stl_uninit
+#define	nd6_add_ifa_lle _bsd_nd6_add_ifa_lle
+#define	nd6_alloc _bsd_nd6_alloc
 #define	nd6_cache_lladdr _bsd_nd6_cache_lladdr
-#define	nd6_dad_duplicated _bsd_nd6_dad_duplicated
+#define	nd6_dad_init _bsd_nd6_dad_init
 #define	nd6_dad_start _bsd_nd6_dad_start
 #define	nd6_dad_stop _bsd_nd6_dad_stop
 #define	nd6_defifindex _bsd_nd6_defifindex
+#define	nd6_flush_holdchain _bsd_nd6_flush_holdchain
+#define	nd6_grab_holdchain _bsd_nd6_grab_holdchain
 #define	nd6_ifattach _bsd_nd6_ifattach
 #define	nd6_ifdetach _bsd_nd6_ifdetach
 #define	nd6_ifptomac _bsd_nd6_ifptomac
 #define	nd6_init _bsd_nd6_init
 #define	nd6_ioctl _bsd_nd6_ioctl
 #define	nd6_is_addr_neighbor _bsd_nd6_is_addr_neighbor
-#define	nd6_llinfo_settimer _bsd_nd6_llinfo_settimer
-#define	nd6_llinfo_settimer_locked _bsd_nd6_llinfo_settimer_locked
+#define	nd6_llinfo_setstate _bsd_nd6_llinfo_setstate
+#define	nd6_lock _bsd_nd6_lock
 #define	nd6_lookup _bsd_nd6_lookup
 #define	nd6_na_input _bsd_nd6_na_input
 #define	nd6_na_output _bsd_nd6_na_output
-#define	nd6_need_cache _bsd_nd6_need_cache
 #define	nd6_ns_input _bsd_nd6_ns_input
 #define	nd6_ns_output _bsd_nd6_ns_output
-#define	nd6_nud_hint _bsd_nd6_nud_hint
 #define	nd6_option _bsd_nd6_option
 #define	nd6_option_init _bsd_nd6_option_init
 #define	nd6_options _bsd_nd6_options
-#define	nd6_output _bsd_nd6_output
-#define	nd6_output_flush _bsd_nd6_output_flush
-#define	nd6_output_lle _bsd_nd6_output_lle
+#define	nd6_output_ifp _bsd_nd6_output_ifp
 #define	nd6_prefix_lookup _bsd_nd6_prefix_lookup
 #define	nd6_prelist_add _bsd_nd6_prelist_add
 #define	nd6_purge _bsd_nd6_purge
 #define	nd6_ra_input _bsd_nd6_ra_input
 #define	nd6_recalc_reachtm_interval _bsd_nd6_recalc_reachtm_interval
+#define	nd6_rem_ifa_lle _bsd_nd6_rem_ifa_lle
+#define	nd6_resolve _bsd_nd6_resolve
+#define	nd6_resolve_addr _bsd_nd6_resolve_addr
 #define	nd6_rs_input _bsd_nd6_rs_input
-#define	nd6_rtrequest _bsd_nd6_rtrequest
 #define	nd6_setdefaultiface _bsd_nd6_setdefaultiface
 #define	nd6_setmtu _bsd_nd6_setmtu
-#define	nd6_storelladdr _bsd_nd6_storelladdr
 #define	nd6_timer _bsd_nd6_timer
 #define	nd6_timer_ch _bsd_nd6_timer_ch
 #define	nd_defrouter _bsd_nd_defrouter
@@ -2067,44 +2248,13 @@
 #define	ng_ipfw_input_p _bsd_ng_ipfw_input_p
 #define	norule_counter _bsd_norule_counter
 #define	nousrreqs _bsd_nousrreqs
+#define	nptv6_init _bsd_nptv6_init
+#define	nptv6_uninit _bsd_nptv6_uninit
 #define	null_class _bsd_null_class
 #define	null_filtops _bsd_null_filtops
-#define	num_cam_status_entries _bsd_num_cam_status_entries
-#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_enter _bsd_OF_enter
-#define	OF_exit _bsd_OF_exit
-#define	OF_finddevice _bsd_OF_finddevice
-#define	OF_getprop _bsd_OF_getprop
-#define	OF_getprop_alloc _bsd_OF_getprop_alloc
-#define	OF_getproplen _bsd_OF_getproplen
-#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_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_read _bsd_OF_read
-#define	OF_release _bsd_OF_release
-#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	ohci_bus_methods _bsd_ohci_bus_methods
+#define	nullop _bsd_nullop
+#define	number_array _bsd_number_array
 #define	ohci_detach _bsd_ohci_detach
-#define	ohci_device_bulk_methods _bsd_ohci_device_bulk_methods
-#define	ohci_device_ctrl_methods _bsd_ohci_device_ctrl_methods
-#define	ohci_device_intr_methods _bsd_ohci_device_intr_methods
-#define	ohci_device_isoc_methods _bsd_ohci_device_isoc_methods
 #define	ohci_init _bsd_ohci_init
 #define	ohci_interrupt _bsd_ohci_interrupt
 #define	ohci_iterate_hw_softc _bsd_ohci_iterate_hw_softc
@@ -2112,17 +2262,27 @@
 #define	osd_del _bsd_osd_del
 #define	osd_deregister _bsd_osd_deregister
 #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	page_heap_mtx _bsd_page_heap_mtx
 #define	panic _bsd_panic
+#define	parse_uuid _bsd_parse_uuid
+#define	pause_sbt _bsd_pause_sbt
 #define	pci_activate_resource _bsd_pci_activate_resource
+#define	pci_add_bar _bsd_pci_add_bar
 #define	pci_add_child _bsd_pci_add_child
 #define	pci_add_children _bsd_pci_add_children
 #define	pci_add_resources _bsd_pci_add_resources
+#define	pci_add_resources_ea _bsd_pci_add_resources_ea
+#define	pci_alloc_devinfo_method _bsd_pci_alloc_devinfo_method
 #define	pci_alloc_msi_method _bsd_pci_alloc_msi_method
 #define	pci_alloc_msix_method _bsd_pci_alloc_msix_method
+#define	pci_alloc_multi_resource _bsd_pci_alloc_multi_resource
 #define	pci_alloc_resource _bsd_pci_alloc_resource
 #define	pci_assign_interrupt_method _bsd_pci_assign_interrupt_method
 #define	pci_attach_common _bsd_pci_attach_common
@@ -2131,17 +2291,19 @@
 #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_detach _bsd_pcib_detach
 #define	pcib_driver _bsd_pcib_driver
 #define	pcibios_pcib_route_interrupt _bsd_pcibios_pcib_route_interrupt
 #define	pcib_map_msi _bsd_pcib_map_msi
 #define	pcib_maxslots _bsd_pcib_maxslots
-#define	pcib_read_config _bsd_pcib_read_config
 #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_route_interrupt _bsd_pcib_route_interrupt
-#define	pcib_write_config _bsd_pcib_write_config
 #define	pcib_write_ivar _bsd_pcib_write_ivar
 #define	pcicdev _bsd_pcicdev
 #define	pci_cfgregopen _bsd_pci_cfgregopen
@@ -2149,68 +2311,85 @@
 #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
 #define	pci_child_location_str_method _bsd_pci_child_location_str_method
 #define	pci_child_pnpinfo_str_method _bsd_pci_child_pnpinfo_str_method
 #define	pci_deactivate_resource _bsd_pci_deactivate_resource
-#define	pci_delete_child _bsd_pci_delete_child
 #define	pci_delete_resource _bsd_pci_delete_resource
 #define	pci_devq _bsd_pci_devq
 #define	pci_disable_busmaster_method _bsd_pci_disable_busmaster_method
 #define	pci_disable_io_method _bsd_pci_disable_io_method
+#define	pci_disable_msi_method _bsd_pci_disable_msi_method
 #define	pci_do_power_resume _bsd_pci_do_power_resume
 #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	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_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
+#define	pci_find_cap_method _bsd_pci_find_cap_method
 #define	pci_find_class _bsd_pci_find_class
 #define	pci_find_dbsf _bsd_pci_find_dbsf
 #define	pci_find_extcap_method _bsd_pci_find_extcap_method
+#define	pci_find_htcap_method _bsd_pci_find_htcap_method
+#define	pci_find_pcie_root_port _bsd_pci_find_pcie_root_port
 #define	pci_freecfg _bsd_pci_freecfg
 #define	pci_generation _bsd_pci_generation
+#define	pci_get_dma_tag _bsd_pci_get_dma_tag
+#define	pci_get_max_payload _bsd_pci_get_max_payload
 #define	pci_get_max_read_req _bsd_pci_get_max_read_req
 #define	pci_get_powerstate_method _bsd_pci_get_powerstate_method
 #define	pci_get_resource_list _bsd_pci_get_resource_list
 #define	pci_get_vpd_ident_method _bsd_pci_get_vpd_ident_method
 #define	pci_get_vpd_readonly_method _bsd_pci_get_vpd_readonly_method
 #define	pci_ht_map_msi _bsd_pci_ht_map_msi
+#define	pci_mapsize _bsd_pci_mapsize
 #define	pci_msi_count_method _bsd_pci_msi_count_method
 #define	pci_msi_device_blacklisted _bsd_pci_msi_device_blacklisted
 #define	pci_msix_count_method _bsd_pci_msix_count_method
 #define	pci_msix_device_blacklisted _bsd_pci_msix_device_blacklisted
+#define	pci_msix_pba_bar_method _bsd_pci_msix_pba_bar_method
+#define	pci_msix_table_bar_method _bsd_pci_msix_table_bar_method
 #define	pci_numdevs _bsd_pci_numdevs
 #define	pci_pending_msix _bsd_pci_pending_msix
 #define	pci_print_child _bsd_pci_print_child
 #define	pci_print_verbose _bsd_pci_print_verbose
 #define	pci_probe_nomatch _bsd_pci_probe_nomatch
+#define	pci_read_bar _bsd_pci_read_bar
 #define	pci_read_config_method _bsd_pci_read_config_method
 #define	pci_read_device _bsd_pci_read_device
 #define	pci_read_ivar _bsd_pci_read_ivar
 #define	pci_release_msi_method _bsd_pci_release_msi_method
 #define	pci_release_resource _bsd_pci_release_resource
 #define	pci_remap_msix_method _bsd_pci_remap_msix_method
+#define	pci_rescan_method _bsd_pci_rescan_method
 #define	pci_restore_state _bsd_pci_restore_state
 #define	pci_resume _bsd_pci_resume
+#define	pci_resume_child _bsd_pci_resume_child
 #define	pci_save_state _bsd_pci_save_state
 #define	pci_set_max_read_req _bsd_pci_set_max_read_req
 #define	pci_set_powerstate_method _bsd_pci_set_powerstate_method
 #define	pci_setup_intr _bsd_pci_setup_intr
-#define	pci_suspend _bsd_pci_suspend
+#define	pci_suspend_child _bsd_pci_suspend_child
 #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	pcpu_entry_epair_dpcpu _bsd_pcpu_entry_epair_dpcpu
-#define	pf_addr_copyout _bsd_pf_addr_copyout
+#define	pcpu_zone_64 _bsd_pcpu_zone_64
+#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_addr_setup _bsd_pf_addr_setup
-#define	pf_addr_wrap_neq _bsd_pf_addr_wrap_neq
-#define	pf_add_threshold _bsd_pf_add_threshold
-#define	pf_alloc_state_key _bsd_pf_alloc_state_key
-#define	pf_altq_pl _bsd_pf_altq_pl
 #define	pf_altqs _bsd_pf_altqs
 #define	pf_altqs_active _bsd_pf_altqs_active
 #define	pf_altqs_inactive _bsd_pf_altqs_inactive
@@ -2236,227 +2415,146 @@
 #define	pf_anchor_remove _bsd_pf_anchor_remove
 #define	pf_anchors _bsd_pf_anchors
 #define	pf_anchor_setup _bsd_pf_anchor_setup
-#define	pf_anchor_stack _bsd_pf_anchor_stack
-#define	pfattach _bsd_pfattach
-#define	pf_begin_rules _bsd_pf_begin_rules
-#define	pf_cache_pl _bsd_pf_cache_pl
-#define	pf_cachequeue _bsd_pf_cachequeue
-#define	pf_cache_tree _bsd_pf_cache_tree
-#define	pf_calc_mss _bsd_pf_calc_mss
 #define	pf_calc_skip_steps _bsd_pf_calc_skip_steps
-#define	pf_cent_pl _bsd_pf_cent_pl
 #define	pf_change_a _bsd_pf_change_a
-#define	pf_change_a6 _bsd_pf_change_a6
-#define	pf_change_ap _bsd_pf_change_ap
-#define	pf_change_icmp _bsd_pf_change_icmp
-#define	pf_check_congestion _bsd_pf_check_congestion
-#define	pf_check_proto_cksum _bsd_pf_check_proto_cksum
-#define	pf_check_threshold _bsd_pf_check_threshold
+#define	pf_change_proto_a _bsd_pf_change_proto_a
 #define	pf_cksum_fixup _bsd_pf_cksum_fixup
-#define	pf_commit_rules _bsd_pf_commit_rules
-#define	pf_compare_state_keys _bsd_pf_compare_state_keys
-#define	pf_consistency_lock _bsd_pf_consistency_lock
+#define	pf_cleanup _bsd_pf_cleanup
 #define	pfctlinput _bsd_pfctlinput
 #define	pfctlinput2 _bsd_pfctlinput2
 #define	pf_default_rule _bsd_pf_default_rule
-#define	pf_detach_state _bsd_pf_detach_state
 #define	pf_dev _bsd_pf_dev
-#define	pf_empty_pool _bsd_pf_empty_pool
 #define	pf_end_threads _bsd_pf_end_threads
-#define	pf_find_anchor _bsd_pf_find_anchor
-#define	pf_find_fragment _bsd_pf_find_fragment
+#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_state _bsd_pf_find_state
+#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_flush_fragments _bsd_pf_flush_fragments
-#define	pf_fragcache _bsd_pf_fragcache
-#define	pf_frag_pl _bsd_pf_frag_pl
-#define	pf_fragqueue _bsd_pf_fragqueue
-#define	pf_frag_tree _bsd_pf_frag_tree
 #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_INSERT_COLOR _bsd_pf_frag_tree_RB_INSERT_COLOR
 #define	pf_frag_tree_RB_MINMAX _bsd_pf_frag_tree_RB_MINMAX
 #define	pf_frag_tree_RB_NEXT _bsd_pf_frag_tree_RB_NEXT
 #define	pf_frag_tree_RB_NFIND _bsd_pf_frag_tree_RB_NFIND
 #define	pf_frag_tree_RB_PREV _bsd_pf_frag_tree_RB_PREV
 #define	pf_frag_tree_RB_REMOVE _bsd_pf_frag_tree_RB_REMOVE
 #define	pf_frag_tree_RB_REMOVE_COLOR _bsd_pf_frag_tree_RB_REMOVE_COLOR
-#define	pf_free_fragment _bsd_pf_free_fragment
+#define	pf_free_rule _bsd_pf_free_rule
+#define	pf_free_src_nodes _bsd_pf_free_src_nodes
 #define	pf_free_state _bsd_pf_free_state
-#define	pf_frent_pl _bsd_pf_frent_pl
-#define	pf_get_mss _bsd_pf_get_mss
-#define	pf_get_pool _bsd_pf_get_pool
+#define	pf_get_mtag _bsd_pf_get_mtag
 #define	pf_get_ruleset_number _bsd_pf_get_ruleset_number
-#define	pf_get_sport _bsd_pf_get_sport
 #define	pf_get_translation _bsd_pf_get_translation
-#define	pf_get_wscale _bsd_pf_get_wscale
-#define	pf_hash _bsd_pf_hash
-#define	pf_hash_rule _bsd_pf_hash_rule
-#define	pf_hash_rule_addr _bsd_pf_hash_rule_addr
-#define	pfi_address_add _bsd_pfi_address_add
-#define	pfi_addr_pl _bsd_pfi_addr_pl
+#define	pf_hashmask _bsd_pf_hashmask
+#define	pf_hashseed _bsd_pf_hashseed
 #define	pfi_all _bsd_pfi_all
 #define	pfi_attach_cookie _bsd_pfi_attach_cookie
 #define	pfi_attach_group_cookie _bsd_pfi_attach_group_cookie
-#define	pfi_attach_group_event _bsd_pfi_attach_group_event
-#define	pfi_attach_ifgroup _bsd_pfi_attach_ifgroup
-#define	pfi_attach_ifnet _bsd_pfi_attach_ifnet
-#define	pfi_attach_ifnet_event _bsd_pfi_attach_ifnet_event
-#define	pfi_buffer _bsd_pfi_buffer
-#define	pfi_buffer_cnt _bsd_pfi_buffer_cnt
-#define	pfi_buffer_max _bsd_pfi_buffer_max
 #define	pfi_change_group_cookie _bsd_pfi_change_group_cookie
-#define	pfi_change_group_event _bsd_pfi_change_group_event
 #define	pfi_cleanup _bsd_pfi_cleanup
+#define	pfi_cleanup_vnet _bsd_pfi_cleanup_vnet
 #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	pfi_detach_group_event _bsd_pfi_detach_group_event
-#define	pfi_detach_ifgroup _bsd_pfi_detach_ifgroup
-#define	pfi_detach_ifnet _bsd_pfi_detach_ifnet
-#define	pfi_detach_ifnet_event _bsd_pfi_detach_ifnet_event
+#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
-#define	pfi_dynaddr_update _bsd_pfi_dynaddr_update
 #define	pfi_get_ifaces _bsd_pfi_get_ifaces
-#define	pfi_group_change _bsd_pfi_group_change
-#define	pfi_ifaddr_event _bsd_pfi_ifaddr_event
 #define	pfi_ifaddr_event_cookie _bsd_pfi_ifaddr_event_cookie
-#define	pfi_if_compare _bsd_pfi_if_compare
 #define	pfi_ifhead_RB_FIND _bsd_pfi_ifhead_RB_FIND
 #define	pfi_ifhead_RB_INSERT _bsd_pfi_ifhead_RB_INSERT
-#define	pfi_ifhead_RB_INSERT_COLOR _bsd_pfi_ifhead_RB_INSERT_COLOR
 #define	pfi_ifhead_RB_MINMAX _bsd_pfi_ifhead_RB_MINMAX
 #define	pfi_ifhead_RB_NEXT _bsd_pfi_ifhead_RB_NEXT
 #define	pfi_ifhead_RB_NFIND _bsd_pfi_ifhead_RB_NFIND
 #define	pfi_ifhead_RB_PREV _bsd_pfi_ifhead_RB_PREV
 #define	pfi_ifhead_RB_REMOVE _bsd_pfi_ifhead_RB_REMOVE
 #define	pfi_ifhead_RB_REMOVE_COLOR _bsd_pfi_ifhead_RB_REMOVE_COLOR
-#define	pfi_ifs _bsd_pfi_ifs
 #define	pfi_initialize _bsd_pfi_initialize
-#define	pfi_instance_add _bsd_pfi_instance_add
-#define	pfi_kifaddr_update _bsd_pfi_kifaddr_update
-#define	pfi_kif_get _bsd_pfi_kif_get
+#define	pfi_initialize_vnet _bsd_pfi_initialize_vnet
+#define	pfi_kif_attach _bsd_pfi_kif_attach
+#define	pfi_kif_find _bsd_pfi_kif_find
 #define	pfi_kif_match _bsd_pfi_kif_match
+#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_kif_update _bsd_pfi_kif_update
 #define	pfil_add_hook _bsd_pfil_add_hook
 #define	pfil_head_get _bsd_pfil_head_get
 #define	pfil_head_list _bsd_pfil_head_list
 #define	pfil_head_register _bsd_pfil_head_register
 #define	pfil_head_unregister _bsd_pfil_head_unregister
+#define	pfil_lock _bsd_pfil_lock
 #define	pfil_remove_hook _bsd_pfil_remove_hook
+#define	pfil_rlock _bsd_pfil_rlock
 #define	pfil_run_hooks _bsd_pfil_run_hooks
+#define	pfil_runlock _bsd_pfil_runlock
+#define	pfil_try_rlock _bsd_pfil_try_rlock
+#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_init_threshold _bsd_pf_init_threshold
-#define	pf_insert_src_node _bsd_pf_insert_src_node
-#define	pfioctl _bsd_pfioctl
-#define	pf_ip2key _bsd_pf_ip2key
+#define	pf_intr _bsd_pf_intr
+#define	pf_ioctl_lock _bsd_pf_ioctl_lock
 #define	pfi_set_flags _bsd_pfi_set_flags
-#define	pfi_skip_if _bsd_pfi_skip_if
-#define	pfi_table_update _bsd_pfi_table_update
-#define	pfi_unmask _bsd_pfi_unmask
-#define	pfi_update _bsd_pfi_update
 #define	pfi_update_status _bsd_pfi_update_status
-#define	pflogattach _bsd_pflogattach
-#define	pflog_cloner _bsd_pflog_cloner
-#define	pflog_cloner_data _bsd_pflog_cloner_data
-#define	pflogif_list _bsd_pflogif_list
+#define	pf_keyhash _bsd_pf_keyhash
+#define	pf_limits _bsd_pf_limits
 #define	pflogifs _bsd_pflogifs
-#define	pflogioctl _bsd_pflogioctl
-#define	pflogoutput _bsd_pflogoutput
-#define	pflog_packet _bsd_pflog_packet
 #define	pflog_packet_ptr _bsd_pflog_packet_ptr
-#define	pflogstart _bsd_pflogstart
 #define	pf_main_anchor _bsd_pf_main_anchor
 #define	pf_map_addr _bsd_pf_map_addr
-#define	pf_match _bsd_pf_match
 #define	pf_match_addr _bsd_pf_match_addr
 #define	pf_match_addr_range _bsd_pf_match_addr_range
-#define	pf_match_gid _bsd_pf_match_gid
 #define	pf_match_port _bsd_pf_match_port
 #define	pf_match_tag _bsd_pf_match_tag
-#define	pf_match_translation _bsd_pf_match_translation
-#define	pf_match_uid _bsd_pf_match_uid
-#define	pf_modulate_sack _bsd_pf_modulate_sack
-#define	pf_mv_pool _bsd_pf_mv_pool
-#define	pf_ncache _bsd_pf_ncache
-#define	pf_nfrents _bsd_pf_nfrents
+#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_tcpopt _bsd_pf_normalize_tcpopt
 #define	pf_normalize_tcp_stateful _bsd_pf_normalize_tcp_stateful
 #define	pf_osfp_add _bsd_pf_osfp_add
-#define	pf_osfp_cleanup _bsd_pf_osfp_cleanup
-#define	pf_osfp_find _bsd_pf_osfp_find
-#define	pf_osfp_find_exact _bsd_pf_osfp_find_exact
 #define	pf_osfp_fingerprint _bsd_pf_osfp_fingerprint
-#define	pf_osfp_fingerprint_hdr _bsd_pf_osfp_fingerprint_hdr
 #define	pf_osfp_flush _bsd_pf_osfp_flush
 #define	pf_osfp_get _bsd_pf_osfp_get
-#define	pf_osfp_initialize _bsd_pf_osfp_initialize
-#define	pf_osfp_insert _bsd_pf_osfp_insert
-#define	pf_osfp_list _bsd_pf_osfp_list
 #define	pf_osfp_match _bsd_pf_osfp_match
-#define	pf_osfp_validate _bsd_pf_osfp_validate
 #define	pf_pabuf _bsd_pf_pabuf
-#define	pf_pkt_addr_changed _bsd_pf_pkt_addr_changed
-#define	pf_pooladdr_pl _bsd_pf_pooladdr_pl
-#define	pf_pool_limits _bsd_pf_pool_limits
 #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_print_state_parts _bsd_pf_print_state_parts
+#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_expired_states _bsd_pf_purge_expired_states
 #define	pf_purge_thread _bsd_pf_purge_thread
 #define	pf_qids _bsd_pf_qids
 #define	pfr_add_addrs _bsd_pfr_add_addrs
 #define	pfr_add_tables _bsd_pfr_add_tables
 #define	pfr_attach_table _bsd_pfr_attach_table
-#define	pfr_clean_node_mask _bsd_pfr_clean_node_mask
+#define	pfr_cleanup _bsd_pfr_cleanup
 #define	pfr_clr_addrs _bsd_pfr_clr_addrs
 #define	pfr_clr_astats _bsd_pfr_clr_astats
 #define	pfr_clr_tables _bsd_pfr_clr_tables
 #define	pfr_clr_tstats _bsd_pfr_clr_tstats
-#define	pfr_clstats_kentries _bsd_pfr_clstats_kentries
-#define	pfr_clstats_ktable _bsd_pfr_clstats_ktable
-#define	pfr_clstats_ktables _bsd_pfr_clstats_ktables
-#define	pfr_commit_ktable _bsd_pfr_commit_ktable
-#define	pfr_copyout_addr _bsd_pfr_copyout_addr
-#define	pfr_create_kentry _bsd_pfr_create_kentry
-#define	pfr_create_ktable _bsd_pfr_create_ktable
 #define	pfr_del_addrs _bsd_pfr_del_addrs
 #define	pfr_del_tables _bsd_pfr_del_tables
-#define	pfr_destroy_kentries _bsd_pfr_destroy_kentries
-#define	pfr_destroy_kentry _bsd_pfr_destroy_kentry
-#define	pfr_destroy_ktable _bsd_pfr_destroy_ktable
-#define	pfr_destroy_ktables _bsd_pfr_destroy_ktables
 #define	pfr_detach_table _bsd_pfr_detach_table
 #define	pfr_dynaddr_update _bsd_pfr_dynaddr_update
-#define	pf_reassemble _bsd_pf_reassemble
-#define	pf_remove_fragment _bsd_pf_remove_fragment
+#define	pf_refragment6 _bsd_pf_refragment6
 #define	pf_remove_if_empty_ruleset _bsd_pf_remove_if_empty_ruleset
-#define	pfr_enqueue_addrs _bsd_pfr_enqueue_addrs
-#define	pfr_ffaddr _bsd_pfr_ffaddr
-#define	pfr_fix_anchor _bsd_pfr_fix_anchor
 #define	pfr_get_addrs _bsd_pfr_get_addrs
 #define	pfr_get_astats _bsd_pfr_get_astats
 #define	pfr_get_tables _bsd_pfr_get_tables
@@ -2466,209 +2564,75 @@
 #define	pfr_ina_define _bsd_pfr_ina_define
 #define	pfr_ina_rollback _bsd_pfr_ina_rollback
 #define	pfr_initialize _bsd_pfr_initialize
-#define	pfr_insert_kentries _bsd_pfr_insert_kentries
 #define	pfr_insert_kentry _bsd_pfr_insert_kentry
-#define	pfr_insert_ktable _bsd_pfr_insert_ktable
-#define	pfr_insert_ktables _bsd_pfr_insert_ktables
-#define	pfr_kcounters_pl _bsd_pfr_kcounters_pl
-#define	pfr_kentry_byidx _bsd_pfr_kentry_byidx
-#define	pfr_kentry_pl _bsd_pfr_kentry_pl
 #define	pfr_ktable_cnt _bsd_pfr_ktable_cnt
-#define	pfr_ktable_compare _bsd_pfr_ktable_compare
 #define	pfr_ktablehead_RB_FIND _bsd_pfr_ktablehead_RB_FIND
 #define	pfr_ktablehead_RB_INSERT _bsd_pfr_ktablehead_RB_INSERT
-#define	pfr_ktablehead_RB_INSERT_COLOR _bsd_pfr_ktablehead_RB_INSERT_COLOR
 #define	pfr_ktablehead_RB_MINMAX _bsd_pfr_ktablehead_RB_MINMAX
 #define	pfr_ktablehead_RB_NEXT _bsd_pfr_ktablehead_RB_NEXT
 #define	pfr_ktablehead_RB_NFIND _bsd_pfr_ktablehead_RB_NFIND
 #define	pfr_ktablehead_RB_PREV _bsd_pfr_ktablehead_RB_PREV
 #define	pfr_ktablehead_RB_REMOVE _bsd_pfr_ktablehead_RB_REMOVE
 #define	pfr_ktablehead_RB_REMOVE_COLOR _bsd_pfr_ktablehead_RB_REMOVE_COLOR
-#define	pfr_ktable_pl _bsd_pfr_ktable_pl
 #define	pfr_ktables _bsd_pfr_ktables
-#define	pfr_lookup_addr _bsd_pfr_lookup_addr
-#define	pfr_lookup_table _bsd_pfr_lookup_table
-#define	pfr_mark_addrs _bsd_pfr_mark_addrs
-#define	pfr_mask _bsd_pfr_mask
 #define	pfr_match_addr _bsd_pfr_match_addr
-#define	pf_rm_rule _bsd_pf_rm_rule
 #define	pfr_nulltable _bsd_pfr_nulltable
-#define	pf_rollback_rules _bsd_pf_rollback_rules
 #define	pf_routable _bsd_pf_routable
-#define	pf_route _bsd_pf_route
-#define	pf_route6 _bsd_pf_route6
 #define	pfr_pool_get _bsd_pfr_pool_get
-#define	pfr_prepare_network _bsd_pfr_prepare_network
-#define	pfr_remove_kentries _bsd_pfr_remove_kentries
-#define	pfr_reset_feedback _bsd_pfr_reset_feedback
-#define	pfr_route_kentry _bsd_pfr_route_kentry
 #define	pfr_set_addrs _bsd_pfr_set_addrs
-#define	pfr_setflags_ktable _bsd_pfr_setflags_ktable
-#define	pfr_setflags_ktables _bsd_pfr_setflags_ktables
 #define	pfr_set_tflags _bsd_pfr_set_tflags
-#define	pfr_sin _bsd_pfr_sin
-#define	pfr_sin6 _bsd_pfr_sin6
-#define	pfr_skip_table _bsd_pfr_skip_table
-#define	pfr_table_count _bsd_pfr_table_count
-#define	pf_rtlabel_add _bsd_pf_rtlabel_add
-#define	pf_rtlabel_copyout _bsd_pf_rtlabel_copyout
-#define	pf_rtlabel_match _bsd_pf_rtlabel_match
-#define	pf_rtlabel_remove _bsd_pf_rtlabel_remove
 #define	pfr_tst_addrs _bsd_pfr_tst_addrs
-#define	pf_rule_pl _bsd_pf_rule_pl
-#define	pfr_unroute_kentry _bsd_pfr_unroute_kentry
+#define	pf_rules_lock _bsd_pf_rules_lock
 #define	pfr_update_stats _bsd_pfr_update_stats
-#define	pfr_validate_addr _bsd_pfr_validate_addr
-#define	pfr_validate_table _bsd_pfr_validate_table
-#define	pfr_walktree _bsd_pfr_walktree
-#define	pf_scrub_ip _bsd_pf_scrub_ip
-#define	pf_scrub_ip6 _bsd_pf_scrub_ip6
-#define	pf_send_tcp _bsd_pf_send_tcp
-#define	pf_set_rt_ifp _bsd_pf_set_rt_ifp
-#define	pf_setup_pfsync_matching _bsd_pf_setup_pfsync_matching
 #define	pf_socket_lookup _bsd_pf_socket_lookup
-#define	pf_src_connlimit _bsd_pf_src_connlimit
-#define	pf_src_tree_pl _bsd_pf_src_tree_pl
-#define	pf_src_tree_RB_FIND _bsd_pf_src_tree_RB_FIND
-#define	pf_src_tree_RB_INSERT _bsd_pf_src_tree_RB_INSERT
-#define	pf_src_tree_RB_INSERT_COLOR _bsd_pf_src_tree_RB_INSERT_COLOR
-#define	pf_src_tree_RB_MINMAX _bsd_pf_src_tree_RB_MINMAX
-#define	pf_src_tree_RB_NEXT _bsd_pf_src_tree_RB_NEXT
-#define	pf_src_tree_RB_NFIND _bsd_pf_src_tree_RB_NFIND
-#define	pf_src_tree_RB_PREV _bsd_pf_src_tree_RB_PREV
-#define	pf_src_tree_RB_REMOVE _bsd_pf_src_tree_RB_REMOVE
-#define	pf_src_tree_RB_REMOVE_COLOR _bsd_pf_src_tree_RB_REMOVE_COLOR
-#define	pf_src_tree_remove_state _bsd_pf_src_tree_remove_state
+#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_item_pl _bsd_pf_state_item_pl
-#define	pf_state_key_attach _bsd_pf_state_key_attach
-#define	pf_state_key_detach _bsd_pf_state_key_detach
-#define	pf_state_key_pl _bsd_pf_state_key_pl
+#define	pf_state_key_clone _bsd_pf_state_key_clone
 #define	pf_state_key_setup _bsd_pf_state_key_setup
-#define	pf_state_pl _bsd_pf_state_pl
-#define	pf_state_scrub_pl _bsd_pf_state_scrub_pl
-#define	pf_statetbl _bsd_pf_statetbl
-#define	pf_state_tree_id_RB_FIND _bsd_pf_state_tree_id_RB_FIND
-#define	pf_state_tree_id_RB_INSERT _bsd_pf_state_tree_id_RB_INSERT
-#define	pf_state_tree_id_RB_INSERT_COLOR _bsd_pf_state_tree_id_RB_INSERT_COLOR
-#define	pf_state_tree_id_RB_MINMAX _bsd_pf_state_tree_id_RB_MINMAX
-#define	pf_state_tree_id_RB_NEXT _bsd_pf_state_tree_id_RB_NEXT
-#define	pf_state_tree_id_RB_NFIND _bsd_pf_state_tree_id_RB_NFIND
-#define	pf_state_tree_id_RB_PREV _bsd_pf_state_tree_id_RB_PREV
-#define	pf_state_tree_id_RB_REMOVE _bsd_pf_state_tree_id_RB_REMOVE
-#define	pf_state_tree_id_RB_REMOVE_COLOR _bsd_pf_state_tree_id_RB_REMOVE_COLOR
-#define	pf_state_tree_RB_FIND _bsd_pf_state_tree_RB_FIND
-#define	pf_state_tree_RB_INSERT _bsd_pf_state_tree_RB_INSERT
-#define	pf_state_tree_RB_INSERT_COLOR _bsd_pf_state_tree_RB_INSERT_COLOR
-#define	pf_state_tree_RB_MINMAX _bsd_pf_state_tree_RB_MINMAX
-#define	pf_state_tree_RB_NEXT _bsd_pf_state_tree_RB_NEXT
-#define	pf_state_tree_RB_NFIND _bsd_pf_state_tree_RB_NFIND
-#define	pf_state_tree_RB_PREV _bsd_pf_state_tree_RB_PREV
-#define	pf_state_tree_RB_REMOVE _bsd_pf_state_tree_RB_REMOVE
-#define	pf_state_tree_RB_REMOVE_COLOR _bsd_pf_state_tree_RB_REMOVE_COLOR
+#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	pfsync_acts _bsd_pfsync_acts
-#define	pfsync_alloc_scrub_memory _bsd_pfsync_alloc_scrub_memory
-#define	pfsyncattach _bsd_pfsyncattach
-#define	pfsync_bulk_fail _bsd_pfsync_bulk_fail
-#define	pfsync_bulk_start _bsd_pfsync_bulk_start
-#define	pfsync_bulk_status _bsd_pfsync_bulk_status
-#define	pfsync_bulk_update _bsd_pfsync_bulk_update
-#define	pfsync_clear_states _bsd_pfsync_clear_states
+#define	pf_swi_cookie _bsd_pf_swi_cookie
 #define	pfsync_clear_states_ptr _bsd_pfsync_clear_states_ptr
-#define	pfsync_clone_create _bsd_pfsync_clone_create
-#define	pfsync_clone_destroy _bsd_pfsync_clone_destroy
 #define	pfsync_cloner _bsd_pfsync_cloner
-#define	pfsync_cloner_data _bsd_pfsync_cloner_data
-#define	pfsync_defer _bsd_pfsync_defer
 #define	pfsync_defer_ptr _bsd_pfsync_defer_ptr
-#define	pfsync_deferred _bsd_pfsync_deferred
-#define	pfsync_defer_tmo _bsd_pfsync_defer_tmo
-#define	pfsync_delete_state _bsd_pfsync_delete_state
 #define	pfsync_delete_state_ptr _bsd_pfsync_delete_state_ptr
-#define	pfsync_drop _bsd_pfsync_drop
-#define	pfsync_if_dequeue _bsd_pfsync_if_dequeue
-#define	pfsync_in_bus _bsd_pfsync_in_bus
-#define	pfsync_in_clr _bsd_pfsync_in_clr
-#define	pfsync_in_del _bsd_pfsync_in_del
-#define	pfsync_in_del_c _bsd_pfsync_in_del_c
-#define	pfsync_in_eof _bsd_pfsync_in_eof
-#define	pfsync_in_error _bsd_pfsync_in_error
-#define	pfsync_in_iack _bsd_pfsync_in_iack
-#define	pfsync_in_ins _bsd_pfsync_in_ins
-#define	pfsync_input _bsd_pfsync_input
-#define	pfsync_insert_state _bsd_pfsync_insert_state
 #define	pfsync_insert_state_ptr _bsd_pfsync_insert_state_ptr
-#define	pfsync_in_tdb _bsd_pfsync_in_tdb
-#define	pfsync_ints _bsd_pfsync_ints
-#define	pfsync_in_upd _bsd_pfsync_in_upd
-#define	pfsync_in_upd_c _bsd_pfsync_in_upd_c
-#define	pfsync_in_ureq _bsd_pfsync_in_ureq
-#define	pfsyncioctl _bsd_pfsyncioctl
-#define	pfsync_out_del _bsd_pfsync_out_del
-#define	pfsync_out_iack _bsd_pfsync_out_iack
-#define	pfsyncoutput _bsd_pfsyncoutput
-#define	pfsync_out_state _bsd_pfsync_out_state
-#define	pfsync_out_upd_c _bsd_pfsync_out_upd_c
-#define	pfsync_q_del _bsd_pfsync_q_del
-#define	pfsync_q_ins _bsd_pfsync_q_ins
-#define	pfsync_qs _bsd_pfsync_qs
-#define	pfsync_request_update _bsd_pfsync_request_update
-#define	pfsync_sendout _bsd_pfsync_sendout
-#define	pfsync_send_plus _bsd_pfsync_send_plus
-#define	pfsyncstart _bsd_pfsyncstart
 #define	pfsync_state_export _bsd_pfsync_state_export
-#define	pfsync_state_import _bsd_pfsync_state_import
 #define	pfsync_state_import_ptr _bsd_pfsync_state_import_ptr
-#define	pfsync_state_in_use _bsd_pfsync_state_in_use
-#define	pfsync_state_in_use_ptr _bsd_pfsync_state_in_use_ptr
-#define	pfsync_sysctl _bsd_pfsync_sysctl
-#define	pfsync_timeout _bsd_pfsync_timeout
-#define	pfsync_tmos _bsd_pfsync_tmos
-#define	pfsync_undefer _bsd_pfsync_undefer
-#define	pfsync_up _bsd_pfsync_up
-#define	pfsync_update_state _bsd_pfsync_update_state
 #define	pfsync_update_state_ptr _bsd_pfsync_update_state_ptr
-#define	pfsync_update_state_req _bsd_pfsync_update_state_req
-#define	pfsync_upds _bsd_pfsync_upds
-#define	pfsync_upd_tcp _bsd_pfsync_upd_tcp
-#define	pfsync_up_ptr _bsd_pfsync_up_ptr
-#define	pf_tag2tagname _bsd_pf_tag2tagname
-#define	pf_tagname2tag _bsd_pf_tagname2tag
 #define	pf_tag_packet _bsd_pf_tag_packet
-#define	pf_tag_ref _bsd_pf_tag_ref
 #define	pf_tags _bsd_pf_tags
-#define	pf_tag_unref _bsd_pf_tag_unref
-#define	pf_task_mtx _bsd_pf_task_mtx
-#define	pf_tbladdr_copyout _bsd_pf_tbladdr_copyout
-#define	pf_tbladdr_remove _bsd_pf_tbladdr_remove
-#define	pf_tbladdr_setup _bsd_pf_tbladdr_setup
-#define	pf_tcp_iss _bsd_pf_tcp_iss
 #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_tcp_track_full _bsd_pf_tcp_track_full
-#define	pf_tcp_track_sloppy _bsd_pf_tcp_track_sloppy
 #define	pf_test _bsd_pf_test
 #define	pf_test6 _bsd_pf_test6
-#define	pf_test_fragment _bsd_pf_test_fragment
-#define	pf_test_rule _bsd_pf_test_rule
-#define	pf_test_state_icmp _bsd_pf_test_state_icmp
-#define	pf_test_state_other _bsd_pf_test_state_other
-#define	pf_test_state_tcp _bsd_pf_test_state_tcp
-#define	pf_test_state_udp _bsd_pf_test_state_udp
+#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	pgsigio _bsd_pgsigio
 #define	phashinit _bsd_phashinit
+#define	phashinit_flags _bsd_phashinit_flags
 #define	pim6_input _bsd_pim6_input
 #define	pim_input _bsd_pim_input
+#define	pipe_dtor _bsd_pipe_dtor
+#define	pipe_named_ctor _bsd_pipe_named_ctor
+#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	ppsratecheck _bsd_ppsratecheck
 #define	prelist_remove _bsd_prelist_remove
 #define	preload_addr_relocate _bsd_preload_addr_relocate
@@ -2682,6 +2646,7 @@
 #define	preload_search_info _bsd_preload_search_info
 #define	preload_search_next_name _bsd_preload_search_next_name
 #define	printf _bsd_printf
+#define	printf_uuid _bsd_printf_uuid
 #define	prison0 _bsd_prison0
 #define	prison_check _bsd_prison_check
 #define	prison_check_af _bsd_prison_check_af
@@ -2702,9 +2667,12 @@
 #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_connect2_notsupp _bsd_pru_connect2_notsupp
+#define	pru_connectat_notsupp _bsd_pru_connectat_notsupp
 #define	pru_connect_notsupp _bsd_pru_connect_notsupp
 #define	pru_control_notsupp _bsd_pru_control_notsupp
 #define	pru_disconnect_notsupp _bsd_pru_disconnect_notsupp
@@ -2712,6 +2680,7 @@
 #define	pru_peeraddr_notsupp _bsd_pru_peeraddr_notsupp
 #define	pru_rcvd_notsupp _bsd_pru_rcvd_notsupp
 #define	pru_rcvoob_notsupp _bsd_pru_rcvoob_notsupp
+#define	pru_ready_notsupp _bsd_pru_ready_notsupp
 #define	pru_send_notsupp _bsd_pru_send_notsupp
 #define	pru_sense_null _bsd_pru_sense_null
 #define	pru_shutdown_notsupp _bsd_pru_shutdown_notsupp
@@ -2719,10 +2688,6 @@
 #define	pru_sopoll_notsupp _bsd_pru_sopoll_notsupp
 #define	pru_soreceive_notsupp _bsd_pru_soreceive_notsupp
 #define	pru_sosend_notsupp _bsd_pru_sosend_notsupp
-#define	random_harvest _bsd_random_harvest
-#define	random_set_wakeup_exit _bsd_random_set_wakeup_exit
-#define	random_yarrow_deinit_harvester _bsd_random_yarrow_deinit_harvester
-#define	random_yarrow_init_harvester _bsd_random_yarrow_init_harvester
 #define	ratecheck _bsd_ratecheck
 #define	raw_attach _bsd_raw_attach
 #define	rawcb_list _bsd_rawcb_list
@@ -2737,8 +2702,8 @@
 #define	rc4_init _bsd_rc4_init
 #define	read_dsfield _bsd_read_dsfield
 #define	read_machclk _bsd_read_machclk
-#define	read_random _bsd_read_random
 #define	registered_toedevs _bsd_registered_toedevs
+#define	register_tcp_functions _bsd_register_tcp_functions
 #define	resource_disabled _bsd_resource_disabled
 #define	resource_find_match _bsd_resource_find_match
 #define	resource_int_value _bsd_resource_int_value
@@ -2753,10 +2718,14 @@
 #define	resource_list_print_type _bsd_resource_list_print_type
 #define	resource_list_purge _bsd_resource_list_purge
 #define	resource_list_release _bsd_resource_list_release
+#define	resource_list_release_active _bsd_resource_list_release_active
 #define	resource_list_reserve _bsd_resource_list_reserve
 #define	resource_list_reserved _bsd_resource_list_reserved
 #define	resource_list_unreserve _bsd_resource_list_unreserve
 #define	resource_string_value _bsd_resource_string_value
+#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	rijndael_blockDecrypt _bsd_rijndael_blockDecrypt
 #define	rijndael_blockEncrypt _bsd_rijndael_blockEncrypt
 #define	rijndael_cipherInit _bsd_rijndael_cipherInit
@@ -2774,8 +2743,6 @@
 #define	rip6_ctloutput _bsd_rip6_ctloutput
 #define	rip6_input _bsd_rip6_input
 #define	rip6_output _bsd_rip6_output
-#define	rip6_recvspace _bsd_rip6_recvspace
-#define	rip6_sendspace _bsd_rip6_sendspace
 #define	rip6stat _bsd_rip6stat
 #define	rip6_usrreqs _bsd_rip6_usrreqs
 #define	ripcb _bsd_ripcb
@@ -2798,6 +2765,7 @@
 #define	rman_get_device _bsd_rman_get_device
 #define	rman_get_end _bsd_rman_get_end
 #define	rman_get_flags _bsd_rman_get_flags
+#define	rman_get_mapping _bsd_rman_get_mapping
 #define	rman_get_rid _bsd_rman_get_rid
 #define	rman_get_size _bsd_rman_get_size
 #define	rman_get_start _bsd_rman_get_start
@@ -2816,6 +2784,7 @@
 #define	rman_set_bustag _bsd_rman_set_bustag
 #define	rman_set_device _bsd_rman_set_device
 #define	rman_set_end _bsd_rman_set_end
+#define	rman_set_mapping _bsd_rman_set_mapping
 #define	rman_set_rid _bsd_rman_set_rid
 #define	rman_set_start _bsd_rman_set_start
 #define	rman_set_virtual _bsd_rman_set_virtual
@@ -2825,19 +2794,21 @@
 #define	RMD160Update _bsd_RMD160Update
 #define	rn4_mpath_inithead _bsd_rn4_mpath_inithead
 #define	rn6_mpath_inithead _bsd_rn6_mpath_inithead
-#define	rn_addmask _bsd_rn_addmask
-#define	rn_addmask_r _bsd_rn_addmask_r
 #define	rn_addroute _bsd_rn_addroute
 #define	rn_delete _bsd_rn_delete
 #define	rn_detachhead _bsd_rn_detachhead
-#define	rn_init _bsd_rn_init
 #define	rn_inithead _bsd_rn_inithead
+#define	rn_inithead_internal _bsd_rn_inithead_internal
 #define	rn_lookup _bsd_rn_lookup
 #define	rn_match _bsd_rn_match
 #define	rn_mpath_capable _bsd_rn_mpath_capable
 #define	rn_mpath_count _bsd_rn_mpath_count
 #define	rn_mpath_next _bsd_rn_mpath_next
 #define	rn_refines _bsd_rn_refines
+#define	rn_walktree _bsd_rn_walktree
+#define	rn_walktree_from _bsd_rn_walktree_from
+#define	rollback_table_values _bsd_rollback_table_values
+#define	rollback_toperation_state _bsd_rollback_toperation_state
 #define	root_bus _bsd_root_bus
 #define	root_bus_configure _bsd_root_bus_configure
 #define	root_devclass _bsd_root_devclass
@@ -2848,38 +2819,35 @@
 #define	rt6_flush _bsd_rt6_flush
 #define	rt_add_addr_allfibs _bsd_rt_add_addr_allfibs
 #define	rt_addrmsg _bsd_rt_addrmsg
-#define	rtalloc _bsd_rtalloc
 #define	rtalloc1 _bsd_rtalloc1
 #define	rtalloc1_fib _bsd_rtalloc1_fib
-#define	rtalloc_fib _bsd_rtalloc_fib
-#define	rtalloc_ign _bsd_rtalloc_ign
 #define	rtalloc_ign_fib _bsd_rtalloc_ign_fib
 #define	rtalloc_mpath_fib _bsd_rtalloc_mpath_fib
-#define	rtexpunge _bsd_rtexpunge
+#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 _bsd_rt_getifa
 #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	rtinit_fib _bsd_rtinit_fib
-#define	rtioctl _bsd_rtioctl
 #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
+#define	rt_mpath_capable _bsd_rt_mpath_capable
 #define	rt_mpath_conflict _bsd_rt_mpath_conflict
 #define	rt_mpath_deldup _bsd_rt_mpath_deldup
 #define	rt_mpath_matchgate _bsd_rt_mpath_matchgate
+#define	rt_mpath_select _bsd_rt_mpath_select
 #define	rt_newaddrmsg _bsd_rt_newaddrmsg
 #define	rt_newaddrmsg_fib _bsd_rt_newaddrmsg_fib
 #define	rt_newmaddrmsg _bsd_rt_newmaddrmsg
 #define	rt_numfibs _bsd_rt_numfibs
 #define	rto_logging _bsd_rto_logging
-#define	rtredirect _bsd_rtredirect
 #define	rtredirect_fib _bsd_rtredirect_fib
-#define	rtrequest _bsd_rtrequest
 #define	rtrequest1_fib _bsd_rtrequest1_fib
 #define	rtrequest_fib _bsd_rtrequest_fib
 #define	rt_routemsg _bsd_rt_routemsg
@@ -2888,9 +2856,13 @@
 #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	rw_destroy _bsd_rw_destroy
 #define	_rw_downgrade _bsd__rw_downgrade
 #define	rw_init_flags _bsd_rw_init_flags
@@ -2905,10 +2877,13 @@
 #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
 #define	sa6_embedscope _bsd_sa6_embedscope
 #define	sa6_recoverscope _bsd_sa6_recoverscope
 #define	sack_array _bsd_sack_array
 #define	sack_hole_zone _bsd_sack_hole_zone
+#define	sballoc _bsd_sballoc
 #define	sbappend _bsd_sbappend
 #define	sbappendaddr _bsd_sbappendaddr
 #define	sbappendaddr_locked _bsd_sbappendaddr_locked
@@ -2922,6 +2897,7 @@
 #define	sbappendstream_locked _bsd_sbappendstream_locked
 #define	sbcompress _bsd_sbcompress
 #define	sbcreatecontrol _bsd_sbcreatecontrol
+#define	sbcut_locked _bsd_sbcut_locked
 #define	sbdestroy _bsd_sbdestroy
 #define	sbdrop _bsd_sbdrop
 #define	sbdrop_locked _bsd_sbdrop_locked
@@ -2929,9 +2905,11 @@
 #define	sbdroprecord_locked _bsd_sbdroprecord_locked
 #define	sbflush _bsd_sbflush
 #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
 #define	sbrelease_locked _bsd_sbrelease_locked
@@ -2940,11 +2918,14 @@
 #define	sbsndmbuf _bsd_sbsndmbuf
 #define	sbsndptr _bsd_sbsndptr
 #define	sbtoxsockbuf _bsd_sbtoxsockbuf
+#define	sbt_tickthreshold _bsd_sbt_tickthreshold
+#define	sbt_timethreshold _bsd_sbt_timethreshold
 #define	sbuf_bcat _bsd_sbuf_bcat
 #define	sbuf_bcopyin _bsd_sbuf_bcopyin
 #define	sbuf_bcpy _bsd_sbuf_bcpy
 #define	sbuf_cat _bsd_sbuf_cat
 #define	sbuf_clear _bsd_sbuf_clear
+#define	sbuf_clear_flags _bsd_sbuf_clear_flags
 #define	sbuf_copyin _bsd_sbuf_copyin
 #define	sbuf_cpy _bsd_sbuf_cpy
 #define	sbuf_data _bsd_sbuf_data
@@ -2953,12 +2934,15 @@
 #define	sbuf_end_section _bsd_sbuf_end_section
 #define	sbuf_error _bsd_sbuf_error
 #define	sbuf_finish _bsd_sbuf_finish
+#define	sbuf_get_flags _bsd_sbuf_get_flags
 #define	sbuf_len _bsd_sbuf_len
 #define	sbuf_new _bsd_sbuf_new
 #define	sbuf_new_for_sysctl _bsd_sbuf_new_for_sysctl
 #define	sbuf_printf _bsd_sbuf_printf
+#define	sbuf_printf_uuid _bsd_sbuf_printf_uuid
 #define	sbuf_putc _bsd_sbuf_putc
 #define	sbuf_set_drain _bsd_sbuf_set_drain
+#define	sbuf_set_flags _bsd_sbuf_set_flags
 #define	sbuf_setpos _bsd_sbuf_setpos
 #define	sbuf_start_section _bsd_sbuf_start_section
 #define	sbuf_trim _bsd_sbuf_trim
@@ -2973,23 +2957,55 @@
 #define	scope6_init _bsd_scope6_init
 #define	scope6_ioctl _bsd_scope6_ioctl
 #define	scope6_setdefault _bsd_scope6_setdefault
+#define	scsi_attrib_ascii_sbuf _bsd_scsi_attrib_ascii_sbuf
+#define	scsi_attrib_hexdump_sbuf _bsd_scsi_attrib_hexdump_sbuf
+#define	scsi_attrib_int_sbuf _bsd_scsi_attrib_int_sbuf
+#define	scsi_attrib_prefix_sbuf _bsd_scsi_attrib_prefix_sbuf
+#define	scsi_attrib_sbuf _bsd_scsi_attrib_sbuf
+#define	scsi_attrib_text_sbuf _bsd_scsi_attrib_text_sbuf
+#define	scsi_attrib_value_sbuf _bsd_scsi_attrib_value_sbuf
+#define	scsi_attrib_vendser_sbuf _bsd_scsi_attrib_vendser_sbuf
+#define	scsi_attrib_volcoh_sbuf _bsd_scsi_attrib_volcoh_sbuf
 #define	scsi_devid_is_lun_eui64 _bsd_scsi_devid_is_lun_eui64
 #define	scsi_devid_is_lun_naa _bsd_scsi_devid_is_lun_naa
 #define	scsi_devid_is_lun_name _bsd_scsi_devid_is_lun_name
 #define	scsi_devid_is_lun_t10 _bsd_scsi_devid_is_lun_t10
 #define	scsi_devid_is_naa_ieee_reg _bsd_scsi_devid_is_naa_ieee_reg
+#define	scsi_devid_is_port_naa _bsd_scsi_devid_is_port_naa
 #define	scsi_devid_is_sas_target _bsd_scsi_devid_is_sas_target
 #define	scsi_extract_sense_len _bsd_scsi_extract_sense_len
+#define	scsi_find_attrib_entry _bsd_scsi_find_attrib_entry
+#define	scsi_get_attrib_entry _bsd_scsi_get_attrib_entry
 #define	scsi_get_devid _bsd_scsi_get_devid
+#define	scsi_get_devid_desc _bsd_scsi_get_devid_desc
+#define	scsi_get_nv _bsd_scsi_get_nv
 #define	scsi_get_sense_key _bsd_scsi_get_sense_key
 #define	scsi_inquiry _bsd_scsi_inquiry
+#define	scsi_log_select _bsd_scsi_log_select
+#define	scsi_log_sense _bsd_scsi_log_sense
+#define	scsi_mam_attr_table _bsd_scsi_mam_attr_table
+#define	scsi_mode_select _bsd_scsi_mode_select
+#define	scsi_mode_select_len _bsd_scsi_mode_select_len
+#define	scsi_mode_sense _bsd_scsi_mode_sense
+#define	scsi_mode_sense_len _bsd_scsi_mode_sense_len
+#define	scsi_nv_to_str _bsd_scsi_nv_to_str
+#define	scsi_parse_transportid _bsd_scsi_parse_transportid
+#define	scsi_parse_transportid_64bit _bsd_scsi_parse_transportid_64bit
+#define	scsi_parse_transportid_iscsi _bsd_scsi_parse_transportid_iscsi
+#define	scsi_parse_transportid_rdma _bsd_scsi_parse_transportid_rdma
+#define	scsi_parse_transportid_sop _bsd_scsi_parse_transportid_sop
+#define	scsi_parse_transportid_spi _bsd_scsi_parse_transportid_spi
+#define	scsi_prevent _bsd_scsi_prevent
 #define	scsi_print_inquiry _bsd_scsi_print_inquiry
 #define	scsi_print_inquiry_short _bsd_scsi_print_inquiry_short
+#define	scsi_proto_map _bsd_scsi_proto_map
 #define	scsi_read_capacity _bsd_scsi_read_capacity
 #define	scsi_read_write _bsd_scsi_read_write
+#define	scsi_request_sense _bsd_scsi_request_sense
 #define	scsi_set_sense_data _bsd_scsi_set_sense_data
 #define	scsi_set_sense_data_va _bsd_scsi_set_sense_data_va
 #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
@@ -3011,7 +3027,6 @@
 #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_out _bsd_sctp_add_stream_reset_out
 #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_to_readq _bsd_sctp_add_to_readq
@@ -3024,7 +3039,6 @@
 #define	sctp_alloc_key _bsd_sctp_alloc_key
 #define	sctp_alloc_sharedkey _bsd_sctp_alloc_sharedkey
 #define	sctp_aloc_assoc _bsd_sctp_aloc_assoc
-#define	sctp_append_to_readq _bsd_sctp_append_to_readq
 #define	sctp_arethere_unrecognized_parameters _bsd_sctp_arethere_unrecognized_parameters
 #define	sctp_asconf_cleanup _bsd_sctp_asconf_cleanup
 #define	sctp_asconf_iterator_end _bsd_sctp_asconf_iterator_end
@@ -3044,7 +3058,6 @@
 #define	sctp_auth_key_release _bsd_sctp_auth_key_release
 #define	sctp_auth_setactivekey _bsd_sctp_auth_setactivekey
 #define	sctp_auth_setactivekey_ep _bsd_sctp_auth_setactivekey_ep
-#define	sctp_auth_set_default_chunks _bsd_sctp_auth_set_default_chunks
 #define	sctp_autoclose_timer _bsd_sctp_autoclose_timer
 #define	sctp_bindx_add_address _bsd_sctp_bindx_add_address
 #define	sctp_bindx_delete_address _bsd_sctp_bindx_delete_address
@@ -3059,6 +3072,7 @@
 #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
 #define	sctp_clear_cachedkeys_ep _bsd_sctp_clear_cachedkeys_ep
 #define	sctp_clear_chunklist _bsd_sctp_clear_chunklist
@@ -3077,7 +3091,6 @@
 #define	sctp_copy_skeylist _bsd_sctp_copy_skeylist
 #define	sctp_ctlinput _bsd_sctp_ctlinput
 #define	sctp_ctloutput _bsd_sctp_ctloutput
-#define	sctp_cwnd_adjust _bsd_sctp_cwnd_adjust
 #define	sctp_deact_sharedkey _bsd_sctp_deact_sharedkey
 #define	sctp_deact_sharedkey_ep _bsd_sctp_deact_sharedkey_ep
 #define	sctp_default_supported_hmaclist _bsd_sctp_default_supported_hmaclist
@@ -3115,7 +3128,6 @@
 #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_finish _bsd_sctp_finish
 #define	sctp_fix_ecn_echo _bsd_sctp_fix_ecn_echo
 #define	sctp_flush _bsd_sctp_flush
 #define	sctp_free_assoc _bsd_sctp_free_assoc
@@ -3160,7 +3172,6 @@
 #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_laddr _bsd_sctp_insert_laddr
 #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
@@ -3184,8 +3195,6 @@
 #define	sctp_log_lock _bsd_sctp_log_lock
 #define	sctp_log_map _bsd_sctp_log_map
 #define	sctp_log_maxburst _bsd_sctp_log_maxburst
-#define	sctp_log_mb _bsd_sctp_log_mb
-#define	sctp_log_mbcnt _bsd_sctp_log_mbcnt
 #define	sctp_log_nagle_event _bsd_sctp_log_nagle_event
 #define	sctp_log_rwnd _bsd_sctp_log_rwnd
 #define	sctp_log_rwnd_set _bsd_sctp_log_rwnd_set
@@ -3193,7 +3202,7 @@
 #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_map_lookup_tab _bsd_sctp_map_lookup_tab
+#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
@@ -3246,7 +3255,6 @@
 #define	sctp_queue_op_err _bsd_sctp_queue_op_err
 #define	sctp_recover_scope _bsd_sctp_recover_scope
 #define	sctp_release_pr_sctp_chunk _bsd_sctp_release_pr_sctp_chunk
-#define	sctp_remove_laddr _bsd_sctp_remove_laddr
 #define	sctp_remove_net _bsd_sctp_remove_net
 #define	sctp_report_all_outbound _bsd_sctp_report_all_outbound
 #define	sctp_reset_in_stream _bsd_sctp_reset_in_stream
@@ -3261,6 +3269,7 @@
 #define	sctp_send_cookie_ack _bsd_sctp_send_cookie_ack
 #define	sctp_send_cookie_echo _bsd_sctp_send_cookie_echo
 #define	sctp_send_cwr _bsd_sctp_send_cwr
+#define	sctp_send_deferred_reset_response _bsd_sctp_send_deferred_reset_response
 #define	sctp_send_ecn_echo _bsd_sctp_send_ecn_echo
 #define	sctp_send_hb _bsd_sctp_send_hb
 #define	sctp_send_heartbeat_ack _bsd_sctp_send_heartbeat_ack
@@ -3274,10 +3283,10 @@
 #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_serialize_auth_chunks _bsd_sctp_serialize_auth_chunks
 #define	sctp_serialize_hmaclist _bsd_sctp_serialize_hmaclist
-#define	sctp_service_queues _bsd_sctp_service_queues
 #define	sctp_set_key _bsd_sctp_set_key
 #define	sctp_set_primary_addr _bsd_sctp_set_primary_addr
 #define	sctp_set_primary_ip_address _bsd_sctp_set_primary_ip_address
@@ -3299,7 +3308,6 @@
 #define	sctp_swap_inpcb_for_listen _bsd_sctp_swap_inpcb_for_listen
 #define	sctp_t1init_timer _bsd_sctp_t1init_timer
 #define	sctp_t3rxt_timer _bsd_sctp_t3rxt_timer
-#define	sctp_threshold_management _bsd_sctp_threshold_management
 #define	sctp_timeout_handler _bsd_sctp_timeout_handler
 #define	sctp_timer_start _bsd_sctp_timer_start
 #define	sctp_timer_stop _bsd_sctp_timer_stop
@@ -3318,7 +3326,7 @@
 #define	sctp_verify_hmac_param _bsd_sctp_verify_hmac_param
 #define	sctp_wakeup_iterator _bsd_sctp_wakeup_iterator
 #define	sctp_wakeup_log _bsd_sctp_wakeup_log
-#define	sdhci_debug _bsd_sdhci_debug
+#define	sctp_wakeup_the_read_socket _bsd_sctp_wakeup_the_read_socket
 #define	seldrain _bsd_seldrain
 #define	selrecord _bsd_selrecord
 #define	seltdfini _bsd_seltdfini
@@ -3342,27 +3350,63 @@
 #define	sha1_loop _bsd_sha1_loop
 #define	sha1_pad _bsd_sha1_pad
 #define	sha1_result _bsd_sha1_result
-#define	SHA256_Data _bsd_SHA256_Data
-#define	SHA256_End _bsd_SHA256_End
 #define	SHA256_Final _bsd_SHA256_Final
 #define	SHA256_Init _bsd_SHA256_Init
 #define	SHA256_Update _bsd_SHA256_Update
-#define	SHA384_Data _bsd_SHA384_Data
-#define	SHA384_End _bsd_SHA384_End
 #define	SHA384_Final _bsd_SHA384_Final
 #define	SHA384_Init _bsd_SHA384_Init
 #define	SHA384_Update _bsd_SHA384_Update
-#define	SHA512_Data _bsd_SHA512_Data
-#define	SHA512_End _bsd_SHA512_End
 #define	SHA512_Final _bsd_SHA512_Final
 #define	SHA512_Init _bsd_SHA512_Init
 #define	SHA512_Update _bsd_SHA512_Update
+#define	SipHash24_TestVectors _bsd_SipHash24_TestVectors
+#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	Skein_Get64_LSB_First _bsd_Skein_Get64_LSB_First
+#define	Skein_Put64_LSB_First _bsd_Skein_Put64_LSB_First
 #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	sleepinit _bsd_sleepinit
 #define	sleepq_add _bsd_sleepq_add
 #define	sleepq_alloc _bsd_sleepq_alloc
 #define	sleepq_broadcast _bsd_sleepq_broadcast
@@ -3371,7 +3415,7 @@
 #define	sleepq_lookup _bsd_sleepq_lookup
 #define	sleepq_release _bsd_sleepq_release
 #define	sleepq_remove _bsd_sleepq_remove
-#define	sleepq_set_timeout _bsd_sleepq_set_timeout
+#define	sleepq_set_timeout_sbt _bsd_sleepq_set_timeout_sbt
 #define	sleepq_signal _bsd_sleepq_signal
 #define	sleepq_sleepcnt _bsd_sleepq_sleepcnt
 #define	sleepq_timedwait _bsd_sleepq_timedwait
@@ -3387,26 +3431,27 @@
 #define	smc_miibus_writereg _bsd_smc_miibus_writereg
 #define	smc_probe _bsd_smc_probe
 #define	snprintf _bsd_snprintf
+#define	snprintf_uuid _bsd_snprintf_uuid
 #define	soabort _bsd_soabort
 #define	soaccept _bsd_soaccept
 #define	sobind _bsd_sobind
+#define	sobindat _bsd_sobindat
 #define	socantrcvmore _bsd_socantrcvmore
 #define	socantrcvmore_locked _bsd_socantrcvmore_locked
 #define	socantsendmore _bsd_socantsendmore
 #define	socantsendmore_locked _bsd_socantsendmore_locked
-#define	sockargs _bsd_sockargs
+#define	socket_hhh _bsd_socket_hhh
 #define	socketops _bsd_socketops
-#define	socket_zone _bsd_socket_zone
 #define	soclose _bsd_soclose
 #define	soconnect _bsd_soconnect
 #define	soconnect2 _bsd_soconnect2
+#define	soconnectat _bsd_soconnectat
 #define	socreate _bsd_socreate
 #define	sodisconnect _bsd_sodisconnect
 #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	softclock _bsd_softclock
 #define	so_gencnt _bsd_so_gencnt
 #define	sogetopt _bsd_sogetopt
 #define	sohasoutofband _bsd_sohasoutofband
@@ -3422,6 +3467,9 @@
 #define	solisten_proto_check _bsd_solisten_proto_check
 #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	soopt_getm _bsd_soopt_getm
@@ -3429,6 +3477,8 @@
 #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	sopoll _bsd_sopoll
 #define	sopoll_generic _bsd_sopoll_generic
 #define	so_protosw_get _bsd_so_protosw_get
@@ -3476,8 +3526,6 @@
 #define	_start_set_nexus _bsd__start_set_nexus
 #define	_start_set_sysctl_set _bsd__start_set_sysctl_set
 #define	_start_set_sysinit_set _bsd__start_set_sysinit_set
-#define	state_list _bsd_state_list
-#define	stf_cloner _bsd_stf_cloner
 #define	_stop_set_modmetadata_set _bsd__stop_set_modmetadata_set
 #define	_stop_set_nexus _bsd__stop_set_nexus
 #define	_stop_set_sysctl_set _bsd__stop_set_sysctl_set
@@ -3486,11 +3534,11 @@
 #define	swi_add _bsd_swi_add
 #define	swi_sched _bsd_swi_sched
 #define	sx_destroy _bsd_sx_destroy
-#define	_sx_downgrade _bsd__sx_downgrade
+#define	sx_downgrade_ _bsd_sx_downgrade_
 #define	sx_init_flags _bsd_sx_init_flags
 #define	sx_sysinit _bsd_sx_sysinit
-#define	_sx_try_upgrade _bsd__sx_try_upgrade
-#define	_sx_try_xlock _bsd__sx_try_xlock
+#define	sx_try_upgrade_ _bsd_sx_try_upgrade_
+#define	sx_try_xlock_ _bsd_sx_try_xlock_
 #define	_sx_xlock _bsd__sx_xlock
 #define	sx_xlocked _bsd_sx_xlocked
 #define	_sx_xunlock _bsd__sx_xunlock
@@ -3499,8 +3547,6 @@
 #define	syncache_chkrst _bsd_syncache_chkrst
 #define	syncache_expand _bsd_syncache_expand
 #define	syncache_init _bsd_syncache_init
-#define	syncache_lookup _bsd_syncache_lookup
-#define	syncache_pcbcount _bsd_syncache_pcbcount
 #define	syncache_pcblist _bsd_syncache_pcblist
 #define	syncache_unreach _bsd_syncache_unreach
 #define	sysctl_add_oid _bsd_sysctl_add_oid
@@ -3519,75 +3565,81 @@
 #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_children _bsd_sysctl__debug_children
-#define	sysctl__dev_children _bsd_sysctl__dev_children
+#define	sysctl___debug _bsd_sysctl___debug
+#define	sysctl___dev _bsd_sysctl___dev
 #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__hw_atm_children _bsd_sysctl__hw_atm_children
-#define	sysctl__hw_bus_children _bsd_sysctl__hw_bus_children
-#define	sysctl__hw_children _bsd_sysctl__hw_children
-#define	sysctl__hw_pci_children _bsd_sysctl__hw_pci_children
-#define	sysctl__hw_sdhci_children _bsd_sysctl__hw_sdhci_children
-#define	sysctl__hw_usb_children _bsd_sysctl__hw_usb_children
-#define	sysctl__hw_zynq_children _bsd_sysctl__hw_zynq_children
-#define	sysctl__kern_cam_children _bsd_sysctl__kern_cam_children
-#define	sysctl__kern_children _bsd_sysctl__kern_children
-#define	sysctl__kern_features_children _bsd_sysctl__kern_features_children
-#define	sysctl__kern_ipc_children _bsd_sysctl__kern_ipc_children
-#define	sysctl_lock _bsd_sysctl_lock
+#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_atm _bsd_sysctl___hw_atm
+#define	sysctl___hw_bus _bsd_sysctl___hw_bus
+#define	sysctl___hw_pci _bsd_sysctl___hw_pci
+#define	sysctl___hw_usb _bsd_sysctl___hw_usb
+#define	sysctl___hw_zynq _bsd_sysctl___hw_zynq
+#define	sysctl___kern _bsd_sysctl___kern
+#define	sysctl___kern_cam _bsd_sysctl___kern_cam
+#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_ticks _bsd_sysctl_msec_to_ticks
-#define	sysctl__net_bpf_children _bsd_sysctl__net_bpf_children
-#define	sysctl__net_bpf_jitter_children _bsd_sysctl__net_bpf_jitter_children
-#define	sysctl__net_children _bsd_sysctl__net_children
-#define	sysctl__net_inet6_children _bsd_sysctl__net_inet6_children
-#define	sysctl__net_inet6_icmp6_children _bsd_sysctl__net_inet6_icmp6_children
-#define	sysctl__net_inet6_icmp6_nd6_drlist_children _bsd_sysctl__net_inet6_icmp6_nd6_drlist_children
-#define	sysctl__net_inet6_icmp6_nd6_prlist_children _bsd_sysctl__net_inet6_icmp6_nd6_prlist_children
-#define	sysctl__net_inet6_ip6_children _bsd_sysctl__net_inet6_ip6_children
-#define	sysctl__net_inet6_ip6_fw_children _bsd_sysctl__net_inet6_ip6_fw_children
-#define	sysctl__net_inet6_mld_children _bsd_sysctl__net_inet6_mld_children
-#define	sysctl__net_inet6_tcp6_children _bsd_sysctl__net_inet6_tcp6_children
-#define	sysctl__net_inet6_udp6_children _bsd_sysctl__net_inet6_udp6_children
-#define	sysctl__net_inet_accf_children _bsd_sysctl__net_inet_accf_children
-#define	sysctl__net_inet_carp_children _bsd_sysctl__net_inet_carp_children
-#define	sysctl__net_inet_children _bsd_sysctl__net_inet_children
-#define	sysctl__net_inet_icmp_children _bsd_sysctl__net_inet_icmp_children
-#define	sysctl__net_inet_igmp_children _bsd_sysctl__net_inet_igmp_children
-#define	sysctl__net_inet_ip_alias_children _bsd_sysctl__net_inet_ip_alias_children
-#define	sysctl__net_inet_ip_children _bsd_sysctl__net_inet_ip_children
-#define	sysctl__net_inet_ip_fw_children _bsd_sysctl__net_inet_ip_fw_children
-#define	sysctl__net_inet_pim_children _bsd_sysctl__net_inet_pim_children
-#define	sysctl__net_inet_raw_children _bsd_sysctl__net_inet_raw_children
-#define	sysctl__net_inet_tcp_cc_children _bsd_sysctl__net_inet_tcp_cc_children
-#define	sysctl__net_inet_tcp_children _bsd_sysctl__net_inet_tcp_children
-#define	sysctl__net_inet_tcp_experimental_children _bsd_sysctl__net_inet_tcp_experimental_children
-#define	sysctl__net_inet_tcp_sack_children _bsd_sysctl__net_inet_tcp_sack_children
-#define	sysctl__net_inet_udp_children _bsd_sysctl__net_inet_udp_children
-#define	sysctl__net_link_children _bsd_sysctl__net_link_children
-#define	sysctl__net_link_ether_children _bsd_sysctl__net_link_ether_children
-#define	sysctl__net_link_generic_children _bsd_sysctl__net_link_generic_children
-#define	sysctl__net_pfsync_children _bsd_sysctl__net_pfsync_children
+#define	sysctl___net _bsd_sysctl___net
+#define	sysctl___net_accf _bsd_sysctl___net_accf
+#define	sysctl___net_bpf _bsd_sysctl___net_bpf
+#define	sysctl___net_bpf_jitter _bsd_sysctl___net_bpf_jitter
+#define	sysctl___net_inet _bsd_sysctl___net_inet
+#define	sysctl___net_inet6 _bsd_sysctl___net_inet6
+#define	sysctl___net_inet6_icmp6 _bsd_sysctl___net_inet6_icmp6
+#define	sysctl___net_inet6_ip6 _bsd_sysctl___net_inet6_ip6
+#define	sysctl___net_inet6_ip6_fw _bsd_sysctl___net_inet6_ip6_fw
+#define	sysctl___net_inet6_mld _bsd_sysctl___net_inet6_mld
+#define	sysctl___net_inet6_tcp6 _bsd_sysctl___net_inet6_tcp6
+#define	sysctl___net_inet6_udp6 _bsd_sysctl___net_inet6_udp6
+#define	sysctl___net_inet_accf _bsd_sysctl___net_inet_accf
+#define	sysctl___net_inet_carp _bsd_sysctl___net_inet_carp
+#define	sysctl___net_inet_icmp _bsd_sysctl___net_inet_icmp
+#define	sysctl___net_inet_igmp _bsd_sysctl___net_inet_igmp
+#define	sysctl___net_inet_ip _bsd_sysctl___net_inet_ip
+#define	sysctl___net_inet_ip_alias _bsd_sysctl___net_inet_ip_alias
+#define	sysctl___net_inet_ip_fw _bsd_sysctl___net_inet_ip_fw
+#define	sysctl___net_inet_pim _bsd_sysctl___net_inet_pim
+#define	sysctl___net_inet_raw _bsd_sysctl___net_inet_raw
+#define	sysctl___net_inet_tcp _bsd_sysctl___net_inet_tcp
+#define	sysctl___net_inet_tcp_cc _bsd_sysctl___net_inet_tcp_cc
+#define	sysctl___net_inet_tcp_lro _bsd_sysctl___net_inet_tcp_lro
+#define	sysctl___net_inet_tcp_sack _bsd_sysctl___net_inet_tcp_sack
+#define	sysctl___net_inet_udp _bsd_sysctl___net_inet_udp
+#define	sysctl___net_link _bsd_sysctl___net_link
+#define	sysctl___net_link_ether _bsd_sysctl___net_link_ether
+#define	sysctl___net_link_generic _bsd_sysctl___net_link_generic
+#define	sysctl___net_link_lagg _bsd_sysctl___net_link_lagg
+#define	sysctl___net_link_lagg_lacp _bsd_sysctl___net_link_lagg_lacp
+#define	sysctl___net_pf _bsd_sysctl___net_pf
+#define	sysctl___net_pfsync _bsd_sysctl___net_pfsync
 #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__security_children _bsd_sysctl__security_children
-#define	sysctl__sysctl_children _bsd_sysctl__sysctl_children
-#define	sysctl_unlock _bsd_sysctl_unlock
+#define	sysctl___security _bsd_sysctl___security
+#define	sysctl___sysctl _bsd_sysctl___sysctl
 #define	sysctl_unregister_oid _bsd_sysctl_unregister_oid
-#define	sysctl__vm_children _bsd_sysctl__vm_children
+#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	sys_listen _bsd_sys_listen
 #define	system_base_info _bsd_system_base_info
-#define	tag2tagname _bsd_tag2tagname
-#define	tagname2tag _bsd_tagname2tag
-#define	tag_unref _bsd_tag_unref
-#define	tap_cloner _bsd_tap_cloner
-#define	tap_cloner_data _bsd_tap_cloner_data
+#define	TB_DRAIN_WAITER _bsd_TB_DRAIN_WAITER
 #define	tbr_dequeue_ptr _bsd_tbr_dequeue_ptr
 #define	tbr_get _bsd_tbr_get
 #define	tbr_set _bsd_tbr_set
@@ -3606,30 +3658,36 @@
 #define	tcp_ccalgounload _bsd_tcp_ccalgounload
 #define	tcp_clean_sackreport _bsd_tcp_clean_sackreport
 #define	tcp_close _bsd_tcp_close
+#define	tcp_compute_pipe _bsd_tcp_compute_pipe
 #define	tcp_ctlinput _bsd_tcp_ctlinput
 #define	tcp_ctloutput _bsd_tcp_ctloutput
 #define	tcp_debug_mtx _bsd_tcp_debug_mtx
+#define	tcp_default_ctloutput _bsd_tcp_default_ctloutput
 #define	tcp_delack_enabled _bsd_tcp_delack_enabled
 #define	tcp_delacktime _bsd_tcp_delacktime
 #define	tcp_discardcb _bsd_tcp_discardcb
 #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_do_initcwnd10 _bsd_tcp_do_initcwnd10
+#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
 #define	tcp_do_rfc3465 _bsd_tcp_do_rfc3465
+#define	tcp_do_rfc6675_pipe _bsd_tcp_do_rfc6675_pipe
 #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_drain _bsd_tcp_drain
 #define	tcp_drop _bsd_tcp_drop
 #define	tcp_drop_syn_sent _bsd_tcp_drop_syn_sent
+#define	tcp_dropwithreset _bsd_tcp_dropwithreset
 #define	tcp_ecn_maxretries _bsd_tcp_ecn_maxretries
 #define	tcp_fast_finwait2_recycle _bsd_tcp_fast_finwait2_recycle
 #define	tcp_fini _bsd_tcp_fini
 #define	tcp_finwait2_timeout _bsd_tcp_finwait2_timeout
 #define	tcp_free_sackholes _bsd_tcp_free_sackholes
+#define	tcp_function_lock _bsd_tcp_function_lock
 #define	tcp_hc_get _bsd_tcp_hc_get
 #define	tcp_hc_getmtu _bsd_tcp_hc_getmtu
 #define	tcp_hc_init _bsd_tcp_hc_init
@@ -3637,8 +3695,12 @@
 #define	tcp_hc_updatemtu _bsd_tcp_hc_updatemtu
 #define	tcp_hhh _bsd_tcp_hhh
 #define	tcp_init _bsd_tcp_init
+#define	tcp_initcwnd_segments _bsd_tcp_initcwnd_segments
+#define	tcp_inpinfo_lock_add _bsd_tcp_inpinfo_lock_add
+#define	tcp_inpinfo_lock_del _bsd_tcp_inpinfo_lock_del
 #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_keepcnt _bsd_tcp_keepcnt
@@ -3649,20 +3711,25 @@
 #define	tcp_log_in_vain _bsd_tcp_log_in_vain
 #define	tcp_log_vain _bsd_tcp_log_vain
 #define	tcp_lro_flush _bsd_tcp_lro_flush
+#define	tcp_lro_flush_all _bsd_tcp_lro_flush_all
+#define	tcp_lro_flush_inactive _bsd_tcp_lro_flush_inactive
 #define	tcp_lro_free _bsd_tcp_lro_free
 #define	tcp_lro_init _bsd_tcp_lro_init
+#define	tcp_lro_init_args _bsd_tcp_lro_init_args
+#define	tcp_lro_queue_mbuf _bsd_tcp_lro_queue_mbuf
 #define	tcp_lro_rx _bsd_tcp_lro_rx
 #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_minmss _bsd_tcp_minmss
 #define	tcp_msl _bsd_tcp_msl
 #define	tcp_mss _bsd_tcp_mss
 #define	tcp_mssdflt _bsd_tcp_mssdflt
 #define	tcp_mssopt _bsd_tcp_mssopt
 #define	tcp_mss_update _bsd_tcp_mss_update
-#define	tcp_mtudisc _bsd_tcp_mtudisc
 #define	tcp_new_isn _bsd_tcp_new_isn
+#define	tcp_newreno_partial_ack _bsd_tcp_newreno_partial_ack
 #define	tcp_newtcpcb _bsd_tcp_newtcpcb
 #define	tcp_offload_connect _bsd_tcp_offload_connect
 #define	tcp_offload_ctloutput _bsd_tcp_offload_ctloutput
@@ -3670,11 +3737,14 @@
 #define	tcp_offload_input _bsd_tcp_offload_input
 #define	tcp_offload_output _bsd_tcp_offload_output
 #define	tcp_offload_rcvd _bsd_tcp_offload_rcvd
-#define	tcp_offload_syncache_add _bsd_tcp_offload_syncache_add
 #define	tcp_output _bsd_tcp_output
+#define	tcp_persmax _bsd_tcp_persmax
+#define	tcp_persmin _bsd_tcp_persmin
+#define	tcp_pulloutofband _bsd_tcp_pulloutofband
 #define	tcp_reass _bsd_tcp_reass
 #define	tcp_reass_flush _bsd_tcp_reass_flush
-#define	tcp_reass_init _bsd_tcp_reass_init
+#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_min _bsd_tcp_rexmit_min
@@ -3691,31 +3761,42 @@
 #define	tcp_sendspace _bsd_tcp_sendspace
 #define	tcp_setpersist _bsd_tcp_setpersist
 #define	tcp_slowtimo _bsd_tcp_slowtimo
+#define	tcps_states _bsd_tcps_states
 #define	tcpstat _bsd_tcpstat
+#define	tcp_state_change _bsd_tcp_state_change
 #define	tcp_syn_backoff _bsd_tcp_syn_backoff
 #define	tcp_timer_2msl _bsd_tcp_timer_2msl
 #define	tcp_timer_activate _bsd_tcp_timer_activate
 #define	tcp_timer_active _bsd_tcp_timer_active
 #define	tcp_timer_delack _bsd_tcp_timer_delack
+#define	tcp_timer_discard _bsd_tcp_timer_discard
 #define	tcp_timer_keep _bsd_tcp_timer_keep
 #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_timer_to_xtimer _bsd_tcp_timer_to_xtimer
 #define	tcp_trace _bsd_tcp_trace
 #define	tcp_tw_2msl_scan _bsd_tcp_tw_2msl_scan
 #define	tcp_twcheck _bsd_tcp_twcheck
 #define	tcp_twclose _bsd_tcp_twclose
 #define	tcp_tw_init _bsd_tcp_tw_init
-#define	tcp_twrespond _bsd_tcp_twrespond
 #define	tcp_twstart _bsd_tcp_twstart
 #define	tcp_tw_zone_change _bsd_tcp_tw_zone_change
 #define	tcp_update_sack_list _bsd_tcp_update_sack_list
 #define	tcp_usrreqs _bsd_tcp_usrreqs
 #define	tcp_v6mssdflt _bsd_tcp_v6mssdflt
+#define	tcp_xmit_timer _bsd_tcp_xmit_timer
+#define	tc_ref _bsd_tc_ref
+#define	tc_tick_bt _bsd_tc_tick_bt
+#define	tc_tick_sbt _bsd_tc_tick_sbt
+#define	tc_unref _bsd_tc_unref
+#define	t_functions _bsd_t_functions
+#define	t_functions_inited _bsd_t_functions_inited
 #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	tick_sbt _bsd_tick_sbt
 #define	timeout _bsd_timeout
 #define	_timeout_task_init _bsd__timeout_task_init
 #define	timevaladd _bsd_timevaladd
@@ -3724,8 +3805,6 @@
 #define	trash_dtor _bsd_trash_dtor
 #define	trash_fini _bsd_trash_fini
 #define	trash_init _bsd_trash_init
-#define	tree_id _bsd_tree_id
-#define	tree_src_tracking _bsd_tree_src_tracking
 #define	tsec_attach _bsd_tsec_attach
 #define	tsec_detach _bsd_tsec_detach
 #define	tsec_devclass _bsd_tsec_devclass
@@ -3733,20 +3812,17 @@
 #define	tsec_miibus_readreg _bsd_tsec_miibus_readreg
 #define	tsec_miibus_statchg _bsd_tsec_miibus_statchg
 #define	tsec_miibus_writereg _bsd_tsec_miibus_writereg
+#define	tsec_phy_mtx _bsd_tsec_phy_mtx
 #define	tsec_receive_intr _bsd_tsec_receive_intr
 #define	tsec_resume _bsd_tsec_resume
 #define	tsec_shutdown _bsd_tsec_shutdown
 #define	tsec_suspend _bsd_tsec_suspend
 #define	tsec_transmit_intr _bsd_tsec_transmit_intr
-#define	tun_cloner _bsd_tun_cloner
-#define	tun_cloner_data _bsd_tun_cloner_data
 #define	tvtohz _bsd_tvtohz
 #define	udb _bsd_udb
 #define	udbinfo _bsd_udbinfo
 #define	udp6_ctlinput _bsd_udp6_ctlinput
 #define	udp6_input _bsd_udp6_input
-#define	udp6_recvspace _bsd_udp6_recvspace
-#define	udp6_sendspace _bsd_udp6_sendspace
 #define	udp6_usrreqs _bsd_udp6_usrreqs
 #define	udp_blackhole _bsd_udp_blackhole
 #define	udp_cksum _bsd_udp_cksum
@@ -3755,6 +3831,9 @@
 #define	udp_discardcb _bsd_udp_discardcb
 #define	udp_init _bsd_udp_init
 #define	udp_input _bsd_udp_input
+#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
@@ -3772,16 +3851,18 @@
 #define	uiomove _bsd_uiomove
 #define	uiomove_nofault _bsd_uiomove_nofault
 #define	ukphy_status _bsd_ukphy_status
+#define	ulitecb _bsd_ulitecb
+#define	ulitecbinfo _bsd_ulitecbinfo
 #define	uma_align_cache _bsd_uma_align_cache
-#define	uma_dbg_alloc _bsd_uma_dbg_alloc
-#define	uma_dbg_free _bsd_uma_dbg_free
-#define	uma_find_refcnt _bsd_uma_find_refcnt
 #define	uma_print_stats _bsd_uma_print_stats
 #define	uma_print_zone _bsd_uma_print_zone
 #define	uma_reclaim _bsd_uma_reclaim
+#define	uma_reclaim_wakeup _bsd_uma_reclaim_wakeup
+#define	uma_reclaim_worker _bsd_uma_reclaim_worker
 #define	uma_set_align _bsd_uma_set_align
 #define	uma_startup _bsd_uma_startup
 #define	uma_zalloc_arg _bsd_uma_zalloc_arg
+#define	uma_zcache_create _bsd_uma_zcache_create
 #define	uma_zcreate _bsd_uma_zcreate
 #define	uma_zdestroy _bsd_uma_zdestroy
 #define	uma_zfree_arg _bsd_uma_zfree_arg
@@ -3789,15 +3870,19 @@
 #define	uma_zone_exhausted_nolock _bsd_uma_zone_exhausted_nolock
 #define	uma_zone_get_cur _bsd_uma_zone_get_cur
 #define	uma_zone_get_max _bsd_uma_zone_get_max
+#define	uma_zone_reserve _bsd_uma_zone_reserve
 #define	uma_zone_set_allocf _bsd_uma_zone_set_allocf
 #define	uma_zone_set_fini _bsd_uma_zone_set_fini
 #define	uma_zone_set_freef _bsd_uma_zone_set_freef
 #define	uma_zone_set_init _bsd_uma_zone_set_init
 #define	uma_zone_set_max _bsd_uma_zone_set_max
+#define	uma_zone_set_maxaction _bsd_uma_zone_set_maxaction
+#define	uma_zone_set_warning _bsd_uma_zone_set_warning
 #define	uma_zone_set_zfini _bsd_uma_zone_set_zfini
 #define	uma_zone_set_zinit _bsd_uma_zone_set_zinit
 #define	uma_zsecond_create _bsd_uma_zsecond_create
 #define	untimeout _bsd_untimeout
+#define	update_opcode_kidx _bsd_update_opcode_kidx
 #define	usb_alloc_device _bsd_usb_alloc_device
 #define	usb_alloc_mbufs _bsd_usb_alloc_mbufs
 #define	usb_bdma_done_event _bsd_usb_bdma_done_event
@@ -4037,6 +4122,9 @@
 #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	uuid_ether_add _bsd_uuid_ether_add
+#define	uuid_ether_del _bsd_uuid_ether_del
+#define	vectors _bsd_vectors
 #define	verbose_limit _bsd_verbose_limit
 #define	vlan_cookie_p _bsd_vlan_cookie_p
 #define	vlan_devat_p _bsd_vlan_devat_p
@@ -4046,16 +4134,15 @@
 #define	vlan_tag_p _bsd_vlan_tag_p
 #define	vlan_trunk_cap_p _bsd_vlan_trunk_cap_p
 #define	vlan_trunkdev_p _bsd_vlan_trunkdev_p
-#define	vmnet_cloner _bsd_vmnet_cloner
-#define	vmnet_cloner_data _bsd_vmnet_cloner_data
+#define	vlog _bsd_vlog
 #define	vnet_if_clone_init _bsd_vnet_if_clone_init
+#define	vnet_ipfw_iface_destroy _bsd_vnet_ipfw_iface_destroy
 #define	vprintf _bsd_vprintf
 #define	vsnprintf _bsd_vsnprintf
 #define	vsnrprintf _bsd_vsnrprintf
 #define	vsprintf _bsd_vsprintf
 #define	wakeup _bsd_wakeup
 #define	wakeup_one _bsd_wakeup_one
-#define	walk_dll_chain _bsd_walk_dll_chain
 #define	window_deflate _bsd_window_deflate
 #define	window_inflate _bsd_window_inflate
 #define	write_dsfield _bsd_write_dsfield
@@ -4068,13 +4155,22 @@
 #define	xpt_bus_register _bsd_xpt_bus_register
 #define	xpt_done _bsd_xpt_done
 #define	z_alloc _bsd_z_alloc
-#define	zeroin6_addr _bsd_zeroin6_addr
 #define	z_free _bsd_z_free
 #define	zone_clust _bsd_zone_clust
 #define	zone_drain _bsd_zone_drain
-#define	zone_ext_refcnt _bsd_zone_ext_refcnt
 #define	zone_jumbo16 _bsd_zone_jumbo16
 #define	zone_jumbo9 _bsd_zone_jumbo9
 #define	zone_jumbop _bsd_zone_jumbop
 #define	zone_mbuf _bsd_zone_mbuf
 #define	zone_pack _bsd_zone_pack
+#define	zy7_pl_fclk_disable _bsd_zy7_pl_fclk_disable
+#define	zy7_pl_fclk_enable _bsd_zy7_pl_fclk_enable
+#define	zy7_pl_fclk_enabled _bsd_zy7_pl_fclk_enabled
+#define	zy7_pl_fclk_get_freq _bsd_zy7_pl_fclk_get_freq
+#define	zy7_pl_fclk_get_source _bsd_zy7_pl_fclk_get_source
+#define	zy7_pl_fclk_set_freq _bsd_zy7_pl_fclk_set_freq
+#define	zy7_pl_fclk_set_source _bsd_zy7_pl_fclk_set_source
+#define	zy7_pl_level_shifters_disable _bsd_zy7_pl_level_shifters_disable
+#define	zy7_pl_level_shifters_enable _bsd_zy7_pl_level_shifters_enable
+#define	zy7_pl_level_shifters_enabled _bsd_zy7_pl_level_shifters_enabled
+#define	zy7_slcr_postload_pl _bsd_zy7_slcr_postload_pl
diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-space.h b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h
index 44f76fe1..49dc3aad 100644
--- a/rtemsbsd/include/machine/rtems-bsd-kernel-space.h
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h
@@ -47,6 +47,8 @@
 #define	__GLOBL1(sym)	__asm__(".globl " #sym)
 #define	__GLOBL(sym)	__GLOBL1(sym)
 
+#define O_CLOEXEC 0
+
 #define __FreeBSD__ 1
 
 /* General define to activate BSD kernel parts */
diff --git a/rtemsbsd/include/machine/rtems-bsd-nexus-bus.h b/rtemsbsd/include/machine/rtems-bsd-nexus-bus.h
index 5a3458c6..a408c172 100644
--- a/rtemsbsd/include/machine/rtems-bsd-nexus-bus.h
+++ b/rtemsbsd/include/machine/rtems-bsd-nexus-bus.h
@@ -37,7 +37,7 @@
  * Driver Summary is:
  *
  *  Devices:
- *   RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR0
+ *   RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR
  *
  *  Buses:
  *   RTEMS_BSD_DRIVER_PC_LEGACY
@@ -96,14 +96,14 @@ extern "C" {
  **/
 
 /*
- * Xilinx Zynq System Level Control Core 0 (SLCR0).
+ * Xilinx Zynq System Level Control Registers (SLCR).
  */
 #if !defined(RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR)
   /*
    * Hard IP part of the Zynq so a fixed address.
    */
-  #define RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR0                            \
-    static const rtems_bsd_device_resource zy7_slcr0_res[] = {          \
+  #define RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR                            \
+    static const rtems_bsd_device_resource zy7_slcr_res[] = {          \
       {                                                                 \
         .type = RTEMS_BSD_RES_MEMORY,                                   \
         .start_request = 0,                                             \
@@ -111,9 +111,9 @@ extern "C" {
       }                                                                 \
     };                                                                  \
     RTEMS_BSD_DEFINE_NEXUS_DEVICE(zy7_slcr, 0,                          \
-                                  RTEMS_ARRAY_SIZE(zy7_slcr0_res),      \
-                                  &zy7_slcr0_res[0])
-#endif /* RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR0 */
+                                  RTEMS_ARRAY_SIZE(zy7_slcr_res),      \
+                                  &zy7_slcr_res[0])
+#endif /* RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR */
 
 /**
  ** Physical Buses
diff --git a/rtemsbsd/include/machine/rtems-bsd-user-space.h b/rtemsbsd/include/machine/rtems-bsd-user-space.h
index 536ef8e2..3bf971fd 100644
--- a/rtemsbsd/include/machine/rtems-bsd-user-space.h
+++ b/rtemsbsd/include/machine/rtems-bsd-user-space.h
@@ -63,12 +63,18 @@
 #define	CLOCK_MONOTONIC_FAST CLOCK_MONOTONIC
 #endif
 
+#ifndef CLOCK_REALTIME_FAST
+#define	CLOCK_REALTIME_FAST CLOCK_REALTIME
+#endif
+
 #ifndef CLOCK_UPTIME
 #define	CLOCK_UPTIME CLOCK_MONOTONIC
 #endif
 
 #define	SIZE_T_MAX SIZE_MAX
 
+#define	__libc_sigprocmask(a, b, c) sigprocmask(a, b, c)
+
 __BEGIN_DECLS
 
 /* FIXME: Add to Newlib */
diff --git a/rtemsbsd/include/rtems/bsd/local/bus_if.h b/rtemsbsd/include/rtems/bsd/local/bus_if.h
index c95c7015..2376b896 100644
--- a/rtemsbsd/include/rtems/bsd/local/bus_if.h
+++ b/rtemsbsd/include/rtems/bsd/local/bus_if.h
@@ -92,7 +92,7 @@ typedef int bus_read_ivar_t(device_t _dev, device_t _child, int _index,
  * @param _child	the child device whose instance variable is
  *			being read
  * @param _index	the instance variable to read
- * @param _result	a loction to recieve the instance variable
+ * @param _result	a location to receive the instance variable
  *			value
  * 
  * @retval 0		success
@@ -215,7 +215,9 @@ typedef device_t bus_add_child_t(device_t _dev, u_int _order, const char *_name,
  * For busses which use use drivers supporting DEVICE_IDENTIFY() to
  * enumerate their devices, this method is used to create new
  * device instances. The new device will be added after the last
- * existing child with the same order.
+ * existing child with the same order. Implementations of bus_add_child
+ * call device_add_child_ordered to add the child and often add
+ * a suitable ivar to the device specific to that bus.
  * 
  * @param _dev		the bus device which will be the parent of the
  *			new child device
@@ -237,13 +239,35 @@ static __inline device_t BUS_ADD_CHILD(device_t _dev, u_int _order,
 	return ((bus_add_child_t *) _m)(_dev, _order, _name, _unit);
 }
 
+/** @brief Unique descriptor for the BUS_RESCAN() method */
+extern struct kobjop_desc bus_rescan_desc;
+/** @brief A function implementing the BUS_RESCAN() method */
+typedef int bus_rescan_t(device_t _dev);
+/**
+ * @brief Rescan the bus
+ *
+ * This method is called by a parent bridge or devctl to trigger a bus
+ * rescan.  The rescan should delete devices no longer present and
+ * enumerate devices that have newly arrived.
+ *
+ * @param _dev		the bus device
+ */
+
+static __inline int BUS_RESCAN(device_t _dev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_rescan);
+	return ((bus_rescan_t *) _m)(_dev);
+}
+
 /** @brief Unique descriptor for the BUS_ALLOC_RESOURCE() method */
 extern struct kobjop_desc bus_alloc_resource_desc;
 /** @brief A function implementing the BUS_ALLOC_RESOURCE() method */
 typedef struct resource * bus_alloc_resource_t(device_t _dev, device_t _child,
                                                int _type, int *_rid,
-                                               u_long _start, u_long _end,
-                                               u_long _count, u_int _flags);
+                                               rman_res_t _start,
+                                               rman_res_t _end,
+                                               rman_res_t _count, u_int _flags);
 /**
  * @brief Allocate a system resource
  *
@@ -260,9 +284,9 @@ typedef struct resource * bus_alloc_resource_t(device_t _dev, device_t _child,
  * @param _type		the type of resource to allocate
  * @param _rid		a pointer to the resource identifier
  * @param _start	hint at the start of the resource range - pass
- *			@c 0UL for any start address
+ *			@c 0 for any start address
  * @param _end		hint at the end of the resource range - pass
- *			@c ~0UL for any end address
+ *			@c ~0 for any end address
  * @param _count	hint at the size of range required - pass @c 1
  *			for any size
  * @param _flags	any extra flags to control the resource
@@ -275,8 +299,10 @@ typedef struct resource * bus_alloc_resource_t(device_t _dev, device_t _child,
 
 static __inline struct resource * BUS_ALLOC_RESOURCE(device_t _dev,
                                                      device_t _child, int _type,
-                                                     int *_rid, u_long _start,
-                                                     u_long _end, u_long _count,
+                                                     int *_rid,
+                                                     rman_res_t _start,
+                                                     rman_res_t _end,
+                                                     rman_res_t _count,
                                                      u_int _flags)
 {
 	kobjop_t _m;
@@ -293,8 +319,9 @@ typedef int bus_activate_resource_t(device_t _dev, device_t _child, int _type,
  * @brief Activate a resource
  *
  * Activate a resource previously allocated with
- * BUS_ALLOC_RESOURCE(). This may for instance map a memory region
- * into the kernel's virtual address space.
+ * BUS_ALLOC_RESOURCE().  This may enable decoding of this resource in a
+ * device for instance.  It will also establish a mapping for the resource
+ * unless RF_UNMAPPED was set when allocating the resource.
  *
  * @param _dev		the parent device of @p _child
  * @param _child	the device which allocated the resource
@@ -312,6 +339,67 @@ static __inline int BUS_ACTIVATE_RESOURCE(device_t _dev, device_t _child,
 	return ((bus_activate_resource_t *) _m)(_dev, _child, _type, _rid, _r);
 }
 
+/** @brief Unique descriptor for the BUS_MAP_RESOURCE() method */
+extern struct kobjop_desc bus_map_resource_desc;
+/** @brief A function implementing the BUS_MAP_RESOURCE() method */
+typedef int bus_map_resource_t(device_t _dev, device_t _child, int _type,
+                               struct resource *_r,
+                               struct resource_map_request *_args,
+                               struct resource_map *_map);
+/**
+ * @brief Map a resource
+ *
+ * Allocate a mapping for a range of an active resource.  The mapping
+ * is described by a struct resource_map object.  This may for instance
+ * map a memory region into the kernel's virtual address space.
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _child	the device which allocated the resource
+ * @param _type		the type of resource
+ * @param _r		the resource to map
+ * @param _args		optional attributes of the mapping
+ * @param _map		the mapping
+ */
+
+static __inline int BUS_MAP_RESOURCE(device_t _dev, device_t _child, int _type,
+                                     struct resource *_r,
+                                     struct resource_map_request *_args,
+                                     struct resource_map *_map)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_map_resource);
+	return ((bus_map_resource_t *) _m)(_dev, _child, _type, _r, _args, _map);
+}
+
+/** @brief Unique descriptor for the BUS_UNMAP_RESOURCE() method */
+extern struct kobjop_desc bus_unmap_resource_desc;
+/** @brief A function implementing the BUS_UNMAP_RESOURCE() method */
+typedef int bus_unmap_resource_t(device_t _dev, device_t _child, int _type,
+                                 struct resource *_r,
+                                 struct resource_map *_map);
+/**
+ * @brief Unmap a resource
+ *
+ * Release a mapping previously allocated with
+ * BUS_MAP_RESOURCE(). This may for instance unmap a memory region
+ * from the kernel's virtual address space.
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _child	the device which allocated the resource
+ * @param _type		the type of resource
+ * @param _r		the resource
+ * @param _map		the mapping to release
+ */
+
+static __inline int BUS_UNMAP_RESOURCE(device_t _dev, device_t _child,
+                                       int _type, struct resource *_r,
+                                       struct resource_map *_map)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_unmap_resource);
+	return ((bus_unmap_resource_t *) _m)(_dev, _child, _type, _r, _map);
+}
+
 /** @brief Unique descriptor for the BUS_DEACTIVATE_RESOURCE() method */
 extern struct kobjop_desc bus_deactivate_resource_desc;
 /** @brief A function implementing the BUS_DEACTIVATE_RESOURCE() method */
@@ -321,8 +409,7 @@ typedef int bus_deactivate_resource_t(device_t _dev, device_t _child, int _type,
  * @brief Deactivate a resource
  *
  * Deactivate a resource previously allocated with
- * BUS_ALLOC_RESOURCE(). This may for instance unmap a memory region
- * from the kernel's virtual address space.
+ * BUS_ALLOC_RESOURCE(). 
  *
  * @param _dev		the parent device of @p _child
  * @param _child	the device which allocated the resource
@@ -344,8 +431,8 @@ static __inline int BUS_DEACTIVATE_RESOURCE(device_t _dev, device_t _child,
 extern struct kobjop_desc bus_adjust_resource_desc;
 /** @brief A function implementing the BUS_ADJUST_RESOURCE() method */
 typedef int bus_adjust_resource_t(device_t _dev, device_t _child, int _type,
-                                  struct resource *_res, u_long _start,
-                                  u_long _end);
+                                  struct resource *_res, rman_res_t _start,
+                                  rman_res_t _end);
 /**
  * @brief Adjust a resource
  *
@@ -364,7 +451,7 @@ typedef int bus_adjust_resource_t(device_t _dev, device_t _child, int _type,
 
 static __inline int BUS_ADJUST_RESOURCE(device_t _dev, device_t _child,
                                         int _type, struct resource *_res,
-                                        u_long _start, u_long _end)
+                                        rman_res_t _start, rman_res_t _end)
 {
 	kobjop_t _m;
 	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_adjust_resource);
@@ -425,7 +512,7 @@ typedef int bus_setup_intr_t(device_t _dev, device_t _child,
  *			triggers
  * @param _arg		a value to use as the single argument in calls
  *			to @p _intr
- * @param _cookiep	a pointer to a location to recieve a cookie
+ * @param _cookiep	a pointer to a location to receive a cookie
  *			value that may be used to remove the interrupt
  *			handler
  */
@@ -472,7 +559,7 @@ static __inline int BUS_TEARDOWN_INTR(device_t _dev, device_t _child,
 extern struct kobjop_desc bus_set_resource_desc;
 /** @brief A function implementing the BUS_SET_RESOURCE() method */
 typedef int bus_set_resource_t(device_t _dev, device_t _child, int _type,
-                               int _rid, u_long _start, u_long _count);
+                               int _rid, rman_res_t _start, rman_res_t _count);
 /**
  * @brief Define a resource which can be allocated with
  * BUS_ALLOC_RESOURCE().
@@ -492,7 +579,8 @@ typedef int bus_set_resource_t(device_t _dev, device_t _child, int _type,
  */
 
 static __inline int BUS_SET_RESOURCE(device_t _dev, device_t _child, int _type,
-                                     int _rid, u_long _start, u_long _count)
+                                     int _rid, rman_res_t _start,
+                                     rman_res_t _count)
 {
 	kobjop_t _m;
 	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_set_resource);
@@ -503,7 +591,8 @@ static __inline int BUS_SET_RESOURCE(device_t _dev, device_t _child, int _type,
 extern struct kobjop_desc bus_get_resource_desc;
 /** @brief A function implementing the BUS_GET_RESOURCE() method */
 typedef int bus_get_resource_t(device_t _dev, device_t _child, int _type,
-                               int _rid, u_long *_startp, u_long *_countp);
+                               int _rid, rman_res_t *_startp,
+                               rman_res_t *_countp);
 /**
  * @brief Describe a resource
  *
@@ -514,14 +603,15 @@ typedef int bus_get_resource_t(device_t _dev, device_t _child, int _type,
  * @param _child	the device which owns the resource
  * @param _type		the type of resource
  * @param _rid		the resource identifier
- * @param _start	the address of a location to recieve the start
+ * @param _start	the address of a location to receive the start
  *			index of the resource range
- * @param _count	the address of a location to recieve the size
+ * @param _count	the address of a location to receive the size
  *			of the resource range
  */
 
 static __inline int BUS_GET_RESOURCE(device_t _dev, device_t _child, int _type,
-                                     int _rid, u_long *_startp, u_long *_countp)
+                                     int _rid, rman_res_t *_startp,
+                                     rman_res_t *_countp)
 {
 	kobjop_t _m;
 	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_get_resource);
@@ -612,8 +702,15 @@ typedef int bus_child_pnpinfo_str_t(device_t _dev, device_t _child, char *_buf,
 /**
  * @brief Returns the pnp info for this device.
  *
- * Return it as a string.  If the string is insufficient for the
- * storage, then return EOVERFLOW.
+ * Return it as a string.  If the storage is insufficient for the
+ * string, then return EOVERFLOW.
+ *
+ * The string must be formatted as a space-separated list of
+ * name=value pairs.  Names may only contain alphanumeric characters,
+ * underscores ('_') and hyphens ('-').  Values can contain any
+ * non-whitespace characters.  Values containing whitespace can be
+ * quoted with double quotes ('"').  Double quotes and backslashes in
+ * quoted values can be escaped with backslashes ('\').
  * 
  * @param _dev		the parent device of @p _child
  * @param _child	the device which is being examined
@@ -638,9 +735,16 @@ typedef int bus_child_location_str_t(device_t _dev, device_t _child, char *_buf,
 /**
  * @brief Returns the location for this device.
  *
- * Return it as a string.  If the string is insufficient for the
- * storage, then return EOVERFLOW.
- * 
+ * Return it as a string.  If the storage is insufficient for the
+ * string, then return EOVERFLOW.
+ *
+ * The string must be formatted as a space-separated list of
+ * name=value pairs.  Names may only contain alphanumeric characters,
+ * underscores ('_') and hyphens ('-').  Values can contain any
+ * non-whitespace characters.  Values containing whitespace can be
+ * quoted with double quotes ('"').  Double quotes and backslashes in
+ * quoted values can be escaped with backslashes ('\').
+ *
  * @param _dev		the parent device of @p _child
  * @param _child	the device which is being examined
  * @param _buf		the address of a buffer to receive the location
@@ -777,6 +881,24 @@ static __inline bus_dma_tag_t BUS_GET_DMA_TAG(device_t _dev, device_t _child)
 	return ((bus_get_dma_tag_t *) _m)(_dev, _child);
 }
 
+/** @brief Unique descriptor for the BUS_GET_BUS_TAG() method */
+extern struct kobjop_desc bus_get_bus_tag_desc;
+/** @brief A function implementing the BUS_GET_BUS_TAG() method */
+typedef bus_space_tag_t bus_get_bus_tag_t(device_t _dev, device_t _child);
+/**
+ * @brief Returns bus_space_tag_t for use w/ devices on the bus.
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _child	the device to which the tag will belong
+ */
+
+static __inline bus_space_tag_t BUS_GET_BUS_TAG(device_t _dev, device_t _child)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_get_bus_tag);
+	return ((bus_get_bus_tag_t *) _m)(_dev, _child);
+}
+
 /** @brief Unique descriptor for the BUS_HINT_DEVICE_UNIT() method */
 extern struct kobjop_desc bus_hint_device_unit_desc;
 /** @brief A function implementing the BUS_HINT_DEVICE_UNIT() method */
@@ -835,4 +957,84 @@ static __inline int BUS_REMAP_INTR(device_t _dev, device_t _child, u_int _irq)
 	return ((bus_remap_intr_t *) _m)(_dev, _child, _irq);
 }
 
+/** @brief Unique descriptor for the BUS_SUSPEND_CHILD() method */
+extern struct kobjop_desc bus_suspend_child_desc;
+/** @brief A function implementing the BUS_SUSPEND_CHILD() method */
+typedef int bus_suspend_child_t(device_t _dev, device_t _child);
+/**
+ * @brief Suspend a given child
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _child	the device to suspend
+ */
+
+static __inline int BUS_SUSPEND_CHILD(device_t _dev, device_t _child)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_suspend_child);
+	return ((bus_suspend_child_t *) _m)(_dev, _child);
+}
+
+/** @brief Unique descriptor for the BUS_RESUME_CHILD() method */
+extern struct kobjop_desc bus_resume_child_desc;
+/** @brief A function implementing the BUS_RESUME_CHILD() method */
+typedef int bus_resume_child_t(device_t _dev, device_t _child);
+/**
+ * @brief Resume a given child
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _child	the device to resume
+ */
+
+static __inline int BUS_RESUME_CHILD(device_t _dev, device_t _child)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_resume_child);
+	return ((bus_resume_child_t *) _m)(_dev, _child);
+}
+
+/** @brief Unique descriptor for the BUS_GET_DOMAIN() method */
+extern struct kobjop_desc bus_get_domain_desc;
+/** @brief A function implementing the BUS_GET_DOMAIN() method */
+typedef int bus_get_domain_t(device_t _dev, device_t _child, int *_domain);
+/**
+ * @brief Get the VM domain handle for the given bus and child.
+ *
+ * @param _dev		the bus device
+ * @param _child	the child device
+ * @param _domain	a pointer to the bus's domain handle identifier
+ */
+
+static __inline int BUS_GET_DOMAIN(device_t _dev, device_t _child, int *_domain)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_get_domain);
+	return ((bus_get_domain_t *) _m)(_dev, _child, _domain);
+}
+
+/** @brief Unique descriptor for the BUS_GET_CPUS() method */
+extern struct kobjop_desc bus_get_cpus_desc;
+/** @brief A function implementing the BUS_GET_CPUS() method */
+typedef int bus_get_cpus_t(device_t _dev, device_t _child, enum cpu_sets _op,
+                           size_t _setsize, cpuset_t *_cpuset);
+/**
+ * @brief Request a set of CPUs
+ *
+ * @param _dev		the bus device
+ * @param _child	the child device
+ * @param _op		type of CPUs to request
+ * @param _setsize	the size of the set passed in _cpuset
+ * @param _cpuset	a pointer to a cpuset to receive the requested
+ *			set of CPUs
+ */
+
+static __inline int BUS_GET_CPUS(device_t _dev, device_t _child,
+                                 enum cpu_sets _op, size_t _setsize,
+                                 cpuset_t *_cpuset)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_get_cpus);
+	return ((bus_get_cpus_t *) _m)(_dev, _child, _op, _setsize, _cpuset);
+}
+
 #endif /* _bus_if_h_ */
diff --git a/rtemsbsd/include/rtems/bsd/local/device_if.h b/rtemsbsd/include/rtems/bsd/local/device_if.h
index 7a2cbc72..e27c2b52 100644
--- a/rtemsbsd/include/rtems/bsd/local/device_if.h
+++ b/rtemsbsd/include/rtems/bsd/local/device_if.h
@@ -52,28 +52,29 @@ typedef int device_probe_t(device_t dev);
  * the probe before returning. The return value of DEVICE_PROBE()
  * is used to elect which driver is used - the driver which returns
  * the largest non-error value wins the election and attaches to
- * the device.
+ * the device. Common non-error values are described in the
+ * DEVICE_PROBE(9) manual page.
  *
  * If a driver matches the hardware, it should set the device
  * description string using device_set_desc() or
- * device_set_desc_copy(). This string is
- * used to generate an informative message when DEVICE_ATTACH()
- * is called.
+ * device_set_desc_copy(). This string is used to generate an
+ * informative message when DEVICE_ATTACH() is called.
  * 
  * As a special case, if a driver returns zero, the driver election
  * is cut short and that driver will attach to the device
- * immediately.
+ * immediately. This should rarely be used.
  *
- * For example, a probe method for a pci device driver might look
+ * For example, a probe method for a PCI device driver might look
  * like this:
  *
  * @code
- * int foo_probe(device_t dev)
+ * int
+ * foo_probe(device_t dev)
  * {
  *         if (pci_get_vendor(dev) == FOOVENDOR &&
  *             pci_get_device(dev) == FOODEVICE) {
  *                 device_set_desc(dev, "Foo device");
- *                 return (0);
+ *                 return (BUS_PROBE_DEFAULT);
  *         }
  *         return (ENXIO);
  * }
@@ -88,7 +89,8 @@ typedef int device_probe_t(device_t dev);
  *
  * @param dev		the device to probe
  *
- * @retval 0		if the driver strongly matches this device
+ * @retval 0		if this is the only possible driver for this
+ *			device
  * @retval negative	if the driver can match this device - the
  *			least negative value is used to select the
  *			driver
@@ -337,4 +339,33 @@ static __inline int DEVICE_QUIESCE(device_t dev)
 	return ((device_quiesce_t *) _m)(dev);
 }
 
+/** @brief Unique descriptor for the DEVICE_REGISTER() method */
+extern struct kobjop_desc device_register_desc;
+/** @brief A function implementing the DEVICE_REGISTER() method */
+typedef void * device_register_t(device_t dev);
+/**
+ * @brief This is called when the driver is asked to register handlers.
+ *
+ *
+ * To include this method in a device driver, use a line like this
+ * in the driver's method list:
+ *
+ * @code
+ * 	KOBJMETHOD(device_register, foo_register)
+ * @endcode
+ *
+ * @param dev		the device for which handlers are being registered
+ *
+ * @retval NULL     method not implemented
+ * @retval non-NULL	a pointer to implementation specific static driver state
+ *
+ */
+
+static __inline void * DEVICE_REGISTER(device_t dev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,device_register);
+	return ((device_register_t *) _m)(dev);
+}
+
 #endif /* _device_if_h_ */
diff --git a/rtemsbsd/include/rtems/bsd/local/gpio_if.h b/rtemsbsd/include/rtems/bsd/local/gpio_if.h
new file mode 100644
index 00000000..1d42f82b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/gpio_if.h
@@ -0,0 +1,151 @@
+/*
+ * This file is produced automatically.
+ * Do not modify anything in here by hand.
+ *
+ * Created from source file
+ *   freebsd-org/sys/dev/gpio/gpio_if.m
+ * with
+ *   makeobjops.awk
+ *
+ * See the source file for legal information
+ */
+
+
+#ifndef _gpio_if_h_
+#define _gpio_if_h_
+
+
+#include <dev/ofw/openfirm.h>
+
+/** @brief Unique descriptor for the GPIO_GET_BUS() method */
+extern struct kobjop_desc gpio_get_bus_desc;
+/** @brief A function implementing the GPIO_GET_BUS() method */
+typedef device_t gpio_get_bus_t(device_t dev);
+
+static __inline device_t GPIO_GET_BUS(device_t dev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,gpio_get_bus);
+	return ((gpio_get_bus_t *) _m)(dev);
+}
+
+/** @brief Unique descriptor for the GPIO_PIN_MAX() method */
+extern struct kobjop_desc gpio_pin_max_desc;
+/** @brief A function implementing the GPIO_PIN_MAX() method */
+typedef int gpio_pin_max_t(device_t dev, int *maxpin);
+
+static __inline int GPIO_PIN_MAX(device_t dev, int *maxpin)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,gpio_pin_max);
+	return ((gpio_pin_max_t *) _m)(dev, maxpin);
+}
+
+/** @brief Unique descriptor for the GPIO_PIN_SET() method */
+extern struct kobjop_desc gpio_pin_set_desc;
+/** @brief A function implementing the GPIO_PIN_SET() method */
+typedef int gpio_pin_set_t(device_t dev, uint32_t pin_num, uint32_t pin_value);
+
+static __inline int GPIO_PIN_SET(device_t dev, uint32_t pin_num,
+                                 uint32_t pin_value)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,gpio_pin_set);
+	return ((gpio_pin_set_t *) _m)(dev, pin_num, pin_value);
+}
+
+/** @brief Unique descriptor for the GPIO_PIN_GET() method */
+extern struct kobjop_desc gpio_pin_get_desc;
+/** @brief A function implementing the GPIO_PIN_GET() method */
+typedef int gpio_pin_get_t(device_t dev, uint32_t pin_num, uint32_t *pin_value);
+
+static __inline int GPIO_PIN_GET(device_t dev, uint32_t pin_num,
+                                 uint32_t *pin_value)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,gpio_pin_get);
+	return ((gpio_pin_get_t *) _m)(dev, pin_num, pin_value);
+}
+
+/** @brief Unique descriptor for the GPIO_PIN_TOGGLE() method */
+extern struct kobjop_desc gpio_pin_toggle_desc;
+/** @brief A function implementing the GPIO_PIN_TOGGLE() method */
+typedef int gpio_pin_toggle_t(device_t dev, uint32_t pin_num);
+
+static __inline int GPIO_PIN_TOGGLE(device_t dev, uint32_t pin_num)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,gpio_pin_toggle);
+	return ((gpio_pin_toggle_t *) _m)(dev, pin_num);
+}
+
+/** @brief Unique descriptor for the GPIO_PIN_GETCAPS() method */
+extern struct kobjop_desc gpio_pin_getcaps_desc;
+/** @brief A function implementing the GPIO_PIN_GETCAPS() method */
+typedef int gpio_pin_getcaps_t(device_t dev, uint32_t pin_num, uint32_t *caps);
+
+static __inline int GPIO_PIN_GETCAPS(device_t dev, uint32_t pin_num,
+                                     uint32_t *caps)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,gpio_pin_getcaps);
+	return ((gpio_pin_getcaps_t *) _m)(dev, pin_num, caps);
+}
+
+/** @brief Unique descriptor for the GPIO_PIN_GETFLAGS() method */
+extern struct kobjop_desc gpio_pin_getflags_desc;
+/** @brief A function implementing the GPIO_PIN_GETFLAGS() method */
+typedef int gpio_pin_getflags_t(device_t dev, uint32_t pin_num,
+                                uint32_t *flags);
+
+static __inline int GPIO_PIN_GETFLAGS(device_t dev, uint32_t pin_num,
+                                      uint32_t *flags)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,gpio_pin_getflags);
+	return ((gpio_pin_getflags_t *) _m)(dev, pin_num, flags);
+}
+
+/** @brief Unique descriptor for the GPIO_PIN_GETNAME() method */
+extern struct kobjop_desc gpio_pin_getname_desc;
+/** @brief A function implementing the GPIO_PIN_GETNAME() method */
+typedef int gpio_pin_getname_t(device_t dev, uint32_t pin_num, char *name);
+
+static __inline int GPIO_PIN_GETNAME(device_t dev, uint32_t pin_num, char *name)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,gpio_pin_getname);
+	return ((gpio_pin_getname_t *) _m)(dev, pin_num, name);
+}
+
+/** @brief Unique descriptor for the GPIO_PIN_SETFLAGS() method */
+extern struct kobjop_desc gpio_pin_setflags_desc;
+/** @brief A function implementing the GPIO_PIN_SETFLAGS() method */
+typedef int gpio_pin_setflags_t(device_t dev, uint32_t pin_num, uint32_t flags);
+
+static __inline int GPIO_PIN_SETFLAGS(device_t dev, uint32_t pin_num,
+                                      uint32_t flags)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,gpio_pin_setflags);
+	return ((gpio_pin_setflags_t *) _m)(dev, pin_num, flags);
+}
+
+/** @brief Unique descriptor for the GPIO_MAP_GPIOS() method */
+extern struct kobjop_desc gpio_map_gpios_desc;
+/** @brief A function implementing the GPIO_MAP_GPIOS() method */
+typedef int gpio_map_gpios_t(device_t bus, phandle_t dev, phandle_t gparent,
+                             int gcells, pcell_t *gpios, uint32_t *pin,
+                             uint32_t *flags);
+
+static __inline int GPIO_MAP_GPIOS(device_t bus, phandle_t dev,
+                                   phandle_t gparent, int gcells,
+                                   pcell_t *gpios, uint32_t *pin,
+                                   uint32_t *flags)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)bus)->ops,gpio_map_gpios);
+	return ((gpio_map_gpios_t *) _m)(bus, dev, gparent, gcells, gpios, pin, flags);
+}
+
+#endif /* _gpio_if_h_ */
diff --git a/rtemsbsd/include/rtems/bsd/local/if_dwc_if.h b/rtemsbsd/include/rtems/bsd/local/if_dwc_if.h
new file mode 100644
index 00000000..17aa3b8e
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/if_dwc_if.h
@@ -0,0 +1,55 @@
+/*
+ * This file is produced automatically.
+ * Do not modify anything in here by hand.
+ *
+ * Created from source file
+ *   freebsd-org/sys/dev/dwc/if_dwc_if.m
+ * with
+ *   makeobjops.awk
+ *
+ * See the source file for legal information
+ */
+
+
+#ifndef _if_dwc_if_h_
+#define _if_dwc_if_h_
+
+
+
+/** @brief Unique descriptor for the IF_DWC_INIT() method */
+extern struct kobjop_desc if_dwc_init_desc;
+/** @brief A function implementing the IF_DWC_INIT() method */
+typedef int if_dwc_init_t(device_t dev);
+
+static __inline int IF_DWC_INIT(device_t dev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,if_dwc_init);
+	return ((if_dwc_init_t *) _m)(dev);
+}
+
+/** @brief Unique descriptor for the IF_DWC_MAC_TYPE() method */
+extern struct kobjop_desc if_dwc_mac_type_desc;
+/** @brief A function implementing the IF_DWC_MAC_TYPE() method */
+typedef int if_dwc_mac_type_t(device_t dev);
+
+static __inline int IF_DWC_MAC_TYPE(device_t dev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,if_dwc_mac_type);
+	return ((if_dwc_mac_type_t *) _m)(dev);
+}
+
+/** @brief Unique descriptor for the IF_DWC_MII_CLK() method */
+extern struct kobjop_desc if_dwc_mii_clk_desc;
+/** @brief A function implementing the IF_DWC_MII_CLK() method */
+typedef int if_dwc_mii_clk_t(device_t dev);
+
+static __inline int IF_DWC_MII_CLK(device_t dev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,if_dwc_mii_clk);
+	return ((if_dwc_mii_clk_t *) _m)(dev);
+}
+
+#endif /* _if_dwc_if_h_ */
diff --git a/rtemsbsd/include/rtems/bsd/local/miidevs.h b/rtemsbsd/include/rtems/bsd/local/miidevs.h
index 82f0102b..2199229d 100644
--- a/rtemsbsd/include/rtems/bsd/local/miidevs.h
+++ b/rtemsbsd/include/rtems/bsd/local/miidevs.h
@@ -187,8 +187,14 @@
 #define	MII_STR_BROADCOM_BCM5400	"BCM5400 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM_BCM5401	0x0005
 #define	MII_STR_BROADCOM_BCM5401	"BCM5401 1000BASE-T media interface"
+#define	MII_MODEL_BROADCOM_BCM5402	0x0006
+#define	MII_STR_BROADCOM_BCM5402	"BCM5402 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM_BCM5411	0x0007
 #define	MII_STR_BROADCOM_BCM5411	"BCM5411 1000BASE-T media interface"
+#define	MII_MODEL_BROADCOM_BCM5404	0x0008
+#define	MII_STR_BROADCOM_BCM5404	"BCM5404 1000BASE-T media interface"
+#define	MII_MODEL_BROADCOM_BCM5424	0x000a
+#define	MII_STR_BROADCOM_BCM5424	"BCM5424/BCM5234 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM_BCM5464	0x000b
 #define	MII_STR_BROADCOM_BCM5464	"BCM5464 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM_BCM5461	0x000c
@@ -219,10 +225,16 @@
 #define	MII_STR_BROADCOM_BCM5780	"BCM5780 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM_BCM5708C	0x0036
 #define	MII_STR_BROADCOM_BCM5708C	"BCM5708C 1000BASE-T media interface"
+#define	MII_MODEL_BROADCOM_BCM5466	0x003b
+#define	MII_STR_BROADCOM_BCM5466	"BCM5466 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM2_BCM5325	0x0003
 #define	MII_STR_BROADCOM2_BCM5325	"BCM5325 10/100 5-port PHY switch"
 #define	MII_MODEL_BROADCOM2_BCM5906	0x0004
 #define	MII_STR_BROADCOM2_BCM5906	"BCM5906 10/100baseTX media interface"
+#define	MII_MODEL_BROADCOM2_BCM5478	0x0008
+#define	MII_STR_BROADCOM2_BCM5478	"BCM5478 1000BASE-T media interface"
+#define	MII_MODEL_BROADCOM2_BCM5488	0x0009
+#define	MII_STR_BROADCOM2_BCM5488	"BCM5488 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM2_BCM5481	0x000a
 #define	MII_STR_BROADCOM2_BCM5481	"BCM5481 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM2_BCM5482	0x000b
@@ -230,7 +242,7 @@
 #define	MII_MODEL_BROADCOM2_BCM5755	0x000c
 #define	MII_STR_BROADCOM2_BCM5755	"BCM5755 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM2_BCM5754	0x000e
-#define	MII_STR_BROADCOM2_BCM5754	"BCM5754/5787 1000BASE-T media interface"
+#define	MII_STR_BROADCOM2_BCM5754	"BCM5754/BCM5787 1000BASE-T media interface"
 #define	MII_MODEL_BROADCOM2_BCM5708S	0x0015
 #define	MII_STR_BROADCOM2_BCM5708S	"BCM5708S 1000/2500baseSX PHY"
 #define	MII_MODEL_BROADCOM2_BCM5785	0x0016
@@ -411,6 +423,8 @@
 /* Micrel PHYs */
 #define	MII_MODEL_MICREL_KSZ9021	0x0021
 #define	MII_STR_MICREL_KSZ9021	"Micrel KSZ9021 10/100/1000 PHY"
+#define	MII_MODEL_MICREL_KSZ9031	0x0022
+#define	MII_STR_MICREL_KSZ9031	"Micrel KSZ9031 10/100/1000 PHY"
 
 /* Myson Technology PHYs */
 #define	MII_MODEL_xxMYSON_MTD972	0x0000
@@ -505,3 +519,5 @@
 /* SMC */
 #define	MII_MODEL_SMC_LAN8710A	0x000F
 #define	MII_STR_SMC_LAN8710A	"SMC LAN8710A 10/100 interface"
+#define	MII_MODEL_SMC_LAN8700	0x000C
+#define	MII_STR_SMC_LAN8700	"SMC LAN8700 10/100 interface"
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_callout_profiling.h b/rtemsbsd/include/rtems/bsd/local/opt_callout_profiling.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_callout_profiling.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_em.h b/rtemsbsd/include/rtems/bsd/local/opt_em.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_em.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_ifmedia.h b/rtemsbsd/include/rtems/bsd/local/opt_ifmedia.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_ifmedia.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_kld.h b/rtemsbsd/include/rtems/bsd/local/opt_kld.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_kld.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_kqueue.h b/rtemsbsd/include/rtems/bsd/local/opt_kqueue.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_kqueue.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_kstack_usage_prof.h b/rtemsbsd/include/rtems/bsd/local/opt_kstack_usage_prof.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_kstack_usage_prof.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_pci.h b/rtemsbsd/include/rtems/bsd/local/opt_pci.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_pci.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_rss.h b/rtemsbsd/include/rtems/bsd/local/opt_rss.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_rss.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_stack.h b/rtemsbsd/include/rtems/bsd/local/opt_stack.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_stack.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_timer.h b/rtemsbsd/include/rtems/bsd/local/opt_timer.h
new file mode 100644
index 00000000..188d2f49
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_timer.h
@@ -0,0 +1 @@
+#define	NO_EVENTTIMERS 1
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_verbose_sysinit.h b/rtemsbsd/include/rtems/bsd/local/opt_verbose_sysinit.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_verbose_sysinit.h
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_vm.h b/rtemsbsd/include/rtems/bsd/local/opt_vm.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_vm.h
diff --git a/rtemsbsd/include/rtems/bsd/local/pci_if.h b/rtemsbsd/include/rtems/bsd/local/pci_if.h
index d4152556..2f11c95a 100644
--- a/rtemsbsd/include/rtems/bsd/local/pci_if.h
+++ b/rtemsbsd/include/rtems/bsd/local/pci_if.h
@@ -14,6 +14,14 @@
 #ifndef _pci_if_h_
 #define _pci_if_h_
 
+
+struct nvlist;
+
+enum pci_id_type {
+    PCI_ID_RID,
+    PCI_ID_MSI,
+};
+
 /** @brief Unique descriptor for the PCI_READ_CONFIG() method */
 extern struct kobjop_desc pci_read_config_desc;
 /** @brief A function implementing the PCI_READ_CONFIG() method */
@@ -154,6 +162,20 @@ static __inline int PCI_ASSIGN_INTERRUPT(device_t dev, device_t child)
 	return ((pci_assign_interrupt_t *) _m)(dev, child);
 }
 
+/** @brief Unique descriptor for the PCI_FIND_CAP() method */
+extern struct kobjop_desc pci_find_cap_desc;
+/** @brief A function implementing the PCI_FIND_CAP() method */
+typedef int pci_find_cap_t(device_t dev, device_t child, int capability,
+                           int *capreg);
+
+static __inline int PCI_FIND_CAP(device_t dev, device_t child, int capability,
+                                 int *capreg)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_find_cap);
+	return ((pci_find_cap_t *) _m)(dev, child, capability, capreg);
+}
+
 /** @brief Unique descriptor for the PCI_FIND_EXTCAP() method */
 extern struct kobjop_desc pci_find_extcap_desc;
 /** @brief A function implementing the PCI_FIND_EXTCAP() method */
@@ -168,6 +190,20 @@ static __inline int PCI_FIND_EXTCAP(device_t dev, device_t child,
 	return ((pci_find_extcap_t *) _m)(dev, child, capability, capreg);
 }
 
+/** @brief Unique descriptor for the PCI_FIND_HTCAP() method */
+extern struct kobjop_desc pci_find_htcap_desc;
+/** @brief A function implementing the PCI_FIND_HTCAP() method */
+typedef int pci_find_htcap_t(device_t dev, device_t child, int capability,
+                             int *capreg);
+
+static __inline int PCI_FIND_HTCAP(device_t dev, device_t child, int capability,
+                                   int *capreg)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_find_htcap);
+	return ((pci_find_htcap_t *) _m)(dev, child, capability, capreg);
+}
+
 /** @brief Unique descriptor for the PCI_ALLOC_MSI() method */
 extern struct kobjop_desc pci_alloc_msi_desc;
 /** @brief A function implementing the PCI_ALLOC_MSI() method */
@@ -192,6 +228,46 @@ static __inline int PCI_ALLOC_MSIX(device_t dev, device_t child, int *count)
 	return ((pci_alloc_msix_t *) _m)(dev, child, count);
 }
 
+/** @brief Unique descriptor for the PCI_ENABLE_MSI() method */
+extern struct kobjop_desc pci_enable_msi_desc;
+/** @brief A function implementing the PCI_ENABLE_MSI() method */
+typedef void pci_enable_msi_t(device_t dev, device_t child, uint64_t address,
+                              uint16_t data);
+
+static __inline void PCI_ENABLE_MSI(device_t dev, device_t child,
+                                    uint64_t address, uint16_t data)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_enable_msi);
+	((pci_enable_msi_t *) _m)(dev, child, address, data);
+}
+
+/** @brief Unique descriptor for the PCI_ENABLE_MSIX() method */
+extern struct kobjop_desc pci_enable_msix_desc;
+/** @brief A function implementing the PCI_ENABLE_MSIX() method */
+typedef void pci_enable_msix_t(device_t dev, device_t child, u_int index,
+                               uint64_t address, uint32_t data);
+
+static __inline void PCI_ENABLE_MSIX(device_t dev, device_t child, u_int index,
+                                     uint64_t address, uint32_t data)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_enable_msix);
+	((pci_enable_msix_t *) _m)(dev, child, index, address, data);
+}
+
+/** @brief Unique descriptor for the PCI_DISABLE_MSI() method */
+extern struct kobjop_desc pci_disable_msi_desc;
+/** @brief A function implementing the PCI_DISABLE_MSI() method */
+typedef void pci_disable_msi_t(device_t dev, device_t child);
+
+static __inline void PCI_DISABLE_MSI(device_t dev, device_t child)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_disable_msi);
+	((pci_disable_msi_t *) _m)(dev, child);
+}
+
 /** @brief Unique descriptor for the PCI_REMAP_MSIX() method */
 extern struct kobjop_desc pci_remap_msix_desc;
 /** @brief A function implementing the PCI_REMAP_MSIX() method */
@@ -242,4 +318,109 @@ static __inline int PCI_MSIX_COUNT(device_t dev, device_t child)
 	return ((pci_msix_count_t *) _m)(dev, child);
 }
 
+/** @brief Unique descriptor for the PCI_MSIX_PBA_BAR() method */
+extern struct kobjop_desc pci_msix_pba_bar_desc;
+/** @brief A function implementing the PCI_MSIX_PBA_BAR() method */
+typedef int pci_msix_pba_bar_t(device_t dev, device_t child);
+
+static __inline int PCI_MSIX_PBA_BAR(device_t dev, device_t child)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_msix_pba_bar);
+	return ((pci_msix_pba_bar_t *) _m)(dev, child);
+}
+
+/** @brief Unique descriptor for the PCI_MSIX_TABLE_BAR() method */
+extern struct kobjop_desc pci_msix_table_bar_desc;
+/** @brief A function implementing the PCI_MSIX_TABLE_BAR() method */
+typedef int pci_msix_table_bar_t(device_t dev, device_t child);
+
+static __inline int PCI_MSIX_TABLE_BAR(device_t dev, device_t child)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_msix_table_bar);
+	return ((pci_msix_table_bar_t *) _m)(dev, child);
+}
+
+/** @brief Unique descriptor for the PCI_GET_ID() method */
+extern struct kobjop_desc pci_get_id_desc;
+/** @brief A function implementing the PCI_GET_ID() method */
+typedef int pci_get_id_t(device_t dev, device_t child, enum pci_id_type type,
+                         uintptr_t *id);
+
+static __inline int PCI_GET_ID(device_t dev, device_t child,
+                               enum pci_id_type type, uintptr_t *id)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_get_id);
+	return ((pci_get_id_t *) _m)(dev, child, type, id);
+}
+
+/** @brief Unique descriptor for the PCI_ALLOC_DEVINFO() method */
+extern struct kobjop_desc pci_alloc_devinfo_desc;
+/** @brief A function implementing the PCI_ALLOC_DEVINFO() method */
+typedef struct pci_devinfo * pci_alloc_devinfo_t(device_t dev);
+
+static __inline struct pci_devinfo * PCI_ALLOC_DEVINFO(device_t dev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_alloc_devinfo);
+	return ((pci_alloc_devinfo_t *) _m)(dev);
+}
+
+/** @brief Unique descriptor for the PCI_CHILD_ADDED() method */
+extern struct kobjop_desc pci_child_added_desc;
+/** @brief A function implementing the PCI_CHILD_ADDED() method */
+typedef void pci_child_added_t(device_t dev, device_t child);
+
+static __inline void PCI_CHILD_ADDED(device_t dev, device_t child)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_child_added);
+	((pci_child_added_t *) _m)(dev, child);
+}
+
+/** @brief Unique descriptor for the PCI_IOV_ATTACH() method */
+extern struct kobjop_desc pci_iov_attach_desc;
+/** @brief A function implementing the PCI_IOV_ATTACH() method */
+typedef int pci_iov_attach_t(device_t dev, device_t child,
+                             struct nvlist *pf_schema, struct nvlist *vf_schema,
+                             const char *name);
+
+static __inline int PCI_IOV_ATTACH(device_t dev, device_t child,
+                                   struct nvlist *pf_schema,
+                                   struct nvlist *vf_schema, const char *name)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_iov_attach);
+	return ((pci_iov_attach_t *) _m)(dev, child, pf_schema, vf_schema, name);
+}
+
+/** @brief Unique descriptor for the PCI_IOV_DETACH() method */
+extern struct kobjop_desc pci_iov_detach_desc;
+/** @brief A function implementing the PCI_IOV_DETACH() method */
+typedef int pci_iov_detach_t(device_t dev, device_t child);
+
+static __inline int PCI_IOV_DETACH(device_t dev, device_t child)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_iov_detach);
+	return ((pci_iov_detach_t *) _m)(dev, child);
+}
+
+/** @brief Unique descriptor for the PCI_CREATE_IOV_CHILD() method */
+extern struct kobjop_desc pci_create_iov_child_desc;
+/** @brief A function implementing the PCI_CREATE_IOV_CHILD() method */
+typedef device_t pci_create_iov_child_t(device_t bus, device_t pf, uint16_t rid,
+                                        uint16_t vid, uint16_t did);
+
+static __inline device_t PCI_CREATE_IOV_CHILD(device_t bus, device_t pf,
+                                              uint16_t rid, uint16_t vid,
+                                              uint16_t did)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)bus)->ops,pci_create_iov_child);
+	return ((pci_create_iov_child_t *) _m)(bus, pf, rid, vid, did);
+}
+
 #endif /* _pci_if_h_ */
diff --git a/rtemsbsd/include/rtems/bsd/local/pcib_if.h b/rtemsbsd/include/rtems/bsd/local/pcib_if.h
index d8f20c78..a7c06c31 100644
--- a/rtemsbsd/include/rtems/bsd/local/pcib_if.h
+++ b/rtemsbsd/include/rtems/bsd/local/pcib_if.h
@@ -14,6 +14,9 @@
 #ifndef _pcib_if_h_
 #define _pcib_if_h_
 
+
+#include "pci_if.h"
+
 /** @brief Unique descriptor for the PCIB_MAXSLOTS() method */
 extern struct kobjop_desc pcib_maxslots_desc;
 /** @brief A function implementing the PCIB_MAXSLOTS() method */
@@ -26,6 +29,18 @@ static __inline int PCIB_MAXSLOTS(device_t dev)
 	return ((pcib_maxslots_t *) _m)(dev);
 }
 
+/** @brief Unique descriptor for the PCIB_MAXFUNCS() method */
+extern struct kobjop_desc pcib_maxfuncs_desc;
+/** @brief A function implementing the PCIB_MAXFUNCS() method */
+typedef int pcib_maxfuncs_t(device_t dev);
+
+static __inline int PCIB_MAXFUNCS(device_t dev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)dev)->ops,pcib_maxfuncs);
+	return ((pcib_maxfuncs_t *) _m)(dev);
+}
+
 /** @brief Unique descriptor for the PCIB_READ_CONFIG() method */
 extern struct kobjop_desc pcib_read_config_desc;
 /** @brief A function implementing the PCIB_READ_CONFIG() method */
@@ -147,4 +162,56 @@ static __inline int PCIB_POWER_FOR_SLEEP(device_t pcib, device_t dev,
 	return ((pcib_power_for_sleep_t *) _m)(pcib, dev, pstate);
 }
 
+/** @brief Unique descriptor for the PCIB_GET_ID() method */
+extern struct kobjop_desc pcib_get_id_desc;
+/** @brief A function implementing the PCIB_GET_ID() method */
+typedef int pcib_get_id_t(device_t pcib, device_t dev, enum pci_id_type type,
+                          uintptr_t *id);
+
+static __inline int PCIB_GET_ID(device_t pcib, device_t dev,
+                                enum pci_id_type type, uintptr_t *id)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)pcib)->ops,pcib_get_id);
+	return ((pcib_get_id_t *) _m)(pcib, dev, type, id);
+}
+
+/** @brief Unique descriptor for the PCIB_TRY_ENABLE_ARI() method */
+extern struct kobjop_desc pcib_try_enable_ari_desc;
+/** @brief A function implementing the PCIB_TRY_ENABLE_ARI() method */
+typedef int pcib_try_enable_ari_t(device_t pcib, device_t dev);
+
+static __inline int PCIB_TRY_ENABLE_ARI(device_t pcib, device_t dev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)pcib)->ops,pcib_try_enable_ari);
+	return ((pcib_try_enable_ari_t *) _m)(pcib, dev);
+}
+
+/** @brief Unique descriptor for the PCIB_ARI_ENABLED() method */
+extern struct kobjop_desc pcib_ari_enabled_desc;
+/** @brief A function implementing the PCIB_ARI_ENABLED() method */
+typedef int pcib_ari_enabled_t(device_t pcib);
+
+static __inline int PCIB_ARI_ENABLED(device_t pcib)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)pcib)->ops,pcib_ari_enabled);
+	return ((pcib_ari_enabled_t *) _m)(pcib);
+}
+
+/** @brief Unique descriptor for the PCIB_DECODE_RID() method */
+extern struct kobjop_desc pcib_decode_rid_desc;
+/** @brief A function implementing the PCIB_DECODE_RID() method */
+typedef void pcib_decode_rid_t(device_t pcib, uint16_t rid, int *bus, int *slot,
+                               int *func);
+
+static __inline void PCIB_DECODE_RID(device_t pcib, uint16_t rid, int *bus,
+                                     int *slot, int *func)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)pcib)->ops,pcib_decode_rid);
+	((pcib_decode_rid_t *) _m)(pcib, rid, bus, slot, func);
+}
+
 #endif /* _pcib_if_h_ */
diff --git a/rtemsbsd/include/rtems/bsd/sys/cpuset.h b/rtemsbsd/include/rtems/bsd/sys/cpuset.h
index 9048c2d9..f5940682 100644
--- a/rtemsbsd/include/rtems/bsd/sys/cpuset.h
+++ b/rtemsbsd/include/rtems/bsd/sys/cpuset.h
@@ -33,64 +33,36 @@
 #define	_RTEMS_BSD_SYS_CPUSET_H_
 
 #include <sys/_cpuset.h>
+#include <sys/_bitset.h>
+#include <sys/bitset.h>
 
 #define	CPUSETBUFSIZ	((2 + sizeof(long) * 2) * _NCPUWORDS)
 
-#define	CPU_SETOF(n, p) do {					\
-	CPU_ZERO(p);						\
-	((p)->__bits[__cpuset_word(n)] = __cpuset_mask(n));	\
-} while (0)
-
-/* Is p full set. */
-#define	CPU_ISFULLSET(p) __extension__ ({		\
-	__size_t __i;					\
-	for (__i = 0; __i < _NCPUWORDS; __i++)		\
-		if ((p)->__bits[__i] != (long)-1)	\
-			break;				\
-	__i == _NCPUWORDS;				\
-})
-
-/* Is c a subset of p. */
-#define	CPU_SUBSET(p, c) __extension__ ({		\
-	__size_t __i;					\
-	for (__i = 0; __i < _NCPUWORDS; __i++)		\
-		if (((c)->__bits[__i] &			\
-		    (p)->__bits[__i]) !=		\
-		    (c)->__bits[__i])			\
-			break;				\
-	__i == _NCPUWORDS;				\
-})
-
-/* Are there any common bits between b & c? */
-#define	CPU_OVERLAP(p, c) __extension__ ({		\
-	__size_t __i;					\
-	for (__i = 0; __i < _NCPUWORDS; __i++)		\
-		if (((c)->__bits[__i] &			\
-		    (p)->__bits[__i]) != 0)		\
-			break;				\
-	__i != _NCPUWORDS;				\
-})
-
-#define	CPU_CLR_ATOMIC(n, p)						\
-	atomic_clear_long(&(p)->__bits[__cpuset_word(n)], __cpuset_mask(n))
-
-#define	CPU_SET_ATOMIC(n, p)						\
-	atomic_set_long(&(p)->__bits[__cpuset_word(n)], __cpuset_mask(n))
-
-/* Convenience functions catering special cases. */ 
-#define	CPU_OR_ATOMIC(d, s) do {			\
-	__size_t __i;					\
-	for (__i = 0; __i < _NCPUWORDS; __i++)		\
-		atomic_set_long(&(d)->__bits[__i],	\
-		    (s)->__bits[__i]);			\
-} while (0)
-
-#define	CPU_COPY_STORE_REL(f, t) do {				\
-	__size_t __i;						\
-	for (__i = 0; __i < _NCPUWORDS; __i++)			\
-		atomic_store_rel_long(&(t)->__bits[__i],	\
-		    (f)->__bits[__i]);				\
-} while (0)
+#define	CPU_CLR(n, p)			BIT_CLR(CPU_SETSIZE, n, p)
+#define	CPU_COPY(f, t)			BIT_COPY(CPU_SETSIZE, f, t)
+#define	CPU_ISSET(n, p)			BIT_ISSET(CPU_SETSIZE, n, p)
+#define	CPU_SET(n, p)			BIT_SET(CPU_SETSIZE, n, p)
+#define	CPU_ZERO(p) 			BIT_ZERO(CPU_SETSIZE, p)
+#define	CPU_FILL(p) 			BIT_FILL(CPU_SETSIZE, p)
+#define	CPU_SETOF(n, p)			BIT_SETOF(CPU_SETSIZE, n, p)
+#define	CPU_EMPTY(p)			BIT_EMPTY(CPU_SETSIZE, p)
+#define	CPU_ISFULLSET(p)		BIT_ISFULLSET(CPU_SETSIZE, p)
+#define	CPU_SUBSET(p, c)		BIT_SUBSET(CPU_SETSIZE, p, c)
+#define	CPU_OVERLAP(p, c)		BIT_OVERLAP(CPU_SETSIZE, p, c)
+#define	CPU_CMP(p, c)			BIT_CMP(CPU_SETSIZE, p, c)
+#define	CPU_OR(d, s)			BIT_OR(CPU_SETSIZE, d, s)
+#define	CPU_AND(d, s)			BIT_AND(CPU_SETSIZE, d, s)
+#define	CPU_NAND(d, s)			BIT_NAND(CPU_SETSIZE, d, s)
+#define	CPU_CLR_ATOMIC(n, p)		BIT_CLR_ATOMIC(CPU_SETSIZE, n, p)
+#define	CPU_SET_ATOMIC(n, p)		BIT_SET_ATOMIC(CPU_SETSIZE, n, p)
+#define	CPU_SET_ATOMIC_ACQ(n, p)	BIT_SET_ATOMIC_ACQ(CPU_SETSIZE, n, p)
+#define	CPU_AND_ATOMIC(n, p)		BIT_AND_ATOMIC(CPU_SETSIZE, n, p)
+#define	CPU_OR_ATOMIC(d, s)		BIT_OR_ATOMIC(CPU_SETSIZE, d, s)
+#define	CPU_COPY_STORE_REL(f, t)	BIT_COPY_STORE_REL(CPU_SETSIZE, f, t)
+#define	CPU_FFS(p)			BIT_FFS(CPU_SETSIZE, p)
+#define	CPU_COUNT(p)			BIT_COUNT(CPU_SETSIZE, p)
+#define	CPUSET_FSET			BITSET_FSET(_NCPUWORDS)
+#define	CPUSET_T_INITIALIZER		BITSET_T_INITIALIZER
 
 /*
  * Valid cpulevel_t values.
@@ -107,6 +79,7 @@
 #define	CPU_WHICH_CPUSET	3	/* Specifies a set id. */
 #define	CPU_WHICH_IRQ		4	/* Specifies an irq #. */
 #define	CPU_WHICH_JAIL		5	/* Specifies a jail id. */
+#define	CPU_WHICH_DOMAIN	6	/* Specifies a NUMA domain id. */
 
 /*
  * Reserved cpuset identifiers.
@@ -115,6 +88,8 @@
 #define	CPUSET_DEFAULT	0
 
 #ifdef _KERNEL
+#include <sys/queue.h>
+
 LIST_HEAD(setlist, cpuset);
 
 /*
@@ -145,16 +120,23 @@ struct cpuset {
 extern cpuset_t *cpuset_root;
 struct prison;
 struct proc;
+struct thread;
 
 struct cpuset *cpuset_thread0(void);
 struct cpuset *cpuset_ref(struct cpuset *);
 void	cpuset_rel(struct cpuset *);
 int	cpuset_setthread(lwpid_t id, cpuset_t *);
+int	cpuset_setithread(lwpid_t id, int cpu);
 int	cpuset_create_root(struct prison *, struct cpuset **);
 int	cpuset_setproc_update_set(struct proc *, struct cpuset *);
-int	cpusetobj_ffs(const cpuset_t *);
+int	cpuset_which(cpuwhich_t, id_t, struct proc **,
+	    struct thread **, struct cpuset **);
+
 char	*cpusetobj_strprint(char *, const cpuset_t *);
 int	cpusetobj_strscan(cpuset_t *, const char *);
+#ifdef DDB
+void	ddb_display_cpuset(const cpuset_t *);
+#endif
 
 #else
 __BEGIN_DECLS
diff --git a/rtemsbsd/include/rtems/bsd/sys/lock.h b/rtemsbsd/include/rtems/bsd/sys/lock.h
index f252976c..0456d0da 100644
--- a/rtemsbsd/include/rtems/bsd/sys/lock.h
+++ b/rtemsbsd/include/rtems/bsd/sys/lock.h
@@ -175,7 +175,7 @@ struct lock_class {
 
 #define	LOCK_LOG_DESTROY(lo, flags)	LOCK_LOG_INIT(lo, flags)
 
-#define	lock_initalized(lo)	((lo)->lo_flags & LO_INITIALIZED)
+#define	lock_initialized(lo)	((lo)->lo_flags & LO_INITIALIZED)
 
 /*
  * Helpful macros for quickly coming up with assertions with informative
diff --git a/rtemsbsd/include/rtems/bsd/sys/param.h b/rtemsbsd/include/rtems/bsd/sys/param.h
index 2bc6cce9..a21e94aa 100644
--- a/rtemsbsd/include/rtems/bsd/sys/param.h
+++ b/rtemsbsd/include/rtems/bsd/sys/param.h
@@ -40,6 +40,7 @@
 
 #ifdef __rtems__
 #include <sys/param.h>
+#include <sys/_bitset.h>
 #endif /* __rtems__ */
 #include <sys/_null.h>
 
@@ -61,11 +62,16 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 903000	/* Master, propagated to newvers */
+#define __FreeBSD_version 1200003	/* Master, propagated to newvers */
 
 #ifdef _KERNEL
-#define	P_OSREL_SIGSEGV		700004
-#define	P_OSREL_MAP_ANON	800104
+#define	P_OSREL_SIGWAIT			700000
+#define	P_OSREL_SIGSEGV			700004
+#define	P_OSREL_MAP_ANON		800104
+#define	P_OSREL_MAP_FSTRICT		1100036
+#define	P_OSREL_SHUTDOWN_ENOTCONN	1100077
+
+#define	P_OSREL_MAJOR(x)		((x) / 100000)
 #endif
 
 #ifndef LOCORE
diff --git a/rtemsbsd/include/sys/_vm_domain.h b/rtemsbsd/include/sys/_vm_domain.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/sys/_vm_domain.h
diff --git a/rtemsbsd/include/sys/fail.h b/rtemsbsd/include/sys/fail.h
deleted file mode 100644
index 936ffd88..00000000
--- a/rtemsbsd/include/sys/fail.h
+++ /dev/null
@@ -1 +0,0 @@
-/* EMPTY */
diff --git a/rtemsbsd/include/sys/signalvar.h b/rtemsbsd/include/sys/signalvar.h
deleted file mode 100644
index 936ffd88..00000000
--- a/rtemsbsd/include/sys/signalvar.h
+++ /dev/null
@@ -1 +0,0 @@
-/* EMPTY */
diff --git a/rtemsbsd/include/sys/stack.h b/rtemsbsd/include/sys/stack.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/sys/stack.h
diff --git a/rtemsbsd/include/sys/stdatomic.h b/rtemsbsd/include/sys/stdatomic.h
new file mode 100644
index 00000000..2643cf37
--- /dev/null
+++ b/rtemsbsd/include/sys/stdatomic.h
@@ -0,0 +1 @@
+#include <stdatomic.h>
diff --git a/rtemsbsd/include/sys/zlib.h b/rtemsbsd/include/sys/zlib.h
new file mode 100644
index 00000000..4470a1fd
--- /dev/null
+++ b/rtemsbsd/include/sys/zlib.h
@@ -0,0 +1 @@
+#include <zlib.h>
diff --git a/rtemsbsd/include/vm/memguard.h b/rtemsbsd/include/vm/memguard.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/vm/memguard.h
diff --git a/rtemsbsd/include/vm/vm_domain.h b/rtemsbsd/include/vm/vm_domain.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/vm/vm_domain.h
diff --git a/rtemsbsd/include/vm/vm_map.h b/rtemsbsd/include/vm/vm_map.h
index 936ffd88..086ac13b 100644
--- a/rtemsbsd/include/vm/vm_map.h
+++ b/rtemsbsd/include/vm/vm_map.h
@@ -1 +1 @@
-/* EMPTY */
+#include <sys/sx.h>
diff --git a/rtemsbsd/local/bus_if.c b/rtemsbsd/local/bus_if.c
index 558888af..169ea7d5 100644
--- a/rtemsbsd/local/bus_if.c
+++ b/rtemsbsd/local/bus_if.c
@@ -24,8 +24,8 @@
 
 static struct resource *
 null_alloc_resource(device_t dev, device_t child,
-    int type, int *rid, u_long start, u_long end,
-    u_long count, u_int flags)
+    int type, int *rid, rman_res_t start, rman_res_t end,
+    rman_res_t count, u_int flags)
 {
     return (0);
 }
@@ -47,243 +47,155 @@ null_add_child(device_t bus, int order, const char *name,
 	panic("bus_add_child is not implemented");
 }
 
-struct kobj_method bus_print_child_method_default = {
-	&bus_print_child_desc, (kobjop_t) bus_generic_print_child
-};
-
 struct kobjop_desc bus_print_child_desc = {
-	0, &bus_print_child_method_default
-};
-
-struct kobj_method bus_probe_nomatch_method_default = {
-	&bus_probe_nomatch_desc, (kobjop_t) kobj_error_method
+	0, { &bus_print_child_desc, (kobjop_t)bus_generic_print_child }
 };
 
 struct kobjop_desc bus_probe_nomatch_desc = {
-	0, &bus_probe_nomatch_method_default
-};
-
-struct kobj_method bus_read_ivar_method_default = {
-	&bus_read_ivar_desc, (kobjop_t) kobj_error_method
+	0, { &bus_probe_nomatch_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_read_ivar_desc = {
-	0, &bus_read_ivar_method_default
-};
-
-struct kobj_method bus_write_ivar_method_default = {
-	&bus_write_ivar_desc, (kobjop_t) kobj_error_method
+	0, { &bus_read_ivar_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_write_ivar_desc = {
-	0, &bus_write_ivar_method_default
-};
-
-struct kobj_method bus_child_deleted_method_default = {
-	&bus_child_deleted_desc, (kobjop_t) kobj_error_method
+	0, { &bus_write_ivar_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_child_deleted_desc = {
-	0, &bus_child_deleted_method_default
-};
-
-struct kobj_method bus_child_detached_method_default = {
-	&bus_child_detached_desc, (kobjop_t) kobj_error_method
+	0, { &bus_child_deleted_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_child_detached_desc = {
-	0, &bus_child_detached_method_default
-};
-
-struct kobj_method bus_driver_added_method_default = {
-	&bus_driver_added_desc, (kobjop_t) bus_generic_driver_added
+	0, { &bus_child_detached_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_driver_added_desc = {
-	0, &bus_driver_added_method_default
-};
-
-struct kobj_method bus_add_child_method_default = {
-	&bus_add_child_desc, (kobjop_t) null_add_child
+	0, { &bus_driver_added_desc, (kobjop_t)bus_generic_driver_added }
 };
 
 struct kobjop_desc bus_add_child_desc = {
-	0, &bus_add_child_method_default
+	0, { &bus_add_child_desc, (kobjop_t)null_add_child }
 };
 
-struct kobj_method bus_alloc_resource_method_default = {
-	&bus_alloc_resource_desc, (kobjop_t) null_alloc_resource
+struct kobjop_desc bus_rescan_desc = {
+	0, { &bus_rescan_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_alloc_resource_desc = {
-	0, &bus_alloc_resource_method_default
-};
-
-struct kobj_method bus_activate_resource_method_default = {
-	&bus_activate_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_alloc_resource_desc, (kobjop_t)null_alloc_resource }
 };
 
 struct kobjop_desc bus_activate_resource_desc = {
-	0, &bus_activate_resource_method_default
+	0, { &bus_activate_resource_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method bus_deactivate_resource_method_default = {
-	&bus_deactivate_resource_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc bus_map_resource_desc = {
+	0, { &bus_map_resource_desc, (kobjop_t)bus_generic_map_resource }
 };
 
-struct kobjop_desc bus_deactivate_resource_desc = {
-	0, &bus_deactivate_resource_method_default
+struct kobjop_desc bus_unmap_resource_desc = {
+	0, { &bus_unmap_resource_desc, (kobjop_t)bus_generic_unmap_resource }
 };
 
-struct kobj_method bus_adjust_resource_method_default = {
-	&bus_adjust_resource_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc bus_deactivate_resource_desc = {
+	0, { &bus_deactivate_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_adjust_resource_desc = {
-	0, &bus_adjust_resource_method_default
-};
-
-struct kobj_method bus_release_resource_method_default = {
-	&bus_release_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_adjust_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_release_resource_desc = {
-	0, &bus_release_resource_method_default
-};
-
-struct kobj_method bus_setup_intr_method_default = {
-	&bus_setup_intr_desc, (kobjop_t) kobj_error_method
+	0, { &bus_release_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_setup_intr_desc = {
-	0, &bus_setup_intr_method_default
-};
-
-struct kobj_method bus_teardown_intr_method_default = {
-	&bus_teardown_intr_desc, (kobjop_t) kobj_error_method
+	0, { &bus_setup_intr_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_teardown_intr_desc = {
-	0, &bus_teardown_intr_method_default
-};
-
-struct kobj_method bus_set_resource_method_default = {
-	&bus_set_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_teardown_intr_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_set_resource_desc = {
-	0, &bus_set_resource_method_default
-};
-
-struct kobj_method bus_get_resource_method_default = {
-	&bus_get_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_set_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_get_resource_desc = {
-	0, &bus_get_resource_method_default
-};
-
-struct kobj_method bus_delete_resource_method_default = {
-	&bus_delete_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_get_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_delete_resource_desc = {
-	0, &bus_delete_resource_method_default
-};
-
-struct kobj_method bus_get_resource_list_method_default = {
-	&bus_get_resource_list_desc, (kobjop_t) bus_generic_get_resource_list
+	0, { &bus_delete_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_get_resource_list_desc = {
-	0, &bus_get_resource_list_method_default
-};
-
-struct kobj_method bus_child_present_method_default = {
-	&bus_child_present_desc, (kobjop_t) bus_generic_child_present
+	0, { &bus_get_resource_list_desc, (kobjop_t)bus_generic_get_resource_list }
 };
 
 struct kobjop_desc bus_child_present_desc = {
-	0, &bus_child_present_method_default
-};
-
-struct kobj_method bus_child_pnpinfo_str_method_default = {
-	&bus_child_pnpinfo_str_desc, (kobjop_t) kobj_error_method
+	0, { &bus_child_present_desc, (kobjop_t)bus_generic_child_present }
 };
 
 struct kobjop_desc bus_child_pnpinfo_str_desc = {
-	0, &bus_child_pnpinfo_str_method_default
-};
-
-struct kobj_method bus_child_location_str_method_default = {
-	&bus_child_location_str_desc, (kobjop_t) kobj_error_method
+	0, { &bus_child_pnpinfo_str_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_child_location_str_desc = {
-	0, &bus_child_location_str_method_default
-};
-
-struct kobj_method bus_bind_intr_method_default = {
-	&bus_bind_intr_desc, (kobjop_t) bus_generic_bind_intr
+	0, { &bus_child_location_str_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_bind_intr_desc = {
-	0, &bus_bind_intr_method_default
-};
-
-struct kobj_method bus_config_intr_method_default = {
-	&bus_config_intr_desc, (kobjop_t) bus_generic_config_intr
+	0, { &bus_bind_intr_desc, (kobjop_t)bus_generic_bind_intr }
 };
 
 struct kobjop_desc bus_config_intr_desc = {
-	0, &bus_config_intr_method_default
-};
-
-struct kobj_method bus_describe_intr_method_default = {
-	&bus_describe_intr_desc, (kobjop_t) bus_generic_describe_intr
+	0, { &bus_config_intr_desc, (kobjop_t)bus_generic_config_intr }
 };
 
 struct kobjop_desc bus_describe_intr_desc = {
-	0, &bus_describe_intr_method_default
+	0, { &bus_describe_intr_desc, (kobjop_t)bus_generic_describe_intr }
 };
 
-struct kobj_method bus_hinted_child_method_default = {
-	&bus_hinted_child_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc bus_hinted_child_desc = {
+	0, { &bus_hinted_child_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc bus_hinted_child_desc = {
-	0, &bus_hinted_child_method_default
+struct kobjop_desc bus_get_dma_tag_desc = {
+	0, { &bus_get_dma_tag_desc, (kobjop_t)bus_generic_get_dma_tag }
 };
 
-struct kobj_method bus_get_dma_tag_method_default = {
-	&bus_get_dma_tag_desc, (kobjop_t) bus_generic_get_dma_tag
+struct kobjop_desc bus_get_bus_tag_desc = {
+	0, { &bus_get_bus_tag_desc, (kobjop_t)bus_generic_get_bus_tag }
 };
 
-struct kobjop_desc bus_get_dma_tag_desc = {
-	0, &bus_get_dma_tag_method_default
+struct kobjop_desc bus_hint_device_unit_desc = {
+	0, { &bus_hint_device_unit_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method bus_hint_device_unit_method_default = {
-	&bus_hint_device_unit_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc bus_new_pass_desc = {
+	0, { &bus_new_pass_desc, (kobjop_t)bus_generic_new_pass }
 };
 
-struct kobjop_desc bus_hint_device_unit_desc = {
-	0, &bus_hint_device_unit_method_default
+struct kobjop_desc bus_remap_intr_desc = {
+	0, { &bus_remap_intr_desc, (kobjop_t)null_remap_intr }
 };
 
-struct kobj_method bus_new_pass_method_default = {
-	&bus_new_pass_desc, (kobjop_t) bus_generic_new_pass
+struct kobjop_desc bus_suspend_child_desc = {
+	0, { &bus_suspend_child_desc, (kobjop_t)bus_generic_suspend_child }
 };
 
-struct kobjop_desc bus_new_pass_desc = {
-	0, &bus_new_pass_method_default
+struct kobjop_desc bus_resume_child_desc = {
+	0, { &bus_resume_child_desc, (kobjop_t)bus_generic_resume_child }
 };
 
-struct kobj_method bus_remap_intr_method_default = {
-	&bus_remap_intr_desc, (kobjop_t) null_remap_intr
+struct kobjop_desc bus_get_domain_desc = {
+	0, { &bus_get_domain_desc, (kobjop_t)bus_generic_get_domain }
 };
 
-struct kobjop_desc bus_remap_intr_desc = {
-	0, &bus_remap_intr_method_default
+struct kobjop_desc bus_get_cpus_desc = {
+	0, { &bus_get_cpus_desc, (kobjop_t)bus_generic_get_cpus }
 };
 
diff --git a/rtemsbsd/local/device_if.c b/rtemsbsd/local/device_if.c
index 1c04d55d..20ab6221 100644
--- a/rtemsbsd/local/device_if.c
+++ b/rtemsbsd/local/device_if.c
@@ -37,70 +37,47 @@ static int null_resume(device_t dev)
 
 static int null_quiesce(device_t dev)
 {
-    return EOPNOTSUPP;
+    return 0;
 }
 
-struct kobj_method device_probe_method_default = {
-	&device_probe_desc, (kobjop_t) kobj_error_method
-};
+static void * null_register(device_t dev)
+{
+	return NULL;
+}
 
 struct kobjop_desc device_probe_desc = {
-	0, &device_probe_method_default
-};
-
-struct kobj_method device_identify_method_default = {
-	&device_identify_desc, (kobjop_t) kobj_error_method
+	0, { &device_probe_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc device_identify_desc = {
-	0, &device_identify_method_default
-};
-
-struct kobj_method device_attach_method_default = {
-	&device_attach_desc, (kobjop_t) kobj_error_method
+	0, { &device_identify_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc device_attach_desc = {
-	0, &device_attach_method_default
-};
-
-struct kobj_method device_detach_method_default = {
-	&device_detach_desc, (kobjop_t) kobj_error_method
+	0, { &device_attach_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc device_detach_desc = {
-	0, &device_detach_method_default
-};
-
-struct kobj_method device_shutdown_method_default = {
-	&device_shutdown_desc, (kobjop_t) null_shutdown
+	0, { &device_detach_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc device_shutdown_desc = {
-	0, &device_shutdown_method_default
-};
-
-struct kobj_method device_suspend_method_default = {
-	&device_suspend_desc, (kobjop_t) null_suspend
+	0, { &device_shutdown_desc, (kobjop_t)null_shutdown }
 };
 
 struct kobjop_desc device_suspend_desc = {
-	0, &device_suspend_method_default
-};
-
-struct kobj_method device_resume_method_default = {
-	&device_resume_desc, (kobjop_t) null_resume
+	0, { &device_suspend_desc, (kobjop_t)null_suspend }
 };
 
 struct kobjop_desc device_resume_desc = {
-	0, &device_resume_method_default
+	0, { &device_resume_desc, (kobjop_t)null_resume }
 };
 
-struct kobj_method device_quiesce_method_default = {
-	&device_quiesce_desc, (kobjop_t) null_quiesce
+struct kobjop_desc device_quiesce_desc = {
+	0, { &device_quiesce_desc, (kobjop_t)null_quiesce }
 };
 
-struct kobjop_desc device_quiesce_desc = {
-	0, &device_quiesce_method_default
+struct kobjop_desc device_register_desc = {
+	0, { &device_register_desc, (kobjop_t)null_register }
 };
 
diff --git a/rtemsbsd/local/gpio_if.c b/rtemsbsd/local/gpio_if.c
new file mode 100644
index 00000000..ca15c8bd
--- /dev/null
+++ b/rtemsbsd/local/gpio_if.c
@@ -0,0 +1,88 @@
+#include <machine/rtems-bsd-kernel-space.h>
+
+/*
+ * This file is produced automatically.
+ * Do not modify anything in here by hand.
+ *
+ * Created from source file
+ *   freebsd-org/sys/dev/gpio/gpio_if.m
+ * with
+ *   makeobjops.awk
+ *
+ * See the source file for legal information
+ */
+
+#include <rtems/bsd/sys/param.h>
+#include <sys/queue.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <sys/bus.h>
+#include <sys/gpio.h>
+#include <rtems/bsd/local/gpio_if.h>
+
+
+static device_t
+gpio_default_get_bus(void)
+{
+
+	return (NULL);
+}
+
+static int
+gpio_default_map_gpios(device_t bus, phandle_t dev,
+    phandle_t gparent, int gcells, pcell_t *gpios, uint32_t *pin,
+    uint32_t *flags)
+{
+	/* Propagate up the bus hierarchy until someone handles it. */  
+	if (device_get_parent(bus) != NULL)
+		return (GPIO_MAP_GPIOS(device_get_parent(bus), dev,
+		    gparent, gcells, gpios, pin, flags));
+
+	/* If that fails, then assume the FreeBSD defaults. */
+	*pin = gpios[0];
+	if (gcells == 2 || gcells == 3)
+		*flags = gpios[gcells - 1];
+
+	return (0);
+}
+
+struct kobjop_desc gpio_get_bus_desc = {
+	0, { &gpio_get_bus_desc, (kobjop_t)gpio_default_get_bus }
+};
+
+struct kobjop_desc gpio_pin_max_desc = {
+	0, { &gpio_pin_max_desc, (kobjop_t)kobj_error_method }
+};
+
+struct kobjop_desc gpio_pin_set_desc = {
+	0, { &gpio_pin_set_desc, (kobjop_t)kobj_error_method }
+};
+
+struct kobjop_desc gpio_pin_get_desc = {
+	0, { &gpio_pin_get_desc, (kobjop_t)kobj_error_method }
+};
+
+struct kobjop_desc gpio_pin_toggle_desc = {
+	0, { &gpio_pin_toggle_desc, (kobjop_t)kobj_error_method }
+};
+
+struct kobjop_desc gpio_pin_getcaps_desc = {
+	0, { &gpio_pin_getcaps_desc, (kobjop_t)kobj_error_method }
+};
+
+struct kobjop_desc gpio_pin_getflags_desc = {
+	0, { &gpio_pin_getflags_desc, (kobjop_t)kobj_error_method }
+};
+
+struct kobjop_desc gpio_pin_getname_desc = {
+	0, { &gpio_pin_getname_desc, (kobjop_t)kobj_error_method }
+};
+
+struct kobjop_desc gpio_pin_setflags_desc = {
+	0, { &gpio_pin_setflags_desc, (kobjop_t)kobj_error_method }
+};
+
+struct kobjop_desc gpio_map_gpios_desc = {
+	0, { &gpio_map_gpios_desc, (kobjop_t)gpio_default_map_gpios }
+};
+
diff --git a/rtemsbsd/local/if_dwc_if.c b/rtemsbsd/local/if_dwc_if.c
new file mode 100644
index 00000000..cd8b8922
--- /dev/null
+++ b/rtemsbsd/local/if_dwc_if.c
@@ -0,0 +1,52 @@
+#include <machine/rtems-bsd-kernel-space.h>
+
+/*
+ * This file is produced automatically.
+ * Do not modify anything in here by hand.
+ *
+ * Created from source file
+ *   freebsd-org/sys/dev/dwc/if_dwc_if.m
+ * with
+ *   makeobjops.awk
+ *
+ * See the source file for legal information
+ */
+
+#include <rtems/bsd/sys/param.h>
+#include <sys/queue.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <rtems/bsd/local/if_dwc_if.h>
+
+#include <dev/dwc/if_dwc.h>
+
+static int
+if_dwc_default_init(device_t dev)
+{
+	return (0);
+}
+
+static int
+if_dwc_default_mac_type(device_t dev)
+{
+	return (DWC_GMAC);
+}
+
+static int
+if_dwc_default_mii_clk(device_t dev)
+{
+	return (GMAC_MII_CLK_25_35M_DIV16);
+}
+
+struct kobjop_desc if_dwc_init_desc = {
+	0, { &if_dwc_init_desc, (kobjop_t)if_dwc_default_init }
+};
+
+struct kobjop_desc if_dwc_mac_type_desc = {
+	0, { &if_dwc_mac_type_desc, (kobjop_t)if_dwc_default_mac_type }
+};
+
+struct kobjop_desc if_dwc_mii_clk_desc = {
+	0, { &if_dwc_mii_clk_desc, (kobjop_t)if_dwc_default_mii_clk }
+};
+
diff --git a/rtemsbsd/local/miibus_if.c b/rtemsbsd/local/miibus_if.c
index 433e7a67..fdb30e81 100644
--- a/rtemsbsd/local/miibus_if.c
+++ b/rtemsbsd/local/miibus_if.c
@@ -19,43 +19,23 @@
 #include <sys/bus.h>
 #include <rtems/bsd/local/miibus_if.h>
 
-struct kobj_method miibus_readreg_method_default = {
-	&miibus_readreg_desc, (kobjop_t) kobj_error_method
-};
-
 struct kobjop_desc miibus_readreg_desc = {
-	0, &miibus_readreg_method_default
-};
-
-struct kobj_method miibus_writereg_method_default = {
-	&miibus_writereg_desc, (kobjop_t) kobj_error_method
+	0, { &miibus_readreg_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc miibus_writereg_desc = {
-	0, &miibus_writereg_method_default
-};
-
-struct kobj_method miibus_statchg_method_default = {
-	&miibus_statchg_desc, (kobjop_t) kobj_error_method
+	0, { &miibus_writereg_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc miibus_statchg_desc = {
-	0, &miibus_statchg_method_default
-};
-
-struct kobj_method miibus_linkchg_method_default = {
-	&miibus_linkchg_desc, (kobjop_t) kobj_error_method
+	0, { &miibus_statchg_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc miibus_linkchg_desc = {
-	0, &miibus_linkchg_method_default
-};
-
-struct kobj_method miibus_mediainit_method_default = {
-	&miibus_mediainit_desc, (kobjop_t) kobj_error_method
+	0, { &miibus_linkchg_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc miibus_mediainit_desc = {
-	0, &miibus_mediainit_method_default
+	0, { &miibus_mediainit_desc, (kobjop_t)kobj_error_method }
 };
 
diff --git a/rtemsbsd/local/mmcbr_if.c b/rtemsbsd/local/mmcbr_if.c
index 1ce2d263..83c8f03e 100644
--- a/rtemsbsd/local/mmcbr_if.c
+++ b/rtemsbsd/local/mmcbr_if.c
@@ -22,43 +22,23 @@
 #include <dev/mmc/mmcreg.h>
 #include <rtems/bsd/local/mmcbr_if.h>
 
-struct kobj_method mmcbr_update_ios_method_default = {
-	&mmcbr_update_ios_desc, (kobjop_t) kobj_error_method
-};
-
 struct kobjop_desc mmcbr_update_ios_desc = {
-	0, &mmcbr_update_ios_method_default
-};
-
-struct kobj_method mmcbr_request_method_default = {
-	&mmcbr_request_desc, (kobjop_t) kobj_error_method
+	0, { &mmcbr_update_ios_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc mmcbr_request_desc = {
-	0, &mmcbr_request_method_default
-};
-
-struct kobj_method mmcbr_get_ro_method_default = {
-	&mmcbr_get_ro_desc, (kobjop_t) kobj_error_method
+	0, { &mmcbr_request_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc mmcbr_get_ro_desc = {
-	0, &mmcbr_get_ro_method_default
-};
-
-struct kobj_method mmcbr_acquire_host_method_default = {
-	&mmcbr_acquire_host_desc, (kobjop_t) kobj_error_method
+	0, { &mmcbr_get_ro_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc mmcbr_acquire_host_desc = {
-	0, &mmcbr_acquire_host_method_default
-};
-
-struct kobj_method mmcbr_release_host_method_default = {
-	&mmcbr_release_host_desc, (kobjop_t) kobj_error_method
+	0, { &mmcbr_acquire_host_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc mmcbr_release_host_desc = {
-	0, &mmcbr_release_host_method_default
+	0, { &mmcbr_release_host_desc, (kobjop_t)kobj_error_method }
 };
 
diff --git a/rtemsbsd/local/mmcbus_if.c b/rtemsbsd/local/mmcbus_if.c
index a757a561..fc5e6ffb 100644
--- a/rtemsbsd/local/mmcbus_if.c
+++ b/rtemsbsd/local/mmcbus_if.c
@@ -21,27 +21,15 @@
 #include <dev/mmc/bridge.h>
 #include <rtems/bsd/local/mmcbus_if.h>
 
-struct kobj_method mmcbus_wait_for_request_method_default = {
-	&mmcbus_wait_for_request_desc, (kobjop_t) kobj_error_method
-};
-
 struct kobjop_desc mmcbus_wait_for_request_desc = {
-	0, &mmcbus_wait_for_request_method_default
-};
-
-struct kobj_method mmcbus_acquire_bus_method_default = {
-	&mmcbus_acquire_bus_desc, (kobjop_t) kobj_error_method
+	0, { &mmcbus_wait_for_request_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc mmcbus_acquire_bus_desc = {
-	0, &mmcbus_acquire_bus_method_default
-};
-
-struct kobj_method mmcbus_release_bus_method_default = {
-	&mmcbus_release_bus_desc, (kobjop_t) kobj_error_method
+	0, { &mmcbus_acquire_bus_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc mmcbus_release_bus_desc = {
-	0, &mmcbus_release_bus_method_default
+	0, { &mmcbus_release_bus_desc, (kobjop_t)kobj_error_method }
 };
 
diff --git a/rtemsbsd/local/pci_if.c b/rtemsbsd/local/pci_if.c
index 7531ee15..f8ea8d96 100644
--- a/rtemsbsd/local/pci_if.c
+++ b/rtemsbsd/local/pci_if.c
@@ -12,11 +12,12 @@
  * See the source file for legal information
  */
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 #include <sys/kobj.h>
 #include <sys/bus.h>
+#include <dev/pci/pcivar.h>
 #include <rtems/bsd/local/pci_if.h>
 
 
@@ -26,147 +27,141 @@ null_msi_count(device_t dev, device_t child)
 	return (0);
 }
 
-struct kobj_method pci_read_config_method_default = {
-	&pci_read_config_desc, (kobjop_t) kobj_error_method
-};
+static int
+null_msix_bar(device_t dev, device_t child)
+{
+	return (-1);
+}
 
-struct kobjop_desc pci_read_config_desc = {
-	0, &pci_read_config_method_default
-};
+static device_t
+null_create_iov_child(device_t bus, device_t pf, uint16_t rid,
+    uint16_t vid, uint16_t did)
+{
+	device_printf(bus, "PCI_IOV not implemented on this bus.\n");
+	return (NULL);
+}
 
-struct kobj_method pci_write_config_method_default = {
-	&pci_write_config_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_read_config_desc = {
+	0, { &pci_read_config_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc pci_write_config_desc = {
-	0, &pci_write_config_method_default
-};
-
-struct kobj_method pci_get_powerstate_method_default = {
-	&pci_get_powerstate_desc, (kobjop_t) kobj_error_method
+	0, { &pci_write_config_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc pci_get_powerstate_desc = {
-	0, &pci_get_powerstate_method_default
-};
-
-struct kobj_method pci_set_powerstate_method_default = {
-	&pci_set_powerstate_desc, (kobjop_t) kobj_error_method
+	0, { &pci_get_powerstate_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc pci_set_powerstate_desc = {
-	0, &pci_set_powerstate_method_default
-};
-
-struct kobj_method pci_get_vpd_ident_method_default = {
-	&pci_get_vpd_ident_desc, (kobjop_t) kobj_error_method
+	0, { &pci_set_powerstate_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc pci_get_vpd_ident_desc = {
-	0, &pci_get_vpd_ident_method_default
+	0, { &pci_get_vpd_ident_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_get_vpd_readonly_method_default = {
-	&pci_get_vpd_readonly_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_get_vpd_readonly_desc = {
+	0, { &pci_get_vpd_readonly_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_get_vpd_readonly_desc = {
-	0, &pci_get_vpd_readonly_method_default
+struct kobjop_desc pci_enable_busmaster_desc = {
+	0, { &pci_enable_busmaster_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_enable_busmaster_method_default = {
-	&pci_enable_busmaster_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_disable_busmaster_desc = {
+	0, { &pci_disable_busmaster_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_enable_busmaster_desc = {
-	0, &pci_enable_busmaster_method_default
+struct kobjop_desc pci_enable_io_desc = {
+	0, { &pci_enable_io_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_disable_busmaster_method_default = {
-	&pci_disable_busmaster_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_disable_io_desc = {
+	0, { &pci_disable_io_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_disable_busmaster_desc = {
-	0, &pci_disable_busmaster_method_default
+struct kobjop_desc pci_assign_interrupt_desc = {
+	0, { &pci_assign_interrupt_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_enable_io_method_default = {
-	&pci_enable_io_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_find_cap_desc = {
+	0, { &pci_find_cap_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_enable_io_desc = {
-	0, &pci_enable_io_method_default
+struct kobjop_desc pci_find_extcap_desc = {
+	0, { &pci_find_extcap_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_disable_io_method_default = {
-	&pci_disable_io_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_find_htcap_desc = {
+	0, { &pci_find_htcap_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_disable_io_desc = {
-	0, &pci_disable_io_method_default
+struct kobjop_desc pci_alloc_msi_desc = {
+	0, { &pci_alloc_msi_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_assign_interrupt_method_default = {
-	&pci_assign_interrupt_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_alloc_msix_desc = {
+	0, { &pci_alloc_msix_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_assign_interrupt_desc = {
-	0, &pci_assign_interrupt_method_default
+struct kobjop_desc pci_enable_msi_desc = {
+	0, { &pci_enable_msi_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_find_extcap_method_default = {
-	&pci_find_extcap_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_enable_msix_desc = {
+	0, { &pci_enable_msix_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_find_extcap_desc = {
-	0, &pci_find_extcap_method_default
+struct kobjop_desc pci_disable_msi_desc = {
+	0, { &pci_disable_msi_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_alloc_msi_method_default = {
-	&pci_alloc_msi_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_remap_msix_desc = {
+	0, { &pci_remap_msix_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_alloc_msi_desc = {
-	0, &pci_alloc_msi_method_default
+struct kobjop_desc pci_release_msi_desc = {
+	0, { &pci_release_msi_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_alloc_msix_method_default = {
-	&pci_alloc_msix_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_msi_count_desc = {
+	0, { &pci_msi_count_desc, (kobjop_t)null_msi_count }
 };
 
-struct kobjop_desc pci_alloc_msix_desc = {
-	0, &pci_alloc_msix_method_default
+struct kobjop_desc pci_msix_count_desc = {
+	0, { &pci_msix_count_desc, (kobjop_t)null_msi_count }
 };
 
-struct kobj_method pci_remap_msix_method_default = {
-	&pci_remap_msix_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_msix_pba_bar_desc = {
+	0, { &pci_msix_pba_bar_desc, (kobjop_t)null_msix_bar }
 };
 
-struct kobjop_desc pci_remap_msix_desc = {
-	0, &pci_remap_msix_method_default
+struct kobjop_desc pci_msix_table_bar_desc = {
+	0, { &pci_msix_table_bar_desc, (kobjop_t)null_msix_bar }
 };
 
-struct kobj_method pci_release_msi_method_default = {
-	&pci_release_msi_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pci_get_id_desc = {
+	0, { &pci_get_id_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_release_msi_desc = {
-	0, &pci_release_msi_method_default
+struct kobjop_desc pci_alloc_devinfo_desc = {
+	0, { &pci_alloc_devinfo_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_msi_count_method_default = {
-	&pci_msi_count_desc, (kobjop_t) null_msi_count
+struct kobjop_desc pci_child_added_desc = {
+	0, { &pci_child_added_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_msi_count_desc = {
-	0, &pci_msi_count_method_default
+struct kobjop_desc pci_iov_attach_desc = {
+	0, { &pci_iov_attach_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pci_msix_count_method_default = {
-	&pci_msix_count_desc, (kobjop_t) null_msi_count
+struct kobjop_desc pci_iov_detach_desc = {
+	0, { &pci_iov_detach_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pci_msix_count_desc = {
-	0, &pci_msix_count_method_default
+struct kobjop_desc pci_create_iov_child_desc = {
+	0, { &pci_create_iov_child_desc, (kobjop_t)null_create_iov_child }
 };
 
diff --git a/rtemsbsd/local/pcib_if.c b/rtemsbsd/local/pcib_if.c
index 07d7abb5..d0c2aa89 100644
--- a/rtemsbsd/local/pcib_if.c
+++ b/rtemsbsd/local/pcib_if.c
@@ -17,7 +17,9 @@
 #include <sys/kernel.h>
 #include <sys/kobj.h>
 #include <sys/bus.h>
+#include <sys/rman.h>
 #include <dev/pci/pcivar.h>
+#include <dev/pci/pcib_private.h>
 #include <rtems/bsd/local/pcib_if.h>
 
 
@@ -27,83 +29,70 @@ null_route_interrupt(device_t pcib, device_t dev, int pin)
 	return (PCI_INVALID_IRQ);
 }
 
-struct kobj_method pcib_maxslots_method_default = {
-	&pcib_maxslots_desc, (kobjop_t) kobj_error_method
-};
+static int
+pcib_null_ari_enabled(device_t pcib)
+{
+
+	return (0);
+}
 
 struct kobjop_desc pcib_maxslots_desc = {
-	0, &pcib_maxslots_method_default
+	0, { &pcib_maxslots_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pcib_read_config_method_default = {
-	&pcib_read_config_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pcib_maxfuncs_desc = {
+	0, { &pcib_maxfuncs_desc, (kobjop_t)pcib_maxfuncs }
 };
 
 struct kobjop_desc pcib_read_config_desc = {
-	0, &pcib_read_config_method_default
-};
-
-struct kobj_method pcib_write_config_method_default = {
-	&pcib_write_config_desc, (kobjop_t) kobj_error_method
+	0, { &pcib_read_config_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc pcib_write_config_desc = {
-	0, &pcib_write_config_method_default
-};
-
-struct kobj_method pcib_route_interrupt_method_default = {
-	&pcib_route_interrupt_desc, (kobjop_t) null_route_interrupt
+	0, { &pcib_write_config_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc pcib_route_interrupt_desc = {
-	0, &pcib_route_interrupt_method_default
-};
-
-struct kobj_method pcib_alloc_msi_method_default = {
-	&pcib_alloc_msi_desc, (kobjop_t) kobj_error_method
+	0, { &pcib_route_interrupt_desc, (kobjop_t)null_route_interrupt }
 };
 
 struct kobjop_desc pcib_alloc_msi_desc = {
-	0, &pcib_alloc_msi_method_default
-};
-
-struct kobj_method pcib_release_msi_method_default = {
-	&pcib_release_msi_desc, (kobjop_t) kobj_error_method
+	0, { &pcib_alloc_msi_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc pcib_release_msi_desc = {
-	0, &pcib_release_msi_method_default
+	0, { &pcib_release_msi_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pcib_alloc_msix_method_default = {
-	&pcib_alloc_msix_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pcib_alloc_msix_desc = {
+	0, { &pcib_alloc_msix_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pcib_alloc_msix_desc = {
-	0, &pcib_alloc_msix_method_default
+struct kobjop_desc pcib_release_msix_desc = {
+	0, { &pcib_release_msix_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pcib_release_msix_method_default = {
-	&pcib_release_msix_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pcib_map_msi_desc = {
+	0, { &pcib_map_msi_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc pcib_release_msix_desc = {
-	0, &pcib_release_msix_method_default
+struct kobjop_desc pcib_power_for_sleep_desc = {
+	0, { &pcib_power_for_sleep_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pcib_map_msi_method_default = {
-	&pcib_map_msi_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pcib_get_id_desc = {
+	0, { &pcib_get_id_desc, (kobjop_t)pcib_get_id }
 };
 
-struct kobjop_desc pcib_map_msi_desc = {
-	0, &pcib_map_msi_method_default
+struct kobjop_desc pcib_try_enable_ari_desc = {
+	0, { &pcib_try_enable_ari_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method pcib_power_for_sleep_method_default = {
-	&pcib_power_for_sleep_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc pcib_ari_enabled_desc = {
+	0, { &pcib_ari_enabled_desc, (kobjop_t)pcib_null_ari_enabled }
 };
 
-struct kobjop_desc pcib_power_for_sleep_desc = {
-	0, &pcib_power_for_sleep_method_default
+struct kobjop_desc pcib_decode_rid_desc = {
+	0, { &pcib_decode_rid_desc, (kobjop_t)pcib_decode_rid }
 };
 
diff --git a/rtemsbsd/local/usb_if.c b/rtemsbsd/local/usb_if.c
index d88ab545..4f334ec8 100644
--- a/rtemsbsd/local/usb_if.c
+++ b/rtemsbsd/local/usb_if.c
@@ -19,19 +19,11 @@
 #include <sys/bus.h>
 #include <rtems/bsd/local/usb_if.h>
 
-struct kobj_method usb_handle_request_method_default = {
-	&usb_handle_request_desc, (kobjop_t) kobj_error_method
-};
-
 struct kobjop_desc usb_handle_request_desc = {
-	0, &usb_handle_request_method_default
-};
-
-struct kobj_method usb_take_controller_method_default = {
-	&usb_take_controller_desc, (kobjop_t) kobj_error_method
+	0, { &usb_handle_request_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc usb_take_controller_desc = {
-	0, &usb_take_controller_method_default
+	0, { &usb_take_controller_desc, (kobjop_t)kobj_error_method }
 };
 
diff --git a/rtemsbsd/rtems/generate_kvm_symbols b/rtemsbsd/rtems/generate_kvm_symbols
index 8097c516..5be75664 100755
--- a/rtemsbsd/rtems/generate_kvm_symbols
+++ b/rtemsbsd/rtems/generate_kvm_symbols
@@ -8,62 +8,76 @@ while read sym
 do
   symbols="${symbols} ${sym}"
 done <<EOF
-_ifnet
-_rtstat
-_rt_tables
-_mrtstat
-_mfchashtbl
-_viftable
-_ipxpcb_list
-_ipxstat
-_spx_istat
-_ddpstat
+_ahstat
+_arpstat
+_carpstats
+_clust_hiwm
+_clust_lowm
 _ddpcb
-_ngsocklist
-_ip6stat
+_ddpstat
+_divcbinfo
+_espstat
 _icmp6stat
+_icmpstat
+_ifnet
+_igmpstat
+_ip6stat
+_ipcompstat
 _ipsec4stat
 _ipsec6stat
-_pim6stat
-_mrt6stat
-_mf6ctable
-_mif6table
-_pfkeystat
+_ipstat
+_ipxpcb_list
+_ipxstat
 _mbstat
+_mb_statpcpu
 _mbtypes
+_mbuf_hiwm
+_mbuf_lowm
+_mf6ctable
+_mfchashtbl
+_mfctablesize
+_mif6table
+_mrt6stat
+_mrtstat
+_netisr_bindthreads
+_netisr_defaultqlimit
+_netisr_dispatch_policy
+_netisr_maxprot
+_netisr_maxqlimit
+_netisr_maxthreads
+_netisr_proto
+_ngsocklist
 _nmbclusters
 _nmbufs
-_mbuf_hiwm
-_clust_hiwm
-_smp_cpus
+_nws
+_nws_array
+_nws_count
 _pagesize
-_mb_statpcpu
-_rttrash
-_mbuf_lowm
-_clust_lowm
-_carpstats
+_pfkeystat
 _pfsyncstats
-_ahstat
-_espstat
-_ipcompstat
-_tcpstat
-_udpstat
-_ipstat
-_icmpstat
-_igmpstat
+_pim6stat
 _pimstat
+_rip6stat
+_ripcbinfo
+_rtree
+_rtstat
+_rt_tables
+_rttrash
+_sctpstat
+_sfstat
+_smp_cpus
+_spx_istat
 _tcbinfo
+_tcps_states
+_tcpstat
 _udbinfo
-_divcbinfo
-_ripcbinfo
+_udpstat
 _unp_count
-_unp_gencnt
 _unp_dhead
+_unp_gencnt
 _unp_shead
-_rip6stat
-_sctpstat
-_mfctablesize
-_arpstat
+_unp_sphead
+_viftable
 EOF
 
 cat <<EOF
@@ -85,8 +99,7 @@ cat <<EOF
 EOF
 for sym in ${symbols}
 do
-  no_underscore=`echo $sym | sed -e 's/^_//' `
-  echo "extern int ${no_underscore} __attribute((weak));"
+  echo "extern int _bsd${sym} __attribute((weak));"
 done
 
 cat <<EOF
@@ -99,8 +112,7 @@ const kvm_symval_t rtems_kvm_symbols[] = {
 EOF
 for sym in ${symbols}
 do
-  no_underscore=`echo $sym | sed -e 's/^_//' `
-  echo "  { \"${sym}\", (uintptr_t) &${no_underscore} },"
+  echo "  { \"${sym}\", (uintptr_t) &_bsd${sym} },"
 done
 
 cat <<EOF
diff --git a/rtemsbsd/rtems/rtems-kernel-init.c b/rtemsbsd/rtems/rtems-kernel-init.c
index a60024a0..d6ba174c 100644
--- a/rtemsbsd/rtems/rtems-kernel-init.c
+++ b/rtemsbsd/rtems/rtems-kernel-init.c
@@ -69,6 +69,14 @@ void mi_startup(void);
 
 int hz;
 int tick;
+sbintime_t tick_sbt;
+struct bintime bt_timethreshold;
+struct bintime bt_tickthreshold;
+sbintime_t sbt_timethreshold;
+sbintime_t sbt_tickthreshold;
+struct bintime tc_tick_bt;
+sbintime_t tc_tick_sbt;
+int tc_precexp;
 int maxusers;     /* base tunable */
 
 static SYSCTL_NODE(_kern, OID_AUTO, smp, CTLFLAG_RD|CTLFLAG_CAPRD, NULL,
@@ -91,6 +99,18 @@ volatile uint32_t _Watchdog_Ticks_since_boot;
 extern volatile int32_t _bsd_ticks
     __attribute__ ((__alias__("_Watchdog_Ticks_since_boot")));
 
+__attribute__((__weak__)) void _arc4random_getentropy_fail(void)
+{
+
+}
+
+__attribute__((__weak__)) int getentropy(void *buf, size_t n)
+{
+
+	memset(buf, 0, n);
+	return (0);
+}
+
 rtems_status_code
 rtems_bsd_initialize(void)
 {
@@ -99,6 +119,15 @@ rtems_bsd_initialize(void)
 
 	hz = (int) rtems_clock_get_ticks_per_second();
 	tick = 1000000 / hz;
+	tick_sbt = SBT_1S / hz;
+	FREQ2BT(hz, &tc_tick_bt);
+	tc_tick_sbt = bttosbt(tc_tick_bt);
+	tc_precexp = 31;
+	bt_timethreshold.sec = INT_MAX;
+	bt_timethreshold.frac = ~(uint64_t)0;
+	bt_tickthreshold = bt_timethreshold;
+	sbt_timethreshold = bttosbt(bt_timethreshold);
+	sbt_tickthreshold = bttosbt(bt_tickthreshold);
 	maxusers = 1;
 	maxid_maxcpus = (int) rtems_get_processor_count();
 
diff --git a/rtemsbsd/rtems/rtems-kernel-irqs.c b/rtemsbsd/rtems/rtems-kernel-irqs.c
index 4331c05d..41331b57 100644
--- a/rtemsbsd/rtems/rtems-kernel-irqs.c
+++ b/rtemsbsd/rtems/rtems-kernel-irqs.c
@@ -60,4 +60,4 @@ irqs_sysinit(void)
 	);
 	BSD_ASSERT(status == RTEMS_SUCCESSFUL);
 }
-SYSINIT(irqs, SI_SUB_SETTINGS, SI_ORDER_ANY, irqs_sysinit, NULL);
+SYSINIT(irqs, SI_SUB_TUNABLES, SI_ORDER_ANY, irqs_sysinit, NULL);
diff --git a/rtemsbsd/rtems/rtems-kernel-jail.c b/rtemsbsd/rtems/rtems-kernel-jail.c
index 663c9348..2499846f 100644
--- a/rtemsbsd/rtems/rtems-kernel-jail.c
+++ b/rtemsbsd/rtems/rtems-kernel-jail.c
@@ -162,7 +162,7 @@ prison_saddrsel_ip6(struct ucred *cred, struct in6_addr *ia6)
  * doesn't allow IPv4.  Address passed in in NBO.
  */
 int
-prison_check_ip4(struct ucred *cred, struct in_addr *ia)
+prison_check_ip4(const struct ucred *cred, const struct in_addr *ia)
 {
   return 0;
 }
@@ -173,7 +173,7 @@ prison_check_ip4(struct ucred *cred, struct in_addr *ia)
  * NOTE: RTEMS does not restrict via a jail so return 0.
  */
 int
-prison_check_ip6(struct ucred *cred, struct in6_addr *ia6)
+prison_check_ip6(const struct ucred *cred, const struct in6_addr *ia6)
 {
   return 0;
 }
diff --git a/rtemsbsd/rtems/rtems-kernel-malloc.c b/rtemsbsd/rtems/rtems-kernel-malloc.c
index 3c9d877f..b61f2911 100644
--- a/rtemsbsd/rtems/rtems-kernel-malloc.c
+++ b/rtemsbsd/rtems/rtems-kernel-malloc.c
@@ -50,9 +50,6 @@ MALLOC_DEFINE(M_DEVBUF, "devbuf", "device driver memory");
 
 MALLOC_DEFINE(M_TEMP, "temp", "misc temporary data buffers");
 
-MALLOC_DEFINE(M_IP6OPT, "ip6opt", "IPv6 options");
-MALLOC_DEFINE(M_IP6NDP, "ip6ndp", "IPv6 Neighbor Discovery");
-
 MALLOC_DEFINE(M_IOV, "iov", "large iov's");
 
 void
diff --git a/rtemsbsd/rtems/rtems-kernel-mutex.c b/rtemsbsd/rtems/rtems-kernel-mutex.c
index 84ea9e53..8e8e1cd5 100644
--- a/rtemsbsd/rtems/rtems-kernel-mutex.c
+++ b/rtemsbsd/rtems/rtems-kernel-mutex.c
@@ -146,7 +146,7 @@ _mtx_lock_flags(struct mtx *m, int opts, const char *file, int line)
 }
 
 int
-_mtx_trylock(struct mtx *m, int opts, const char *file, int line)
+mtx_trylock_flags_(struct mtx *m, int opts, const char *file, int line)
 {
 	return (rtems_bsd_mutex_trylock(&m->lock_object, &m->mutex));
 }
diff --git a/rtemsbsd/rtems/rtems-kernel-nexus.c b/rtemsbsd/rtems/rtems-kernel-nexus.c
index a9c2427a..04638cca 100644
--- a/rtemsbsd/rtems/rtems-kernel-nexus.c
+++ b/rtemsbsd/rtems/rtems-kernel-nexus.c
@@ -121,9 +121,9 @@ nexus_probe(device_t dev)
 }
 
 static bool
-nexus_get_start(const rtems_bsd_device *nd, int type, u_long *start)
+nexus_get_start(const rtems_bsd_device *nd, int type, rman_res_t *start)
 {
-	u_long sr = *start;
+	u_long sr = (u_long)*start;
 	size_t i;
 
 	for (i = 0; i < nd->resource_count; ++i) {
@@ -141,7 +141,7 @@ nexus_get_start(const rtems_bsd_device *nd, int type, u_long *start)
 
 static struct resource *
 nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
-    u_long start, u_long end, u_long count, u_int flags)
+    rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
 {
 	struct resource *res = NULL;
 	struct rman *rm;
diff --git a/rtemsbsd/rtems/rtems-kernel-page.c b/rtemsbsd/rtems/rtems-kernel-page.c
index cfcbb1a0..8f8c235a 100644
--- a/rtemsbsd/rtems/rtems-kernel-page.c
+++ b/rtemsbsd/rtems/rtems-kernel-page.c
@@ -94,10 +94,12 @@ rtems_bsd_page_alloc(uintptr_t size_in_bytes, int wait)
 	mtx_unlock(&page_heap_mtx);
 
 #ifdef INVARIANTS
-	if (addr != NULL) {
+	wait |= M_ZERO;
+#endif
+
+	if (addr != NULL && (wait & M_ZERO) != 0) {
 		memset(addr, 0, size_in_bytes);
 	}
-#endif
 
 	return (addr);
 }
diff --git a/rtemsbsd/rtems/rtems-kernel-sx.c b/rtemsbsd/rtems/rtems-kernel-sx.c
index 84523a9a..ea0cf04e 100644
--- a/rtemsbsd/rtems/rtems-kernel-sx.c
+++ b/rtemsbsd/rtems/rtems-kernel-sx.c
@@ -146,7 +146,7 @@ _sx_xlock(struct sx *sx, int opts, const char *file, int line)
 }
 
 int
-_sx_try_xlock(struct sx *sx, const char *file, int line)
+sx_try_xlock_(struct sx *sx, const char *file, int line)
 {
 	return (rtems_bsd_mutex_trylock(&sx->lock_object, &sx->mutex));
 }
@@ -158,13 +158,13 @@ _sx_xunlock(struct sx *sx, const char *file, int line)
 }
 
 int
-_sx_try_upgrade(struct sx *sx, const char *file, int line)
+sx_try_upgrade_(struct sx *sx, const char *file, int line)
 {
 	return (1);
 }
 
 void
-_sx_downgrade(struct sx *sx, const char *file, int line)
+sx_downgrade_(struct sx *sx, const char *file, int line)
 {
 	/* Do nothing */
 }
diff --git a/rtemsbsd/rtems/rtems-legacy-rtrequest.c b/rtemsbsd/rtems/rtems-legacy-rtrequest.c
index e1269be9..2223ab09 100644
--- a/rtemsbsd/rtems/rtems-legacy-rtrequest.c
+++ b/rtemsbsd/rtems/rtems-legacy-rtrequest.c
@@ -44,7 +44,8 @@ rtems_bsdnet_rtrequest(int req, struct sockaddr *dst, struct sockaddr *gateway,
 {
 	int error;
 
-	error = rtrequest(req, dst, gateway, netmask, flags, net_nrt);
+	error = rtrequest_fib(req, dst, gateway, netmask, flags, net_nrt,
+	    BSD_DEFAULT_FIB);
 	if (error != 0) {
 		errno = error;
 
diff --git a/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c b/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c
index 875fae57..a6d55b19 100644
--- a/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c
+++ b/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c
@@ -1145,7 +1145,7 @@ static MCD_bufDescFec *fec_init_rx_dma(
   for (bdIndex = 0; bdIndex < bdCount; ++bdIndex) {
     bool bdIsLast = bdIndex == bdCount - 1;
 
-    mbufs[bdIndex] = fec_add_mbuf(M_WAIT, ifp, &bdRing[bdIndex], bdIsLast);
+    mbufs[bdIndex] = fec_add_mbuf(M_WAITOK, ifp, &bdRing[bdIndex], bdIsLast);
   }
 
   return bdRing;
@@ -1539,7 +1539,6 @@ static int fec_attach(device_t dev)
   IFQ_SET_MAXLEN(&ifp->if_snd, TX_BUF_COUNT - 1);
   ifp->if_snd.ifq_drv_maxlen = TX_BUF_COUNT - 1;
   IFQ_SET_READY(&ifp->if_snd);
-  ifp->if_data.ifi_hdrlen = sizeof(struct ether_header);
 
   /*
    * Attach the interface
diff --git a/rtemsbsd/sys/dev/tsec/if_tsec_nexus.c b/rtemsbsd/sys/dev/tsec/if_tsec_nexus.c
index 72dfafa1..b56a598d 100644
--- a/rtemsbsd/sys/dev/tsec/if_tsec_nexus.c
+++ b/rtemsbsd/sys/dev/tsec/if_tsec_nexus.c
@@ -152,7 +152,6 @@ tsec_fdt_attach(device_t dev)
 	sc->dev = dev;
 
 	/* FIXME */
-	sc->phy_sc = sc;
 	sc->phyaddr = -1;
 
 	/* Init timer */
diff --git a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
index 00fbaef0..906fc742 100644
--- a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
+++ b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
@@ -254,7 +254,7 @@ ehci_mpc83xx_attach(device_t self)
 	);
 	BSD_ASSERT_SC(sc);
 
-	e->sc_flags |= EHCI_SCFLG_SETMODE | EHCI_SCFLG_NORESTERM | EHCI_SCFLG_TT;
+	e->sc_flags |= EHCI_SCFLG_NORESTERM | EHCI_SCFLG_TT;
 
 	/* EHCI intitialization */
 	ue = ehci_init(e);
diff --git a/rtemsbsd/sys/fs/devfs/devfs_devs.c b/rtemsbsd/sys/fs/devfs/devfs_devs.c
index 75c9e270..85929e81 100755
--- a/rtemsbsd/sys/fs/devfs/devfs_devs.c
+++ b/rtemsbsd/sys/fs/devfs/devfs_devs.c
@@ -98,7 +98,7 @@ devfs_imfs_readv(rtems_libio_t *iop, const struct iovec *iov, int iovcnt,
 	struct cdev *cdev = devfs_imfs_get_context_by_iop(iop);
 	struct thread *td = rtems_bsd_get_curthread_or_null();
 	struct uio uio = {
-		.uio_iov = iov,
+		.uio_iov = __DECONST(struct iovec *, iov),
 		.uio_iovcnt = iovcnt,
 		.uio_offset = 0,
 		.uio_resid = total,
@@ -140,7 +140,7 @@ devfs_imfs_writev(rtems_libio_t *iop, const struct iovec *iov, int iovcnt,
 	struct cdev *cdev = devfs_imfs_get_context_by_iop(iop);
 	struct thread *td = rtems_bsd_get_curthread_or_null();
 	struct uio uio = {
-		.uio_iov = iov,
+		.uio_iov = __DECONST(struct iovec *, iov),
 		.uio_iovcnt = iovcnt,
 		.uio_offset = 0,
 		.uio_resid = total,
@@ -168,7 +168,7 @@ static ssize_t
 devfs_imfs_write(rtems_libio_t *iop, const void *buffer, size_t count)
 {
 	struct iovec iov = {
-		.iov_base = buffer,
+		.iov_base = __DECONST(void *, buffer),
 		.iov_len = count
 	};
 
@@ -237,15 +237,11 @@ devfs_alloc(int flags)
 {
 	struct cdev *cdev;
 
-	cdev = malloc(sizeof *cdev, M_TEMP, 0);
-	if (cdev == NULL)
+	cdev = malloc(sizeof *cdev, M_TEMP, M_ZERO);
+	if (cdev != NULL)
 		return (NULL);
 
-	memset(cdev, 0, sizeof *cdev);
-	cdev->si_name = cdev->__si_namebuf;
-	memcpy(cdev->__si_pathstruct.__si_dir, rtems_cdev_directory,
-	    sizeof(rtems_cdev_directory) - 1);
-
+	memcpy(cdev->si_path, rtems_cdev_directory, sizeof(cdev->si_path));
 	return (cdev);
 }
 
diff --git a/rtemsbsd/sys/net/if_ppp.c b/rtemsbsd/sys/net/if_ppp.c
index b93dc0db..8f8d29c6 100644
--- a/rtemsbsd/sys/net/if_ppp.c
+++ b/rtemsbsd/sys/net/if_ppp.c
@@ -107,6 +107,7 @@
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
 #include <net/route.h>
@@ -918,7 +919,7 @@ pppsioctl(struct ifnet *ifp, ioctl_command_t cmd, caddr_t data)
  * Packet is placed in Information field of PPP frame.
  */
 int
-pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
+pppoutput(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
     struct route *rtp)
 {
     register struct ppp_softc *sc = ifp->if_softc;
@@ -987,7 +988,7 @@ pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
      * (This assumes M_LEADINGSPACE is always 0 for a cluster mbuf.)
      */
     if (M_LEADINGSPACE(m0) < PPP_HDRLEN) {
-	m0 = m_prepend(m0, PPP_HDRLEN, M_DONTWAIT);
+	m0 = m_prepend(m0, PPP_HDRLEN, M_NOWAIT);
 	if (m0 == 0) {
 	    error = ENOBUFS;
 	    goto bad;
@@ -1063,9 +1064,9 @@ pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
     } else {
 	ifq = (m0->m_flags & M_HIGHPRI)? &sc->sc_fastq: &ifp->if_snd;
 	if (_IF_QFULL(ifq) && dst->sa_family != AF_UNSPEC) {
-	    IFQ_INC_DROPS(ifq);
+	    if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 	    splx(s);
-	    sc->sc_ifp->if_oerrors++;
+	    if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	    sc->sc_stats.ppp_oerrors++;
 	    error = ENOBUFS;
 	    goto bad;
@@ -1074,8 +1075,8 @@ pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
 	(*sc->sc_start)(sc);
     }
     ifp->if_lastchange = ppp_time;
-    ifp->if_opackets++;
-    ifp->if_obytes += len;
+    if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+    if_inc_counter(ifp, IFCOUNTER_OBYTES, len);
 
     splx(s);
     return (0);
@@ -1115,8 +1116,8 @@ ppp_requeue(struct ppp_softc *sc)
 	    m->m_nextpkt = NULL;
 	    ifq = (m->m_flags & M_HIGHPRI)? &sc->sc_fastq: &sc->sc_ifp->if_snd;
 	    if (_IF_QFULL(ifq)) {
-		IFQ_INC_DROPS(ifq);
-		sc->sc_ifp->if_oerrors++;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_OQDROPS, 1);
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 		sc->sc_stats.ppp_oerrors++;
 	    } else
 		IF_ENQUEUE(ifq, m);
@@ -1517,13 +1518,13 @@ ppp_inproc(struct ppp_softc *sc, struct mbuf *m)
 	}
 
 	/* Copy the PPP and IP headers into a new mbuf. */
-	MGETHDR(mp, M_DONTWAIT, MT_DATA);
+	MGETHDR(mp, M_NOWAIT, MT_DATA);
 	if (mp == NULL)
 	    goto bad;
 	mp->m_len = 0;
 	mp->m_next = NULL;
 	if (hlen + PPP_HDRLEN > MHLEN) {
-	    MCLGET(mp, M_DONTWAIT);
+	    MCLGET(mp, M_NOWAIT);
 	    if (M_TRAILINGSPACE(mp) < hlen + PPP_HDRLEN) {
 		m_freem(mp);
 		goto bad;	/* lose if big headers and no clusters */
@@ -1581,7 +1582,7 @@ ppp_inproc(struct ppp_softc *sc, struct mbuf *m)
      * whole cluster on it.
      */
     if (ilen <= MHLEN && M_IS_CLUSTER(m)) {
-	MGETHDR(mp, M_DONTWAIT, MT_DATA);
+	MGETHDR(mp, M_NOWAIT, MT_DATA);
 	if (mp != NULL) {
 	    m_copydata(m, 0, ilen, mtod(mp, caddr_t));
             /* instead of freeing - return cluster mbuf so it can be reused */
@@ -1661,11 +1662,10 @@ ppp_inproc(struct ppp_softc *sc, struct mbuf *m)
 	 */
 	s = splimp();
 	if (_IF_QFULL(inq)) {
-	    IFQ_INC_DROPS(inq);
 	    splx(s);
 	    if (sc->sc_flags & SC_DEBUG)
 		printf("ppp%d: input queue full\n", ppp_unit(sc));
-	    ifp->if_iqdrops++;
+	    if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 	    goto bad;
 	}
 	IF_ENQUEUE(inq, m);
@@ -1674,8 +1674,8 @@ ppp_inproc(struct ppp_softc *sc, struct mbuf *m)
 	break;
     }
 
-    ifp->if_ipackets++;
-    ifp->if_ibytes += ilen;
+    if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+    if_inc_counter(ifp, IFCOUNTER_IBYTES, ilen);
     microtime(&ppp_time);
     ifp->if_lastchange = ppp_time;
 
@@ -1687,7 +1687,7 @@ ppp_inproc(struct ppp_softc *sc, struct mbuf *m)
 
  bad:
     m_freem(m);
-    sc->sc_ifp->if_ierrors++;
+    if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
     sc->sc_stats.ppp_ierrors++;
     return mf;
 }
diff --git a/rtemsbsd/sys/net/if_pppvar.h b/rtemsbsd/sys/net/if_pppvar.h
index b0a5ba91..fdfb56df 100644
--- a/rtemsbsd/sys/net/if_pppvar.h
+++ b/rtemsbsd/sys/net/if_pppvar.h
@@ -131,8 +131,8 @@ struct ppp_softc {
 
 struct	ppp_softc *pppalloc(pid_t pid);
 void	pppdealloc(struct ppp_softc *sc);
-int	pppoutput(struct ifnet *, struct mbuf *,
-		       struct sockaddr *, struct route *);
+int	pppoutput(struct ifnet *, struct mbuf *, const struct sockaddr *,
+	    struct route *);
 int	pppioctl(struct ppp_softc *sc, ioctl_command_t cmd, caddr_t data,
 		      int flag, struct proc *p);
 struct	mbuf *ppp_dequeue(struct ppp_softc *sc);
diff --git a/rtemsbsd/sys/net/ppp_tty.c b/rtemsbsd/sys/net/ppp_tty.c
index d1945941..71105c94 100644
--- a/rtemsbsd/sys/net/ppp_tty.c
+++ b/rtemsbsd/sys/net/ppp_tty.c
@@ -377,14 +377,14 @@ pppwrite(struct rtems_termios_tty *tty, rtems_libio_rw_args_t *rw_args)
     struct mbuf                 **mp;
 
     for (mp = &m0; maximum; mp = &m->m_next) {
-	MGET(m, M_WAIT, MT_DATA);
+	MGET(m, M_WAITOK, MT_DATA);
 	if ((*mp = m) == NULL) {
 	    m_freem(m0);
 	    return (ENOBUFS);
 	}
 	m->m_len = 0;
 	if (maximum >= MCLBYTES / 2) {
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
         }
 	len = M_TRAILINGSPACE(m);
 	if (len > maximum) {
@@ -683,11 +683,11 @@ pppgetm(struct ppp_softc *sc)
     mp = &sc->sc_m;
     for (len = sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN; len > 0; ){
 	if ((m = *mp) == NULL) {
-	    MGETHDR(m, M_DONTWAIT, MT_DATA);
+	    MGETHDR(m, M_NOWAIT, MT_DATA);
 	    if (m == NULL)
 		break;
 	    *mp = m;
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	}
 	len -= M_DATASIZE(m);
 	mp = &m->m_next;
@@ -708,8 +708,8 @@ pppallocmbuf(struct ppp_softc *sc, struct mbuf **mp)
     m = *mp;
     if ( m == NULL ) {
       /* get mbuf header */
-      MGETHDR(m, M_WAIT, MT_DATA);
-      MCLGET(m, M_WAIT);
+      MGETHDR(m, M_WAITOK, MT_DATA);
+      MCLGET(m, M_WAITOK);
       *mp = m;
     }
 
@@ -769,7 +769,7 @@ pppinput(int c, struct rtems_termios_tty *tp)
 	    sc->sc_flags |= SC_PKTLOST;	/* note the dropped packet */
 	    if ((sc->sc_flags & (SC_FLUSH | SC_ESCAPED)) == 0){
                 /* bad fcs error */
-		sc->sc_ifp->if_ierrors++;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 		sc->sc_stats.ppp_ierrors++;
 	    } else
 		sc->sc_flags &= ~(SC_FLUSH | SC_ESCAPED);
@@ -779,7 +779,7 @@ pppinput(int c, struct rtems_termios_tty *tp)
 	if (ilen < PPP_HDRLEN + PPP_FCSLEN) {
 	    if (ilen) {
                 /* too short error */
-		sc->sc_ifp->if_ierrors++;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 		sc->sc_stats.ppp_ierrors++;
 		sc->sc_flags |= SC_PKTLOST;
 	    }
@@ -898,7 +898,7 @@ pppinput(int c, struct rtems_termios_tty *tp)
 
  flush:
     if (!(sc->sc_flags & SC_FLUSH)) {
-	sc->sc_ifp->if_ierrors++;
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 	sc->sc_stats.ppp_ierrors++;
 	sc->sc_flags |= SC_FLUSH;
     }