M1: pf.c compiles into pf.ko

scripts/stage-port.sh

@@ -34,11 +34,15 @@ pf_sed() {
 	-e 's/ip6_fragment[(]/pfk_ip6_fragment(/g' \
 	-e 's/in6_proto_cksum_out[(]/pfk_in6_proto_cksum_out(/g' \
 	-e 's/ip6_forward[(]/pfk_ip6_forward(/g' \
+	-e 's/\bip6_output[(]/pfk_ip6_output(/g' \
+	-e 's/\bip_output[(]/pfk_ip_output(/g' \
+	-e 's/\bip_forward[(]/pfk_ip_forward(/g' \
 	-e 's/ifp->if_output[(]/pfk_if_output(/g' \
 	-e 's/pfk_if_output[(]ifp, m, sin6tosa[(]dst[)]/pfk_if_output(ifp, m, (struct sockaddr *)sin6tosa(dst)/g' \
 	-e 's/pfk_if_output[(]ifp, m, sintosa[(]dst[)]/pfk_if_output(ifp, m, (struct sockaddr *)sintosa(dst)/g' \
-	-e 's/^([ \t]*)[^;]*\.(sa|sin|sin6|six|sun)[0-9]*_len[[:space:]]*=[^;]*;/\1;/' \
+	-e 's/^([ \t]*)[^;]*(\.|->)(sa|sin|sin6|six|sun)[0-9]*_len[[:space:]]*=[^;]*;/\1;/' \
 	-e 's/struct radix_node \[2\], u_int8_t\);/struct radix_node *, u_int8_t);/' \
+	-e 's/struct pf_src_node \*\*, struct pf_test_ctx \*/struct pf_src_node *[PF_SN_MAX], struct pf_test_ctx */g' \
 	-e '/^#define[[:space:]]+isupper\(c\)/d' \
 	-e '/^#define[[:space:]]+islower\(c\)/d' \
 	-e '/^#define[[:space:]]+isalpha\(c\)/d' \
@@ -98,7 +102,7 @@ port_c() {
 PORTED_LIST='net/pf.c net/pf_ioctl.c net/pf_norm.c net/pf_if.c net/pf_lb.c
 net/pf_ruleset.c net/pf_table.c net/pf_osfp.c net/pf_syncookies.c
 net/ifq.c net/hfsc.c net/fq_codel.c net/if_pflog.c netinet/ip_divert.c
-crypto/md5.c crypto/sha2.c'
+kern/subr_tree.c crypto/md5.c crypto/sha2.c'
 # radix.c/rtable.c (hand-ported against our cleaned compat/net/radix.h) and
 # siphash/toeplitz (own PFLinux implementations) are deliberately NOT in the
 # automatic list.
@@ -125,6 +129,8 @@ port)
 			port_c "$f" "pfsrc/${f##*/}" ;;
 		net/radix.c|net/rtable.c)
 			port_c "$f" "compat/${f##*/}" ;;
+		kern/subr_tree.c)
+			port_c "$f" "compat/subr_tree.c" ;;
 		netinet/ip_divert.c)
 			port_c "$f" "pfsrc/ip_divert.c" ;;
 		crypto/md5.c|crypto/sha2.c)