From 77a0144145d8913221a2c71d9060a08665491539 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 11 Jun 2019 22:07:39 +0000 Subject: [PATCH] Sort opt_foo.h #includes and add a missing blank line in ip_output(). --- sys/netinet/ip_output.c | 5 +++-- sys/netinet6/ip6_output.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index b48350fd5c7a..99b8c3662be5 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -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 #include @@ -283,6 +283,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags, #if defined(IPSEC) || defined(IPSEC_SUPPORT) int no_route_but_check_spd = 0; #endif + M_ASSERTPKTHDR(m); if (inp != NULL) { diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 3c601cb8702f..f1e36c9f1966 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -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 #include