Date: Wed, 13 May 2015 00:28:37 +0000 (UTC) From: "George V. Neville-Neil" <gnn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282826 - in stable/10/sys: conf netinet Message-ID: <201505130028.t4D0SbK7093688@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gnn Date: Wed May 13 00:28:36 2015 New Revision: 282826 URL: https://svnweb.freebsd.org/changeset/base/282826 Log: MFC: 282215 Make it possible to statically link SIFTR into the kernel as a new option. Reviewed by: bz Discussed with: lstewart Modified: stable/10/sys/conf/files stable/10/sys/conf/options stable/10/sys/netinet/tcp_timewait.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Tue May 12 20:42:42 2015 (r282825) +++ stable/10/sys/conf/files Wed May 13 00:28:36 2015 (r282826) @@ -3426,6 +3426,7 @@ netinet/sctp_sysctl.c optional inet sct netinet/sctp_timer.c optional inet sctp | inet6 sctp netinet/sctp_usrreq.c optional inet sctp | inet6 sctp netinet/sctputil.c optional inet sctp | inet6 sctp +netinet/siftr.c optional inet siftr alq | inet6 siftr alq netinet/tcp_debug.c optional tcpdebug netinet/tcp_hostcache.c optional inet | inet6 netinet/tcp_input.c optional inet | inet6 Modified: stable/10/sys/conf/options ============================================================================== --- stable/10/sys/conf/options Tue May 12 20:42:42 2015 (r282825) +++ stable/10/sys/conf/options Wed May 13 00:28:36 2015 (r282826) @@ -439,6 +439,7 @@ RADIX_MPATH opt_mpath.h ROUTETABLES opt_route.h SLIP_IFF_OPTS opt_slip.h TCPDEBUG +SIFTR TCP_OFFLOAD opt_inet.h # Enable code to dispatch TCP offloading TCP_SIGNATURE opt_inet.h VLAN_ARRAY opt_vlan.h Modified: stable/10/sys/netinet/tcp_timewait.c ============================================================================== --- stable/10/sys/netinet/tcp_timewait.c Tue May 12 20:42:42 2015 (r282825) +++ stable/10/sys/netinet/tcp_timewait.c Wed May 13 00:28:36 2015 (r282826) @@ -250,6 +250,13 @@ tcp_twstart(struct tcpcb *tp) } } + + /* + * For use only by DTrace. We do not reference the state + * after this point so modifying it in place is not a problem. + */ + tcp_state_change(tp, TCPS_TIME_WAIT); + tw = uma_zalloc(V_tcptw_zone, M_NOWAIT); if (tw == NULL) { /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505130028.t4D0SbK7093688>