svn commit: r311682 - stable/11/sys/netinet

[Andrey V. Elsukov]

Author: ae
Date: Sun Jan  8 13:35:10 2017
New Revision: 311682
URL: https://svnweb.freebsd.org/changeset/base/311682

Log:
  MFC r310783:
    When we are sending IP fragments, update ip pointers in IP_PROBE() for
    each fragment.

Modified:
  stable/11/sys/netinet/ip_fastfwd.c
  stable/11/sys/netinet/ip_output.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/ip_fastfwd.c
==============================================================================
--- stable/11/sys/netinet/ip_fastfwd.c	Sun Jan  8 13:31:24 2017	(r311681)
+++ stable/11/sys/netinet/ip_fastfwd.c	Sun Jan  8 13:35:10 2017	(r311682)
@@ -400,8 +400,9 @@ passout:
 				 */
 				m_clrprotoflags(m);
 
-				IP_PROBE(send, NULL, NULL, ip, nh.nh_ifp,
-				    ip, NULL);
+				IP_PROBE(send, NULL, NULL,
+				    mtod(m, struct ip *), nh.nh_ifp,
+				    mtod(m, struct ip *), NULL);
 				/* XXX: we can use cached route here */
 				error = (*nh.nh_ifp->if_output)(nh.nh_ifp, m,
 				    (struct sockaddr *)&dst, NULL);

Modified: stable/11/sys/netinet/ip_output.c
==============================================================================
--- stable/11/sys/netinet/ip_output.c	Sun Jan  8 13:31:24 2017	(r311681)
+++ stable/11/sys/netinet/ip_output.c	Sun Jan  8 13:35:10 2017	(r311682)
@@ -693,7 +693,8 @@ sendit:
 			 */
 			m_clrprotoflags(m);
 
-			IP_PROBE(send, NULL, NULL, ip, ifp, ip, NULL);
+			IP_PROBE(send, NULL, NULL, mtod(m, struct ip *), ifp,
+			    mtod(m, struct ip *), NULL);
 			error = (*ifp->if_output)(ifp, m,
 			    (const struct sockaddr *)gw, ro);
 		} else