Date: Fri, 20 May 2016 12:17:40 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300298 - head/sys/netinet6 Message-ID: <201605201217.u4KCHeeq088852@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605201217.u4KCHeeq088852>