D2079.id4429.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2079.id4429.diff
View Options

	Index: sys/netinet/tcp_subr.c
	===================================================================
	--- sys/netinet/tcp_subr.c
	+++ sys/netinet/tcp_subr.c
	@@ -1033,32 +1033,38 @@
	}

	void
	-tcp_timer_2msl_discard(void *xtp) {
	+tcp_timer_2msl_discard(void *xtp)
	+{
	tcp_timer_discard((struct tcpcb *)xtp, TT_2MSL);
	}

	void
	-tcp_timer_keep_discard(void *xtp) {
	+tcp_timer_keep_discard(void *xtp)
	+{
	tcp_timer_discard((struct tcpcb *)xtp, TT_KEEP);
	}

	void
	-tcp_timer_persist_discard(void *xtp) {
	+tcp_timer_persist_discard(void *xtp)
	+{
	tcp_timer_discard((struct tcpcb *)xtp, TT_PERSIST);
	}

	void
	-tcp_timer_rexmt_discard(void *xtp) {
	+tcp_timer_rexmt_discard(void *xtp)
	+{
	tcp_timer_discard((struct tcpcb *)xtp, TT_REXMT);
	}

	void
	-tcp_timer_delack_discard(void *xtp) {
	+tcp_timer_delack_discard(void *xtp)
	+{
	tcp_timer_discard((struct tcpcb *)xtp, TT_DELACK);
	}

	void
	-tcp_timer_discard(struct tcpcb *tp, uint32_t timer_type) {
	+tcp_timer_discard(struct tcpcb *tp, uint32_t timer_type)
	+{

	CURVNET_SET(tp->t_vnet);
	INP_INFO_WLOCK(&V_tcbinfo);
	Index: sys/netinet/tcp_timer.c
	===================================================================
	--- sys/netinet/tcp_timer.c
	+++ sys/netinet/tcp_timer.c
	@@ -817,7 +817,7 @@
	return;
	#endif

	- if(tp->t_timers->tt_flags & TT_STOPPED)
	+ if (tp->t_timers->tt_flags & TT_STOPPED)
	return;

	switch (timer_type) {
	@@ -922,7 +922,7 @@
	panic("bad timer_type");
	}

	- if(tp->t_timers->tt_flags & timer_type) {
	+ if (tp->t_timers->tt_flags & timer_type) {
	if (callout_stop(t_callout)) {
	tp->t_timers->tt_flags &= ~timer_type;
	} else {