D31583.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D31583.diff
View Options

	diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c
	--- a/sys/netinet/tcp_hpts.c
	+++ b/sys/netinet/tcp_hpts.c
	@@ -1014,7 +1014,7 @@
	hpts_cpuid(struct inpcb inp, int failed)
	{
	u_int cpuid;
	-#if !defined(RSS) && defined(NUMA)
	+#ifdef NUMA
	struct hpts_domain_info *di;
	#endif

	@@ -1040,7 +1040,7 @@
	return (hpts_random_cpu(inp));
	else
	return (cpuid);
	-#else
	+#endif
	/*
	* We don't have a flowid -> cpuid mapping, so cheat and just map
	* unknown cpuids to curcpu. Not the best, but apparently better
	@@ -1063,7 +1063,6 @@
	cpuid = inp->inp_flowid % mp_ncpus;
	counter_u64_add(cpu_uses_flowid, 1);
	return (cpuid);
	-#endif
	}

	static void
	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
	@@ -210,17 +210,14 @@
	{
	u_int cpuid;

	-#ifdef RSS
	if (per_cpu_timers) {
	+#ifdef RSS
	cpuid = rss_hash2cpuid(inp->inp_flowid, inp->inp_flowtype);
	if (cpuid == NETISR_CPUID_NONE)
	return (curcpu); /* XXX */
	else
	return (cpuid);
	- }
	-#else
	- /* Legacy, pre-RSS behaviour */
	- if (per_cpu_timers) {
	+#endif
	/*
	* We don't have a flowid -> cpuid mapping, so cheat and
	* just map unknown cpuids to curcpu. Not the best, but
	@@ -230,10 +227,7 @@
	if (! CPU_ABSENT(cpuid))
	return (cpuid);
	return (curcpu);
	- }
	-#endif
	- /* Default for RSS and non-RSS - cpuid 0 */
	- else {
	+ } else {
	return (0);
	}
	}