Revert the partial MFC of r313045 which broke dtrace

This removes the mbuf to ipinfo_t translator and switches tcp_autorcvbuf to
use the older mtod macro.

This was originally merged to stable/10 as part of r317375.

Reported by:	markj
Reviewed by:	markj, hiren
Sponsored by:	Multiplay
Differential Revision:  https://reviews.freebsd.org/D10769

1 files changed, 0 insertions, 18 deletions

diff --git a/cddl/lib/libdtrace/ip.d b/cddl/lib/libdtrace/ip.d
index 15dfc34..f8fa9b1 100644
--- a/cddl/lib/libdtrace/ip.d
+++ b/cddl/lib/libdtrace/ip.d
@@ -240,24 +240,6 @@ translator ipinfo_t < uint8_t *p > {
 #pragma D binding "1.0" IFF_LOOPBACK
 inline int IFF_LOOPBACK =	0x8;
 
-#pragma D binding "1.13" translator
-translator ipinfo_t < struct mbuf *m > {
-	ip_ver =	m == NULL ? 0 : ((struct ip *)m->m_data)->ip_v;
-	ip_plength =	m == NULL ? 0 :
-	    ((struct ip *)m->m_data)->ip_v == 4 ?
-	    ntohs(((struct ip *)m->m_data)->ip_len) - 
-			(((struct ip *)m->m_data)->ip_hl << 2):
-	    ntohs(((struct ip6_hdr *)m->m_data)->ip6_ctlun.ip6_un1.ip6_un1_plen);
-	ip_saddr =	m == NULL ? 0 :
-	    ((struct ip *)m->m_data)->ip_v == 4 ?
-	    inet_ntoa(&((struct ip *)m->m_data)->ip_src.s_addr) :
-	    inet_ntoa6(&((struct ip6_hdr *)m->m_data)->ip6_src);
-	ip_daddr =	m == NULL ? 0 :
-	    ((struct ip *)m->m_data)->ip_v == 4 ?
-	    inet_ntoa(&((struct ip *)m->m_data)->ip_dst.s_addr) :
-	    inet_ntoa6(&((struct ip6_hdr *)m->m_data)->ip6_dst);
-};
-
 #pragma D binding "1.0" translator
 translator ifinfo_t < struct ifnet *p > {
 	if_name =	p->if_xname;