Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nick-nhusb]: src/sys Sync with HEAD
details: https://anonhg.NetBSD.org/src/rev/12bb85b6ba6d
branches: nick-nhusb
changeset: 334502:12bb85b6ba6d
user: skrll <skrll%NetBSD.org@localhost>
date: Fri Apr 22 15:44:08 2016 +0000
description:
Sync with HEAD
diffstat:
sys/altq/altq_blue.c | 15 +-
sys/altq/altq_cbq.c | 26 +-
sys/altq/altq_fifoq.c | 10 +-
sys/altq/altq_hfsc.c | 24 +-
sys/altq/altq_jobs.c | 10 +-
sys/altq/altq_priq.c | 23 +-
sys/altq/altq_red.c | 15 +-
sys/altq/altq_rio.c | 15 +-
sys/altq/altq_subr.c | 6 +-
sys/altq/altq_wfq.c | 11 +-
sys/altq/if_altq.h | 14 +-
sys/arch/acorn26/stand/lib/Makefile | 3 +-
sys/arch/acorn26/stand/lib/Makefile.inc | 6 +-
sys/arch/acorn32/stand/lib/Makefile | 3 +-
sys/arch/acorn32/stand/lib/Makefile.inc | 6 +-
sys/arch/alpha/alpha/compat_16_machdep.c | 6 +-
sys/arch/alpha/conf/GENERIC | 6 +-
sys/arch/amd64/amd64/db_disasm.c | 10 +-
sys/arch/amd64/amd64/lock_stubs.S | 4 +-
sys/arch/amd64/conf/GENERIC | 14 +-
sys/arch/amd64/conf/XEN3_DOM0 | 4 +-
sys/arch/amd64/include/profile.h | 10 +-
sys/arch/amiga/amiga/machdep.c | 12 +-
sys/arch/arm/allwinner/awin_reg.h | 4 +-
sys/arch/arm/nvidia/tegra_reg.h | 8 +-
sys/arch/arm/nvidia/tegra_soc.c | 14 +-
sys/arch/arm/nvidia/tegra_var.h | 37 +-
sys/arch/arm/rockchip/rockchip_emac.c | 6 +-
sys/arch/cats/conf/GENERIC | 4 +-
sys/arch/evbarm/conf/HDL_G | 4 +-
sys/arch/evbarm/conf/HPT5325 | 4 +-
sys/arch/evbarm/conf/SHEEVAPLUG | 4 +-
sys/arch/evbarm/conf/SMDK2410 | 4 +-
sys/arch/evbarm/conf/VEXPRESS_A15 | 3 +-
sys/arch/evbarm/conf/mk.gumstix | 12 +-
sys/arch/evbarm/conf/std.vexpress | 5 +-
sys/arch/evbarm/gumstix/gumstix_machdep.c | 34 +-
sys/arch/evbarm/gumstix/gumstixreg.h | 7 +-
sys/arch/evbarm/rpi/vcprop.h | 8 +-
sys/arch/evbarm/tegra/tegra_machdep.c | 18 +-
sys/arch/evbppc/conf/OPENBLOCKS266_OPT | 4 +-
sys/arch/evbppc/conf/PMPPC | 4 +-
sys/arch/hpcmips/conf/GENERIC | 6 +-
sys/arch/hpcmips/conf/TX3922 | 4 +-
sys/arch/hpcmips/conf/VR41XX | 6 +-
sys/arch/hppa/conf/GENERIC | 6 +-
sys/arch/hppa/spmath/Makefile | 4 +-
sys/arch/hppa/spmath/Makefile.inc | 6 +-
sys/arch/i386/conf/GENERIC | 10 +-
sys/arch/i386/conf/GENERIC_PAE | 5 +
sys/arch/i386/conf/XEN3_DOM0 | 4 +-
sys/arch/i386/stand/lib/Makefile | 3 +-
sys/arch/i386/stand/lib/Makefile.inc | 6 +-
sys/arch/ia64/stand/efi/libefi/Makefile | 3 +-
sys/arch/ia64/stand/efi/libefi/Makefile.inc | 6 +-
sys/arch/landisk/conf/GENERIC | 6 +-
sys/arch/m68k/fpe/fpu_trig.c | 7 +-
sys/arch/m68k/fpsp/Makefile.inc | 7 +-
sys/arch/macppc/conf/GENERIC | 6 +-
sys/arch/mips/conf/Makefile.mips | 7 +-
sys/arch/mips/ingenic/ingenic_regs.h | 15 +-
sys/arch/mips/ingenic/jzfb_regs.h | 89 +
sys/arch/mips/mips/mips_fpu.c | 14 +-
sys/arch/mvmeppc/mvmeppc/mainbus.c | 6 +-
sys/arch/newsmips/dev/scsi_1185.c | 7 +-
sys/arch/ofppc/stand/ofwboot/mbr.c | 3 +-
sys/arch/playstation2/conf/Makefile.playstation2.inc | 24 +-
sys/arch/playstation2/dev/emac3.c | 12 +-
sys/arch/playstation2/dev/emac3var.h | 8 +-
sys/arch/playstation2/dev/if_smap.c | 17 +-
sys/arch/playstation2/ee/dmacreg.h | 4 +-
sys/arch/playstation2/ee/eevar.h | 4 +-
sys/arch/playstation2/playstation2/cpu.c | 5 +-
sys/arch/playstation2/playstation2/interrupt.h | 4 +-
sys/arch/playstation2/playstation2/locore_machdep.S | 18 +-
sys/arch/pmax/pmax/dec_3maxplus.c | 10 +-
sys/arch/pmax/stand/Makefile.booters | 3 +-
sys/arch/sgimips/conf/GENERIC32_IP3x | 6 +-
sys/arch/sparc/conf/GENERIC | 19 +-
sys/arch/sparc/conf/INSTALL | 15 +-
sys/arch/sparc/conf/files.sparc | 4 +-
sys/arch/sparc/dev/cgsix_obio.c | 22 +-
sys/arch/sparc/include/openfirm.h | 3 +-
sys/arch/sparc/sparc/openfirm.c | 47 +-
sys/arch/sparc/sparc/promlib.c | 6 +-
sys/arch/sparc64/conf/GENERIC | 6 +-
sys/arch/sparc64/conf/Makefile.sparc64 | 4 +-
sys/arch/sparc64/conf/kern32.ldscript | 4 +-
sys/arch/sparc64/doc/TODO | 6 +-
sys/arch/sparc64/include/param.h | 7 +-
sys/arch/sparc64/include/vmparam.h | 4 +-
sys/arch/sparc64/sparc64/cpu.c | 8 +-
sys/arch/sparc64/sparc64/pmap.c | 9 +-
sys/arch/x86/x86/ipmi.c | 9 +-
sys/arch/x86/x86/powernow.c | 6 +-
sys/compat/common/Makefile | 7 +-
sys/compat/common/Makefile.inc | 8 +-
sys/compat/common/uipc_usrreq_70.c | 70 +
sys/compat/netbsd32/netbsd32_fs.c | 8 +-
sys/compat/svr4_32/svr4_32_signal.c | 6 +-
sys/compat/sys/socket.h | 25 +-
sys/conf/Makefile.kern.inc | 18 +-
sys/conf/files | 3 +-
sys/ddb/db_command.c | 11 +-
sys/ddb/db_interface.h | 6 +-
sys/dev/acpi/acpi_display.c | 11 +-
sys/dev/acpi/thinkpad_acpi.c | 112 +-
sys/dev/i2c/ds1307.c | 6 +-
sys/dev/i2c/ds1307reg.h | 3 +-
sys/dev/ic/ath.c | 4 +-
sys/dev/ic/dp8390.c | 13 +-
sys/dev/ic/hd64570.c | 9 +-
sys/dev/mscp/mscp_disk.c | 28 +-
sys/dev/pci/if_lmc.c | 6 +-
sys/dev/ppbus/if_plip.c | 7 +-
sys/dev/qbus/if_dmc.c | 9 +-
sys/dev/sbus/cgthree_sbus.c | 5 +-
sys/dev/sbus/cgtwelve.c | 6 +-
sys/dev/sbus/cgtwelvereg.h | 12 +-
sys/dev/sbus/p9100.c | 39 +-
sys/dev/sbus/zx.c | 30 +-
sys/dev/scsipi/atapi_wdc.c | 10 +-
sys/dev/sun/bwtwo.c | 7 +-
sys/dev/sun/cgsix.c | 102 +-
sys/dev/sun/cgsixvar.h | 10 +-
sys/dev/sun/cgthree.c | 35 +-
sys/dev/sun/fb.c | 147 +-
sys/dev/sun/fbvar.h | 9 +-
sys/dev/usb/if_upl.c | 9 +-
sys/dev/usb/uhso.c | 9 +-
sys/dev/usb/umass.c | 12 +-
sys/dev/usb/usb_subr.c | 8 +-
sys/dev/usb/usbdevs.h | 5 +-
sys/dev/usb/usbdevs_data.h | 3187 +++++----
sys/external/bsd/compiler_rt/dist/lib/builtins/floatdidf.c | 4 +-
sys/external/bsd/compiler_rt/dist/lib/builtins/floatundidf.c | 4 +-
sys/external/bsd/compiler_rt/dist/lib/builtins/int_types.h | 3 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_subdev.c | 5 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c | 10 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/namedb.h | 7 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar/nouveau_subdev_bar_base.c | 18 +-
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c | 5 +-
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c | 5 +-
sys/external/bsd/drm2/dist/drm/via/via_drv.c | 2 +
sys/external/bsd/drm2/drm/drm_lock.c | 49 +-
sys/external/bsd/drm2/drm/drm_vma_manager.c | 8 +-
sys/external/bsd/drm2/include/linux/spinlock.h | 79 +-
sys/external/bsd/drm2/nouveau/nouveau_pci.c | 20 +-
sys/kern/exec_elf.c | 15 +-
sys/kern/exec_subr.c | 19 +-
sys/kern/files.kern | 3 +-
sys/kern/init_main.c | 8 +-
sys/kern/init_sysent.c | 13 +-
sys/kern/kern_event.c | 7 +-
sys/kern/kern_exec.c | 10 +-
sys/kern/kern_exit.c | 342 +-
sys/kern/kern_lwp.c | 8 +-
sys/kern/kern_pax.c | 125 +-
sys/kern/kern_proc.c | 6 +-
sys/kern/kern_sdt.c | 4 +-
sys/kern/kern_sig.c | 48 +-
sys/kern/kern_synch.c | 6 +-
sys/kern/subr_autoconf.c | 59 +-
sys/kern/subr_psref.c | 493 +
sys/kern/sys_process.c | 8 +-
sys/kern/syscalls.c | 11 +-
sys/kern/syscalls.conf | 4 +-
sys/kern/syscalls.master | 6 +-
sys/kern/syscalls_autoload.c | 6 +-
sys/kern/systrace_args.c | 44 +-
sys/kern/uipc_mbuf.c | 22 +-
sys/kern/uipc_usrreq.c | 37 +-
sys/kern/vfs_lookup.c | 133 +-
sys/lib/libgnuefi/Makefile | 3 +-
sys/lib/libgnuefi/Makefile.inc | 7 +-
sys/lib/libkern/Makefile | 4 +-
sys/lib/libkern/rngtest.c | 8 +-
sys/lib/libsa/Makefile | 3 +-
sys/lib/libsa/Makefile.inc | 7 +-
sys/lib/libz/Makefile | 3 +-
sys/lib/libz/Makefile.inc | 7 +-
sys/miscfs/procfs/procfs_ctl.c | 6 +-
sys/miscfs/procfs/procfs_linux.c | 33 +-
sys/miscfs/specfs/spec_vnops.c | 46 +-
sys/modules/compat/Makefile | 3 +-
sys/net/bridgestp.c | 28 +-
sys/net/dl_print.c | 9 +-
sys/net/files.net | 4 +-
sys/net/if.c | 122 +-
sys/net/if.h | 30 +-
sys/net/if_arcsubr.c | 15 +-
sys/net/if_atmsubr.c | 9 +-
sys/net/if_bridge.c | 376 +-
sys/net/if_bridgevar.h | 50 +-
sys/net/if_ecosubr.c | 14 +-
sys/net/if_ethersubr.c | 52 +-
sys/net/if_fddisubr.c | 12 +-
sys/net/if_gif.c | 9 +-
sys/net/if_hippisubr.c | 9 +-
sys/net/if_ieee1394subr.c | 12 +-
sys/net/if_llatbl.c | 97 +-
sys/net/if_llatbl.h | 14 +-
sys/net/if_loop.c | 9 +-
sys/net/if_ppp.c | 13 +-
sys/net/if_pppoe.c | 50 +-
sys/net/if_pppoe.h | 9 +-
sys/net/if_sl.c | 10 +-
sys/net/if_spppsubr.c | 9 +-
sys/net/if_strip.c | 8 +-
sys/net/if_tokensubr.c | 11 +-
sys/net/if_tun.c | 9 +-
sys/net/if_vlan.c | 9 +-
sys/net/npf/npf_tableset.c | 6 +-
sys/net/ppp-deflate.c | 6 +-
sys/net/route.c | 333 +-
sys/net/route.h | 17 +-
sys/net/rtbl.c | 11 +-
sys/net/rtsock.c | 178 +-
sys/net80211/ieee80211_input.c | 10 +-
sys/net80211/ieee80211_node.h | 2 +-
sys/net80211/ieee80211_rssadapt.h | 2 +-
sys/net80211/ieee80211_var.h | 2 +-
sys/netinet/if_arp.c | 636 +-
sys/netinet/if_atm.c | 27 +-
sys/netinet/if_inarp.h | 6 +-
sys/netinet/in.c | 39 +-
sys/netinet/in_proto.c | 5 +-
sys/netinet/ip_carp.c | 14 +-
sys/netinet/ip_icmp.c | 15 +-
sys/netinet/ip_output.c | 104 +-
sys/netinet/sctp_asconf.c | 10 +-
sys/netinet/sctp_output.c | 75 +-
sys/netinet/sctp_pcb.c | 9 +-
sys/netinet/sctp_usrreq.c | 12 +-
sys/netinet/sctputil.c | 9 +-
sys/netinet6/icmp6.c | 116 +-
sys/netinet6/in6.c | 112 +-
sys/netinet6/in6_ifattach.c | 58 +-
sys/netinet6/in6_proto.c | 5 +-
sys/netinet6/ip6_input.c | 20 +-
sys/netinet6/nd6.c | 959 +-
sys/netinet6/nd6.h | 17 +-
sys/netinet6/nd6_nbr.c | 140 +-
sys/netinet6/nd6_rtr.c | 191 +-
sys/netisdn/i4b_ipr.c | 9 +-
sys/netnatm/natm_pcb.c | 5 +-
sys/rump/fs/lib/liblfs/Makefile | 5 +-
sys/rump/include/machine/intr.h | 4 +-
sys/rump/include/opt/opt_rumpkernel.h | 4 +-
sys/rump/include/opt/pppoe.h | 4 +-
sys/rump/include/rump/rump_syscalls.h | 1160 +-
sys/rump/librump/rumpkern/Makefile.rumpkern | 3 +-
sys/rump/librump/rumpkern/lwproc.c | 6 +-
sys/rump/librump/rumpkern/rump_syscalls.c | 11 +-
sys/rump/librump/rumpnet/net_stub.c | 8 +-
sys/rump/librump/rumpnet/rump_net.c | 5 +-
sys/rump/net/Makefile.rumpnetcomp | 4 +-
sys/rump/net/lib/libnet/Makefile | 5 +-
sys/rump/net/lib/libpppoe/Makefile | 13 +
sys/rump/net/lib/libpppoe/PPPOE.ioconf | 6 +
sys/rump/net/lib/libpppoe/pppoe_component.c | 13 +
sys/rump/net/lib/libshmif/if_shmem.c | 8 +-
sys/rump/net/lib/libvirtif/if_virt.c | 8 +-
sys/sys/Makefile | 5 +-
sys/sys/aio.h | 4 +-
sys/sys/condvar.h | 14 +-
sys/sys/idtype.h | 62 +
sys/sys/ktrace.h | 5 +-
sys/sys/mbuf.h | 50 +-
sys/sys/mman.h | 28 +-
sys/sys/param.h | 4 +-
sys/sys/pax.h | 24 +-
sys/sys/proc.h | 20 +-
sys/sys/pset.h | 8 +-
sys/sys/pslist.h | 321 +
sys/sys/psref.h | 95 +
sys/sys/resource.h | 9 +-
sys/sys/socket.h | 13 +-
sys/sys/syscall.h | 9 +-
sys/sys/syscallargs.h | 19 +-
sys/sys/types.h | 3 +-
sys/sys/un.h | 5 +-
sys/sys/unpcb.h | 5 +-
sys/sys/wait.h | 19 +-
sys/ufs/ufs/ufs_extern.h | 6 +-
sys/ufs/ufs/ufs_lookup.c | 694 +-
sys/uvm/uvm_mmap.c | 11 +-
sys/uvm/uvm_unix.c | 11 +-
288 files changed, 7674 insertions(+), 5961 deletions(-)
diffs (truncated from 26152 to 300 lines):
diff -r 06279e223f0b -r 12bb85b6ba6d sys/altq/altq_blue.c
--- a/sys/altq/altq_blue.c Fri Apr 22 13:43:55 2016 +0000
+++ b/sys/altq/altq_blue.c Fri Apr 22 15:44:08 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_blue.c,v 1.23 2011/11/19 22:51:18 tls Exp $ */
+/* $NetBSD: altq_blue.c,v 1.23.26.1 2016/04/22 15:44:08 skrll Exp $ */
/* $KAME: altq_blue.c,v 1.15 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.23 2011/11/19 22:51:18 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.23.26.1 2016/04/22 15:44:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -112,7 +112,7 @@
static blue_queue_t *blue_list = NULL;
/* internal function prototypes */
-static int blue_enqueue(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
+static int blue_enqueue(struct ifaltq *, struct mbuf *);
static struct mbuf *blue_dequeue(struct ifaltq *, int);
static int drop_early(blue_t *);
static int mark_ecn(struct mbuf *, struct altq_pktattr *, int);
@@ -391,12 +391,17 @@
* ENOBUFS when drop occurs.
*/
static int
-blue_enqueue(struct ifaltq *ifq, struct mbuf *m, struct altq_pktattr *pktattr)
+blue_enqueue(struct ifaltq *ifq, struct mbuf *m)
{
+ struct altq_pktattr pktattr;
blue_queue_t *rqp = (blue_queue_t *)ifq->altq_disc;
int error = 0;
- if (blue_addq(rqp->rq_blue, rqp->rq_q, m, pktattr) == 0)
+ pktattr.pattr_class = m->m_pkthdr.pattr_class;
+ pktattr.pattr_af = m->m_pkthdr.pattr_af;
+ pktattr.pattr_hdr = m->m_pkthdr.pattr_hdr;
+
+ if (blue_addq(rqp->rq_blue, rqp->rq_q, m, &pktattr) == 0)
ifq->ifq_len++;
else
error = ENOBUFS;
diff -r 06279e223f0b -r 12bb85b6ba6d sys/altq/altq_cbq.c
--- a/sys/altq/altq_cbq.c Fri Apr 22 13:43:55 2016 +0000
+++ b/sys/altq/altq_cbq.c Fri Apr 22 15:44:08 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.c,v 1.28 2014/10/18 08:33:24 snj Exp $ */
+/* $NetBSD: altq_cbq.c,v 1.28.2.1 2016/04/22 15:44:08 skrll Exp $ */
/* $KAME: altq_cbq.c,v 1.21 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.28 2014/10/18 08:33:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.28.2.1 2016/04/22 15:44:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -82,8 +82,7 @@
static struct rm_class *clh_to_clp(cbq_state_t *, u_int32_t);
static int cbq_clear_interface(cbq_state_t *);
static int cbq_request(struct ifaltq *, int, void *);
-static int cbq_enqueue(struct ifaltq *, struct mbuf *,
- struct altq_pktattr *);
+static int cbq_enqueue(struct ifaltq *, struct mbuf *);
static struct mbuf *cbq_dequeue(struct ifaltq *, int);
static void cbqrestart(struct ifaltq *);
static void get_class_stats(class_stats_t *, struct rm_class *);
@@ -483,7 +482,7 @@
/*
* int
- * cbq_enqueue(struct ifaltq *ifq, struct mbuf *m, struct altq_pktattr *pattr)
+ * cbq_enqueue(struct ifaltq *ifq, struct mbuf *m)
* - Queue data packets.
*
* cbq_enqueue is set to ifp->if_altqenqueue and called by an upper
@@ -497,8 +496,9 @@
*/
static int
-cbq_enqueue(struct ifaltq *ifq, struct mbuf *m, struct altq_pktattr *pktattr)
+cbq_enqueue(struct ifaltq *ifq, struct mbuf *m)
{
+ struct altq_pktattr pktattr;
cbq_state_t *cbqp = (cbq_state_t *)ifq->altq_disc;
struct rm_class *cl;
struct m_tag *t;
@@ -516,8 +516,8 @@
if ((t = m_tag_find(m, PACKET_TAG_ALTQ_QID, NULL)) != NULL)
cl = clh_to_clp(cbqp, ((struct altq_tag *)(t+1))->qid);
#ifdef ALTQ3_COMPAT
- else if ((ifq->altq_flags & ALTQF_CLASSIFY) && pktattr != NULL)
- cl = pktattr->pattr_class;
+ else if (ifq->altq_flags & ALTQF_CLASSIFY)
+ cl = m->m_pkthdr.pattr_class;
#endif
if (cl == NULL) {
cl = cbqp->ifnp.default_;
@@ -527,9 +527,13 @@
}
}
#ifdef ALTQ3_COMPAT
- if (pktattr != NULL)
- cl->pktattr_ = pktattr; /* save proto hdr used by ECN */
- else
+ if (m->m_pkthdr.pattr_af != AF_UNSPEC) {
+ pktattr.pattr_class = m->m_pkthdr.pattr_class;
+ pktattr.pattr_af = m->m_pkthdr.pattr_af;
+ pktattr.pattr_hdr = m->m_pkthdr.pattr_hdr;
+
+ cl->pktattr_ = &pktattr; /* save proto hdr used by ECN */
+ } else
#endif
cl->pktattr_ = NULL;
len = m_pktlen(m);
diff -r 06279e223f0b -r 12bb85b6ba6d sys/altq/altq_fifoq.c
--- a/sys/altq/altq_fifoq.c Fri Apr 22 13:43:55 2016 +0000
+++ b/sys/altq/altq_fifoq.c Fri Apr 22 15:44:08 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_fifoq.c,v 1.16 2007/03/04 05:59:01 christos Exp $ */
+/* $NetBSD: altq_fifoq.c,v 1.16.106.1 2016/04/22 15:44:08 skrll Exp $ */
/* $KAME: altq_fifoq.c,v 1.12 2003/07/10 12:07:48 kjc Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_fifoq.c,v 1.16 2007/03/04 05:59:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_fifoq.c,v 1.16.106.1 2016/04/22 15:44:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -70,8 +70,7 @@
static fifoq_state_t *fifoq_list = NULL;
/* internal function prototypes */
-static int fifoq_enqueue(struct ifaltq *, struct mbuf *,
- struct altq_pktattr *);
+static int fifoq_enqueue(struct ifaltq *, struct mbuf *);
static struct mbuf *fifoq_dequeue(struct ifaltq *, int);
static int fifoq_detach(fifoq_state_t *);
static int fifoq_request(struct ifaltq *, int, void *);
@@ -266,8 +265,7 @@
* ENOBUFS when drop occurs.
*/
static int
-fifoq_enqueue(struct ifaltq *ifq, struct mbuf *m,
- struct altq_pktattr *pktattr)
+fifoq_enqueue(struct ifaltq *ifq, struct mbuf *m)
{
fifoq_state_t *q = (fifoq_state_t *)ifq->altq_disc;
diff -r 06279e223f0b -r 12bb85b6ba6d sys/altq/altq_hfsc.c
--- a/sys/altq/altq_hfsc.c Fri Apr 22 13:43:55 2016 +0000
+++ b/sys/altq/altq_hfsc.c Fri Apr 22 15:44:08 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_hfsc.c,v 1.24.60.1 2016/03/19 11:29:53 skrll Exp $ */
+/* $NetBSD: altq_hfsc.c,v 1.24.60.2 2016/04/22 15:44:08 skrll Exp $ */
/* $KAME: altq_hfsc.c,v 1.26 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.24.60.1 2016/03/19 11:29:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.24.60.2 2016/04/22 15:44:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -90,8 +90,7 @@
struct hfsc_class *, int, int, int);
static int hfsc_class_destroy(struct hfsc_class *);
static struct hfsc_class *hfsc_nextclass(struct hfsc_class *);
-static int hfsc_enqueue(struct ifaltq *, struct mbuf *,
- struct altq_pktattr *);
+static int hfsc_enqueue(struct ifaltq *, struct mbuf *);
static struct mbuf *hfsc_dequeue(struct ifaltq *, int);
static int hfsc_addq(struct hfsc_class *, struct mbuf *);
@@ -666,8 +665,9 @@
* (*altq_enqueue) in struct ifaltq.
*/
static int
-hfsc_enqueue(struct ifaltq *ifq, struct mbuf *m, struct altq_pktattr *pktattr)
+hfsc_enqueue(struct ifaltq *ifq, struct mbuf *m)
{
+ struct altq_pktattr pktattr;
struct hfsc_if *hif = (struct hfsc_if *)ifq->altq_disc;
struct hfsc_class *cl;
struct m_tag *t;
@@ -685,8 +685,8 @@
if ((t = m_tag_find(m, PACKET_TAG_ALTQ_QID, NULL)) != NULL)
cl = clh_to_clp(hif, ((struct altq_tag *)(t+1))->qid);
#ifdef ALTQ3_COMPAT
- else if ((ifq->altq_flags & ALTQF_CLASSIFY) && pktattr != NULL)
- cl = pktattr->pattr_class;
+ else if ((ifq->altq_flags & ALTQF_CLASSIFY))
+ cl = m->m_pkthdr.pattr_class;
#endif
if (cl == NULL || is_a_parent_class(cl)) {
cl = hif->hif_defaultclass;
@@ -696,9 +696,13 @@
}
}
#ifdef ALTQ3_COMPAT
- if (pktattr != NULL)
- cl->cl_pktattr = pktattr; /* save proto hdr used by ECN */
- else
+ if (m->m_pkthdr.pattr_af != AF_UNSPEC) {
+ pktattr.pattr_class = m->m_pkthdr.pattr_class;
+ pktattr.pattr_af = m->m_pkthdr.pattr_af;
+ pktattr.pattr_hdr = m->m_pkthdr.pattr_hdr;
+
+ cl->cl_pktattr = &pktattr; /* save proto hdr used by ECN */
+ } else
#endif
cl->cl_pktattr = NULL;
len = m_pktlen(m);
diff -r 06279e223f0b -r 12bb85b6ba6d sys/altq/altq_jobs.c
--- a/sys/altq/altq_jobs.c Fri Apr 22 13:43:55 2016 +0000
+++ b/sys/altq/altq_jobs.c Fri Apr 22 15:44:08 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_jobs.c,v 1.7.2.1 2016/03/19 11:29:53 skrll Exp $ */
+/* $NetBSD: altq_jobs.c,v 1.7.2.2 2016/04/22 15:44:08 skrll Exp $ */
/* $KAME: altq_jobs.c,v 1.11 2005/04/13 03:44:25 suz Exp $ */
/*
* Copyright (c) 2001, the Rector and Board of Visitors of the
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.7.2.1 2016/03/19 11:29:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.7.2.2 2016/04/22 15:44:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -103,7 +103,7 @@
static struct jobs_class *jobs_class_create(struct jobs_if *,
int, int64_t, int64_t, int64_t, int64_t, int64_t, int);
static int jobs_class_destroy(struct jobs_class *);
-static int jobs_enqueue(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
+static int jobs_enqueue(struct ifaltq *, struct mbuf *);
static struct mbuf *jobs_dequeue(struct ifaltq *, int);
static int jobs_addq(struct jobs_class *, struct mbuf *, struct jobs_if*);
@@ -490,7 +490,7 @@
* (*altq_enqueue) in struct ifaltq.
*/
static int
-jobs_enqueue(struct ifaltq *ifq, struct mbuf *m, struct altq_pktattr *pktattr)
+jobs_enqueue(struct ifaltq *ifq, struct mbuf *m)
{
struct jobs_if *jif = (struct jobs_if *)ifq->altq_disc;
struct jobs_class *cl, *scan;
@@ -533,7 +533,7 @@
}
/* grab class set by classifier */
- if (pktattr == NULL || (cl = pktattr->pattr_class) == NULL)
+ if ((cl = m->m_pkthdr.pattr_class) == NULL)
cl = jif->jif_default;
len = m_pktlen(m);
diff -r 06279e223f0b -r 12bb85b6ba6d sys/altq/altq_priq.c
--- a/sys/altq/altq_priq.c Fri Apr 22 13:43:55 2016 +0000
+++ b/sys/altq/altq_priq.c Fri Apr 22 15:44:08 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_priq.c,v 1.21.40.1 2016/03/19 11:29:53 skrll Exp $ */
+/* $NetBSD: altq_priq.c,v 1.21.40.2 2016/04/22 15:44:08 skrll Exp $ */
/* $KAME: altq_priq.c,v 1.13 2005/04/13 03:44:25 suz Exp $ */
/*
* Copyright (C) 2000-2003
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.21.40.1 2016/03/19 11:29:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.21.40.2 2016/04/22 15:44:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -76,7 +76,7 @@
static struct priq_class *priq_class_create(struct priq_if *, int, int, int,
int);
static int priq_class_destroy(struct priq_class *);
-static int priq_enqueue(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
+static int priq_enqueue(struct ifaltq *, struct mbuf *);
static struct mbuf *priq_dequeue(struct ifaltq *, int);
static int priq_addq(struct priq_class *, struct mbuf *);
Home |
Main Index |
Thread Index |
Old Index