diff options
| author | Seigo Tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
|---|---|---|
| committer | Seigo Tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
| commit | 4cc20ab1f0f3d1126126327aa298ab88c974c53d (patch) | |
| tree | 9d5f24794525313566896ab89aa860515db344a6 /sys/netinet/tcp_output.c | |
| parent | c82593cf2c9a5b4ccd2be043f6c9ccc8af22fcc9 (diff) | |
Notes
Diffstat (limited to 'sys/netinet/tcp_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index dd2832b18fc5..40ed7ee41141 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -126,7 +126,6 @@ tcp_output(tp) #ifdef INET6 int isipv6; #endif - int soopts; #ifdef INET6 isipv6 = (tp->t_inpcb->inp_vflag & INP_IPV6) != 0; @@ -820,12 +819,8 @@ send: /* * Trace. */ - SOCK_LOCK(so); - if (so->so_options & SO_DEBUG) { - SOCK_UNLOCK(so); + if (so->so_options & SO_DEBUG) tcp_trace(TA_OUTPUT, tp->t_state, tp, mtod(m, void *), th, 0); - } else - SOCK_UNLOCK(so); #endif /* @@ -859,13 +854,10 @@ send: goto out; } #endif /*IPSEC*/ - SOCK_LOCK(so); - soopts = (so->so_options & SO_DONTROUTE); - SOCK_UNLOCK(so); error = ip6_output(m, tp->t_inpcb->in6p_outputopts, &tp->t_inpcb->in6p_route, - soopts, NULL, NULL); + (so->so_options & SO_DONTROUTE), NULL, NULL); } else #endif /* INET6 */ { @@ -897,11 +889,8 @@ send: #ifdef IPSEC ipsec_setsocket(m, so); #endif /*IPSEC*/ - SOCK_LOCK(so); - soopts = (so->so_options & SO_DONTROUTE); - SOCK_UNLOCK(so); error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route, - soopts, 0); + (so->so_options & SO_DONTROUTE), 0); } if (error) { |