diff options
author | kmacy <kmacy@FreeBSD.org> | 2008-07-21 21:22:56 +0000 |
---|---|---|
committer | kmacy <kmacy@FreeBSD.org> | 2008-07-21 21:22:56 +0000 |
commit | bffea91419d3ffc52cf0823e8e18963a71431531 (patch) | |
tree | af21d25db65d38df530fa5bdd6c7323a9e0fc4ec /sys/netinet | |
parent | f3c6f1e959a07e2bcb8f0ed9f00fc8dc13cc76c2 (diff) | |
download | FreeBSD-src-bffea91419d3ffc52cf0823e8e18963a71431531.zip FreeBSD-src-bffea91419d3ffc52cf0823e8e18963a71431531.tar.gz |
- Switch to INP_WLOCK macro from inp_wlock
- calling sodisconnect after tcp_twstart is both gratuitous and unsafe - remove
Submitted by: rwatson
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/tcp_offload.c | 16 | ||||
-rw-r--r-- | sys/netinet/tcp_offload.h | 1 |
2 files changed, 1 insertions, 16 deletions
diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c index e5c3a19..d64805f 100644 --- a/sys/netinet/tcp_offload.c +++ b/sys/netinet/tcp_offload.c @@ -103,22 +103,8 @@ tcp_offload_twstart(struct tcpcb *tp) { INP_INFO_WLOCK(&tcbinfo); - inp_wlock(tp->t_inpcb); - tcp_twstart(tp); - INP_INFO_WUNLOCK(&tcbinfo); -} - -void -tcp_offload_twstart_disconnect(struct tcpcb *tp) -{ - struct socket *so; - - INP_INFO_WLOCK(&tcbinfo); - inp_wlock(tp->t_inpcb); - so = tp->t_inpcb->inp_socket; + INP_WLOCK(tp->t_inpcb); tcp_twstart(tp); - if (so) - soisdisconnected(so); INP_INFO_WUNLOCK(&tcbinfo); } diff --git a/sys/netinet/tcp_offload.h b/sys/netinet/tcp_offload.h index ed1166e..d05ef46 100644 --- a/sys/netinet/tcp_offload.h +++ b/sys/netinet/tcp_offload.h @@ -335,7 +335,6 @@ tcp_offload_listen_close(struct tcpcb *tp) #undef tp_offload void tcp_offload_twstart(struct tcpcb *tp); -void tcp_offload_twstart_disconnect(struct tcpcb *tp); struct tcpcb *tcp_offload_close(struct tcpcb *tp); struct tcpcb *tcp_offload_drop(struct tcpcb *tp, int error); |