From owner-svn-src-all@FreeBSD.ORG Fri Jan 17 18:03:03 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B3E6BC28; Fri, 17 Jan 2014 18:03:03 +0000 (UTC) Received: from mail-qa0-x231.google.com (mail-qa0-x231.google.com [IPv6:2607:f8b0:400d:c00::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2BEE31B01; Fri, 17 Jan 2014 18:03:03 +0000 (UTC) Received: by mail-qa0-f49.google.com with SMTP id w8so3518236qac.8 for ; Fri, 17 Jan 2014 10:03:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=tn9tNQhGwqEDL1kzk4PRp10iPZjbdEWHjRelvQ1ulIY=; b=FQCTMTJw1PYRx8kZAGoKSqbHtctHqvsMYEC9G9OvZiNVMzNIS3L0n2eb/37bbOuU77 Nnlrb2CyH3lAcZO7t7zS5q7Rf9H0r8mlQg1DWERvo9pinsSK/vZW50l3YfrgFKMBJ35f aXhwUW7mPHJ7Z9IecfZ97DSNZJFraUMyEIMjGszIgNhZWdur5kxVkw4x9Pw15a0ZQtPr e4YL/rDTR0xNitrquEjS7L/sAyM9tx4c3+s6+lxzmTNbPXlzv8AovynwyrW14FydxTnG KNY7OOByWoOKOq75xuYkWsos1RzLoZ9jKzN+No8L2xQlKcyvAJZYOEQQ7hRkzJg0iFCr QSNg== MIME-Version: 1.0 X-Received: by 10.140.96.180 with SMTP id k49mr2633090qge.4.1389981782314; Fri, 17 Jan 2014 10:03:02 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.224.52.8 with HTTP; Fri, 17 Jan 2014 10:03:02 -0800 (PST) In-Reply-To: <201401171048.s0HAmiPf025684@svn.freebsd.org> References: <201401171048.s0HAmiPf025684@svn.freebsd.org> Date: Fri, 17 Jan 2014 10:03:02 -0800 X-Google-Sender-Auth: AKQtb4up09bFzMTJt2dYHfbWmgY Message-ID: Subject: Re: svn commit: r260815 - stable/10/sys/netinet From: Adrian Chadd To: Andriy Gapon Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , svn-src-stable-10@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 18:03:03 -0000 :) Thanks! -a On 17 January 2014 02:48, Andriy Gapon wrote: > Author: avg > Date: Fri Jan 17 10:48:44 2014 > New Revision: 260815 > URL: http://svnweb.freebsd.org/changeset/base/260815 > > Log: > MFC r258605: Convert over the TCP probes to use mtod() > > MFC slacker: adrian > > Modified: > stable/10/sys/netinet/tcp_input.c > stable/10/sys/netinet/tcp_subr.c > Directory Properties: > stable/10/ (props changed) > > Modified: stable/10/sys/netinet/tcp_input.c > ============================================================================== > --- stable/10/sys/netinet/tcp_input.c Fri Jan 17 10:35:18 2014 (r260814) > +++ stable/10/sys/netinet/tcp_input.c Fri Jan 17 10:48:44 2014 (r260815) > @@ -1393,7 +1393,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 > @@ -1405,7 +1405,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); > @@ -1429,7 +1429,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); > @@ -1928,8 +1928,8 @@ 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, > - th); > + TCP_PROBE5(connect_refused, NULL, tp, > + mtod(m, const char *), tp, th); > tp = tcp_drop(tp, ECONNREFUSED); > } > if (thflags & TH_RST) > @@ -1982,7 +1982,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)); > @@ -2387,8 +2387,8 @@ 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, > - th); > + 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)); > } > > Modified: stable/10/sys/netinet/tcp_subr.c > ============================================================================== > --- stable/10/sys/netinet/tcp_subr.c Fri Jan 17 10:35:18 2014 (r260814) > +++ stable/10/sys/netinet/tcp_subr.c Fri Jan 17 10:48:44 2014 (r260815) > @@ -706,9 +706,10 @@ tcp_respond(struct tcpcb *tp, void *ipge > tcp_trace(TA_OUTPUT, 0, tp, mtod(m, void *), th, 0); > #endif > if (flags & TH_RST) > - TCP_PROBE5(accept_refused, NULL, NULL, m->m_data, tp, nth); > + TCP_PROBE5(accept_refused, NULL, NULL, mtod(m, const char *), > + tp, nth); > > - TCP_PROBE5(send, NULL, tp, m->m_data, tp, nth); > + TCP_PROBE5(send, NULL, tp, mtod(m, const char *), tp, nth); > #ifdef INET6 > if (isipv6) > (void) ip6_output(m, NULL, NULL, ipflags, NULL, NULL, inp);