svn commit: r257653 - projects/mbuf_iovec/sys/netinet

[Adrian Chadd]

Author: adrian
Date: Mon Nov  4 20:38:32 2013
New Revision: 257653
URL: http://svnweb.freebsd.org/changeset/base/257653

Log:
  Convert m->m_data referneces to mtod(m, const char *).
  
  Sponsored by:	Netflix, inc.

Modified:
  projects/mbuf_iovec/sys/netinet/tcp_input.c

Modified: projects/mbuf_iovec/sys/netinet/tcp_input.c
==============================================================================
--- projects/mbuf_iovec/sys/netinet/tcp_input.c	Mon Nov  4 20:37:12 2013	(r257652)
+++ projects/mbuf_iovec/sys/netinet/tcp_input.c	Mon Nov  4 20:38:32 2013	(r257653)
@@ -1394,7 +1394,7 @@ relocked:
 	}
 #endif
 
-	TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
+	TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
 
 	/*
 	 * Segment belongs to a connection in SYN_SENT, ESTABLISHED or later
@@ -1406,7 +1406,7 @@ relocked:
 	return;
 
 dropwithreset:
-	TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
+	TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
 
 	if (ti_locked == TI_WLOCKED) {
 		INP_INFO_WUNLOCK(&V_tcbinfo);
@@ -1430,7 +1430,7 @@ dropwithreset:
 
 dropunlock:
 	if (m != NULL)
-		TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
+		TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
 
 	if (ti_locked == TI_WLOCKED) {
 		INP_INFO_WUNLOCK(&V_tcbinfo);
@@ -1929,7 +1929,7 @@ tcp_do_segment(struct mbuf *m, struct tc
 			goto dropwithreset;
 		}
 		if ((thflags & (TH_ACK|TH_RST)) == (TH_ACK|TH_RST)) {
-			TCP_PROBE5(connect_refused, NULL, tp, m->m_data, tp,
+			TCP_PROBE5(connect_refused, NULL, tp, mtod(m, const char *), tp,
 			    th);
 			tp = tcp_drop(tp, ECONNREFUSED);
 		}
@@ -1983,7 +1983,7 @@ tcp_do_segment(struct mbuf *m, struct tc
 			} else {
 				tcp_state_change(tp, TCPS_ESTABLISHED);
 				TCP_PROBE5(connect_established, NULL, tp,
-				    m->m_data, tp, th);
+				    mtod(m, const char *), tp, th);
 				cc_conn_init(tp);
 				tcp_timer_activate(tp, TT_KEEP,
 				    TP_KEEPIDLE(tp));
@@ -2388,7 +2388,7 @@ tcp_do_segment(struct mbuf *m, struct tc
 			tp->t_flags &= ~TF_NEEDFIN;
 		} else {
 			tcp_state_change(tp, TCPS_ESTABLISHED);
-			TCP_PROBE5(accept_established, NULL, tp, m->m_data, tp,
+			TCP_PROBE5(accept_established, NULL, tp, mtod(m, const char *), tp,
 			    th);
 			cc_conn_init(tp);
 			tcp_timer_activate(tp, TT_KEEP, TP_KEEPIDLE(tp));