diff options
author | David Gwynne <dlg@cvs.openbsd.org> | 2015-04-10 13:58:21 +0000 |
---|---|---|
committer | David Gwynne <dlg@cvs.openbsd.org> | 2015-04-10 13:58:21 +0000 |
commit | 250513adf3ae568c024bafdf3e845f1276740ad4 (patch) | |
tree | 77683efc78bd0dba266f3daef8e373a90f87e85d /sys/netmpls/mpls_raw.c | |
parent | eef7b0919e36bece6c9cf91b19a2f5062a1acaa2 (diff) |
replace the use of ifqueues for most input queues serviced by netisr
with niqueues.
this change is so big because there's a lot of code that takes
pointers to different input queues (eg, ether_input picks between
ipv4, ipv6, pppoe, arp, and mpls input queues) and falls through
to code to enqueue packets against the pointer. if i changed only
one of the input queues id have to add sepearate code paths, one
for ifqueues and one for niqueues in each of these places
by flipping all these input queues at once i can keep the currently
common code common.
testing by mpi@ sthen@ and rafael zalamena
ok mpi@ sthen@ claudio@ henning@
Diffstat (limited to 'sys/netmpls/mpls_raw.c')
-rw-r--r-- | sys/netmpls/mpls_raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netmpls/mpls_raw.c b/sys/netmpls/mpls_raw.c index bb95029f569..a3165155f4c 100644 --- a/sys/netmpls/mpls_raw.c +++ b/sys/netmpls/mpls_raw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_raw.c,v 1.10 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: mpls_raw.c,v 1.11 2015/04/10 13:58:20 dlg Exp $ */ /* * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. @@ -135,7 +135,7 @@ mpls_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, switch (name[0]) { case MPLSCTL_IFQUEUE: - return (sysctl_ifq(name + 1, namelen - 1, + return (sysctl_niq(name + 1, namelen - 1, oldp, oldlenp, newp, newlen, &mplsintrq)); default: return sysctl_int_arr(mplsctl_vars, name, namelen, |