Date: Tue, 22 Oct 2019 14:11:22 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r353885 - in stable/12/sys: modules/pf netpfil/pf Message-ID: <201910221411.x9MEBNlA084542@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue Oct 22 14:11:22 2019 New Revision: 353885 URL: https://svnweb.freebsd.org/changeset/base/353885 Log: MFC r353458, r353460: Add a missing include of opt_sctp.h. Modified: stable/12/sys/modules/pf/Makefile stable/12/sys/netpfil/pf/pf.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/modules/pf/Makefile ============================================================================== --- stable/12/sys/modules/pf/Makefile Tue Oct 22 14:10:31 2019 (r353884) +++ stable/12/sys/modules/pf/Makefile Tue Oct 22 14:11:22 2019 (r353885) @@ -6,7 +6,7 @@ KMOD= pf SRCS= pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ pf_ruleset.c in4_cksum.c \ bus_if.h device_if.h \ - opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h + opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_sctp.h opt_global.h .if !defined(KERNBUILDDIR) # pflog can be loaded as a module, have the additional checks turned on Modified: stable/12/sys/netpfil/pf/pf.c ============================================================================== --- stable/12/sys/netpfil/pf/pf.c Tue Oct 22 14:10:31 2019 (r353884) +++ stable/12/sys/netpfil/pf/pf.c Tue Oct 22 14:11:22 2019 (r353885) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_bpf.h" #include "opt_pf.h" +#include "opt_sctp.h" #include <sys/param.h> #include <sys/bus.h> @@ -103,6 +104,10 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #endif /* INET6 */ +#ifdef SCTP +#include <netinet/sctp_crc32.h> +#endif + #include <machine/in_cksum.h> #include <security/mac/mac_framework.h> @@ -5589,7 +5594,7 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, } #ifdef SCTP if (m0->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) { - sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2)); + sctp_delayed_cksum(m0, (uint32_t)(ip->ip_hl << 2)); m0->m_pkthdr.csum_flags &= ~CSUM_SCTP; } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910221411.x9MEBNlA084542>