Index: sys/net/if_var.h =================================================================== --- sys/net/if_var.h +++ sys/net/if_var.h @@ -71,12 +71,12 @@ struct netmap_adapter; struct debugnet_methods; -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_KERNEL_UT) #include #include /* ifqueue only? */ #include #include -#endif /* _KERNEL */ +#endif /* _KERNEL || _KERNEL_UT */ #include #include #include @@ -94,7 +94,7 @@ CK_STAILQ_HEAD(ifmultihead, ifmultiaddr); CK_STAILQ_HEAD(ifgrouphead, ifg_group); -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_KERNEL_UT) VNET_DECLARE(struct pfil_head *, link_pfil_head); #define V_link_pfil_head VNET(link_pfil_head) #define PFIL_ETHER_NAME "ethernet" @@ -106,7 +106,7 @@ VNET_DECLARE(struct hhook_head *, ipsec_hhh_out[HHOOK_IPSEC_COUNT]); #define V_ipsec_hhh_in VNET(ipsec_hhh_in) #define V_ipsec_hhh_out VNET(ipsec_hhh_out) -#endif /* _KERNEL */ +#endif /* _KERNEL || _KERNEL_UT */ typedef enum { IFCOUNTER_IPACKETS = 0, @@ -466,7 +466,7 @@ #define IF_ADDR_LOCK_ASSERT(if) MPASS(in_epoch(net_epoch_preempt) || mtx_owned(&(if)->if_addr_lock)) #define IF_ADDR_WLOCK_ASSERT(if) mtx_assert(&(if)->if_addr_lock, MA_OWNED) -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_KERNEL_UT) /* interface link layer address change event */ typedef void (*iflladdr_event_handler_t)(void *, struct ifnet *); EVENTHANDLER_DECLARE(iflladdr_event, iflladdr_event_handler_t); @@ -792,7 +792,7 @@ int ether_poll_deregister(if_t ifp); #endif /* DEVICE_POLLING */ -#endif /* _KERNEL */ +#endif /* _KERNEL || _KERNEL_UT */ #include /* XXXAO: temporary unconditional include */