svn commit: r287807 - in head: cddl/lib/libdtrace share/man/man4

[Mark Johnston]

Author: markj
Date: Tue Sep 15 05:16:26 2015
New Revision: 287807
URL: https://svnweb.freebsd.org/changeset/base/287807

Log:
  Remove an unneeded typedef of ip6_t from the DTrace ip provider library.
  It causes an error when ipfilter is enabled, since ipl.ko contains an
  identical typedef.
  
  PR:		203092
  MFC after:	1 week

Modified:
  head/cddl/lib/libdtrace/ip.d
  head/share/man/man4/dtrace_ip.4

Modified: head/cddl/lib/libdtrace/ip.d
==============================================================================
--- head/cddl/lib/libdtrace/ip.d	Tue Sep 15 05:09:17 2015	(r287806)
+++ head/cddl/lib/libdtrace/ip.d	Tue Sep 15 05:16:26 2015	(r287807)
@@ -110,7 +110,6 @@ typedef struct ipv4info {
  * These values are NULL if the packet is not IPv6.
  */
 typedef struct in6_addr in6_addr_t;
-typedef struct ip6_hdr ip6_t;
 typedef struct ipv6info {
 	uint8_t ipv6_ver;		/* IP version (6) */
 	uint8_t ipv6_tclass;		/* traffic class */
@@ -123,7 +122,7 @@ typedef struct ipv6info {
 	in6_addr_t *ipv6_dst;		/* destination address */
 	string ipv6_saddr;		/* source address, string */
 	string ipv6_daddr;		/* destination address, string */
-	ip6_t *ipv6_hdr;		/* pointer to raw header */
+	struct ip6_hdr *ipv6_hdr;	/* pointer to raw header */
 } ipv6info_t;
 
 #pragma D binding "1.5" IPPROTO_IP
@@ -282,5 +281,5 @@ translator ipv6info_t < struct ip6_hdr *
 	ipv6_dst =	p == NULL ? 0 : (in6_addr_t *)&p->ip6_dst;
 	ipv6_saddr =	p == NULL ? 0 : inet_ntoa6(&p->ip6_src);
 	ipv6_daddr =	p == NULL ? 0 : inet_ntoa6(&p->ip6_dst);
-	ipv6_hdr =	(ip6_t *)p;
+	ipv6_hdr =	p;
 };

Modified: head/share/man/man4/dtrace_ip.4
==============================================================================
--- head/share/man/man4/dtrace_ip.4	Tue Sep 15 05:09:17 2015	(r287806)
+++ head/share/man/man4/dtrace_ip.4	Tue Sep 15 05:16:26 2015	(r287807)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 18, 2015
+.Dd September 14, 2015
 .Dt DTRACE_IP 4
 .Os
 .Sh NAME
@@ -212,7 +212,7 @@ IPv6 destination address.
 A string representation of the source address.
 .It Vt string ipv6_daddr
 A string representation of the destination address.
-.It Vt ip6_t *ipv6_hdr
+.It Vt struct ip6_hdr *ipv6_hdr
 A pointer to the raw IPv6 header.
 .El
 .Sh FILES