summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorkmacy <kmacy@FreeBSD.org>2008-07-21 21:23:43 +0000
committerkmacy <kmacy@FreeBSD.org>2008-07-21 21:23:43 +0000
commit52a393acadb5f26325eb0916c7e62876f726d8c4 (patch)
tree7a2e438cdf8f4e09c86a75e0156940063017022e /sys/dev
parentbffea91419d3ffc52cf0823e8e18963a71431531 (diff)
downloadFreeBSD-src-52a393acadb5f26325eb0916c7e62876f726d8c4.zip
FreeBSD-src-52a393acadb5f26325eb0916c7e62876f726d8c4.tar.gz
remove call to unsafe tcp_twstart function
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
index 61222e8..00b4575 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
@@ -2431,25 +2431,6 @@ enter_timewait(struct tcpcb *tp)
tcp_offload_twstart(tp);
}
-static void
-enter_timewait_disconnect(struct tcpcb *tp)
-{
- /*
- * Bump rcv_nxt for the peer FIN. We don't do this at the time we
- * process peer_close because we don't want to carry the peer FIN in
- * the socket's receive queue and if we increment rcv_nxt without
- * having the FIN in the receive queue we'll confuse facilities such
- * as SIOCINQ.
- */
- inp_wlock(tp->t_inpcb);
- tp->rcv_nxt++;
-
- tp->ts_recent_age = 0; /* defeat recycling */
- tp->t_srtt = 0; /* defeat tcp_update_metrics */
- inp_wunlock(tp->t_inpcb);
- tcp_offload_twstart_disconnect(tp);
-}
-
/*
* For TCP DDP a PEER_CLOSE may also be an implicit RX_DDP_COMPLETE. This
* function deals with the data that may be reported along with the FIN.
@@ -2717,7 +2698,7 @@ process_close_con_rpl(struct toepcb *toep, struct mbuf *m)
if (action == TCP_TIMEWAIT) {
- enter_timewait_disconnect(tp);
+ enter_timewait(tp);
} else if (action == TCP_DROP) {
tcp_offload_drop(tp, 0);
} else if (action == TCP_CLOSE) {
OpenPOWER on IntegriCloud