netinet: simplify RSS ifdef statements
Approved by: transport (rrs) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D31583
This commit is contained in:
parent
511b83b167
commit
47ded797ce
@ -1014,7 +1014,7 @@ static uint16_t
|
||||
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 @@ hpts_cpuid(struct inpcb *inp, int *failed)
|
||||
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 @@ hpts_cpuid(struct inpcb *inp, int *failed)
|
||||
cpuid = inp->inp_flowid % mp_ncpus;
|
||||
counter_u64_add(cpu_uses_flowid, 1);
|
||||
return (cpuid);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -210,17 +210,14 @@ inp_to_cpuid(struct inpcb *inp)
|
||||
{
|
||||
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 @@ inp_to_cpuid(struct inpcb *inp)
|
||||
if (! CPU_ABSENT(cpuid))
|
||||
return (cpuid);
|
||||
return (curcpu);
|
||||
}
|
||||
#endif
|
||||
/* Default for RSS and non-RSS - cpuid 0 */
|
||||
else {
|
||||
} else {
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user