D45748.id145434.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45748.id145434.diff
View Options

	diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
	--- a/sys/netinet/tcp_timer.c
	+++ b/sys/netinet/tcp_timer.c
	@@ -874,12 +874,8 @@
	struct inpcb *inp = tptoinpcb(tp);
	sbintime_t precision;
	tt_which which;
	- bool tp_valid;

	INP_WLOCK_ASSERT(inp);
	- MPASS((curthread->td_pflags & TDP_INTCPCALLOUT) == 0);
	-
	- curthread->td_pflags \|= TDP_INTCPCALLOUT;

	which = tcp_timer_next(tp, NULL);
	MPASS(which < TT_N);
	@@ -887,8 +883,7 @@
	tp->t_precisions[which] = 0;

	tcp_bblog_timer(tp, which, TT_PROCESSING, 0);
	- tp_valid = tcp_timersw[which](tp);
	- if (tp_valid) {
	+ if (tcp_timersw[which](tp)) {
	tcp_bblog_timer(tp, which, TT_PROCESSED, 0);
	if ((which = tcp_timer_next(tp, &precision)) != TT_N) {
	MPASS(tp->t_state > TCPS_CLOSED);
	@@ -898,8 +893,6 @@
	}
	INP_WUNLOCK(inp);
	}
	-
	- curthread->td_pflags &= ~TDP_INTCPCALLOUT;
	}

	/*
	diff --git a/sys/sys/proc.h b/sys/sys/proc.h
	--- a/sys/sys/proc.h
	+++ b/sys/sys/proc.h
	@@ -560,7 +560,7 @@
	#define TDP_RESETSPUR 0x04000000 /* Reset spurious page fault history. */
	#define TDP_NERRNO 0x08000000 /* Last errno is already in td_errno */
	#define TDP_UIOHELD 0x10000000 /* Current uio has pages held in td_ma */
	-#define TDP_INTCPCALLOUT 0x20000000 /* used by netinet/tcp_timer.c */
	+#define TDP_UNUSED0 0x20000000 /* UNUSED */
	#define TDP_EXECVMSPC 0x40000000 /* Execve destroyed old vmspace */
	#define TDP_SIGFASTPENDING 0x80000000 /* Pending signal due to sigfastblock */