diff options
| author | gnn <gnn@FreeBSD.org> | 2015-05-13 00:28:36 +0000 |
|---|---|---|
| committer | gnn <gnn@FreeBSD.org> | 2015-05-13 00:28:36 +0000 |
| commit | 4215c2f123c1d2a682e4265d8f9072588d636415 (patch) | |
| tree | 0a03635168323b4759e73a0f07ffb4f8557d5784 | |
| parent | b270c91e87e6e6a4b3133fec81b7ffd063888880 (diff) | |
| download | FreeBSD-src-4215c2f123c1d2a682e4265d8f9072588d636415.zip FreeBSD-src-4215c2f123c1d2a682e4265d8f9072588d636415.tar.gz | |
MFC: 282215
Make it possible to statically link SIFTR into the kernel
as a new option.
Reviewed by: bz
Discussed with: lstewart
| -rw-r--r-- | sys/conf/files | 1 | ||||
| -rw-r--r-- | sys/conf/options | 1 | ||||
| -rw-r--r-- | sys/netinet/tcp_timewait.c | 7 |
3 files changed, 9 insertions, 0 deletions
diff --git a/sys/conf/files b/sys/conf/files index 715fb94..1f08ce7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3426,6 +3426,7 @@ netinet/sctp_sysctl.c optional inet sctp | inet6 sctp 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 diff --git a/sys/conf/options b/sys/conf/options index 33046f7..a93db0e 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -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 diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index e82f6f7..97eeeed 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -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) { /* |
