diff options
| author | Renato Botelho <renato@netgate.com> | 2016-08-25 10:40:54 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-08-25 10:40:54 -0300 |
| commit | 5f4dbd408a354e294fdffc23ee889af03b7cfc28 (patch) | |
| tree | 2d140e0691c400a324f9da94ed1282ab1a1c8710 /sys/net/netisr.c | |
| parent | ff37ccbef82fdcee6f5306945547bc8541986a03 (diff) | |
| parent | 986f593e4573a0f751ae6fa39b49e0a0dcbefbf8 (diff) | |
| download | FreeBSD-src-5f4dbd408a354e294fdffc23ee889af03b7cfc28.zip FreeBSD-src-5f4dbd408a354e294fdffc23ee889af03b7cfc28.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/net/netisr.c')
| -rw-r--r-- | sys/net/netisr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/net/netisr.c b/sys/net/netisr.c index 318e1a3..931d86c 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -272,10 +272,7 @@ u_int netisr_get_cpuid(u_int cpunumber) { - KASSERT(cpunumber < nws_count, ("%s: %u > %u", __func__, cpunumber, - nws_count)); - - return (nws_array[cpunumber]); + return (nws_array[cpunumber % nws_count]); } /* @@ -810,10 +807,12 @@ netisr_select_cpuid(struct netisr_proto *npp, u_int dispatch_policy, * dispatch. In the queued case, fall back on the SOURCE * policy. */ - if (*cpuidp != NETISR_CPUID_NONE) + if (*cpuidp != NETISR_CPUID_NONE) { + *cpuidp = netisr_get_cpuid(*cpuidp); return (m); + } if (dispatch_policy == NETISR_DISPATCH_HYBRID) { - *cpuidp = curcpu; + *cpuidp = netisr_get_cpuid(curcpu); return (m); } policy = NETISR_POLICY_SOURCE; |
