Date: Tue, 11 Jun 2019 22:07:39 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r348966 - in head/sys: netinet netinet6 Message-ID: <201906112207.x5BM7dXB060597@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Tue Jun 11 22:07:39 2019 New Revision: 348966 URL: https://svnweb.freebsd.org/changeset/base/348966 Log: Sort opt_foo.h #includes and add a missing blank line in ip_output(). Modified: head/sys/netinet/ip_output.c head/sys/netinet6/ip6_output.c Modified: head/sys/netinet/ip_output.c ============================================================================== --- head/sys/netinet/ip_output.c Tue Jun 11 22:06:31 2019 (r348965) +++ head/sys/netinet/ip_output.c Tue Jun 11 22:07:39 2019 (r348966) @@ -35,13 +35,13 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" -#include "opt_ratelimit.h" #include "opt_ipsec.h" #include "opt_mbuf_stress_test.h" #include "opt_mpath.h" +#include "opt_ratelimit.h" #include "opt_route.h" -#include "opt_sctp.h" #include "opt_rss.h" +#include "opt_sctp.h" #include <sys/param.h> #include <sys/systm.h> @@ -283,6 +283,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct rou #if defined(IPSEC) || defined(IPSEC_SUPPORT) int no_route_but_check_spd = 0; #endif + M_ASSERTPKTHDR(m); if (inp != NULL) { Modified: head/sys/netinet6/ip6_output.c ============================================================================== --- head/sys/netinet6/ip6_output.c Tue Jun 11 22:06:31 2019 (r348965) +++ head/sys/netinet6/ip6_output.c Tue Jun 11 22:07:39 2019 (r348966) @@ -67,11 +67,11 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_ratelimit.h" #include "opt_ipsec.h" -#include "opt_sctp.h" +#include "opt_ratelimit.h" #include "opt_route.h" #include "opt_rss.h" +#include "opt_sctp.h" #include <sys/param.h> #include <sys/kernel.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906112207.x5BM7dXB060597>