D28265.1775829807.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28265.1775829807.diff
View Options

	diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
	--- a/sys/netinet/tcp_timer.h
	+++ b/sys/netinet/tcp_timer.h
	@@ -115,8 +115,6 @@

	#define TCPTV_TWTRUNC 8 /* RTO factor to truncate TW */

	-#define TCP_LINGERTIME 120 /* linger at most 2 minutes */
	-
	#define TCP_MAXRXTSHIFT 12 /* maximum retransmits */

	#define TCPTV_DELACK ( hz/25 ) /* 40ms timeout */
	diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
	--- a/sys/netinet/tcp_usrreq.c
	+++ b/sys/netinet/tcp_usrreq.c
	@@ -204,8 +204,6 @@
	tp->t_state = TCPS_CLOSED;
	INP_WUNLOCK(inp);
	TCPSTATES_INC(TCPS_CLOSED);
	- if ((so->so_options & SO_LINGER) && so->so_linger == 0)
	- so->so_linger = TCP_LINGERTIME;
	out:
	TCPDEBUG2(PRU_ATTACH);
	TCP_PROBE2(debug__user, tp, PRU_ATTACH);
	diff --git a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
	--- a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
	+++ b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
	@@ -482,8 +482,6 @@
	LIST_INSERT_HEAD(&sdp_list, ssk, list);
	sdp_count++;
	SDP_LIST_WUNLOCK();
	- if ((so->so_options & SO_LINGER) && so->so_linger == 0)
	- so->so_linger = TCP_LINGERTIME;

	return (0);
	}