D7833.id20197.diff
No OneTemporary
Actions

Size

933 B

Referenced Files

None

Subscribers

None

D7833.id20197.diff
View Options

	Index: sys/netinet/tcp_usrreq.c
	===================================================================
	--- sys/netinet/tcp_usrreq.c
	+++ sys/netinet/tcp_usrreq.c
	@@ -1329,6 +1329,8 @@
	ti->tcpi_snd_wscale = tp->snd_scale;
	ti->tcpi_rcv_wscale = tp->rcv_scale;
	}
	+ if (tp->t_flags & TF_ECN_PERMIT)
	+ ti->tcpi_options \|= TCPI_OPT_ECN;

	ti->tcpi_rto = tp->t_rxtcur * tick;
	ti->tcpi_last_data_recv = (long)(ticks - (int)tp->t_rcvtime) * tick;
	@@ -1817,16 +1819,16 @@
	case TCP_KEEPCNT:
	switch (sopt->sopt_name) {
	case TCP_KEEPIDLE:
	- ui = tp->t_keepidle / hz;
	+ ui = TP_KEEPIDLE(tp) / hz;
	break;
	case TCP_KEEPINTVL:
	- ui = tp->t_keepintvl / hz;
	+ ui = TP_KEEPINTVL(tp) / hz;
	break;
	case TCP_KEEPINIT:
	- ui = tp->t_keepinit / hz;
	+ ui = TP_KEEPINIT(tp) / hz;
	break;
	case TCP_KEEPCNT:
	- ui = tp->t_keepcnt;
	+ ui = TP_KEEPCNT(tp);
	break;
	}
	INP_WUNLOCK(inp);