CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: simonb Date: Fri Nov 3 00:24:20 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_OMSAL400 Log Message: All other install kernels use a 6MB RAM disk. Stop with the teeny frequent bumps and jump straight to the size everything is using. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 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/evbmips/conf/INSTALL_OMSAL400 diff -u src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.4 src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.5 --- src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.4 Tue Oct 10 10:36:42 2023 +++ src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Fri Nov 3 00:24:20 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_OMSAL400,v 1.4 2023/10/10 10:36:42 martin Exp $ +# $NetBSD: INSTALL_OMSAL400,v 1.5 2023/11/03 00:24:20 simonb Exp $ include "arch/evbmips/conf/OMSAL400" -#ident "INSTALL_OMSAL400-$Revision: 1.4 $" +#ident "INSTALL_OMSAL400-$Revision: 1.5 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,5 +11,5 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=8350 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: simonb Date: Fri Nov 3 00:24:20 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_OMSAL400 Log Message: All other install kernels use a 6MB RAM disk. Stop with the teeny frequent bumps and jump straight to the size everything is using. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 22:17:48 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #445 To generate a diff of this commit: cvs rdiff -u -r1.1.2.154 -r1.1.2.155 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.154 src/doc/CHANGES-10.0:1.1.2.155 --- src/doc/CHANGES-10.0:1.1.2.154 Thu Nov 2 19:33:36 2023 +++ src/doc/CHANGES-10.0 Thu Nov 2 22:17:48 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.154 2023/11/02 19:33:36 sborrill Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.155 2023/11/02 22:17:48 sborrill Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -13878,7 +13878,90 @@ crypto/external/bsd/openssl/lib/libcrypt crypto/external/bsd/openssl/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 1.22 crypto/external/bsd/openssl/lib/libcrypto/man/X509_verify_cert.3 1.22 crypto/external/bsd/openssl/lib/libcrypto/man/openssl.11.22 +doc/3RDPARTY 1.1961 via patch openssl(3): update to OpenSSL-3.0.12 [ticket #444, martin] +crypto/external/bsd/openssh/dist/PROTOCOL up to 1.22 +crypto/external/bsd/openssh/dist/PROTOCOL.agent up to 1.14 +crypto/external/bsd/openssh/dist/PROTOCOL.krl up to 1.1.1.5 +crypto/external/bsd/openssh/dist/addr.c up to 1.6 +crypto/external/bsd/openssh/dist/auth-options.c up to 1.29 +crypto/external/bsd/openssh/dist/auth-pam.c up to 1.21 +crypto/external/bsd/openssh/dist/auth2-gss.cup to 1.17 +crypto/external/bsd/openssh/dist/auth2-pubkey.c up to 1.34 +crypto/external/bsd/openssh/dist/auth2.cup to 1.28 +crypto/external/bsd/openssh/dist/canohost.c up to 1.16 +crypto/external/bsd/openssh/dist/chacha.c up to 1.6 +crypto/external/bsd/openssh/dist/channels.c up to 1.41 +crypto/external/bsd/openssh/dist/channels.h up to 1.25 +crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c up to 1.3 +crypto/external/bsd/openssh/dist/cipher-chachapoly.c up to 1.7 +crypto/external/bsd/openssh/dist/clientloop.c up to 1.38 +crypto/external/bsd/openssh/dist/kex.c up to 1.33 +crypto/external/bsd/openssh/dist/kex.h up to 1.23 +crypto/external/bsd/openssh/dist/kexgexs.c up to 1.23 +crypto/external/bsd/openssh/dist/krl.c up to 1.23 +crypto/external/bsd/openssh/dist/krl.h up to 1.6 +crypto/external/bsd/openssh/dist/match.cup to 1.16 +crypto/external/bsd/openssh/dist/misc.c up to 1.34 +crypto/external/bsd/openssh/dist/misc.h up to 1.26 +crypto/external/bsd/openssh/dist/moduli up to 1.10 +crypto/external/bsd/openssh/dist/monitor.c up to 1.43 +crypto/external/bsd/openssh/dist/monitor_wrap.c up to 1.33 +crypto/external/bsd/openssh/dist/mux.c up to 1.34 +crypto/external/bsd/openssh/dist/packet.c up to 1.49 +crypto/external/bsd/openssh/dist/packet.h up to 1.25 +crypto/external/bsd/openssh/dist/poly1305.c up to 1.6 +crypto/external/bsd/openssh/dist/progressmeter.c up to 1.15 +crypto/external/bsd/openssh/dist/readconf.c up to 1.42 +crypto/external/bsd/openssh/dist/readconf.h up to 1.32 +crypto/external/bsd/openssh/dist/scp.c up to 1.40 +crypto/external/bsd/openssh/dist/servconf.c up to 1.43 +crypto/external/bsd/openssh/dist/servconf.h up to 1.30 +crypto/external/bsd/openssh/dist/serverloop.c up to 1.35 +crypto/external/bsd/openssh/dist/session.c up to 1.38 +crypto/external/bsd/openssh/dist/sftp-client.c up to 1.34 +crypto/external/bsd/openssh/dist/sftp-client.h up to 1.18 +crypto/external/bsd/openssh/dist/sftp-common.c up to 1.14 +crypto/external/bsd/openssh/dist/sftp-glob.cup to 1.15 +crypto/external/bsd/openssh/dist/sftp-server.c up to 1.30 +crypto/external/bsd/openssh/dist/sftp-usergroup.c up to 1.3 +crypto/external/bsd/openssh/dist/sftp.c up to 1.39 +crypto/external/bsd/openssh/dist/sk-usbhid.cup to 1.9 +crypto/external/bsd/openssh/dist/ssh-add.c up to 1.29 +crypto/external/bsd/openssh/dist/ssh-agent.1up to 1.19 +crypto/external/bsd/openssh/dist/ssh-agent.cup to 1.36 +crypto/external/bsd/openssh/dist/ssh-keygen.1 up to 1.34 +crypto/external/bsd/openssh/dist/ssh-keygen.c up to 1.46 +crypto/external/bsd/openssh/dist/ssh-keyscan.c up to 1.32 +crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c up to 1.18 +crypto/external/bsd/openssh/dist/ssh-pkcs11.c up to 1.26 +crypto/external/bsd/openssh/dist/ssh-sk.c up to 1.8 +crypto/external/bsd/openssh/dist/ssh.1 up to 1.37 +crypto/external/bsd/openssh/dist/ssh.c up to 1.44 +crypto/external/bsd/openssh/dist/ssh2.h up to 1.14 +crypto/external/bsd/openssh/dist/ssh_config up to 1.16 +crypto/external/bsd/openssh/dist/ssh_config.5 up to 1.38 +crypto/external/bsd/openssh/dist/sshconnect2.c up to
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 22:17:48 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #445 To generate a diff of this commit: cvs rdiff -u -r1.1.2.154 -r1.1.2.155 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 22:16:44 UTC 2023 Modified Files: src/doc [netbsd-10]: 3RDPARTY Log Message: Tickets #444 and #445 To generate a diff of this commit: cvs rdiff -u -r1.1905.2.5 -r1.1905.2.6 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1905.2.5 src/doc/3RDPARTY:1.1905.2.6 --- src/doc/3RDPARTY:1.1905.2.5 Mon Sep 4 17:33:28 2023 +++ src/doc/3RDPARTY Thu Nov 2 22:16:44 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1905.2.5 2023/09/04 17:33:28 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.1905.2.6 2023/11/02 22:16:44 sborrill Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1071,8 +1071,8 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 9.3 -Current Vers: 9.3 / portable 9.3p2 +Version: 9.5 +Current Vers: 9.5 / portable 9.5p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html @@ -1116,8 +1116,8 @@ markus is very cooperative about it): - blocklistd additions Package: OpenSSL -Version: 1.0.2o/1.1.1t -Current Vers: 1.0.2zd/1.1.1t/3.0.7 +Version: 1.0.2o/1.1.1t/3.0.12 +Current Vers: 1.0.2zd/1.1.1t/3.0.12/3.1.4 Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 22:16:44 UTC 2023 Modified Files: src/doc [netbsd-10]: 3RDPARTY Log Message: Tickets #444 and #445 To generate a diff of this commit: cvs rdiff -u -r1.1905.2.5 -r1.1905.2.6 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: sborrill Date: Thu Nov 2 22:15:22 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/dist [netbsd-10]: PROTOCOL PROTOCOL.agent PROTOCOL.krl addr.c auth-options.c auth-pam.c auth2-gss.c auth2-pubkey.c auth2.c canohost.c chacha.c channels.c channels.h cipher-chachapoly-libcrypto.c cipher-chachapoly.c clientloop.c kex.c kex.h kexgexs.c krl.c krl.h match.c misc.c misc.h moduli monitor.c monitor_wrap.c mux.c packet.c packet.h poly1305.c progressmeter.c readconf.c readconf.h scp.c servconf.c servconf.h serverloop.c session.c sftp-client.c sftp-client.h sftp-common.c sftp-glob.c sftp-server.c sftp-usergroup.c sftp.c sk-usbhid.c ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.c ssh-pkcs11-client.c ssh-pkcs11.c ssh-sk.c ssh.1 ssh.c ssh2.h ssh_config ssh_config.5 sshconnect2.c sshd.8 sshd_config.5 sshkey.c sshkey.h sshsig.c version.h src/crypto/external/bsd/openssh/dist/moduli-gen [netbsd-10]: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib [netbsd-10]: shlib_version src/distrib/sets/lists/base [netbsd-10]: shl.mi src/distrib/sets/lists/debug [netbsd-10]: shl.mi Log Message: Pull up the following revisions(s) (requested by martin in ticket #443): crypto/external/bsd/openssh/dist sync with HEAD crypto/external/bsd/openssh/dist/PROTOCOL: up to 1.22 crypto/external/bsd/openssh/dist/PROTOCOL.agent: up to 1.14 crypto/external/bsd/openssh/dist/PROTOCOL.krl: up to 1.1.1.5 crypto/external/bsd/openssh/dist/addr.c: up to 1.6 crypto/external/bsd/openssh/dist/auth-options.c: up to 1.29 crypto/external/bsd/openssh/dist/auth-pam.c: up to 1.21 crypto/external/bsd/openssh/dist/auth2-gss.c:up to 1.17 crypto/external/bsd/openssh/dist/auth2-pubkey.c: up to 1.34 crypto/external/bsd/openssh/dist/auth2.c:up to 1.28 crypto/external/bsd/openssh/dist/canohost.c: up to 1.16 crypto/external/bsd/openssh/dist/chacha.c: up to 1.6 crypto/external/bsd/openssh/dist/channels.c up to 1.41 crypto/external/bsd/openssh/dist/channels.h: up to 1.25 crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c: up to 1.3 crypto/external/bsd/openssh/dist/cipher-chachapoly.c: up to 1.7 crypto/external/bsd/openssh/dist/clientloop.c: up to 1.38 crypto/external/bsd/openssh/dist/kex.c: up to 1.33 crypto/external/bsd/openssh/dist/kex.h: up to 1.23 crypto/external/bsd/openssh/dist/kexgexs.c: up to 1.23 crypto/external/bsd/openssh/dist/krl.c: up to 1.23 crypto/external/bsd/openssh/dist/krl.h: up to 1.6 crypto/external/bsd/openssh/dist/match.c:up to 1.16 crypto/external/bsd/openssh/dist/misc.c; up to 1.34 crypto/external/bsd/openssh/dist/misc.h: up to 1.26 crypto/external/bsd/openssh/dist/moduli: up to 1.10 crypto/external/bsd/openssh/dist/monitor.c: up to 1.43 crypto/external/bsd/openssh/dist/monitor_wrap.c: up to 1.33 crypto/external/bsd/openssh/dist/mux.c: up to 1.34 crypto/external/bsd/openssh/dist/packet.c: up to 1.49 crypto/external/bsd/openssh/dist/packet.h: up to 1.25 crypto/external/bsd/openssh/dist/poly1305.c: up to 1.6 crypto/external/bsd/openssh/dist/progressmeter.c: up to 1.15 crypto/external/bsd/openssh/dist/readconf.c: up to 1.42 crypto/external/bsd/openssh/dist/readconf.h: up to 1.32 crypto/external/bsd/openssh/dist/scp.c: up to 1.40 crypto/external/bsd/openssh/dist/servconf.c: up to 1.43 crypto/external/bsd/openssh/dist/servconf.h: up to 1.30 crypto/external/bsd/openssh/dist/serverloop.c: up to 1.35 crypto/external/bsd/openssh/dist/session.c: up to 1.38 crypto/external/bsd/openssh/dist/sftp-client.c: up to 1.34 crypto/external/bsd/openssh/dist/sftp-client.h: up to 1.18 crypto/external/bsd/openssh/dist/sftp-common.c: up to 1.14 crypto/external/bsd/openssh/dist/sftp-glob.c:up to 1.15 crypto/external/bsd/openssh/dist/sftp-server.c: up to 1.30 crypto/external/bsd/openssh/dist/sftp-usergroup.c: up to 1.3 crypto/external/bsd/openssh/dist/sftp.c: up to 1.39 crypto/external/bsd/openssh/dist/sk-usbhid.c:up to 1.9 crypto/external/bsd/openssh/dist/ssh-add.c: up to 1.29 crypto/external/bsd/openssh/dist/ssh-agent.1:up to 1.19 crypto/external/bsd/openssh/dist/ssh-agent.c:up to 1.36
CVS commit: [netbsd-10] src
Module Name:src Committed By: sborrill Date: Thu Nov 2 22:15:22 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/dist [netbsd-10]: PROTOCOL PROTOCOL.agent PROTOCOL.krl addr.c auth-options.c auth-pam.c auth2-gss.c auth2-pubkey.c auth2.c canohost.c chacha.c channels.c channels.h cipher-chachapoly-libcrypto.c cipher-chachapoly.c clientloop.c kex.c kex.h kexgexs.c krl.c krl.h match.c misc.c misc.h moduli monitor.c monitor_wrap.c mux.c packet.c packet.h poly1305.c progressmeter.c readconf.c readconf.h scp.c servconf.c servconf.h serverloop.c session.c sftp-client.c sftp-client.h sftp-common.c sftp-glob.c sftp-server.c sftp-usergroup.c sftp.c sk-usbhid.c ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.c ssh-pkcs11-client.c ssh-pkcs11.c ssh-sk.c ssh.1 ssh.c ssh2.h ssh_config ssh_config.5 sshconnect2.c sshd.8 sshd_config.5 sshkey.c sshkey.h sshsig.c version.h src/crypto/external/bsd/openssh/dist/moduli-gen [netbsd-10]: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib [netbsd-10]: shlib_version src/distrib/sets/lists/base [netbsd-10]: shl.mi src/distrib/sets/lists/debug [netbsd-10]: shl.mi Log Message: Pull up the following revisions(s) (requested by martin in ticket #443): crypto/external/bsd/openssh/dist sync with HEAD crypto/external/bsd/openssh/dist/PROTOCOL: up to 1.22 crypto/external/bsd/openssh/dist/PROTOCOL.agent: up to 1.14 crypto/external/bsd/openssh/dist/PROTOCOL.krl: up to 1.1.1.5 crypto/external/bsd/openssh/dist/addr.c: up to 1.6 crypto/external/bsd/openssh/dist/auth-options.c: up to 1.29 crypto/external/bsd/openssh/dist/auth-pam.c: up to 1.21 crypto/external/bsd/openssh/dist/auth2-gss.c:up to 1.17 crypto/external/bsd/openssh/dist/auth2-pubkey.c: up to 1.34 crypto/external/bsd/openssh/dist/auth2.c:up to 1.28 crypto/external/bsd/openssh/dist/canohost.c: up to 1.16 crypto/external/bsd/openssh/dist/chacha.c: up to 1.6 crypto/external/bsd/openssh/dist/channels.c up to 1.41 crypto/external/bsd/openssh/dist/channels.h: up to 1.25 crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c: up to 1.3 crypto/external/bsd/openssh/dist/cipher-chachapoly.c: up to 1.7 crypto/external/bsd/openssh/dist/clientloop.c: up to 1.38 crypto/external/bsd/openssh/dist/kex.c: up to 1.33 crypto/external/bsd/openssh/dist/kex.h: up to 1.23 crypto/external/bsd/openssh/dist/kexgexs.c: up to 1.23 crypto/external/bsd/openssh/dist/krl.c: up to 1.23 crypto/external/bsd/openssh/dist/krl.h: up to 1.6 crypto/external/bsd/openssh/dist/match.c:up to 1.16 crypto/external/bsd/openssh/dist/misc.c; up to 1.34 crypto/external/bsd/openssh/dist/misc.h: up to 1.26 crypto/external/bsd/openssh/dist/moduli: up to 1.10 crypto/external/bsd/openssh/dist/monitor.c: up to 1.43 crypto/external/bsd/openssh/dist/monitor_wrap.c: up to 1.33 crypto/external/bsd/openssh/dist/mux.c: up to 1.34 crypto/external/bsd/openssh/dist/packet.c: up to 1.49 crypto/external/bsd/openssh/dist/packet.h: up to 1.25 crypto/external/bsd/openssh/dist/poly1305.c: up to 1.6 crypto/external/bsd/openssh/dist/progressmeter.c: up to 1.15 crypto/external/bsd/openssh/dist/readconf.c: up to 1.42 crypto/external/bsd/openssh/dist/readconf.h: up to 1.32 crypto/external/bsd/openssh/dist/scp.c: up to 1.40 crypto/external/bsd/openssh/dist/servconf.c: up to 1.43 crypto/external/bsd/openssh/dist/servconf.h: up to 1.30 crypto/external/bsd/openssh/dist/serverloop.c: up to 1.35 crypto/external/bsd/openssh/dist/session.c: up to 1.38 crypto/external/bsd/openssh/dist/sftp-client.c: up to 1.34 crypto/external/bsd/openssh/dist/sftp-client.h: up to 1.18 crypto/external/bsd/openssh/dist/sftp-common.c: up to 1.14 crypto/external/bsd/openssh/dist/sftp-glob.c:up to 1.15 crypto/external/bsd/openssh/dist/sftp-server.c: up to 1.30 crypto/external/bsd/openssh/dist/sftp-usergroup.c: up to 1.3 crypto/external/bsd/openssh/dist/sftp.c: up to 1.39 crypto/external/bsd/openssh/dist/sk-usbhid.c:up to 1.9 crypto/external/bsd/openssh/dist/ssh-add.c: up to 1.29 crypto/external/bsd/openssh/dist/ssh-agent.1:up to 1.19 crypto/external/bsd/openssh/dist/ssh-agent.c:up to 1.36
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 19:33:36 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #444 To generate a diff of this commit: cvs rdiff -u -r1.1.2.153 -r1.1.2.154 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.153 src/doc/CHANGES-10.0:1.1.2.154 --- src/doc/CHANGES-10.0:1.1.2.153 Thu Nov 2 14:12:18 2023 +++ src/doc/CHANGES-10.0 Thu Nov 2 19:33:36 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.153 2023/11/02 14:12:18 sborrill Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.154 2023/11/02 19:33:36 sborrill Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12833,3 +12833,1052 @@ usr.sbin/sysinst/msg.mi.de 1.45 schemes (e.g. disklabel). [martin, ticket #443] +crypto/external/bsd/openssl/dist/test/certs/sm2-pub.key up to 1.1.1.1 +crypto/external/bsd/openssl/dist/test/recipes/90-test_store_cases.t up to 1.1.1.1 +crypto/external/bsd/openssl/dist/test/recipes/90-test_store_cases_data/garbage-pkcs12.p12 up to 1.1.1.1 +crypto/external/bsd/openssl/dist/appveyor.yml delete +crypto/external/bsd/openssl/dist/CHANGES.md up to 1.1.1.3 +crypto/external/bsd/openssl/dist/Configure up to 1.34 +crypto/external/bsd/openssl/dist/INSTALL.md up to 1.1.1.2 +crypto/external/bsd/openssl/dist/NEWS.mdup to 1.1.1.3 +crypto/external/bsd/openssl/dist/README-FIPS.md up to 1.1.1.2 +crypto/external/bsd/openssl/dist/README.md up to 1.1.1.2 +crypto/external/bsd/openssl/dist/VERSION.datup to 1.1.1.3 +crypto/external/bsd/openssl/dist/Configurations/10-main.conf up to 1.1.1.15 +crypto/external/bsd/openssl/dist/Configurations/README.md up to 1.1.1.2 +crypto/external/bsd/openssl/dist/Configurations/unix-Makefile.tmpl up to 1.1.1.15 +crypto/external/bsd/openssl/dist/apps/ca.c up to 1.24 +crypto/external/bsd/openssl/dist/apps/cmp.c up to 1.4 +crypto/external/bsd/openssl/dist/apps/cms.c up to 1.1.1.17 +crypto/external/bsd/openssl/dist/apps/dgst.cup to 1.1.1.19 +crypto/external/bsd/openssl/dist/apps/dhparam.c up to 1.1.1.14 +crypto/external/bsd/openssl/dist/apps/dsaparam.c up to 1.1.1.12 +crypto/external/bsd/openssl/dist/apps/enc.c up to 1.1.1.20 +crypto/external/bsd/openssl/dist/apps/gendsa.c up to 1.1.1.9 +crypto/external/bsd/openssl/dist/apps/genpkey.c up to 1.1.1.8 +crypto/external/bsd/openssl/dist/apps/genrsa.c up to 1.1.1.12 +crypto/external/bsd/openssl/dist/apps/pkeyutl.c up to 1.1.1.11 +crypto/external/bsd/openssl/dist/apps/req.c up to 1.6 +crypto/external/bsd/openssl/dist/apps/s_client.c up to 1.28 +crypto/external/bsd/openssl/dist/apps/s_server.c up to 1.29 +crypto/external/bsd/openssl/dist/apps/speed.c up to 1.23 +crypto/external/bsd/openssl/dist/apps/lib/apps.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/LPdir_unix.c up to 1.1.1.9 +crypto/external/bsd/openssl/dist/crypto/arm_arch.h up to 1.10 +crypto/external/bsd/openssl/dist/crypto/build.info up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/core_namemap.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/crypto/ex_data.c up to 1.9 +crypto/external/bsd/openssl/dist/crypto/mem.c up to 1.14 +crypto/external/bsd/openssl/dist/crypto/param_build_set.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/crypto/params.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/crypto/provider_core.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/crypto/threads_pthread.c up to 1.7 +crypto/external/bsd/openssl/dist/crypto/aes/asm/aesv8-armx.pl up to 1.1.1.10 +crypto/external/bsd/openssl/dist/crypto/asn1/a_strnid.c up to 1.1.1.9 +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_gen.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c up to 1.15 +crypto/external/bsd/openssl/dist/crypto/bn/bn_gcd.c up to 1.1.1.12 +crypto/external/bsd/openssl/dist/crypto/bn/bn_recp.c up to 1.1.1.9 +crypto/external/bsd/openssl/dist/crypto/chacha/asm/chacha-ia64.pl up to 1.1.1.2 +crypto/external/bsd/openssl/dist/crypto/cmp/cmp_asn.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/crypto/cmp/cmp_client.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/cmp/cmp_status.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/crypto/cms/cms_enc.c up to 1.1.1.12 +crypto/external/bsd/openssl/dist/crypto/cms/cms_env.c up to 1.1.1.16 +crypto/external/bsd/openssl/dist/crypto/cms/cms_err.c up to 1.1.1.12 +crypto/external/bsd/openssl/dist/crypto/cms/cms_lib.c up to 1.1.1.14 +crypto/external/bsd/openssl/dist/crypto/cms/cms_local.h up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/cms/cms_rsa.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/crypto/cms/cms_sd.c up to 1.1.1.13 +crypto/external/bsd/openssl/dist/crypto/conf/conf_mod.c up to 1.1.1.10 +crypto/external/bsd/openssl/dist/crypto/conf/conf_sap.c up to 1.1.1.10
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 19:33:36 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #444 To generate a diff of this commit: cvs rdiff -u -r1.1.2.153 -r1.1.2.154 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:12:18 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #443 To generate a diff of this commit: cvs rdiff -u -r1.1.2.152 -r1.1.2.153 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:12:18 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #443 To generate a diff of this commit: cvs rdiff -u -r1.1.2.152 -r1.1.2.153 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.152 src/doc/CHANGES-10.0:1.1.2.153 --- src/doc/CHANGES-10.0:1.1.2.152 Thu Nov 2 14:08:40 2023 +++ src/doc/CHANGES-10.0 Thu Nov 2 14:12:18 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.152 2023/11/02 14:08:40 sborrill Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.153 2023/11/02 14:12:18 sborrill Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12826,3 +12826,10 @@ usr.sbin/sysinst/msg.mi.pl 1.46 accordingly. [martin, ticket #442] +usr.sbin/sysinst/msg.mi.de 1.45 + + Shorten the Use_Different_Part_Scheme message - the old version + could overflow a 80 wide char display with some partitioning + schemes (e.g. disklabel). + [martin, ticket #443] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:08:41 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #442 To generate a diff of this commit: cvs rdiff -u -r1.1.2.151 -r1.1.2.152 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:12:03 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: msg.mi.de Log Message: Pull up the following revisions(s) (requested by martin in ticket #443): usr.sbin/sysinst/msg.mi.de: revision 1.45 Shorten the Use_Different_Part_Scheme message - the old version could overflow a 80 wide char display with some partitioning schemes (e.g. disklabel). To generate a diff of this commit: cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/usr.sbin/sysinst/msg.mi.de Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sbin/gpt
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:02:52 UTC 2023 Modified Files: src/sbin/gpt [netbsd-10]: gpt.8 Log Message: Pull up the following revisions(s) (requested by martin in ticket #441): sbin/gpt/gpt.8: revision 1.79 Add missing suffixes for size values and clarify that they are case-independent. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.76.2.1 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: sborrill
Date: Thu Nov 2 14:12:03 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: msg.mi.de
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #443):
usr.sbin/sysinst/msg.mi.de: revision 1.45
Shorten the Use_Different_Part_Scheme message - the old version could
overflow a 80 wide char display with some partitioning schemes (e.g.
disklabel).
To generate a diff of this commit:
cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/usr.sbin/sysinst/msg.mi.de
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.43.2.1 src/usr.sbin/sysinst/msg.mi.de:1.43.2.2
--- src/usr.sbin/sysinst/msg.mi.de:1.43.2.1 Thu Nov 2 14:08:17 2023
+++ src/usr.sbin/sysinst/msg.mi.de Thu Nov 2 14:12:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.43.2.1 2023/11/02 14:08:17 sborrill Exp $ */
+/* $NetBSD: msg.mi.de,v 1.43.2.2 2023/11/02 14:12:03 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1120,7 +1120,7 @@ message Use_Empty_Parts {Partitionen fre
* $1 = short version of $0 MBR
*/
message Use_Different_Part_Scheme
-{Alles löschen, anderes Partitionierungsverfahren statt $1 verwenden}
+{Alles löschen, anders partitionieren (statt $1)}
message Gigabytes {Gigabyte}
message Megabytes {Megabyte}
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: sborrill
Date: Thu Nov 2 14:08:17 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: label.c msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #442):
usr.sbin/sysinst/label.c: revision 1.49
usr.sbin/sysinst/msg.mi.de: revision 1.44
usr.sbin/sysinst/msg.mi.en: revision 1.47
usr.sbin/sysinst/msg.mi.es: revision 1.40
usr.sbin/sysinst/msg.mi.fr: revision 1.45
usr.sbin/sysinst/msg.mi.pl: revision 1.46
Switch to "-" (single minus) as input denotation for "no mount point"
in all translations and adjust the code accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.2.1 src/usr.sbin/sysinst/label.c \
src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.39 -r1.39.2.1 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.44 -r1.44.2.1 src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.sbin/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.46 src/usr.sbin/sysinst/label.c:1.46.2.1
--- src/usr.sbin/sysinst/label.c:1.46 Thu Dec 15 20:21:16 2022
+++ src/usr.sbin/sysinst/label.c Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.46 2022/12/15 20:21:16 martin Exp $ */
+/* $NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.46 2022/12/15 20:21:16 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $");
#endif
#include
@@ -441,7 +441,7 @@ edit_fs_mountpt(menudesc *m, void *arg)
if (last != NULL)
last[1] = 0;
- if (first == NULL || *first == 0 || strcmp(first, "none") == 0) {
+ if (first == NULL || *first == 0 || strcmp(first, "-") == 0) {
edit->wanted->mount[0] = 0;
edit->wanted->instflags &= ~PUIINST_MOUNT;
return 0;
@@ -454,6 +454,7 @@ edit_fs_mountpt(menudesc *m, void *arg)
} else {
strlcpy(edit->wanted->mount, first, sizeof edit->wanted->mount);
}
+ edit->wanted->instflags |= PUIINST_MOUNT;
return 0;
}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.46 src/usr.sbin/sysinst/msg.mi.en:1.46.2.1
--- src/usr.sbin/sysinst/msg.mi.en:1.46 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.en Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.46 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -143,7 +143,7 @@ message sectors
{sectors}
message mountpoint
-{mount point (or 'none')}
+{mount point (or '-')}
message cylname
{cyl}
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.43 src/usr.sbin/sysinst/msg.mi.de:1.43.2.1
--- src/usr.sbin/sysinst/msg.mi.de:1.43 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.de Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.43 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.43.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -152,7 +152,7 @@ message sectors
{Sektoren}
message mountpoint
-{Mountpoint (oder 'kein(e)'))}
+{Mountpoint (oder '-')}
message cylname
{Zyl}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.39 src/usr.sbin/sysinst/msg.mi.es:1.39.2.1
--- src/usr.sbin/sysinst/msg.mi.es:1.39 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.es Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.39 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.es,v 1.39.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -150,7 +150,7 @@ message sectors
{sectores}
message mountpoint
-{punto de montaje (o 'ninguno')}
+{punto de montaje (o '-')}
message cylname
{cil}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.44 src/usr.sbin/sysinst/msg.mi.fr:1.44.2.1
--- src/usr.sbin/sysinst/msg.mi.fr:1.44 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.fr Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.44 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.44.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -152,7 +152,7 @@ message sectors
{secteurs}
message mountpoint
-{point de montage (ou 'aucun')}
+{point de montage (ou '-')}
message cylname
{cyl}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.45
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:08:41 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #442 To generate a diff of this commit: cvs rdiff -u -r1.1.2.151 -r1.1.2.152 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.151 src/doc/CHANGES-10.0:1.1.2.152 --- src/doc/CHANGES-10.0:1.1.2.151 Thu Nov 2 14:03:58 2023 +++ src/doc/CHANGES-10.0 Thu Nov 2 14:08:40 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.151 2023/11/02 14:03:58 sborrill Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.152 2023/11/02 14:08:40 sborrill Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12814,3 +12814,15 @@ sbin/gpt/gpt.8 1.79 case-independent. [martin, ticket #441] +usr.sbin/sysinst/label.c 1.49 +usr.sbin/sysinst/msg.mi.de 1.44 +usr.sbin/sysinst/msg.mi.en 1.47 +usr.sbin/sysinst/msg.mi.es 1.40 +usr.sbin/sysinst/msg.mi.fr 1.45 +usr.sbin/sysinst/msg.mi.pl 1.46 + + Switch to "-" (single minus) as input denotation for + "no mount point" in all translations and adjust the code + accordingly. + [martin, ticket #442] +
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:08:17 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: label.c msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl Log Message: Pull up the following revisions(s) (requested by martin in ticket #442): usr.sbin/sysinst/label.c: revision 1.49 usr.sbin/sysinst/msg.mi.de: revision 1.44 usr.sbin/sysinst/msg.mi.en: revision 1.47 usr.sbin/sysinst/msg.mi.es: revision 1.40 usr.sbin/sysinst/msg.mi.fr: revision 1.45 usr.sbin/sysinst/msg.mi.pl: revision 1.46 Switch to "-" (single minus) as input denotation for "no mount point" in all translations and adjust the code accordingly. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.46.2.1 src/usr.sbin/sysinst/label.c \ src/usr.sbin/sysinst/msg.mi.en cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.39 -r1.39.2.1 src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.44 -r1.44.2.1 src/usr.sbin/sysinst/msg.mi.fr cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.sbin/sysinst/msg.mi.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:03:58 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #441 To generate a diff of this commit: cvs rdiff -u -r1.1.2.150 -r1.1.2.151 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:03:58 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #441 To generate a diff of this commit: cvs rdiff -u -r1.1.2.150 -r1.1.2.151 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.150 src/doc/CHANGES-10.0:1.1.2.151 --- src/doc/CHANGES-10.0:1.1.2.150 Mon Oct 30 17:46:05 2023 +++ src/doc/CHANGES-10.0 Thu Nov 2 14:03:58 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.150 2023/10/30 17:46:05 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.151 2023/11/02 14:03:58 sborrill Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12809,3 +12809,8 @@ sys/dev/usb/ehci.c1.318,1.319 ehci(4): fix timeout logic. [riastradh, ticket #440] +sbin/gpt/gpt.8 1.79 + Add missing suffixes for size values and clarify that they are + case-independent. + [martin, ticket #441] +
CVS commit: [netbsd-10] src/sbin/gpt
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:02:52 UTC 2023 Modified Files: src/sbin/gpt [netbsd-10]: gpt.8 Log Message: Pull up the following revisions(s) (requested by martin in ticket #441): sbin/gpt/gpt.8: revision 1.79 Add missing suffixes for size values and clarify that they are case-independent. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.76.2.1 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/gpt.8 diff -u src/sbin/gpt/gpt.8:1.76 src/sbin/gpt/gpt.8:1.76.2.1 --- src/sbin/gpt/gpt.8:1.76 Thu Apr 7 13:57:44 2022 +++ src/sbin/gpt/gpt.8 Thu Nov 2 14:02:52 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: gpt.8,v 1.76 2022/04/07 13:57:44 kre Exp $ +.\" $NetBSD: gpt.8,v 1.76.2.1 2023/11/02 14:02:52 sborrill Exp $ .\" .\" Copyright (c) 2002 Marcel Moolenaar .\" All rights reserved. @@ -165,7 +165,7 @@ or .Sq S then size is in sectors, otherwise size is in bytes which must be a multiple of the device's sector size. -Accepted suffix units are +Accepted suffix units (case insensitive) are .Sq b to denote bytes, .Sq k @@ -173,7 +173,13 @@ to denote kilobytes, .Sq m to denote megabytes and .Sq g -to denote gigabytes. +to denote gigabytes, +.Sq t +to denote terabytes, +.Sq p +to denote petabytes, and +.Sq e +to denote exabytes. The minimum size is 1 sector. .Pp The
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: riastradh
Date: Thu Nov 2 13:50:14 UTC 2023
Modified Files:
src/sys/dev/ic: dwc_eqos.c
Log Message:
eqos(4): Fix multicast filter updates.
1. Don't touch the obsolete IFF_ALLMULTI.
2. Set ETHER_F_ALLMULTI if we're accepting all multicast addresses.
3. If any multicast entry range is not a single address, accept all
multicast addresses.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ic/dwc_eqos.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/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.32 src/sys/dev/ic/dwc_eqos.c:1.33
--- src/sys/dev/ic/dwc_eqos.c:1.32 Thu Nov 2 13:50:02 2023
+++ src/sys/dev/ic/dwc_eqos.c Thu Nov 2 13:50:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.32 2023/11/02 13:50:02 riastradh Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.33 2023/11/02 13:50:14 riastradh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -38,7 +38,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.32 2023/11/02 13:50:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.33 2023/11/02 13:50:14 riastradh Exp $");
#include
#include
@@ -509,17 +509,29 @@ eqos_setup_rxfilter(struct eqos_softc *s
GMAC_MAC_PACKET_FILTER_PCF_MASK);
hash[0] = hash[1] = ~0U;
+ ETHER_LOCK(ec);
if (sc->sc_promisc) {
+ ec->ec_flags |= ETHER_F_ALLMULTI;
pfil |= GMAC_MAC_PACKET_FILTER_PR |
GMAC_MAC_PACKET_FILTER_PCF_ALL;
- } else if (sc->sc_allmulti) {
- pfil |= GMAC_MAC_PACKET_FILTER_PM;
} else {
- hash[0] = hash[1] = 0;
pfil |= GMAC_MAC_PACKET_FILTER_HMC;
- ETHER_LOCK(ec);
+ hash[0] = hash[1] = 0;
+ ec->ec_flags &= ~ETHER_F_ALLMULTI;
ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
+ if (memcmp(enm->enm_addrlo, enm->enm_addrhi,
+ETHER_ADDR_LEN) != 0) {
+ec->ec_flags |= ETHER_F_ALLMULTI;
+pfil &= ~GMAC_MAC_PACKET_FILTER_HMC;
+pfil |= GMAC_MAC_PACKET_FILTER_PM;
+/*
+ * Shouldn't matter if we clear HMC but
+ * let's avoid using different values.
+ */
+hash[0] = hash[1] = 0x;
+break;
+ }
crc = ether_crc32_le(enm->enm_addrlo, ETHER_ADDR_LEN);
crc &= 0x7f;
crc = eqos_bitrev32(~crc) >> 26;
@@ -528,8 +540,8 @@ eqos_setup_rxfilter(struct eqos_softc *s
hash[hashreg] |= (1 << hashbit);
ETHER_NEXT_MULTI(step, enm);
}
- ETHER_UNLOCK(ec);
}
+ ETHER_UNLOCK(ec);
/* Write our unicast address */
eaddr = CLLADDR(ifp->if_sadl);
@@ -618,7 +630,6 @@ eqos_init_locked(struct eqos_softc *sc)
/* Setup RX filter */
sc->sc_promisc = ifp->if_flags & IFF_PROMISC;
- sc->sc_allmulti = ifp->if_flags & IFF_ALLMULTI; /* XXX */
eqos_setup_rxfilter(sc);
WR4(sc, GMAC_MAC_1US_TIC_COUNTER, (sc->sc_csr_clock / 100) - 1);
CVS commit: src/sys/dev/ic
Module Name:src Committed By: riastradh Date: Thu Nov 2 13:50:14 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c Log Message: eqos(4): Fix multicast filter updates. 1. Don't touch the obsolete IFF_ALLMULTI. 2. Set ETHER_F_ALLMULTI if we're accepting all multicast addresses. 3. If any multicast entry range is not a single address, accept all multicast addresses. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ic/dwc_eqos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: riastradh
Date: Thu Nov 2 13:50:02 UTC 2023
Modified Files:
src/sys/dev/ic: dwc_eqos.c dwc_eqos_var.h
Log Message:
eqos(4): Fix locking around multicast filter updates.
- Can't touch if_flags without IFNET_LOCK.
- Can't take IFNET_LOCK in SIOCADDMULTI/SIOCDELMULTI path.
Instead, cache IFF_PROMISC and IFF_ALLMULTI on if_init under a lock we
can take in this path.
XXX Is IFF_ALLMULTI relevant any more? Hasn't it been moved to
ethercom flags?
XXX Should not take sc_lock around if_init/stop -- IFNET_LOCK is
enough. Should narrow scope of sc_lock to be just tick/mii/multi
stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/dwc_eqos_var.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/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.31 src/sys/dev/ic/dwc_eqos.c:1.32
--- src/sys/dev/ic/dwc_eqos.c:1.31 Thu Nov 2 13:49:49 2023
+++ src/sys/dev/ic/dwc_eqos.c Thu Nov 2 13:50:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.31 2023/11/02 13:49:49 riastradh Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.32 2023/11/02 13:50:02 riastradh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -38,7 +38,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.31 2023/11/02 13:49:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.32 2023/11/02 13:50:02 riastradh Exp $");
#include
#include
@@ -509,10 +509,10 @@ eqos_setup_rxfilter(struct eqos_softc *s
GMAC_MAC_PACKET_FILTER_PCF_MASK);
hash[0] = hash[1] = ~0U;
- if ((ifp->if_flags & IFF_PROMISC) != 0) {
+ if (sc->sc_promisc) {
pfil |= GMAC_MAC_PACKET_FILTER_PR |
GMAC_MAC_PACKET_FILTER_PCF_ALL;
- } else if ((ifp->if_flags & IFF_ALLMULTI) != 0) {
+ } else if (sc->sc_allmulti) {
pfil |= GMAC_MAC_PACKET_FILTER_PM;
} else {
hash[0] = hash[1] = 0;
@@ -617,6 +617,8 @@ eqos_init_locked(struct eqos_softc *sc)
eqos_init_rings(sc, 0);
/* Setup RX filter */
+ sc->sc_promisc = ifp->if_flags & IFF_PROMISC;
+ sc->sc_allmulti = ifp->if_flags & IFF_ALLMULTI; /* XXX */
eqos_setup_rxfilter(sc);
WR4(sc, GMAC_MAC_1US_TIC_COUNTER, (sc->sc_csr_clock / 100) - 1);
@@ -1232,9 +1234,10 @@ eqos_ioctl(struct ifnet *ifp, u_long cmd
error = (*ifp->if_init)(ifp);
else if (cmd != SIOCADDMULTI && cmd != SIOCDELMULTI)
;
- else if ((ifp->if_flags & IFF_RUNNING) != 0) {
+ else {
EQOS_LOCK(sc);
- eqos_setup_rxfilter(sc);
+ if (sc->sc_running)
+eqos_setup_rxfilter(sc);
EQOS_UNLOCK(sc);
}
break;
Index: src/sys/dev/ic/dwc_eqos_var.h
diff -u src/sys/dev/ic/dwc_eqos_var.h:1.8 src/sys/dev/ic/dwc_eqos_var.h:1.9
--- src/sys/dev/ic/dwc_eqos_var.h:1.8 Thu Nov 2 13:49:49 2023
+++ src/sys/dev/ic/dwc_eqos_var.h Thu Nov 2 13:50:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos_var.h,v 1.8 2023/11/02 13:49:49 riastradh Exp $ */
+/* $NetBSD: dwc_eqos_var.h,v 1.9 2023/11/02 13:50:02 riastradh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -72,6 +72,8 @@ struct eqos_softc {
kmutex_t sc_txlock;
bool sc_running;
bool sc_txrunning;
+ bool sc_promisc;
+ bool sc_allmulti;
struct eqos_ring sc_tx;
struct eqos_ring sc_rx;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: riastradh Date: Thu Nov 2 13:50:02 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c dwc_eqos_var.h Log Message: eqos(4): Fix locking around multicast filter updates. - Can't touch if_flags without IFNET_LOCK. - Can't take IFNET_LOCK in SIOCADDMULTI/SIOCDELMULTI path. Instead, cache IFF_PROMISC and IFF_ALLMULTI on if_init under a lock we can take in this path. XXX Is IFF_ALLMULTI relevant any more? Hasn't it been moved to ethercom flags? XXX Should not take sc_lock around if_init/stop -- IFNET_LOCK is enough. Should narrow scope of sc_lock to be just tick/mii/multi stuff. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/ic/dwc_eqos.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/dwc_eqos_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: riastradh Date: Thu Nov 2 13:49:49 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c dwc_eqos_var.h Log Message: eqos(4): Don't touch if_flags in tx path. Can't touch this without IFNET_LOCK. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/dwc_eqos.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/dwc_eqos_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: riastradh
Date: Thu Nov 2 13:49:49 UTC 2023
Modified Files:
src/sys/dev/ic: dwc_eqos.c dwc_eqos_var.h
Log Message:
eqos(4): Don't touch if_flags in tx path.
Can't touch this without IFNET_LOCK.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/dwc_eqos_var.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/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.30 src/sys/dev/ic/dwc_eqos.c:1.31
--- src/sys/dev/ic/dwc_eqos.c:1.30 Thu Nov 2 13:49:37 2023
+++ src/sys/dev/ic/dwc_eqos.c Thu Nov 2 13:49:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.30 2023/11/02 13:49:37 riastradh Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.31 2023/11/02 13:49:49 riastradh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -38,7 +38,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.30 2023/11/02 13:49:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.31 2023/11/02 13:49:49 riastradh Exp $");
#include
#include
@@ -698,6 +698,9 @@ eqos_init_locked(struct eqos_softc *sc)
/* Enable interrupts */
eqos_enable_intr(sc);
+ EQOS_ASSERT_TXLOCKED(sc);
+ sc->sc_txrunning = true;
+
sc->sc_running = true;
ifp->if_flags |= IFF_RUNNING;
@@ -731,6 +734,10 @@ eqos_stop_locked(struct eqos_softc *sc,
EQOS_ASSERT_LOCKED(sc);
+ EQOS_TXLOCK(sc);
+ sc->sc_txrunning = false;
+ EQOS_TXUNLOCK(sc);
+
sc->sc_running = false;
callout_halt(>sc_stat_ch, >sc_lock);
@@ -1010,7 +1017,7 @@ eqos_start_locked(struct eqos_softc *sc)
EQOS_ASSERT_TXLOCKED(sc);
- if ((ifp->if_flags & IFF_RUNNING) == 0)
+ if (!sc->sc_txrunning)
return;
for (cnt = 0, start = sc->sc_tx.cur; ; cnt++) {
Index: src/sys/dev/ic/dwc_eqos_var.h
diff -u src/sys/dev/ic/dwc_eqos_var.h:1.7 src/sys/dev/ic/dwc_eqos_var.h:1.8
--- src/sys/dev/ic/dwc_eqos_var.h:1.7 Thu Nov 2 13:49:37 2023
+++ src/sys/dev/ic/dwc_eqos_var.h Thu Nov 2 13:49:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos_var.h,v 1.7 2023/11/02 13:49:37 riastradh Exp $ */
+/* $NetBSD: dwc_eqos_var.h,v 1.8 2023/11/02 13:49:49 riastradh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -71,6 +71,7 @@ struct eqos_softc {
kmutex_t sc_lock;
kmutex_t sc_txlock;
bool sc_running;
+ bool sc_txrunning;
struct eqos_ring sc_tx;
struct eqos_ring sc_rx;
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: riastradh
Date: Thu Nov 2 13:49:37 UTC 2023
Modified Files:
src/sys/dev/ic: dwc_eqos.c dwc_eqos_var.h
Log Message:
eqos(4): Wait for callout to halt and make sure it stays halted.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/dwc_eqos_var.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/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.29 src/sys/dev/ic/dwc_eqos.c:1.30
--- src/sys/dev/ic/dwc_eqos.c:1.29 Thu Nov 2 02:32:41 2023
+++ src/sys/dev/ic/dwc_eqos.c Thu Nov 2 13:49:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.29 2023/11/02 02:32:41 msaitoh Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.30 2023/11/02 13:49:37 riastradh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -38,7 +38,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.29 2023/11/02 02:32:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.30 2023/11/02 13:49:37 riastradh Exp $");
#include
#include
@@ -468,7 +468,8 @@ eqos_tick(void *softc)
EQOS_LOCK(sc);
mii_tick(mii);
- callout_schedule(>sc_stat_ch, hz);
+ if (sc->sc_running)
+ callout_schedule(>sc_stat_ch, hz);
EQOS_UNLOCK(sc);
#ifndef EQOS_MPSAFE
@@ -697,6 +698,7 @@ eqos_init_locked(struct eqos_softc *sc)
/* Enable interrupts */
eqos_enable_intr(sc);
+ sc->sc_running = true;
ifp->if_flags |= IFF_RUNNING;
mii_mediachg(mii);
@@ -729,7 +731,8 @@ eqos_stop_locked(struct eqos_softc *sc,
EQOS_ASSERT_LOCKED(sc);
- callout_stop(>sc_stat_ch);
+ sc->sc_running = false;
+ callout_halt(>sc_stat_ch, >sc_lock);
mii_down(>sc_mii);
Index: src/sys/dev/ic/dwc_eqos_var.h
diff -u src/sys/dev/ic/dwc_eqos_var.h:1.6 src/sys/dev/ic/dwc_eqos_var.h:1.7
--- src/sys/dev/ic/dwc_eqos_var.h:1.6 Thu Oct 26 18:02:50 2023
+++ src/sys/dev/ic/dwc_eqos_var.h Thu Nov 2 13:49:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos_var.h,v 1.6 2023/10/26 18:02:50 msaitoh Exp $ */
+/* $NetBSD: dwc_eqos_var.h,v 1.7 2023/11/02 13:49:37 riastradh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -70,6 +70,7 @@ struct eqos_softc {
callout_t sc_stat_ch;
kmutex_t sc_lock;
kmutex_t sc_txlock;
+ bool sc_running;
struct eqos_ring sc_tx;
struct eqos_ring sc_rx;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: riastradh Date: Thu Nov 2 13:49:37 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c dwc_eqos_var.h Log Message: eqos(4): Wait for callout to halt and make sure it stays halted. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/dwc_eqos.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/dwc_eqos_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: martin
Date: Thu Nov 2 10:31:55 UTC 2023
Modified Files:
src/sys/ddb: db_command.c db_interface.h db_xxx.c
src/sys/kern: kern_condvar.c kern_sleepq.c sys_pipe.c uipc_socket.c
uipc_syscalls.c
src/sys/rump/librump/rumpkern: locks.c locks_up.c
src/sys/sys: condvar.h lwp.h pipe.h socketvar.h
src/usr.bin/fstat: fstat.c
Log Message:
Back out the following revisions on behalf of core:
sys/sys/lwp.h: revision 1.228
sys/sys/pipe.h: revision 1.40
sys/kern/uipc_socket.c: revision 1.306
sys/kern/kern_sleepq.c: revision 1.84
sys/rump/librump/rumpkern/locks_up.c: revision 1.13
sys/kern/sys_pipe.c: revision 1.165
usr.bin/fstat/fstat.c: revision 1.119
sys/rump/librump/rumpkern/locks.c: revision 1.87
sys/ddb/db_xxx.c: revision 1.78
sys/ddb/db_command.c: revision 1.187
sys/sys/condvar.h: revision 1.18
sys/ddb/db_interface.h: revision 1.42
sys/sys/socketvar.h: revision 1.166
sys/kern/uipc_syscalls.c: revision 1.209
sys/kern/kern_condvar.c: revision 1.60
Add cv_fdrestart() [...]
Use cv_fdrestart() to implement fo_restart.
Simplify/streamline pipes a little bit [...]
This changes have caused regressions and need to be debugged.
The cv_fdrestart() addition needs more discussion.
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/ddb/db_command.c
cvs rdiff -u -r1.42 -r1.43 src/sys/ddb/db_interface.h
cvs rdiff -u -r1.79 -r1.80 src/sys/ddb/db_xxx.c
cvs rdiff -u -r1.62 -r1.63 src/sys/kern/kern_condvar.c
cvs rdiff -u -r1.86 -r1.87 src/sys/kern/kern_sleepq.c
cvs rdiff -u -r1.165 -r1.166 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.306 -r1.307 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.209 -r1.210 src/sys/kern/uipc_syscalls.c
cvs rdiff -u -r1.87 -r1.88 src/sys/rump/librump/rumpkern/locks.c
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpkern/locks_up.c
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/condvar.h
cvs rdiff -u -r1.230 -r1.231 src/sys/sys/lwp.h
cvs rdiff -u -r1.41 -r1.42 src/sys/sys/pipe.h
cvs rdiff -u -r1.166 -r1.167 src/sys/sys/socketvar.h
cvs rdiff -u -r1.119 -r1.120 src/usr.bin/fstat/fstat.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/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.189 src/sys/ddb/db_command.c:1.190
--- src/sys/ddb/db_command.c:1.189 Sun Oct 15 10:27:33 2023
+++ src/sys/ddb/db_command.c Thu Nov 2 10:31:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_command.c,v 1.189 2023/10/15 10:27:33 riastradh Exp $ */
+/* $NetBSD: db_command.c,v 1.190 2023/11/02 10:31:55 martin Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009, 2019
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.189 2023/10/15 10:27:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.190 2023/11/02 10:31:55 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -301,8 +301,6 @@ static const struct db_command db_show_c
0 ,"List all used memory pages.",NULL,NULL) },
{ DDB_ADD_CMD("panic", db_show_panic, 0,
"Print the current panic string",NULL,NULL) },
- { DDB_ADD_CMD("pipe", db_show_pipe,
- 0 ,"Show the contents of a pipe.",NULL,NULL) },
{ DDB_ADD_CMD("pool", db_pool_print_cmd, 0,
"Print the pool at address.", "[/clp] address",NULL) },
/* added from all sub cmds */
Index: src/sys/ddb/db_interface.h
diff -u src/sys/ddb/db_interface.h:1.42 src/sys/ddb/db_interface.h:1.43
--- src/sys/ddb/db_interface.h:1.42 Fri Oct 13 19:07:08 2023
+++ src/sys/ddb/db_interface.h Thu Nov 2 10:31:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.h,v 1.42 2023/10/13 19:07:08 ad Exp $ */
+/* $NetBSD: db_interface.h,v 1.43 2023/11/02 10:31:55 martin Exp $ */
/*-
* Copyright (c) 1995, 2023 The NetBSD Foundation, Inc.
@@ -86,9 +86,6 @@ void db_show_sleepq(db_expr_t, bool, db
/* kern/kern_condvar.c */
void db_show_condvar(db_expr_t, bool, db_expr_t, const char *);
-/* kern/sys_pipe.c */
-void db_show_pipe(db_expr_t, bool, db_expr_t, const char *);
-
/* kern/sys_select.c */
void db_show_selinfo(db_expr_t, bool, db_expr_t, const char *);
Index: src/sys/ddb/db_xxx.c
diff -u src/sys/ddb/db_xxx.c:1.79 src/sys/ddb/db_xxx.c:1.80
--- src/sys/ddb/db_xxx.c:1.79 Sun Oct 15 10:40:52 2023
+++ src/sys/ddb/db_xxx.c Thu Nov 2 10:31:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_xxx.c,v 1.79 2023/10/15 10:40:52 martin Exp $ */
+/* $NetBSD: db_xxx.c,v 1.80 2023/11/02 10:31:55 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_xxx.c,v 1.79 2023/10/15 10:40:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_xxx.c,v 1.80 2023/11/02 10:31:55 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_kgdb.h"
@@ -72,7 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: db_xxx.c,v 1
CVS commit: src
Module Name:src Committed By: martin Date: Thu Nov 2 10:31:55 UTC 2023 Modified Files: src/sys/ddb: db_command.c db_interface.h db_xxx.c src/sys/kern: kern_condvar.c kern_sleepq.c sys_pipe.c uipc_socket.c uipc_syscalls.c src/sys/rump/librump/rumpkern: locks.c locks_up.c src/sys/sys: condvar.h lwp.h pipe.h socketvar.h src/usr.bin/fstat: fstat.c Log Message: Back out the following revisions on behalf of core: sys/sys/lwp.h: revision 1.228 sys/sys/pipe.h: revision 1.40 sys/kern/uipc_socket.c: revision 1.306 sys/kern/kern_sleepq.c: revision 1.84 sys/rump/librump/rumpkern/locks_up.c: revision 1.13 sys/kern/sys_pipe.c: revision 1.165 usr.bin/fstat/fstat.c: revision 1.119 sys/rump/librump/rumpkern/locks.c: revision 1.87 sys/ddb/db_xxx.c: revision 1.78 sys/ddb/db_command.c: revision 1.187 sys/sys/condvar.h: revision 1.18 sys/ddb/db_interface.h: revision 1.42 sys/sys/socketvar.h: revision 1.166 sys/kern/uipc_syscalls.c: revision 1.209 sys/kern/kern_condvar.c: revision 1.60 Add cv_fdrestart() [...] Use cv_fdrestart() to implement fo_restart. Simplify/streamline pipes a little bit [...] This changes have caused regressions and need to be debugged. The cv_fdrestart() addition needs more discussion. To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.190 src/sys/ddb/db_command.c cvs rdiff -u -r1.42 -r1.43 src/sys/ddb/db_interface.h cvs rdiff -u -r1.79 -r1.80 src/sys/ddb/db_xxx.c cvs rdiff -u -r1.62 -r1.63 src/sys/kern/kern_condvar.c cvs rdiff -u -r1.86 -r1.87 src/sys/kern/kern_sleepq.c cvs rdiff -u -r1.165 -r1.166 src/sys/kern/sys_pipe.c cvs rdiff -u -r1.306 -r1.307 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.209 -r1.210 src/sys/kern/uipc_syscalls.c cvs rdiff -u -r1.87 -r1.88 src/sys/rump/librump/rumpkern/locks.c cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpkern/locks_up.c cvs rdiff -u -r1.18 -r1.19 src/sys/sys/condvar.h cvs rdiff -u -r1.230 -r1.231 src/sys/sys/lwp.h cvs rdiff -u -r1.41 -r1.42 src/sys/sys/pipe.h cvs rdiff -u -r1.166 -r1.167 src/sys/sys/socketvar.h cvs rdiff -u -r1.119 -r1.120 src/usr.bin/fstat/fstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/if_vlan
Module Name:src
Committed By: yamaguchi
Date: Thu Nov 2 09:50:50 UTC 2023
Modified Files:
src/tests/net/if_vlan: t_vlan.sh
Log Message:
Added the test for vlan over l2tp
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tests/net/if_vlan/t_vlan.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/net/if_vlan/t_vlan.sh
diff -u src/tests/net/if_vlan/t_vlan.sh:1.24 src/tests/net/if_vlan/t_vlan.sh:1.25
--- src/tests/net/if_vlan/t_vlan.sh:1.24 Thu Aug 19 03:27:05 2021
+++ src/tests/net/if_vlan/t_vlan.sh Thu Nov 2 09:50:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_vlan.sh,v 1.24 2021/08/19 03:27:05 yamaguchi Exp $
+# $NetBSD: t_vlan.sh,v 1.25 2023/11/02 09:50:50 yamaguchi Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -1035,6 +1035,139 @@ vlan_promisc_cleanup()
cleanup
}
+vlan_l2tp_body_common()
+{
+ local atf_ifconfig="atf_check -s exit:0 rump.ifconfig"
+
+ local af=$1
+ local ping_cmd="rump.ping -c 1"
+ local pfx=24
+ local local0=$IP_LOCAL0
+ local local1=$IP_LOCAL1
+ local remote0=$IP_REMOTE0
+ local remote1=$IP_REMOTE1
+ local sysctl_param="net.inet.ip.dad_count=0"
+ local vid0=10
+ local vid1=11
+
+ local l2tp_laddr=10.222.222.1
+ local l2tp_lsession=1001
+ local l2tp_raddr=10.222.222.2
+ local l2tp_rsession=1002
+
+ if [ x"$af" = x"inet6" ]; then
+ ping_cmd="rump.ping6 -c 1"
+ rumplib="netinet6"
+ pfx=64
+ local0=$IP6_LOCAL0
+ local1=$IP6_LOCAL1
+ remote0=$IP6_REMOTE0
+ remote1=$IP6_REMOTE1
+ sysctl_param="net.inet6.ip6.dad_count=0"
+ fi
+
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS
+ rump_server_add_iface $SOCK_LOCAL l2tp0
+ rump_server_add_iface $SOCK_LOCAL vlan0
+ rump_server_add_iface $SOCK_LOCAL vlan1
+
+ rump_server_add_iface $SOCK_REMOTE shmif0 $BUS
+ rump_server_add_iface $SOCK_REMOTE l2tp0
+ rump_server_add_iface $SOCK_REMOTE vlan0
+ rump_server_add_iface $SOCK_REMOTE vlan1
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.sysctl -w $sysctl_param
+ $atf_ifconfig shmif0 $l2tp_laddr/24
+ $atf_ifconfig l2tp0 tunnel $l2tp_laddr $l2tp_raddr
+ $atf_ifconfig l2tp0 session $l2tp_lsession $l2tp_rsession
+ $atf_ifconfig l2tp0 up
+
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 -o ignore rump.sysctl -w $sysctl_param
+ $atf_ifconfig shmif0 $l2tp_raddr/24
+ $atf_ifconfig l2tp0 tunnel $l2tp_raddr $l2tp_laddr
+ $atf_ifconfig l2tp0 session $l2tp_rsession $l2tp_lsession
+ $atf_ifconfig l2tp0 up
+
+ # configure vlans on l2tp(4)
+ export RUMP_SERVER=$SOCK_LOCAL
+ $atf_ifconfig vlan0 vlan $vid0 vlanif l2tp0
+ $atf_ifconfig vlan0 $af $local0/$pfx
+ $atf_ifconfig vlan1 vlan $vid1 vlanif l2tp0
+ $atf_ifconfig vlan1 $af $local1/$pfx
+ export RUMP_SERVER=$SOCK_REMOTE
+ $atf_ifconfig vlan0 vlan $vid0 vlanif l2tp0
+ $atf_ifconfig vlan0 $af $remote0/$pfx
+ $atf_ifconfig vlan1 vlan $vid1 vlanif l2tp0
+ $atf_ifconfig vlan1 $af $remote1/$pfx
+
+ # test for VLAN frame transfer
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore $ping_cmd $remote0
+ atf_check -s exit:0 -o ignore $ping_cmd $remote1
+
+ # unconfig vlans
+ export RUMP_SERVER=$SOCK_LOCAL
+ $atf_ifconfig vlan0 -vlanif
+ export RUMP_SERVER=$SOCK_REMOTE
+ $atf_ifconfig vlan0 -vlanif
+
+ # remove l2tp0 that has vlan1
+ export RUMP_SERVER=$SOCK_LOCAL
+ $atf_ifconfig l2tp0 destroy
+ export RUMP_SERVER=$SOCK_REMOTE
+ $atf_ifconfig l2tp0 destroy
+}
+
+atf_test_case vlan_l2tp cleanup
+vlan_l2tp_head()
+{
+
+ atf_set "descr" "tests of vlan(IPv4) over l2tp(IPv4)"
+ atf_set "require.progs" "rump_server"
+}
+
+vlan_l2tp_body()
+{
+
+ rump_server_start $SOCK_LOCAL vlan l2tp
+ rump_server_start $SOCK_REMOTE vlan l2tp
+
+ vlan_l2tp_body_common "inet"
+}
+
+vlan_l2tp_cleanup()
+{
+
+ $DEBUG && dump
+ cleanup
+}
+
+atf_test_case vlan_l2tp6 cleanup
+vlan_l2tp6_head()
+{
+
+ atf_set "descr" "tests of vlan(IPv6) over l2tp(IPv4)"
+ atf_set "require.progs" "rump_server"
+}
+
+vlan_l2tp6_body()
+{
+
+ rump_server_start $SOCK_LOCAL vlan l2tp netinet6
+ rump_server_start $SOCK_REMOTE vlan l2tp netinet6
+
+ vlan_l2tp_body_common "inet6"
+}
+
+vlan_l2tp6_cleanup()
+{
+
+ $DEBUG && dump
+ cleanup
+}
+
atf_init_test_cases()
{
@@ -1046,6 +1179,7 @@ atf_init_test_cases()
atf_add_test_case vlan_bridge
atf_add_test_case vlan_multicast
atf_add_test_case vlan_promisc
+ atf_add_test_case vlan_l2tp
atf_add_test_case vlan_create_destroy6
atf_add_test_case vlan_basic6
@@ -1054,4 +1188,5 @@ atf_init_test_cases()
atf_add_test_case vlan_configs6
atf_add_test_case vlan_bridge6
atf_add_test_case vlan_multicast6
+ atf_add_test_case vlan_l2tp6
}
CVS commit: src/tests/net/if_vlan
Module Name:src Committed By: yamaguchi Date: Thu Nov 2 09:50:50 UTC 2023 Modified Files: src/tests/net/if_vlan: t_vlan.sh Log Message: Added the test for vlan over l2tp To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/tests/net/if_vlan/t_vlan.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: yamaguchi
Date: Thu Nov 2 09:48:29 UTC 2023
Modified Files:
src/sys/net: if_vlan.c
Log Message:
Support vlan(4) over l2tp(4)
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/net/if_vlan.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/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.170 src/sys/net/if_vlan.c:1.171
--- src/sys/net/if_vlan.c:1.170 Mon Jun 20 08:14:48 2022
+++ src/sys/net/if_vlan.c Thu Nov 2 09:48:29 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.170 2022/06/20 08:14:48 yamaguchi Exp $ */
+/* $NetBSD: if_vlan.c,v 1.171 2023/11/02 09:48:29 yamaguchi Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.170 2022/06/20 08:14:48 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.171 2023/11/02 09:48:29 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -97,6 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v
#include
#include
#include
+#include
#include
#include
#include
@@ -149,6 +150,7 @@ struct ifvlan_linkmib {
struct ifvlan {
struct ethercom ifv_ec;
+ uint8_t ifv_lladdr[ETHER_ADDR_LEN];
struct ifvlan_linkmib *ifv_mib; /*
* reader must use vlan_getref_linkmib()
* instead of direct dereference
@@ -189,6 +191,15 @@ const struct vlan_multisw vlan_ether_mul
.vmsw_purgemulti = vlan_ether_purgemulti,
};
+static void vlan_multi_nothing(struct ifvlan *);
+static int vlan_multi_nothing_ifreq(struct ifvlan *, struct ifreq *);
+
+const struct vlan_multisw vlan_nothing_multisw = {
+ .vmsw_addmulti = vlan_multi_nothing_ifreq,
+ .vmsw_delmulti = vlan_multi_nothing_ifreq,
+ .vmsw_purgemulti = vlan_multi_nothing,
+};
+
static int vlan_clone_create(struct if_clone *, int);
static int vlan_clone_destroy(struct ifnet *);
static int vlan_config(struct ifvlan *, struct ifnet *, uint16_t);
@@ -327,6 +338,9 @@ vlan_clone_create(struct if_clone *ifc,
mib = kmem_zalloc(sizeof(struct ifvlan_linkmib), KM_SLEEP);
ifp = >ifv_if;
LIST_INIT(>ifv_mc_listhead);
+ cprng_fast(ifv->ifv_lladdr, sizeof(ifv->ifv_lladdr));
+ ifv->ifv_lladdr[0] &= 0xFE; /* clear I/G bit */
+ ifv->ifv_lladdr[0] |= 0x02; /* set G/L bit */
mib->ifvm_ifvlan = ifv;
mib->ifvm_p = NULL;
@@ -394,7 +408,10 @@ vlan_config(struct ifvlan *ifv, struct i
struct ifvlan_linkmib *omib = NULL;
struct ifvlan_linkmib *checkmib;
struct psref_target *nmib_psref = NULL;
+ struct ethercom *ec;
const uint16_t vid = EVL_VLANOFTAG(tag);
+ const uint8_t *lla;
+ u_char ifv_iftype;
int error = 0;
int idx;
bool omib_cleanup = false;
@@ -428,69 +445,79 @@ vlan_config(struct ifvlan *ifv, struct i
switch (p->if_type) {
case IFT_ETHER:
- {
- struct ethercom *ec = (void *)p;
-
nmib->ifvm_msw = _ether_multisw;
nmib->ifvm_mintu = ETHERMIN;
- error = ether_add_vlantag(p, tag, NULL);
- if (error != 0)
- goto done;
-
- if (ec->ec_capenable & ETHERCAP_VLAN_MTU) {
- nmib->ifvm_mtufudge = 0;
- } else {
- /*
- * Fudge the MTU by the encapsulation size. This
- * makes us incompatible with strictly compliant
- * 802.1Q implementations, but allows us to use
- * the feature with other NetBSD
- * implementations, which might still be useful.
- */
- nmib->ifvm_mtufudge = ETHER_VLAN_ENCAP_LEN;
- }
-
/*
- * If the parent interface can do hardware-assisted
- * VLAN encapsulation, then propagate its hardware-
- * assisted checksumming flags and tcp segmentation
- * offload.
+ * We inherit the parent's Ethernet address.
*/
- if (ec->ec_capabilities & ETHERCAP_VLAN_HWTAGGING) {
- ifp->if_capabilities = p->if_capabilities &
- (IFCAP_TSOv4 | IFCAP_TSOv6 |
-IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_IPv4_Rx |
-IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_TCPv4_Rx |
-IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_UDPv4_Rx |
-IFCAP_CSUM_TCPv6_Tx | IFCAP_CSUM_TCPv6_Rx |
-IFCAP_CSUM_UDPv6_Tx | IFCAP_CSUM_UDPv6_Rx);
- }
+ lla = CLLADDR(p->if_sadl);
/*
- * We inherit the parent's Ethernet address.
+ * Inherit the if_type from the parent. This allows us
+ * to participate in bridges of that type.
*/
- ether_ifattach(ifp, CLLADDR(p->if_sadl));
- ifp->if_hdrlen = sizeof(struct ether_vlan_header); /* XXX? */
+ ifv_iftype = p->if_type;
+ break;
+
+ case IFT_L2TP:
+ nmib->ifvm_msw = _nothing_multisw;
+ nmib->ifvm_mintu = ETHERMIN;
+ /* use random Ethernet address. */
+ lla = ifv->ifv_lladdr;
+ ifv_iftype = IFT_ETHER;
break;
- }
default:
error = EPROTONOSUPPORT;
goto done;
}
+ error = ether_add_vlantag(p, tag, NULL);
+ if (error != 0)
+ goto done;
+
+ ec = (struct ethercom *)p;
+ if (ec->ec_capenable & ETHERCAP_VLAN_MTU) {
+ nmib->ifvm_mtufudge = 0;
+ } else {
+ /*
+ * Fudge the MTU by the encapsulation size. This
+ * makes us incompatible with
CVS commit: src/sys/net
Module Name:src Committed By: yamaguchi Date: Thu Nov 2 09:48:29 UTC 2023 Modified Files: src/sys/net: if_vlan.c Log Message: Support vlan(4) over l2tp(4) To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/sys/net/if_vlan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: yamaguchi
Date: Thu Nov 2 09:43:46 UTC 2023
Modified Files:
src/sys/net: if_l2tp.c
Log Message:
l2tp(4): use ether_ifattach() to initialize ethercom
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/net/if_l2tp.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/net/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.48 src/sys/net/if_l2tp.c:1.49
--- src/sys/net/if_l2tp.c:1.48 Sat Sep 3 02:47:59 2022
+++ src/sys/net/if_l2tp.c Thu Nov 2 09:43:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.c,v 1.48 2022/09/03 02:47:59 thorpej Exp $ */
+/* $NetBSD: if_l2tp.c,v 1.49 2023/11/02 09:43:46 yamaguchi Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.48 2022/09/03 02:47:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.49 2023/11/02 09:43:46 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -281,6 +281,12 @@ int
l2tpattach0(struct l2tp_softc *sc)
{
+ sc->l2tp_ec.ec_capabilities = 0;
+ sc->l2tp_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
+ sc->l2tp_ec.ec_capabilities |= ETHERCAP_JUMBO_MTU;
+
+ ether_ifattach(>l2tp_ec.ec_if, NULL);
+
sc->l2tp_ec.ec_if.if_addrlen = 0;
sc->l2tp_ec.ec_if.if_mtu= L2TP_MTU;
sc->l2tp_ec.ec_if.if_flags = IFF_POINTOPOINT|IFF_MULTICAST|IFF_SIMPLEX;
@@ -296,23 +302,6 @@ l2tpattach0(struct l2tp_softc *sc)
sc->l2tp_ec.ec_if._if_input = ether_input;
IFQ_SET_READY(>l2tp_ec.ec_if.if_snd);
-#ifdef MBUFTRACE
- struct ethercom *ec = >l2tp_ec;
- struct ifnet *ifp = >l2tp_ec.ec_if;
-
- strlcpy(ec->ec_tx_mowner.mo_name, ifp->if_xname,
- sizeof(ec->ec_tx_mowner.mo_name));
- strlcpy(ec->ec_tx_mowner.mo_descr, "tx",
- sizeof(ec->ec_tx_mowner.mo_descr));
- strlcpy(ec->ec_rx_mowner.mo_name, ifp->if_xname,
- sizeof(ec->ec_rx_mowner.mo_name));
- strlcpy(ec->ec_rx_mowner.mo_descr, "rx",
- sizeof(ec->ec_rx_mowner.mo_descr));
- MOWNER_ATTACH(>ec_tx_mowner);
- MOWNER_ATTACH(>ec_rx_mowner);
- ifp->if_mowner = >ec_tx_mowner;
-#endif
-
/* XXX
* It may improve performance to use if_initialize()/if_register()
* so that l2tp_input() calls if_input() instead of
@@ -322,7 +311,6 @@ l2tpattach0(struct l2tp_softc *sc)
if_attach(>l2tp_ec.ec_if);
if_link_state_change(>l2tp_ec.ec_if, LINK_STATE_DOWN);
if_alloc_sadl(>l2tp_ec.ec_if);
- bpf_attach(>l2tp_ec.ec_if, DLT_EN10MB, sizeof(struct ether_header));
return 0;
}
@@ -351,6 +339,8 @@ l2tp_clone_destroy(struct ifnet *ifp)
struct l2tp_softc *sc = container_of(ifp, struct l2tp_softc,
l2tp_ec.ec_if);
+ ether_ifdetach(ifp);
+
l2tp_clear_session(sc);
l2tp_delete_tunnel(>l2tp_ec.ec_if);
/*
@@ -369,8 +359,6 @@ l2tp_clone_destroy(struct ifnet *ifp)
LIST_REMOVE(sc, l2tp_list);
mutex_exit(_softcs.lock);
- bpf_detach(ifp);
-
if_detach(ifp);
if_tunnel_free_ro_percpu(sc->l2tp_ro_percpu);
CVS commit: src/sys/net
Module Name:src Committed By: yamaguchi Date: Thu Nov 2 09:43:46 UTC 2023 Modified Files: src/sys/net: if_l2tp.c Log Message: l2tp(4): use ether_ifattach() to initialize ethercom To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/net/if_l2tp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: yamaguchi Date: Thu Nov 2 09:40:47 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixv.c src/sys/net: if_ethersubr.c Log Message: Use ether_bpf_mtap only when the device supports vlan harware tagging The function is bpf_mtap() for ethernet devices and *currently* it is just handling VLAN tag stripped by the hardware. To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.193 -r1.194 src/sys/dev/pci/ixgbe/ixv.c cvs rdiff -u -r1.325 -r1.326 src/sys/net/if_ethersubr.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/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.346 src/sys/dev/pci/ixgbe/ixgbe.c:1.347 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.346 Thu Nov 2 05:07:57 2023 +++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Nov 2 09:40:47 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.346 2023/11/02 05:07:57 msaitoh Exp $ */ +/* $NetBSD: ixgbe.c,v 1.347 2023/11/02 09:40:47 yamaguchi Exp $ */ /** @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.346 2023/11/02 05:07:57 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.347 2023/11/02 09:40:47 yamaguchi Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1411,14 +1411,10 @@ ixgbe_setup_interface(device_t dev, stru if_initialize(ifp); sc->ipq = if_percpuq_create(>osdep.ec.ec_if); - ether_ifattach(ifp, sc->hw.mac.addr); - aprint_normal_dev(dev, "Ethernet address %s\n", - ether_sprintf(sc->hw.mac.addr)); /* * We use per TX queue softint, so if_deferred_start_init() isn't * used. */ - ether_set_ifflags_cb(ec, ixgbe_ifflags_cb); sc->max_frame_size = ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; @@ -1442,6 +1438,11 @@ ixgbe_setup_interface(device_t dev, stru /* Enable the above capabilities by default */ ec->ec_capenable = ec->ec_capabilities; + ether_ifattach(ifp, sc->hw.mac.addr); + aprint_normal_dev(dev, "Ethernet address %s\n", + ether_sprintf(sc->hw.mac.addr)); + ether_set_ifflags_cb(ec, ixgbe_ifflags_cb); + /* * Don't turn this on by default, if vlans are * created on another pseudo device (eg. lagg) Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.193 src/sys/dev/pci/ixgbe/ixv.c:1.194 --- src/sys/dev/pci/ixgbe/ixv.c:1.193 Thu Nov 2 05:07:57 2023 +++ src/sys/dev/pci/ixgbe/ixv.c Thu Nov 2 09:40:47 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ixv.c,v 1.193 2023/11/02 05:07:57 msaitoh Exp $ */ +/* $NetBSD: ixv.c,v 1.194 2023/11/02 09:40:47 yamaguchi Exp $ */ /** @@ -35,7 +35,7 @@ /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/ #include -__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.193 2023/11/02 05:07:57 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.194 2023/11/02 09:40:47 yamaguchi Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1678,14 +1678,10 @@ ixv_setup_interface(device_t dev, struct if_initialize(ifp); sc->ipq = if_percpuq_create(>osdep.ec.ec_if); - ether_ifattach(ifp, sc->hw.mac.addr); - aprint_normal_dev(dev, "Ethernet address %s\n", - ether_sprintf(sc->hw.mac.addr)); /* * We use per TX queue softint, so if_deferred_start_init() isn't * used. */ - ether_set_ifflags_cb(ec, ixv_ifflags_cb); sc->max_frame_size = ifp->if_mtu + IXGBE_MTU_HDR; @@ -1709,6 +1705,11 @@ ixv_setup_interface(device_t dev, struct /* Enable the above capabilities by default */ ec->ec_capenable = ec->ec_capabilities; + ether_ifattach(ifp, sc->hw.mac.addr); + aprint_normal_dev(dev, "Ethernet address %s\n", + ether_sprintf(sc->hw.mac.addr)); + ether_set_ifflags_cb(ec, ixv_ifflags_cb); + /* Don't enable LRO by default */ #if 0 /* NetBSD doesn't support LRO yet */ Index: src/sys/net/if_ethersubr.c diff -u src/sys/net/if_ethersubr.c:1.325 src/sys/net/if_ethersubr.c:1.326 --- src/sys/net/if_ethersubr.c:1.325 Thu Nov 2 09:36:27 2023 +++ src/sys/net/if_ethersubr.c Thu Nov 2 09:40:47 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ethersubr.c,v 1.325 2023/11/02 09:36:27 yamaguchi Exp $ */ +/* $NetBSD: if_ethersubr.c,v 1.326 2023/11/02 09:40:47 yamaguchi Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.325 2023/11/02 09:36:27 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.326 2023/11/02 09:40:47 yamaguchi Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1051,7 +1051,8 @@ ether_ifattach(struct ifnet *ifp, const ifp->if_mtu = ETHERMTU; ifp->if_output = ether_output; ifp->_if_input = ether_input; - ifp->if_bpf_mtap = ether_bpf_mtap; + if (ec->ec_capabilities & ETHERCAP_VLAN_HWTAGGING) + ifp->if_bpf_mtap
CVS commit: src/sys
Module Name:src Committed By: yamaguchi Date: Thu Nov 2 09:40:47 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixv.c src/sys/net: if_ethersubr.c Log Message: Use ether_bpf_mtap only when the device supports vlan harware tagging The function is bpf_mtap() for ethernet devices and *currently* it is just handling VLAN tag stripped by the hardware. To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.193 -r1.194 src/sys/dev/pci/ixgbe/ixv.c cvs rdiff -u -r1.325 -r1.326 src/sys/net/if_ethersubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: yamaguchi
Date: Thu Nov 2 09:36:28 UTC 2023
Modified Files:
src/sys/net: if_ethersubr.c
Log Message:
Added NULL check
To generate a diff of this commit:
cvs rdiff -u -r1.324 -r1.325 src/sys/net/if_ethersubr.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/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.324 src/sys/net/if_ethersubr.c:1.325
--- src/sys/net/if_ethersubr.c:1.324 Fri Oct 20 08:35:09 2023
+++ src/sys/net/if_ethersubr.c Thu Nov 2 09:36:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.324 2023/10/20 08:35:09 msaitoh Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.325 2023/11/02 09:36:27 yamaguchi Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.324 2023/10/20 08:35:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.325 2023/11/02 09:36:27 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1041,7 +1041,7 @@ ether_ifattach(struct ifnet *ifp, const
struct ethercom *ec = (struct ethercom *)ifp;
char xnamebuf[HOOKNAMSIZ];
- if (ETHER_IS_MULTICAST(lla))
+ if (lla != NULL && ETHER_IS_MULTICAST(lla))
aprint_error("The multicast bit is set in the MAC address. "
"It's wrong.\n");
CVS commit: src/sys/net
Module Name:src Committed By: yamaguchi Date: Thu Nov 2 09:36:28 UTC 2023 Modified Files: src/sys/net: if_ethersubr.c Log Message: Added NULL check To generate a diff of this commit: cvs rdiff -u -r1.324 -r1.325 src/sys/net/if_ethersubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/igc
Module Name:src
Committed By: rin
Date: Thu Nov 2 09:29:30 UTC 2023
Modified Files:
src/sys/dev/pci/igc: if_igc.c
Log Message:
igc(4): Notify which of 64- or 32-bit DMA is used
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/igc/if_igc.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/igc/if_igc.c
diff -u src/sys/dev/pci/igc/if_igc.c:1.7 src/sys/dev/pci/igc/if_igc.c:1.8
--- src/sys/dev/pci/igc/if_igc.c:1.7 Sun Oct 15 22:36:52 2023
+++ src/sys/dev/pci/igc/if_igc.c Thu Nov 2 09:29:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.7 2023/10/15 22:36:52 oster Exp $ */
+/* $NetBSD: if_igc.c,v 1.8 2023/11/02 09:29:30 rin Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.7 2023/10/15 22:36:52 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.8 2023/11/02 09:29:30 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -354,7 +354,6 @@ igc_attach(device_t parent, device_t sel
const struct igc_product *igcp = igc_lookup(pa);
KASSERT(igcp != NULL);
- pci_aprint_devinfo_fancy(pa, "Ethernet controller", igcp->igcp_name, 1);
sc->sc_dev = self;
callout_init(>sc_tick_ch, CALLOUT_MPSAFE);
@@ -363,17 +362,23 @@ igc_attach(device_t parent, device_t sel
sc->osdep.os_sc = sc;
sc->osdep.os_pa = *pa;
-#ifdef __aarch64__
+#ifndef __aarch64__
/*
* XXX PR port-arm/57643
* 64-bit DMA does not work at least for LX2K with 32/64GB memory.
* smmu(4) support may be required.
*/
- sc->osdep.os_dmat = pa->pa_dmat;
-#else
- sc->osdep.os_dmat = pci_dma64_available(pa) ?
- pa->pa_dmat64 : pa->pa_dmat;
+ if (pci_dma64_available(pa)) {
+ aprint_verbose(", 64-bit DMA");
+ sc->osdep.os_dmat = pa->pa_dmat64;
+ } else
#endif
+ {
+ aprint_verbose(", 32-bit DMA");
+ sc->osdep.os_dmat = pa->pa_dmat;
+ }
+
+ pci_aprint_devinfo_fancy(pa, "Ethernet controller", igcp->igcp_name, 1);
/* Determine hardware and mac info */
igc_identify_hardware(sc);
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: rin Date: Thu Nov 2 09:29:30 UTC 2023 Modified Files: src/sys/dev/pci/igc: if_igc.c Log Message: igc(4): Notify which of 64- or 32-bit DMA is used To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/igc/if_igc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Nov 2 08:56:34 UTC 2023 Modified Files: src/share/man/man4: ixg.4 Log Message: ixg(4): fix formatting of AUTHORS To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/share/man/man4/ixg.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/ixg.4 diff -u src/share/man/man4/ixg.4:1.15 src/share/man/man4/ixg.4:1.16 --- src/share/man/man4/ixg.4:1.15 Wed Aug 25 09:06:02 2021 +++ src/share/man/man4/ixg.4 Thu Nov 2 08:56:34 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: ixg.4,v 1.15 2021/08/25 09:06:02 msaitoh Exp $ +.\" $NetBSD: ixg.4,v 1.16 2023/11/02 08:56:34 wiz Exp $ .\" .\" Copyright (c) 2001-2008, Intel Corporation .\" All rights reserved. @@ -99,6 +99,7 @@ where it is called It first appeared in .Nx 6.0 . .Sh AUTHORS +.An -nosplit The .Nm driver was written by
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Nov 2 08:56:34 UTC 2023 Modified Files: src/share/man/man4: ixg.4 Log Message: ixg(4): fix formatting of AUTHORS To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/share/man/man4/ixg.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Nov 2 06:09:07 UTC 2023
Modified Files:
src/usr.bin/make: var.c
Log Message:
make: when comparing substrings, don't read beyond the substring's end
Right now, Substring_Words terminates each word with a '\0', but that's
an implementation detail that is not required by the interface, so don't
rely on it.
To generate a diff of this commit:
cvs rdiff -u -r1.1067 -r1.1068 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.1067 src/usr.bin/make/var.c:1.1068
--- src/usr.bin/make/var.c:1.1067 Thu Nov 2 05:55:22 2023
+++ src/usr.bin/make/var.c Thu Nov 2 06:09:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1067 2023/11/02 05:55:22 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1068 2023/11/02 06:09:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1067 2023/11/02 05:55:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1068 2023/11/02 06:09:07 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -3382,10 +3382,19 @@ SubNumDesc(const void *sa, const void *s
}
static int
+Substring_Cmp(Substring a, Substring b)
+{
+ for (; a.start < a.end && b.start < b.end; a.start++, b.start++)
+ if (a.start[0] != b.start[0])
+ return (unsigned char)a.start[0]
+ - (unsigned char)b.start[0];
+ return (int)((a.end - a.start) - (b.end - b.start));
+}
+
+static int
SubStrAsc(const void *sa, const void *sb)
{
- return strcmp(
- ((const Substring *)sa)->start, ((const Substring *)sb)->start);
+ return Substring_Cmp(*(const Substring *)sa, *(const Substring *)sb);
}
static int
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Nov 2 06:09:07 UTC 2023 Modified Files: src/usr.bin/make: var.c Log Message: make: when comparing substrings, don't read beyond the substring's end Right now, Substring_Words terminates each word with a '\0', but that's an implementation detail that is not required by the interface, so don't rely on it. To generate a diff of this commit: cvs rdiff -u -r1.1067 -r1.1068 src/usr.bin/make/var.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
