From owner-svn-src-all@freebsd.org Tue Jun 11 22:07:40 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0BA115C8748; Tue, 11 Jun 2019 22:07:40 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 54A608295F; Tue, 11 Jun 2019 22:07:40 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2E4787D88; Tue, 11 Jun 2019 22:07:40 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5BM7erO060599; Tue, 11 Jun 2019 22:07:40 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5BM7dXB060597; Tue, 11 Jun 2019 22:07:39 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201906112207.x5BM7dXB060597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 11 Jun 2019 22:07:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r348966 - in head/sys: netinet netinet6 X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/sys: netinet netinet6 X-SVN-Commit-Revision: 348966 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 54A608295F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jun 2019 22:07:40 -0000 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 #include @@ -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 #include