CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Thu Apr 20 06:47:49 UTC 2017 Modified Files: src/doc [netbsd-7]: 3RDPARTY src/external/bsd/ntp [netbsd-7]: importdate src/external/bsd/ntp/bin/ntpd [netbsd-7]: ntp.keys.5 src/external/bsd/ntp/dist [netbsd-7]: COPYRIGHT ChangeLog CommitLog Makefile.in NEWS aclocal.m4 config.h.in configure configure.ac packageinfo.sh src/external/bsd/ntp/dist/adjtimed [netbsd-7]: Makefile.am Makefile.in src/external/bsd/ntp/dist/clockstuff [netbsd-7]: Makefile.am Makefile.in src/external/bsd/ntp/dist/html [netbsd-7]: copyright.html src/external/bsd/ntp/dist/include [netbsd-7]: Makefile.in libssl_compat.h ntp_crypto.h ntp_fp.h ntp_md5.h ntp_stdlib.h ntpd.h ssl_applink.c src/external/bsd/ntp/dist/include/isc [netbsd-7]: Makefile.in src/external/bsd/ntp/dist/kernel [netbsd-7]: Makefile.in src/external/bsd/ntp/dist/kernel/sys [netbsd-7]: Makefile.in src/external/bsd/ntp/dist/lib/isc [netbsd-7]: inet_pton.c src/external/bsd/ntp/dist/libntp [netbsd-7]: Makefile.am Makefile.in a_md5encrypt.c audio.c authkeys.c emalloc.c libssl_compat.c ntp_intres.c recvbuff.c ssl_init.c statestr.c work_fork.c src/external/bsd/ntp/dist/libparse [netbsd-7]: Makefile.am Makefile.in clk_trimtsip.c gpstolfp.c src/external/bsd/ntp/dist/ntpd [netbsd-7]: Makefile.am Makefile.in invoke-ntp.conf.texi invoke-ntp.keys.texi invoke-ntpd.texi ntp.conf.5man ntp.conf.5mdoc ntp.conf.html ntp.conf.man.in ntp.conf.mdoc.in ntp.keys.5man ntp.keys.5mdoc ntp.keys.html ntp.keys.man.in ntp.keys.mdoc.in ntp_config.c ntp_control.c ntp_crypto.c ntp_io.c ntp_loopfilter.c ntp_parser.y ntp_peer.c ntp_proto.c ntp_restrict.c ntp_scanner.c ntpd-opts.c ntpd-opts.h ntpd.1ntpdman ntpd.1ntpdmdoc ntpd.c ntpd.html ntpd.man.in ntpd.mdoc.in refclock_datum.c refclock_gpsdjson.c refclock_jjy.c refclock_mx4200.c refclock_nmea.c refclock_oncore.c refclock_parse.c src/external/bsd/ntp/dist/ntpdate [netbsd-7]: Makefile.am Makefile.in ntpdate.c src/external/bsd/ntp/dist/ntpdc [netbsd-7]: Makefile.am Makefile.in invoke-ntpdc.texi ntpdc-opts.c ntpdc-opts.h ntpdc.1ntpdcman ntpdc.1ntpdcmdoc ntpdc.c ntpdc.html ntpdc.man.in ntpdc.mdoc.in ntpdc_ops.c src/external/bsd/ntp/dist/ntpq [netbsd-7]: Makefile.am Makefile.in invoke-ntpq.texi libntpq.c ntpq-opts.c ntpq-opts.h ntpq-subs.c ntpq.1ntpqman ntpq.1ntpqmdoc ntpq.c ntpq.html ntpq.man.in ntpq.mdoc.in src/external/bsd/ntp/dist/ntpsnmpd [netbsd-7]: Makefile.am Makefile.in invoke-ntpsnmpd.texi ntpsnmpd-opts.c ntpsnmpd-opts.h ntpsnmpd.1ntpsnmpdman ntpsnmpd.1ntpsnmpdmdoc ntpsnmpd.html ntpsnmpd.man.in ntpsnmpd.mdoc.in src/external/bsd/ntp/dist/parseutil [netbsd-7]: Makefile.am Makefile.in src/external/bsd/ntp/dist/scripts [netbsd-7]: Makefile.in invoke-plot_summary.texi invoke-summary.texi plot_summary-opts plot_summary.1plot_summaryman plot_summary.1plot_summarymdoc plot_summary.html plot_summary.man.in plot_summary.mdoc.in summary-opts summary.1summaryman summary.1summarymdoc summary.html summary.man.in summary.mdoc.in src/external/bsd/ntp/dist/scripts/build [netbsd-7]: Makefile.in src/external/bsd/ntp/dist/scripts/calc_tickadj [netbsd-7]: Makefile.in calc_tickadj.1calc_tickadjman calc_tickadj.1calc_tickadjmdoc calc_tickadj.html calc_tickadj.man.in calc_tickadj.mdoc.in invoke-calc_tickadj.texi src/external/bsd/ntp/dist/scripts/lib [netbsd-7]: Makefile.in src/external/bsd/ntp/dist/scripts/ntp-wait [netbsd-7]: Makefile.in invoke-ntp-wait.texi ntp-wait-opts ntp-wait.1ntp-waitman ntp-wait.1ntp-waitmdoc ntp-wait.html ntp-wait.man.in ntp-wait.mdoc.in src/external/bsd/ntp/dist/scripts/ntpsweep [netbsd-7]: Makefile.in invoke-ntpsweep.texi ntpsweep-opts ntpsweep.1ntpsweepman ntpsweep.1ntpsweepmdoc ntpsweep.html ntpsweep.man.in ntpsweep.mdoc.in src/external/bsd/ntp/dist/scripts/ntptrace [netbsd-7]: Makefile.in invoke-ntptrace.texi ntptrace-opts ntptrace.1ntptraceman ntptrace.1ntptracemdoc ntptrace.html ntptrace.man.in ntptrace.mdoc.in src/external/bsd/ntp/dist/scripts/update-leap [netbsd-7]: Makefile.in invoke-update-leap.texi update-leap-opts update-leap.1update-leapman update-leap.1update-leapmdoc update-leap.html update-leap.man.in update-leap.mdoc.in src/external/bsd/ntp/dist/sntp [netbsd-7]: COPYRIGHT Makefile.am
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: snj Date: Thu Apr 20 06:46:16 UTC 2017 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.1 Log Message: 1405 To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-7.1.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.1 diff -u src/doc/CHANGES-7.1.1:1.1.2.4 src/doc/CHANGES-7.1.1:1.1.2.5 --- src/doc/CHANGES-7.1.1:1.1.2.4 Tue Apr 11 16:49:54 2017 +++ src/doc/CHANGES-7.1.1 Thu Apr 20 06:46:16 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.1,v 1.1.2.4 2017/04/11 16:49:54 martin Exp $ +# $NetBSD: CHANGES-7.1.1,v 1.1.2.5 2017/04/20 06:46:16 snj Exp $ A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1 release: @@ -205,3 +205,283 @@ etc/ssh/ssh_known_hosts1.10 Update ssh keys of various NetBSD.org machines. [spz, ticket #1393] +doc/3RDPARTY 1.1431 +external/bsd/ntp/bin/ntpd/ntp.keys.5up to 1.2 +external/bsd/ntp/dist/COPYRIGHT up to 1.1.1.8 +external/bsd/ntp/dist/ChangeLog up to 1.1.1.12 +external/bsd/ntp/dist/CommitLog up to 1.1.1.12 +external/bsd/ntp/dist/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/NEWS up to 1.1.1.12 +external/bsd/ntp/dist/aclocal.m4up to 1.1.1.10 +external/bsd/ntp/dist/adjtimed/Makefile.am up to 1.1.1.4 +external/bsd/ntp/dist/adjtimed/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/clockstuff/Makefile.amup to 1.1.1.3 +external/bsd/ntp/dist/clockstuff/Makefile.inup to 1.1.1.10 +external/bsd/ntp/dist/config.h.in up to 1.1.1.9 +external/bsd/ntp/dist/configure up to 1.1.1.12 +external/bsd/ntp/dist/configure.ac up to 1.1.1.10 +external/bsd/ntp/dist/html/copyright.html up to 1.1.1.6 +external/bsd/ntp/dist/include/Makefile.in up to 1.1.1.11 +external/bsd/ntp/dist/include/isc/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/include/libssl_compat.h up to 1.1.1.2 +external/bsd/ntp/dist/include/ntp_crypto.h up to 1.5 +external/bsd/ntp/dist/include/ntp_fp.h up to 1.9 +external/bsd/ntp/dist/include/ntp_md5.h up to 1.7 +external/bsd/ntp/dist/include/ntp_stdlib.h up to 1.14 +external/bsd/ntp/dist/include/ntpd.hup to 1.10 +external/bsd/ntp/dist/include/ssl_applink.c up to 1.5 +external/bsd/ntp/dist/kernel/Makefile.inup to 1.1.1.10 +external/bsd/ntp/dist/kernel/sys/Makefile.inup to 1.1.1.10 +external/bsd/ntp/dist/lib/isc/inet_pton.c up to 1.8 +external/bsd/ntp/dist/libntp/Makefile.amup to 1.1.1.8 +external/bsd/ntp/dist/libntp/Makefile.inup to 1.1.1.11 +external/bsd/ntp/dist/libntp/a_md5encrypt.c up to 1.8 +external/bsd/ntp/dist/libntp/audio.cup to 1.12 +external/bsd/ntp/dist/libntp/authkeys.c up to 1.11 +external/bsd/ntp/dist/libntp/emalloc.c up to 1.8 +external/bsd/ntp/dist/libntp/libssl_compat.cup to 1.1.1.2 +external/bsd/ntp/dist/libntp/ntp_intres.c up to 1.11 +external/bsd/ntp/dist/libntp/recvbuff.c up to 1.7 +external/bsd/ntp/dist/libntp/ssl_init.c up to 1.10 +external/bsd/ntp/dist/libntp/statestr.c up to 1.6 +external/bsd/ntp/dist/libntp/work_fork.cup to 1.11 +external/bsd/ntp/dist/libparse/Makefile.am up to 1.1.1.5 +external/bsd/ntp/dist/libparse/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/libparse/clk_trimtsip.c up to 1.6 +external/bsd/ntp/dist/libparse/gpstolfp.c up to 1.6 +external/bsd/ntp/dist/ntpd/Makefile.am up to 1.1.1.8 +external/bsd/ntp/dist/ntpd/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/invoke-ntpd.texi up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.5manup to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.htmlup to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.man.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.5manup to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.htmlup to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.man.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp_config.c up to 1.17 +external/bsd/ntp/dist/ntpd/ntp_control.cup to 1.19 +external/bsd/ntp/dist/ntpd/ntp_crypto.c up to 1.14 +external/bsd/ntp/dist/ntpd/ntp_io.c up to 1.25 +external/bsd/ntp/dist/ntpd/ntp_loopfilter.c up to 1.11 +external/bsd/ntp/dist/ntpd/ntp_parser.y up to 1.16 +external/bsd/ntp/dist/ntpd/ntp_peer.c
CVS commit: [netbsd-7-1] src
Module Name:src Committed By: snj Date: Thu Apr 20 06:45:21 UTC 2017 Modified Files: src/doc [netbsd-7-1]: 3RDPARTY src/external/bsd/ntp [netbsd-7-1]: importdate src/external/bsd/ntp/bin/ntpd [netbsd-7-1]: ntp.keys.5 src/external/bsd/ntp/dist [netbsd-7-1]: COPYRIGHT ChangeLog CommitLog Makefile.in NEWS aclocal.m4 config.h.in configure configure.ac packageinfo.sh src/external/bsd/ntp/dist/adjtimed [netbsd-7-1]: Makefile.am Makefile.in src/external/bsd/ntp/dist/clockstuff [netbsd-7-1]: Makefile.am Makefile.in src/external/bsd/ntp/dist/html [netbsd-7-1]: copyright.html src/external/bsd/ntp/dist/include [netbsd-7-1]: Makefile.in libssl_compat.h ntp_crypto.h ntp_fp.h ntp_md5.h ntp_stdlib.h ntpd.h ssl_applink.c src/external/bsd/ntp/dist/include/isc [netbsd-7-1]: Makefile.in src/external/bsd/ntp/dist/kernel [netbsd-7-1]: Makefile.in src/external/bsd/ntp/dist/kernel/sys [netbsd-7-1]: Makefile.in src/external/bsd/ntp/dist/lib/isc [netbsd-7-1]: inet_pton.c src/external/bsd/ntp/dist/libntp [netbsd-7-1]: Makefile.am Makefile.in a_md5encrypt.c audio.c authkeys.c emalloc.c libssl_compat.c ntp_intres.c recvbuff.c ssl_init.c statestr.c work_fork.c src/external/bsd/ntp/dist/libparse [netbsd-7-1]: Makefile.am Makefile.in clk_trimtsip.c gpstolfp.c src/external/bsd/ntp/dist/ntpd [netbsd-7-1]: Makefile.am Makefile.in invoke-ntp.conf.texi invoke-ntp.keys.texi invoke-ntpd.texi ntp.conf.5man ntp.conf.5mdoc ntp.conf.html ntp.conf.man.in ntp.conf.mdoc.in ntp.keys.5man ntp.keys.5mdoc ntp.keys.html ntp.keys.man.in ntp.keys.mdoc.in ntp_config.c ntp_control.c ntp_crypto.c ntp_io.c ntp_loopfilter.c ntp_parser.y ntp_peer.c ntp_proto.c ntp_restrict.c ntp_scanner.c ntpd-opts.c ntpd-opts.h ntpd.1ntpdman ntpd.1ntpdmdoc ntpd.c ntpd.html ntpd.man.in ntpd.mdoc.in refclock_datum.c refclock_gpsdjson.c refclock_jjy.c refclock_mx4200.c refclock_nmea.c refclock_oncore.c refclock_parse.c src/external/bsd/ntp/dist/ntpdate [netbsd-7-1]: Makefile.am Makefile.in ntpdate.c src/external/bsd/ntp/dist/ntpdc [netbsd-7-1]: Makefile.am Makefile.in invoke-ntpdc.texi ntpdc-opts.c ntpdc-opts.h ntpdc.1ntpdcman ntpdc.1ntpdcmdoc ntpdc.c ntpdc.html ntpdc.man.in ntpdc.mdoc.in ntpdc_ops.c src/external/bsd/ntp/dist/ntpq [netbsd-7-1]: Makefile.am Makefile.in invoke-ntpq.texi libntpq.c ntpq-opts.c ntpq-opts.h ntpq-subs.c ntpq.1ntpqman ntpq.1ntpqmdoc ntpq.c ntpq.html ntpq.man.in ntpq.mdoc.in src/external/bsd/ntp/dist/ntpsnmpd [netbsd-7-1]: Makefile.am Makefile.in invoke-ntpsnmpd.texi ntpsnmpd-opts.c ntpsnmpd-opts.h ntpsnmpd.1ntpsnmpdman ntpsnmpd.1ntpsnmpdmdoc ntpsnmpd.html ntpsnmpd.man.in ntpsnmpd.mdoc.in src/external/bsd/ntp/dist/parseutil [netbsd-7-1]: Makefile.am Makefile.in src/external/bsd/ntp/dist/scripts [netbsd-7-1]: Makefile.in invoke-plot_summary.texi invoke-summary.texi plot_summary-opts plot_summary.1plot_summaryman plot_summary.1plot_summarymdoc plot_summary.html plot_summary.man.in plot_summary.mdoc.in summary-opts summary.1summaryman summary.1summarymdoc summary.html summary.man.in summary.mdoc.in src/external/bsd/ntp/dist/scripts/build [netbsd-7-1]: Makefile.in src/external/bsd/ntp/dist/scripts/calc_tickadj [netbsd-7-1]: Makefile.in calc_tickadj.1calc_tickadjman calc_tickadj.1calc_tickadjmdoc calc_tickadj.html calc_tickadj.man.in calc_tickadj.mdoc.in invoke-calc_tickadj.texi src/external/bsd/ntp/dist/scripts/lib [netbsd-7-1]: Makefile.in src/external/bsd/ntp/dist/scripts/ntp-wait [netbsd-7-1]: Makefile.in invoke-ntp-wait.texi ntp-wait-opts ntp-wait.1ntp-waitman ntp-wait.1ntp-waitmdoc ntp-wait.html ntp-wait.man.in ntp-wait.mdoc.in src/external/bsd/ntp/dist/scripts/ntpsweep [netbsd-7-1]: Makefile.in invoke-ntpsweep.texi ntpsweep-opts ntpsweep.1ntpsweepman ntpsweep.1ntpsweepmdoc ntpsweep.html ntpsweep.man.in ntpsweep.mdoc.in src/external/bsd/ntp/dist/scripts/ntptrace [netbsd-7-1]: Makefile.in invoke-ntptrace.texi ntptrace-opts ntptrace.1ntptraceman ntptrace.1ntptracemdoc ntptrace.html ntptrace.man.in ntptrace.mdoc.in src/external/bsd/ntp/dist/scripts/update-leap [netbsd-7-1]: Makefile.in invoke-update-leap.texi update-leap-opts update-leap.1update-leapman update-leap.1update-leapmdoc update-leap.html update-leap.man.in update-leap.mdoc.
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: snj Date: Thu Apr 20 06:43:48 UTC 2017 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: 1405 To generate a diff of this commit: cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-7.0.3 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.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.37 src/doc/CHANGES-7.0.3:1.1.2.38 --- src/doc/CHANGES-7.0.3:1.1.2.37 Tue Apr 11 16:48:34 2017 +++ src/doc/CHANGES-7.0.3 Thu Apr 20 06:43:48 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.37 2017/04/11 16:48:34 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.38 2017/04/20 06:43:48 snj Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -1512,3 +1512,283 @@ etc/ssh/ssh_known_hosts1.10 Update ssh keys of various NetBSD.org machines. [spz, ticket #1393] +doc/3RDPARTY 1.1431 +external/bsd/ntp/bin/ntpd/ntp.keys.5up to 1.2 +external/bsd/ntp/dist/COPYRIGHT up to 1.1.1.8 +external/bsd/ntp/dist/ChangeLog up to 1.1.1.12 +external/bsd/ntp/dist/CommitLog up to 1.1.1.12 +external/bsd/ntp/dist/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/NEWS up to 1.1.1.12 +external/bsd/ntp/dist/aclocal.m4up to 1.1.1.10 +external/bsd/ntp/dist/adjtimed/Makefile.am up to 1.1.1.4 +external/bsd/ntp/dist/adjtimed/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/clockstuff/Makefile.amup to 1.1.1.3 +external/bsd/ntp/dist/clockstuff/Makefile.inup to 1.1.1.10 +external/bsd/ntp/dist/config.h.in up to 1.1.1.9 +external/bsd/ntp/dist/configure up to 1.1.1.12 +external/bsd/ntp/dist/configure.ac up to 1.1.1.10 +external/bsd/ntp/dist/html/copyright.html up to 1.1.1.6 +external/bsd/ntp/dist/include/Makefile.in up to 1.1.1.11 +external/bsd/ntp/dist/include/isc/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/include/libssl_compat.h up to 1.1.1.2 +external/bsd/ntp/dist/include/ntp_crypto.h up to 1.5 +external/bsd/ntp/dist/include/ntp_fp.h up to 1.9 +external/bsd/ntp/dist/include/ntp_md5.h up to 1.7 +external/bsd/ntp/dist/include/ntp_stdlib.h up to 1.14 +external/bsd/ntp/dist/include/ntpd.hup to 1.10 +external/bsd/ntp/dist/include/ssl_applink.c up to 1.5 +external/bsd/ntp/dist/kernel/Makefile.inup to 1.1.1.10 +external/bsd/ntp/dist/kernel/sys/Makefile.inup to 1.1.1.10 +external/bsd/ntp/dist/lib/isc/inet_pton.c up to 1.8 +external/bsd/ntp/dist/libntp/Makefile.amup to 1.1.1.8 +external/bsd/ntp/dist/libntp/Makefile.inup to 1.1.1.11 +external/bsd/ntp/dist/libntp/a_md5encrypt.c up to 1.8 +external/bsd/ntp/dist/libntp/audio.cup to 1.12 +external/bsd/ntp/dist/libntp/authkeys.c up to 1.11 +external/bsd/ntp/dist/libntp/emalloc.c up to 1.8 +external/bsd/ntp/dist/libntp/libssl_compat.cup to 1.1.1.2 +external/bsd/ntp/dist/libntp/ntp_intres.c up to 1.11 +external/bsd/ntp/dist/libntp/recvbuff.c up to 1.7 +external/bsd/ntp/dist/libntp/ssl_init.c up to 1.10 +external/bsd/ntp/dist/libntp/statestr.c up to 1.6 +external/bsd/ntp/dist/libntp/work_fork.cup to 1.11 +external/bsd/ntp/dist/libparse/Makefile.am up to 1.1.1.5 +external/bsd/ntp/dist/libparse/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/libparse/clk_trimtsip.c up to 1.6 +external/bsd/ntp/dist/libparse/gpstolfp.c up to 1.6 +external/bsd/ntp/dist/ntpd/Makefile.am up to 1.1.1.8 +external/bsd/ntp/dist/ntpd/Makefile.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/invoke-ntpd.texi up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.5manup to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.htmlup to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.man.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.5manup to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.htmlup to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.man.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in up to 1.1.1.10 +external/bsd/ntp/dist/ntpd/ntp_config.c up to 1.17 +external/bsd/ntp/dist/ntpd/ntp_control.cup to 1.19 +external/bsd/ntp/dist/ntpd/ntp_crypto.c up to 1.14 +external/bsd/ntp/dist/ntpd/ntp_io.c up to 1.25 +external/bsd/ntp/dist/ntpd/ntp_loopfilter.c up to 1.11 +external/bsd/ntp/dist/ntpd/ntp_parser.y up to 1.16 +external/bsd/ntp/dist/ntpd
CVS commit: [netbsd-7-0] src
Module Name:src Committed By: snj Date: Thu Apr 20 06:42:26 UTC 2017 Modified Files: src/doc [netbsd-7-0]: 3RDPARTY src/external/bsd/ntp [netbsd-7-0]: importdate src/external/bsd/ntp/bin/ntpd [netbsd-7-0]: ntp.keys.5 src/external/bsd/ntp/dist [netbsd-7-0]: COPYRIGHT ChangeLog CommitLog Makefile.in NEWS aclocal.m4 config.h.in configure configure.ac packageinfo.sh src/external/bsd/ntp/dist/adjtimed [netbsd-7-0]: Makefile.am Makefile.in src/external/bsd/ntp/dist/clockstuff [netbsd-7-0]: Makefile.am Makefile.in src/external/bsd/ntp/dist/html [netbsd-7-0]: copyright.html src/external/bsd/ntp/dist/include [netbsd-7-0]: Makefile.in libssl_compat.h ntp_crypto.h ntp_fp.h ntp_md5.h ntp_stdlib.h ntpd.h ssl_applink.c src/external/bsd/ntp/dist/include/isc [netbsd-7-0]: Makefile.in src/external/bsd/ntp/dist/kernel [netbsd-7-0]: Makefile.in src/external/bsd/ntp/dist/kernel/sys [netbsd-7-0]: Makefile.in src/external/bsd/ntp/dist/lib/isc [netbsd-7-0]: inet_pton.c src/external/bsd/ntp/dist/libntp [netbsd-7-0]: Makefile.am Makefile.in a_md5encrypt.c audio.c authkeys.c emalloc.c libssl_compat.c ntp_intres.c recvbuff.c ssl_init.c statestr.c work_fork.c src/external/bsd/ntp/dist/libparse [netbsd-7-0]: Makefile.am Makefile.in clk_trimtsip.c gpstolfp.c src/external/bsd/ntp/dist/ntpd [netbsd-7-0]: Makefile.am Makefile.in invoke-ntp.conf.texi invoke-ntp.keys.texi invoke-ntpd.texi ntp.conf.5man ntp.conf.5mdoc ntp.conf.html ntp.conf.man.in ntp.conf.mdoc.in ntp.keys.5man ntp.keys.5mdoc ntp.keys.html ntp.keys.man.in ntp.keys.mdoc.in ntp_config.c ntp_control.c ntp_crypto.c ntp_io.c ntp_loopfilter.c ntp_parser.y ntp_peer.c ntp_proto.c ntp_restrict.c ntp_scanner.c ntpd-opts.c ntpd-opts.h ntpd.1ntpdman ntpd.1ntpdmdoc ntpd.c ntpd.html ntpd.man.in ntpd.mdoc.in refclock_datum.c refclock_gpsdjson.c refclock_jjy.c refclock_mx4200.c refclock_nmea.c refclock_oncore.c refclock_parse.c src/external/bsd/ntp/dist/ntpdate [netbsd-7-0]: Makefile.am Makefile.in ntpdate.c src/external/bsd/ntp/dist/ntpdc [netbsd-7-0]: Makefile.am Makefile.in invoke-ntpdc.texi ntpdc-opts.c ntpdc-opts.h ntpdc.1ntpdcman ntpdc.1ntpdcmdoc ntpdc.c ntpdc.html ntpdc.man.in ntpdc.mdoc.in ntpdc_ops.c src/external/bsd/ntp/dist/ntpq [netbsd-7-0]: Makefile.am Makefile.in invoke-ntpq.texi libntpq.c ntpq-opts.c ntpq-opts.h ntpq-subs.c ntpq.1ntpqman ntpq.1ntpqmdoc ntpq.c ntpq.html ntpq.man.in ntpq.mdoc.in src/external/bsd/ntp/dist/ntpsnmpd [netbsd-7-0]: Makefile.am Makefile.in invoke-ntpsnmpd.texi ntpsnmpd-opts.c ntpsnmpd-opts.h ntpsnmpd.1ntpsnmpdman ntpsnmpd.1ntpsnmpdmdoc ntpsnmpd.html ntpsnmpd.man.in ntpsnmpd.mdoc.in src/external/bsd/ntp/dist/parseutil [netbsd-7-0]: Makefile.am Makefile.in src/external/bsd/ntp/dist/scripts [netbsd-7-0]: Makefile.in invoke-plot_summary.texi invoke-summary.texi plot_summary-opts plot_summary.1plot_summaryman plot_summary.1plot_summarymdoc plot_summary.html plot_summary.man.in plot_summary.mdoc.in summary-opts summary.1summaryman summary.1summarymdoc summary.html summary.man.in summary.mdoc.in src/external/bsd/ntp/dist/scripts/build [netbsd-7-0]: Makefile.in src/external/bsd/ntp/dist/scripts/calc_tickadj [netbsd-7-0]: Makefile.in calc_tickadj.1calc_tickadjman calc_tickadj.1calc_tickadjmdoc calc_tickadj.html calc_tickadj.man.in calc_tickadj.mdoc.in invoke-calc_tickadj.texi src/external/bsd/ntp/dist/scripts/lib [netbsd-7-0]: Makefile.in src/external/bsd/ntp/dist/scripts/ntp-wait [netbsd-7-0]: Makefile.in invoke-ntp-wait.texi ntp-wait-opts ntp-wait.1ntp-waitman ntp-wait.1ntp-waitmdoc ntp-wait.html ntp-wait.man.in ntp-wait.mdoc.in src/external/bsd/ntp/dist/scripts/ntpsweep [netbsd-7-0]: Makefile.in invoke-ntpsweep.texi ntpsweep-opts ntpsweep.1ntpsweepman ntpsweep.1ntpsweepmdoc ntpsweep.html ntpsweep.man.in ntpsweep.mdoc.in src/external/bsd/ntp/dist/scripts/ntptrace [netbsd-7-0]: Makefile.in invoke-ntptrace.texi ntptrace-opts ntptrace.1ntptraceman ntptrace.1ntptracemdoc ntptrace.html ntptrace.man.in ntptrace.mdoc.in src/external/bsd/ntp/dist/scripts/update-leap [netbsd-7-0]: Makefile.in invoke-update-leap.texi update-leap-opts update-leap.1update-leapman update-leap.1update-leapmdoc update-leap.html update-leap.man.in update-leap.mdoc.
CVS commit: src/sys/netipsec
Module Name:src Committed By: ozaki-r Date: Thu Apr 20 06:27:08 UTC 2017 Modified Files: src/sys/netipsec: key.c Log Message: Use IPSEC_DIR_IS_INOROUT (NFC) To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/netipsec/key.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/netipsec/key.c diff -u src/sys/netipsec/key.c:1.115 src/sys/netipsec/key.c:1.116 --- src/sys/netipsec/key.c:1.115 Thu Apr 20 03:41:47 2017 +++ src/sys/netipsec/key.c Thu Apr 20 06:27:08 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.115 2017/04/20 03:41:47 ozaki-r Exp $ */ +/* $NetBSD: key.c,v 1.116 2017/04/20 06:27:08 ozaki-r Exp $ */ /* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.115 2017/04/20 03:41:47 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.116 2017/04/20 06:27:08 ozaki-r Exp $"); /* * This code is referd to RFC 2367 @@ -594,8 +594,7 @@ key_allocsp(const struct secpolicyindex int s; KASSERT(spidx != NULL); - KASSERTMSG(dir == IPSEC_DIR_INBOUND || dir == IPSEC_DIR_OUTBOUND, - "invalid direction %u", dir); + KASSERTMSG(IPSEC_DIR_IS_INOROUT(dir), "invalid direction %u", dir); KEYDEBUG_PRINTF(KEYDEBUG_IPSEC_STAMP, "DP from %s:%u\n", where, tag);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Apr 20 05:48:39 UTC 2017
Modified Files:
src/sys/dev/pci: pci_subr.c
Log Message:
Add 0x for register output.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/dev/pci/pci_subr.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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.174 src/sys/dev/pci/pci_subr.c:1.175
--- src/sys/dev/pci/pci_subr.c:1.174 Tue Apr 18 10:00:26 2017
+++ src/sys/dev/pci/pci_subr.c Thu Apr 20 05:48:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.174 2017/04/18 10:00:26 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.175 2017/04/20 05:48:38 msaitoh Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.174 2017/04/18 10:00:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.175 2017/04/20 05:48:38 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -1894,7 +1894,7 @@ pci_conf_print_pcie_cap(const pcireg_t *
/* Slot Control Register */
reg = regs[o2i(capoff + PCIE_SLCSR)];
- printf("Slot Control Register: %04x\n", reg & 0x);
+ printf("Slot Control Register: 0x%04x\n", reg & 0x);
onoff("Attention Button Pressed Enabled", reg, PCIE_SLCSR_ABE);
onoff("Power Fault Detected Enabled", reg, PCIE_SLCSR_PFE);
onoff("MRL Sensor Changed Enabled", reg, PCIE_SLCSR_MSE);
@@ -1958,7 +1958,7 @@ pci_conf_print_pcie_cap(const pcireg_t *
if (check_rootport == true) {
/* Root Control Register */
reg = regs[o2i(capoff + PCIE_RCR)];
- printf("Root Control Register: %04x\n", reg & 0x);
+ printf("Root Control Register: 0x%04x\n", reg & 0x);
onoff("SERR on Correctable Error Enable", reg,
PCIE_RCR_SERR_CER);
onoff("SERR on Non-Fatal Error Enable", reg,
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Thu Apr 20 03:57:27 UTC 2017
Modified Files:
src/usr.bin/make: main.c
Log Message:
We cannot tollerate things like trailing /.. etc in .CURDIR
so only accept -C arg "as is" if it contains no relative components.
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.263 src/usr.bin/make/main.c:1.264
--- src/usr.bin/make/main.c:1.263 Wed Apr 19 04:54:17 2017
+++ src/usr.bin/make/main.c Thu Apr 20 03:57:27 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.263 2017/04/19 04:54:17 sjg Exp $ */
+/* $NetBSD: main.c,v 1.264 2017/04/20 03:57:27 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.263 2017/04/19 04:54:17 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.264 2017/04/20 03:57:27 sjg Exp $";
#else
#include
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.263 2017/04/19 04:54:17 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.264 2017/04/20 03:57:27 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -355,6 +355,32 @@ debug_setbuf:
}
}
+/*
+ * does path contain any relative components
+ */
+static int
+is_relpath(const char *path)
+{
+ const char *cp;
+
+ if (path[0] != '/')
+ return TRUE;
+ cp = path;
+ do {
+ cp = strstr(cp, "/.");
+ if (!cp)
+ break;
+ cp += 2;
+ if (cp[0] == '/' || cp[0] == '\0')
+ return TRUE;
+ else if (cp[0] == '.') {
+ if (cp[1] == '/' || cp[1] == '\0')
+return TRUE;
+ }
+ } while (cp);
+ return FALSE;
+}
+
/*-
* MainParseArgs --
* Parse a given argument vector. Called from main() and from
@@ -446,7 +472,7 @@ rearg:
(void)fprintf(stderr, "%s: %s.\n", progname, strerror(errno));
exit(2);
}
- if (argvalue[0] == '/' &&
+ if (!is_relpath(argvalue) &&
stat(argvalue, &sa) != -1 &&
stat(curdir, &sb) != -1 &&
sa.st_ino == sb.st_ino &&
CVS commit: src/sys/netipsec
Module Name:src
Committed By: ozaki-r
Date: Thu Apr 20 03:41:47 UTC 2017
Modified Files:
src/sys/netipsec: ipsec.c ipsec.h key.c
Log Message:
Provide IPSEC_DIR_* validation macros
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.41 -r1.42 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.114 -r1.115 src/sys/netipsec/key.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/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.80 src/sys/netipsec/ipsec.c:1.81
--- src/sys/netipsec/ipsec.c:1.80 Wed Apr 19 07:19:46 2017
+++ src/sys/netipsec/ipsec.c Thu Apr 20 03:41:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.80 2017/04/19 07:19:46 ozaki-r Exp $ */
+/* $NetBSD: ipsec.c,v 1.81 2017/04/20 03:41:47 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.80 2017/04/19 07:19:46 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.81 2017/04/20 03:41:47 ozaki-r Exp $");
/*
* IPsec controller part.
@@ -211,15 +211,7 @@ ipsec_checkpcbcache(struct mbuf *m, stru
{
struct secpolicyindex spidx;
- switch (dir) {
- case IPSEC_DIR_INBOUND:
- case IPSEC_DIR_OUTBOUND:
- case IPSEC_DIR_ANY:
- break;
- default:
- return NULL;
- }
-
+ KASSERT(IPSEC_DIR_IS_VALID(dir));
KASSERT(pcbsp != NULL);
KASSERT(dir < sizeof(pcbsp->sp_cache)/sizeof(pcbsp->sp_cache[0]));
@@ -276,14 +268,7 @@ ipsec_fillpcbcache(struct inpcbpolicy *p
struct secpolicy *sp, int dir)
{
- switch (dir) {
- case IPSEC_DIR_INBOUND:
- case IPSEC_DIR_OUTBOUND:
- break;
- default:
- return EINVAL;
- }
-
+ KASSERT(IPSEC_DIR_IS_INOROUT(dir));
KASSERT(dir < sizeof(pcbsp->sp_cache)/sizeof(pcbsp->sp_cache[0]));
if (pcbsp->sp_cache[dir].cachesp)
@@ -426,8 +411,7 @@ ipsec_getpolicy(const struct tdb_ident *
struct secpolicy *sp;
KASSERT(tdbi != NULL);
- KASSERTMSG(dir == IPSEC_DIR_INBOUND || dir == IPSEC_DIR_OUTBOUND,
- "invalid direction %u", dir);
+ KASSERTMSG(IPSEC_DIR_IS_INOROUT(dir), "invalid direction %u", dir);
sp = KEY_ALLOCSP2(tdbi->spi, &tdbi->dst, tdbi->proto, dir);
if (sp == NULL) /*XXX*/
@@ -460,8 +444,7 @@ ipsec_getpolicybysock(struct mbuf *m, u_
KASSERT(m != NULL);
KASSERT(inp != NULL);
KASSERT(error != NULL);
- KASSERTMSG(dir == IPSEC_DIR_INBOUND || dir == IPSEC_DIR_OUTBOUND,
- "invalid direction %u", dir);
+ KASSERTMSG(IPSEC_DIR_IS_INOROUT(dir), "invalid direction %u", dir);
KASSERT(inp->inph_socket != NULL);
@@ -592,8 +575,7 @@ ipsec_getpolicybyaddr(struct mbuf *m, u_
KASSERT(m != NULL);
KASSERT(error != NULL);
- KASSERTMSG(dir == IPSEC_DIR_INBOUND || dir == IPSEC_DIR_OUTBOUND,
- "invalid direction %u", dir);
+ KASSERTMSG(IPSEC_DIR_IS_INOROUT(dir), "invalid direction %u", dir);
sp = NULL;
Index: src/sys/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.41 src/sys/netipsec/ipsec.h:1.42
--- src/sys/netipsec/ipsec.h:1.41 Wed Apr 19 03:39:14 2017
+++ src/sys/netipsec/ipsec.h Thu Apr 20 03:41:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.41 2017/04/19 03:39:14 ozaki-r Exp $ */
+/* $NetBSD: ipsec.h,v 1.42 2017/04/20 03:41:47 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@@ -171,6 +171,10 @@ struct secspacq {
#define IPSEC_DIR_MAX 3
#define IPSEC_DIR_INVALID 4
+#define IPSEC_DIR_IS_VALID(dir) ((dir) >= 0 && (dir) <= IPSEC_DIR_MAX)
+#define IPSEC_DIR_IS_INOROUT(dir) ((dir) == IPSEC_DIR_INBOUND || \
+ (dir) == IPSEC_DIR_OUTBOUND)
+
/* Policy level */
/*
* IPSEC, ENTRUST and BYPASS are allowed for setsockopt() in PCB,
Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.114 src/sys/netipsec/key.c:1.115
--- src/sys/netipsec/key.c:1.114 Wed Apr 19 09:23:19 2017
+++ src/sys/netipsec/key.c Thu Apr 20 03:41:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.114 2017/04/19 09:23:19 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.115 2017/04/20 03:41:47 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.114 2017/04/19 09:23:19 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.115 2017/04/20 03:41:47 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -652,8 +652,7 @@ key_allocsp2(u_int32_t spi,
int s;
KASSERT(dst != NULL);
- KASSERTMSG(dir == IPSEC_DIR_INBOUND || dir == IPSEC_DIR_OUTBOUND,
- "invalid direction %u", dir);
+ KASSERTMSG(IPSEC_DIR_IS_INOROUT(dir), "invalid direction %u", dir);
KEYDEBUG_PRINTF(KEYDEBUG_IPSEC_STAMP, "DP from %
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: knakahara
Date: Thu Apr 20 02:42:59 UTC 2017
Modified Files:
src/sys/arch/x86/x86: intr.c
Log Message:
always notice if the device's interrupt set affinity to other than CPU#0.
suggested by msaitoh@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/x86/x86/intr.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/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.99 src/sys/arch/x86/x86/intr.c:1.100
--- src/sys/arch/x86/x86/intr.c:1.99 Tue Apr 18 11:49:50 2017
+++ src/sys/arch/x86/x86/intr.c Thu Apr 20 02:42:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.99 2017/04/18 11:49:50 knakahara Exp $ */
+/* $NetBSD: intr.c,v 1.100 2017/04/20 02:42:59 knakahara Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.99 2017/04/18 11:49:50 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.100 2017/04/20 02:42:59 knakahara Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -1082,7 +1082,7 @@ intr_establish_xname(int legacy_irq, str
(*pic->pic_hwunmask)(pic, pin);
mutex_exit(&cpu_lock);
- if (bootverbose)
+ if (bootverbose || cpu_index(ci) != 0)
aprint_verbose("allocated pic %s type %s pin %d level %d to %s slot %d "
"idt entry %d\n",
pic->pic_name, type == IST_EDGE ? "edge" : "level", pin, level,
CVS commit: src/tests/usr.bin/mixerctl
Module Name:src
Committed By: kre
Date: Thu Apr 20 00:17:11 UTC 2017
Modified Files:
src/tests/usr.bin/mixerctl: t_mixerctl.sh
Log Message:
If we are using the pad audio device, there must be a process with
the corresponding pad device open, or we get EIO from audio accesses
Explained and fix provided by Nathanial Sloss
Note: if we are testing and using real audio hardware, the open
of /dev/pad0 is irrelevant (but harmless, so we don't attempt to
check) and what's more it doesn't matter if it succeeds or fails.
If we're testing under qemu (or any other situation where the only
audio "hardware" is pad) then the open will work, and there should be
no more EIO.
If there is no audio hardware of any kind on the system being tested,
the attempt top open /dev/mixer should fail, and the test will be
skipped.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/mixerctl/t_mixerctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/mixerctl/t_mixerctl.sh
diff -u src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.4 src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.5
--- src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.4 Thu Feb 23 14:01:37 2017
+++ src/tests/usr.bin/mixerctl/t_mixerctl.sh Thu Apr 20 00:17:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_mixerctl.sh,v 1.4 2017/02/23 14:01:37 kre Exp $
+# $NetBSD: t_mixerctl.sh,v 1.5 2017/04/20 00:17:11 kre Exp $
atf_test_case noargs_usage
noargs_usage_head() {
@@ -14,6 +14,9 @@ showvalue_head() {
atf_set "descr" "Ensure mixerctl(1) can print the value for all variables"
}
showvalue_body() {
+ cat /dev/pad0 > /dev/null 2>&1 &
+ padpid=$!
+
(/dev/null 2>&1 ||
atf_skip "no audio mixer available in kernel"
@@ -21,6 +24,8 @@ showvalue_body() {
atf_check -s exit:0 -e ignore -o match:"^${var}=" \
mixerctl ${var}
done
+
+ kill -HUP ${padpid} 2>/dev/null # may have exited already
}
atf_test_case nflag
@@ -28,6 +33,9 @@ nflag_head() {
atf_set "descr" "Ensure 'mixerctl -n' actually suppresses some output"
}
nflag_body() {
+ cat /dev/pad0 > /dev/null 2>&1 &
+ padpid=$!
+
(/dev/null 2>&1 ||
atf_skip "no audio mixer available in kernel"
@@ -38,6 +46,8 @@ nflag_body() {
atf_check -s exit:0 -o not-match:"${varname}" -e ignore \
mixerctl -n ${varname}
+
+ kill -HUP ${padpid} 2>/dev/null
}
atf_test_case nonexistant_device
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Wed Apr 19 23:41:00 UTC 2017
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Add netpgpverify to the library list.
To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.303 src/share/mk/bsd.prog.mk:1.304
--- src/share/mk/bsd.prog.mk:1.303 Mon Feb 20 16:05:34 2017
+++ src/share/mk/bsd.prog.mk Wed Apr 19 23:41:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.303 2017/02/20 16:05:34 rin Exp $
+# $NetBSD: bsd.prog.mk,v 1.304 2017/04/19 23:41:00 joerg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -156,6 +156,7 @@ LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
m \
magic \
menu \
+ netpgpverify \
objc \
ossaudio \
pam \
CVS commit: src/lib/libc/resolv
Module Name:src
Committed By: christos
Date: Wed Apr 19 22:21:07 UTC 2017
Modified Files:
src/lib/libc/resolv: res_init.c
Log Message:
F_DUPFD* needs an argument (minfd) found by jmcneill
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libc/resolv/res_init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/resolv/res_init.c
diff -u src/lib/libc/resolv/res_init.c:1.30 src/lib/libc/resolv/res_init.c:1.31
--- src/lib/libc/resolv/res_init.c:1.30 Tue Feb 24 12:56:20 2015
+++ src/lib/libc/resolv/res_init.c Wed Apr 19 18:21:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: res_init.c,v 1.30 2015/02/24 17:56:20 christos Exp $ */
+/* $NetBSD: res_init.c,v 1.31 2017/04/19 22:21:07 christos Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@@ -72,7 +72,7 @@
static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
static const char rcsid[] = "Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp";
#else
-__RCSID("$NetBSD: res_init.c,v 1.30 2015/02/24 17:56:20 christos Exp $");
+__RCSID("$NetBSD: res_init.c,v 1.31 2017/04/19 22:21:07 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -495,7 +495,7 @@ __res_vinit(res_state statp, int preinit
#ifdef RESOLVSORT
statp->nsort = nsort;
#endif
- statp->_u._ext.ext->resfd = fcntl(fileno(fp), F_DUPFD_CLOEXEC);
+ statp->_u._ext.ext->resfd = fcntl(fileno(fp), F_DUPFD_CLOEXEC, 0);
(void) fclose(fp);
if (fstat(statp->_u._ext.ext->resfd, &st) != -1)
__res_conf_time = statp->_u._ext.ext->res_conf_time =
CVS commit: [bouyer-socketcan] src/sys/netcan
Module Name:src
Committed By: bouyer
Date: Wed Apr 19 22:19:12 UTC 2017
Modified Files:
src/sys/netcan [bouyer-socketcan]: can.c
Log Message:
can_mbuf_tag_clean(): make sure we won't free the tag we will reuse.
Avoid mbuf leak in error paths.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/netcan/can.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/netcan/can.c
diff -u src/sys/netcan/can.c:1.1.2.9 src/sys/netcan/can.c:1.1.2.10
--- src/sys/netcan/can.c:1.1.2.9 Wed Apr 19 17:52:37 2017
+++ src/sys/netcan/can.c Wed Apr 19 22:19:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: can.c,v 1.1.2.9 2017/04/19 17:52:37 bouyer Exp $ */
+/* $NetBSD: can.c,v 1.1.2.10 2017/04/19 22:19:12 bouyer Exp $ */
/*-
* Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.9 2017/04/19 17:52:37 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.10 2017/04/19 22:19:12 bouyer Exp $");
#include
#include
@@ -214,24 +214,20 @@ static int
can_output(struct mbuf *m, struct canpcb *canp)
{
struct ifnet *ifp;
- int error = 0;
struct m_tag *sotag;
if (canp == NULL) {
printf("can_output: no pcb\n");
- error = EINVAL;
- return error;
+ return EINVAL;
}
ifp = canp->canp_ifp;
if (ifp == 0) {
- error = EDESTADDRREQ;
- goto bad;
+ return EDESTADDRREQ;
}
sotag = m_tag_get(PACKET_TAG_SO, sizeof(struct socket *), PR_NOWAIT);
if (sotag == NULL) {
ifp->if_oerrors++;
- error = ENOMEM;
- goto bad;
+ return ENOMEM;
}
*(struct socket **)(sotag + 1) = canp->canp_socket;
m_tag_prepend(m, sotag);
@@ -240,10 +236,7 @@ can_output(struct mbuf *m, struct canpcb
can_output_cnt++;
return ifq_enqueue(ifp, m);
} else
- error = EMSGSIZE;
-bad:
- m_freem(m);
- return (error);
+ return EMSGSIZE;
}
/*
@@ -255,6 +248,9 @@ can_mbuf_tag_clean(struct mbuf *m)
struct m_tag *sotag;
sotag = m_tag_find(m, PACKET_TAG_SO, NULL);
+ if (sotag)
+ m_tag_unlink(m, sotag);
+
m_tag_delete_nonpersistent(m);
if (sotag)
m_tag_prepend(m, sotag);
@@ -285,9 +281,9 @@ can_input(struct ifnet *ifp, struct mbuf
} else {
IF_ENQUEUE(inq, m);
IFQ_UNLOCK(inq);
- schednetisr(NETISR_CAN);
ifp->if_ipackets++;
ifp->if_ibytes += m->m_pkthdr.len;
+ schednetisr(NETISR_CAN);
}
}
@@ -356,7 +352,7 @@ canintr(void)
* we can't be sure we won't need
* the original mbuf later so copy
*/
-mc = m_copym(m, 0, M_COPYALL, M_NOWAIT);
+mc = m_copypacket(m, M_NOWAIT);
if (mc == NULL) {
/* deliver this mbuf and abort */
mc = m;
@@ -574,11 +570,15 @@ can_send(struct socket *so, struct mbuf
int s;
if (control && control->m_len) {
- return EINVAL;
+ m_freem(control);
+ error = EINVAL;
+ goto err;
}
if (m->m_len > sizeof(struct can_frame) ||
- m->m_len < offsetof(struct can_frame, can_dlc))
- return EINVAL;
+ m->m_len < offsetof(struct can_frame, can_dlc)) {
+ error = EINVAL;
+ goto err;
+ }
/* we expect all data in the first mbuf */
KASSERT((m->m_flags & M_PKTHDR) != 0);
@@ -586,20 +586,24 @@ can_send(struct socket *so, struct mbuf
if (nam) {
if ((so->so_state & SS_ISCONNECTED) != 0) {
- return EISCONN;
+ error = EISCONN;
+ goto err;
}
s = splnet();
error = can_pcbbind(canp, (struct sockaddr_can *)nam, l);
if (error) {
splx(s);
- return error;
+ goto err;
}
} else {
if ((so->so_state & SS_ISCONNECTED) == 0) {
- return EDESTADDRREQ;
+ error = EDESTADDRREQ;
+ goto err;
}
}
error = can_output(m, canp);
+ if (error)
+ goto err;
if (nam) {
struct sockaddr_can lscan;
memset(&lscan, 0, sizeof(lscan));
@@ -607,6 +611,10 @@ can_send(struct socket *so, struct mbuf
lscan.can_len = sizeof(lscan);
can_pcbbind(canp, &lscan, l);
}
+ return 0;
+
+err:
+ m_freem(m);
return error;
}
CVS commit: [bouyer-socketcan] src/sys/netcan
Module Name:src
Committed By: bouyer
Date: Wed Apr 19 22:17:57 UTC 2017
Modified Files:
src/sys/netcan [bouyer-socketcan]: if_canloop.c
Log Message:
Set rcvif before bpf_mtap
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/netcan/if_canloop.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/netcan/if_canloop.c
diff -u src/sys/netcan/if_canloop.c:1.1.2.4 src/sys/netcan/if_canloop.c:1.1.2.5
--- src/sys/netcan/if_canloop.c:1.1.2.4 Sun Feb 5 17:37:10 2017
+++ src/sys/netcan/if_canloop.c Wed Apr 19 22:17:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_canloop.c,v 1.1.2.4 2017/02/05 17:37:10 bouyer Exp $ */
+/* $NetBSD: if_canloop.c,v 1.1.2.5 2017/04/19 22:17:56 bouyer Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_canloop.c,v 1.1.2.4 2017/02/05 17:37:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_canloop.c,v 1.1.2.5 2017/04/19 22:17:56 bouyer Exp $");
#ifdef _KERNEL_OPT
#include "opt_can.h"
@@ -164,9 +164,9 @@ canloop_ifstart(struct ifnet *ifp)
if ((m->m_flags & M_PKTHDR) == 0)
panic("canloop_output: no header mbuf");
+ m_set_rcvif(m, ifp);
if (ifp->if_flags & IFF_LOOPBACK)
bpf_mtap_af(ifp, AF_CAN, m);
- m_set_rcvif(m, ifp);
pktlen = m->m_pkthdr.len;
ifp->if_opackets++;
@@ -178,7 +178,6 @@ canloop_ifstart(struct ifnet *ifp)
#else
printf("%s: can't handle CAN packet\n", ifp->if_xname);
m_freem(m);
- error = EAFNOSUPPORT;
#endif
}
CVS commit: [jdolecek-ncq] src/sys/dev/ata
Module Name:src Committed By: jdolecek Date: Wed Apr 19 22:02:32 UTC 2017 Modified Files: src/sys/dev/ata [jdolecek-ncq]: TODO.ncq Log Message: note the QEMU bug To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/ata/TODO.ncq 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/ata/TODO.ncq diff -u src/sys/dev/ata/TODO.ncq:1.1.2.2 src/sys/dev/ata/TODO.ncq:1.1.2.3 --- src/sys/dev/ata/TODO.ncq:1.1.2.2 Wed Apr 19 21:02:43 2017 +++ src/sys/dev/ata/TODO.ncq Wed Apr 19 22:02:32 2017 @@ -1,5 +1,8 @@ ahci with NCQ gets frequent timeouts, something's amiss +under QEMU, the mounted AHCI drive doesn't show directories for ls, +but cd, mkdir, stat and creating files wroks just fine - what do? + ata_xfer_*() uses wd->drvp->chnl_softc as ata_channel, but it's umass softc for wd? at umass*
CVS commit: src/doc/roadmaps
Module Name:src Committed By: jdolecek Date: Wed Apr 19 21:48:58 UTC 2017 Modified Files: src/doc/roadmaps: storage Log Message: ld(4) already improved to arbitrary ioctls, and nvme(4) updated to support both DIOCGCACHE and DIOCCACHESYNC To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/doc/roadmaps/storage 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/storage diff -u src/doc/roadmaps/storage:1.21 src/doc/roadmaps/storage:1.22 --- src/doc/roadmaps/storage:1.21 Fri Jan 13 10:14:58 2017 +++ src/doc/roadmaps/storage Wed Apr 19 21:48:58 2017 @@ -1,4 +1,4 @@ -$NetBSD: storage,v 1.21 2017/01/13 10:14:58 dholland Exp $ +$NetBSD: storage,v 1.22 2017/04/19 21:48:58 jdolecek Exp $ NetBSD Storage Roadmap == @@ -228,11 +228,6 @@ Semi-relatedly, it is also time for scsi - Flush cache commands via DIOCCACHESYNC currently doesn't wait for completion; it must not poll since that corrupts command queue, but it should use a condition variable to wait for the flush to actually finish - - NVMe controllers supports write cache administration via GET/SET FEATURE, but - driver doesn't currently implement the cache ioctls, leading to somewhat - ugly dkctl(1) output; it would be fairly simple to add this, but would - require ld(4) attachment code changed to support passing arbitrary ioctls - to attachments - There is no clear timeframe or release target for these points. - Contact msaitoh or agc for further information.
CVS commit: [jdolecek-ncq] src/sys/dev/ata
Module Name:src
Committed By: jdolecek
Date: Wed Apr 19 21:42:39 UTC 2017
Modified Files:
src/sys/dev/ata [jdolecek-ncq]: ata.c atareg.h atavar.h wd.c
Log Message:
add ATA FUA support
To generate a diff of this commit:
cvs rdiff -u -r1.132.8.5 -r1.132.8.6 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.43 -r1.43.18.1 src/sys/dev/ata/atareg.h
cvs rdiff -u -r1.92.8.5 -r1.92.8.6 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.428.2.8 -r1.428.2.9 src/sys/dev/ata/wd.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.132.8.5 src/sys/dev/ata/ata.c:1.132.8.6
--- src/sys/dev/ata/ata.c:1.132.8.5 Wed Apr 19 20:49:17 2017
+++ src/sys/dev/ata/ata.c Wed Apr 19 21:42:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.132.8.5 2017/04/19 20:49:17 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.132.8.6 2017/04/19 21:42:39 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.5 2017/04/19 20:49:17 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.6 2017/04/19 21:42:39 jdolecek Exp $");
#include "opt_ata.h"
@@ -1980,8 +1980,14 @@ void
atacmd_toncq(struct ata_xfer *xfer, uint8_t *cmd, uint16_t *count,
uint16_t *features, uint8_t *device)
{
- if ((xfer->c_flags & C_NCQ) == 0)
+ if ((xfer->c_flags & C_NCQ) == 0) {
+ /* FUA handling for non-NCQ drives */
+ if (xfer->c_bio.flags & ATA_FUA
+ && *cmd == WDCC_WRITEDMA_EXT)
+ *cmd = WDCC_WRITEDMA_FUA_EXT;
+
return;
+ }
*cmd = (xfer->c_bio.flags & ATA_READ) ?
WDCC_READ_FPDMA_QUEUED : WDCC_WRITE_FPDMA_QUEUED;
@@ -1993,5 +1999,6 @@ atacmd_toncq(struct ata_xfer *xfer, uint
*count = (xfer->c_slot << 3);
/* other device flags */
- /* XXX FUA handling */
+ if (xfer->c_bio.flags & ATA_FUA)
+ *device |= WDSD_FUA;
}
Index: src/sys/dev/ata/atareg.h
diff -u src/sys/dev/ata/atareg.h:1.43 src/sys/dev/ata/atareg.h:1.43.18.1
--- src/sys/dev/ata/atareg.h:1.43 Wed Oct 30 15:37:49 2013
+++ src/sys/dev/ata/atareg.h Wed Apr 19 21:42:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: atareg.h,v 1.43 2013/10/30 15:37:49 drochner Exp $ */
+/* $NetBSD: atareg.h,v 1.43.18.1 2017/04/19 21:42:39 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -144,6 +144,7 @@
#define WDCC_READDMA_EXT 0x25 /* read 48-bit addressing with DMA */
#define WDCC_WRITEDMA_EXT 0x35 /* write 48-bit addressing with DMA */
+#define WDCC_WRITEDMA_FUA_EXT 0x3d /* write 48-bit addr with DMA & FUA */
#if defined(_KERNEL) || defined(_STANDALONE)
#include
@@ -248,6 +249,7 @@ atacmd_tostatq(int cmd32)
#define WDSD_IBM 0xa0 /* forced to 512 byte sector, ecc */
#define WDSD_CHS 0x00 /* cylinder/head/sector addressing */
#define WDSD_LBA 0x40 /* logical block addressing */
+#define WDSD_FUA 0x80 /* Forced Unit Access (FUA) */
/* Commands for ATAPI devices */
#define ATAPI_CHECK_POWER_MODE 0xe5
Index: src/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.92.8.5 src/sys/dev/ata/atavar.h:1.92.8.6
--- src/sys/dev/ata/atavar.h:1.92.8.5 Wed Apr 19 20:49:17 2017
+++ src/sys/dev/ata/atavar.h Wed Apr 19 21:42:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.92.8.5 2017/04/19 20:49:17 jdolecek Exp $ */
+/* $NetBSD: atavar.h,v 1.92.8.6 2017/04/19 21:42:39 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -49,6 +49,7 @@ struct ata_bio {
#define ATA_READ 0x0020 /* transfer is a read (otherwise a write) */
#define ATA_CORR 0x0040 /* transfer had a corrected error */
#define ATA_LBA48 0x0080 /* transfer uses 48-bit LBA addressing */
+#define ATA_FUA 0x0100 /* transfer uses FUA */
daddr_t blkno; /* block addr */
daddr_t blkdone;/* number of blks transferred */
daddr_t nblks; /* number of block currently transferring */
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.428.2.8 src/sys/dev/ata/wd.c:1.428.2.9
--- src/sys/dev/ata/wd.c:1.428.2.8 Wed Apr 19 21:02:43 2017
+++ src/sys/dev/ata/wd.c Wed Apr 19 21:42:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.428.2.8 2017/04/19 21:02:43 jdolecek Exp $ */
+/* $NetBSD: wd.c,v 1.428.2.9 2017/04/19 21:42:39 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.428.2.8 2017/04/19 21:02:43 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.428.2.9 2017/04/19 21:42:39 jdolecek Exp $");
#include "opt_ata.h"
@@ -809,6 +809,14 @@ fail:
xfer->c_bio.flags |= ATA_LBA;
if (bp->b_flags & B_READ)
xfer->c_bio.flags |= ATA_READ;
+ if (bp->b_flags & B_MEDIA_FUA) {
+ /* If not using NCQ, the command WRITE DMA FUA EXT is LBA48 */
+ KASSERT((wd->sc_flags & WDF_LBA48) != 0);
+ if ((xfer->c_flags & C_NCQ) == 0)
+ xfer->c_bio.flags |= ATA_LBA48;
+
+ xfer->c_bio.flags |= ATA_FUA;
+ }
/* Instrumentation. */
disk_busy(&wd->
CVS commit: [jdolecek-ncq] src/sys/dev/ata
Module Name:src
Committed By: jdolecek
Date: Wed Apr 19 21:02:43 UTC 2017
Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq wd.c
Log Message:
up to 65536 sectors can be transferred for LBA48 commands; adjust wdminphys()
and wdstart1() accordingly
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.428.2.7 -r1.428.2.8 src/sys/dev/ata/wd.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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.1 src/sys/dev/ata/TODO.ncq:1.1.2.2
--- src/sys/dev/ata/TODO.ncq:1.1.2.1 Wed Apr 19 20:49:58 2017
+++ src/sys/dev/ata/TODO.ncq Wed Apr 19 21:02:43 2017
@@ -5,8 +5,6 @@ softc for wd? at umass*
protect more of wddone() with mutex?
-wdminphys() - LBA48 has maximum 65536 sectors
-
refactor mvsata to reuse (more of) ata_wdc.c?
NCQ ICC - investigate and set/get the behaviour with timeouts
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.428.2.7 src/sys/dev/ata/wd.c:1.428.2.8
--- src/sys/dev/ata/wd.c:1.428.2.7 Wed Apr 19 20:49:17 2017
+++ src/sys/dev/ata/wd.c Wed Apr 19 21:02:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.428.2.7 2017/04/19 20:49:17 jdolecek Exp $ */
+/* $NetBSD: wd.c,v 1.428.2.8 2017/04/19 21:02:43 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.428.2.7 2017/04/19 20:49:17 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.428.2.8 2017/04/19 21:02:43 jdolecek Exp $");
#include "opt_ata.h"
@@ -793,9 +793,10 @@ fail:
else
xfer->c_bio.flags = 0;
if (wd->sc_flags & WDF_LBA48 &&
- (xfer->c_bio.blkno +
+ (((xfer->c_bio.blkno +
xfer->c_bio.bcount / wd->sc_dk.dk_label->d_secsize) >
- wd->sc_capacity28)
+ wd->sc_capacity28) ||
+ ((xfer->c_bio.bcount / wd->sc_dk.dk_label->d_secsize) > 128)))
xfer->c_bio.flags |= ATA_LBA48;
/* If NCQ was negotiated, always use it */
@@ -977,10 +978,21 @@ wdminphys(struct buf *bp)
{
const struct wd_softc * const wd =
device_lookup_private(&wd_cd, WDUNIT(bp->b_dev));
+ uint32_t maxsectors;
+
+ /*
+ * The limit is actually 65536 for LBA48 and 256 for non-LBA48,
+ * but that requires to pass set the count for the ATA command
+ * to 0, which is somewhat error prone, so better stay safe.
+ */
+ if (wd->sc_flags & WDF_LBA48)
+ maxsectors = 65535;
+ else
+ maxsectors = 128;
+
+ if (bp->b_bcount > (wd->sc_blksize * maxsectors))
+ bp->b_bcount = (wd->sc_blksize * maxsectors);
- if (bp->b_bcount > (wd->sc_blksize * 128)) {
- bp->b_bcount = (wd->sc_blksize * 128);
- }
minphys(bp);
}
CVS commit: [jdolecek-ncq] src/sys/dev/ata
Module Name:src Committed By: jdolecek Date: Wed Apr 19 20:49:58 UTC 2017 Added Files: src/sys/dev/ata [jdolecek-ncq]: TODO.ncq Log Message: bunch of random observations To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/sys/dev/ata/TODO.ncq Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/dev/ata/TODO.ncq diff -u /dev/null src/sys/dev/ata/TODO.ncq:1.1.2.1 --- /dev/null Wed Apr 19 20:49:58 2017 +++ src/sys/dev/ata/TODO.ncq Wed Apr 19 20:49:58 2017 @@ -0,0 +1,20 @@ +ahci with NCQ gets frequent timeouts, something's amiss + +ata_xfer_*() uses wd->drvp->chnl_softc as ata_channel, but it's umass +softc for wd? at umass* + +protect more of wddone() with mutex? + +wdminphys() - LBA48 has maximum 65536 sectors + +refactor mvsata to reuse (more of) ata_wdc.c? + +NCQ ICC - investigate and set/get the behaviour with timeouts + +implement DIOCGCACHE/DIOCCACHESYNC for ld@ataraid? just passthrough, like ccd + +MSI/MSI-X support for AHCI + +fix all 'XXX slot' + +malloc(M_CANFAIL) actually doesn't do anything
CVS commit: [jdolecek-ncq] src/sys/dev
Module Name:src
Committed By: jdolecek
Date: Wed Apr 19 20:49:17 UTC 2017
Modified Files:
src/sys/dev/ata [jdolecek-ncq]: ata.c ata_wdc.c atavar.h satafis_subr.c
wd.c wdvar.h
src/sys/dev/ic [jdolecek-ncq]: ahcisata_core.c mvsata.c siisata.c wdc.c
src/sys/dev/scsipi [jdolecek-ncq]: atapi_wdc.c
Log Message:
adjust ata code to support more than one active command, including the
timeout handling, add support for NCQ commands
move probe for NCQ and number of tags to middle layer, negotiate mutual
support between drive and controller
implement NCQ support in ahci(4)
To generate a diff of this commit:
cvs rdiff -u -r1.132.8.4 -r1.132.8.5 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.105.6.2 -r1.105.6.3 src/sys/dev/ata/ata_wdc.c
cvs rdiff -u -r1.92.8.4 -r1.92.8.5 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.7.28.1 -r1.7.28.2 src/sys/dev/ata/satafis_subr.c
cvs rdiff -u -r1.428.2.6 -r1.428.2.7 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.43.4.3 -r1.43.4.4 src/sys/dev/ata/wdvar.h
cvs rdiff -u -r1.57.6.6 -r1.57.6.7 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.35.6.5 -r1.35.6.6 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.30.4.4 -r1.30.4.5 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.283.2.3 -r1.283.2.4 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.123.4.3 -r1.123.4.4 src/sys/dev/scsipi/atapi_wdc.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.132.8.4 src/sys/dev/ata/ata.c:1.132.8.5
--- src/sys/dev/ata/ata.c:1.132.8.4 Sat Apr 15 17:14:11 2017
+++ src/sys/dev/ata/ata.c Wed Apr 19 20:49:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.132.8.4 2017/04/15 17:14:11 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.132.8.5 2017/04/19 20:49:17 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.4 2017/04/15 17:14:11 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.5 2017/04/19 20:49:17 jdolecek Exp $");
#include "opt_ata.h"
@@ -195,7 +195,7 @@ ata_queue_hwslot_to_xfer(struct ata_queu
struct ata_xfer *xfer;
KASSERT(hwslot < chq->queue_openings);
- KASSERT(hwslot == 0 || (chq->queue_xfers_avail & __BIT(hwslot)) == 0);
+ KASSERT((chq->active_xfers_used & __BIT(hwslot)) != 0);
/* Usually the first entry will be the one */
TAILQ_FOREACH(xfer, &chq->active_xfers, c_activechain) {
@@ -203,27 +203,71 @@ ata_queue_hwslot_to_xfer(struct ata_queu
return xfer;
}
- panic("%s: xfer with slot %d not found", __func__, hwslot);
+ panic("%s: xfer with slot %d not found (active %x)", __func__, hwslot,
+ chq->active_xfers_used);
+}
+
+void
+ata_xfer_init(struct ata_xfer *xfer, bool zero)
+{
+ if (zero)
+ memset(xfer, 0, sizeof(*xfer));
+
+ callout_init(&xfer->c_timo_callout, 0); /* XXX MPSAFE */
+}
+
+void
+ata_xfer_destroy(struct ata_xfer *xfer)
+{
+ callout_halt(&xfer->c_timo_callout, NULL); /* XXX MPSAFE */
+ callout_destroy(&xfer->c_timo_callout);
}
struct ata_queue *
-ata_queue_alloc(int openings)
+ata_queue_alloc(uint8_t openings)
{
if (openings == 0)
openings = 1;
+
+ /*
+ * While hw supports up to 32 tags, in practice we must never
+ * allow 32 active commands, since that would signal same as
+ * channel error. So just limit this to 31.
+ */
+ if (openings > 31)
+ openings = 31;
+
struct ata_queue *chq = malloc(offsetof(struct ata_queue, queue_xfers[openings]),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (chq != NULL) {
- chq->queue_openings = openings;
- chq->queue_xfers_avail = (1 << openings) - 1;
- ata_queue_reset(chq);
- }
+
+ chq->queue_openings = openings;
+ chq->queue_xfers_avail = (1 << openings) - 1;
+ ata_queue_reset(chq);
+
+ for (uint8_t i = 0; i < openings; i++)
+ ata_xfer_init(&chq->queue_xfers[i], false);
+
return chq;
}
+static void
+ata_queue_downsize(struct ata_queue *chq, uint8_t openings)
+{
+ KASSERT(chq->queue_active == 0);
+ KASSERT(TAILQ_FIRST(&chq->queue_xfer) == NULL);
+ KASSERT(openings < chq->queue_openings);
+
+ chq->queue_openings = openings;
+ chq->queue_xfers_avail = (1 << openings) - 1;
+ ata_queue_reset(chq);
+}
+
void
ata_queue_free(struct ata_queue *chq)
{
+ for (uint8_t i = 0; i < chq->queue_openings; i++)
+ ata_xfer_destroy(&chq->queue_xfers[i]);
+
free(chq, M_DEVBUF);
}
@@ -240,11 +284,6 @@ ata_channel_attach(struct ata_channel *c
if (chp->ch_flags & ATACH_DISABLED)
return;
- /* XXX callout_destroy */
- callout_init(&chp->ch_callout, 0);
-
- chq->queue_openings = 1; /* XXX */
-
ata_queue_reset(chq);
chp->atabus = config_found_ia(chp->ch_atac->atac_dev, "ata", chp,
@@ -397,7 +436,6 @@ atabusconfig_thread(void *arg)
memset(&adev, 0, sizeof(struct ata_device));
adev.adev_bustype = atac->atac_bustype_ata;
adev.adev_channel = chp->ch_channel;
- adev.adev_openings = chp->ch_queue->queue_openings;
adev.adev_drv_data = &chp->ch_
CVS commit: [bouyer-socketcan] src/sys/arch/arm/allwinner
Module Name:src
Committed By: bouyer
Date: Wed Apr 19 17:54:18 UTC 2017
Modified Files:
src/sys/arch/arm/allwinner [bouyer-socketcan]: awin_can.c
Log Message:
Fix the reset code
clear the IFF_UP flag if we can't get the interface running.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/arm/allwinner/awin_can.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/arm/allwinner/awin_can.c
diff -u src/sys/arch/arm/allwinner/awin_can.c:1.1.2.1 src/sys/arch/arm/allwinner/awin_can.c:1.1.2.2
--- src/sys/arch/arm/allwinner/awin_can.c:1.1.2.1 Tue Apr 18 21:30:38 2017
+++ src/sys/arch/arm/allwinner/awin_can.c Wed Apr 19 17:54:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_can.c,v 1.1.2.1 2017/04/18 21:30:38 bouyer Exp $ */
+/* $NetBSD: awin_can.c,v 1.1.2.2 2017/04/19 17:54:18 bouyer Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.1 2017/04/18 21:30:38 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.2 2017/04/19 17:54:18 bouyer Exp $");
#include
#include
@@ -119,8 +119,9 @@ awin_can_match(device_t parent, cfdata_t
KASSERT(cf->cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT
|| cf->cf_loc[AWINIOCF_PORT] == loc->loc_port);
- if (!awin_gpio_pinset_available(pinset))
+ if (!awin_gpio_pinset_available(pinset)) {
return 0;
+ }
return 1;
}
@@ -465,6 +466,9 @@ awin_can_ifioctl(struct ifnet *ifp, u_lo
if ((ifp->if_flags & IFF_UP) != 0 &&
(ifp->if_flags & IFF_RUNNING) == 0) {
error = awin_can_ifup(sc);
+if (error) {
+ ifp->if_flags &= ~IFF_UP;
+}
} else if ((ifp->if_flags & IFF_UP) == 0 &&
(ifp->if_flags & IFF_RUNNING) != 0) {
awin_can_ifdown(sc);
@@ -493,7 +497,7 @@ awin_can_enter_reset(struct awin_can_sof
val |= AWIN_CAN_MODSEL_RST;
awin_can_write(sc, AWIN_CAN_MODSEL_REG, val);
val = awin_can_read(sc, AWIN_CAN_MODSEL_REG);
- if (val & AWIN_CAN_MODSEL_REG)
+ if (val & AWIN_CAN_MODSEL_RST)
return;
}
printf("%s: couldn't enter reset mode\n", device_xname(sc->sc_dev));
@@ -510,7 +514,7 @@ awin_can_exit_reset(struct awin_can_soft
val &= ~AWIN_CAN_MODSEL_RST;
awin_can_write(sc, AWIN_CAN_MODSEL_REG, val);
val = awin_can_read(sc, AWIN_CAN_MODSEL_REG);
- if ((val & AWIN_CAN_MODSEL_REG) == 0)
+ if ((val & AWIN_CAN_MODSEL_RST) == 0)
return;
}
printf("%s: couldn't leave reset mode\n", device_xname(sc->sc_dev));
CVS commit: [bouyer-socketcan] src/sys/arch/arm/allwinner
Module Name:src
Committed By: bouyer
Date: Wed Apr 19 17:53:32 UTC 2017
Modified Files:
src/sys/arch/arm/allwinner [bouyer-socketcan]: awin_io.c
Log Message:
Add awincan
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.4.1 src/sys/arch/arm/allwinner/awin_io.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/arm/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.46 src/sys/arch/arm/allwinner/awin_io.c:1.46.4.1
--- src/sys/arch/arm/allwinner/awin_io.c:1.46 Wed May 11 18:33:40 2016
+++ src/sys/arch/arm/allwinner/awin_io.c Wed Apr 19 17:53:32 2017
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.46 2016/05/11 18:33:40 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.46.4.1 2017/04/19 17:53:32 bouyer Exp $");
#include
#include
@@ -192,6 +192,7 @@ static const struct awin_locators awin_l
{ "awinir", OFFANDSIZE(A31_CIR), NOPORT, AWIN_A31_IRQ_CIR, A31 },
{ "awinir", OFFANDSIZE(A80_CIR), NOPORT, AWIN_A80_IRQ_R_CIR, A80 },
{ "awinlradc", OFFANDSIZE(LRADC), NOPORT, AWIN_IRQ_LRADC, A20 },
+ { "awincan", OFFANDSIZE(CAN), NOPORT, AWIN_IRQ_CAN, A20 },
};
static int
CVS commit: [bouyer-socketcan] src/sys/netcan
Module Name:src
Committed By: bouyer
Date: Wed Apr 19 17:52:38 UTC 2017
Modified Files:
src/sys/netcan [bouyer-socketcan]: can.c
Log Message:
Call if_alloc_sadl() for the interface, so that getifaddrs() will find
them.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/netcan/can.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/netcan/can.c
diff -u src/sys/netcan/can.c:1.1.2.8 src/sys/netcan/can.c:1.1.2.9
--- src/sys/netcan/can.c:1.1.2.8 Tue Apr 18 20:37:38 2017
+++ src/sys/netcan/can.c Wed Apr 19 17:52:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: can.c,v 1.1.2.8 2017/04/18 20:37:38 bouyer Exp $ */
+/* $NetBSD: can.c,v 1.1.2.9 2017/04/19 17:52:37 bouyer Exp $ */
/*-
* Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.8 2017/04/18 20:37:38 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.9 2017/04/19 17:52:37 bouyer Exp $");
#include
#include
@@ -200,6 +200,7 @@ can_ifattach(struct ifnet *ifp) {
ifp->if_dlt = DLT_CAN_SOCKETCAN;
ifp->if_output = NULL; /* unused */
IFQ_SET_READY(&ifp->if_snd);
+ if_alloc_sadl(ifp);
}
void
CVS commit: [bouyer-socketcan] src/sbin/canconfig
Module Name:src
Committed By: bouyer
Date: Wed Apr 19 17:51:16 UTC 2017
Modified Files:
src/sbin/canconfig [bouyer-socketcan]: canconfig.c
Log Message:
Make output better
Fix setting timings parameters
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sbin/canconfig/canconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/canconfig/canconfig.c
diff -u src/sbin/canconfig/canconfig.c:1.1.2.1 src/sbin/canconfig/canconfig.c:1.1.2.2
--- src/sbin/canconfig/canconfig.c:1.1.2.1 Mon Apr 17 20:48:36 2017
+++ src/sbin/canconfig/canconfig.c Wed Apr 19 17:51:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: canconfig.c,v 1.1.2.1 2017/04/17 20:48:36 bouyer Exp $ */
+/* $NetBSD: canconfig.c,v 1.1.2.2 2017/04/19 17:51:16 bouyer Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: canconfig.c,v 1.1.2.1 2017/04/17 20:48:36 bouyer Exp $");
+__RCSID("$NetBSD: canconfig.c,v 1.1.2.2 2017/04/19 17:51:16 bouyer Exp $");
#endif
@@ -202,7 +202,7 @@ main(int argc, char *argv[])
/* If the timings changed, update them. */
if (g_clt_updated &&
- do_cmd(sock, canifname, CANGLINKTIMINGS, &g_clt, sizeof(g_clt), 1) < 0)
+ do_cmd(sock, canifname, CANSLINKTIMINGS, &g_clt, sizeof(g_clt), 1) < 0)
err(1, "unable to set can link timings");
/* If the flags changed, update them. */
@@ -313,8 +313,7 @@ status(int sock, const char *canifname)
printb("flags", ifr.ifr_flags, IFFBITS);
printf("\n");
- printf("\tTimings:\n");
- show_timings(sock, canifname, "\t\t");
+ show_timings(sock, canifname, "\t");
}
@@ -340,7 +339,7 @@ show_timings(int sock, const char *canif
humanize_number(hbuf, sizeof(hbuf), cltc.cltc_clock_freq, "Hz", 0,
HN_AUTOSCALE | HN_NOSPACE | HN_DIVISOR_1000);
- printf("%scaps:\n", prefix);
+ printf("%stiming caps:\n", prefix);
printf("%s clock %s, brp [%d..%d]/%d, prop_seg [%d..%d]\n",
prefix, hbuf,
cltc.cltc_brp_min, cltc.cltc_brp_max, cltc.cltc_brp_inc,
@@ -352,12 +351,14 @@ show_timings(int sock, const char *canif
cltc.cltc_sjw_max);
printf("%s ", prefix);
printb("capabilities", cltc.cltc_linkmode_caps, CAN_IFFBITS);
- printf("%soperational:\n", prefix);
+ printf("\n");
+ printf("%soperational timings:\n", prefix);
printf("%s brp %d prop_seg %d, phase_seg1 %d, phase_seg2 %d, sjw %d\n",
prefix,
clt.clt_brp, clt.clt_prop, clt.clt_ps1, clt.clt_ps2, clt.clt_sjw);
printf("%s ", prefix);
printb("mode", linkmode, CAN_IFFBITS);
+ printf("\n");
}
static int
@@ -417,7 +418,7 @@ do_canflag(int sock, const char *canifna
cmd = CANSLINKMODE;
else
cmd = CANCLINKMODE;
- return do_cmd(sock, canifname, cmd, &flag, sizeof(flag), 1);
+ return do_cmd(sock, canifname, cmd, &flag, sizeof(flag), set);
}
static void
CVS commit: [netbsd-7] src/doc
Module Name:src
Committed By: snj
Date: Wed Apr 19 17:17:18 UTC 2017
Modified Files:
src/doc [netbsd-7]: CHANGES-7.2
Log Message:
1354, 1382, 1385, 1388, 1403
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-7.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-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.10 src/doc/CHANGES-7.2:1.1.2.11
--- src/doc/CHANGES-7.2:1.1.2.10 Tue Apr 18 19:54:52 2017
+++ src/doc/CHANGES-7.2 Wed Apr 19 17:17:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.10 2017/04/18 19:54:52 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.11 2017/04/19 17:17:17 snj Exp $
A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
release:
@@ -603,7 +603,7 @@ sys/compat/linux/arch/powerpc/linux_sysc
sys/compat/linux/arch/powerpc/linux_sysent.c regen
sys/compat/linux/arch/powerpc/syscalls.master 1.70 via patch
sys/compat/linux/common/linux_misc.c 1.234
-sys/compat/linux/common/linux_signal.h 1.31
+sys/compat/linux/common/linux_signal.h 1.31, 1.32
Add pselect6 Linux system call.
[manu, ticket #1354]
@@ -615,3 +615,28 @@ sys/arch/xen/x86/xen_pmap.c 1.25
Make xen dom0 SMP bootable again. Disabled by default.
[khorben/bouyer, ticket #1367]
+sys/arch/powerpc/powerpc/locore_subr.S 1.55
+
+ PR 44387: Fix hangs where a softint thread is blocked
+ waiting for a mutex that is not held.
+ [phx, ticket #1382]
+
+sys/dev/pci/if_wm.c1.497
+
+ Fix panic on shutdown. PR kern/52039.
+ [kardel, ticket #1385]
+
+bin/sh/expand.c 1.102
+
+ Fix for the "${unset-var#$(cmd1)}$(cmd2)" runs the wrong
+ ommand bug.
+ [kre, ticket #1388]
+
+sys/rump/dev/lib/libugenhc/ugenhc.c 1.25, 1.26
+
+ Fix order of outputs in rumpuser_open call.
+ Fix bulk xfer buffer with usedma = false.
+
+ Now ugenhc works again after a four-year hiatus.
+ [skrll, ticket #1403]
+
CVS commit: [netbsd-7] src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: snj
Date: Wed Apr 19 17:15:18 UTC 2017
Modified Files:
src/sys/rump/dev/lib/libugenhc [netbsd-7]: ugenhc.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1403):
sys/rump/dev/lib/libugenhc/ugenhc.c: revision 1.25, 1.26
Fix order of outputs in rumpuser_open call.
Now ugenhc works again after a four-year hiatus...
--
Fix bulk xfer buffer with usedma = false.
To generate a diff of this commit:
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/sys/rump/dev/lib/libugenhc/ugenhc.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/rump/dev/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.2.1 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.2.2
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.2.1 Wed Apr 5 19:54:23 2017
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Wed Apr 19 17:15:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.22.2.1 2017/04/05 19:54:23 snj Exp $ */
+/* $NetBSD: ugenhc.c,v 1.22.2.2 2017/04/19 17:15:18 snj Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.2.1 2017/04/05 19:54:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.2.2 2017/04/19 17:15:18 snj Exp $");
#include
#include
@@ -489,7 +489,7 @@ rhscintr(void *arg)
*/
for (;;) {
- fd = rumpuser_open(buf, RUMPUSER_OPEN_RDWR, &error);
+ error = rumpuser_open(buf, RUMPUSER_OPEN_RDWR, &fd);
if (fd == -1)
break;
@@ -603,7 +603,7 @@ rumpusb_device_bulk_start(struct usbd_xf
endpt = UE_GET_ADDR(endpt);
KASSERT(endpt < UGEN_NEPTS);
- buf = KERNADDR(&xfer->ux_dmabuf, 0);
+ buf = xfer->ux_buf;
done = 0;
if ((ed->bmAttributes & UE_XFERTYPE) == UE_ISOCHRONOUS) {
for (i = 0, len = 0; i < xfer->ux_nframes; i++)
CVS commit: [netbsd-7] src/bin/sh
Module Name:src
Committed By: snj
Date: Wed Apr 19 17:09:38 UTC 2017
Modified Files:
src/bin/sh [netbsd-7]: expand.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1388):
bin/sh/expand.c: revision 1.102
Fix for the "${unset-var#$(cmd1)}$(cmd2)" runs the wrong command bug.
... From FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.91.4.1 src/bin/sh/expand.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.91 src/bin/sh/expand.c:1.91.4.1
--- src/bin/sh/expand.c:1.91 Mon Jan 20 14:05:51 2014
+++ src/bin/sh/expand.c Wed Apr 19 17:09:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.91 2014/01/20 14:05:51 roy Exp $ */
+/* $NetBSD: expand.c,v 1.91.4.1 2017/04/19 17:09:38 snj Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else
-__RCSID("$NetBSD: expand.c,v 1.91 2014/01/20 14:05:51 roy Exp $");
+__RCSID("$NetBSD: expand.c,v 1.91.4.1 2017/04/19 17:09:38 snj Exp $");
#endif
#endif /* not lint */
@@ -753,8 +753,10 @@ again: /* jump here after setting a vari
case VSTRIMLEFTMAX:
case VSTRIMRIGHT:
case VSTRIMRIGHTMAX:
- if (!set)
+ if (!set) {
+ set = 1; /* allow argbackq to be advanced if needed */
break;
+ }
/*
* Terminate the string and start recording the pattern
* right after it
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: snj Date: Wed Apr 19 17:06:21 UTC 2017 Modified Files: src/sys/dev/pci [netbsd-7]: if_wm.c Log Message: Pull up following revision(s) (requested by kardel in ticket #1385): sys/dev/pci/if_wm.c: revision 1.497 PR kern/52039: use same safeguard as for the 82578 To generate a diff of this commit: cvs rdiff -u -r1.289.2.13 -r1.289.2.14 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.289.2.13 src/sys/dev/pci/if_wm.c:1.289.2.14 --- src/sys/dev/pci/if_wm.c:1.289.2.13 Thu Mar 9 06:28:36 2017 +++ src/sys/dev/pci/if_wm.c Wed Apr 19 17:06:21 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.289.2.13 2017/03/09 06:28:36 snj Exp $ */ +/* $NetBSD: if_wm.c,v 1.289.2.14 2017/04/19 17:06:21 snj Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -84,7 +84,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.13 2017/03/09 06:28:36 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.14 2017/04/19 17:06:21 snj Exp $"); #include #include @@ -11153,7 +11153,7 @@ wm_enable_wakeup(struct wm_softc *sc) /* Assume that the PHY is copper */ child = LIST_FIRST(&sc->sc_mii.mii_phys); - if (child->mii_mpd_rev <= 2) + if ((child != NULL) && (child->mii_mpd_rev <= 2)) sc->sc_mii.mii_writereg(sc->sc_dev, 1, (768 << 5) | 25, 0x0444); /* magic num */ }
CVS commit: [netbsd-7] src/sys/arch/powerpc/powerpc
Module Name:src Committed By: snj Date: Wed Apr 19 17:02:43 UTC 2017 Modified Files: src/sys/arch/powerpc/powerpc [netbsd-7]: locore_subr.S Log Message: Pull up following revision(s) (requested by phx in ticket #1382): sys/arch/powerpc/powerpc/locore_subr.S: revision 1.55 in cpu_switchto() and the fast-softint context switch code, put back the stwcx. instruction to clear the reservation. we used to have this in the old cpu_switch() until it was if-0'd in 2003 and removed completely in 2007. this fixes hangs I've seen where a softint thread is blocked waiting for a mutex that is not held. this should also fix PR 44387. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.54.2.1 src/sys/arch/powerpc/powerpc/locore_subr.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/powerpc/powerpc/locore_subr.S diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.54 src/sys/arch/powerpc/powerpc/locore_subr.S:1.54.2.1 --- src/sys/arch/powerpc/powerpc/locore_subr.S:1.54 Wed Jul 30 23:27:55 2014 +++ src/sys/arch/powerpc/powerpc/locore_subr.S Wed Apr 19 17:02:43 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_subr.S,v 1.54 2014/07/30 23:27:55 matt Exp $ */ +/* $NetBSD: locore_subr.S,v 1.54.2.1 2017/04/19 17:02:43 snj Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -288,6 +288,7 @@ switchto_restore: */ ldreg %r31,CFRAME_R31(%r1) /* restore saved registers */ ldreg %r30,CFRAME_R30(%r1) + stwcx. %r1,0,%r1 /* clear reservation */ #if 1 addi %r1,%r1,CALLFRAMELEN #else @@ -328,6 +329,7 @@ _ENTRY(softint_cleanup) mtmsr %r0 isync #endif + stwcx. %r1,0,%r1 /* clear reservation */ addi %r1, %r1, CALLFRAMELEN ldreg %r0, CFRAME_LR(%r1) mtlr %r0 @@ -478,6 +480,7 @@ _ENTRY(softint_fast_dispatch) ldreg %r29,SFRAME_R29(%r1) /* R29 */ ldreg %r31,SFRAMELEN+CFRAME_R31(%r1) /* restore saved registers */ ldreg %r30,SFRAMELEN+CFRAME_R30(%r1) + stwcx. %r1,0,%r1 /* clear reservation */ addi %r1,%r1,SFRAMELEN+2*CALLFRAMELEN /* remove switch & callframes */ #endif ldreg %r0,CFRAME_LR(%r1)
CVS commit: [netbsd-7] src/sys/compat/linux/common
Module Name:src
Committed By: snj
Date: Wed Apr 19 16:58:28 UTC 2017
Modified Files:
src/sys/compat/linux/common [netbsd-7]: linux_signal.h
Log Message:
Fix fallout from ticket #1354 by applying:
sys/compat/linux/common/linux_signal.h: revision 1.32
Provide a dummy linux_sigset_t for all architectures that do not have
any machdep one. This make kdump compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.30.38.1 -r1.30.38.2 \
src/sys/compat/linux/common/linux_signal.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/compat/linux/common/linux_signal.h
diff -u src/sys/compat/linux/common/linux_signal.h:1.30.38.1 src/sys/compat/linux/common/linux_signal.h:1.30.38.2
--- src/sys/compat/linux/common/linux_signal.h:1.30.38.1 Mon Apr 17 05:19:09 2017
+++ src/sys/compat/linux/common/linux_signal.h Wed Apr 19 16:58:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.h,v 1.30.38.1 2017/04/17 05:19:09 snj Exp $ */
+/* $NetBSD: linux_signal.h,v 1.30.38.2 2017/04/19 16:58:28 snj Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -46,6 +46,8 @@
#include
#elif defined(__amd64__)
#include
+#else
+typedef void linux_sigset_t;
#endif
typedef struct {
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Wed Apr 19 15:54:45 UTC 2017
Modified Files:
src/sys/kern: subr_kobj.c
Log Message:
simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/kern/subr_kobj.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/kern/subr_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.60 src/sys/kern/subr_kobj.c:1.61
--- src/sys/kern/subr_kobj.c:1.60 Wed Apr 19 02:19:02 2017
+++ src/sys/kern/subr_kobj.c Wed Apr 19 11:54:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.60 2017/04/19 06:19:02 pgoyette Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.61 2017/04/19 15:54:45 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.60 2017/04/19 06:19:02 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.61 2017/04/19 15:54:45 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -629,6 +629,29 @@ kobj_load(kobj_t ko)
return error;
}
+static void
+kobj_unload_notify(kobj_t ko, vaddr_t addr, size_t size, const char *note)
+{
+ if (addr == 0)
+ return;
+
+ int error = kobj_machdep(ko, (void *)addr, size, false);
+ if (error)
+ kobj_error(ko, "machine dependent deinit failed (%s) %d",
+ note, error);
+}
+
+#define KOBJ_SEGMENT_NOTIFY(ko, what) \
+kobj_unload_notify(ko, (ko)->ko_ ## what ## _address, \
+ (ko)->ko_ ## what ## _size, # what);
+
+#define KOBJ_SEGMENT_FREE(ko, what) \
+do \
+ if ((ko)->ko_ ## what ## _address != 0) \
+ uvm_km_free(module_map, (ko)->ko_ ## what ## _address, \
+ round_page((ko)->ko_ ## what ## _size), UVM_KMF_WIRED); \
+while (/*CONSTCOND*/ 0)
+
/*
* kobj_unload:
*
@@ -637,51 +660,23 @@ kobj_load(kobj_t ko)
void
kobj_unload(kobj_t ko)
{
- int error;
-
kobj_close(ko);
kobj_jettison(ko);
+
/*
* Notify MD code that a module has been unloaded.
*/
if (ko->ko_loaded) {
- if (ko->ko_text_address != 0) {
- error = kobj_machdep(ko, (void *)ko->ko_text_address,
- ko->ko_text_size, false);
- if (error != 0)
-kobj_error(ko, "machine dependent deinit failed"
- " (text) %d", error);
- }
+ KOBJ_SEGMENT_NOTIFY(ko, text);
+ KOBJ_SEGMENT_NOTIFY(ko, data);
+ KOBJ_SEGMENT_NOTIFY(ko, rodata);
+ }
- if (ko->ko_data_address != 0) {
- error = kobj_machdep(ko, (void *)ko->ko_data_address,
- ko->ko_data_size, false);
- if (error != 0)
-kobj_error(ko, "machine dependent deinit failed"
-"(data) %d", error);
- }
+ KOBJ_SEGMENT_FREE(ko, text);
+ KOBJ_SEGMENT_FREE(ko, data);
+ KOBJ_SEGMENT_FREE(ko, rodata);
- if (ko->ko_rodata_address != 0) {
- error = kobj_machdep(ko, (void *)ko->ko_rodata_address,
- ko->ko_rodata_size, false);
- if (error != 0)
-kobj_error(ko, "machine dependent deinit failed"
-"(rodata) %d", error);
- }
- }
- if (ko->ko_text_address != 0) {
- uvm_km_free(module_map, ko->ko_text_address,
- round_page(ko->ko_text_size), UVM_KMF_WIRED);
- }
- if (ko->ko_data_address != 0) {
- uvm_km_free(module_map, ko->ko_data_address,
- round_page(ko->ko_data_size), UVM_KMF_WIRED);
- }
- if (ko->ko_rodata_address != 0) {
- uvm_km_free(module_map, ko->ko_rodata_address,
- round_page(ko->ko_rodata_size), UVM_KMF_WIRED);
- }
if (ko->ko_ksyms == true) {
ksyms_modunload(ko->ko_name);
}
CVS commit: src/share/man/man4
Module Name:src Committed By: riastradh Date: Wed Apr 19 15:37:46 UTC 2017 Modified Files: src/share/man/man4: ualea.4 Log Message: The wiz daemon was unsatisfied with offering, so fix section heading. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/ualea.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ualea.4 diff -u src/share/man/man4/ualea.4:1.1 src/share/man/man4/ualea.4:1.2 --- src/share/man/man4/ualea.4:1.1 Wed Apr 19 00:17:31 2017 +++ src/share/man/man4/ualea.4 Wed Apr 19 15:37:46 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: ualea.4,v 1.1 2017/04/19 00:17:31 riastradh Exp $ +.\" $NetBSD: ualea.4,v 1.2 2017/04/19 15:37:46 riastradh Exp $ .\" .\" Copyright (c) 2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -50,6 +50,6 @@ driver first appeared in .Nx 8.0 . .Sh AUTHORS .An Taylor R Campbell Aq Mt riastr...@netbsd.org -.Sh BUGS +.Sh CAVEATS Destruction of an Alea II TRNG device with a consumer-grade laundry washing machine is ineffective.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Wed Apr 19 15:34:25 UTC 2017 Modified Files: src/crypto/external/bsd/openssh/dist: sshd_config Log Message: fix conflict. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/sshd_config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssh/dist/sshd_config diff -u src/crypto/external/bsd/openssh/dist/sshd_config:1.20 src/crypto/external/bsd/openssh/dist/sshd_config:1.21 --- src/crypto/external/bsd/openssh/dist/sshd_config:1.20 Tue Apr 18 14:41:46 2017 +++ src/crypto/external/bsd/openssh/dist/sshd_config Wed Apr 19 11:34:25 2017 @@ -1,4 +1,4 @@ -# $NetBSD: sshd_config,v 1.20 2017/04/18 18:41:46 christos Exp $ +# $NetBSD: sshd_config,v 1.21 2017/04/19 15:34:25 christos Exp $ # $OpenBSD: sshd_config,v 1.101 2017/03/14 07:19:07 djm Exp $ # This is the sshd server system-wide configuration file. See @@ -74,11 +74,8 @@ AuthorizedKeysFile .ssh/authorized_keys #PrintLastLog yes #TCPKeepAlive yes #UseLogin no -<<< sshd_config #UsePrivilegeSeparation sandbox UsePam yes -=== ->>> 1.1.1.15 #PermitUserEnvironment no #Compression delayed #ClientAliveInterval 0
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: jmcneill
Date: Wed Apr 19 12:58:59 UTC 2017
Modified Files:
src/sys/arch/arm/include: pci_machdep.h
Log Message:
Provide a pci_intr_setattr implementation. For chipset tags that don't
implement pc_intr_setattr, simply return ENODEV.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/pci_machdep.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/arm/include/pci_machdep.h
diff -u src/sys/arch/arm/include/pci_machdep.h:1.11 src/sys/arch/arm/include/pci_machdep.h:1.12
--- src/sys/arch/arm/include/pci_machdep.h:1.11 Sun Apr 16 18:02:50 2017
+++ src/sys/arch/arm/include/pci_machdep.h Wed Apr 19 12:58:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.11 2017/04/16 18:02:50 jmcneill Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.12 2017/04/19 12:58:59 jmcneill Exp $ */
/*
* Modified for arm32 by Mark Brinicombe
@@ -37,6 +37,8 @@
* Machine-specific definitions for PCI autoconfiguration.
*/
+#include
+
/*
* Types provided to machine-independent PCI code
*/
@@ -116,4 +118,13 @@ struct arm32_pci_chipset {
#define pci_conf_interrupt(c, b, d, i, s, p)\
(*(c)->pc_conf_interrupt)((c)->pc_conf_v, (b), (d), (i), (s), (p))
+static inline int
+pci_intr_setattr(pci_chipset_tag_t pc, pci_intr_handle_t *ihp,
+int attr, uint64_t data)
+{
+ if (!pc->pc_intr_setattr)
+ return ENODEV;
+ return pc->pc_intr_setattr(pc, ihp, attr, data);
+}
+
#endif /* _ARM_PCI_MACHDEP_H_ */
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src Committed By: jmcneill Date: Wed Apr 19 12:34:14 UTC 2017 Modified Files: src/sys/arch/arm/s3c2xx0: s3c2800_pci.c Log Message: Initialize intr_setattr of arm32_pci_chipset To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/s3c2xx0/s3c2800_pci.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/arm/s3c2xx0/s3c2800_pci.c diff -u src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.22 src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.23 --- src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.22 Fri Oct 2 05:22:50 2015 +++ src/sys/arch/arm/s3c2xx0/s3c2800_pci.c Wed Apr 19 12:34:14 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: s3c2800_pci.c,v 1.22 2015/10/02 05:22:50 msaitoh Exp $ */ +/* $NetBSD: s3c2800_pci.c,v 1.23 2017/04/19 12:34:14 jmcneill Exp $ */ /* * Copyright (c) 2002 Fujitsu Component Limited @@ -100,7 +100,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.22 2015/10/02 05:22:50 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.23 2017/04/19 12:34:14 jmcneill Exp $"); #include "opt_pci.h" #include "pci.h" @@ -208,6 +208,7 @@ struct arm32_pci_chipset sspci_chipset = s3c2800_pci_intr_map, s3c2800_pci_intr_string, s3c2800_pci_intr_evcnt, + NULL, /* intr_setattr */ s3c2800_pci_intr_establish, s3c2800_pci_intr_disestablish, #ifdef __HAVE_PCI_CONF_HOOK
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: jmcneill Date: Wed Apr 19 12:26:00 UTC 2017 Modified Files: src/sys/arch/arm/marvell: pci_machdep.c Log Message: Initialize intr_setattr of arm32_pci_chipset To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/marvell/pci_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/arm/marvell/pci_machdep.c diff -u src/sys/arch/arm/marvell/pci_machdep.c:1.11 src/sys/arch/arm/marvell/pci_machdep.c:1.12 --- src/sys/arch/arm/marvell/pci_machdep.c:1.11 Fri Mar 10 15:44:24 2017 +++ src/sys/arch/arm/marvell/pci_machdep.c Wed Apr 19 12:26:00 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.11 2017/03/10 15:44:24 skrll Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.12 2017/04/19 12:26:00 jmcneill Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.11 2017/03/10 15:44:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.12 2017/04/19 12:26:00 jmcneill Exp $"); #include "opt_mvsoc.h" #include "gtpci.h" @@ -93,6 +93,7 @@ struct arm32_pci_chipset arm32_gtpci_chi gtpci_gpp_intr_map, gtpci_gpp_intr_string, gtpci_gpp_intr_evcnt, + NULL, /* intr_setattr */ gtpci_gpp_intr_establish, gtpci_gpp_intr_disestablish, #ifdef __HAVE_PCI_CONF_HOOK @@ -123,6 +124,7 @@ struct arm32_pci_chipset arm32_mvpex0_ch mvpex_intr_map, mvpex_intr_string, mvpex_intr_evcnt, + NULL, /* intr_setattr */ mvpex_intr_establish, mvpex_intr_disestablish, #ifdef __HAVE_PCI_CONF_HOOK @@ -146,6 +148,7 @@ struct arm32_pci_chipset arm32_mvpex1_ch mvpex_intr_map, mvpex_intr_string, mvpex_intr_evcnt, + NULL, /* intr_setattr */ mvpex_intr_establish, mvpex_intr_disestablish, #ifdef __HAVE_PCI_CONF_HOOK @@ -169,6 +172,7 @@ struct arm32_pci_chipset arm32_mvpex2_ch mvpex_intr_map, mvpex_intr_string, mvpex_intr_evcnt, + NULL, /* intr_setattr */ mvpex_intr_establish, mvpex_intr_disestablish, #ifdef __HAVE_PCI_CONF_HOOK @@ -192,6 +196,7 @@ struct arm32_pci_chipset arm32_mvpex3_ch mvpex_intr_map, mvpex_intr_string, mvpex_intr_evcnt, + NULL, /* intr_setattr */ mvpex_intr_establish, mvpex_intr_disestablish, #ifdef __HAVE_PCI_CONF_HOOK @@ -215,6 +220,7 @@ struct arm32_pci_chipset arm32_mvpex4_ch mvpex_intr_map, mvpex_intr_string, mvpex_intr_evcnt, + NULL, /* intr_setattr */ mvpex_intr_establish, mvpex_intr_disestablish, #ifdef __HAVE_PCI_CONF_HOOK @@ -238,6 +244,7 @@ struct arm32_pci_chipset arm32_mvpex5_ch mvpex_intr_map, mvpex_intr_string, mvpex_intr_evcnt, + NULL, /* intr_setattr */ mvpex_intr_establish, mvpex_intr_disestablish, #ifdef __HAVE_PCI_CONF_HOOK @@ -261,6 +268,7 @@ struct arm32_pci_chipset arm32_mvpex6_ch mvpex_intr_map, mvpex_intr_string, mvpex_intr_evcnt, + NULL, /* intr_setattr */ mvpex_intr_establish, mvpex_intr_disestablish, #ifdef __HAVE_PCI_CONF_HOOK
CVS commit: src/share/man/man9
Module Name:src Committed By: abhinav Date: Wed Apr 19 11:33:01 UTC 2017 Modified Files: src/share/man/man9: namecache.9 Log Message: Fix typo: s/nshashtbl/nchashtbl To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man9/namecache.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/namecache.9 diff -u src/share/man/man9/namecache.9:1.20 src/share/man/man9/namecache.9:1.21 --- src/share/man/man9/namecache.9:1.20 Sat Mar 18 21:21:24 2017 +++ src/share/man/man9/namecache.9 Wed Apr 19 11:33:01 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: namecache.9,v 1.20 2017/03/18 21:21:24 riastradh Exp $ +.\" $NetBSD: namecache.9,v 1.21 2017/04/19 11:33:01 abhinav Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -105,7 +105,7 @@ case, and are almost never of interest. Each .Em namecache entry can appear on two hash chains in addition to -.Va nshashtbl : +.Va nchashtbl : .Em ncvhashtbl (the name cache directory hash chain), and .Em nclruhead
CVS commit: src/sys/netipsec
Module Name:src
Committed By: ozaki-r
Date: Wed Apr 19 09:23:19 UTC 2017
Modified Files:
src/sys/netipsec: key.c
Log Message:
Reduce return points (NFC)
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.113 src/sys/netipsec/key.c:1.114
--- src/sys/netipsec/key.c:1.113 Wed Apr 19 09:22:17 2017
+++ src/sys/netipsec/key.c Wed Apr 19 09:23:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.113 2017/04/19 09:22:17 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.114 2017/04/19 09:23:19 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.113 2017/04/19 09:22:17 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.114 2017/04/19 09:23:19 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -1489,9 +1489,8 @@ key_msg2sp(const struct sadb_x_policy *x
if (PFKEY_EXTLEN(xpl0) < sizeof(*xpl0)) {
ipseclog((LOG_DEBUG,
"key_msg2sp: Invalid msg length.\n"));
- KEY_FREESP(&newsp);
*error = EINVAL;
- return NULL;
+ goto free_exit;
}
tlen = PFKEY_EXTLEN(xpl0) - sizeof(*xpl0);
@@ -1502,9 +1501,8 @@ key_msg2sp(const struct sadb_x_policy *x
if (xisr->sadb_x_ipsecrequest_len < sizeof(*xisr)) {
ipseclog((LOG_DEBUG, "key_msg2sp: "
"invalid ipsecrequest length.\n"));
- KEY_FREESP(&newsp);
*error = EINVAL;
- return NULL;
+ goto free_exit;
}
/* allocate request buffer */
@@ -1512,9 +1510,8 @@ key_msg2sp(const struct sadb_x_policy *x
if ((*p_isr) == NULL) {
ipseclog((LOG_DEBUG,
"key_msg2sp: No more memory.\n"));
- KEY_FREESP(&newsp);
*error = ENOBUFS;
- return NULL;
+ goto free_exit;
}
memset(*p_isr, 0, sizeof(**p_isr));
@@ -1530,9 +1527,8 @@ key_msg2sp(const struct sadb_x_policy *x
ipseclog((LOG_DEBUG,
"key_msg2sp: invalid proto type=%u\n",
xisr->sadb_x_ipsecrequest_proto));
- KEY_FREESP(&newsp);
*error = EPROTONOSUPPORT;
- return NULL;
+ goto free_exit;
}
(*p_isr)->saidx.proto = xisr->sadb_x_ipsecrequest_proto;
@@ -1545,9 +1541,8 @@ key_msg2sp(const struct sadb_x_policy *x
ipseclog((LOG_DEBUG,
"key_msg2sp: invalid mode=%u\n",
xisr->sadb_x_ipsecrequest_mode));
- KEY_FREESP(&newsp);
*error = EINVAL;
- return NULL;
+ goto free_exit;
}
(*p_isr)->saidx.mode = xisr->sadb_x_ipsecrequest_mode;
@@ -1575,9 +1570,8 @@ key_msg2sp(const struct sadb_x_policy *x
if (xisr_reqid == 0) {
u_int16_t reqid;
if ((reqid = key_newreqid()) == 0) {
- KEY_FREESP(&newsp);
*error = ENOBUFS;
- return NULL;
+ goto free_exit;
}
(*p_isr)->saidx.reqid = reqid;
} else {
@@ -1589,9 +1583,8 @@ key_msg2sp(const struct sadb_x_policy *x
default:
ipseclog((LOG_DEBUG, "key_msg2sp: invalid level=%u\n",
xisr->sadb_x_ipsecrequest_level));
- KEY_FREESP(&newsp);
*error = EINVAL;
- return NULL;
+ goto free_exit;
}
(*p_isr)->level = xisr->sadb_x_ipsecrequest_level;
@@ -1606,9 +1599,8 @@ key_msg2sp(const struct sadb_x_policy *x
> sizeof((*p_isr)->saidx.src)) {
ipseclog((LOG_DEBUG, "key_msg2sp: invalid request "
"address length.\n"));
-KEY_FREESP(&newsp);
*error = EINVAL;
-return NULL;
+goto free_exit;
}
memcpy(&(*p_isr)->saidx.src, paddr, paddr->sa_len);
@@ -1620,9 +1612,8 @@ key_msg2sp(const struct sadb_x_policy *x
> sizeof((*p_isr)->saidx.dst)) {
ipseclog((LOG_DEBUG, "key_msg2sp: invalid request "
"address length.\n"));
-KEY_FREESP(&newsp);
*error = EINVAL;
-return NULL;
+goto free_exit;
}
memcpy(&(*p_isr)->saidx.dst, paddr, paddr->sa_len);
}
@@ -1637,9 +1628,8 @@ key_msg2sp(const struct sadb_x_policy *x
/* validity check */
if (tlen < 0) {
ipseclog((LOG_DEBUG, "key_msg2sp: becoming tlen < 0.\n"));
- KEY_FREESP(&newsp);
*error = EINVAL;
- return NULL;
+ goto free_exit;
}
xisr = (const struct sadb_x_ipsecrequest *)((const char *)xisr
@@ -1649,6 +1639,10 @@ key_msg2sp(const struct sadb_x_policy *x
*error = 0;
return newsp;
+
+free_exit:
+ KEY_FREESP(&newsp);
+ return NULL;
}
static u_int16_t
CVS commit: src/sys/netipsec
Module Name:src
Committed By: ozaki-r
Date: Wed Apr 19 09:22:17 UTC 2017
Modified Files:
src/sys/netipsec: key.c
Log Message:
Return early, reduce identation (NFCI)
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.112 src/sys/netipsec/key.c:1.113
--- src/sys/netipsec/key.c:1.112 Wed Apr 19 07:19:46 2017
+++ src/sys/netipsec/key.c Wed Apr 19 09:22:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.112 2017/04/19 07:19:46 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.113 2017/04/19 09:22:17 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.112 2017/04/19 07:19:46 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.113 2017/04/19 09:22:17 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -1465,183 +1465,187 @@ key_msg2sp(const struct sadb_x_policy *x
case IPSEC_POLICY_ENTRUST:
case IPSEC_POLICY_BYPASS:
newsp->req = NULL;
- break;
+ *error = 0;
+ return newsp;
case IPSEC_POLICY_IPSEC:
- {
- int tlen;
- const struct sadb_x_ipsecrequest *xisr;
- uint16_t xisr_reqid;
- struct ipsecrequest **p_isr = &newsp->req;
+ /* Continued */
+ break;
+ default:
+ ipseclog((LOG_DEBUG, "key_msg2sp: invalid policy type.\n"));
+ KEY_FREESP(&newsp);
+ *error = EINVAL;
+ return NULL;
+ }
- /* validity check */
- if (PFKEY_EXTLEN(xpl0) < sizeof(*xpl0)) {
- ipseclog((LOG_DEBUG,
- "key_msg2sp: Invalid msg length.\n"));
+ /* IPSEC_POLICY_IPSEC */
+{
+ int tlen;
+ const struct sadb_x_ipsecrequest *xisr;
+ uint16_t xisr_reqid;
+ struct ipsecrequest **p_isr = &newsp->req;
+
+ /* validity check */
+ if (PFKEY_EXTLEN(xpl0) < sizeof(*xpl0)) {
+ ipseclog((LOG_DEBUG,
+ "key_msg2sp: Invalid msg length.\n"));
+ KEY_FREESP(&newsp);
+ *error = EINVAL;
+ return NULL;
+ }
+
+ tlen = PFKEY_EXTLEN(xpl0) - sizeof(*xpl0);
+ xisr = (const struct sadb_x_ipsecrequest *)(xpl0 + 1);
+
+ while (tlen > 0) {
+ /* length check */
+ if (xisr->sadb_x_ipsecrequest_len < sizeof(*xisr)) {
+ ipseclog((LOG_DEBUG, "key_msg2sp: "
+"invalid ipsecrequest length.\n"));
KEY_FREESP(&newsp);
*error = EINVAL;
return NULL;
}
- tlen = PFKEY_EXTLEN(xpl0) - sizeof(*xpl0);
- xisr = (const struct sadb_x_ipsecrequest *)(xpl0 + 1);
+ /* allocate request buffer */
+ KMALLOC(*p_isr, struct ipsecrequest *, sizeof(**p_isr));
+ if ((*p_isr) == NULL) {
+ ipseclog((LOG_DEBUG,
+ "key_msg2sp: No more memory.\n"));
+ KEY_FREESP(&newsp);
+ *error = ENOBUFS;
+ return NULL;
+ }
+ memset(*p_isr, 0, sizeof(**p_isr));
- while (tlen > 0) {
- /* length check */
- if (xisr->sadb_x_ipsecrequest_len < sizeof(*xisr)) {
-ipseclog((LOG_DEBUG, "key_msg2sp: "
- "invalid ipsecrequest length.\n"));
-KEY_FREESP(&newsp);
-*error = EINVAL;
-return NULL;
- }
+ /* set values */
+ (*p_isr)->next = NULL;
- /* allocate request buffer */
- KMALLOC(*p_isr, struct ipsecrequest *, sizeof(**p_isr));
- if ((*p_isr) == NULL) {
-ipseclog((LOG_DEBUG,
-"key_msg2sp: No more memory.\n"));
-KEY_FREESP(&newsp);
-*error = ENOBUFS;
-return NULL;
- }
- memset(*p_isr, 0, sizeof(**p_isr));
+ switch (xisr->sadb_x_ipsecrequest_proto) {
+ case IPPROTO_ESP:
+ case IPPROTO_AH:
+ case IPPROTO_IPCOMP:
+ break;
+ default:
+ ipseclog((LOG_DEBUG,
+ "key_msg2sp: invalid proto type=%u\n",
+ xisr->sadb_x_ipsecrequest_proto));
+ KEY_FREESP(&newsp);
+ *error = EPROTONOSUPPORT;
+ return NULL;
+ }
+ (*p_isr)->saidx.proto = xisr->sadb_x_ipsecrequest_proto;
- /* set values */
- (*p_isr)->next = NULL;
+ switch (xisr->sadb_x_ipsecrequest_mode) {
+ case IPSEC_MODE_TRANSPORT:
+ case IPSEC_MODE_TUNNEL:
+ break;
+ case IPSEC_MODE_ANY:
+ default:
+ ipseclog((LOG_DEBUG,
+ "key_msg2sp: invalid mode=%u\n",
+ xisr->sadb_x_ipsecrequest_mode));
+ KEY_FREESP(&newsp);
+ *error = EINVAL;
+ return NULL;
+ }
+ (*p_isr)->saidx.mode = xisr->sadb_x_ipsecrequest_mode;
- switch (xisr->sadb_x_ipsecrequest_proto) {
- case IPPROTO_ESP:
- case IPPROTO_AH:
- case IPPROTO_IPCOMP:
-break;
- default:
+ switch (xisr->sadb_x_ipsecrequest_level) {
+ case IPSEC_LEVEL_DEFAULT:
+ case IPSEC_LEVEL_USE:
+ case IPSEC_LEVEL_REQUIRE:
+ break;
+ case IPSEC_LEVEL_UNIQUE:
+ xisr_reqid = xisr->sadb_x_ipsecrequest_reqid;
+ /* validity check */
+ /*
+ * If range violation of reqid, kernel will
+ * update it, don't refuse it.
+ */
+ if (xisr_reqid > IPSEC_MANUAL_REQID_MAX) {
ipseclog((LOG_DEBUG,
-"key_msg2sp: invalid proto type=%u\n",
-xisr->sadb_x_ipsecrequest_proto));
-KEY_
CVS commit: src/sys/arch/arm/footbridge
Module Name:src
Committed By: skrll
Date: Wed Apr 19 08:30:01 UTC 2017
Modified Files:
src/sys/arch/arm/footbridge: footbridge_pci.c
Log Message:
Use designated initialisers and fix build in process.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/footbridge/footbridge_pci.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/arm/footbridge/footbridge_pci.c
diff -u src/sys/arch/arm/footbridge/footbridge_pci.c:1.28 src/sys/arch/arm/footbridge/footbridge_pci.c:1.29
--- src/sys/arch/arm/footbridge/footbridge_pci.c:1.28 Fri Oct 2 05:22:49 2015
+++ src/sys/arch/arm/footbridge/footbridge_pci.c Wed Apr 19 08:30:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_pci.c,v 1.28 2015/10/02 05:22:49 msaitoh Exp $ */
+/* $NetBSD: footbridge_pci.c,v 1.29 2017/04/19 08:30:00 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.28 2015/10/02 05:22:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.29 2017/04/19 08:30:00 skrll Exp $");
#include
#include
@@ -77,23 +77,21 @@ void footbridge_pci_intr_disestablish(v
const struct evcnt *footbridge_pci_intr_evcnt(void *, pci_intr_handle_t);
struct arm32_pci_chipset footbridge_pci_chipset = {
- NULL, /* conf_v */
#ifdef netwinder
- netwinder_pci_attach_hook,
+ .pc_attach_hook = netwinder_pci_attach_hook,
#else
- footbridge_pci_attach_hook,
+ .pc_attach_hook = footbridge_pci_attach_hook,
#endif
- footbridge_pci_bus_maxdevs,
- footbridge_pci_make_tag,
- footbridge_pci_decompose_tag,
- footbridge_pci_conf_read,
- footbridge_pci_conf_write,
- NULL, /* intr_v */
- footbridge_pci_intr_map,
- footbridge_pci_intr_string,
- footbridge_pci_intr_evcnt,
- footbridge_pci_intr_establish,
- footbridge_pci_intr_disestablish
+ .pc_bus_maxdevs = footbridge_pci_bus_maxdevs,
+ .pc_make_tag = footbridge_pci_make_tag,
+ .pc_decompose_tag = footbridge_pci_decompose_tag,
+ .pc_conf_read = footbridge_pci_conf_read,
+ .pc_conf_write = footbridge_pci_conf_write,
+ .pc_intr_map = footbridge_pci_intr_map,
+ .pc_intr_string = footbridge_pci_intr_string,
+ .pc_intr_evcnt = footbridge_pci_intr_evcnt,
+ .pc_intr_establish = footbridge_pci_intr_establish,
+ .pc_intr_disestablish = footbridge_pci_intr_disestablish
};
struct arm32_dma_range footbridge_dma_ranges[1];
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Apr 19 07:35:45 UTC 2017
Modified Files:
src/sys/dev/pci: if_bce.c
Log Message:
Add another BCM4401 chip support.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/if_bce.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_bce.c
diff -u src/sys/dev/pci/if_bce.c:1.45 src/sys/dev/pci/if_bce.c:1.46
--- src/sys/dev/pci/if_bce.c:1.45 Wed Apr 19 06:52:11 2017
+++ src/sys/dev/pci/if_bce.c Wed Apr 19 07:35:44 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.45 2017/04/19 06:52:11 msaitoh Exp $ */
+/* $NetBSD: if_bce.c,v 1.46 2017/04/19 07:35:44 msaitoh Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.45 2017/04/19 06:52:11 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.46 2017/04/19 07:35:44 msaitoh Exp $");
#include "vlan.h"
@@ -198,6 +198,11 @@ static const struct bce_product {
"Broadcom BCM4401-B0 10/100 Ethernet"
},
{
+ PCI_VENDOR_BROADCOM,
+ PCI_PRODUCT_BROADCOM_BCM4401_B1,
+ "Broadcom BCM4401-B1 10/100 Ethernet"
+ },
+ {
0,
0,
CVS commit: src/sys/netipsec
Module Name:src
Committed By: ozaki-r
Date: Wed Apr 19 07:19:46 UTC 2017
Modified Files:
src/sys/netipsec: ipsec.c key.c
Log Message:
Use KASSERT for sanity checks of function arguments
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.111 -r1.112 src/sys/netipsec/key.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/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.79 src/sys/netipsec/ipsec.c:1.80
--- src/sys/netipsec/ipsec.c:1.79 Wed Apr 19 07:14:45 2017
+++ src/sys/netipsec/ipsec.c Wed Apr 19 07:19:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.79 2017/04/19 07:14:45 ozaki-r Exp $ */
+/* $NetBSD: ipsec.c,v 1.80 2017/04/19 07:19:46 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.79 2017/04/19 07:14:45 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.80 2017/04/19 07:19:46 ozaki-r Exp $");
/*
* IPsec controller part.
@@ -1172,9 +1172,7 @@ ipsec6_get_ulp(struct mbuf *m, struct se
struct udphdr uh;
struct icmp6_hdr icmph;
- /* sanity check */
- if (m == NULL)
- panic("%s: NULL pointer was passed", __func__);
+ KASSERT(m != NULL);
if (KEYDEBUG_ON(KEYDEBUG_IPSEC_DUMP)) {
printf("%s:\n", __func__);
@@ -1282,9 +1280,8 @@ ipsec_init_policy(struct socket *so, str
{
struct inpcbpolicy *new;
- /* sanity check. */
- if (so == NULL || policy == NULL)
- panic("%s: NULL pointer was passed", __func__);
+ KASSERT(so != NULL);
+ KASSERT(policy != NULL);
new = malloc(sizeof(*new), M_SECA, M_NOWAIT|M_ZERO);
if (new == NULL) {
@@ -1878,9 +1875,7 @@ ipsec6_in_reject(struct mbuf *m, struct
int error;
int result;
- /* sanity check */
- if (m == NULL)
- return 0; /* XXX should be panic ? */
+ KASSERT(m != NULL);
/* get SP for this packet.
* When we are called from ip_forward(), we call
Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.111 src/sys/netipsec/key.c:1.112
--- src/sys/netipsec/key.c:1.111 Wed Apr 19 03:42:11 2017
+++ src/sys/netipsec/key.c Wed Apr 19 07:19:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.111 2017/04/19 03:42:11 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.112 2017/04/19 07:19:46 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.111 2017/04/19 03:42:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.112 2017/04/19 07:19:46 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -956,9 +956,8 @@ key_do_allocsa_policy(struct secashead *
/* Which SA is the better ? */
/* sanity check 2 */
- if (candidate->lft_c == NULL || sav->lft_c == NULL)
- panic("key_do_allocsa_policy: "
- "lifetime_current is NULL");
+ KASSERT(candidate->lft_c != NULL);
+ KASSERT(sav->lft_c != NULL);
/* What the best method is to compare ? */
if (key_prefered_oldsa) {
@@ -1442,11 +1441,9 @@ key_msg2sp(const struct sadb_x_policy *x
{
struct secpolicy *newsp;
- /* sanity check */
- if (xpl0 == NULL)
- panic("key_msg2sp: NULL pointer was passed");
- if (len < sizeof(*xpl0))
- panic("key_msg2sp: invalid length");
+ KASSERT(xpl0 != NULL);
+ KASSERT(len >= sizeof(*xpl0));
+
if (len != PFKEY_EXTLEN(xpl0)) {
ipseclog((LOG_DEBUG, "key_msg2sp: Invalid msg length.\n"));
*error = EINVAL;
@@ -1674,9 +1671,7 @@ key_sp2msg(const struct secpolicy *sp)
char *p;
struct mbuf *m;
- /* sanity check. */
- if (sp == NULL)
- panic("key_sp2msg: NULL pointer was passed");
+ KASSERT(sp != NULL);
tlen = key_getspreqmsglen(sp);
@@ -1740,8 +1735,8 @@ key_gather_mbuf(struct mbuf *m, const st
struct mbuf *result = NULL, *n;
int len;
- if (m == NULL || mhp == NULL)
- panic("null pointer passed to key_gather");
+ KASSERT(m != NULL);
+ KASSERT(mhp != NULL);
va_start(ap, nitem);
for (i = 0; i < nitem; i++) {
@@ -1831,9 +1826,10 @@ key_spdadd(struct socket *so, struct mbu
struct secpolicy *newsp;
int error;
- /* sanity check */
- if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
- panic("key_spdadd: NULL pointer is passed");
+ KASSERT(so != NULL);
+ KASSERT(m != NULL);
+ KASSERT(mhp != NULL);
+ KASSERT(mhp->msg != NULL);
if (mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL ||
mhp->ext[SADB_EXT_ADDRESS_DST] == NULL ||
@@ -2080,9 +2076,10 @@ key_spddelete(struct socket *so, struct
struct secpolicyindex spidx;
struct secpolicy *sp;
- /* sanity check */
- if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
- panic("key_spddelete: NULL pointer is passed");
+ KASSERT(so != NULL);
+ KASSERT(m != NULL);
+ KASSERT(mh
CVS commit: src/sys/netipsec
Module Name:src
Committed By: ozaki-r
Date: Wed Apr 19 07:14:45 UTC 2017
Modified Files:
src/sys/netipsec: ipsec.c
Log Message:
Change ifdef DIAGNOSTIC + panic to KASSERT
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/netipsec/ipsec.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/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.78 src/sys/netipsec/ipsec.c:1.79
--- src/sys/netipsec/ipsec.c:1.78 Wed Apr 19 03:43:34 2017
+++ src/sys/netipsec/ipsec.c Wed Apr 19 07:14:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.78 2017/04/19 03:43:34 ozaki-r Exp $ */
+/* $NetBSD: ipsec.c,v 1.79 2017/04/19 07:14:45 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.78 2017/04/19 03:43:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.79 2017/04/19 07:14:45 ozaki-r Exp $");
/*
* IPsec controller part.
@@ -283,10 +283,8 @@ ipsec_fillpcbcache(struct inpcbpolicy *p
default:
return EINVAL;
}
-#ifdef DIAGNOSTIC
- if (dir >= sizeof(pcbsp->sp_cache)/sizeof(pcbsp->sp_cache[0]))
- panic("dir too big in ipsec_fillpcbcache");
-#endif
+
+ KASSERT(dir < sizeof(pcbsp->sp_cache)/sizeof(pcbsp->sp_cache[0]));
if (pcbsp->sp_cache[dir].cachesp)
KEY_FREESP(&pcbsp->sp_cache[dir].cachesp);
