CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Oct 19 15:00:41 UTC 2022 Modified Files: src/doc: CHANGES Log Message: doc: Various recent changes To generate a diff of this commit: cvs rdiff -u -r1.2921 -r1.2922 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/dist/apps
Module Name:src Committed By: christos Date: Wed Oct 19 14:23:00 UTC 2022 Modified Files: src/crypto/external/bsd/openssl/dist/apps: openssl.cnf Log Message: PR/57065: sergio lenzi: remove the default_md override, since 1.1 it is sha256 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/apps/openssl.cnf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/dist/apps
Module Name:src Committed By: christos Date: Wed Oct 19 14:23:00 UTC 2022 Modified Files: src/crypto/external/bsd/openssl/dist/apps: openssl.cnf Log Message: PR/57065: sergio lenzi: remove the default_md override, since 1.1 it is sha256 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/apps/openssl.cnf 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/openssl/dist/apps/openssl.cnf diff -u src/crypto/external/bsd/openssl/dist/apps/openssl.cnf:1.8 src/crypto/external/bsd/openssl/dist/apps/openssl.cnf:1.9 --- src/crypto/external/bsd/openssl/dist/apps/openssl.cnf:1.8 Tue Mar 12 12:58:12 2019 +++ src/crypto/external/bsd/openssl/dist/apps/openssl.cnf Wed Oct 19 10:23:00 2022 @@ -107,7 +107,6 @@ emailAddress = optional [ req ] default_bits = 2048 default_keyfile = privkey.pem -default_md = sha2 distinguished_name = req_distinguished_name attributes = req_attributes x509_extensions = v3_ca # The extensions to add to the self signed cert
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Oct 19 15:00:41 UTC 2022 Modified Files: src/doc: CHANGES Log Message: doc: Various recent changes To generate a diff of this commit: cvs rdiff -u -r1.2921 -r1.2922 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2921 src/doc/CHANGES:1.2922 --- src/doc/CHANGES:1.2921 Sat Oct 15 19:51:04 2022 +++ src/doc/CHANGES Wed Oct 19 15:00:41 2022 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2921 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2922 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -692,7 +692,12 @@ Changes from NetBSD 9.0 to NetBSD 10.0: nsd: Import 4.6.0. [christos 20220924] unbound(8): Import 1.16.3. [christos 20220924] file(1): Upgraded to 5.43. [christos 20220924] + luna68k: Improve framebuffer performance. [isaki 20220925] tzdata: updated to 2022d (using the 2022dgtz fork) [kre 20220928] + swwdog(4): Enable in GENERIC kernels. [riastradh 20220929] + wbsio(4): Add Nuvoton NCT6799D support. [msaitoh 20221001] + amdsmn(4), amdzentemp(4): Add support for AMD family 17h/6xh and + 19h/6xh. [msaitoh 20221001] wbsio(4),lm(4): Add NCT6799D support. [msaitoh 20221001] dhcp: Patch to version 4.4.3-P1. [christos 20221005] OpenSSH: Import 9.1. [christos 20221005] @@ -701,3 +706,7 @@ Changes from NetBSD 9.0 to NetBSD 10.0: tzdata: updated to 2022e (using the 2022egtz fork) [kre 20221013] tzcode: Updated to 2022e. [christos 20221015] zlib(3): Import 1.2.13 [christos 20221015] + ldd(1): Add -v option to display all errors, not just the most + recent. [mrg 20221015] + evbarm: Add support for Oracle Cloud virtual machines. + [jmcneill 20221015]
CVS commit: src/sys/arch/x86/include
Module Name:src
Committed By: msaitoh
Date: Wed Oct 19 15:01:24 UTC 2022
Modified Files:
src/sys/arch/x86/include: specialreg.h
Log Message:
Add AMD cpuid Fn8000_000a x2AVIC, VNMI and IBSVIRT from APM Vol. 3 Rev. 3.34.
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/sys/arch/x86/include/specialreg.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/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.193 src/sys/arch/x86/include/specialreg.h:1.194
--- src/sys/arch/x86/include/specialreg.h:1.193 Wed Oct 12 10:25:41 2022
+++ src/sys/arch/x86/include/specialreg.h Wed Oct 19 15:01:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.193 2022/10/12 10:25:41 msaitoh Exp $ */
+/* $NetBSD: specialreg.h,v 1.194 2022/10/19 15:01:24 msaitoh Exp $ */
/*
* Copyright (c) 2014-2020 The NetBSD Foundation, Inc.
@@ -859,10 +859,13 @@
#define CPUID_AMD_SVM_V_VMSAVE_VMLOAD __BIT(15) /* Virtual VM{SAVE/LOAD} */
#define CPUID_AMD_SVM_vGIF __BIT(16) /* Virtualized GIF */
#define CPUID_AMD_SVM_GMET __BIT(17) /* Guest Mode Execution Trap */
+#define CPUID_AMD_SVM_X2AVIC __BIT(18) /* Virt. Intr. Ctrl 4 x2APIC */
#define CPUID_AMD_SVM_SSSCHECK __BIT(19) /* Shadow Stack restrictions */
#define CPUID_AMD_SVM_SPEC_CTRL __BIT(20) /* SPEC_CTRL virtualization */
#define CPUID_AMD_SVM_HOST_MCE_OVERRIDE __BIT(23) /* #MC intercept */
#define CPUID_AMD_SVM_TLBICTL __BIT(24) /* TLB Intercept Control */
+#define CPUID_AMD_SVM_VNMI __BIT(25) /* NMI Virtualization */
+#define CPUID_AMD_SVM_IBSVIRT __BIT(26) /* IBS Virtualization */
#define CPUID_AMD_SVM_FLAGS "\20" \
"\1" "NP" "\2" "LbrVirt" "\3" "SVML" "\4" "NRIPS" \
@@ -871,9 +874,9 @@
"\11" "B08" "\12" "B09" "\13" "PauseFilter" "\14" "B11" \
"\15" "PFThreshold" "\16" "AVIC" "\17" "B14" \
"\20" "V_VMSAVE_VMLOAD" \
- "\21" "VGIF" "\22" "GMET" "\23B18" "\24SSSCHECK" \
+ "\21" "VGIF" "\22" "GMET" "\23x2AVIC" "\24SSSCHECK" \
"\25" "SPEC_CTRL" "\30HOST_MCE_OVERRIDE" \
- "\31" "TLBICTL" "\32B25" "\32B26" "\32B27" \
+ "\31" "TLBICTL" "\32VNMI" "\33IBSVIRT" "\34B27" \
"\35B28"
/*
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Wed Oct 19 15:01:24 UTC 2022 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add AMD cpuid Fn8000_000a x2AVIC, VNMI and IBSVIRT from APM Vol. 3 Rev. 3.34. To generate a diff of this commit: cvs rdiff -u -r1.193 -r1.194 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Wed Oct 19 11:54:02 UTC 2022
Modified Files:
src/crypto/external/bsd/openssh/dist: ssherr.c
Log Message:
remove debugging sleep. Pointed out by rillig.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/ssherr.c
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/ssherr.c
diff -u src/crypto/external/bsd/openssh/dist/ssherr.c:1.9 src/crypto/external/bsd/openssh/dist/ssherr.c:1.10
--- src/crypto/external/bsd/openssh/dist/ssherr.c:1.9 Wed Feb 26 19:24:40 2020
+++ src/crypto/external/bsd/openssh/dist/ssherr.c Wed Oct 19 07:54:02 2022
@@ -15,7 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "includes.h"
-__RCSID("$NetBSD: ssherr.c,v 1.9 2020/02/27 00:24:40 christos Exp $");
+__RCSID("$NetBSD: ssherr.c,v 1.10 2022/10/19 11:54:02 christos Exp $");
#include
#include
@@ -154,7 +154,6 @@ ssh_err(int n)
{
static char buf[1024];
snprintf(buf, sizeof(buf), "unknown error %d", n);
- sleep(1000);
return buf;
}
}
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Wed Oct 19 11:54:02 UTC 2022 Modified Files: src/crypto/external/bsd/openssh/dist: ssherr.c Log Message: remove debugging sleep. Pointed out by rillig. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/ssherr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Oct 19 11:54:35 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: update zlib To generate a diff of this commit: cvs rdiff -u -r1.1893 -r1.1894 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.1893 src/doc/3RDPARTY:1.1894 --- src/doc/3RDPARTY:1.1893 Sat Oct 15 14:59:31 2022 +++ src/doc/3RDPARTY Wed Oct 19 07:54:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1893 2022/10/15 18:59:31 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1894 2022/10/19 11:54:35 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1457,12 +1457,12 @@ Notes: See /usr/src/external/bsd/wpa/NetBSD-upgrade for update instructions. Package: zlib -Version: 1.2.10 +Version: 1.2.13 Current Vers: 1.2.13 Maintainer: Jean-loup Gailly and Mark Adler Archive Site: http://www.zlib.net/ Home Page: http://www.zlib.net/ -Date: 2019-10-09 +Date: 2022-10-15 Mailing List: Responsible: gwr, christos License: BSD (3-clause)
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Oct 19 11:54:35 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: update zlib To generate a diff of this commit: cvs rdiff -u -r1.1893 -r1.1894 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Oct 19 13:00:54 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: document more changes for openssh To generate a diff of this commit: cvs rdiff -u -r1.1894 -r1.1895 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.1894 src/doc/3RDPARTY:1.1895 --- src/doc/3RDPARTY:1.1894 Wed Oct 19 07:54:35 2022 +++ src/doc/3RDPARTY Wed Oct 19 09:00:53 2022 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1894 2022/10/19 11:54:35 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1895 2022/10/19 13:00:53 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1096,6 +1096,7 @@ markus is very cooperative about it): - added USE_PAM patches and auth_pam.[ch] from portable openssh (see if there is any difference between the current version of opensshX.Yp1 and the new opensshZ.Wp1) and apply them. +- added LDAP from portable openssh. - conditionalize login_cap - conditionalize bsd_auth - restore krb5, krb4, afs, skey @@ -1112,6 +1113,7 @@ markus is very cooperative about it): - always bump major when importing to avoid api problems. - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes. - adjust the DEFAULT_PKCS11_WHITELIST for ssh-agent +- blocklistd additions Package: OpenSSL Version: 1.0.2o/1.1.1n
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Oct 19 13:00:54 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: document more changes for openssh To generate a diff of this commit: cvs rdiff -u -r1.1894 -r1.1895 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Oct 19 18:16:01 UTC 2022 Modified Files: src/doc: CHANGES Log Message: Deduplicate To generate a diff of this commit: cvs rdiff -u -r1.2922 -r1.2923 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Oct 19 18:16:01 UTC 2022 Modified Files: src/doc: CHANGES Log Message: Deduplicate To generate a diff of this commit: cvs rdiff -u -r1.2922 -r1.2923 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2922 src/doc/CHANGES:1.2923 --- src/doc/CHANGES:1.2922 Wed Oct 19 15:00:41 2022 +++ src/doc/CHANGES Wed Oct 19 18:16:01 2022 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2922 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2923 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -695,10 +695,9 @@ Changes from NetBSD 9.0 to NetBSD 10.0: luna68k: Improve framebuffer performance. [isaki 20220925] tzdata: updated to 2022d (using the 2022dgtz fork) [kre 20220928] swwdog(4): Enable in GENERIC kernels. [riastradh 20220929] - wbsio(4): Add Nuvoton NCT6799D support. [msaitoh 20221001] amdsmn(4), amdzentemp(4): Add support for AMD family 17h/6xh and 19h/6xh. [msaitoh 20221001] - wbsio(4),lm(4): Add NCT6799D support. [msaitoh 20221001] + wbsio(4),lm(4): Add Nuvoton NCT6799D support. [msaitoh 20221001] dhcp: Patch to version 4.4.3-P1. [christos 20221005] OpenSSH: Import 9.1. [christos 20221005] postfix(1): Import version 3.7.3. [christos 20221008]
CVS commit: src/sys/dev/ic
Module Name:src Committed By: riastradh Date: Wed Oct 19 22:34:10 UTC 2022 Modified Files: src/sys/dev/ic: dwiic.c dwiic_var.h Log Message: dwiic(4): Don't try processing interrupts before attach completes. PR kern/57063 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/dwiic.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/dwiic_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
Module Name:src Committed By: riastradh Date: Wed Oct 19 22:28:36 UTC 2022 Modified Files: src/sys/arch/x86/pci: dwiic_pci.c src/sys/dev/acpi: dwiic_acpi.c src/sys/dev/fdt: dwiic_fdt.c Log Message: dwiic(4): Don't try to attach children if dwiic_attach failed. PR kern/57063 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/pci/dwiic_pci.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/dwiic_acpi.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/dwiic_fdt.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: riastradh Date: Wed Oct 19 22:28:36 UTC 2022 Modified Files: src/sys/arch/x86/pci: dwiic_pci.c src/sys/dev/acpi: dwiic_acpi.c src/sys/dev/fdt: dwiic_fdt.c Log Message: dwiic(4): Don't try to attach children if dwiic_attach failed. PR kern/57063 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/pci/dwiic_pci.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/dwiic_acpi.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/dwiic_fdt.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/pci/dwiic_pci.c diff -u src/sys/arch/x86/pci/dwiic_pci.c:1.8 src/sys/arch/x86/pci/dwiic_pci.c:1.9 --- src/sys/arch/x86/pci/dwiic_pci.c:1.8 Wed Oct 27 19:04:03 2021 +++ src/sys/arch/x86/pci/dwiic_pci.c Wed Oct 19 22:28:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dwiic_pci.c,v 1.8 2021/10/27 19:04:03 msaitoh Exp $ */ +/* $NetBSD: dwiic_pci.c,v 1.9 2022/10/19 22:28:35 riastradh Exp $ */ /*- * Copyright (c) 2017 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.8 2021/10/27 19:04:03 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.9 2022/10/19 22:28:35 riastradh Exp $"); #include #include @@ -277,7 +277,8 @@ pci_dwiic_attach(device_t parent, device aprint_verbose_dev(self, "no matching ACPI node\n"); } - dwiic_attach(>sc_dwiic); + if (!dwiic_attach(>sc_dwiic)) + goto out; config_found(self, >sc_dwiic.sc_iba, iicbus_print, CFARGS_NONE); Index: src/sys/dev/acpi/dwiic_acpi.c diff -u src/sys/dev/acpi/dwiic_acpi.c:1.9 src/sys/dev/acpi/dwiic_acpi.c:1.10 --- src/sys/dev/acpi/dwiic_acpi.c:1.9 Sat Aug 7 16:19:09 2021 +++ src/sys/dev/acpi/dwiic_acpi.c Wed Oct 19 22:28:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dwiic_acpi.c,v 1.9 2021/08/07 16:19:09 thorpej Exp $ */ +/* $NetBSD: dwiic_acpi.c,v 1.10 2022/10/19 22:28:35 riastradh Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.9 2021/08/07 16:19:09 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.10 2022/10/19 22:28:35 riastradh Exp $"); #include #include @@ -127,7 +127,8 @@ dwiic_acpi_attach(device_t parent, devic sc->sc_iba.iba_child_devices = acpi_enter_i2c_devs(self, aa->aa_node); - dwiic_attach(sc); + if (!dwiic_attach(sc)) + goto done; config_found(self, >sc_iba, iicbus_print, CFARGS_NONE); Index: src/sys/dev/fdt/dwiic_fdt.c diff -u src/sys/dev/fdt/dwiic_fdt.c:1.4 src/sys/dev/fdt/dwiic_fdt.c:1.5 --- src/sys/dev/fdt/dwiic_fdt.c:1.4 Wed Jan 27 03:10:21 2021 +++ src/sys/dev/fdt/dwiic_fdt.c Wed Oct 19 22:28:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dwiic_fdt.c,v 1.4 2021/01/27 03:10:21 thorpej Exp $ */ +/* $NetBSD: dwiic_fdt.c,v 1.5 2022/10/19 22:28:35 riastradh Exp $ */ /*- * Copyright (c) 2017 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwiic_fdt.c,v 1.4 2021/01/27 03:10:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwiic_fdt.c,v 1.5 2022/10/19 22:28:35 riastradh Exp $"); #include #include @@ -105,7 +105,8 @@ dwiic_fdt_attach(device_t parent, device goto out; } - dwiic_attach(>sc_dwiic); + if (!dwiic_attach(>sc_dwiic)) + goto out; pmf_device_register(self, dwiic_suspend, dwiic_resume);
CVS commit: src/sys/netipsec
Module Name:src Committed By: christos Date: Wed Oct 19 21:28:03 UTC 2022 Modified Files: src/sys/netipsec: key.c xform_ipcomp.c Log Message: PR/56836: Andrew Cagney: IPv6 ESN tunneling IPcomp has corrupt header Always always send / expect CPI in IPcomp header Fixes kern/56836 where an IPsec interop combining compression and ESP|AH would fail. Since fast ipsec, the outgoing IPcomp header has contained the compression algorithm instead of the CPI. Adding the SADB_X_EXT_RAWCPI flag worked around this but ... The IPcomp's SADB was unconditionally hashed using the compression algorithm instead of the CPI. This meant that an incoming packet with a valid CPI could never match its SADB. To generate a diff of this commit: cvs rdiff -u -r1.277 -r1.278 src/sys/netipsec/key.c cvs rdiff -u -r1.74 -r1.75 src/sys/netipsec/xform_ipcomp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netipsec
Module Name:src Committed By: christos Date: Wed Oct 19 21:28:03 UTC 2022 Modified Files: src/sys/netipsec: key.c xform_ipcomp.c Log Message: PR/56836: Andrew Cagney: IPv6 ESN tunneling IPcomp has corrupt header Always always send / expect CPI in IPcomp header Fixes kern/56836 where an IPsec interop combining compression and ESP|AH would fail. Since fast ipsec, the outgoing IPcomp header has contained the compression algorithm instead of the CPI. Adding the SADB_X_EXT_RAWCPI flag worked around this but ... The IPcomp's SADB was unconditionally hashed using the compression algorithm instead of the CPI. This meant that an incoming packet with a valid CPI could never match its SADB. To generate a diff of this commit: cvs rdiff -u -r1.277 -r1.278 src/sys/netipsec/key.c cvs rdiff -u -r1.74 -r1.75 src/sys/netipsec/xform_ipcomp.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.277 src/sys/netipsec/key.c:1.278 --- src/sys/netipsec/key.c:1.277 Tue Oct 11 05:51:47 2022 +++ src/sys/netipsec/key.c Wed Oct 19 17:28:02 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.277 2022/10/11 09:51:47 knakahara Exp $ */ +/* $NetBSD: key.c,v 1.278 2022/10/19 21:28:02 christos Exp $ */ /* $FreeBSD: 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.277 2022/10/11 09:51:47 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.278 2022/10/19 21:28:02 christos Exp $"); /* * This code is referred to RFC 2367 @@ -8765,10 +8765,7 @@ key_savlut_writer_insert_head(struct sec KASSERT(mutex_owned(_sad.lock)); KASSERT(!sav->savlut_added); - if (sav->sah->saidx.proto == IPPROTO_IPCOMP) - hash_key = sav->alg_comp; - else - hash_key = sav->spi; + hash_key = sav->spi; hash = key_savluthash(>sah->saidx.dst.sa, sav->sah->saidx.proto, hash_key, key_sad.savlutmask); Index: src/sys/netipsec/xform_ipcomp.c diff -u src/sys/netipsec/xform_ipcomp.c:1.74 src/sys/netipsec/xform_ipcomp.c:1.75 --- src/sys/netipsec/xform_ipcomp.c:1.74 Sun May 22 07:40:29 2022 +++ src/sys/netipsec/xform_ipcomp.c Wed Oct 19 17:28:02 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: xform_ipcomp.c,v 1.74 2022/05/22 11:40:29 riastradh Exp $ */ +/* $NetBSD: xform_ipcomp.c,v 1.75 2022/10/19 21:28:02 christos Exp $ */ /* $FreeBSD: xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */ /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */ @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.74 2022/05/22 11:40:29 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.75 2022/10/19 21:28:02 christos Exp $"); /* IP payload compression protocol (IPComp), see RFC 2393 */ #if defined(_KERNEL_OPT) @@ -573,10 +573,7 @@ ipcomp_output_cb(struct cryptop *crp) } ipcomp->comp_flags = 0; - if ((sav->flags & SADB_X_EXT_RAWCPI) == 0) - cpi = sav->alg_enc; - else - cpi = ntohl(sav->spi) & 0x; + cpi = ntohl(sav->spi) & 0x; ipcomp->comp_cpi = htons(cpi); /* Fix Next Protocol in IPv4/IPv6 header */
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: riastradh
Date: Wed Oct 19 22:34:10 UTC 2022
Modified Files:
src/sys/dev/ic: dwiic.c dwiic_var.h
Log Message:
dwiic(4): Don't try processing interrupts before attach completes.
PR kern/57063
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/dwiic.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/dwiic_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/dwiic.c
diff -u src/sys/dev/ic/dwiic.c:1.8 src/sys/dev/ic/dwiic.c:1.9
--- src/sys/dev/ic/dwiic.c:1.8 Sun Nov 14 20:51:57 2021
+++ src/sys/dev/ic/dwiic.c Wed Oct 19 22:34:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic.c,v 1.8 2021/11/14 20:51:57 andvar Exp $ */
+/* $NetBSD: dwiic.c,v 1.9 2022/10/19 22:34:10 riastradh Exp $ */
/* $OpenBSD: dwiic.c,v 1.4 2018/05/23 22:08:00 kettenis Exp $ */
@@ -49,9 +49,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwiic.c,v 1.8 2021/11/14 20:51:57 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic.c,v 1.9 2022/10/19 22:34:10 riastradh Exp $");
#include
+
+#include
#include
#include
#include
@@ -196,6 +198,8 @@ dwiic_attach(struct dwiic_softc *sc)
/* config_found_ia for "i2cbus" is done in the bus-attachment glue */
+ atomic_store_release(>sc_attached, true);
+
return 1;
}
@@ -587,6 +591,17 @@ dwiic_intr(void *arg)
struct dwiic_softc *sc = arg;
uint32_t en, stat;
+ /*
+ * Give up if attach hasn't succeeded. If it failed, nothing
+ * to do here. If it is still ongoing and simply hasn't yet
+ * succeeded, interrupts from the device are masked -- so this
+ * interrupt must be shared with another driver -- and any
+ * interrupts applicable to us will be delivered once
+ * interrupts from the device are unmasked in dwiic_i2c_exec.
+ */
+ if (!atomic_load_acquire(>sc_attached))
+ return 0;
+
en = dwiic_read(sc, DW_IC_ENABLE);
/* probably for the other controller */
if (!en)
Index: src/sys/dev/ic/dwiic_var.h
diff -u src/sys/dev/ic/dwiic_var.h:1.2 src/sys/dev/ic/dwiic_var.h:1.3
--- src/sys/dev/ic/dwiic_var.h:1.2 Wed Sep 26 18:32:51 2018
+++ src/sys/dev/ic/dwiic_var.h Wed Oct 19 22:34:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_var.h,v 1.2 2018/09/26 18:32:51 jakllsch Exp $ */
+/* $NetBSD: dwiic_var.h,v 1.3 2022/10/19 22:34:10 riastradh Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -71,6 +71,8 @@ struct dwiic_softc {
int flags;
volatile int error;
} sc_i2c_xfer;
+
+ volatile bool sc_attached;
};
bool dwiic_attach(struct dwiic_softc *);
CVS commit: src/lib/libcurses
Module Name:src
Committed By: blymn
Date: Wed Oct 19 06:09:27 UTC 2022
Modified Files:
src/lib/libcurses: add_wchstr.c addbytes.c background.c chgat.c
clrtobot.c color.c cr_put.c curses.c delch.c erase.c ins_wch.c
ins_wstr.c insch.c insdelln.c insstr.c refresh.c resize.c
Log Message:
Fixes for lib/56926 amongst other things:
- plod now correctly accounts for wide characters when plodding
- use erase line when in color mode if the terminal has the capability
- ensure that the CA_CONTINUATION flag is applied consistently to the
subsequent characters in a wide character.
- fix a bunch of refresh bugs that caused inconsistent placement of
wide characters.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libcurses/add_wchstr.c
cvs rdiff -u -r1.64 -r1.65 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.32 -r1.33 src/lib/libcurses/background.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/chgat.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libcurses/clrtobot.c \
src/lib/libcurses/curses.c
cvs rdiff -u -r1.46 -r1.47 src/lib/libcurses/color.c
cvs rdiff -u -r1.39 -r1.40 src/lib/libcurses/cr_put.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libcurses/delch.c
cvs rdiff -u -r1.36 -r1.37 src/lib/libcurses/erase.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/ins_wch.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libcurses/insch.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libcurses/insdelln.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/insstr.c
cvs rdiff -u -r1.123 -r1.124 src/lib/libcurses/refresh.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libcurses/resize.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/libcurses/add_wchstr.c
diff -u src/lib/libcurses/add_wchstr.c:1.13 src/lib/libcurses/add_wchstr.c:1.14
--- src/lib/libcurses/add_wchstr.c:1.13 Tue May 3 07:25:34 2022
+++ src/lib/libcurses/add_wchstr.c Wed Oct 19 06:09:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: add_wchstr.c,v 1.13 2022/05/03 07:25:34 blymn Exp $ */
+/* $NetBSD: add_wchstr.c,v 1.14 2022/10/19 06:09:27 blymn Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: add_wchstr.c,v 1.13 2022/05/03 07:25:34 blymn Exp $");
+__RCSID("$NetBSD: add_wchstr.c,v 1.14 2022/10/19 06:09:27 blymn Exp $");
#endif/* not lint */
#include
@@ -174,7 +174,8 @@ wadd_wchnstr(WINDOW *win, const cchar_t
if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
return ERR;
tp->attr = win->battr;
-(*tp).wcols = 1;
+tp->wcols = 1;
+tp->cflags = CA_BACKGROUND;
np = tp->nsp;
}
} else {
@@ -186,7 +187,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
}
lnp->flags |= __ISDIRTY;
newx = sx + win->ch_off;
- if (newx < *lnp->firstchp)
+ if (newx < *lnp->firstchp)
*lnp->firstchp = newx;
/* add characters in the string */
@@ -210,7 +211,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
== ERR)
return ERR;
lp->attr = win->battr;
- lp->cflags |= CA_BACKGROUND;
+ lp->cflags = CA_BACKGROUND;
(*lp).wcols = 1;
lp++, ex++;
}
@@ -259,6 +260,8 @@ wadd_wchnstr(WINDOW *win, const cchar_t
}
lp->ch = chp->vals[0];
lp->attr = chp->attributes & WA_ATTRIBUTES;
+lp->cflags &= ~CA_BACKGROUND;
+lp->cflags |= CA_CONTINUATION;
(*lp).wcols = x - ex;
lp++, ex++;
}
Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.64 src/lib/libcurses/addbytes.c:1.65
--- src/lib/libcurses/addbytes.c:1.64 Thu May 19 07:41:26 2022
+++ src/lib/libcurses/addbytes.c Wed Oct 19 06:09:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.64 2022/05/19 07:41:26 blymn Exp $ */
+/* $NetBSD: addbytes.c,v 1.65 2022/10/19 06:09:27 blymn Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addbytes.c 8.4 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addbytes.c,v 1.64 2022/05/19 07:41:26 blymn Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.65 2022/10/19 06:09:27 blymn Exp $");
#endif
#endif/* not lint */
@@ -293,6 +293,7 @@ _cursesi_addbyte(WINDOW *win, __LINE **l
*/
if (newx < *(*lp)->firstchp)
*(*lp)->firstchp = newx;
+
if (newx > *(*lp)->lastchp)
*(*lp)->lastchp = newx;
__CTRACE(__CTRACE_INPUT, "ADDBYTES: change gives f/l: %d/%d [%d/%d]\n",
@@ -311,7 +312,7 @@ _cursesi_addbyte(WINDOW *win, __LINE **l
#endif
}
- (*lp)->line[*x].cflags &= ~ CA_BACKGROUND;
+ (*lp)->line[*x].cflags &= ~ (CA_BACKGROUND | CA_CONTINUATION);
if (attributes & __COLOR)
(*lp)->line[*x].attr =
@@ -421,6 +422,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
newx = *x + win->ch_off;
if (newx < *(*lnp)->firstchp)
*(*lnp)->firstchp = newx;
+
if (newx > *(*lnp)->lastchp)
*(*lnp)->lastchp = newx;
__touchline(win, *y, *x, *x);
@@ -451,7 +453,7 @@ _cursesi_addwchar(WINDOW
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Wed Oct 19 06:09:27 UTC 2022 Modified Files: src/lib/libcurses: add_wchstr.c addbytes.c background.c chgat.c clrtobot.c color.c cr_put.c curses.c delch.c erase.c ins_wch.c ins_wstr.c insch.c insdelln.c insstr.c refresh.c resize.c Log Message: Fixes for lib/56926 amongst other things: - plod now correctly accounts for wide characters when plodding - use erase line when in color mode if the terminal has the capability - ensure that the CA_CONTINUATION flag is applied consistently to the subsequent characters in a wide character. - fix a bunch of refresh bugs that caused inconsistent placement of wide characters. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libcurses/add_wchstr.c cvs rdiff -u -r1.64 -r1.65 src/lib/libcurses/addbytes.c cvs rdiff -u -r1.32 -r1.33 src/lib/libcurses/background.c cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/chgat.c cvs rdiff -u -r1.30 -r1.31 src/lib/libcurses/clrtobot.c \ src/lib/libcurses/curses.c cvs rdiff -u -r1.46 -r1.47 src/lib/libcurses/color.c cvs rdiff -u -r1.39 -r1.40 src/lib/libcurses/cr_put.c cvs rdiff -u -r1.29 -r1.30 src/lib/libcurses/delch.c cvs rdiff -u -r1.36 -r1.37 src/lib/libcurses/erase.c cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/ins_wch.c cvs rdiff -u -r1.23 -r1.24 src/lib/libcurses/ins_wstr.c cvs rdiff -u -r1.27 -r1.28 src/lib/libcurses/insch.c cvs rdiff -u -r1.22 -r1.23 src/lib/libcurses/insdelln.c cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/insstr.c cvs rdiff -u -r1.123 -r1.124 src/lib/libcurses/refresh.c cvs rdiff -u -r1.35 -r1.36 src/lib/libcurses/resize.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
Module Name:src Committed By: msaitoh Date: Wed Oct 19 06:37:25 UTC 2022 Modified Files: src/sys/dev/pci: if_wm.c if_wmreg.h Log Message: Fix typo. No functional change. OK'd by knakahara. To generate a diff of this commit: cvs rdiff -u -r1.764 -r1.765 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.127 -r1.128 src/sys/dev/pci/if_wmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Wed Oct 19 06:10:44 UTC 2022 Modified Files: src/tests/lib/libcurses/check_files: add_wch3.chk copywin10.chk delch2.chk delch3.chk delch6.chk delch7.chk get_wstr.chk getn_wstr.chk ins_wch2.chk ins_wch3.chk redrawwin2.chk touchline2.chk wcolor_set.chk wget_wstr.chk wgetn_wstr.chk wins_wch2.chk wins_wch3.chk wins_wstr4.chk wvline_set.chk src/tests/lib/libcurses/tests: ins_wch Log Message: Updates to account for changes resulting from fixes to libcurses. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/add_wch3.chk \ src/tests/lib/libcurses/check_files/delch3.chk \ src/tests/lib/libcurses/check_files/get_wstr.chk \ src/tests/lib/libcurses/check_files/getn_wstr.chk \ src/tests/lib/libcurses/check_files/ins_wch2.chk \ src/tests/lib/libcurses/check_files/ins_wch3.chk \ src/tests/lib/libcurses/check_files/wcolor_set.chk \ src/tests/lib/libcurses/check_files/wget_wstr.chk \ src/tests/lib/libcurses/check_files/wgetn_wstr.chk \ src/tests/lib/libcurses/check_files/wins_wch2.chk \ src/tests/lib/libcurses/check_files/wvline_set.chk cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libcurses/check_files/copywin10.chk \ src/tests/lib/libcurses/check_files/wins_wch3.chk cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/delch2.chk \ src/tests/lib/libcurses/check_files/delch6.chk \ src/tests/lib/libcurses/check_files/delch7.chk \ src/tests/lib/libcurses/check_files/redrawwin2.chk \ src/tests/lib/libcurses/check_files/touchline2.chk \ src/tests/lib/libcurses/check_files/wins_wstr4.chk cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/tests/ins_wch Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libcurses/check_files/add_wch3.chk diff -u src/tests/lib/libcurses/check_files/add_wch3.chk:1.2 src/tests/lib/libcurses/check_files/add_wch3.chk:1.3 --- src/tests/lib/libcurses/check_files/add_wch3.chk:1.2 Tue Jan 25 03:23:05 2022 +++ src/tests/lib/libcurses/check_files/add_wch3.chk Wed Oct 19 06:10:43 2022 @@ -1,2 +1,2 @@ smso㐁rmsohome -㐁㐁 \ No newline at end of file + \ No newline at end of file Index: src/tests/lib/libcurses/check_files/delch3.chk diff -u src/tests/lib/libcurses/check_files/delch3.chk:1.2 src/tests/lib/libcurses/check_files/delch3.chk:1.3 --- src/tests/lib/libcurses/check_files/delch3.chk:1.2 Sat Oct 24 04:46:16 2020 +++ src/tests/lib/libcurses/check_files/delch3.chk Wed Oct 19 06:10:43 2022 @@ -1 +1 @@ -stsmsotrmso tessmsotrmso tes \ No newline at end of file +stsmsotrmso tessmsotelrmso \ No newline at end of file Index: src/tests/lib/libcurses/check_files/get_wstr.chk diff -u src/tests/lib/libcurses/check_files/get_wstr.chk:1.2 src/tests/lib/libcurses/check_files/get_wstr.chk:1.3 --- src/tests/lib/libcurses/check_files/get_wstr.chk:1.2 Tue Jan 25 03:23:05 2022 +++ src/tests/lib/libcurses/check_files/get_wstr.chk Wed Oct 19 06:10:43 2022 @@ -1,6 +1,6 @@ 㐁el -a cup4;2Xab cup4;3Xcup4;1Xc cup4;2Xcd cup4;3Xcde cup4;4Xcd cup4;3Xcdf cup4;4X -a cup5;6Xab cup5;7Xa cup5;6Xac cup5;7Xacd cup5;8Xacdcup5;9XacdO cup5;10XacdOD cup5;11Xsmkx - a cup6;3X ab cup6;4X abccup6;5Xel d cup6;3X \ No newline at end of file +aelabelelcelcdelcdeelcdelcdfel +ael
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Wed Oct 19 06:10:44 UTC 2022 Modified Files: src/tests/lib/libcurses/check_files: add_wch3.chk copywin10.chk delch2.chk delch3.chk delch6.chk delch7.chk get_wstr.chk getn_wstr.chk ins_wch2.chk ins_wch3.chk redrawwin2.chk touchline2.chk wcolor_set.chk wget_wstr.chk wgetn_wstr.chk wins_wch2.chk wins_wch3.chk wins_wstr4.chk wvline_set.chk src/tests/lib/libcurses/tests: ins_wch Log Message: Updates to account for changes resulting from fixes to libcurses. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/add_wch3.chk \ src/tests/lib/libcurses/check_files/delch3.chk \ src/tests/lib/libcurses/check_files/get_wstr.chk \ src/tests/lib/libcurses/check_files/getn_wstr.chk \ src/tests/lib/libcurses/check_files/ins_wch2.chk \ src/tests/lib/libcurses/check_files/ins_wch3.chk \ src/tests/lib/libcurses/check_files/wcolor_set.chk \ src/tests/lib/libcurses/check_files/wget_wstr.chk \ src/tests/lib/libcurses/check_files/wgetn_wstr.chk \ src/tests/lib/libcurses/check_files/wins_wch2.chk \ src/tests/lib/libcurses/check_files/wvline_set.chk cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libcurses/check_files/copywin10.chk \ src/tests/lib/libcurses/check_files/wins_wch3.chk cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/delch2.chk \ src/tests/lib/libcurses/check_files/delch6.chk \ src/tests/lib/libcurses/check_files/delch7.chk \ src/tests/lib/libcurses/check_files/redrawwin2.chk \ src/tests/lib/libcurses/check_files/touchline2.chk \ src/tests/lib/libcurses/check_files/wins_wstr4.chk cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/tests/ins_wch 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
Module Name:src
Committed By: msaitoh
Date: Wed Oct 19 06:37:25 UTC 2022
Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h
Log Message:
Fix typo. No functional change. OK'd by knakahara.
To generate a diff of this commit:
cvs rdiff -u -r1.764 -r1.765 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/pci/if_wmreg.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.764 src/sys/dev/pci/if_wm.c:1.765
--- src/sys/dev/pci/if_wm.c:1.764 Thu Sep 8 02:40:10 2022
+++ src/sys/dev/pci/if_wm.c Wed Oct 19 06:37:25 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.764 2022/09/08 02:40:10 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.765 2022/10/19 06:37:25 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.764 2022/09/08 02:40:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.765 2022/10/19 06:37:25 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -8922,12 +8922,12 @@ wm_nq_tx_offload(struct wm_softc *sc, st
* however it does not cause problems.
*/
/* Fill in the context descriptor. */
- txq->txq_nq_descs[txq->txq_next].nqrx_ctx.nqtxc_vl_len =
+ txq->txq_nq_descs[txq->txq_next].nqtx_ctx.nqtxc_vl_len =
htole32(vl_len);
- txq->txq_nq_descs[txq->txq_next].nqrx_ctx.nqtxc_sn = 0;
- txq->txq_nq_descs[txq->txq_next].nqrx_ctx.nqtxc_cmd =
+ txq->txq_nq_descs[txq->txq_next].nqtx_ctx.nqtxc_sn = 0;
+ txq->txq_nq_descs[txq->txq_next].nqtx_ctx.nqtxc_cmd =
htole32(cmdc);
- txq->txq_nq_descs[txq->txq_next].nqrx_ctx.nqtxc_mssidx =
+ txq->txq_nq_descs[txq->txq_next].nqtx_ctx.nqtxc_mssidx =
htole32(mssidx);
wm_cdtxsync(txq, txq->txq_next, 1, BUS_DMASYNC_PREWRITE);
DPRINTF(sc, WM_DEBUG_TX,
Index: src/sys/dev/pci/if_wmreg.h
diff -u src/sys/dev/pci/if_wmreg.h:1.127 src/sys/dev/pci/if_wmreg.h:1.128
--- src/sys/dev/pci/if_wmreg.h:1.127 Fri Jul 22 05:23:50 2022
+++ src/sys/dev/pci/if_wmreg.h Wed Oct 19 06:37:25 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmreg.h,v 1.127 2022/07/22 05:23:50 msaitoh Exp $ */
+/* $NetBSD: if_wmreg.h,v 1.128 2022/10/19 06:37:25 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -1707,7 +1707,7 @@ typedef union nq_txdesc {
uint32_t nqtxc_sn;
uint32_t nqtxc_cmd;
uint32_t nqtxc_mssidx;
- } nqrx_ctx;
+ } nqtx_ctx;
} __packed nq_txdesc_t;
