? net/npf/npf_os.c
? net/npf/npfkern.h
? net/npf/stateful-ends
Index: compat/netbsd32/netbsd32_ioctl.h
===================================================================
RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_ioctl.h,v
retrieving revision 1.55
diff -u -u -r1.55 netbsd32_ioctl.h
--- compat/netbsd32/netbsd32_ioctl.h	12 Nov 2016 16:06:04 -0000	1.55
+++ compat/netbsd32/netbsd32_ioctl.h	26 Dec 2016 20:55:42 -0000
@@ -575,14 +575,12 @@
 #define	KIOCGSYMBOL32	_IOWR('l', 5, struct netbsd32_ksyms_gsymbol)
 #endif /* KIOCGSYMBOL */
 
-/* From net/npf/npf.h */
-typedef struct in6_addr		netbsd32_npf_addr_t;
-typedef uint8_t			netbsd32_npf_netmask_t;
+#include <net/npf/npf.h>
 
 typedef struct netbsd32_npf_ioctl_ent {
-	int			alen;
-	netbsd32_npf_addr_t	addr;
-	netbsd32_npf_netmask_t	mask;
+	int		alen;
+	npf_addr_t	addr;
+	npf_netmask_t	mask;
 } netbsd32_npf_ioctl_ent_t;
 
 typedef struct netbsd32_npf_ioctl_buf {