svn commit: r300298 - head/sys/netinet6

Andrey V. Elsukov ae at FreeBSD.org
Fri May 20 12:17:41 UTC 2016


Author: ae
Date: Fri May 20 12:17:40 2016
New Revision: 300298
URL: https://svnweb.freebsd.org/changeset/base/300298

Log:
  Remove ip6 adjusting from the place where pointer couldn't be changed.
  And add comment after calling PFIL hooks, where it could be changed.

Modified:
  head/sys/netinet6/ip6_output.c

Modified: head/sys/netinet6/ip6_output.c
==============================================================================
--- head/sys/netinet6/ip6_output.c	Fri May 20 12:09:10 2016	(r300297)
+++ head/sys/netinet6/ip6_output.c	Fri May 20 12:17:40 2016	(r300298)
@@ -536,10 +536,6 @@ again:
 		else
 			ip6->ip6_hlim = V_ip6_defmcasthlim;
 	}
-
-	/* adjust pointer */
-	ip6 = mtod(m, struct ip6_hdr *);
-
 	/*
 	 * Validate route against routing table additions;
 	 * a better/more specific route might have been added.
@@ -798,6 +794,7 @@ again:
 	error = pfil_run_hooks(&V_inet6_pfil_hook, &m, ifp, PFIL_OUT, inp);
 	if (error != 0 || m == NULL)
 		goto done;
+	/* adjust pointer */
 	ip6 = mtod(m, struct ip6_hdr *);
 
 	needfiblookup = 0;


More information about the svn-src-head mailing list