CVS commit: src/sys/arch/evbarm/imx7
Module Name:src Committed By: ryo Date: Thu May 19 05:15:51 UTC 2016 Modified Files: src/sys/arch/evbarm/imx7: imx7_machdep.c Log Message: delete unused variables To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/imx7/imx7_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/imx7/imx7_machdep.c diff -u src/sys/arch/evbarm/imx7/imx7_machdep.c:1.1 src/sys/arch/evbarm/imx7/imx7_machdep.c:1.2 --- src/sys/arch/evbarm/imx7/imx7_machdep.c:1.1 Tue May 17 06:44:46 2016 +++ src/sys/arch/evbarm/imx7/imx7_machdep.c Thu May 19 05:15:51 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: imx7_machdep.c,v 1.1 2016/05/17 06:44:46 ryo Exp $ */ +/* $NetBSD: imx7_machdep.c,v 1.2 2016/05/19 05:15:51 ryo Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.1 2016/05/17 06:44:46 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.2 2016/05/19 05:15:51 ryo Exp $"); #include "opt_evbarm_boardtype.h" #include "opt_arm_debug.h" @@ -97,10 +97,6 @@ void imx7_setup_iomux(void); void imx7_setup_gpio(void); void imx7board_device_register(device_t, void *); -static const bus_addr_t comcnaddr = (bus_addr_t)CONADDR; -static const int comcnspeed = CONSPEED; -static const int comcnmode = CONMODE | CLOCAL; - #ifdef KGDB #include #endif
CVS commit: src/sys/netinet6
Module Name:src
Committed By: ozaki-r
Date: Thu May 19 03:11:42 UTC 2016
Modified Files:
src/sys/netinet6: scope6.c
Log Message:
Replace DIAGNOSTIC & panic with KASSERT
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet6/scope6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/scope6.c
diff -u src/sys/netinet6/scope6.c:1.12 src/sys/netinet6/scope6.c:1.13
--- src/sys/netinet6/scope6.c:1.12 Tue Apr 26 08:44:45 2016
+++ src/sys/netinet6/scope6.c Thu May 19 03:11:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: scope6.c,v 1.12 2016/04/26 08:44:45 ozaki-r Exp $ */
+/* $NetBSD: scope6.c,v 1.13 2016/05/19 03:11:42 ozaki-r Exp $ */
/* $KAME$ */
/*-
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.12 2016/04/26 08:44:45 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.13 2016/05/19 03:11:42 ozaki-r Exp $");
#include
#include
@@ -380,12 +380,7 @@ in6_setscope(struct in6_addr *in6, const
uint32_t zoneid = 0;
const struct scope6_id *sid = SID(ifp);
-#ifdef DIAGNOSTIC
- if (sid == NULL) { /* should not happen */
- panic("in6_setscope: scope array is NULL");
- /* NOTREACHED */
- }
-#endif
+ KASSERT(sid != NULL);
/*
* special case: the loopback address can only belong to a loopback
CVS commit: src/doc/roadmaps/people
Module Name:src Committed By: christos Date: Wed May 18 15:27:17 UTC 2016 Added Files: src/doc/roadmaps/people: christos Log Message: Add my list of things to do for 8. To be expanded. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/doc/roadmaps/people/christos Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/doc/roadmaps/people/christos diff -u /dev/null src/doc/roadmaps/people/christos:1.1 --- /dev/null Wed May 18 11:27:17 2016 +++ src/doc/roadmaps/people/christos Wed May 18 11:27:17 2016 @@ -0,0 +1,6 @@ +Things I want to finish for 8: + +- import new file(1) +- get more ports to gcc-5.3/binutils-2.29 +- turn on ASLR/MPROTECT/SEGVGUARD on more ports +- debug issue with virtio/network getting stuffed
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Wed May 18 15:14:08 UTC 2016 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Decrement %tl in trap handler not to make it zero unconditionally for the nested trap, and remove useless mov. To generate a diff of this commit: cvs rdiff -u -r1.396 -r1.397 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.396 src/sys/arch/sparc64/sparc64/locore.s:1.397 --- src/sys/arch/sparc64/sparc64/locore.s:1.396 Tue May 17 19:43:28 2016 +++ src/sys/arch/sparc64/sparc64/locore.s Wed May 18 15:14:08 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.396 2016/05/17 19:43:28 palle Exp $ */ +/* $NetBSD: locore.s,v 1.397 2016/05/18 15:14:08 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -7147,7 +7147,6 @@ ENTRY(sparc64_ipi_ccall) wrpr %g0, PSTATE_KERN, %pstate ! Get back to normal globals stx %g1, [%sp + CC64FSZ + STKB + TF_G + ( 1*8)] - mov %g1, %o1 ! code rdpr %tpc, %o2 ! (pc) stx %g2, [%sp + CC64FSZ + STKB + TF_G + ( 2*8)] rdpr %tstate, %g1 @@ -7157,7 +7156,6 @@ ENTRY(sparc64_ipi_ccall) rd %y, %o4 stx %g5, [%sp + CC64FSZ + STKB + TF_G + ( 5*8)] stx %g6, [%sp + CC64FSZ + STKB + TF_G + ( 6*8)] - wrpr %g0, 0, %tl ! return to tl=0 stx %g7, [%sp + CC64FSZ + STKB + TF_G + ( 7*8)] stx %g1, [%sp + CC64FSZ + STKB + TF_TSTATE] @@ -7169,6 +7167,10 @@ ENTRY(sparc64_ipi_ccall) stb %g5, [%sp + CC64FSZ + STKB + TF_PIL] stb %g5, [%sp + CC64FSZ + STKB + TF_OLDPIL] + rdpr %tl, %g7 + dec %g7 + movrlz %g7, %g0, %g7 + wrpr %g0, %g7, %tl !! In the EMBEDANY memory model %g4 points to the start of the data segment. !! In our case we need to clear it before calling any C-code clr %g4
CVS commit: src/sys/netinet6
Module Name:src
Committed By: ozaki-r
Date: Wed May 18 11:28:44 UTC 2016
Modified Files:
src/sys/netinet6: nd6.c
Log Message:
Get rid of unnecessary assignment
To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/sys/netinet6/nd6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.194 src/sys/netinet6/nd6.c:1.195
--- src/sys/netinet6/nd6.c:1.194 Thu May 12 02:24:17 2016
+++ src/sys/netinet6/nd6.c Wed May 18 11:28:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.194 2016/05/12 02:24:17 ozaki-r Exp $ */
+/* $NetBSD: nd6.c,v 1.195 2016/05/18 11:28:44 ozaki-r Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.194 2016/05/12 02:24:17 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.195 2016/05/18 11:28:44 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1457,7 +1457,7 @@ nd6_rtrequest(int req, struct rtentry *r
(rt_getkey(rt))->sin6_addr);
if (ifa != NULL) {
if (nd6_useloopback) {
-ifp = rt->rt_ifp = lo0ifp; /* XXX */
+rt->rt_ifp = lo0ifp; /* XXX */
/*
* Make sure rt_ifa be equal to the ifaddr
* corresponding to the address.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Wed May 18 10:53:20 UTC 2016 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: 1383 To generate a diff of this commit: cvs rdiff -u -r1.1.2.250 -r1.1.2.251 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.250 src/doc/CHANGES-6.2:1.1.2.251 --- src/doc/CHANGES-6.2:1.1.2.250 Wed May 18 08:47:26 2016 +++ src/doc/CHANGES-6.2 Wed May 18 10:53:20 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.250 2016/05/18 08:47:26 martin Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.251 2016/05/18 10:53:20 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -14286,3 +14286,96 @@ sys/arch/powerpc/oea/oea_machdep.c 1.72 Don't preserve PSL_FP/PSL_VEC in cpu_setmcontext. [matt, ticket #1310] +distrib/sets/lists/base/ad.mips64eb patch +distrib/sets/lists/base/ad.mips64el patch +distrib/sets/lists/base/md.amd64 patch +distrib/sets/lists/base/md.sparc64 patch +distrib/sets/lists/base/shl.mi 1.771, 1.772 via patch +distrib/sets/lists/comp/ad.mips64eb patch +distrib/sets/lists/comp/ad.mips64el patch +distrib/sets/lists/comp/md.amd64 patch +distrib/sets/lists/comp/md.sparc64 patch +distrib/sets/lists/comp/mi 1.2035 via patch +distrib/sets/lists/comp/shl.mi patch +external/mit/expat/dist/CMake.README up to 1.1.1.2 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.3 +external/mit/expat/dist/ConfigureChecks.cmake up to 1.1.1.1 +external/mit/expat/dist/MANIFEST up to 1.1.1.3 +external/mit/expat/dist/Makefile.in up to 1.1.1.3 +external/mit/expat/dist/README up to 1.1.1.3 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.3 +external/mit/expat/dist/configure.ac up to 1.1.1.1 +external/mit/expat/dist/configure.in up to 1.1.1.2 +external/mit/expat/dist/expat.pc.in up to 1.1.1.1 +external/mit/expat/dist/expat_config.h.cmake up to 1.1.1.1 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.3 +external/mit/expat/dist/amiga/Makefile up to 1.1.1.2 +external/mit/expat/dist/amiga/README.txt up to 1.1.1.2 +external/mit/expat/dist/amiga/expat_68k.c up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_68k.h up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_68k_handler_stubs.c up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_base.h up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_lib.c up to 1.1.1.2 +external/mit/expat/dist/amiga/expat_vectors.c up to 1.1.1.2 +external/mit/expat/dist/amiga/launch.c up to 1.1.1.2 +external/mit/expat/dist/amiga/stdlib.c delete +external/mit/expat/dist/bcb5/elements.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/outline.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.2 +external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 up to 1.4 +external/mit/expat/dist/conftools/config.guess up to 1.1.1.3 +external/mit/expat/dist/conftools/config.sub up to 1.1.1.3 +external/mit/expat/dist/conftools/expat.m4 up to 1.1.1.2 +external/mit/expat/dist/conftools/install-sh up to 1.1.1.3 +external/mit/expat/dist/conftools/libtool.m4 delete +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.3 +external/mit/expat/dist/conftools/mkinstalldirs up to 1.4 +external/mit/expat/dist/doc/reference.html up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.sgml up to 1.1.1.3 +external/mit/expat/dist/examples/elements.c up to 1.1.1.2 +external/mit/expat/dist/examples/elements.dsp up to 1.1.1.2 +external/mit/expat/dist/examples/outline.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/amigaconfig.h up to 1.1.1.2 +external/mit/expat/dist/lib/expat.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/expat.h up to 1.1.1.3 +external/mit/expat/dist/lib/expat_static.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/expatw.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/libexpat.def up to 1.1.1.2 +external/mit/expat/dist/lib/libexpatw.def up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.4 +external/mit/expat/dist/lib/xmlrole.c up to 1.1.1.2 +external/mit/expat/dist/lib/xmltok.c up to 1.1.1.2 +external/mit/expat/dist/lib/xmltok.h up to 1.1.1.1 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.3 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltsugar.m4 up to 1.1.1.1 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/lt~obsolete.m4 up to 1.1.1.1 +external/mit/expat/dist/tests/README.txt up to 1.1.1.2
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Wed May 18 10:48:51 UTC 2016 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: 1383 To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-6.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.65 src/doc/CHANGES-6.1.6:1.1.2.66 --- src/doc/CHANGES-6.1.6:1.1.2.65 Tue May 10 23:18:37 2016 +++ src/doc/CHANGES-6.1.6 Wed May 18 10:48:51 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.65 2016/05/10 23:18:37 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.66 2016/05/18 10:48:51 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -8268,3 +8268,96 @@ sys/miscfs/specfs/spec_vnops.c 1.161, Fixes PR kern/50467. [hannken, ticket #1376] +distrib/sets/lists/base/ad.mips64eb patch +distrib/sets/lists/base/ad.mips64el patch +distrib/sets/lists/base/md.amd64 patch +distrib/sets/lists/base/md.sparc64 patch +distrib/sets/lists/base/shl.mi 1.771, 1.772 via patch +distrib/sets/lists/comp/ad.mips64eb patch +distrib/sets/lists/comp/ad.mips64el patch +distrib/sets/lists/comp/md.amd64 patch +distrib/sets/lists/comp/md.sparc64 patch +distrib/sets/lists/comp/mi 1.2035 via patch +distrib/sets/lists/comp/shl.mi patch +external/mit/expat/dist/CMake.README up to 1.1.1.2 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.3 +external/mit/expat/dist/ConfigureChecks.cmake up to 1.1.1.1 +external/mit/expat/dist/MANIFEST up to 1.1.1.3 +external/mit/expat/dist/Makefile.in up to 1.1.1.3 +external/mit/expat/dist/README up to 1.1.1.3 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.3 +external/mit/expat/dist/configure.ac up to 1.1.1.1 +external/mit/expat/dist/configure.in up to 1.1.1.2 +external/mit/expat/dist/expat.pc.in up to 1.1.1.1 +external/mit/expat/dist/expat_config.h.cmake up to 1.1.1.1 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.3 +external/mit/expat/dist/amiga/Makefile up to 1.1.1.2 +external/mit/expat/dist/amiga/README.txt up to 1.1.1.2 +external/mit/expat/dist/amiga/expat_68k.c up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_68k.h up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_68k_handler_stubs.c up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_base.h up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_lib.c up to 1.1.1.2 +external/mit/expat/dist/amiga/expat_vectors.c up to 1.1.1.2 +external/mit/expat/dist/amiga/launch.c up to 1.1.1.2 +external/mit/expat/dist/amiga/stdlib.c delete +external/mit/expat/dist/bcb5/elements.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/outline.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.2 +external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 up to 1.4 +external/mit/expat/dist/conftools/config.guess up to 1.1.1.3 +external/mit/expat/dist/conftools/config.sub up to 1.1.1.3 +external/mit/expat/dist/conftools/expat.m4 up to 1.1.1.2 +external/mit/expat/dist/conftools/install-sh up to 1.1.1.3 +external/mit/expat/dist/conftools/libtool.m4 delete +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.3 +external/mit/expat/dist/conftools/mkinstalldirs up to 1.4 +external/mit/expat/dist/doc/reference.html up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.sgml up to 1.1.1.3 +external/mit/expat/dist/examples/elements.c up to 1.1.1.2 +external/mit/expat/dist/examples/elements.dsp up to 1.1.1.2 +external/mit/expat/dist/examples/outline.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/amigaconfig.h up to 1.1.1.2 +external/mit/expat/dist/lib/expat.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/expat.h up to 1.1.1.3 +external/mit/expat/dist/lib/expat_static.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/expatw.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/libexpat.def up to 1.1.1.2 +external/mit/expat/dist/lib/libexpatw.def up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.4 +external/mit/expat/dist/lib/xmlrole.c up to 1.1.1.2 +external/mit/expat/dist/lib/xmltok.c up to 1.1.1.2 +external/mit/expat/dist/lib/xmltok.h up to 1.1.1.1 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.3 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltsugar.m4 up to 1.1.1.1 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/lt~obsolete.m4 up to 1.1.1.1 +external/mit/expat/dist/tests/README.txt up to 1.1.1.2
CVS commit: [netbsd-6] src
Module Name:src Committed By: snj Date: Wed May 18 10:49:24 UTC 2016 Modified Files: src/distrib/sets/lists/base [netbsd-6]: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp [netbsd-6]: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/external/mit/expat/dist [netbsd-6]: Changes MANIFEST Makefile.in README configure configure.in expat_config.h.in src/external/mit/expat/dist/amiga [netbsd-6]: Makefile README.txt expat_lib.c expat_vectors.c launch.c src/external/mit/expat/dist/bcb5 [netbsd-6]: elements.bpr expat.bpr expat_static.bpr expatw.bpr expatw_static.bpr outline.bpr xmlwf.bpr src/external/mit/expat/dist/conftools [netbsd-6]: ac_c_bigendian_cross.m4 config.guess config.sub expat.m4 install-sh ltmain.sh mkinstalldirs src/external/mit/expat/dist/doc [netbsd-6]: reference.html xmlwf.1 xmlwf.sgml src/external/mit/expat/dist/examples [netbsd-6]: elements.c elements.dsp outline.dsp src/external/mit/expat/dist/lib [netbsd-6]: amigaconfig.h expat.dsp expat.h expat_static.dsp expatw.dsp libexpat.def libexpatw.def xmlparse.c xmlrole.c xmltok.c xmltok.h xmltok_impl.c src/external/mit/expat/dist/tests [netbsd-6]: README.txt chardata.c minicheck.h runtests.c xmltest.sh src/external/mit/expat/dist/tests/benchmark [netbsd-6]: README.txt benchmark.dsp src/external/mit/expat/dist/win32 [netbsd-6]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-6]: unixfilemap.c xmlwf.c xmlwf.dsp src/external/mit/expat/lib/libexpat [netbsd-6]: Makefile expat_config.h shlib_version Added Files: src/external/mit/expat/dist [netbsd-6]: CMake.README CMakeLists.txt ConfigureChecks.cmake aclocal.m4 configure.ac expat.pc.in expat_config.h.cmake src/external/mit/expat/dist/amiga [netbsd-6]: expat_68k.c expat_68k.h expat_68k_handler_stubs.c expat_base.h src/external/mit/expat/dist/m4 [netbsd-6]: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 src/external/mit/expat/lib/libexpat [netbsd-6]: expat.pc.in Removed Files: src/external/mit/expat/dist/amiga [netbsd-6]: stdlib.c src/external/mit/expat/dist/conftools [netbsd-6]: libtool.m4 Log Message: Pull up following revision(s) (requested by spz in ticket #1383): distrib/sets/lists/base/ad.mips64eb: patch distrib/sets/lists/base/ad.mips64el: patch distrib/sets/lists/base/md.amd64: patch distrib/sets/lists/base/md.sparc64: patch distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch distrib/sets/lists/comp/ad.mips64eb: patch distrib/sets/lists/comp/ad.mips64el: patch distrib/sets/lists/comp/md.amd64: patch distrib/sets/lists/comp/md.sparc64: patch distrib/sets/lists/comp/mi: 1.2035 via patch distrib/sets/lists/comp/shl.mi: patch external/mit/expat/dist/CMake.README: up to 1.1.1.2 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.3 external/mit/expat/dist/ConfigureChecks.cmake: up to 1.1.1.1 external/mit/expat/dist/MANIFEST: up to 1.1.1.3 external/mit/expat/dist/Makefile.in: up to 1.1.1.3 external/mit/expat/dist/README: up to 1.1.1.3 external/mit/expat/dist/aclocal.m4: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.3 external/mit/expat/dist/configure.ac: up to 1.1.1.1 external/mit/expat/dist/configure.in: up to 1.1.1.2 external/mit/expat/dist/expat.pc.in: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.cmake: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3 external/mit/expat/dist/amiga/Makefile: up to 1.1.1.2 external/mit/expat/dist/amiga/README.txt: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_68k.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_base.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2 external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2 external/mit/expat/dist/amiga/stdlib.c: delete external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.2
CVS commit: [netbsd-6-1] src
Module Name:src Committed By: snj Date: Wed May 18 10:45:14 UTC 2016 Modified Files: src/distrib/sets/lists/base [netbsd-6-1]: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp [netbsd-6-1]: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/external/mit/expat/dist [netbsd-6-1]: Changes MANIFEST Makefile.in README configure configure.in expat_config.h.in src/external/mit/expat/dist/amiga [netbsd-6-1]: Makefile README.txt expat_lib.c expat_vectors.c launch.c src/external/mit/expat/dist/bcb5 [netbsd-6-1]: elements.bpr expat.bpr expat_static.bpr expatw.bpr expatw_static.bpr outline.bpr xmlwf.bpr src/external/mit/expat/dist/conftools [netbsd-6-1]: ac_c_bigendian_cross.m4 config.guess config.sub expat.m4 install-sh ltmain.sh mkinstalldirs src/external/mit/expat/dist/doc [netbsd-6-1]: reference.html xmlwf.1 xmlwf.sgml src/external/mit/expat/dist/examples [netbsd-6-1]: elements.c elements.dsp outline.dsp src/external/mit/expat/dist/lib [netbsd-6-1]: amigaconfig.h expat.dsp expat.h expat_static.dsp expatw.dsp libexpat.def libexpatw.def xmlparse.c xmlrole.c xmltok.c xmltok.h xmltok_impl.c src/external/mit/expat/dist/tests [netbsd-6-1]: README.txt chardata.c minicheck.h runtests.c xmltest.sh src/external/mit/expat/dist/tests/benchmark [netbsd-6-1]: README.txt benchmark.dsp src/external/mit/expat/dist/win32 [netbsd-6-1]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-6-1]: unixfilemap.c xmlwf.c xmlwf.dsp src/external/mit/expat/lib/libexpat [netbsd-6-1]: Makefile expat_config.h shlib_version Added Files: src/external/mit/expat/dist [netbsd-6-1]: CMake.README CMakeLists.txt ConfigureChecks.cmake aclocal.m4 configure.ac expat.pc.in expat_config.h.cmake src/external/mit/expat/dist/amiga [netbsd-6-1]: expat_68k.c expat_68k.h expat_68k_handler_stubs.c expat_base.h src/external/mit/expat/dist/m4 [netbsd-6-1]: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 src/external/mit/expat/lib/libexpat [netbsd-6-1]: expat.pc.in Removed Files: src/external/mit/expat/dist/amiga [netbsd-6-1]: stdlib.c src/external/mit/expat/dist/conftools [netbsd-6-1]: libtool.m4 Log Message: Pull up following revision(s) (requested by spz in ticket #1383): distrib/sets/lists/base/ad.mips64eb: patch distrib/sets/lists/base/ad.mips64el: patch distrib/sets/lists/base/md.amd64: patch distrib/sets/lists/base/md.sparc64: patch distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch distrib/sets/lists/comp/ad.mips64eb: patch distrib/sets/lists/comp/ad.mips64el: patch distrib/sets/lists/comp/md.amd64: patch distrib/sets/lists/comp/md.sparc64: patch distrib/sets/lists/comp/mi: 1.2035 via patch distrib/sets/lists/comp/shl.mi: patch external/mit/expat/dist/CMake.README: up to 1.1.1.2 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.3 external/mit/expat/dist/ConfigureChecks.cmake: up to 1.1.1.1 external/mit/expat/dist/MANIFEST: up to 1.1.1.3 external/mit/expat/dist/Makefile.in: up to 1.1.1.3 external/mit/expat/dist/README: up to 1.1.1.3 external/mit/expat/dist/aclocal.m4: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.3 external/mit/expat/dist/configure.ac: up to 1.1.1.1 external/mit/expat/dist/configure.in: up to 1.1.1.2 external/mit/expat/dist/expat.pc.in: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.cmake: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3 external/mit/expat/dist/amiga/Makefile: up to 1.1.1.2 external/mit/expat/dist/amiga/README.txt: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_68k.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_base.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2 external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2 external/mit/expat/dist/amiga/stdlib.c: delete external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Wed May 18 10:44:41 UTC 2016 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: 1383 To generate a diff of this commit: cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-6.0.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.67 src/doc/CHANGES-6.0.7:1.1.2.68 --- src/doc/CHANGES-6.0.7:1.1.2.67 Tue May 10 23:18:17 2016 +++ src/doc/CHANGES-6.0.7 Wed May 18 10:44:41 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.67 2016/05/10 23:18:17 snj Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.68 2016/05/18 10:44:41 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -8548,3 +8548,96 @@ sys/miscfs/specfs/spec_vnops.c 1.161, Fixes PR kern/50467. [hannken, ticket #1376] +distrib/sets/lists/base/ad.mips64eb patch +distrib/sets/lists/base/ad.mips64el patch +distrib/sets/lists/base/md.amd64 patch +distrib/sets/lists/base/md.sparc64 patch +distrib/sets/lists/base/shl.mi 1.771, 1.772 via patch +distrib/sets/lists/comp/ad.mips64eb patch +distrib/sets/lists/comp/ad.mips64el patch +distrib/sets/lists/comp/md.amd64 patch +distrib/sets/lists/comp/md.sparc64 patch +distrib/sets/lists/comp/mi 1.2035 via patch +distrib/sets/lists/comp/shl.mi patch +external/mit/expat/dist/CMake.README up to 1.1.1.2 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.3 +external/mit/expat/dist/ConfigureChecks.cmake up to 1.1.1.1 +external/mit/expat/dist/MANIFEST up to 1.1.1.3 +external/mit/expat/dist/Makefile.in up to 1.1.1.3 +external/mit/expat/dist/README up to 1.1.1.3 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.3 +external/mit/expat/dist/configure.ac up to 1.1.1.1 +external/mit/expat/dist/configure.in up to 1.1.1.2 +external/mit/expat/dist/expat.pc.in up to 1.1.1.1 +external/mit/expat/dist/expat_config.h.cmake up to 1.1.1.1 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.3 +external/mit/expat/dist/amiga/Makefile up to 1.1.1.2 +external/mit/expat/dist/amiga/README.txt up to 1.1.1.2 +external/mit/expat/dist/amiga/expat_68k.c up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_68k.h up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_68k_handler_stubs.c up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_base.h up to 1.1.1.1 +external/mit/expat/dist/amiga/expat_lib.c up to 1.1.1.2 +external/mit/expat/dist/amiga/expat_vectors.c up to 1.1.1.2 +external/mit/expat/dist/amiga/launch.c up to 1.1.1.2 +external/mit/expat/dist/amiga/stdlib.c delete +external/mit/expat/dist/bcb5/elements.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/outline.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.2 +external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 up to 1.4 +external/mit/expat/dist/conftools/config.guess up to 1.1.1.3 +external/mit/expat/dist/conftools/config.sub up to 1.1.1.3 +external/mit/expat/dist/conftools/expat.m4 up to 1.1.1.2 +external/mit/expat/dist/conftools/install-sh up to 1.1.1.3 +external/mit/expat/dist/conftools/libtool.m4 delete +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.3 +external/mit/expat/dist/conftools/mkinstalldirs up to 1.4 +external/mit/expat/dist/doc/reference.html up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.sgml up to 1.1.1.3 +external/mit/expat/dist/examples/elements.c up to 1.1.1.2 +external/mit/expat/dist/examples/elements.dsp up to 1.1.1.2 +external/mit/expat/dist/examples/outline.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/amigaconfig.h up to 1.1.1.2 +external/mit/expat/dist/lib/expat.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/expat.h up to 1.1.1.3 +external/mit/expat/dist/lib/expat_static.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/expatw.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/libexpat.def up to 1.1.1.2 +external/mit/expat/dist/lib/libexpatw.def up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.4 +external/mit/expat/dist/lib/xmlrole.c up to 1.1.1.2 +external/mit/expat/dist/lib/xmltok.c up to 1.1.1.2 +external/mit/expat/dist/lib/xmltok.h up to 1.1.1.1 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.3 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltsugar.m4 up to 1.1.1.1 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/lt~obsolete.m4 up to 1.1.1.1 +external/mit/expat/dist/tests/README.txt up to 1.1.1.2
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: snj Date: Wed May 18 10:40:43 UTC 2016 Modified Files: src/distrib/sets/lists/base [netbsd-6-0]: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp [netbsd-6-0]: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/external/mit/expat/dist [netbsd-6-0]: Changes MANIFEST Makefile.in README configure configure.in expat_config.h.in src/external/mit/expat/dist/amiga [netbsd-6-0]: Makefile README.txt expat_lib.c expat_vectors.c launch.c src/external/mit/expat/dist/bcb5 [netbsd-6-0]: elements.bpr expat.bpr expat_static.bpr expatw.bpr expatw_static.bpr outline.bpr xmlwf.bpr src/external/mit/expat/dist/conftools [netbsd-6-0]: ac_c_bigendian_cross.m4 config.guess config.sub expat.m4 install-sh ltmain.sh mkinstalldirs src/external/mit/expat/dist/doc [netbsd-6-0]: reference.html xmlwf.1 xmlwf.sgml src/external/mit/expat/dist/examples [netbsd-6-0]: elements.c elements.dsp outline.dsp src/external/mit/expat/dist/lib [netbsd-6-0]: amigaconfig.h expat.dsp expat.h expat_static.dsp expatw.dsp libexpat.def libexpatw.def xmlparse.c xmlrole.c xmltok.c xmltok.h xmltok_impl.c src/external/mit/expat/dist/tests [netbsd-6-0]: README.txt chardata.c minicheck.h runtests.c xmltest.sh src/external/mit/expat/dist/tests/benchmark [netbsd-6-0]: README.txt benchmark.dsp src/external/mit/expat/dist/win32 [netbsd-6-0]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-6-0]: unixfilemap.c xmlwf.c xmlwf.dsp src/external/mit/expat/lib/libexpat [netbsd-6-0]: Makefile expat_config.h shlib_version Added Files: src/external/mit/expat/dist [netbsd-6-0]: CMake.README CMakeLists.txt ConfigureChecks.cmake aclocal.m4 configure.ac expat.pc.in expat_config.h.cmake src/external/mit/expat/dist/amiga [netbsd-6-0]: expat_68k.c expat_68k.h expat_68k_handler_stubs.c expat_base.h src/external/mit/expat/dist/m4 [netbsd-6-0]: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 src/external/mit/expat/lib/libexpat [netbsd-6-0]: expat.pc.in Removed Files: src/external/mit/expat/dist/amiga [netbsd-6-0]: stdlib.c src/external/mit/expat/dist/conftools [netbsd-6-0]: libtool.m4 Log Message: Pull up following revision(s) (requested by spz in ticket #1383): distrib/sets/lists/base/ad.mips64eb: patch distrib/sets/lists/base/ad.mips64el: patch distrib/sets/lists/base/md.amd64: patch distrib/sets/lists/base/md.sparc64: patch distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch distrib/sets/lists/comp/ad.mips64eb: patch distrib/sets/lists/comp/ad.mips64el: patch distrib/sets/lists/comp/md.amd64: patch distrib/sets/lists/comp/md.sparc64: patch distrib/sets/lists/comp/mi: 1.2035 via patch distrib/sets/lists/comp/shl.mi: patch external/mit/expat/dist/CMake.README: up to 1.1.1.2 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.3 external/mit/expat/dist/ConfigureChecks.cmake: up to 1.1.1.1 external/mit/expat/dist/MANIFEST: up to 1.1.1.3 external/mit/expat/dist/Makefile.in: up to 1.1.1.3 external/mit/expat/dist/README: up to 1.1.1.3 external/mit/expat/dist/aclocal.m4: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.3 external/mit/expat/dist/configure.ac: up to 1.1.1.1 external/mit/expat/dist/configure.in: up to 1.1.1.2 external/mit/expat/dist/expat.pc.in: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.cmake: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3 external/mit/expat/dist/amiga/Makefile: up to 1.1.1.2 external/mit/expat/dist/amiga/README.txt: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_68k.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_base.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2 external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2 external/mit/expat/dist/amiga/stdlib.c: delete external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to
CVS commit: src/sys/netinet6
Module Name:src
Committed By: ozaki-r
Date: Wed May 18 09:32:05 UTC 2016
Modified Files:
src/sys/netinet6: in6_src.c
Log Message:
Get rid of unnecessary NULL check
It's already checked just some lines above.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/netinet6/in6_src.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6_src.c
diff -u src/sys/netinet6/in6_src.c:1.59 src/sys/netinet6/in6_src.c:1.60
--- src/sys/netinet6/in6_src.c:1.59 Sat Dec 12 23:34:25 2015
+++ src/sys/netinet6/in6_src.c Wed May 18 09:32:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_src.c,v 1.59 2015/12/12 23:34:25 christos Exp $ */
+/* $NetBSD: in6_src.c,v 1.60 2016/05/18 09:32:05 ozaki-r Exp $ */
/* $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.59 2015/12/12 23:34:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.60 2016/05/18 09:32:05 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -279,10 +279,6 @@ in6_selectsrc(struct sockaddr_in6 *dstso
}
#endif /* MIP6 && NMIP > 0 */
-#ifdef DIAGNOSTIC
- if (ifp == NULL) /* this should not happen */
- panic("in6_selectsrc: NULL ifp");
-#endif
*errorp = in6_setscope(, ifp, );
if (*errorp != 0)
return (NULL);
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed May 18 09:22:11 UTC 2016 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: 1169 To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-7.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.90 src/doc/CHANGES-7.1:1.1.2.91 --- src/doc/CHANGES-7.1:1.1.2.90 Tue May 17 18:51:39 2016 +++ src/doc/CHANGES-7.1 Wed May 18 09:22:11 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.90 2016/05/17 18:51:39 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.91 2016/05/18 09:22:11 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -4677,3 +4677,70 @@ crypto/external/bsd/openssh/dist/session set via PAM. CVE-2015-8325. [christos, ticket #1168] +distrib/sets/lists/base/ad.aarch64 patch +distrib/sets/lists/base/ad.arm patch +distrib/sets/lists/base/ad.mips patch +distrib/sets/lists/base/ad.powerpc patch +distrib/sets/lists/base/md.amd64 patch +distrib/sets/lists/base/md.sparc64 patch +distrib/sets/lists/base/shl.mi 1.771, 1.772 via patch +distrib/sets/lists/comp/mi 1.2035 +distrib/sets/lists/debug/ad.aarch64 patch +distrib/sets/lists/debug/ad.arm patch +distrib/sets/lists/debug/ad.mips patch +distrib/sets/lists/debug/ad.powerpc patch +distrib/sets/lists/debug/md.amd64 patch +distrib/sets/lists/debug/md.sparc64 patch +distrib/sets/lists/debug/shl.mi 1.133, 1.134 via patch +doc/3RDPARTY 1.1316, 1.1330 +external/mit/expat/dist/CMake.README up to 1.1.1.2 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.3 +external/mit/expat/dist/MANIFEST up to 1.1.1.3 +external/mit/expat/dist/Makefile.in up to 1.1.1.3 +external/mit/expat/dist/README up to 1.1.1.3 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.3 +external/mit/expat/dist/configure.ac up to 1.1.1.1 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.3 +external/mit/expat/dist/bcb5/elements.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/outline.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.2 +external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 up to 1.4 +external/mit/expat/dist/conftools/config.guess up to 1.1.1.3 +external/mit/expat/dist/conftools/config.sub up to 1.1.1.3 +external/mit/expat/dist/conftools/install-sh up to 1.1.1.3 +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.3 +external/mit/expat/dist/conftools/mkinstalldirs up to 1.4 +external/mit/expat/dist/doc/reference.html up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.sgml up to 1.1.1.3 +external/mit/expat/dist/examples/elements.c up to 1.1.1.2 +external/mit/expat/dist/lib/amigaconfig.h up to 1.1.1.2 +external/mit/expat/dist/lib/expat.h up to 1.1.1.3 +external/mit/expat/dist/lib/libexpat.def up to 1.1.1.2 +external/mit/expat/dist/lib/libexpatw.def up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.4 +external/mit/expat/dist/lib/xmltok.c up to 1.1.1.2 +external/mit/expat/dist/lib/xmltok.h up to 1.1.1.1 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.3 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.2 +external/mit/expat/dist/tests/chardata.c up to 1.1.1.2 +external/mit/expat/dist/tests/benchmark/README.txt up to 1.1.1.2 +external/mit/expat/dist/win32/expat.iss up to 1.1.1.3 +external/mit/expat/dist/xmlwf/unixfilemap.c up to 1.1.1.2 +external/mit/expat/dist/xmlwf/xmlwf.c up to 1.1.1.3 +external/mit/expat/lib/libexpat/Makefile up to 1.2 +external/mit/expat/lib/libexpat/expat.pc.in up to 1.1 +external/mit/expat/lib/libexpat/expat_config.h up to 1.3 +external/mit/expat/lib/libexpat/shlib_version up to 1.3 + + Update expat to 2.1.1. Apply fixes for CVE-2016-0718. + [spz, ticket #1169] +
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: snj Date: Wed May 18 09:19:48 UTC 2016 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.1 Log Message: 1169 To generate a diff of this commit: cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-7.0.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.1 diff -u src/doc/CHANGES-7.0.1:1.1.2.55 src/doc/CHANGES-7.0.1:1.1.2.56 --- src/doc/CHANGES-7.0.1:1.1.2.55 Tue May 17 18:49:33 2016 +++ src/doc/CHANGES-7.0.1 Wed May 18 09:19:48 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.1,v 1.1.2.55 2016/05/17 18:49:33 snj Exp $ +# $NetBSD: CHANGES-7.0.1,v 1.1.2.56 2016/05/18 09:19:48 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1 release: @@ -3065,3 +3065,70 @@ crypto/external/bsd/openssh/dist/session set via PAM. CVE-2015-8325. [christos, ticket #1168] +distrib/sets/lists/base/ad.aarch64 patch +distrib/sets/lists/base/ad.arm patch +distrib/sets/lists/base/ad.mips patch +distrib/sets/lists/base/ad.powerpc patch +distrib/sets/lists/base/md.amd64 patch +distrib/sets/lists/base/md.sparc64 patch +distrib/sets/lists/base/shl.mi 1.771, 1.772 via patch +distrib/sets/lists/comp/mi 1.2035 +distrib/sets/lists/debug/ad.aarch64 patch +distrib/sets/lists/debug/ad.arm patch +distrib/sets/lists/debug/ad.mips patch +distrib/sets/lists/debug/ad.powerpc patch +distrib/sets/lists/debug/md.amd64 patch +distrib/sets/lists/debug/md.sparc64 patch +distrib/sets/lists/debug/shl.mi 1.133, 1.134 via patch +doc/3RDPARTY 1.1316, 1.1330 +external/mit/expat/dist/CMake.README up to 1.1.1.2 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.3 +external/mit/expat/dist/MANIFEST up to 1.1.1.3 +external/mit/expat/dist/Makefile.in up to 1.1.1.3 +external/mit/expat/dist/README up to 1.1.1.3 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.3 +external/mit/expat/dist/configure.ac up to 1.1.1.1 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.3 +external/mit/expat/dist/bcb5/elements.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/outline.bpr up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.2 +external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 up to 1.4 +external/mit/expat/dist/conftools/config.guess up to 1.1.1.3 +external/mit/expat/dist/conftools/config.sub up to 1.1.1.3 +external/mit/expat/dist/conftools/install-sh up to 1.1.1.3 +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.3 +external/mit/expat/dist/conftools/mkinstalldirs up to 1.4 +external/mit/expat/dist/doc/reference.html up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.sgml up to 1.1.1.3 +external/mit/expat/dist/examples/elements.c up to 1.1.1.2 +external/mit/expat/dist/lib/amigaconfig.h up to 1.1.1.2 +external/mit/expat/dist/lib/expat.h up to 1.1.1.3 +external/mit/expat/dist/lib/libexpat.def up to 1.1.1.2 +external/mit/expat/dist/lib/libexpatw.def up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.4 +external/mit/expat/dist/lib/xmltok.c up to 1.1.1.2 +external/mit/expat/dist/lib/xmltok.h up to 1.1.1.1 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.3 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.2 +external/mit/expat/dist/tests/chardata.c up to 1.1.1.2 +external/mit/expat/dist/tests/benchmark/README.txt up to 1.1.1.2 +external/mit/expat/dist/win32/expat.iss up to 1.1.1.3 +external/mit/expat/dist/xmlwf/unixfilemap.c up to 1.1.1.2 +external/mit/expat/dist/xmlwf/xmlwf.c up to 1.1.1.3 +external/mit/expat/lib/libexpat/Makefile up to 1.2 +external/mit/expat/lib/libexpat/expat.pc.in up to 1.1 +external/mit/expat/lib/libexpat/expat_config.h up to 1.3 +external/mit/expat/lib/libexpat/shlib_version up to 1.3 + + Update expat to 2.1.1. Apply fixes for CVE-2016-0718. + [spz, ticket #1169] +
CVS commit: src/doc/roadmaps
Module Name:src Committed By: ozaki-r Date: Wed May 18 09:12:04 UTC 2016 Modified Files: src/doc/roadmaps: networking Log Message: Split "MP network stack" into two and make our targets clear To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/doc/roadmaps/networking Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/roadmaps/networking diff -u src/doc/roadmaps/networking:1.10 src/doc/roadmaps/networking:1.11 --- src/doc/roadmaps/networking:1.10 Tue May 17 20:53:53 2016 +++ src/doc/roadmaps/networking Wed May 18 09:12:04 2016 @@ -1,4 +1,4 @@ -$NetBSD: networking,v 1.10 2016/05/17 20:53:53 christos Exp $ +$NetBSD: networking,v 1.11 2016/05/18 09:12:04 ozaki-r Exp $ NetBSD Networking Roadmap = @@ -17,7 +17,8 @@ The following features are expected to b 5. integrated multicast dns / zeroconf 6. tcp support in libsa 7. netboot from http -8. MP network stack +8. MP network stack (Layer 3 and below) +9. MP network stack (rest) We'll continue to update this roadmap as features and dates get firmed up. @@ -97,16 +98,28 @@ Responsible: TBD Status: not started Comment[christos]: Not very interesting -8. net SMP work --- +8. net SMP work (Layer 3 and below) +--- -Make multi-threaded network stack +Make multi-threaded network stack. Targets are Layer 3 (IP forwarding), +Layer 2 (ARP, NDP, bridge, vlan and bpf) and some tunnel devices (gif, +ipsec and pppoe). Responsible: ozaki-r,knakahara Status: in progress +9. net SMP work (rest) +-- + +Make multi-threaded network stack. Get tasks other than the above targets down. + +Responsible: TBD +Status: not started + Matt Thomas Alistair Crooks Sat Jan 14 11:44:46 PST 2012 Christos Zoulas Tue May 17 16:46:54 EDT 2016 +Ryota Ozaki +Wed May 18 18:07:43 JST 2016
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Wed May 18 08:59:57 UTC 2016
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Whether Tx interrupt handler kicks if_start() should not depend on wm_txeof()
return value.
To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.402 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.401 src/sys/dev/pci/if_wm.c:1.402
--- src/sys/dev/pci/if_wm.c:1.401 Wed May 18 08:41:42 2016
+++ src/sys/dev/pci/if_wm.c Wed May 18 08:59:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.401 2016/05/18 08:41:42 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.402 2016/05/18 08:59:56 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.401 2016/05/18 08:41:42 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.402 2016/05/18 08:59:56 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -7605,7 +7605,6 @@ wm_txintr_msix(void *arg)
struct wm_txqueue *txq = arg;
struct wm_softc *sc = txq->txq_sc;
struct ifnet *ifp = >sc_ethercom.ec_if;
- int handled = 0;
DPRINTF(WM_DEBUG_TX,
("%s: TX: got Tx intr\n", device_xname(sc->sc_dev)));
@@ -7623,7 +7622,7 @@ wm_txintr_msix(void *arg)
goto out;
WM_EVCNT_INCR(>sc_ev_txdw);
- handled = wm_txeof(sc);
+ wm_txeof(sc);
out:
WM_TX_UNLOCK(txq);
@@ -7635,12 +7634,12 @@ out:
else
CSR_WRITE(sc, WMREG_EIMS, 1 << txq->txq_intr_idx);
- if (handled) {
+ if (!IFQ_IS_EMPTY(>if_snd)) {
/* Try to get more packets going. */
ifp->if_start(ifp);
}
- return handled;
+ return 1;
}
/*
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Wed May 18 08:47:26 UTC 2016 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket #1310 To generate a diff of this commit: cvs rdiff -u -r1.1.2.249 -r1.1.2.250 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.249 src/doc/CHANGES-6.2:1.1.2.250 --- src/doc/CHANGES-6.2:1.1.2.249 Tue May 10 23:17:59 2016 +++ src/doc/CHANGES-6.2 Wed May 18 08:47:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.249 2016/05/10 23:17:59 snj Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.250 2016/05/18 08:47:26 martin Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -14276,3 +14276,13 @@ sys/miscfs/specfs/spec_vnops.c 1.161, Fixes PR kern/50467. [hannken, ticket #1376] +sys/arch/powerpc/include/psl.h 1.20 (patch) +sys/arch/powerpc/include/userret.h 1.29-1.30 (patch) +sys/arch/powerpc/oea/oea_machdep.c 1.72 (patch) + + Add a check to make sure that if PSL_FP is set, we own the FPU. + Don't clear PSL_FP/PSL_VEC. + Remove PSL_SPV from BOOKE PSL_USERMOD + Don't preserve PSL_FP/PSL_VEC in cpu_setmcontext. + [matt, ticket #1310] +
CVS commit: [netbsd-6] src/sys/arch/powerpc
Module Name:src
Committed By: martin
Date: Wed May 18 08:44:42 UTC 2016
Modified Files:
src/sys/arch/powerpc/include [netbsd-6]: psl.h userret.h
src/sys/arch/powerpc/oea [netbsd-6]: oea_machdep.c
Log Message:
Pull up following revision(s) (requested by matt in ticket #1310):
sys/arch/powerpc/include/userret.h: revision 1.29-1.30
sys/arch/powerpc/include/psl.h: revision 1.20
sys/arch/powerpc/oea/oea_machdep.c: revision 1.72
(via patch)
Add a check to make sure that if PSL_FP is set, we own the FPU.
Don't clear PSL_FP/PSL_VEC
Remove PSL_SPV from BOOKE PSL_USERMOD
Don't preserve PSL_FP/PSL_VEC in cpu_setmcontext.
To generate a diff of this commit:
cvs rdiff -u -r1.18.8.3 -r1.18.8.4 src/sys/arch/powerpc/include/psl.h
cvs rdiff -u -r1.22.8.4 -r1.22.8.5 src/sys/arch/powerpc/include/userret.h
cvs rdiff -u -r1.63.2.3 -r1.63.2.4 src/sys/arch/powerpc/oea/oea_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/psl.h
diff -u src/sys/arch/powerpc/include/psl.h:1.18.8.3 src/sys/arch/powerpc/include/psl.h:1.18.8.4
--- src/sys/arch/powerpc/include/psl.h:1.18.8.3 Thu Nov 19 08:50:05 2015
+++ src/sys/arch/powerpc/include/psl.h Wed May 18 08:44:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.18.8.3 2015/11/19 08:50:05 bouyer Exp $ */
+/* $NetBSD: psl.h,v 1.18.8.4 2016/05/18 08:44:41 martin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -111,7 +111,7 @@ extern register_t cpu_psluserset, cpu_ps
#elif defined(PPC_BOOKE)
#define PSL_USERSET (PSL_EE | PSL_PR | PSL_IS | PSL_DS | PSL_ME | PSL_CE | PSL_DE)
#define PSL_USERMASK (PSL_SPV | PSL_CE | 0x)
-#define PSL_USERMOD (PSL_SPV)
+#define PSL_USERMOD (0)
#else /* PPC_IBM4XX */
#ifdef PPC_IBM403
#define PSL_USERSET (PSL_EE | PSL_PR | PSL_IR | PSL_DR | PSL_ME)
Index: src/sys/arch/powerpc/include/userret.h
diff -u src/sys/arch/powerpc/include/userret.h:1.22.8.4 src/sys/arch/powerpc/include/userret.h:1.22.8.5
--- src/sys/arch/powerpc/include/userret.h:1.22.8.4 Thu Nov 19 08:50:05 2015
+++ src/sys/arch/powerpc/include/userret.h Wed May 18 08:44:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: userret.h,v 1.22.8.4 2015/11/19 08:50:05 bouyer Exp $ */
+/* $NetBSD: userret.h,v 1.22.8.5 2016/05/18 08:44:41 martin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -58,7 +58,13 @@ userret(struct lwp *l, struct trapframe
/* Invoke MI userret code */
mi_userret(l);
- tf->tf_srr1 &= PSL_USERSRR1; /* clear SRR1 status bits */
+ KASSERTMSG((tf->tf_srr1 & PSL_FP) == 0
+ || l->l_cpu->ci_data.cpu_pcu_curlwp[PCU_FPU] == l,
+ "tf=%p: srr1 (%#lx): PSL_FP set but FPU curlwp %p is not curlwp %p!",
+ tf, tf->tf_srr1, l->l_cpu->ci_data.cpu_pcu_curlwp[PCU_FPU], l);
+
+ /* clear SRR1 status bits */
+ tf->tf_srr1 &= (PSL_USERSRR1|PSL_FP|PSL_VEC);
#ifdef ALTIVEC
/*
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.63.2.3 src/sys/arch/powerpc/oea/oea_machdep.c:1.63.2.4
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.63.2.3 Thu Nov 19 08:50:05 2015
+++ src/sys/arch/powerpc/oea/oea_machdep.c Wed May 18 08:44:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.63.2.3 2015/11/19 08:50:05 bouyer Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.63.2.4 2016/05/18 08:44:42 martin Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.63.2.3 2015/11/19 08:50:05 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.63.2.4 2016/05/18 08:44:42 martin Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
@@ -391,19 +391,16 @@ oea_init(void (*handler)(void))
/*
* Configure a PSL user mask matching this processor.
+ * Don't allow to set PSL_FP/PSL_VEC, since that will affect PCU.
*/
cpu_psluserset = PSL_EE | PSL_PR | PSL_ME | PSL_IR | PSL_DR | PSL_RI;
- cpu_pslusermod = PSL_FP | PSL_FE0 | PSL_FE1 | PSL_LE | PSL_SE | PSL_BE;
+ cpu_pslusermod = PSL_FE0 | PSL_FE1 | PSL_LE | PSL_SE | PSL_BE;
#ifdef PPC_OEA601
if (cpuvers == MPC601) {
cpu_psluserset &= PSL_601_MASK;
cpu_pslusermod &= PSL_601_MASK;
}
#endif
-#ifdef ALTIVEC
- if (cpu_altivec)
- cpu_pslusermod |= PSL_VEC;
-#endif
#ifdef PPC_HIGH_VEC
cpu_psluserset |= PSL_IP; /* XXX ok? */
#endif
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Wed May 18 08:41:42 UTC 2016
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
rename WM_TXQ_WORKING to WM_TXQ_NO_SPACE
To generate a diff of this commit:
cvs rdiff -u -r1.400 -r1.401 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.400 src/sys/dev/pci/if_wm.c:1.401
--- src/sys/dev/pci/if_wm.c:1.400 Wed May 18 07:49:34 2016
+++ src/sys/dev/pci/if_wm.c Wed May 18 08:41:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.400 2016/05/18 07:49:34 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.401 2016/05/18 08:41:42 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.400 2016/05/18 07:49:34 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.401 2016/05/18 08:41:42 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -292,7 +292,7 @@ struct wm_txqueue {
* to manage Tx H/W queue's busy flag.
*/
int txq_flags; /* flags for H/W queue, see below */
-#define WM_TXQ_WORKING 0x1
+#define WM_TXQ_NO_SPACE 0x1
/* XXX which event counter is required? */
};
@@ -6702,7 +6702,7 @@ wm_nq_start_locked(struct ifnet *ifp)
if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
return;
- if ((txq->txq_flags & WM_TXQ_WORKING) != 0)
+ if ((txq->txq_flags & WM_TXQ_NO_SPACE) != 0)
return;
sent = false;
@@ -6787,7 +6787,7 @@ wm_nq_start_locked(struct ifnet *ifp)
("%s: TX: need %d (%d) descriptors, have %d\n",
device_xname(sc->sc_dev), dmamap->dm_nsegs,
segs_needed, txq->txq_free - 1));
- txq->txq_flags |= WM_TXQ_WORKING;
+ txq->txq_flags |= WM_TXQ_NO_SPACE;
bus_dmamap_unload(sc->sc_dmat, dmamap);
WM_EVCNT_INCR(>sc_ev_txdstall);
break;
@@ -6944,7 +6944,7 @@ wm_nq_start_locked(struct ifnet *ifp)
}
if (m0 != NULL) {
- txq->txq_flags |= WM_TXQ_WORKING;
+ txq->txq_flags |= WM_TXQ_NO_SPACE;
WM_EVCNT_INCR(>sc_ev_txdrop);
DPRINTF(WM_DEBUG_TX, ("%s: TX: error after IFQ_DEQUEUE\n",
__func__));
@@ -6953,7 +6953,7 @@ wm_nq_start_locked(struct ifnet *ifp)
if (txq->txq_sfree == 0 || txq->txq_free <= 2) {
/* No more slots; notify upper layer. */
- txq->txq_flags |= WM_TXQ_WORKING;
+ txq->txq_flags |= WM_TXQ_NO_SPACE;
}
if (sent) {
@@ -6983,7 +6983,7 @@ wm_txeof(struct wm_softc *sc)
if (sc->sc_stopping)
return 0;
- txq->txq_flags &= ~WM_TXQ_WORKING;
+ txq->txq_flags &= ~WM_TXQ_NO_SPACE;
/*
* Go through the Tx list and free mbufs for those
CVS commit: src/sys/netinet6
Module Name:src
Committed By: ozaki-r
Date: Wed May 18 08:40:51 UTC 2016
Modified Files:
src/sys/netinet6: icmp6.c
Log Message:
Don't try to get outif unnecessarily from in6_selectsrc
The got outif is unused.
To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/sys/netinet6/icmp6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.185 src/sys/netinet6/icmp6.c:1.186
--- src/sys/netinet6/icmp6.c:1.185 Tue May 17 03:27:02 2016
+++ src/sys/netinet6/icmp6.c Wed May 18 08:40:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.185 2016/05/17 03:27:02 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.186 2016/05/18 08:40:51 ozaki-r Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.185 2016/05/17 03:27:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.186 2016/05/18 08:40:51 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2061,7 +2061,7 @@ icmp6_reflect(struct mbuf *m, size_t off
sockaddr_in6_init(, >ip6_dst, 0, 0, 0);
memset(, 0, sizeof(ro));
- src = in6_selectsrc(, NULL, NULL, , NULL, , );
+ src = in6_selectsrc(, NULL, NULL, , NULL, NULL, );
rtcache_free();
if (src == NULL) {
nd6log(LOG_DEBUG,
CVS commit: src/sys/arch/sparc/include
Module Name:src Committed By: nakayama Date: Wed May 18 08:16:04 UTC 2016 Modified Files: src/sys/arch/sparc/include: psl.h Log Message: Fix (unused) pstate mask bits in tstate and comment. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/sparc/include/psl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/include/psl.h diff -u src/sys/arch/sparc/include/psl.h:1.48 src/sys/arch/sparc/include/psl.h:1.49 --- src/sys/arch/sparc/include/psl.h:1.48 Sun Aug 28 22:30:09 2011 +++ src/sys/arch/sparc/include/psl.h Wed May 18 08:16:04 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.48 2011/08/28 22:30:09 mrg Exp $ */ +/* $NetBSD: psl.h,v 1.49 2016/05/18 08:16:04 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -146,14 +146,14 @@ /* * SPARC V9 TSTATE register * - * 39 32 31 24 23 18 17 8 7 5 4 0 + * 39 32 31 24 23 20 19 8 7 5 4 0 * +-+-+-++---+-+ * | CCR | ASI | - | PSTATE | - | CWP | * +-+-+-++---+-+ */ #define TSTATE_CWP 0x01f -#define TSTATE_PSTATE 0x6ff00 +#define TSTATE_PSTATE 0xfff00 #define TSTATE_PSTATE_SHIFT 8 #define TSTATE_ASI 0xff00LL #define TSTATE_ASI_SHIFT 24
CVS commit: src/sys/arch/sparc64/include
Module Name:src Committed By: nakayama Date: Wed May 18 07:59:30 UTC 2016 Modified Files: src/sys/arch/sparc64/include: psl.h Log Message: Fix (unused) pstate mask bits in tstate and comment. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc64/include/psl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/include/psl.h diff -u src/sys/arch/sparc64/include/psl.h:1.56 src/sys/arch/sparc64/include/psl.h:1.57 --- src/sys/arch/sparc64/include/psl.h:1.56 Thu Dec 25 14:02:03 2014 +++ src/sys/arch/sparc64/include/psl.h Wed May 18 07:59:30 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.56 2014/12/25 14:02:03 nakayama Exp $ */ +/* $NetBSD: psl.h,v 1.57 2016/05/18 07:59:30 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -165,14 +165,14 @@ /* * SPARC V9 TSTATE register * - * 39 32 31 24 23 18 17 8 7 5 4 0 + * 39 32 31 24 23 20 19 8 7 5 4 0 * +-+-+-++---+-+ * | CCR | ASI | - | PSTATE | - | CWP | * +-+-+-++---+-+ */ #define TSTATE_CWP 0x01f -#define TSTATE_PSTATE 0x6ff00 +#define TSTATE_PSTATE 0xfff00 #define TSTATE_PSTATE_SHIFT 8 #define TSTATE_ASI 0xff00LL #define TSTATE_ASI_SHIFT 24
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Wed May 18 07:49:34 UTC 2016
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
device drivers should not divert ifp->if_flags to manage H/W satatus.
To generate a diff of this commit:
cvs rdiff -u -r1.399 -r1.400 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.399 src/sys/dev/pci/if_wm.c:1.400
--- src/sys/dev/pci/if_wm.c:1.399 Wed May 18 06:59:59 2016
+++ src/sys/dev/pci/if_wm.c Wed May 18 07:49:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.399 2016/05/18 06:59:59 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.400 2016/05/18 07:49:34 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.399 2016/05/18 06:59:59 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.400 2016/05/18 07:49:34 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -287,6 +287,13 @@ struct wm_txqueue {
uint32_t txq_fifo_addr; /* internal address of start of FIFO */
int txq_fifo_stall; /* Tx FIFO is stalled */
+ /*
+ * NEWQUEUE devices must use not ifp->if_flags but txq->txq_flags
+ * to manage Tx H/W queue's busy flag.
+ */
+ int txq_flags; /* flags for H/W queue, see below */
+#define WM_TXQ_WORKING 0x1
+
/* XXX which event counter is required? */
};
@@ -6695,6 +6702,8 @@ wm_nq_start_locked(struct ifnet *ifp)
if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
return;
+ if ((txq->txq_flags & WM_TXQ_WORKING) != 0)
+ return;
sent = false;
@@ -6778,7 +6787,7 @@ wm_nq_start_locked(struct ifnet *ifp)
("%s: TX: need %d (%d) descriptors, have %d\n",
device_xname(sc->sc_dev), dmamap->dm_nsegs,
segs_needed, txq->txq_free - 1));
- ifp->if_flags |= IFF_OACTIVE;
+ txq->txq_flags |= WM_TXQ_WORKING;
bus_dmamap_unload(sc->sc_dmat, dmamap);
WM_EVCNT_INCR(>sc_ev_txdstall);
break;
@@ -6935,7 +6944,7 @@ wm_nq_start_locked(struct ifnet *ifp)
}
if (m0 != NULL) {
- ifp->if_flags |= IFF_OACTIVE;
+ txq->txq_flags |= WM_TXQ_WORKING;
WM_EVCNT_INCR(>sc_ev_txdrop);
DPRINTF(WM_DEBUG_TX, ("%s: TX: error after IFQ_DEQUEUE\n",
__func__));
@@ -6944,7 +6953,7 @@ wm_nq_start_locked(struct ifnet *ifp)
if (txq->txq_sfree == 0 || txq->txq_free <= 2) {
/* No more slots; notify upper layer. */
- ifp->if_flags |= IFF_OACTIVE;
+ txq->txq_flags |= WM_TXQ_WORKING;
}
if (sent) {
@@ -6974,7 +6983,7 @@ wm_txeof(struct wm_softc *sc)
if (sc->sc_stopping)
return 0;
- ifp->if_flags &= ~IFF_OACTIVE;
+ txq->txq_flags &= ~WM_TXQ_WORKING;
/*
* Go through the Tx list and free mbufs for those
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Wed May 18 06:59:59 UTC 2016
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
refactor: eliminate "txq->txq_descs_size", use WM_TXDESCS_SIZE instead.
To generate a diff of this commit:
cvs rdiff -u -r1.398 -r1.399 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.398 src/sys/dev/pci/if_wm.c:1.399
--- src/sys/dev/pci/if_wm.c:1.398 Wed May 18 06:55:51 2016
+++ src/sys/dev/pci/if_wm.c Wed May 18 06:59:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.398 2016/05/18 06:55:51 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.399 2016/05/18 06:59:59 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.398 2016/05/18 06:55:51 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.399 2016/05/18 06:59:59 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -268,7 +268,6 @@ struct wm_txqueue {
bus_dmamap_t txq_desc_dmamap; /* control data DMA map */
bus_dma_segment_t txq_desc_seg; /* control data segment */
int txq_desc_rseg; /* real number of control segment */
- size_t txq_descs_size; /* control data size */
#define txq_desc_dma txq_desc_dmamap->dm_segs[0].ds_addr
#define txq_descs txq_descs_u->sctxu_txdescs
#define txq_nq_descs txq_descs_u->sctxu_nq_txdescs
@@ -5357,19 +5356,16 @@ wm_alloc_tx_descs(struct wm_softc *sc, s
* memory. So must Rx descriptors. We simplify by allocating
* both sets within the same 4G segment.
*/
- if (sc->sc_type < WM_T_82544) {
+ if (sc->sc_type < WM_T_82544)
WM_NTXDESC(txq) = WM_NTXDESC_82542;
- txq->txq_descs_size = sizeof(wiseman_txdesc_t) *WM_NTXDESC(txq);
- } else {
+ else
WM_NTXDESC(txq) = WM_NTXDESC_82544;
- txq->txq_descs_size = sizeof(txdescs_t);
- }
if ((sc->sc_flags & WM_F_NEWQUEUE) != 0)
txq->txq_descsize = sizeof(nq_txdesc_t);
else
txq->txq_descsize = sizeof(wiseman_txdesc_t);
- if ((error = bus_dmamem_alloc(sc->sc_dmat, txq->txq_descs_size,
+ if ((error = bus_dmamem_alloc(sc->sc_dmat, WM_TXDESCS_SIZE(txq),
PAGE_SIZE, (bus_size_t) 0x1ULL, >txq_desc_seg,
1, >txq_desc_rseg, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
@@ -5379,15 +5375,15 @@ wm_alloc_tx_descs(struct wm_softc *sc, s
}
if ((error = bus_dmamem_map(sc->sc_dmat, >txq_desc_seg,
- txq->txq_desc_rseg, txq->txq_descs_size,
+ txq->txq_desc_rseg, WM_TXDESCS_SIZE(txq),
(void **)>txq_descs_u, BUS_DMA_COHERENT)) != 0) {
aprint_error_dev(sc->sc_dev,
"unable to map TX control data, error = %d\n", error);
goto fail_1;
}
- if ((error = bus_dmamap_create(sc->sc_dmat, txq->txq_descs_size, 1,
- txq->txq_descs_size, 0, 0, >txq_desc_dmamap)) != 0) {
+ if ((error = bus_dmamap_create(sc->sc_dmat, WM_TXDESCS_SIZE(txq), 1,
+ WM_TXDESCS_SIZE(txq), 0, 0, >txq_desc_dmamap)) != 0) {
aprint_error_dev(sc->sc_dev,
"unable to create TX control data DMA map, error = %d\n",
error);
@@ -5395,7 +5391,7 @@ wm_alloc_tx_descs(struct wm_softc *sc, s
}
if ((error = bus_dmamap_load(sc->sc_dmat, txq->txq_desc_dmamap,
- txq->txq_descs_u, txq->txq_descs_size, NULL, 0)) != 0) {
+ txq->txq_descs_u, WM_TXDESCS_SIZE(txq), NULL, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
"unable to load TX control data DMA map, error = %d\n",
error);
@@ -5408,7 +5404,7 @@ wm_alloc_tx_descs(struct wm_softc *sc, s
bus_dmamap_destroy(sc->sc_dmat, txq->txq_desc_dmamap);
fail_2:
bus_dmamem_unmap(sc->sc_dmat, (void *)txq->txq_descs_u,
- txq->txq_descs_size);
+ WM_TXDESCS_SIZE(txq));
fail_1:
bus_dmamem_free(sc->sc_dmat, >txq_desc_seg, txq->txq_desc_rseg);
fail_0:
@@ -5422,7 +5418,7 @@ wm_free_tx_descs(struct wm_softc *sc, st
bus_dmamap_unload(sc->sc_dmat, txq->txq_desc_dmamap);
bus_dmamap_destroy(sc->sc_dmat, txq->txq_desc_dmamap);
bus_dmamem_unmap(sc->sc_dmat, (void *)txq->txq_descs_u,
- txq->txq_descs_size);
+ WM_TXDESCS_SIZE(txq));
bus_dmamem_free(sc->sc_dmat, >txq_desc_seg, txq->txq_desc_rseg);
}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Wed May 18 06:55:52 UTC 2016
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
fix unmatched dma sync size for NEWQUEUE. This bug would have caused
wm_nq_tx_offload() not to work.
To generate a diff of this commit:
cvs rdiff -u -r1.397 -r1.398 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.397 src/sys/dev/pci/if_wm.c:1.398
--- src/sys/dev/pci/if_wm.c:1.397 Wed May 11 04:37:09 2016
+++ src/sys/dev/pci/if_wm.c Wed May 18 06:55:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.397 2016/05/11 04:37:09 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.398 2016/05/18 06:55:51 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.397 2016/05/11 04:37:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.398 2016/05/18 06:55:51 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -188,7 +188,7 @@ int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX
#define WM_NTXDESC_82544 4096
#define WM_NTXDESC(txq) ((txq)->txq_ndesc)
#define WM_NTXDESC_MASK(txq) (WM_NTXDESC(txq) - 1)
-#define WM_TXDESCSIZE(txq) (WM_NTXDESC(txq) * sizeof(wiseman_txdesc_t))
+#define WM_TXDESCS_SIZE(txq) (WM_NTXDESC(txq) * (txq)->txq_descsize)
#define WM_NEXTTX(txq, x) (((x) + 1) & WM_NTXDESC_MASK(txq))
#define WM_NEXTTXS(txq, x) (((x) + 1) & WM_TXQUEUELEN_MASK(txq))
@@ -210,7 +210,7 @@ typedef union txdescs {
nq_txdesc_t sctxu_nq_txdescs[WM_NTXDESC_82544];
} txdescs_t;
-#define WM_CDTXOFF(x) (sizeof(wiseman_txdesc_t) * x)
+#define WM_CDTXOFF(txq, x) ((txq)->txq_descsize * (x))
#define WM_CDRXOFF(x) (sizeof(wiseman_rxdesc_t) * x)
/*
@@ -263,11 +263,12 @@ struct wm_txqueue {
/* TX control data structures. */
int txq_ndesc; /* must be a power of two */
+ size_t txq_descsize; /* a tx descriptor size */
txdescs_t *txq_descs_u;
bus_dmamap_t txq_desc_dmamap; /* control data DMA map */
bus_dma_segment_t txq_desc_seg; /* control data segment */
int txq_desc_rseg; /* real number of control segment */
- size_t txq_desc_size; /* control data size */
+ size_t txq_descs_size; /* control data size */
#define txq_desc_dma txq_desc_dmamap->dm_segs[0].ds_addr
#define txq_descs txq_descs_u->sctxu_txdescs
#define txq_nq_descs txq_descs_u->sctxu_nq_txdescs
@@ -509,7 +510,7 @@ do { \
bus_space_write_2((sc)->sc_flasht, (sc)->sc_flashh, \
(reg) + sc->sc_flashreg_offset, (data))
-#define WM_CDTXADDR(txq, x) ((txq)->txq_desc_dma + WM_CDTXOFF((x)))
+#define WM_CDTXADDR(txq, x) ((txq)->txq_desc_dma + WM_CDTXOFF((txq), (x)))
#define WM_CDRXADDR(rxq, x) ((rxq)->rxq_desc_dma + WM_CDRXOFF((x)))
#define WM_CDTXADDR_LO(txq, x) (WM_CDTXADDR((txq), (x)) & 0xU)
@@ -1384,7 +1385,7 @@ wm_cdtxsync(struct wm_txqueue *txq, int
/* If it will wrap around, sync to the end of the ring. */
if ((start + num) > WM_NTXDESC(txq)) {
bus_dmamap_sync(sc->sc_dmat, txq->txq_desc_dmamap,
- WM_CDTXOFF(start), sizeof(wiseman_txdesc_t) *
+ WM_CDTXOFF(txq, start), txq->txq_descsize *
(WM_NTXDESC(txq) - start), ops);
num -= (WM_NTXDESC(txq) - start);
start = 0;
@@ -1392,7 +1393,7 @@ wm_cdtxsync(struct wm_txqueue *txq, int
/* Now sync whatever is left. */
bus_dmamap_sync(sc->sc_dmat, txq->txq_desc_dmamap,
- WM_CDTXOFF(start), sizeof(wiseman_txdesc_t) * num, ops);
+ WM_CDTXOFF(txq, start), txq->txq_descsize * num, ops);
}
static inline void
@@ -5358,13 +5359,17 @@ wm_alloc_tx_descs(struct wm_softc *sc, s
*/
if (sc->sc_type < WM_T_82544) {
WM_NTXDESC(txq) = WM_NTXDESC_82542;
- txq->txq_desc_size = sizeof(wiseman_txdesc_t) *WM_NTXDESC(txq);
+ txq->txq_descs_size = sizeof(wiseman_txdesc_t) *WM_NTXDESC(txq);
} else {
WM_NTXDESC(txq) = WM_NTXDESC_82544;
- txq->txq_desc_size = sizeof(txdescs_t);
+ txq->txq_descs_size = sizeof(txdescs_t);
}
+ if ((sc->sc_flags & WM_F_NEWQUEUE) != 0)
+ txq->txq_descsize = sizeof(nq_txdesc_t);
+ else
+ txq->txq_descsize = sizeof(wiseman_txdesc_t);
- if ((error = bus_dmamem_alloc(sc->sc_dmat, txq->txq_desc_size,
+ if ((error = bus_dmamem_alloc(sc->sc_dmat, txq->txq_descs_size,
PAGE_SIZE, (bus_size_t) 0x1ULL, >txq_desc_seg,
1, >txq_desc_rseg, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
@@ -5374,15 +5379,15 @@ wm_alloc_tx_descs(struct wm_softc *sc, s
}
if ((error = bus_dmamem_map(sc->sc_dmat, >txq_desc_seg,
- txq->txq_desc_rseg, txq->txq_desc_size,
+ txq->txq_desc_rseg, txq->txq_descs_size,
(void **)>txq_descs_u, BUS_DMA_COHERENT)) != 0) {
aprint_error_dev(sc->sc_dev,
"unable to map TX control data, error = %d\n", error);
goto fail_1;
}
- if ((error = bus_dmamap_create(sc->sc_dmat, txq->txq_desc_size, 1,
-
