CVS commit: src/etc/rc.d
Module Name:src Committed By: sborrill Date: Tue Mar 9 12:42:46 UTC 2021 Modified Files: src/etc/rc.d: mountall Log Message: Need to explicitly load value of zfs variable as zfs=YES may be set in /etc/rc.conf.d/zfs, not /etc/rc.conf. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/etc/rc.d/mountall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/mountall diff -u src/etc/rc.d/mountall:1.14 src/etc/rc.d/mountall:1.15 --- src/etc/rc.d/mountall:1.14 Tue Feb 16 10:02:42 2021 +++ src/etc/rc.d/mountall Tue Mar 9 12:42:46 2021 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mountall,v 1.14 2021/02/16 10:02:42 hannken Exp $ +# $NetBSD: mountall,v 1.15 2021/03/09 12:42:46 sborrill Exp $ # # REQUIRE: mountcritremote named ypbind @@ -41,4 +41,5 @@ mountall_stop() } load_rc_config $name +load_rc_config_var zfs zfs run_rc_command "$1"
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: sborrill Date: Thu Nov 5 08:11:37 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Ticket #1121 To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-9.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.2 diff -u src/doc/CHANGES-9.2:1.1.2.7 src/doc/CHANGES-9.2:1.1.2.8 --- src/doc/CHANGES-9.2:1.1.2.7 Wed Nov 4 13:33:10 2020 +++ src/doc/CHANGES-9.2 Thu Nov 5 08:11:37 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.7 2020/11/04 13:33:10 sborrill Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.8 2020/11/05 08:11:37 sborrill Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -1037,3 +1037,24 @@ usr.sbin/sysinst/arch/i386/md.c 1.33 single named partition. [martin, ticket #1120] +usr.sbin/sysinst/menus.mi 1.22-1.23 +usr.sbin/sysinst/msg.mi.de 1.25-1.26 +usr.sbin/sysinst/msg.mi.en 1.33-1.34 +usr.sbin/sysinst/msg.mi.pl 1.33-1.34 +usr.sbin/sysinst/msg.mi.es 1.27-1.28 +usr.sbin/sysinst/msg.mi.fr 1.32-1.33 +usr.sbin/sysinst/util.c1.49-1.52 + + - When looking for available CD media, skip those that are already + mounted. + - When no medium with sets is found, show a new error message and + return to the source selection menu. + - Rearrange all source option menus to have the proper set suffix + available (either .tgz or .tar.xz). + - Relax an assertion, the first getvfsstat() call may overestimate + the file systems visible to us. Fixes PR 55752 + - When we did not magically find any CD medium with sets, offer a + manual override (so ISO images on USB sticks or Xen's xbd(4) + work). + [martin, ticket #1121] +
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src
Committed By: sborrill
Date: Thu Nov 5 08:10:21 UTC 2020
Modified Files:
src/usr.sbin/sysinst [netbsd-9]: menus.mi msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl util.c
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #1121):
usr.sbin/sysinst/menus.mi: revision 1.22-1.23
usr.sbin/sysinst/msg.mi.de: revision 1.25-1.26
usr.sbin/sysinst/msg.mi.en: revision 1.33-1.34
usr.sbin/sysinst/msg.mi.pl: revision 1.33-1.34
usr.sbin/sysinst/msg.mi.es: revision 1.27-1.28
usr.sbin/sysinst/msg.mi.fr: revision 1.32-1.33
usr.sbin/sysinst/util.c:revision 1.49-1.52
- When looking for available CD media, skip those that are already mounted.
- When no medium with sets is found, show a new error message and return
to the source selection menu.
- Rearrange all source option menus to have the proper set suffix available
(either .tgz or .tar.xz).
- Relax an assertion, the first getvfsstat() call may overestimate the file
systems visible to us. Fixes PR 55752
- When we did not magically find any CD medium with sets, offer a manual
override (so ISO images on USB sticks or Xen's xbd(4) work).
To generate a diff of this commit:
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.13.2.8 -r1.13.2.9 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.19.2.9 -r1.19.2.10 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.14.2.8 -r1.14.2.9 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.17.2.9 -r1.17.2.10 src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.20.2.9 -r1.20.2.10 src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.29.2.7 -r1.29.2.8 src/usr.sbin/sysinst/util.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.sbin/sysinst/menus.mi
diff -u src/usr.sbin/sysinst/menus.mi:1.19.2.1 src/usr.sbin/sysinst/menus.mi:1.19.2.2
--- src/usr.sbin/sysinst/menus.mi:1.19.2.1 Tue Jan 28 10:17:58 2020
+++ src/usr.sbin/sysinst/menus.mi Thu Nov 5 08:10:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.19.2.1 2020/01/28 10:17:58 msaitoh Exp $ */
+/* $NetBSD: menus.mi,v 1.19.2.2 2020/11/05 08:10:21 sborrill Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -362,8 +362,10 @@ menu distset, title MSG_Select_your_dist
menu ftpsource, y=-4, x=0, w=70, no box, no clear,
exitstring MSG_Get_Distribution;
- display action { msg_fmt_display(MSG_ftpsource, "%s",
- url_proto((uintptr_t)((arg_rv*)arg)->arg)); };
+ display action {
+ msg_display_subst(MSG_ftpsource, 2, "." SETS_TAR_SUFF,
+ url_proto((uintptr_t)((arg_rv*)arg)->arg));
+ };
option {src_legend(menu, MSG_Host, ftp.xfer_host[(uintptr_t)((arg_rv*)arg)->arg]);},
action { src_prompt(MSG_Host, ftp.xfer_host[(uintptr_t)((arg_rv*)arg)->arg], sizeof ftp.xfer_host[(uintptr_t)((arg_rv*)arg)->arg]); };
option {src_legend(menu, MSG_Base_dir, ftp.dir);},
@@ -412,7 +414,8 @@ menu ftpsource, y=-4, x=0, w=70, no box,
menu nfssource, y=-4, x=0, w=70, no box, no clear,
exitstring MSG_Get_Distribution;
- display action { msg_display(MSG_nfssource); };
+ display action { const char suff[] = "." SETS_TAR_SUFF;
+ msg_display_subst(MSG_nfssource, 1, ); };
option {src_legend(menu, MSG_Host, nfs_host);},
action { src_prompt(MSG_Host, nfs_host, sizeof nfs_host); };
option {src_legend(menu, MSG_Base_dir, nfs_dir);},
@@ -459,17 +462,20 @@ menu floppysource, y=-4, x=0, w=70, no b
option MSG_exit_menu_generic, exit, action { *((int*)arg) = SET_RETRY; };
menu cdromsource, y=-4, x=0, w=70, no box, no clear, exitstring MSG_Continue;
- display action { msg_display(MSG_cdromsource); };
+ display action { const char suff[] = "." SETS_TAR_SUFF;
+ msg_display_add_subst(MSG_cdromsource, 1, ); };
option {src_legend(menu, MSG_Device, cdrom_dev);},
action { src_prompt(MSG_dev, cdrom_dev, sizeof cdrom_dev); };
option {src_legend(menu, MSG_Set_dir_bin, set_dir_bin);},
action { src_prompt(MSG_Set_dir_bin, set_dir_bin, sizeof set_dir_bin); };
option {src_legend(menu, MSG_Set_dir_src, set_dir_src);},
action { src_prompt(MSG_Set_dir_src, set_dir_src, sizeof set_dir_src); };
- option MSG_exit_menu_generic, exit, action { *((int*)arg) = SET_RETRY; };
+ option MSG_abort_install, exit, action { *((int*)arg) = SET_ABANDON; };
+ option MSG_source_sel_retry, exit, action { *((int*)arg) = SET_RETRY; };
menu localfssource, y=-4, x=0, w=70, no box, no clear, exitstring MSG_Continue;
- display action { msg_display(MSG_localfssource); };
+ display action { const char suff[] = "." SETS_TAR_SUFF;
+ msg_display_subst(MSG_localfssource, 1, ); };
option {src_legend(menu, MSG_Device, localfs_dev);},
action { src_prompt(MSG_dev, localfs_dev, sizeof localfs_dev);};
option {src_legend(menu, MSG_File_system, localfs_fs);},
@@ -483,7 +489,8 @@ menu localfssource, y=-4, x=0, w=70, no
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: sborrill Date: Wed Nov 4 13:33:10 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Ticket #1120 To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-9.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.2 diff -u src/doc/CHANGES-9.2:1.1.2.6 src/doc/CHANGES-9.2:1.1.2.7 --- src/doc/CHANGES-9.2:1.1.2.6 Wed Nov 4 13:27:40 2020 +++ src/doc/CHANGES-9.2 Wed Nov 4 13:33:10 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.6 2020/11/04 13:27:40 sborrill Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.7 2020/11/04 13:33:10 sborrill Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -1031,3 +1031,9 @@ usr.sbin/sysinst/mbr.c1.37 an existing partition table hints at it. [martin, ticket #1119] +usr.sbin/sysinst/arch/i386/md.c 1.33 + + Do not force bootselector MBR code for installs with only a + single named partition. + [martin, ticket #1120] +
CVS commit: [netbsd-9] src/usr.sbin/sysinst/arch/i386
Module Name:src
Committed By: sborrill
Date: Wed Nov 4 13:31:23 UTC 2020
Modified Files:
src/usr.sbin/sysinst/arch/i386 [netbsd-9]: md.c
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #1120):
usr.sbin/sysinst/arch/i386/md.c:revision 1.33
Do not force bootselector MBR code for installs with only a single named
partition.
To generate a diff of this commit:
cvs rdiff -u -r1.20.2.7 -r1.20.2.8 src/usr.sbin/sysinst/arch/i386/md.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.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.20.2.7 src/usr.sbin/sysinst/arch/i386/md.c:1.20.2.8
--- src/usr.sbin/sysinst/arch/i386/md.c:1.20.2.7 Thu Oct 15 19:36:51 2020
+++ src/usr.sbin/sysinst/arch/i386/md.c Wed Nov 4 13:31:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.20.2.7 2020/10/15 19:36:51 bouyer Exp $ */
+/* $NetBSD: md.c,v 1.20.2.8 2020/11/04 13:31:23 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -573,12 +573,14 @@ md_check_mbr(struct disk_partitions *par
}
/* Sort out the name of the mbr code we need */
- if (names > 0 || fl & (NETBSD_NAMED | ACTIVE_NAMED)) {
+ if (names > 1 ||
+ (parts->num_part > 1 && (fl & (NETBSD_NAMED | ACTIVE_NAMED {
/* Need bootselect code */
fl |= MBR_BS_ACTIVE;
bootcode = fl & MBR_BS_EXTLBA ? _PATH_BOOTEXT : _PATH_BOOTSEL;
- } else
+ } else {
bootcode = _PATH_MBR;
+ }
fl &= MBR_BS_ACTIVE | MBR_BS_EXTLBA;
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src
Committed By: sborrill
Date: Wed Nov 4 13:27:08 UTC 2020
Modified Files:
src/usr.sbin/sysinst [netbsd-9]: mbr.c
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #1119):
usr.sbin/sysinst/mbr.c: revision 1.37
Do not force alignment of the first partition by default (which is
treated special to skip the first track), unless an existing partition
table hints at it.
To generate a diff of this commit:
cvs rdiff -u -r1.19.2.7 -r1.19.2.8 src/usr.sbin/sysinst/mbr.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.sbin/sysinst/mbr.c
diff -u src/usr.sbin/sysinst/mbr.c:1.19.2.7 src/usr.sbin/sysinst/mbr.c:1.19.2.8
--- src/usr.sbin/sysinst/mbr.c:1.19.2.7 Thu Oct 15 19:36:51 2020
+++ src/usr.sbin/sysinst/mbr.c Wed Nov 4 13:27:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.19.2.7 2020/10/15 19:36:51 bouyer Exp $ */
+/* $NetBSD: mbr.c,v 1.19.2.8 2020/11/04 13:27:08 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -889,16 +889,15 @@ mbr_init_default_alignments(struct mbr_d
if (parts->dp.disk_size < 0)
return;
+ parts->ptn_0_offset = parts->geo_sec;
+
/* Use 1MB offset/alignemnt for large (>128GB) disks */
if (parts->dp.disk_size > HUGE_DISK_SIZE) {
parts->ptn_alignment = 2048;
- parts->ptn_0_offset = 2048;
} else if (parts->dp.disk_size > TINY_DISK_SIZE) {
parts->ptn_alignment = 64;
- parts->ptn_0_offset = parts->geo_sec;
} else {
parts->ptn_alignment = 1;
- parts->ptn_0_offset = parts->geo_sec;
}
parts->ext_ptn_alignment = track;
}
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: sborrill Date: Wed Nov 4 13:27:40 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Ticket #1119 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-9.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.2 diff -u src/doc/CHANGES-9.2:1.1.2.5 src/doc/CHANGES-9.2:1.1.2.6 --- src/doc/CHANGES-9.2:1.1.2.5 Wed Nov 4 11:49:55 2020 +++ src/doc/CHANGES-9.2 Wed Nov 4 13:27:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.5 2020/11/04 11:49:55 martin Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.6 2020/11/04 13:27:40 sborrill Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -1024,3 +1024,10 @@ sys/dev/pci/if_wmvar.h1.47 (ICH*/PCH*, 82580 and I350). [knakahara, ticket #1126] +usr.sbin/sysinst/mbr.c1.37 + + Do not force alignment of the first partition by default + (which is treated special to skip the first track), unless + an existing partition table hints at it. + [martin, ticket #1119] +
CVS commit: src/usr.sbin/hdaudioctl
Module Name:src
Committed By: sborrill
Date: Wed Jul 1 12:19:45 UTC 2020
Modified Files:
src/usr.sbin/hdaudioctl: hdaudioctl.c
Log Message:
When using show subcommand, display node ID (nid) in hexadecimal to match
the HD audio documentation. Diverge slightly by using 0xXX instead of XXh
format for consistency with the list subcommand.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/hdaudioctl/hdaudioctl.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.sbin/hdaudioctl/hdaudioctl.c
diff -u src/usr.sbin/hdaudioctl/hdaudioctl.c:1.4 src/usr.sbin/hdaudioctl/hdaudioctl.c:1.5
--- src/usr.sbin/hdaudioctl/hdaudioctl.c:1.4 Mon Jun 15 20:29:29 2020
+++ src/usr.sbin/hdaudioctl/hdaudioctl.c Wed Jul 1 12:19:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudioctl.c,v 1.4 2020/06/15 20:29:29 riastradh Exp $ */
+/* $NetBSD: hdaudioctl.c,v 1.5 2020/07/01 12:19:45 sborrill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -292,9 +292,9 @@ hdaudioctl_show(int fd, int argc, char *
array = prop_dictionary_get(response, "pin-config");
iter = prop_array_iterator(array);
prop_object_iterator_reset(iter);
- printf("nid Data As Seq Device Conn Jack"
+ printf("nid Data As Seq Device Conn Jack"
"Location Color Misc\n");
- printf("="
+ printf("=="
"===\n");
while ((obj = prop_object_iterator_next(iter)) != NULL) {
dict = (prop_dictionary_t)obj;
@@ -305,7 +305,7 @@ hdaudioctl_show(int fd, int argc, char *
jack = pin_jacks[(config >> 16) & 0xf];
loc = pin_locations[(config >> 24) & 0x3f];
color = pin_colors[(config >> 12) & 0xf];
- printf("%3d %08X %2d %3d %-14s %-5s %-7s %-10s %-7s %4X\n",
+ printf("0x%2X %08X %2d %3d %-14s %-5s %-7s %-10s %-7s %4X\n",
nid, config, ((config >> 4U) & 0xf), (config & 0xf),
device, conn, jack, loc, color, ((config >> 8U) & 0xf));
}
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: sborrill
Date: Tue Jun 30 13:14:21 UTC 2020
Modified Files:
src/sys/dev/acpi: acpi_display.c
Log Message:
Only need to set brightness if reading the initial state fails
to sync firmware and the driver. Avoids black screen at boot time.
Thanks to jmcneill@
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/acpi_display.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/acpi/acpi_display.c
diff -u src/sys/dev/acpi/acpi_display.c:1.17 src/sys/dev/acpi/acpi_display.c:1.18
--- src/sys/dev/acpi/acpi_display.c:1.17 Tue Apr 28 11:02:37 2020
+++ src/sys/dev/acpi/acpi_display.c Tue Jun 30 13:14:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_display.c,v 1.17 2020/04/28 11:02:37 jmcneill Exp $ */
+/* $NetBSD: acpi_display.c,v 1.18 2020/06/30 13:14:21 sborrill Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.17 2020/04/28 11:02:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.18 2020/06/30 13:14:21 sborrill Exp $");
#include
#include
@@ -647,8 +647,8 @@ acpidisp_out_attach(device_t parent, dev
* Synchronize ACPI and driver brightness levels, and
* check that brightness control is working.
*/
- (void)acpidisp_get_brightness(osc, >bc_current);
- if (acpidisp_set_brightness(osc, bc->bc_current)) {
+ if (acpidisp_get_brightness(osc, >bc_current) &&
+ acpidisp_set_brightness(osc, bc->bc_current)) {
kmem_free(bc->bc_level,
bc->bc_level_count * sizeof(*bc->bc_level));
kmem_free(bc, sizeof(*bc));
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: sborrill Date: Tue Jun 16 13:34:38 UTC 2020 Modified Files: src/usr.sbin/mtree: mtree.8 Log Message: Describe correctly how whitespace is formatted as the docs did not match the source. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/usr.sbin/mtree/mtree.8 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/mtree/mtree.8 diff -u src/usr.sbin/mtree/mtree.8:1.74 src/usr.sbin/mtree/mtree.8:1.75 --- src/usr.sbin/mtree/mtree.8:1.74 Thu Dec 13 07:34:03 2018 +++ src/usr.sbin/mtree/mtree.8 Tue Jun 16 13:34:38 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: mtree.8,v 1.74 2018/12/13 07:34:03 wiz Exp $ +.\" $NetBSD: mtree.8,v 1.75 2020/06/16 13:34:38 sborrill Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -618,9 +618,20 @@ they match. .Nm uses .Xr strsvis 3 -(in VIS_CSTYLE format) to encode path names containing +(in VIS_OCTAL format) to encode path names containing non-printable characters. Whitespace characters are encoded as +.Ql \e040 +(space), +.Ql \e011 +(tab), and +.Ql \e012 +(new line). +When flavor +.Sy netbsd6 +is selected, +.Xr strsvis 3 +(in VIS_CSTYLE format) is used and whitespace characters are encoded as .Ql \es (space), .Ql \et
CVS commit: src/usr.sbin/hdaudioctl
Module Name:src
Committed By: sborrill
Date: Mon Jun 15 13:06:39 UTC 2020
Modified Files:
src/usr.sbin/hdaudioctl: graph.c hdaudioctl.8 hdaudioctl.c hdaudioctl.h
Log Message:
Add show subcommand that displays the codec configuration in
human-readable tabulated form
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/hdaudioctl/graph.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/hdaudioctl/hdaudioctl.8
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/hdaudioctl/hdaudioctl.c \
src/usr.sbin/hdaudioctl/hdaudioctl.h
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/hdaudioctl/graph.c
diff -u src/usr.sbin/hdaudioctl/graph.c:1.4 src/usr.sbin/hdaudioctl/graph.c:1.5
--- src/usr.sbin/hdaudioctl/graph.c:1.4 Sun Jun 7 00:56:05 2020
+++ src/usr.sbin/hdaudioctl/graph.c Mon Jun 15 13:06:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: graph.c,v 1.4 2020/06/07 00:56:05 thorpej Exp $ */
+/* $NetBSD: graph.c,v 1.5 2020/06/15 13:06:39 sborrill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -45,13 +45,6 @@
#include "hdaudioctl.h"
-static const char *pin_devices[16] = {
- "Line Out", "Speaker", "HP Out", "CD",
- "SPDIF Out", "Digital Out", "Modem Line", "Modem Handset",
- "Line In", "AUX", "Mic In", "Telephony",
- "SPDIF In", "Digital In", "Reserved", "Other"
-};
-
int
hdaudioctl_graph(int fd, int argc, char *argv[])
{
Index: src/usr.sbin/hdaudioctl/hdaudioctl.8
diff -u src/usr.sbin/hdaudioctl/hdaudioctl.8:1.6 src/usr.sbin/hdaudioctl/hdaudioctl.8:1.7
--- src/usr.sbin/hdaudioctl/hdaudioctl.8:1.6 Tue Mar 18 18:20:46 2014
+++ src/usr.sbin/hdaudioctl/hdaudioctl.8 Mon Jun 15 13:06:39 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: hdaudioctl.8,v 1.6 2014/03/18 18:20:46 riastradh Exp $
+.\" $NetBSD: hdaudioctl.8,v 1.7 2020/06/15 13:06:39 sborrill Exp $
.\"
.\" Copyright (c) 2009 Precedence Technologies Ltd
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 6, 2009
+.Dd June 12, 2020
.Dt HDAUDIOCTL 8
.Os
.Sh NAME
@@ -55,6 +55,8 @@ Valid commands are:
For each child codec of the chosen
.Xr hdaudio 4
device, display the nid, vendor, product, subsystem and device IDs.
+.It show
+Retrieve and display the current codec configuration in human-readable form.
.It get Ar codecid Ar nid
Retrieve and display the current codec configuration as a
.Xr proplib 3
Index: src/usr.sbin/hdaudioctl/hdaudioctl.c
diff -u src/usr.sbin/hdaudioctl/hdaudioctl.c:1.2 src/usr.sbin/hdaudioctl/hdaudioctl.c:1.3
--- src/usr.sbin/hdaudioctl/hdaudioctl.c:1.2 Sat Mar 28 14:09:59 2015
+++ src/usr.sbin/hdaudioctl/hdaudioctl.c Mon Jun 15 13:06:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudioctl.c,v 1.2 2015/03/28 14:09:59 jmcneill Exp $ */
+/* $NetBSD: hdaudioctl.c,v 1.3 2020/06/15 13:06:39 sborrill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -49,6 +49,46 @@
#define DEVPATH_HDAUDIO "/dev/hdaudio0"
+const char *pin_devices[16] = {
+ "Line out", "Speaker", "Headphones", "CD",
+ "SPDIF Out", "Digital Out", "Modem Line", "Modem Handset",
+ "Line In", "AUX", "Mic In", "Telephony",
+ "SPDIF In", "Digital In", "Reserved", "Other"
+};
+static const char *pin_jacks[16] = {
+ "Unknown", "1/8\"", "1/4\"", "ATAPI",
+ "RCA", "Optic", "Digital", "Analog",
+ "DIN", "XLR", "RJ-11", "Combo",
+ "0xC", "0xD", "0xE", "Other"
+};
+static const char *pin_connections[4] = {
+ "Jack", "None", "Fixed", "Both"
+};
+static const char *pin_colors[16] = {
+ "Unknown", "Black", "Grey", "Blue",
+ "Green", "Red", "Orange", "Yellow",
+ "Purple", "Pink", "Res. A", "Res. B",
+ "Res. C", "Res. D", "White", "Other"
+};
+static const char *pin_locations[64] = {
+ "0x00", "Rear", "Front", "Left",
+ "Right", "Top", "Bottom", "Rear-panel",
+ "Drive-bay", "0x09", "0x0a", "0x0b",
+ "0x0c", "0x0d", "0x0e", "0x0f",
+ "Internal", "0x11", "0x12", "0x13",
+ "0x14", "0x15", "0x16", "Riser",
+ "0x18", "Onboard", "0x1a", "0x1b",
+ "0x1c", "0x1d", "0x1e", "0x1f",
+ "External", "Ext-Rear", "Ext-Front", "Ext-Left",
+ "Ext-Right", "Ext-Top", "Ext-Bottom", "0x07",
+ "0x28", "0x29", "0x2a", "0x2b",
+ "0x2c", "0x2d", "0x2e", "0x2f",
+ "Other", "0x31", "0x32", "0x33",
+ "0x34", "0x35", "Other-Bott", "Lid-In",
+ "Lid-Out", "0x39", "0x3a", "0x3b",
+ "0x3c", "0x3d", "0x3e", "0x3f"
+};
+
void
usage(void)
{
@@ -56,6 +96,7 @@ usage(void)
prog = getprogname();
fprintf(stderr, "usage: %s [-f dev] list\n", prog);
+ fprintf(stderr, " %s [-f dev] show \n", prog);
fprintf(stderr, " %s [-f dev] get \n", prog);
fprintf(stderr, " %s [-f dev] set [plist]\n",
prog);
@@ -203,6 +244,79 @@ hdaudioctl_set(int fd, int argc, char *a
return 0;
}
+/* Based on page 178 onwards:
+ * https://www.intel.com/content/dam/www/public/us/en/documents/product-specifications/high-definition-audio-specification.pdf
+ *
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Thu May 7 12:09:26 UTC 2020 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Whitespace fix To generate a diff of this commit: cvs rdiff -u -r1.1.2.83 -r1.1.2.84 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.83 src/doc/CHANGES-7.3:1.1.2.84 --- src/doc/CHANGES-7.3:1.1.2.83 Thu May 7 12:01:40 2020 +++ src/doc/CHANGES-7.3 Thu May 7 12:09:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.83 2020/05/07 12:01:40 sborrill Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.84 2020/05/07 12:09:26 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -850,7 +850,7 @@ external/bsd/bind/dist/lib/isc/sha2.c ( converting the code to avoid alignment issues. [he, ticket #1730] -bin/rcp/rcp.c 1.50 +bin/rcp/rcp.c 1.50 In sink(), upon error, avoid multiple replies to the source as this would lead to a desynchronization of the protocol and
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: sborrill Date: Thu May 7 12:07:13 UTC 2020 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1731 To generate a diff of this commit: cvs rdiff -u -r1.1.2.70 -r1.1.2.71 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.70 src/doc/CHANGES-7.1.3:1.1.2.71 --- src/doc/CHANGES-7.1.3:1.1.2.70 Thu Apr 30 16:24:26 2020 +++ src/doc/CHANGES-7.1.3 Thu May 7 12:07:13 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.70 2020/04/30 16:24:26 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.71 2020/05/07 12:07:13 sborrill Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -682,4 +682,10 @@ games/fortune/unstr/unstr.c 1.15 Fix potential buffer overflows in fortune tools. [nia, ticket #1729] - +bin/rcp/rcp.c 1.50 + + In sink(), upon error, avoid multiple replies to the source + as this would lead to a desynchronization of the protocol and + further files or directories to be ignored or corrupted. + [aymeric, ticket #1731] +
CVS commit: [netbsd-7-1] src/bin/rcp
Module Name:src
Committed By: sborrill
Date: Thu May 7 12:05:51 UTC 2020
Modified Files:
src/bin/rcp [netbsd-7-1]: rcp.c
Log Message:
Pull up the following revisions(s) (requested by aymeric in ticket #1731):
bin/rcp/rcp.c: revision 1.50
In sink(), upon error, avoid multiple replies to the source as this
would lead to a desynchronization of the protocol and further files or
directories to be ignored or corrupted.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.22.1 src/bin/rcp/rcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/rcp/rcp.c
diff -u src/bin/rcp/rcp.c:1.49 src/bin/rcp/rcp.c:1.49.22.1
--- src/bin/rcp/rcp.c:1.49 Mon May 7 15:22:54 2012
+++ src/bin/rcp/rcp.c Thu May 7 12:05:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rcp.c,v 1.49 2012/05/07 15:22:54 chs Exp $ */
+/* $NetBSD: rcp.c,v 1.49.22.1 2020/05/07 12:05:51 sborrill Exp $ */
/*
* Copyright (c) 1983, 1990, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: rcp.c,v 1.49 2012/05/07 15:22:54 chs Exp $");
+__RCSID("$NetBSD: rcp.c,v 1.49.22.1 2020/05/07 12:05:51 sborrill Exp $");
#endif
#endif /* not lint */
@@ -470,7 +470,6 @@ sink(int argc, char *argv[])
static BUF buffer;
struct stat stb;
struct timeval tv[2];
- enum { YES, NO, DISPLAYED } wrerr;
BUF *bp;
ssize_t j;
off_t i;
@@ -480,8 +479,9 @@ sink(int argc, char *argv[])
mode_t mask;
mode_t mode;
mode_t omode;
- int setimes, targisdir;
+ int setimes, targisdir, wrerr;
int wrerrno = 0; /* pacify gcc */
+ const char *wrcontext = NULL;
char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ];
const char *why;
off_t size;
@@ -624,9 +624,7 @@ sink(int argc, char *argv[])
sink(1, vect);
if (setimes) {
setimes = 0;
-if (utimes(np, tv) < 0)
-run_err("%s: set times: %s",
- np, strerror(errno));
+(void) utimes(np, tv);
}
if (mod_flag)
(void)chmod(np, mode);
@@ -644,7 +642,20 @@ bad: run_err("%s: %s", np, strerror(er
continue;
}
cp = bp->buf;
- wrerr = NO;
+ wrerr = 0;
+
+/*
+ * Like run_err(), but don't send any message to the remote end.
+ * Instead, record the first error and send that in the end.
+ */
+#define RUN_ERR(w_context) do { \
+ if (!wrerr) { \
+ wrerrno = errno; \
+ wrcontext = w_context; \
+ wrerr = 1; \
+ }\
+} while(0)
+
count = 0;
for (i = 0; i < size; i += BUFSIZ) {
amt = BUFSIZ;
@@ -663,69 +674,56 @@ bad: run_err("%s: %s", np, strerror(er
} while (amt > 0);
if (count == bp->cnt) {
/* Keep reading so we stay sync'd up. */
-if (wrerr == NO) {
+if (!wrerr) {
j = write(ofd, bp->buf, (size_t)count);
if (j != count) {
- wrerr = YES;
- wrerrno = j >= 0 ? EIO : errno;
+ if (j >= 0)
+ errno = EIO;
+ RUN_ERR("write");
}
}
count = 0;
cp = bp->buf;
}
}
- if (count != 0 && wrerr == NO &&
+ if (count != 0 && !wrerr &&
(j = write(ofd, bp->buf, (size_t)count)) != count) {
- wrerr = YES;
- wrerrno = j >= 0 ? EIO : errno;
- }
- if (ftruncate(ofd, size)) {
- run_err("%s: truncate: %s", np, strerror(errno));
- wrerr = DISPLAYED;
+ if (j >= 0)
+errno = EIO;
+ RUN_ERR("write");
}
+ if (ftruncate(ofd, size))
+ RUN_ERR("truncate");
+
if (pflag) {
if (exists || omode != mode)
if (fchmod(ofd, omode))
- run_err("%s: set mode: %s",
- np, strerror(errno));
+ RUN_ERR("set mode");
} else {
if (!exists && omode != mode)
if (fchmod(ofd, omode & ~mask))
- run_err("%s: set mode: %s",
- np, strerror(errno));
+ RUN_ERR("set mode");
}
#ifndef __SVR4
- if (setimes && wrerr == NO) {
+ if (setimes && !wrerr) {
setimes = 0;
- if (futimes(ofd, tv) < 0) {
-run_err("%s: set times: %s",
-np, strerror(errno));
-wrerr = DISPLAYED;
- }
+ if (futimes(ofd, tv) < 0)
+RUN_ERR("set times");
}
#endif
(void)close(ofd);
#ifdef __SVR4
- if (setimes && wrerr == NO) {
+ if (setimes && !wrerr) {
setimes = 0;
- if (utimes(np, tv) < 0) {
-run_err("%s: set times: %s",
-np, strerror(errno));
-wrerr = DISPLAYED;
- }
+ if (utimes(np, tv) < 0)
+RUN_ERR("set times");
}
#endif
(void)response();
- switch(wrerr) {
- case YES:
- run_err("%s: write: %s", np, strerror(wrerrno));
- break;
- case NO:
+ if (wrerr)
+ run_err("%s: %s: %s", np, wrcontext, strerror(wrerrno));
+ else
(void)write(rem, "", 1);
- break;
- case DISPLAYED:
- break;
- }
}
out:
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: sborrill Date: Thu May 7 12:03:47 UTC 2020 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1731 To generate a diff of this commit: cvs rdiff -u -r1.1.2.162 -r1.1.2.163 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.162 src/doc/CHANGES-7.0.3:1.1.2.163 --- src/doc/CHANGES-7.0.3:1.1.2.162 Thu Apr 30 16:25:15 2020 +++ src/doc/CHANGES-7.0.3 Thu May 7 12:03:47 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.162 2020/04/30 16:25:15 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.163 2020/05/07 12:03:47 sborrill Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5957,3 +5957,10 @@ games/fortune/unstr/unstr.c 1.15 Fix potential buffer overflows in fortune tools. [nia, ticket #1729] +bin/rcp/rcp.c 1.50 + + In sink(), upon error, avoid multiple replies to the source + as this would lead to a desynchronization of the protocol and + further files or directories to be ignored or corrupted. + [aymeric, ticket #1731] +
CVS commit: [netbsd-7-0] src/bin/rcp
Module Name:src
Committed By: sborrill
Date: Thu May 7 12:02:24 UTC 2020
Modified Files:
src/bin/rcp [netbsd-7-0]: rcp.c
Log Message:
Pull up the following revisions(s) (requested by aymeric in ticket #1731):
bin/rcp/rcp.c: revision 1.50
In sink(), upon error, avoid multiple replies to the source as this
would lead to a desynchronization of the protocol and further files or
directories to be ignored or corrupted.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.14.1 src/bin/rcp/rcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/rcp/rcp.c
diff -u src/bin/rcp/rcp.c:1.49 src/bin/rcp/rcp.c:1.49.14.1
--- src/bin/rcp/rcp.c:1.49 Mon May 7 15:22:54 2012
+++ src/bin/rcp/rcp.c Thu May 7 12:02:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rcp.c,v 1.49 2012/05/07 15:22:54 chs Exp $ */
+/* $NetBSD: rcp.c,v 1.49.14.1 2020/05/07 12:02:24 sborrill Exp $ */
/*
* Copyright (c) 1983, 1990, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: rcp.c,v 1.49 2012/05/07 15:22:54 chs Exp $");
+__RCSID("$NetBSD: rcp.c,v 1.49.14.1 2020/05/07 12:02:24 sborrill Exp $");
#endif
#endif /* not lint */
@@ -470,7 +470,6 @@ sink(int argc, char *argv[])
static BUF buffer;
struct stat stb;
struct timeval tv[2];
- enum { YES, NO, DISPLAYED } wrerr;
BUF *bp;
ssize_t j;
off_t i;
@@ -480,8 +479,9 @@ sink(int argc, char *argv[])
mode_t mask;
mode_t mode;
mode_t omode;
- int setimes, targisdir;
+ int setimes, targisdir, wrerr;
int wrerrno = 0; /* pacify gcc */
+ const char *wrcontext = NULL;
char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ];
const char *why;
off_t size;
@@ -624,9 +624,7 @@ sink(int argc, char *argv[])
sink(1, vect);
if (setimes) {
setimes = 0;
-if (utimes(np, tv) < 0)
-run_err("%s: set times: %s",
- np, strerror(errno));
+(void) utimes(np, tv);
}
if (mod_flag)
(void)chmod(np, mode);
@@ -644,7 +642,20 @@ bad: run_err("%s: %s", np, strerror(er
continue;
}
cp = bp->buf;
- wrerr = NO;
+ wrerr = 0;
+
+/*
+ * Like run_err(), but don't send any message to the remote end.
+ * Instead, record the first error and send that in the end.
+ */
+#define RUN_ERR(w_context) do { \
+ if (!wrerr) { \
+ wrerrno = errno; \
+ wrcontext = w_context; \
+ wrerr = 1; \
+ }\
+} while(0)
+
count = 0;
for (i = 0; i < size; i += BUFSIZ) {
amt = BUFSIZ;
@@ -663,69 +674,56 @@ bad: run_err("%s: %s", np, strerror(er
} while (amt > 0);
if (count == bp->cnt) {
/* Keep reading so we stay sync'd up. */
-if (wrerr == NO) {
+if (!wrerr) {
j = write(ofd, bp->buf, (size_t)count);
if (j != count) {
- wrerr = YES;
- wrerrno = j >= 0 ? EIO : errno;
+ if (j >= 0)
+ errno = EIO;
+ RUN_ERR("write");
}
}
count = 0;
cp = bp->buf;
}
}
- if (count != 0 && wrerr == NO &&
+ if (count != 0 && !wrerr &&
(j = write(ofd, bp->buf, (size_t)count)) != count) {
- wrerr = YES;
- wrerrno = j >= 0 ? EIO : errno;
- }
- if (ftruncate(ofd, size)) {
- run_err("%s: truncate: %s", np, strerror(errno));
- wrerr = DISPLAYED;
+ if (j >= 0)
+errno = EIO;
+ RUN_ERR("write");
}
+ if (ftruncate(ofd, size))
+ RUN_ERR("truncate");
+
if (pflag) {
if (exists || omode != mode)
if (fchmod(ofd, omode))
- run_err("%s: set mode: %s",
- np, strerror(errno));
+ RUN_ERR("set mode");
} else {
if (!exists && omode != mode)
if (fchmod(ofd, omode & ~mask))
- run_err("%s: set mode: %s",
- np, strerror(errno));
+ RUN_ERR("set mode");
}
#ifndef __SVR4
- if (setimes && wrerr == NO) {
+ if (setimes && !wrerr) {
setimes = 0;
- if (futimes(ofd, tv) < 0) {
-run_err("%s: set times: %s",
-np, strerror(errno));
-wrerr = DISPLAYED;
- }
+ if (futimes(ofd, tv) < 0)
+RUN_ERR("set times");
}
#endif
(void)close(ofd);
#ifdef __SVR4
- if (setimes && wrerr == NO) {
+ if (setimes && !wrerr) {
setimes = 0;
- if (utimes(np, tv) < 0) {
-run_err("%s: set times: %s",
-np, strerror(errno));
-wrerr = DISPLAYED;
- }
+ if (utimes(np, tv) < 0)
+RUN_ERR("set times");
}
#endif
(void)response();
- switch(wrerr) {
- case YES:
- run_err("%s: write: %s", np, strerror(wrerrno));
- break;
- case NO:
+ if (wrerr)
+ run_err("%s: %s: %s", np, wrcontext, strerror(wrerrno));
+ else
(void)write(rem, "", 1);
- break;
- case DISPLAYED:
- break;
- }
}
out:
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Thu May 7 12:01:40 UTC 2020 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1731 To generate a diff of this commit: cvs rdiff -u -r1.1.2.82 -r1.1.2.83 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.82 src/doc/CHANGES-7.3:1.1.2.83 --- src/doc/CHANGES-7.3:1.1.2.82 Wed May 6 07:42:14 2020 +++ src/doc/CHANGES-7.3 Thu May 7 12:01:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.82 2020/05/06 07:42:14 sborrill Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.83 2020/05/07 12:01:40 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -850,3 +850,10 @@ external/bsd/bind/dist/lib/isc/sha2.c ( converting the code to avoid alignment issues. [he, ticket #1730] +bin/rcp/rcp.c 1.50 + + In sink(), upon error, avoid multiple replies to the source + as this would lead to a desynchronization of the protocol and + further files or directories to be ignored or corrupted. + [aymeric, ticket #1731] +
CVS commit: [netbsd-7] src/bin/rcp
Module Name:src
Committed By: sborrill
Date: Thu May 7 12:01:00 UTC 2020
Modified Files:
src/bin/rcp [netbsd-7]: rcp.c
Log Message:
Pull up the following revisions(s) (requested by aymeric in ticket #1731):
bin/rcp/rcp.c: revision 1.50
In sink(), upon error, avoid multiple replies to the source as this
would lead to a desynchronization of the protocol and further files or
directories to be ignored or corrupted.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.12.1 src/bin/rcp/rcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/rcp/rcp.c
diff -u src/bin/rcp/rcp.c:1.49 src/bin/rcp/rcp.c:1.49.12.1
--- src/bin/rcp/rcp.c:1.49 Mon May 7 15:22:54 2012
+++ src/bin/rcp/rcp.c Thu May 7 12:01:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rcp.c,v 1.49 2012/05/07 15:22:54 chs Exp $ */
+/* $NetBSD: rcp.c,v 1.49.12.1 2020/05/07 12:01:00 sborrill Exp $ */
/*
* Copyright (c) 1983, 1990, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: rcp.c,v 1.49 2012/05/07 15:22:54 chs Exp $");
+__RCSID("$NetBSD: rcp.c,v 1.49.12.1 2020/05/07 12:01:00 sborrill Exp $");
#endif
#endif /* not lint */
@@ -470,7 +470,6 @@ sink(int argc, char *argv[])
static BUF buffer;
struct stat stb;
struct timeval tv[2];
- enum { YES, NO, DISPLAYED } wrerr;
BUF *bp;
ssize_t j;
off_t i;
@@ -480,8 +479,9 @@ sink(int argc, char *argv[])
mode_t mask;
mode_t mode;
mode_t omode;
- int setimes, targisdir;
+ int setimes, targisdir, wrerr;
int wrerrno = 0; /* pacify gcc */
+ const char *wrcontext = NULL;
char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ];
const char *why;
off_t size;
@@ -624,9 +624,7 @@ sink(int argc, char *argv[])
sink(1, vect);
if (setimes) {
setimes = 0;
-if (utimes(np, tv) < 0)
-run_err("%s: set times: %s",
- np, strerror(errno));
+(void) utimes(np, tv);
}
if (mod_flag)
(void)chmod(np, mode);
@@ -644,7 +642,20 @@ bad: run_err("%s: %s", np, strerror(er
continue;
}
cp = bp->buf;
- wrerr = NO;
+ wrerr = 0;
+
+/*
+ * Like run_err(), but don't send any message to the remote end.
+ * Instead, record the first error and send that in the end.
+ */
+#define RUN_ERR(w_context) do { \
+ if (!wrerr) { \
+ wrerrno = errno; \
+ wrcontext = w_context; \
+ wrerr = 1; \
+ }\
+} while(0)
+
count = 0;
for (i = 0; i < size; i += BUFSIZ) {
amt = BUFSIZ;
@@ -663,69 +674,56 @@ bad: run_err("%s: %s", np, strerror(er
} while (amt > 0);
if (count == bp->cnt) {
/* Keep reading so we stay sync'd up. */
-if (wrerr == NO) {
+if (!wrerr) {
j = write(ofd, bp->buf, (size_t)count);
if (j != count) {
- wrerr = YES;
- wrerrno = j >= 0 ? EIO : errno;
+ if (j >= 0)
+ errno = EIO;
+ RUN_ERR("write");
}
}
count = 0;
cp = bp->buf;
}
}
- if (count != 0 && wrerr == NO &&
+ if (count != 0 && !wrerr &&
(j = write(ofd, bp->buf, (size_t)count)) != count) {
- wrerr = YES;
- wrerrno = j >= 0 ? EIO : errno;
- }
- if (ftruncate(ofd, size)) {
- run_err("%s: truncate: %s", np, strerror(errno));
- wrerr = DISPLAYED;
+ if (j >= 0)
+errno = EIO;
+ RUN_ERR("write");
}
+ if (ftruncate(ofd, size))
+ RUN_ERR("truncate");
+
if (pflag) {
if (exists || omode != mode)
if (fchmod(ofd, omode))
- run_err("%s: set mode: %s",
- np, strerror(errno));
+ RUN_ERR("set mode");
} else {
if (!exists && omode != mode)
if (fchmod(ofd, omode & ~mask))
- run_err("%s: set mode: %s",
- np, strerror(errno));
+ RUN_ERR("set mode");
}
#ifndef __SVR4
- if (setimes && wrerr == NO) {
+ if (setimes && !wrerr) {
setimes = 0;
- if (futimes(ofd, tv) < 0) {
-run_err("%s: set times: %s",
-np, strerror(errno));
-wrerr = DISPLAYED;
- }
+ if (futimes(ofd, tv) < 0)
+RUN_ERR("set times");
}
#endif
(void)close(ofd);
#ifdef __SVR4
- if (setimes && wrerr == NO) {
+ if (setimes && !wrerr) {
setimes = 0;
- if (utimes(np, tv) < 0) {
-run_err("%s: set times: %s",
-np, strerror(errno));
-wrerr = DISPLAYED;
- }
+ if (utimes(np, tv) < 0)
+RUN_ERR("set times");
}
#endif
(void)response();
- switch(wrerr) {
- case YES:
- run_err("%s: write: %s", np, strerror(wrerrno));
- break;
- case NO:
+ if (wrerr)
+ run_err("%s: %s: %s", np, wrcontext, strerror(wrerrno));
+ else
(void)write(rem, "", 1);
- break;
- case DISPLAYED:
- break;
- }
}
out:
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Wed May 6 07:42:14 UTC 2020 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1730 To generate a diff of this commit: cvs rdiff -u -r1.1.2.81 -r1.1.2.82 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.81 src/doc/CHANGES-7.3:1.1.2.82 --- src/doc/CHANGES-7.3:1.1.2.81 Thu Apr 30 16:23:32 2020 +++ src/doc/CHANGES-7.3 Wed May 6 07:42:14 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.81 2020/04/30 16:23:32 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.82 2020/05/06 07:42:14 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -844,3 +844,9 @@ games/fortune/unstr/unstr.c 1.15 Fix potential buffer overflows in fortune tools. [nia, ticket #1729] +external/bsd/bind/dist/lib/isc/sha2.c (apply patch) + + Fix bug in sha384 checksum computation introduced when + converting the code to avoid alignment issues. + [he, ticket #1730] +
CVS commit: [netbsd-7] src/external/bsd/bind/dist/lib/isc
Module Name:src
Committed By: sborrill
Date: Wed May 6 07:40:17 UTC 2020
Modified Files:
src/external/bsd/bind/dist/lib/isc [netbsd-7]: sha2.c
Log Message:
Fix bug in sha384 checksum computation introduced when converting the code
to avoid alignment issues.
To generate a diff of this commit:
cvs rdiff -u -r1.8.2.2 -r1.8.2.3 src/external/bsd/bind/dist/lib/isc/sha2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/isc/sha2.c
diff -u src/external/bsd/bind/dist/lib/isc/sha2.c:1.8.2.2 src/external/bsd/bind/dist/lib/isc/sha2.c:1.8.2.3
--- src/external/bsd/bind/dist/lib/isc/sha2.c:1.8.2.2 Tue Jun 20 17:09:53 2017
+++ src/external/bsd/bind/dist/lib/isc/sha2.c Wed May 6 07:40:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sha2.c,v 1.8.2.2 2017/06/20 17:09:53 snj Exp $ */
+/* $NetBSD: sha2.c,v 1.8.2.3 2020/05/06 07:40:17 sborrill Exp $ */
/*
* Copyright (C) 2005-2007, 2009, 2011, 2012, 2014, 2016 Internet Systems Consortium, Inc. ("ISC")
@@ -1503,6 +1503,8 @@ void isc_sha512_last(isc_sha512_t *conte
*context->buffer = 0x80;
}
/* Store the length of input data (in bits): */
+ memcpy(>buffer[ISC_SHA512_SHORT_BLOCK_LENGTH],
+ >bitcount[1], sizeof(isc_uint64_t));
memcpy(>buffer[ISC_SHA512_SHORT_BLOCK_LENGTH+8],
>bitcount[0], sizeof(isc_uint64_t));
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: sborrill Date: Fri Mar 27 08:51:59 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Add missing line-break To generate a diff of this commit: cvs rdiff -u -r1.1.2.24 -r1.1.2.25 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.24 src/doc/CHANGES-9.1:1.1.2.25 --- src/doc/CHANGES-9.1:1.1.2.24 Fri Mar 27 08:46:07 2020 +++ src/doc/CHANGES-9.1 Fri Mar 27 08:51:59 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.24 2020/03/27 08:46:07 sborrill Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.25 2020/03/27 08:51:59 sborrill Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -720,6 +720,7 @@ sys/arch/vax/vsa/ncr.c1.50 [ragge, ticket #802] etc/named.conf 1.8 + Stop using obsolete dnssec-lookaside (implies use of dlv.isc.org, which no longer serves any useful purpose). [christos, ticket #806]
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: sborrill Date: Fri Mar 27 08:49:53 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Fix ticket number To generate a diff of this commit: cvs rdiff -u -r1.1.2.110 -r1.1.2.111 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.110 src/doc/CHANGES-8.2:1.1.2.111 --- src/doc/CHANGES-8.2:1.1.2.110 Fri Mar 27 08:48:57 2020 +++ src/doc/CHANGES-8.2 Fri Mar 27 08:49:53 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.110 2020/03/27 08:48:57 sborrill Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.111 2020/03/27 08:49:53 sborrill Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -2164,5 +2164,5 @@ etc/named.conf 1.8 Stop using obsolete dnssec-lookaside (implies use of dlv.isc.org, which no longer serves any useful purpose). - [christos, ticket #806] + [christos, ticket #1524]
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: sborrill Date: Fri Mar 27 08:48:57 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1524 To generate a diff of this commit: cvs rdiff -u -r1.1.2.109 -r1.1.2.110 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.109 src/doc/CHANGES-8.2:1.1.2.110 --- src/doc/CHANGES-8.2:1.1.2.109 Mon Mar 23 10:17:07 2020 +++ src/doc/CHANGES-8.2 Fri Mar 27 08:48:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.109 2020/03/23 10:17:07 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.110 2020/03/27 08:48:57 sborrill Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -2160,3 +2160,9 @@ sys/external/bsd/drm2/dist/drm/radeon/ra Fix loading TAHITI VCE firmware. [mrg, ticket #1523] +etc/named.conf 1.8 + + Stop using obsolete dnssec-lookaside (implies use of dlv.isc.org, + which no longer serves any useful purpose). + [christos, ticket #806] +
CVS commit: [netbsd-8] src/etc
Module Name:src
Committed By: sborrill
Date: Fri Mar 27 08:48:23 UTC 2020
Modified Files:
src/etc [netbsd-8]: named.conf
Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1524):
etc/named.conf: revision 1.8
Stop using obsolete dnssec-lookaside (implies use of dlv.isc.org, which
no longer serves any useful purpose).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.22.1 src/etc/named.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/named.conf
diff -u src/etc/named.conf:1.7 src/etc/named.conf:1.7.22.1
--- src/etc/named.conf:1.7 Thu Apr 25 20:28:05 2013
+++ src/etc/named.conf Fri Mar 27 08:48:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.7 2013/04/25 20:28:05 christos Exp $
+# $NetBSD: named.conf,v 1.7.22.1 2020/03/27 08:48:23 sborrill Exp $
# boot file for secondary name server
# Note that there should be one primary entry for each SOA record.
@@ -12,7 +12,6 @@ options {
directory "/etc/namedb";
dnssec-enable yes;
dnssec-validation auto;
- dnssec-lookaside auto;
managed-keys-directory "keys";
bindkeys-file "bind.keys";
allow-recursion { localhost; localnets; };
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: sborrill Date: Fri Mar 27 08:46:07 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Ticket #806 To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.23 src/doc/CHANGES-9.1:1.1.2.24 --- src/doc/CHANGES-9.1:1.1.2.23 Mon Mar 23 10:07:20 2020 +++ src/doc/CHANGES-9.1 Fri Mar 27 08:46:07 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.23 2020/03/23 10:07:20 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.24 2020/03/27 08:46:07 sborrill Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -719,3 +719,8 @@ sys/arch/vax/vsa/ncr.c1.50 Do not expect a struct buf to be present if doing DMA to kernel space. [ragge, ticket #802] +etc/named.conf 1.8 + Stop using obsolete dnssec-lookaside (implies use of dlv.isc.org, + which no longer serves any useful purpose). + [christos, ticket #806] +
CVS commit: [netbsd-9] src/etc
Module Name:src
Committed By: sborrill
Date: Fri Mar 27 08:43:42 UTC 2020
Modified Files:
src/etc [netbsd-9]: named.conf
Log Message:
Pull up the following revisions(s) (requested by christos in ticket #806):
etc/named.conf: revision 1.8
Stop using obsolete dnssec-lookaside (implies use of dlv.isc.org, which
no longer serves any useful purpose).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.32.1 src/etc/named.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/named.conf
diff -u src/etc/named.conf:1.7 src/etc/named.conf:1.7.32.1
--- src/etc/named.conf:1.7 Thu Apr 25 20:28:05 2013
+++ src/etc/named.conf Fri Mar 27 08:43:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.7 2013/04/25 20:28:05 christos Exp $
+# $NetBSD: named.conf,v 1.7.32.1 2020/03/27 08:43:42 sborrill Exp $
# boot file for secondary name server
# Note that there should be one primary entry for each SOA record.
@@ -12,7 +12,6 @@ options {
directory "/etc/namedb";
dnssec-enable yes;
dnssec-validation auto;
- dnssec-lookaside auto;
managed-keys-directory "keys";
bindkeys-file "bind.keys";
allow-recursion { localhost; localnets; };
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: sborrill Date: Mon Mar 16 12:23:05 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1521 To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.107 src/doc/CHANGES-8.2:1.1.2.108 --- src/doc/CHANGES-8.2:1.1.2.107 Fri Mar 13 08:36:23 2020 +++ src/doc/CHANGES-8.2 Mon Mar 16 12:23:05 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.107 2020/03/13 08:36:23 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.108 2020/03/16 12:23:05 sborrill Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -2140,3 +2140,11 @@ sys/netipsec/key.c1.271 Fix kern/55066. [knakahara, ticket #1520] +sys/arch/xen/xen/xennet_checksum.c 1.4 + + Make the packet length check less strict, allow the physical + packet longer than IP payload. This fixes problem where checksum + was not recomputed for short packets coming from Windows domU + on same physical host as it seems Windows does some padding. + [jdolecek, ticket #1521] +
CVS commit: [netbsd-8] src/sys/arch/xen/xen
Module Name:src
Committed By: sborrill
Date: Mon Mar 16 12:22:03 UTC 2020
Modified Files:
src/sys/arch/xen/xen [netbsd-8]: xennet_checksum.c
Log Message:
Pull up the following revisions(s) (requested by jdolecek in ticket #1521):
sys/arch/xen/xen/xennet_checksum.c: revision 1.4
Make the packet length check less strict, allow the physical packet longer
than IP payload. This fixes problem where checksum was not recomputed for
short packets coming from Windows domU on same physical host as it seems
Windows does some padding.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.98.1 src/sys/arch/xen/xen/xennet_checksum.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/xen/xen/xennet_checksum.c
diff -u src/sys/arch/xen/xen/xennet_checksum.c:1.3 src/sys/arch/xen/xen/xennet_checksum.c:1.3.98.1
--- src/sys/arch/xen/xen/xennet_checksum.c:1.3 Thu Nov 22 16:17:10 2007
+++ src/sys/arch/xen/xen/xennet_checksum.c Mon Mar 16 12:22:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $ */
+/* $NetBSD: xennet_checksum.c,v 1.3.98.1 2020/03/16 12:22:03 sborrill Exp $ */
/*-
* Copyright (c)2006 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3.98.1 2020/03/16 12:22:03 sborrill Exp $");
#include
#include
@@ -124,7 +124,7 @@ xennet_checksum_fill(struct mbuf **mp)
nxt = iph->ip_p;
iphlen = iph->ip_hl * 4;
iplen = ntohs(iph->ip_len);
- if (ehlen + iplen != m->m_pkthdr.len) {
+ if (ehlen + iplen > m->m_pkthdr.len) {
return EINVAL;
}
if (nxt == IPPROTO_UDP) {
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Mon Mar 16 12:09:46 UTC 2020 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1726 To generate a diff of this commit: cvs rdiff -u -r1.1.2.77 -r1.1.2.78 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.77 src/doc/CHANGES-7.3:1.1.2.78 --- src/doc/CHANGES-7.3:1.1.2.77 Sun Mar 8 09:20:52 2020 +++ src/doc/CHANGES-7.3 Mon Mar 16 12:09:46 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.77 2020/03/08 09:20:52 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.78 2020/03/16 12:09:46 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -819,3 +819,11 @@ sys/arch/amigappc/include/bus_defs.h 1. the bus methods since we already define them anyway. [is, ticket #1725] +sys/arch/xen/xen/xennet_checksum.c 1.4 + + Make the packet length check less strict, allow the physical + packet longer than IP payload. This fixes problem where checksum + was not recomputed for short packets coming from Windows domU + on same physical host as it seems Windows does some padding. + [jdolecek, ticket #1726] +
CVS commit: [netbsd-7] src/sys/arch/xen/xen
Module Name:src
Committed By: sborrill
Date: Mon Mar 16 12:08:37 UTC 2020
Modified Files:
src/sys/arch/xen/xen [netbsd-7]: xennet_checksum.c
Log Message:
Pull up the following revisions(s) (requested by jdolecek in ticket #1726):
sys/arch/xen/xen/xennet_checksum.c: revision 1.4
Make the packet length check less strict, allow the physical packet longer
than IP payload. This fixes problem where checksum was not recomputed for
short packets coming from Windows domU on same physical host as it seems
Windows does some padding.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.80.1 src/sys/arch/xen/xen/xennet_checksum.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/xen/xen/xennet_checksum.c
diff -u src/sys/arch/xen/xen/xennet_checksum.c:1.3 src/sys/arch/xen/xen/xennet_checksum.c:1.3.80.1
--- src/sys/arch/xen/xen/xennet_checksum.c:1.3 Thu Nov 22 16:17:10 2007
+++ src/sys/arch/xen/xen/xennet_checksum.c Mon Mar 16 12:08:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $ */
+/* $NetBSD: xennet_checksum.c,v 1.3.80.1 2020/03/16 12:08:37 sborrill Exp $ */
/*-
* Copyright (c)2006 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3.80.1 2020/03/16 12:08:37 sborrill Exp $");
#include
#include
@@ -124,7 +124,7 @@ xennet_checksum_fill(struct mbuf **mp)
nxt = iph->ip_p;
iphlen = iph->ip_hl * 4;
iplen = ntohs(iph->ip_len);
- if (ehlen + iplen != m->m_pkthdr.len) {
+ if (ehlen + iplen > m->m_pkthdr.len) {
return EINVAL;
}
if (nxt == IPPROTO_UDP) {
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: sborrill Date: Mon Mar 16 11:11:47 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Ticket #781 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.18 src/doc/CHANGES-9.1:1.1.2.19 --- src/doc/CHANGES-9.1:1.1.2.18 Fri Mar 13 08:34:25 2020 +++ src/doc/CHANGES-9.1 Mon Mar 16 11:11:46 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.18 2020/03/13 08:34:25 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.19 2020/03/16 11:11:46 sborrill Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -526,3 +526,11 @@ sys/netipsec/key.c1.271 Fix kern/55066. [knakahara, ticket #780] +sys/arch/xen/xen/xennet_checksum.c 1.4 + + Make the packet length check less strict, allow the physical + packet longer than IP payload. This fixes problem where checksum + was not recomputed for short packets coming from Windows domU + on same physical host as it seems Windows does some padding. + [jdolecek, ticket #781] +
CVS commit: [netbsd-9] src/sys/arch/xen/xen
Module Name:src
Committed By: sborrill
Date: Mon Mar 16 11:11:13 UTC 2020
Modified Files:
src/sys/arch/xen/xen [netbsd-9]: xennet_checksum.c
Log Message:
Pull up the following revisions(s) (requested by jdolecek in ticket #781):
sys/arch/xen/xen/xennet_checksum.c: revision 1.4
Make the packet length check less strict, allow the physical packet longer
than IP payload. This fixes problem where checksum was not recomputed for
short packets coming from Windows domU on same physical host as it seems
Windows does some padding.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.110.1 src/sys/arch/xen/xen/xennet_checksum.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/xen/xen/xennet_checksum.c
diff -u src/sys/arch/xen/xen/xennet_checksum.c:1.3 src/sys/arch/xen/xen/xennet_checksum.c:1.3.110.1
--- src/sys/arch/xen/xen/xennet_checksum.c:1.3 Thu Nov 22 16:17:10 2007
+++ src/sys/arch/xen/xen/xennet_checksum.c Mon Mar 16 11:11:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $ */
+/* $NetBSD: xennet_checksum.c,v 1.3.110.1 2020/03/16 11:11:13 sborrill Exp $ */
/*-
* Copyright (c)2006 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3 2007/11/22 16:17:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.3.110.1 2020/03/16 11:11:13 sborrill Exp $");
#include
#include
@@ -124,7 +124,7 @@ xennet_checksum_fill(struct mbuf **mp)
nxt = iph->ip_p;
iphlen = iph->ip_hl * 4;
iplen = ntohs(iph->ip_len);
- if (ehlen + iplen != m->m_pkthdr.len) {
+ if (ehlen + iplen > m->m_pkthdr.len) {
return EINVAL;
}
if (nxt == IPPROTO_UDP) {
CVS commit: src/sys/arch/acorn32/stand/boot32
Module Name:src
Committed By: sborrill
Date: Wed Jan 23 14:52:49 UTC 2019
Modified Files:
src/sys/arch/acorn32/stand/boot32: boot32.c
Log Message:
Don't call OS_ReadSysInfo Platform class call on RISC OS 3
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/acorn32/stand/boot32/boot32.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/acorn32/stand/boot32/boot32.c
diff -u src/sys/arch/acorn32/stand/boot32/boot32.c:1.45 src/sys/arch/acorn32/stand/boot32/boot32.c:1.46
--- src/sys/arch/acorn32/stand/boot32/boot32.c:1.45 Tue Oct 30 20:23:29 2018
+++ src/sys/arch/acorn32/stand/boot32/boot32.c Wed Jan 23 14:52:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: boot32.c,v 1.45 2018/10/30 20:23:29 christos Exp $ */
+/* $NetBSD: boot32.c,v 1.46 2019/01/23 14:52:49 sborrill Exp $ */
/*-
* Copyright (c) 2002 Reinoud Zandijk
@@ -760,17 +760,57 @@ create_configuration(int argc, char **ar
}
}
+int get_riscos_ver(void);
+
+#define ModuleName_UtilityModule "UtilityModule"
+
+int
+get_riscos_ver(void)
+{
+ int module, section;
+ os_error *e;
+ char *name;
+ int version;
+
+ version = 0;
+ /* Full enumeration */
+ module = 0;
+ section = -1;
+ do {
+ e = xosmodule_enumeratewithversion(, , ,
+ NULL, NULL, );
+ if (!strncmp(name, ModuleName_UtilityModule,
+ sizeof (ModuleName_UtilityModule))) {
+ return version;
+ }
+ } while (e == NULL && section == -1);
+ return 0;
+}
+
int main(int, char **);
int
main(int argc, char **argv)
{
int howto, start_args, ret;
+ int riscosver;
int class;
+ riscosver = get_riscos_ver();
+ /*
+ * RISC OS version is in BCD
+ * Top 16 bits = major version
+ * Bottom 16 bits = fractional part
+ * e.g. 3.71 = 0x00037100
+ */
+
printf("\n\n");
printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
printf(">> Booting NetBSD/acorn32 on a RiscPC/A7000/NC\n");
+ printf(">> RISC OS version: %d.%d%d\n",
+ (riscosver >> 16) & 0xff,
+ (riscosver >> 12) & 0xf,
+ (riscosver >> 8) & 0xf);
printf("\n");
process_args(argc, argv, , booted_file, _args);
@@ -855,9 +895,19 @@ main(int argc, char **argv)
/* dismount all filesystems */
xosfscontrol_shutdown();
- os_readsysinfo_platform_class(, NULL, NULL);
- if (class != osreadsysinfo_Platform_Pace) {
- /* reset devices, well they try to anyway */
+ /*
+ * OS_ReadSysInfo Platform class reason code not valid
+ * on RISC OS 3.
+ * XXX Don't know about RISC OS 4
+ */
+
+ if (riscosver >= 0x4) {
+ os_readsysinfo_platform_class(, NULL, NULL);
+ if (class != osreadsysinfo_Platform_Pace) {
+ /* reset devices, well try to anyway */
+ service_pre_reset();
+ }
+ } else {
service_pre_reset();
}
CVS commit: src/sys/arch/acorn32/stand/lib
Module Name:src
Committed By: sborrill
Date: Wed Jan 23 14:49:00 UTC 2019
Modified Files:
src/sys/arch/acorn32/stand/lib: riscoscalls.S riscoscalls.h
Log Message:
Add xosmodule_enumeratewithversion() to allow operating systems modules
to be enumerated along with their version numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/acorn32/stand/lib/riscoscalls.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/acorn32/stand/lib/riscoscalls.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/acorn32/stand/lib/riscoscalls.S
diff -u src/sys/arch/acorn32/stand/lib/riscoscalls.S:1.11 src/sys/arch/acorn32/stand/lib/riscoscalls.S:1.12
--- src/sys/arch/acorn32/stand/lib/riscoscalls.S:1.11 Thu Oct 18 19:02:46 2018
+++ src/sys/arch/acorn32/stand/lib/riscoscalls.S Wed Jan 23 14:49:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: riscoscalls.S,v 1.11 2018/10/18 19:02:46 skrll Exp $ */
+/* $NetBSD: riscoscalls.S,v 1.12 2019/01/23 14:49:00 sborrill Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -254,6 +254,36 @@ ENTRY(xosmodule_lookup)
mov r0, #0
ldmdb fp, {r4-r8, fp, sp, pc}
+ENTRY(xosmodule_enumeratewithversion)
+ mov ip, sp
+ stmfd sp!, {r4-r10, fp, ip, lr, pc}
+ sub fp, ip, #4
+ mov r7, r0
+ mov r8, r1
+ mov r9, r2
+ mov r10, r3
+ ldr r1, [r7]
+ ldr r2, [r8]
+ mov r0, #OSModule_EnumerateWithVersion
+ swi XOS_Module
+ ldmdbvs fp, {r4-r10, fp, sp, pc}
+ str r1, [r7]
+ str r2, [r8]
+ teq r9, #0
+ strne r3, [r9]
+ teq r9, #0
+ strne r3, [r9]
+ teq r10, #0
+ strne r4, [r10]
+ ldr r10, [fp, #4]
+ teq r10, #0
+ strne r5, [r10]
+ ldr r10, [fp, #8]
+ teq r10, #0
+ strne r6, [r10]
+ mov r0, #0
+ ldmdb fp, {r4-r10, fp, sp, pc}
+
ENTRY(xosfscontrol_shutdown)
mov ip, sp
stmfd sp!, {fp, ip, lr, pc}
Index: src/sys/arch/acorn32/stand/lib/riscoscalls.h
diff -u src/sys/arch/acorn32/stand/lib/riscoscalls.h:1.12 src/sys/arch/acorn32/stand/lib/riscoscalls.h:1.13
--- src/sys/arch/acorn32/stand/lib/riscoscalls.h:1.12 Thu May 10 10:27:10 2012
+++ src/sys/arch/acorn32/stand/lib/riscoscalls.h Wed Jan 23 14:49:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: riscoscalls.h,v 1.12 2012/05/10 10:27:10 skrll Exp $ */
+/* $NetBSD: riscoscalls.h,v 1.13 2019/01/23 14:49:00 sborrill Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -285,12 +285,15 @@ extern void os_enter_os(void);
#define OSModule_Alloc 6
#define OSModule_Free 7
#define OSModule_Lookup 18
+#define OSModule_EnumerateWithVersion 20
#ifndef __ASSEMBLER__
extern os_error *xosmodule_alloc(int, void **);
extern os_error *xosmodule_free(void *);
extern os_error *xosmodule_lookup(char const *, int *, int *, void **, void **,
char **);
+extern os_error *xosmodule_enumeratewithversion(int *, int *, char **, int *,
+int *, int *);
#endif
#define OSFSControl_AddFS 12
CVS commit: src/libexec/identd
Module Name:src
Committed By: sborrill
Date: Thu Dec 13 13:11:28 UTC 2018
Modified Files:
src/libexec/identd: ipf.c
Log Message:
IPFilter 5 requires you to specify IPv4 or IPv6
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/libexec/identd/ipf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/identd/ipf.c
diff -u src/libexec/identd/ipf.c:1.3 src/libexec/identd/ipf.c:1.4
--- src/libexec/identd/ipf.c:1.3 Sat Dec 10 05:43:11 2016
+++ src/libexec/identd/ipf.c Thu Dec 13 13:11:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipf.c,v 1.3 2016/12/10 05:43:11 christos Exp $ */
+/* $NetBSD: ipf.c,v 1.4 2018/12/13 13:11:28 sborrill Exp $ */
/*
* ipf.c - NAT lookup code for IP Filter.
@@ -8,7 +8,7 @@
*/
#include
-__RCSID("$NetBSD: ipf.c,v 1.3 2016/12/10 05:43:11 christos Exp $");
+__RCSID("$NetBSD: ipf.c,v 1.4 2018/12/13 13:11:28 sborrill Exp $");
#include
#include
@@ -57,6 +57,7 @@ ipf_natlookup(const struct sockaddr_stor
nl.nl_realport = ntohs(csatosin([0])->sin_port);
nl.nl_outport = ntohs(csatosin([1])->sin_port);
nl.nl_flags = IPN_TCP | IPN_IN;
+ nl.nl_v = 4; /* IPv4 */
break;
case AF_INET6:
/* XXX IP Filter doesn't support IPv6 NAT yet. */
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Fri Nov 9 11:29:12 UTC 2018 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1648 To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.11 src/doc/CHANGES-7.3:1.1.2.12 --- src/doc/CHANGES-7.3:1.1.2.11 Tue Oct 30 19:54:56 2018 +++ src/doc/CHANGES-7.3 Fri Nov 9 11:29:12 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.11 2018/10/30 19:54:56 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.12 2018/11/09 11:29:12 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -169,3 +169,35 @@ sys/net/npf/npf_ctl.c1.47 (partial, to be loaded. [sborrill, ticket #1646] +sys/dev/mii/inbmphyreg.h 1.11 +sys/dev/pci/if_wm.c1.586-1.588, 1.590-1.596 via patch +sys/dev/pci/if_wmreg.h1.108 + + - rename tu event counter to txunderrun. + - Try m_defrag() to reduce the number of DMA segment if + bus_dmamap_load_mbuf() returned EFBIG. When m_defrag() + is called, txqNNdefrag event counter is incremented. + If the 2nd try of bus_dmamap_load_mbuf() failed, + txqNNtoomanyseg event counter is incremented. + - Reduce the max number of DMA segments from 256 to 64 (it's + the same value as other BSD's (EM_MAX_SCATTER) and more + than before if_wm.c rev. 1.75's value (40)) because we do + m_defrag() now. + - 82574 and newer document says the status field has neither EC + (Excessive Collision) bit nor LC (Late Collision) bit + (reserved), so don't check the bit. + - Add workaround for DMA hang problem which result in TX device + timeout on PCH_LPT with I218. Same as FreeBSD and Linux. This + workaround is only for device ID 0x155a, 0x15a2, 0x1559 and 0x15a3. + - Fix a PCH2 specific bug that wrong PHY register value can be read + when boot. Same as FreeBSD and Linux. + - After writing MDIC register, don't read quickly the same register + but do delay(50). Same as other OSes. + - Add missing wm_gate_hw_phy_config_ich8lan(false) in + wm_phy_post_reset() on PCH2. wm_gate_hw_phy_config_ich8lan(true) + is called in wm_reset(), so wm_gate_hw_phy_config_ich8lan(false) + should be called after reset in wm_phy_post_reset(). + - On PCH2, set the phy config counter to 50msec after (PHY) reset. + - KNF & Use macro. + [msaitoh, ticket #1648] +
CVS commit: [netbsd-7] src/sys/dev
Module Name:src
Committed By: sborrill
Date: Fri Nov 9 11:28:39 UTC 2018
Modified Files:
src/sys/dev/mii [netbsd-7]: inbmphyreg.h
src/sys/dev/pci [netbsd-7]: if_wm.c if_wmreg.h
Log Message:
Pull up the following revisions(s) (requested by msaitoh in ticket #1648):
sys/dev/mii/inbmphyreg.h1.11
sys/dev/pci/if_wm.c 1.586-1.588, 1.590-1.596 via
patch
sys/dev/pci/if_wmreg.h 1.108
- rename tu event counter to txunderrun.
- Try m_defrag() to reduce the number of DMA segment if bus_dmamap_load_mbuf()
returned EFBIG. When m_defrag() is called, txqNNdefrag event counter is
incremented. If the 2nd try of bus_dmamap_load_mbuf() failed, txqNNtoomanyseg
event counter is incremented.
- Reduce the max number of DMA segments from 256 to 64 (it's the same value
as other BSD's (EM_MAX_SCATTER) and more than before if_wm.c rev. 1.75's
value (40)) because we do m_defrag() now.
- 82574 and newer document says the status field has neither EC
(Excessive Collision) bit nor LC (Late Collision) bit (reserved), so
don't check the bit.
- Add workaround for DMA hang problem which result in TX device timeout
on PCH_LPT with I218. Same as FreeBSD and Linux. This workaround is
only for device ID 0x155a, 0x15a2, 0x1559 and 0x15a3.
- Fix a PCH2 specific bug that wrong PHY register value can be read
when boot. Same as FreeBSD and Linux.
- After writing MDIC register, don't read quickly the same register but
do delay(50). Same as other OSes.
- Add missing wm_gate_hw_phy_config_ich8lan(false) in
wm_phy_post_reset() on PCH2. wm_gate_hw_phy_config_ich8lan(true) is
called in wm_reset(), so wm_gate_hw_phy_config_ich8lan(false) should
be called after reset in wm_phy_post_reset().
- On PCH2, set the phy config counter to 50msec after (PHY) reset.
- KNF & Use macro.
To generate a diff of this commit:
cvs rdiff -u -r1.3.30.2 -r1.3.30.3 src/sys/dev/mii/inbmphyreg.h
cvs rdiff -u -r1.289.2.16 -r1.289.2.17 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.60.2.9 -r1.60.2.10 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/mii/inbmphyreg.h
diff -u src/sys/dev/mii/inbmphyreg.h:1.3.30.2 src/sys/dev/mii/inbmphyreg.h:1.3.30.3
--- src/sys/dev/mii/inbmphyreg.h:1.3.30.2 Sat Aug 11 13:34:21 2018
+++ src/sys/dev/mii/inbmphyreg.h Fri Nov 9 11:28:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: inbmphyreg.h,v 1.3.30.2 2018/08/11 13:34:21 martin Exp $ */
+/* $NetBSD: inbmphyreg.h,v 1.3.30.3 2018/11/09 11:28:39 sborrill Exp $ */
/***
Copyright (c) 2001-2005, Intel Corporation
All rights reserved.
@@ -104,6 +104,10 @@ POSSIBILITY OF SUCH DAMAGE.
#define HV_PM_CTRL BME1000_REG(770, 17)
#define HV_PM_CTRL_K1_ENA __BIT(14)
+#define I217_INBAND_CTRL BME1000_REG(770, 18)
+#define I217_INBAND_CTRL_LINK_STAT_TX_TIMEOUT_MASK 0x3f00
+#define I217_INBAND_CTRL_LINK_STAT_TX_TIMEOUT_SHIFT 8
+
#define IGP3_KMRN_DIAG BME1000_REG(770, 19)
#define IGP3_KMRN_DIAG_PCS_LOCK_LOSS (1 << 1)
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.289.2.16 src/sys/dev/pci/if_wm.c:1.289.2.17
--- src/sys/dev/pci/if_wm.c:1.289.2.16 Tue Oct 30 08:35:56 2018
+++ src/sys/dev/pci/if_wm.c Fri Nov 9 11:28:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.289.2.16 2018/10/30 08:35:56 sborrill Exp $ */
+/* $NetBSD: if_wm.c,v 1.289.2.17 2018/11/09 11:28:39 sborrill Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.16 2018/10/30 08:35:56 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.17 2018/11/09 11:28:39 sborrill Exp $");
#include
#include
@@ -163,11 +163,12 @@ int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX
* of packets, and we go ahead and manage up to 64 (16 for the i82547)
* of them at a time.
*
- * We allow up to 256 (!) DMA segments per packet. Pathological packet
+ * We allow up to 64 (!) DMA segments per packet. Pathological packet
* chains containing many small mbufs have been observed in zero-copy
- * situations with jumbo frames.
+ * situations with jumbo frames. If a mbuf chain has more than 64 DMA segments,
+ * m_defrag() is called to reduce it.
*/
-#define WM_NTXSEGS 256
+#define WM_NTXSEGS 64
#define WM_IFQUEUELEN 256
#define WM_TXQUEUELEN_MAX 64
#define WM_TXQUEUELEN_MAX_82547 16
@@ -366,9 +367,10 @@ struct wm_softc {
struct evcnt sc_ev_txtsopain; /* painful header manip. for TSO */
struct evcnt sc_ev_txseg[WM_NTXSEGS]; /* Tx packets w/ N segments */
- struct evcnt sc_ev_txdrop; /* Tx packets dropped(too many segs) */
-
- struct evcnt sc_ev_tu; /* Tx underrun */
+ struct evcnt sc_ev_txdrop; /* Tx packets dropped(other than txtoomanysegs) */
+ struct evcnt sc_ev_txtoomanysegs; /* Tx
CVS commit: [netbsd-7] src/usr.bin/systat
Module Name:src
Committed By: sborrill
Date: Tue Oct 30 10:54:25 UTC 2018
Modified Files:
src/usr.bin/systat [netbsd-7]: main.c
Log Message:
Pull up the following revisions(s) (requested by mrg in ticket #1639):
usr.bin/systat/main.c: revision 1.52 via patch
Add missing 'b' to the list of options.
Alpha-sort the option handling.
To generate a diff of this commit:
cvs rdiff -u -r1.48.2.1 -r1.48.2.2 src/usr.bin/systat/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/systat/main.c
diff -u src/usr.bin/systat/main.c:1.48.2.1 src/usr.bin/systat/main.c:1.48.2.2
--- src/usr.bin/systat/main.c:1.48.2.1 Mon Sep 4 06:04:06 2017
+++ src/usr.bin/systat/main.c Tue Oct 30 10:54:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.48.2.1 2017/09/04 06:04:06 snj Exp $ */
+/* $NetBSD: main.c,v 1.48.2.2 2018/10/30 10:54:25 sborrill Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: main.c,v 1.48.2.1 2017/09/04 06:04:06 snj Exp $");
+__RCSID("$NetBSD: main.c,v 1.48.2.2 2018/10/30 10:54:25 sborrill Exp $");
#endif /* not lint */
#include
@@ -102,7 +102,7 @@ main(int argc, char **argv)
egid = getegid();
(void)setegid(getgid());
- while ((ch = getopt(argc, argv, "M:N:nw:t:")) != -1)
+ while ((ch = getopt(argc, argv, "M:N:bnw:t:")) != -1)
switch(ch) {
case 'M':
memf = optarg;
@@ -110,19 +110,19 @@ main(int argc, char **argv)
case 'N':
nlistf = optarg;
break;
+ case 'b':
+ bflag = !bflag;
+ break;
case 'n':
nflag = !nflag;
break;
- case 'w':
- if ((naptime = atoi(optarg)) <= 0)
-errx(1, "interval <= 0.");
- break;
case 't':
if ((turns = atoi(optarg)) <= 0)
errx(1, "turns <= 0.");
break;
- case 'b':
- bflag = !bflag;
+ case 'w':
+ if ((naptime = strtod(optarg, NULL)) <= 0)
+errx(1, "interval <= 0.");
break;
case '?':
default:
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Tue Oct 30 10:54:41 UTC 2018 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1639 To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.9 src/doc/CHANGES-7.3:1.1.2.10 --- src/doc/CHANGES-7.3:1.1.2.9 Tue Oct 30 10:17:52 2018 +++ src/doc/CHANGES-7.3 Tue Oct 30 10:54:41 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.9 2018/10/30 10:17:52 sborrill Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.10 2018/10/30 10:54:41 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -106,3 +106,9 @@ sys/arch/pmax/pmax/dec_3min.c 1.74 Addresses PR port-pmax/53611 [tsutsui, #1641] +usr.bin/systat/main.c1.52 via patch + + Add missing 'b' to the list of options. + Alpha-sort the option handling. + [mrg, ticket #1639] +
CVS commit: [netbsd-7] src/sys/arch/pmax/pmax
Module Name:src
Committed By: sborrill
Date: Tue Oct 30 10:17:23 UTC 2018
Modified Files:
src/sys/arch/pmax/pmax [netbsd-7]: dec_3min.c
Log Message:
Pull up the following revisions(s) (requested by tsutsui in ticket #1641):
sys/arch/pmax/pmax/dec_3min.c: revision 1.74
Fix hangup after framebuffers are attached on 3MIN.
Addresses PR port-pmax/53611
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.4.1 src/sys/arch/pmax/pmax/dec_3min.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/pmax/pmax/dec_3min.c
diff -u src/sys/arch/pmax/pmax/dec_3min.c:1.73 src/sys/arch/pmax/pmax/dec_3min.c:1.73.4.1
--- src/sys/arch/pmax/pmax/dec_3min.c:1.73 Mon Mar 24 19:31:40 2014
+++ src/sys/arch/pmax/pmax/dec_3min.c Tue Oct 30 10:17:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.73 2014/03/24 19:31:40 christos Exp $ */
+/* $NetBSD: dec_3min.c,v 1.73.4.1 2018/10/30 10:17:23 sborrill Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -70,7 +70,7 @@
#define __INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.73 2014/03/24 19:31:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.73.4.1 2018/10/30 10:17:23 sborrill Exp $");
#include
#include
@@ -292,12 +292,7 @@ dec_3min_intr_establish(device_t dev, vo
case SYS_DEV_OPT0:
case SYS_DEV_OPT1:
case SYS_DEV_OPT2:
- /* it's an option slot */
- {
- int s = splhigh();
- s |= mask;
- splx(s);
- }
+ /* it's an option slot and handled via MIPS_INT_MASK_[012] */
break;
default:
/* it's a baseboard device going via the IOASIC */
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Tue Oct 30 10:17:52 UTC 2018 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1641 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.8 src/doc/CHANGES-7.3:1.1.2.9 --- src/doc/CHANGES-7.3:1.1.2.8 Tue Oct 30 10:14:55 2018 +++ src/doc/CHANGES-7.3 Tue Oct 30 10:17:52 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.8 2018/10/30 10:14:55 sborrill Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.9 2018/10/30 10:17:52 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -100,3 +100,9 @@ usr.sbin/sysinst/arch/sgimips/md.c 1.5- Make sure to install a bootloader even on upgrade installation. [tsutsui, #1640] +sys/arch/pmax/pmax/dec_3min.c 1.74 + + Fix hangup after framebuffers are attached on 3MIN. + Addresses PR port-pmax/53611 + [tsutsui, #1641] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Tue Oct 30 10:14:55 UTC 2018 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1640 To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.7 src/doc/CHANGES-7.3:1.1.2.8 --- src/doc/CHANGES-7.3:1.1.2.7 Tue Oct 30 10:07:52 2018 +++ src/doc/CHANGES-7.3 Tue Oct 30 10:14:55 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.7 2018/10/30 10:07:52 sborrill Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.8 2018/10/30 10:14:55 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -93,3 +93,10 @@ usr.bin/find/function.c1.77 form part of what is allowed in ARG_MAX. [mrg, ticket #1642] +usr.sbin/sysinst/arch/sgimips/md.c 1.5-1.6 + + PR port-sgimips/53583: fetch kernel name always before using it. + Make the struct utsname local to avoid future similar issues. + Make sure to install a bootloader even on upgrade installation. + [tsutsui, #1640] +
CVS commit: [netbsd-7] src/usr.sbin/sysinst/arch/sgimips
Module Name:src
Committed By: sborrill
Date: Tue Oct 30 10:14:21 UTC 2018
Modified Files:
src/usr.sbin/sysinst/arch/sgimips [netbsd-7]: md.c
Log Message:
Pull up the following revisions(s) (requested by tsutsui in ticket #1640):
usr.sbin/sysinst/arch/sgimips/md.c: revision 1.5-1.6
PR port-sgimips/53583: fetch kernel name always before using it.
Make the struct utsname local to avoid future similar issues.
Make sure to install a bootloader even on upgrade installation.
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/usr.sbin/sysinst/arch/sgimips/md.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.sbin/sysinst/arch/sgimips/md.c
diff -u src/usr.sbin/sysinst/arch/sgimips/md.c:1.2.4.2 src/usr.sbin/sysinst/arch/sgimips/md.c:1.2.4.3
--- src/usr.sbin/sysinst/arch/sgimips/md.c:1.2.4.2 Wed Mar 21 11:42:17 2018
+++ src/usr.sbin/sysinst/arch/sgimips/md.c Tue Oct 30 10:14:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2.4.2 2018/03/21 11:42:17 martin Exp $ */
+/* $NetBSD: md.c,v 1.2.4.3 2018/10/30 10:14:21 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,7 +51,6 @@
#include "msg_defs.h"
#include "menu_defs.h"
-struct utsname instsys;
void
md_init(void)
@@ -61,13 +60,15 @@ md_init(void)
void
md_init_set_status(int flags)
{
+ struct utsname instsys;
+
(void)flags;
/*
* Get the name of the Install Kernel we are running under and
* enable the installation of the corresponding GENERIC kernel.
*/
-uname();
+ uname();
if (strstr(instsys.version, "(INSTALL32_IP3x"))
set_kernel_set(SET_KERNEL_2);
else if (strstr(instsys.version, "(INSTALL32_IP2x"))
@@ -156,7 +157,10 @@ md_pre_disklabel(void)
int
md_post_disklabel(void)
{
-if (strstr(instsys.version, "(INSTALL32_IP3x"))
+ struct utsname instsys;
+ uname();
+
+ if (strstr(instsys.version, "(INSTALL32_IP3x"))
return run_program(RUN_DISPLAY,
"%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip3xboot",
pm->diskdev);
@@ -194,9 +198,12 @@ md_post_extract(void)
void
md_cleanup_install(void)
{
+ struct utsname instsys;
+
#ifndef DEBUG
enable_rc_conf();
#endif
+ uname();
if (strstr(instsys.version, "(GENERIC32_IP12"))
run_program(0, "/usr/mdec/sgivol -f -w netbsd %s %s",
@@ -213,7 +220,7 @@ md_pre_update(void)
int
md_update(void)
{
- md_post_newfs();
+ md_post_disklabel();
return 1;
}
CVS commit: [netbsd-7] src/doc
Module Name:src
Committed By: sborrill
Date: Tue Oct 30 10:07:52 UTC 2018
Modified Files:
src/doc [netbsd-7]: CHANGES-7.3
Log Message:
Ticket #1642
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-7.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-7.3
diff -u src/doc/CHANGES-7.3:1.1.2.6 src/doc/CHANGES-7.3:1.1.2.7
--- src/doc/CHANGES-7.3:1.1.2.6 Tue Oct 30 09:57:05 2018
+++ src/doc/CHANGES-7.3 Tue Oct 30 10:07:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.3,v 1.1.2.6 2018/10/30 09:57:05 sborrill Exp $
+# $NetBSD: CHANGES-7.3,v 1.1.2.7 2018/10/30 10:07:52 sborrill Exp $
A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3
release:
@@ -85,3 +85,11 @@ sys/dev/hpc/hpckbd.c1.33-1.35
Fix kernel crash on hpcmips when console is attached.
[rin, ticket #1638]
+usr.bin/find/function.c1.77
+
+ When calculating the length of the args that can be
+ appended in a "find -exec something {} +"
+ usage, remember to allow for the arg pointers, which
+ form part of what is allowed in ARG_MAX.
+ [mrg, ticket #1642]
+
CVS commit: [netbsd-7] src/usr.bin/find
Module Name:src
Committed By: sborrill
Date: Tue Oct 30 10:07:08 UTC 2018
Modified Files:
src/usr.bin/find [netbsd-7]: function.c
Log Message:
Pull up the following revisions(s) (requested by mrg in ticket #1642):
usr.bin/find/function.c:revision 1.77
When calculating the length of the args that can be
appended in a "find -exec something {} +"
usage, remember to allow for the arg pointers, which
form part of what is allowed in ARG_MAX.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.72.6.1 src/usr.bin/find/function.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/find/function.c
diff -u src/usr.bin/find/function.c:1.72 src/usr.bin/find/function.c:1.72.6.1
--- src/usr.bin/find/function.c:1.72 Sat May 4 06:29:32 2013
+++ src/usr.bin/find/function.c Tue Oct 30 10:07:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: function.c,v 1.72 2013/05/04 06:29:32 uebayasi Exp $ */
+/* $NetBSD: function.c,v 1.72.6.1 2018/10/30 10:07:08 sborrill Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)function.c 8.10 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: function.c,v 1.72 2013/05/04 06:29:32 uebayasi Exp $");
+__RCSID("$NetBSD: function.c,v 1.72.6.1 2018/10/30 10:07:08 sborrill Exp $");
#endif
#endif /* not lint */
@@ -669,7 +669,9 @@ c_exec(char ***argvp, int isok)
size_t c, bufsize;
cnt = ap - *argvp - 1; /* units are words */
- new->ep_maxargs = 5000;
+ new->ep_maxargs = ARG_MAX / (sizeof (char *) + 16);
+ if (new->ep_maxargs > 5000)
+ new->ep_maxargs = 5000;
new->e_argv = emalloc((cnt + new->ep_maxargs)
* sizeof(*new->e_argv));
@@ -690,7 +692,9 @@ c_exec(char ***argvp, int isok)
errx(1, "Arguments too long");
new->e_argv[cnt] = *argv;
}
- bufsize = MAXARG - c;
+ if (c + new->ep_maxargs * sizeof (char *) >= MAXARG)
+ errx(1, "Arguments too long");
+ bufsize = MAXARG - c - new->ep_maxargs * sizeof (char *);
/*
* Allocate, and then initialize current, base, and
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Tue Oct 30 09:57:05 UTC 2018 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1638 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.5 src/doc/CHANGES-7.3:1.1.2.6 --- src/doc/CHANGES-7.3:1.1.2.5 Tue Oct 30 08:36:19 2018 +++ src/doc/CHANGES-7.3 Tue Oct 30 09:57:05 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.5 2018/10/30 08:36:19 sborrill Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.6 2018/10/30 09:57:05 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -80,3 +80,8 @@ sys/dev/pci/if_wm.c1.589 INTx interrupt (Xen dom0 or pre netbsd-8). [msaitoh, ticket #1647] +sys/dev/hpc/hpckbd.c1.33-1.35 + + Fix kernel crash on hpcmips when console is attached. + [rin, ticket #1638] +
CVS commit: [netbsd-7] src/sys/dev/hpc
Module Name:src
Committed By: sborrill
Date: Tue Oct 30 09:56:41 UTC 2018
Modified Files:
src/sys/dev/hpc [netbsd-7]: hpckbd.c
Log Message:
Pull up the following revisions(s) (requested by rin in ticket #1638):
sys/dev/hpc/hpckbd.c: revision 1.33-1.35
Fix kernel crash on hpcmips when console is attached.
To generate a diff of this commit:
cvs rdiff -u -r1.30.12.2 -r1.30.12.3 src/sys/dev/hpc/hpckbd.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/hpc/hpckbd.c
diff -u src/sys/dev/hpc/hpckbd.c:1.30.12.2 src/sys/dev/hpc/hpckbd.c:1.30.12.3
--- src/sys/dev/hpc/hpckbd.c:1.30.12.2 Wed Aug 9 06:48:57 2017
+++ src/sys/dev/hpc/hpckbd.c Tue Oct 30 09:56:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hpckbd.c,v 1.30.12.2 2017/08/09 06:48:57 snj Exp $ */
+/* $NetBSD: hpckbd.c,v 1.30.12.3 2018/10/30 09:56:41 sborrill Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.30.12.2 2017/08/09 06:48:57 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.30.12.3 2018/10/30 09:56:41 sborrill Exp $");
#include
#include
@@ -261,10 +261,11 @@ hpckbd_getevent(struct hpckbd_core* hc,
}
-#ifdef hpcsh
+#if defined(hpcsh) || defined(hpcmips)
/*
- * XXX: Use the old wrong code for now as hpcsh attaches console very
- * early and it's convenient to be able to do early DDB on wscons.
+ * XXX: Use the old wrong code for now as hpcsh and hpcmips attach
+ * console very early when malloc(9) is not yet available. It is
+ * convenient to be able to do early DDB on wscons.
*/
void
hpckbd_keymap_setup(struct hpckbd_core *hc,
@@ -278,8 +279,9 @@ hpckbd_keymap_setup(struct hpckbd_core *
* XXX The way this is done is really wrong. The __UNCONST()
* is a hint as to what is wrong. This actually ends up modifying
* initialized data which is marked "const".
- * The reason we get away with it here is that on sh3 kernel
- * is directly mapped.
+ *
+ * The reason we get away with it here is that on sh3 and mips
+ * the kernel is directly mapped.
*/
desc = (struct wscons_keydesc *)__UNCONST(hpckbd_keymapdata.keydesc);
for (i = 0; desc[i].name != 0; i++) {
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: sborrill Date: Tue Oct 30 09:32:48 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1074 To generate a diff of this commit: cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.41 src/doc/CHANGES-8.1:1.1.2.42 --- src/doc/CHANGES-8.1:1.1.2.41 Tue Oct 30 09:26:05 2018 +++ src/doc/CHANGES-8.1 Tue Oct 30 09:32:48 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.41 2018/10/30 09:26:05 sborrill Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.42 2018/10/30 09:32:48 sborrill Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -1499,3 +1499,16 @@ sys/dev/pci/if_wm.c1.589 INTx interrupt (Xen dom0 or pre netbsd-8). [msaitoh, ticket #1075] +sys/dev/pci/pci_subr.c1.204-1.206 +sys/dev/pci/pcireg.h1.141-1.142 + + Root Complex Event Collector Bus Number Association ECN. + - If capability version is 2 (or greater), decode RCEC + Associated Bus Numbers register. + - Don't print TPH requester's ST Table Size if the ST table + location field is not PCI_TPH_REQ_STTBLLOC_TPHREQ because + the size field is only applicable for + PCI_TPH_REQ_STTBLLOC_TPHREQ case. + - Add comment. + [msaitoh, ticket #1074] +
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: sborrill
Date: Tue Oct 30 09:32:32 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: pci_subr.c pcireg.h
Log Message:
Pull up the following revisions(s) (requested by msaitoh in ticket #1074):
sys/dev/pci/pci_subr.c: revision 1.204-1.206
sys/dev/pci/pcireg.h: revision 1.141-1.142
Root Complex Event Collector Bus Number Association ECN.
- If capability version is 2 (or greater), decode RCEC Associated Bus Numbers
register.
- Don't print TPH requester's ST Table Size if the ST table location field
is not PCI_TPH_REQ_STTBLLOC_TPHREQ because the size field is only applicable
for PCI_TPH_REQ_STTBLLOC_TPHREQ case.
- Add comment.
To generate a diff of this commit:
cvs rdiff -u -r1.183.2.7 -r1.183.2.8 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.130.2.6 -r1.130.2.7 src/sys/dev/pci/pcireg.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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.183.2.7 src/sys/dev/pci/pci_subr.c:1.183.2.8
--- src/sys/dev/pci/pci_subr.c:1.183.2.7 Sun Sep 23 17:40:37 2018
+++ src/sys/dev/pci/pci_subr.c Tue Oct 30 09:32:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.183.2.7 2018/09/23 17:40:37 martin Exp $ */
+/* $NetBSD: pci_subr.c,v 1.183.2.8 2018/10/30 09:32:32 sborrill Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.7 2018/09/23 17:40:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.8 2018/10/30 09:32:32 sborrill Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -3061,6 +3061,18 @@ pci_conf_print_rcec_assoc_cap(const pcir
reg = regs[o2i(extcapoff + PCI_RCEC_ASSOC_ASSOCBITMAP)];
printf("Association Bitmap for Root Complex Integrated Devices:"
" 0x%08x\n", reg);
+
+ if (PCI_EXTCAPLIST_VERSION(regs[o2i(extcapoff)]) >= 2) {
+ reg = regs[o2i(extcapoff + PCI_RCEC_ASSOC_ASSOCBUSNUM)];
+ printf("RCEC Associated Bus Numbers register: 0x%08x\n",
+ reg);
+ printf(" RCEC Next Bus: %u\n",
+ (unsigned int)__SHIFTOUT(reg,
+ PCI_RCEC_ASSOCBUSNUM_RCECNEXT));
+ printf(" RCEC Last Bus: %u\n",
+ (unsigned int)__SHIFTOUT(reg,
+ PCI_RCEC_ASSOCBUSNUM_RCECLAST));
+ }
}
/* XXX pci_conf_print_mfvc_cap */
@@ -3526,7 +3538,7 @@ static void
pci_conf_print_tph_req_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
- int size, i, j;
+ int size = 0, i, j;
uint8_t sttbloc;
printf("\n TPH Requester Extended Capability\n");
@@ -3540,8 +3552,10 @@ pci_conf_print_tph_req_cap(const pcireg_
sttbloc = __SHIFTOUT(reg, PCI_TPH_REQ_CAP_STTBLLOC);
printf(" ST Table Location: %s\n",
pci_conf_print_tph_req_cap_sttabloc(sttbloc));
- size = __SHIFTOUT(reg, PCI_TPH_REQ_CAP_STTBLSIZ) + 1;
- printf(" ST Table Size: %d\n", size);
+ if (sttbloc == PCI_TPH_REQ_STTBLLOC_TPHREQ) {
+ size = __SHIFTOUT(reg, PCI_TPH_REQ_CAP_STTBLSIZ) + 1;
+ printf(" ST Table Size: %d\n", size);
+ }
reg = regs[o2i(extcapoff + PCI_TPH_REQ_CTL)];
printf("TPH Requester Control register: 0x%08x\n", reg);
@@ -4700,19 +4714,19 @@ pci_conf_print(
/* device-dependent header */
printf(" Device-dependent header:\n");
pci_conf_print_regs(regs, endoff, PCI_CONF_SIZE);
- printf("\n");
#ifdef _KERNEL
+ printf("\n");
if (printfn)
(*printfn)(pc, tag, regs);
else
printf("Don't know how to pretty-print device-dependent header.\n");
- printf("\n");
#endif /* _KERNEL */
if (regs[o2i(PCI_EXTCAPLIST_BASE)] == 0x ||
regs[o2i(PCI_EXTCAPLIST_BASE)] == 0)
return;
+ printf("\n");
#ifdef _KERNEL
pci_conf_print_extcaplist(pc, tag, regs);
#else
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.130.2.6 src/sys/dev/pci/pcireg.h:1.130.2.7
--- src/sys/dev/pci/pcireg.h:1.130.2.6 Sun Sep 23 17:40:37 2018
+++ src/sys/dev/pci/pcireg.h Tue Oct 30 09:32:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.130.2.6 2018/09/23 17:40:37 martin Exp $ */
+/* $NetBSD: pcireg.h,v 1.130.2.7 2018/10/30 09:32:32 sborrill Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -1186,8 +1186,8 @@ struct pci_msix_table_entry {
uint32_t pci_msix_vector_control;
};
#define PCI_MSIX_VECTCTL_MASK __BIT(0)
-#define PCI_MSIX_VECTCTL_STLO __BITS(23, 16)
-#define PCI_MSIX_VECTCTL_STUP __BITS(31, 24)
+#define PCI_MSIX_VECTCTL_STLO __BITS(23, 16) /* ST lower */
+#define PCI_MSIX_VECTCTL_STUP __BITS(31, 24) /* ST upper */
/* Max number of MSI-X vectors. See PCI-SIG specification. */
#define PCI_MSIX_MAX_VECTORS 2048
@@ -1699,7 +1699,10 @@ struct pci_rom {
* Extended capability ID: 0x0007
* Root Complex Event Collector Association
*/
-#define PCI_RCEC_ASSOC_ASSOCBITMAP 0x04
+#define PCI_RCEC_ASSOC_ASSOCBITMAP 0x04 /* Association Bitmap */
+#define PCI_RCEC_ASSOC_ASSOCBUSNUM 0x08 /* Associcated Bus Number */
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: sborrill Date: Tue Oct 30 09:26:05 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1075 To generate a diff of this commit: cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.40 src/doc/CHANGES-8.1:1.1.2.41 --- src/doc/CHANGES-8.1:1.1.2.40 Fri Oct 26 15:14:46 2018 +++ src/doc/CHANGES-8.1 Tue Oct 30 09:26:05 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.40 2018/10/26 15:14:46 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.41 2018/10/30 09:26:05 sborrill Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -1493,4 +1493,9 @@ tools/Makefile.gnuhost(apply patch) standards, and this version of gcc has not been adapted. [maya, ticket #1070] +sys/dev/pci/if_wm.c1.589 + + Fix KASSERT to prevent panic on CNP(Intel 300 series + I219) with + INTx interrupt (Xen dom0 or pre netbsd-8). + [msaitoh, ticket #1075]
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: sborrill
Date: Tue Oct 30 09:25:13 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c
Log Message:
Pull up the following revisions(s) (requested by msaitoh in ticket #1075):
sys/dev/pci/if_wm.c:revision 1.589
Fix KASSERT to prevent panic on CNP (Intel 300 series + I219) with INTx
interrupt (Xen dom0 or pre netbsd-8)
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.23 -r1.508.4.24 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.23 src/sys/dev/pci/if_wm.c:1.508.4.24
--- src/sys/dev/pci/if_wm.c:1.508.4.23 Sun Sep 23 17:39:02 2018
+++ src/sys/dev/pci/if_wm.c Tue Oct 30 09:25:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.23 2018/09/23 17:39:02 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.24 2018/10/30 09:25:13 sborrill Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.23 2018/09/23 17:39:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.24 2018/10/30 09:25:13 sborrill Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -14789,7 +14789,8 @@ wm_legacy_irq_quirk_spt(struct wm_softc
DPRINTF(WM_DEBUG_INIT, ("%s: %s called\n",
device_xname(sc->sc_dev), __func__));
- KASSERT(sc->sc_type == WM_T_PCH_SPT);
+ KASSERT((sc->sc_type == WM_T_PCH_SPT)
+ || (sc->sc_type == WM_T_PCH_CNP));
reg = CSR_READ(sc, WMREG_FEXTNVM7);
reg |= FEXTNVM7_SIDE_CLK_UNGATE;
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Tue Oct 30 08:36:19 UTC 2018 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1647 To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.4 src/doc/CHANGES-7.3:1.1.2.5 --- src/doc/CHANGES-7.3:1.1.2.4 Mon Oct 15 08:05:43 2018 +++ src/doc/CHANGES-7.3 Tue Oct 30 08:36:19 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.4 2018/10/15 08:05:43 sborrill Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.5 2018/10/30 08:36:19 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -74,3 +74,9 @@ sbin/gpt/gpt.c 1.76 Should fix PR 53668. [mlelstv, ticket #1643] +sys/dev/pci/if_wm.c1.589 + + Fix KASSERT to prevent panic on CNP(Intel 300 series + I219) with + INTx interrupt (Xen dom0 or pre netbsd-8). + [msaitoh, ticket #1647] +
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: sborrill
Date: Tue Oct 30 08:35:56 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-7]: if_wm.c
Log Message:
Pull up the following revisions(s) (requested by msaitoh in ticket #1647):
sys/dev/pci/if_wm.c:revision 1.589
Fix KASSERT to prevent panic on CNP (Intel 300 series + I219) with INTx
interrupt (Xen dom0 or pre netbsd-8)
To generate a diff of this commit:
cvs rdiff -u -r1.289.2.15 -r1.289.2.16 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.289.2.15 src/sys/dev/pci/if_wm.c:1.289.2.16
--- src/sys/dev/pci/if_wm.c:1.289.2.15 Sat Aug 11 13:34:20 2018
+++ src/sys/dev/pci/if_wm.c Tue Oct 30 08:35:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.289.2.15 2018/08/11 13:34:20 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.289.2.16 2018/10/30 08:35:56 sborrill Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.15 2018/08/11 13:34:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.16 2018/10/30 08:35:56 sborrill Exp $");
#include
#include
@@ -12523,7 +12523,8 @@ wm_legacy_irq_quirk_spt(struct wm_softc
DPRINTF(WM_DEBUG_INIT, ("%s: %s called\n",
device_xname(sc->sc_dev), __func__));
- KASSERT(sc->sc_type == WM_T_PCH_SPT);
+ KASSERT((sc->sc_type == WM_T_PCH_SPT)
+ || (sc->sc_type == WM_T_PCH_CNP));
reg = CSR_READ(sc, WMREG_FEXTNVM7);
reg |= FEXTNVM7_SIDE_CLK_UNGATE;
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Mon Oct 15 08:05:43 UTC 2018 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.3 src/doc/CHANGES-7.3:1.1.2.4 --- src/doc/CHANGES-7.3:1.1.2.3 Mon Oct 15 07:56:09 2018 +++ src/doc/CHANGES-7.3 Mon Oct 15 08:05:43 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.3 2018/10/15 07:56:09 sborrill Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.4 2018/10/15 08:05:43 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -68,7 +68,7 @@ usr.sbin/cpuctl/arch/i386.c 1.71,1.75- - Use aprint_error_dev() for error output. [msaitoh, ticket #1636] -sbin/gpt/gpt.c 1.76 +sbin/gpt/gpt.c 1.76 When changing entries skip those that do not match the -L option. Should fix PR 53668.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: sborrill Date: Mon Oct 15 08:04:20 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1063 To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.34 src/doc/CHANGES-8.1:1.1.2.35 --- src/doc/CHANGES-8.1:1.1.2.34 Mon Oct 15 03:13:46 2018 +++ src/doc/CHANGES-8.1 Mon Oct 15 08:04:20 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.34 2018/10/15 03:13:46 snj Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.35 2018/10/15 08:04:20 sborrill Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -1396,3 +1396,9 @@ etc/mtree/NetBSD.dist.base 1.178-1.179 Add unbound /var/chroot/unbound/var/run. [hannken, ticket #1062] +sbin/gpt/gpt.c 1.76 + + When changing entries, skip those that do not match the -L option. + Should fix PR 53668. + [mlelstv, ticket #1063] +
CVS commit: [netbsd-8] src/sbin/gpt
Module Name:src
Committed By: sborrill
Date: Mon Oct 15 08:04:04 UTC 2018
Modified Files:
src/sbin/gpt [netbsd-8]: gpt.c
Log Message:
Pull up the following revisions(s) (requested by mlelstv in ticket #1063):
sbin/gpt/gpt.c: revision 1.76
When changing entries, skip those that do not match the -L option.
Should fix PR 53668.
To generate a diff of this commit:
cvs rdiff -u -r1.70.4.2 -r1.70.4.3 src/sbin/gpt/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.70.4.2 src/sbin/gpt/gpt.c:1.70.4.3
--- src/sbin/gpt/gpt.c:1.70.4.2 Fri May 4 16:24:46 2018
+++ src/sbin/gpt/gpt.c Mon Oct 15 08:04:04 2018
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.70.4.2 2018/05/04 16:24:46 martin Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.70.4.3 2018/10/15 08:04:04 sborrill Exp $");
#endif
#include
@@ -1043,7 +1043,7 @@ gpt_change_ent(gpt_t gpt, const struct g
utf16_to_utf8(ent->ent_name,
__arraycount(ent->ent_name),
utfbuf, __arraycount(utfbuf));
- if (strcmp((char *)find->label, (char *)utfbuf) == 0)
+ if (strcmp((char *)find->label, (char *)utfbuf) != 0)
continue;
}
CVS commit: [netbsd-7] src/sbin/gpt
Module Name:src
Committed By: sborrill
Date: Mon Oct 15 07:55:50 UTC 2018
Modified Files:
src/sbin/gpt [netbsd-7]: gpt.c
Log Message:
Pull up the following revisions(s) (requested by mlelstv in ticket #1643):
sbin/gpt/gpt.c: revision 1.76
When changing entries skip those that do not match the -L option.
Should fix PR 53668.
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.2 -r1.28.2.3 src/sbin/gpt/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.28.2.2 src/sbin/gpt/gpt.c:1.28.2.3
--- src/sbin/gpt/gpt.c:1.28.2.2 Mon Aug 13 16:12:12 2018
+++ src/sbin/gpt/gpt.c Mon Oct 15 07:55:49 2018
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.28.2.2 2018/08/13 16:12:12 martin Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.28.2.3 2018/10/15 07:55:49 sborrill Exp $");
#endif
#include
@@ -1043,7 +1043,7 @@ gpt_change_ent(gpt_t gpt, const struct g
utf16_to_utf8(ent->ent_name,
__arraycount(ent->ent_name),
utfbuf, __arraycount(utfbuf));
- if (strcmp((char *)find->label, (char *)utfbuf) == 0)
+ if (strcmp((char *)find->label, (char *)utfbuf) != 0)
continue;
}
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Mon Oct 15 07:56:09 UTC 2018 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1643 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.2 src/doc/CHANGES-7.3:1.1.2.3 --- src/doc/CHANGES-7.3:1.1.2.2 Tue Oct 9 15:54:57 2018 +++ src/doc/CHANGES-7.3 Mon Oct 15 07:56:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.2 2018/10/09 15:54:57 snj Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.3 2018/10/15 07:56:09 sborrill Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -68,3 +68,9 @@ usr.sbin/cpuctl/arch/i386.c 1.71,1.75- - Use aprint_error_dev() for error output. [msaitoh, ticket #1636] +sbin/gpt/gpt.c 1.76 + + When changing entries skip those that do not match the -L option. + Should fix PR 53668. + [mlelstv, ticket #1643] +
CVS commit: src/doc
Module Name:src Committed By: sborrill Date: Wed Aug 1 08:54:49 UTC 2018 Modified Files: src/doc: TODO.npf Log Message: Note that mss clamping should be improved To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/doc/TODO.npf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.npf diff -u src/doc/TODO.npf:1.4 src/doc/TODO.npf:1.5 --- src/doc/TODO.npf:1.4 Tue Jul 31 20:33:06 2018 +++ src/doc/TODO.npf Wed Aug 1 08:54:48 2018 @@ -55,3 +55,6 @@ Another TODO list is available here: But it's not a big problem - perhaps we don't care at all. -- add command line variables. See -D option in pf. + +-- improve mss clamping, as explained here: + http://mail-index.netbsd.org/tech-net/2017/01/15/msg006224.html
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: sborrill Date: Mon Jul 16 13:33:04 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.0 Log Message: Ticket #924 To generate a diff of this commit: cvs rdiff -u -r1.1.2.229 -r1.1.2.230 src/doc/CHANGES-8.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-8.0 diff -u src/doc/CHANGES-8.0:1.1.2.229 src/doc/CHANGES-8.0:1.1.2.230 --- src/doc/CHANGES-8.0:1.1.2.229 Mon Jul 16 13:21:39 2018 +++ src/doc/CHANGES-8.0 Mon Jul 16 13:33:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.0,v 1.1.2.229 2018/07/16 13:21:39 sborrill Exp $ +# $NetBSD: CHANGES-8.0,v 1.1.2.230 2018/07/16 13:33:04 sborrill Exp $ A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04 until the 8.0 release: @@ -14272,3 +14272,12 @@ etc/Makefile.params1.20 in MKREPRO=yes builds. [martin, ticket #923] +crypto/external/bsd/heimdal/lib/libheimntlm/Makefile 1.3 +crypto/external/bsd/heimdal/lib/libkdc/Makefile 1.4 +crypto/external/bsd/heimdal/lib/libgssapi/Makefile 1.5 +crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile 1.5 + + Improve MKREPRO builds for architectures with compat (like + amd64). + [martin, ticket #924] +
CVS commit: [netbsd-8] src/crypto/external/bsd/heimdal/lib
Module Name:src
Committed By: sborrill
Date: Mon Jul 16 13:32:27 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi [netbsd-8]: Makefile
src/crypto/external/bsd/heimdal/lib/libheimntlm [netbsd-8]: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5srv [netbsd-8]: Makefile
src/crypto/external/bsd/heimdal/lib/libkdc [netbsd-8]: Makefile
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #924):
crypto/external/bsd/heimdal/lib/libheimntlm/Makefile: revision 1.3
crypto/external/bsd/heimdal/lib/libkdc/Makefile:revision 1.4
crypto/external/bsd/heimdal/lib/libgssapi/Makefile: revision 1.5
crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile: revision 1.5
Improve MKREPRO builds for architectures with compat (like amd64).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.16.1 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.2 -r1.2.18.1 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
cvs rdiff -u -r1.3 -r1.3.4.1 \
src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
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/heimdal/lib/libgssapi/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.4.16.1
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.4 Thu Apr 24 13:50:53 2014
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile Mon Jul 16 13:32:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/04/24 13:50:53 pettai Exp $
+# $NetBSD: Makefile,v 1.4.16.1 2018/07/16 13:32:27 sborrill Exp $
USE_FORT?= yes# network protocol library
@@ -17,6 +17,7 @@ LIBDPLIBS+= krb5 ${HEIMBASE}/lib/libkrb
asn1 ${HEIMBASE}/lib/libasn1 \
com_err ${HEIMBASE}/lib/libcom_err \
roken ${HEIMBASE}/lib/libroken \
+ heimbase ${HEIMBASE}/lib/libheimbase \
heimntlm ${HEIMBASE}/lib/libheimntlm \
crypto ${SSLBASE}/lib/libcrypto
Index: src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2.18.1
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2 Wed Sep 11 23:04:09 2013
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile Mon Jul 16 13:32:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
+# $NetBSD: Makefile,v 1.2.18.1 2018/07/16 13:32:27 sborrill Exp $
USE_FORT?= yes # cryptographic software
@@ -15,7 +15,8 @@ LIBDPLIBS+= asn1 ${.CURDIR}/../libasn1 \
com_err ${.CURDIR}/../libcom_err \
crypto ${SSLBASE}/lib/libcrypto \
krb5 ${.CURDIR}/../libkrb5 \
- roken ${.CURDIR}/../libroken
+ roken ${.CURDIR}/../libroken \
+ wind ${.CURDIR}/../libwind
HEIMSRCS= ntlm_err.et ntlm.c
Index: src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4.4.1
--- src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4 Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile Mon Jul 16 13:32:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2018/07/16 13:32:27 sborrill Exp $
USE_FORT?= yes # network protocol library
@@ -15,7 +15,8 @@ CPPFLAGS+= -I${HEIMDIST}/lib/krb5
LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
com_err ${.CURDIR}/../libcom_err \
hdb ${.CURDIR}/../libhdb \
- roken ${.CURDIR}/../libroken
+ roken ${.CURDIR}/../libroken \
+ heimbase ${.CURDIR}/../libheimbase
HEIMSRCS= kadm5_err.et
Index: src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3.4.1
--- src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3 Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkdc/Makefile Mon Jul 16 13:32:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2018/07/16 13:32:27 sborrill Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -15,6 +15,7 @@ LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5
hdb ${.CURDIR}/../libhdb \
hx509 ${.CURDIR}/../libhx509 \
asn1 ${.CURDIR}/../libasn1 \
+ heimbase ${.CURDIR}/../libheimbase \
heimntlm ${.CURDIR}/../libheimntlm \
roken ${.CURDIR}/../libroken
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: sborrill Date: Mon Jul 16 13:21:39 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.0 Log Message: Ticket #923 To generate a diff of this commit: cvs rdiff -u -r1.1.2.228 -r1.1.2.229 src/doc/CHANGES-8.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-8.0 diff -u src/doc/CHANGES-8.0:1.1.2.228 src/doc/CHANGES-8.0:1.1.2.229 --- src/doc/CHANGES-8.0:1.1.2.228 Sun Jul 15 11:03:13 2018 +++ src/doc/CHANGES-8.0 Mon Jul 16 13:21:39 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.0,v 1.1.2.228 2018/07/15 11:03:13 martin Exp $ +# $NetBSD: CHANGES-8.0,v 1.1.2.229 2018/07/16 13:21:39 sborrill Exp $ A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04 until the 8.0 release: @@ -14266,3 +14266,9 @@ crypto/external/bsd/openssh/dist/ssh-age related libraries. [sevan, ticket #922] +etc/Makefile.params1.20 + + Drop output for MAKECONF MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE + in MKREPRO=yes builds. + [martin, ticket #923] +
CVS commit: [netbsd-8] src/etc
Module Name:src
Committed By: sborrill
Date: Mon Jul 16 13:21:09 UTC 2018
Modified Files:
src/etc [netbsd-8]: Makefile.params
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #923):
etc/Makefile.params:revision 1.20
Drop output for MAKECONF MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE
in MKREPRO=yes builds.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.4.1 src/etc/Makefile.params
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.17 src/etc/Makefile.params:1.17.4.1
--- src/etc/Makefile.params:1.17 Tue Jan 24 17:54:52 2017
+++ src/etc/Makefile.params Mon Jul 16 13:21:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.params,v 1.17 2017/01/24 17:54:52 christos Exp $
+# $NetBSD: Makefile.params,v 1.17.4.1 2018/07/16 13:21:09 sborrill Exp $
#
# Makefile fragment for printing build parameters.
#
@@ -39,8 +39,7 @@
RELEASEVARS= DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \
- MACHINE MACHINE_ARCH MAKECONF \
- MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \
+ MACHINE MACHINE_ARCH \
NOCLEANDIR NODISTRIBDIRS NOINCLUDES \
TOOLCHAIN_MISSING \
USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
@@ -50,7 +49,8 @@ RELEASEVARS= DISTRIBVER EXTERNAL_TOOLCHA
.if ${MKREPRO:Uno} != "yes"
RELEASEVARS+= BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \
DESTDIR KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR MAKE \
- MAKEFLAGS NBUILDJOBS NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
+ MAKECONF MAKEFLAGS MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \
+ NBUILDJOBS NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
RELEASEDIR RELEASEMACHINEDIR TOOLDIR USR_OBJMACHINE X11SRCDIR
.endif
CVS commit: src/sys/arch
Module Name:src Committed By: sborrill Date: Mon Feb 19 13:02:47 UTC 2018 Modified Files: src/sys/arch/amd64/include: param.h src/sys/arch/i386/include: param.h Log Message: Double size of MSGBUFSIZE as existing value is not big enough to hold boot dmesg on modern server-class hardware with lots of CPUs, etc. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/amd64/include/param.h cvs rdiff -u -r1.82 -r1.83 src/sys/arch/i386/include/param.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/amd64/include/param.h diff -u src/sys/arch/amd64/include/param.h:1.23 src/sys/arch/amd64/include/param.h:1.24 --- src/sys/arch/amd64/include/param.h:1.23 Thu Jan 11 10:30:26 2018 +++ src/sys/arch/amd64/include/param.h Mon Feb 19 13:02:47 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.23 2018/01/11 10:30:26 maxv Exp $ */ +/* $NetBSD: param.h,v 1.24 2018/02/19 13:02:47 sborrill Exp $ */ #ifdef __x86_64__ @@ -65,7 +65,7 @@ #define USPACE (UPAGES * NBPG) /* total size of u-area */ #ifndef MSGBUFSIZE -#define MSGBUFSIZE (8*NBPG) /* default message buffer size */ +#define MSGBUFSIZE (16*NBPG) /* default message buffer size */ #endif /* Index: src/sys/arch/i386/include/param.h diff -u src/sys/arch/i386/include/param.h:1.82 src/sys/arch/i386/include/param.h:1.83 --- src/sys/arch/i386/include/param.h:1.82 Sat Jul 29 13:05:15 2017 +++ src/sys/arch/i386/include/param.h Mon Feb 19 13:02:47 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.82 2017/07/29 13:05:15 maxv Exp $ */ +/* $NetBSD: param.h,v 1.83 2018/02/19 13:02:47 sborrill Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -108,7 +108,7 @@ #define INTRSTACKSIZE 8192 #ifndef MSGBUFSIZE -#define MSGBUFSIZE (8*NBPG) /* default message buffer size */ +#define MSGBUFSIZE (16*NBPG) /* default message buffer size */ #endif /*
CVS commit: src/sys/dev/pci
Module Name:src Committed By: sborrill Date: Thu Jan 25 16:02:12 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Marvell Yukon 88E8040T To generate a diff of this commit: cvs rdiff -u -r1.1306 -r1.1307 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1306 src/sys/dev/pci/pcidevs:1.1307 --- src/sys/dev/pci/pcidevs:1.1306 Wed Jan 24 22:23:51 2018 +++ src/sys/dev/pci/pcidevs Thu Jan 25 16:02:12 2018 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1306 2018/01/24 22:23:51 sevan Exp $ +$NetBSD: pcidevs,v 1.1307 2018/01/25 16:02:12 sborrill Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2491,6 +2491,7 @@ product MARVELL YUKON_8036 0x4351 Yukon product MARVELL YUKON_8038 0x4352 Yukon 88E8038 product MARVELL YUKON_8039 0x4353 Yukon 88E8039 product MARVELL YUKON_8040 0x4354 Yukon 88E8040 +product MARVELL YUKON_8040T 0x4355 Yukon 88E8040T product MARVELL YUKON_C033 0x4356 Yukon 88EC033 product MARVELL YUKON_8052 0x4360 Yukon 88E8052 product MARVELL YUKON_8050 0x4361 Yukon 88E8050
CVS commit: src/sbin/gpt
Module Name:src Committed By: sborrill Date: Mon Jan 15 12:20:47 UTC 2018 Modified Files: src/sbin/gpt: gpt.8 Log Message: Explain what suffixes are accepted when specifying a size. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 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.56 src/sbin/gpt/gpt.8:1.57 --- src/sbin/gpt/gpt.8:1.56 Tue Oct 3 06:55:04 2017 +++ src/sbin/gpt/gpt.8 Mon Jan 15 12:20:47 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: gpt.8,v 1.56 2017/10/03 06:55:04 mlelstv Exp $ +.\" $NetBSD: gpt.8,v 1.57 2018/01/15 12:20:47 sborrill Exp $ .\" .\" Copyright (c) 2002 Marcel Moolenaar .\" All rights reserved. @@ -26,7 +26,7 @@ .\" .\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $ .\" -.Dd August 3, 2017 +.Dd January 15, 2018 .Dt GPT 8 .Os .Sh NAME @@ -154,6 +154,15 @@ 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 +.Sq b +to denote bytes, +.Sq k +to denote kilobytes, +.Sq m +to denote megabytes and +.Sq g +to denote gigabytes. The minimum size is 1 sector. .Pp The @@ -465,6 +474,15 @@ 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 +.Sq b +to denote bytes, +.Sq k +to denote kilobytes, +.Sq m +to denote megabytes and +.Sq g +to denote gigabytes. The minimum size is 1 sector. If the .Fl a @@ -494,6 +512,15 @@ 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 +.Sq b +to denote bytes, +.Sq k +to denote kilobytes, +.Sq m +to denote megabytes and +.Sq g +to denote gigabytes. Using the .Fl s option allows you to move the backup copy prior to resizing the medium.
CVS commit: src/sbin/resize_ffs
Module Name:src
Committed By: sborrill
Date: Thu Sep 28 17:07:20 UTC 2017
Modified Files:
src/sbin/resize_ffs: resize_ffs.c
Log Message:
Fix the most obvious integer overflow errors which can lead to superblock
corruption. Thanks to riastradh@
For example:
# df /data
Filesystem1K-blocks Used Avail %Cap Mounted on
/dev/ccd0d -19974939099004 -19982708701532 -737868756431824584 0% /data
# dumpfs -s /dev/rccd0d
file system: /dev/rccd0d
format FFSv2
endian little-endian
location 65536 (-b 128)
magic 19540119timeThu Sep 28 13:18:10 2017
superblock location 65536 id [ 595fa4a5 3363fe37 ]
cylgrp dynamic inodes FFSv2 sblock FFSv2 fslevel 5
nbfree 242773148 ndir211185 nifree 650798800 nffree
215448
ncg 13933 size2647654400 blocks -4993734774751
bsize 32768 shift 15 mask0x8000
fsize 4096shift 12 mask0xf000
frag8 shift 3 fsbtodb 3
bpg 23754 fpg 190032 ipg 46848
minfree 5% optim timemaxcontig 2 maxbpg 4096
symlinklen 120 contigsumsize 2
maxfilesize 0x000800800805
nindir 4096inopb 128
avgfilesize 16384 avgfpdir 64
sblkno 24 cblkno 32 iblkno 40 dblkno 2968
sbsize 4096cgsize 32768
csaddr 35792 cssize 225280
cgrotor 0 fmod0 ronly 0 clean 0x01
wapbl version 0x1 location 2 flags 0x0
wapbl loc0 6354693888 loc1 131072 loc2 512loc3 3
flags none
fsmnt /data
volname swuid 0
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sbin/resize_ffs/resize_ffs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/resize_ffs/resize_ffs.c
diff -u src/sbin/resize_ffs/resize_ffs.c:1.47 src/sbin/resize_ffs/resize_ffs.c:1.48
--- src/sbin/resize_ffs/resize_ffs.c:1.47 Wed Aug 24 07:44:05 2016
+++ src/sbin/resize_ffs/resize_ffs.c Thu Sep 28 17:07:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: resize_ffs.c,v 1.47 2016/08/24 07:44:05 dholland Exp $ */
+/* $NetBSD: resize_ffs.c,v 1.48 2017/09/28 17:07:20 sborrill Exp $ */
/* From sources sent on February 17, 2003 */
/*-
* As its sole author, I explicitly place this code in the public
@@ -36,7 +36,7 @@
*/
#include
-__RCSID("$NetBSD: resize_ffs.c,v 1.47 2016/08/24 07:44:05 dholland Exp $");
+__RCSID("$NetBSD: resize_ffs.c,v 1.48 2017/09/28 17:07:20 sborrill Exp $");
#include
#include
@@ -462,10 +462,10 @@ static void
initcg(int cgn)
{
struct cg *cg; /* The in-core cg, of course */
- int base; /* Disk address of cg base */
- int dlow; /* Size of pre-cg data area */
- int dhigh; /* Offset of post-inode data area, from base */
- int dmax; /* Offset of end of post-inode data area */
+ int64_t base; /* Disk address of cg base */
+ int64_t dlow; /* Size of pre-cg data area */
+ int64_t dhigh; /* Offset of post-inode data area, from base */
+ int64_t dmax; /* Offset of end of post-inode data area */
int i; /* Generic loop index */
int n; /* Generic count */
int start; /* start of cg maps */
@@ -896,10 +896,10 @@ recompute_fs_dsize(void)
newsb->fs_dsize = 0;
for (i = 0; i < newsb->fs_ncg; i++) {
- int dlow; /* size of before-sb data area */
- int dhigh; /* offset of post-inode data area */
- int dmax; /* total size of cg */
- int base; /* base of cg, since cgsblock() etc add it in */
+ int64_t dlow; /* size of before-sb data area */
+ int64_t dhigh; /* offset of post-inode data area */
+ int64_t dmax; /* total size of cg */
+ int64_t base; /* base of cg, since cgsblock() etc add it in */
base = cgbase(newsb, i);
dlow = cgsblock(newsb, i) - base;
dhigh = cgdmin(newsb, i) - base;
@@ -1365,7 +1365,7 @@ fragmove(struct cg * cg, int base, unsig
static void
evict_data(struct cg * cg, unsigned int minfrag, int nfrag)
{
- int base; /* base of cg (in frags from beginning of fs) */
+ int64_t base; /* base of cg (in frags from beginning of fs) */
base = cgbase(oldsb, cg->cg_cgx);
/* Does the boundary fall in the middle of a block? To avoid
@@ -1781,10 +1781,10 @@ shrink(void)
csum_fixup();
/* Evict data from any cgs being wholly eliminated */
for (i = newsb->fs_ncg; i < oldsb->fs_ncg; i++) {
- int base;
- int dlow;
- int dhigh;
- int dmax;
+ int64_t base;
+ int64_t dlow;
+ int64_t dhigh;
+ int64_t dmax;
base = cgbase(oldsb, i);
dlow = cgsblock(oldsb, i) - base;
dhigh = cgdmin(oldsb, i) - base;
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: sborrill Date: Wed Jul 12 18:52:40 UTC 2017 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.1 Log Message: Ticket #1412 To generate a diff of this commit: cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-7.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.1 diff -u src/doc/CHANGES-7.1.1:1.1.2.15 src/doc/CHANGES-7.1.1:1.1.2.16 --- src/doc/CHANGES-7.1.1:1.1.2.15 Wed Jul 12 15:36:25 2017 +++ src/doc/CHANGES-7.1.1 Wed Jul 12 18:52:40 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.1,v 1.1.2.15 2017/07/12 15:36:25 martin Exp $ +# $NetBSD: CHANGES-7.1.1,v 1.1.2.16 2017/07/12 18:52:40 sborrill Exp $ A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1 release: @@ -1697,3 +1697,14 @@ crypto/external/bsd/heimdal/dist/lib/krb Identified by Jeffrey Altman, Viktor Duchovni and Nico Williams. [christos, ticket #1453] +sys/external/bsd/ipf/netinet/fil.c 1.20 +sys/external/bsd/ipf/netinet/ip_state.c 1.7 +sys/external/bsd/ipf/netinet/ip_frag.c 1.5 + + Disconnect maintaining fragment state from keeping session state. + The user now must specify keep frags along with keep state to have + ipfilter do what it did before, as documented in ipf.conf.5. + Free the right fragment. This will cause use after free issues and + eventually panic. + [christos, ticket #1412] +
CVS commit: [netbsd-7-1] src/sys/external/bsd/ipf/netinet
Module Name:src
Committed By: sborrill
Date: Wed Jul 12 18:50:44 UTC 2017
Modified Files:
src/sys/external/bsd/ipf/netinet [netbsd-7-1]: fil.c ip_frag.c
ip_state.c
Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1412):
sys/external/bsd/ipf/netinet/fil.c: revision 1.20
sys/external/bsd/ipf/netinet/ip_state.c:revision 1.7
sys/external/bsd/ipf/netinet/ip_frag.c: revision 1.5
Disconnect maintaining fragment state from keeping session state. The user
now must specify keep frags along with keep state to have ipfilter do what
it did before, as documented in ipf.conf.5.
Free the right fragment. This will cause use after free issues and eventually
panic.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.2 -r1.15.2.2.4.1 src/sys/external/bsd/ipf/netinet/fil.c
cvs rdiff -u -r1.3 -r1.3.24.1 src/sys/external/bsd/ipf/netinet/ip_frag.c
cvs rdiff -u -r1.6 -r1.6.16.1 src/sys/external/bsd/ipf/netinet/ip_state.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/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.2 src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.2.4.1
--- src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.2 Fri Apr 29 19:00:40 2016
+++ src/sys/external/bsd/ipf/netinet/fil.c Wed Jul 12 18:50:44 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $ */
+/* $NetBSD: fil.c,v 1.15.2.2.4.1 2017/07/12 18:50:44 sborrill Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
#if !defined(lint)
#if defined(__NetBSD__)
#include
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.2.4.1 2017/07/12 18:50:44 sborrill Exp $");
#else
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -2689,7 +2689,7 @@ ipf_firewall(fr_info_t *fin, u_32_t *pas
* If the rule has "keep frag" and the packet is actually a fragment,
* then create a fragment state entry.
*/
- if ((pass & (FR_KEEPFRAG|FR_KEEPSTATE)) == FR_KEEPFRAG) {
+ if (pass & FR_KEEPFRAG) {
if (fin->fin_flx & FI_FRAG) {
if (ipf_frag_new(softc, fin, pass) == -1) {
LBUMP(ipf_stats[out].fr_bnfr);
Index: src/sys/external/bsd/ipf/netinet/ip_frag.c
diff -u src/sys/external/bsd/ipf/netinet/ip_frag.c:1.3 src/sys/external/bsd/ipf/netinet/ip_frag.c:1.3.24.1
--- src/sys/external/bsd/ipf/netinet/ip_frag.c:1.3 Sun Jul 22 14:27:51 2012
+++ src/sys/external/bsd/ipf/netinet/ip_frag.c Wed Jul 12 18:50:44 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_frag.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ip_frag.c,v 1.3.24.1 2017/07/12 18:50:44 sborrill Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -87,7 +87,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_frag.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_frag.c,v 1.3.24.1 2017/07/12 18:50:44 sborrill Exp $");
#else
static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_frag.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
@@ -468,7 +468,7 @@ ipfr_frag_new(
IPFR_CMPSZ)) {
RWLOCK_EXIT(lock);
FBUMPD(ifs_exists);
- KFREE(fra);
+ KFREE(fran);
return NULL;
}
Index: src/sys/external/bsd/ipf/netinet/ip_state.c
diff -u src/sys/external/bsd/ipf/netinet/ip_state.c:1.6 src/sys/external/bsd/ipf/netinet/ip_state.c:1.6.16.1
--- src/sys/external/bsd/ipf/netinet/ip_state.c:1.6 Sat Sep 14 12:16:11 2013
+++ src/sys/external/bsd/ipf/netinet/ip_state.c Wed Jul 12 18:50:44 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_state.c,v 1.6 2013/09/14 12:16:11 martin Exp $ */
+/* $NetBSD: ip_state.c,v 1.6.16.1 2017/07/12 18:50:44 sborrill Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -100,7 +100,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.6 2013/09/14 12:16:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.6.16.1 2017/07/12 18:50:44 sborrill Exp $");
#else
static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_state.c,v 1.1.1.2 2012/07/22 13:45:37 darrenr Exp";
@@ -3341,7 +3341,8 @@ ipf_state_check(fr_info_t *fin, u_32_t *
* If this packet is a fragment and the rule says to track fragments,
* then create a new fragment cache entry.
*/
- if ((fin->fin_flx & FI_FRAG) && FR_ISPASS(is->is_pass))
+ if (fin->fin_flx & FI_FRAG && FR_ISPASS(is->is_pass) &&
+ is->is_pass & FR_KEEPFRAG)
(void) ipf_frag_new(softc, fin, is->is_pass);
/*
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Thu Jun 29 12:25:04 UTC 2017 Modified Files: src/doc [netbsd-7]: CHANGES-7.2 Log Message: Ticket #1412 To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-7.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.2 diff -u src/doc/CHANGES-7.2:1.1.2.23 src/doc/CHANGES-7.2:1.1.2.24 --- src/doc/CHANGES-7.2:1.1.2.23 Wed Jun 21 17:27:15 2017 +++ src/doc/CHANGES-7.2 Thu Jun 29 12:25:04 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.2,v 1.1.2.23 2017/06/21 17:27:15 snj Exp $ +# $NetBSD: CHANGES-7.2,v 1.1.2.24 2017/06/29 12:25:04 sborrill Exp $ A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2 release: @@ -2388,3 +2388,14 @@ external/mit/expat/dist/xmlwf/xmlwf.dsp Update expat to 2.2.1. [spz, ticket #1437] +sys/external/bsd/ipf/netinet/fil.c 1.20 +sys/external/bsd/ipf/netinet/ip_state.c 1.7 +sys/external/bsd/ipf/netinet/ip_frag.c 1.5 + + Disconnect maintaining fragment state from keeping session state. + The user now must specify keep frags along with keep state to have + ipfilter do what it did before, as documented in ipf.conf.5. + Free the right fragment. This will cause use after free issues and + eventually panic. + [christos, ticket #1412] +
CVS commit: [netbsd-7] src/sys/external/bsd/ipf/netinet
Module Name:src
Committed By: sborrill
Date: Thu Jun 29 12:24:10 UTC 2017
Modified Files:
src/sys/external/bsd/ipf/netinet [netbsd-7]: fil.c ip_frag.c ip_state.c
Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1412):
sys/external/bsd/ipf/netinet/fil.c: revision 1.20
sys/external/bsd/ipf/netinet/ip_state.c:revision 1.7
sys/external/bsd/ipf/netinet/ip_frag.c: revision 1.5
Disconnect maintaining fragment state from keeping session state. The user
now must specify keep frags along with keep state to have ipfilter do what
it did before, as documented in ipf.conf.5.
Free the right fragment. This will cause use after free issues and eventually
panic.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.2 -r1.15.2.3 src/sys/external/bsd/ipf/netinet/fil.c
cvs rdiff -u -r1.3 -r1.3.14.1 src/sys/external/bsd/ipf/netinet/ip_frag.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/external/bsd/ipf/netinet/ip_state.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/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.2 src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.3
--- src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.2 Fri Apr 29 19:00:40 2016
+++ src/sys/external/bsd/ipf/netinet/fil.c Thu Jun 29 12:24:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $ */
+/* $NetBSD: fil.c,v 1.15.2.3 2017/06/29 12:24:10 sborrill Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
#if !defined(lint)
#if defined(__NetBSD__)
#include
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.3 2017/06/29 12:24:10 sborrill Exp $");
#else
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -2689,7 +2689,7 @@ ipf_firewall(fr_info_t *fin, u_32_t *pas
* If the rule has "keep frag" and the packet is actually a fragment,
* then create a fragment state entry.
*/
- if ((pass & (FR_KEEPFRAG|FR_KEEPSTATE)) == FR_KEEPFRAG) {
+ if (pass & FR_KEEPFRAG) {
if (fin->fin_flx & FI_FRAG) {
if (ipf_frag_new(softc, fin, pass) == -1) {
LBUMP(ipf_stats[out].fr_bnfr);
Index: src/sys/external/bsd/ipf/netinet/ip_frag.c
diff -u src/sys/external/bsd/ipf/netinet/ip_frag.c:1.3 src/sys/external/bsd/ipf/netinet/ip_frag.c:1.3.14.1
--- src/sys/external/bsd/ipf/netinet/ip_frag.c:1.3 Sun Jul 22 14:27:51 2012
+++ src/sys/external/bsd/ipf/netinet/ip_frag.c Thu Jun 29 12:24:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_frag.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ip_frag.c,v 1.3.14.1 2017/06/29 12:24:10 sborrill Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -87,7 +87,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_frag.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_frag.c,v 1.3.14.1 2017/06/29 12:24:10 sborrill Exp $");
#else
static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_frag.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
@@ -468,7 +468,7 @@ ipfr_frag_new(
IPFR_CMPSZ)) {
RWLOCK_EXIT(lock);
FBUMPD(ifs_exists);
- KFREE(fra);
+ KFREE(fran);
return NULL;
}
Index: src/sys/external/bsd/ipf/netinet/ip_state.c
diff -u src/sys/external/bsd/ipf/netinet/ip_state.c:1.6 src/sys/external/bsd/ipf/netinet/ip_state.c:1.6.4.1
--- src/sys/external/bsd/ipf/netinet/ip_state.c:1.6 Sat Sep 14 12:16:11 2013
+++ src/sys/external/bsd/ipf/netinet/ip_state.c Thu Jun 29 12:24:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_state.c,v 1.6 2013/09/14 12:16:11 martin Exp $ */
+/* $NetBSD: ip_state.c,v 1.6.4.1 2017/06/29 12:24:10 sborrill Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -100,7 +100,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.6 2013/09/14 12:16:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.6.4.1 2017/06/29 12:24:10 sborrill Exp $");
#else
static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_state.c,v 1.1.1.2 2012/07/22 13:45:37 darrenr Exp";
@@ -3341,7 +3341,8 @@ ipf_state_check(fr_info_t *fin, u_32_t *
* If this packet is a fragment and the rule says to track fragments,
* then create a new fragment cache entry.
*/
- if ((fin->fin_flx & FI_FRAG) && FR_ISPASS(is->is_pass))
+ if (fin->fin_flx & FI_FRAG && FR_ISPASS(is->is_pass) &&
+ is->is_pass & FR_KEEPFRAG)
(void) ipf_frag_new(softc, fin, is->is_pass);
/*
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: sborrill
Date: Mon Jun 12 10:59:47 UTC 2017
Modified Files:
src/sys/dev/pci: ehci_pci.c
Log Message:
Deal with broken BIOSes that leave PCI interrupts disabled.
Thanks to nick@
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/pci/ehci_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.64 src/sys/dev/pci/ehci_pci.c:1.65
--- src/sys/dev/pci/ehci_pci.c:1.64 Thu Oct 13 20:05:06 2016
+++ src/sys/dev/pci/ehci_pci.c Mon Jun 12 10:59:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.64 2016/10/13 20:05:06 jdolecek Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.65 2017/06/12 10:59:47 sborrill Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.64 2016/10/13 20:05:06 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.65 2017/06/12 10:59:47 sborrill Exp $");
#include
#include
@@ -161,10 +161,14 @@ ehci_pci_attach(device_t parent, device_
break;
}
+ pcireg_t intr = pci_conf_read(pc, tag, PCI_INTERRUPT_REG);
+ int pin = PCI_INTERRUPT_PIN(intr);
+
/* Enable the device. */
csr = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
- pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG,
- csr | PCI_COMMAND_MASTER_ENABLE);
+ csr |= PCI_COMMAND_MASTER_ENABLE;
+ csr &= ~(pin ? PCI_COMMAND_INTERRUPT_DISABLE : 0);
+ pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG, csr);
/* Map and establish the interrupt. */
if (pci_intr_map(pa, )) {
CVS commit: src/usr.sbin/service
Module Name:src
Committed By: sborrill
Date: Mon Jun 5 09:20:05 UTC 2017
Modified Files:
src/usr.sbin/service: service
Log Message:
Only match first instance of name and rcvar in file.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/service/service
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/service/service
diff -u src/usr.sbin/service/service:1.7 src/usr.sbin/service/service:1.8
--- src/usr.sbin/service/service:1.7 Sun Apr 5 11:33:15 2015
+++ src/usr.sbin/service/service Mon Jun 5 09:20:05 2017
@@ -1,5 +1,5 @@
#!/bin/sh
-#$NetBSD: service,v 1.7 2015/04/05 11:33:15 apb Exp $
+#$NetBSD: service,v 1.8 2017/06/05 09:20:05 sborrill Exp $
#service -- run or list system services
#
# Taken from FreeBSD: releng/10.1/usr.sbin/service/service.sh 268098
@@ -84,8 +84,8 @@ if [ -n "${ENABLED}" ]; then
_rc_files | $flt | while read file
do
if grep -q ^rcvar "$file"; then
-eval $( grep ^name= "$file" )
-eval $( grep ^rcvar "$file" )
+eval $( grep -m 1 ^name= "$file" )
+eval $( grep -m 1 ^rcvar "$file" )
if [ -n "${rcvar}" ]; then
load_rc_config ${rcvar}
checkyesno ${rcvar} 2>/dev/null && echo ${file}
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Fri May 12 10:48:34 UTC 2017 Modified Files: src/doc [netbsd-7]: CHANGES-7.2 Log Message: Ticket #1420 To generate a diff of this commit: cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-7.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.2 diff -u src/doc/CHANGES-7.2:1.1.2.15 src/doc/CHANGES-7.2:1.1.2.16 --- src/doc/CHANGES-7.2:1.1.2.15 Fri May 12 06:19:33 2017 +++ src/doc/CHANGES-7.2 Fri May 12 10:48:34 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.2,v 1.1.2.15 2017/05/12 06:19:33 snj Exp $ +# $NetBSD: CHANGES-7.2,v 1.1.2.16 2017/05/12 10:48:34 sborrill Exp $ A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2 release: @@ -1077,3 +1077,9 @@ usr.bin/elf2ecoff/elf2ecoff.c 1.30-1.3 Make elf2ecoff usable as a tool on 64 bit systems. [skrll, ticket #1406] +sys/netinet/ip_carp.c1.88 + + carp should call if_link_state_change instead of affecting + if_link_state directly. + [roy, ticket #1420] +
CVS commit: [netbsd-7] src/sys/netinet
Module Name:src
Committed By: sborrill
Date: Fri May 12 10:48:11 UTC 2017
Modified Files:
src/sys/netinet [netbsd-7]: ip_carp.c
Log Message:
Pull up the following revisions(s) (requested by roy in ticket #1420):
sys/netinet/ip_carp.c: revision 1.88
carp should call if_link_state_change instead of affecting
if_link_state directly.
To generate a diff of this commit:
cvs rdiff -u -r1.59.2.4 -r1.59.2.5 src/sys/netinet/ip_carp.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/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.59.2.4 src/sys/netinet/ip_carp.c:1.59.2.5
--- src/sys/netinet/ip_carp.c:1.59.2.4 Sat Aug 27 04:29:41 2016
+++ src/sys/netinet/ip_carp.c Fri May 12 10:48:11 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.59.2.4 2016/08/27 04:29:41 snj Exp $ */
+/* $NetBSD: ip_carp.c,v 1.59.2.5 2017/05/12 10:48:11 sborrill Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -31,7 +31,7 @@
#include "opt_mbuftrace.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.4 2016/08/27 04:29:41 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.5 2017/05/12 10:48:11 sborrill Exp $");
/*
* TODO:
@@ -2127,6 +2127,8 @@ static void
carp_set_state(struct carp_softc *sc, int state)
{
static const char *carp_states[] = { CARP_STATES };
+ int link_state;
+
if (sc->sc_state == state)
return;
@@ -2135,16 +2137,16 @@ carp_set_state(struct carp_softc *sc, in
sc->sc_state = state;
switch (state) {
case BACKUP:
- sc->sc_if.if_link_state = LINK_STATE_DOWN;
+ link_state = LINK_STATE_DOWN;
break;
case MASTER:
- sc->sc_if.if_link_state = LINK_STATE_UP;
+ link_state = LINK_STATE_UP;
break;
default:
- sc->sc_if.if_link_state = LINK_STATE_UNKNOWN;
+ link_state = LINK_STATE_UNKNOWN;
break;
}
- rt_ifmsg(>sc_if);
+ if_link_state_change(>sc_if, link_state);
}
void
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: sborrill Date: Thu May 11 15:42:15 UTC 2017 Modified Files: src/sys/arch/amd64/conf: XEN3_DOMU Log Message: Add commented out carp and mpls pseudo-devices to be consistent with GENERIC To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/arch/amd64/conf/XEN3_DOMU 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/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.73 src/sys/arch/amd64/conf/XEN3_DOMU:1.74 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.73 Sun Feb 26 12:41:50 2017 +++ src/sys/arch/amd64/conf/XEN3_DOMU Thu May 11 15:42:15 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.73 2017/02/26 12:41:50 rin Exp $ +# $NetBSD: XEN3_DOMU,v 1.74 2017/05/11 15:42:15 sborrill Exp $ include "arch/amd64/conf/std.xen" @@ -215,8 +215,10 @@ pseudo-device dm # device-mapper drive # network pseudo-devices pseudo-device bpfilter # Berkeley packet filter +#pseudo-device carp # Common Address Redundancy Protocol pseudo-device ipfilter # IP filter (firewall) and NAT pseudo-device loop # network loopback +#pseudo-device mpls # MPLS pseudo-interface pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) pseudo-device sl # Serial Line IP
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Mon Feb 20 16:29:31 UTC 2017 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: Ticket #1363 To generate a diff of this commit: cvs rdiff -u -r1.1.2.153 -r1.1.2.154 src/doc/CHANGES-7.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.153 src/doc/CHANGES-7.1:1.1.2.154 --- src/doc/CHANGES-7.1:1.1.2.153 Sun Feb 19 07:44:21 2017 +++ src/doc/CHANGES-7.1 Mon Feb 20 16:29:31 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.153 2017/02/19 07:44:21 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.154 2017/02/20 16:29:31 sborrill Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -8776,3 +8776,79 @@ etc/etc.luna68k/MAKEDEV.conf 1.10 Make sure to prepare /dev/xp node entry. [tsutsui, ticket #1360] +doc/3RDPARTY patch +external/bsd/bind/Makefile.inc up to 1.25 via patch +external/bsd/bind/dist/CHANGES up to 1.25 +external/bsd/bind/dist/README up to 1.13 +external/bsd/bind/dist/bin/named/query.cup to 1.23 +external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl up to 1.1.1.1 +external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db up to 1.1.1.3 +external/bsd/bind/dist/bin/tests/system/dname/tests.sh up to 1.1.1.5 +external/bsd/bind/dist/config.guess up to 1.2 +external/bsd/bind/dist/config.sub up to 1.2 +external/bsd/bind/dist/contrib/dnsperf-2.1.0.0-1/config.guess up to 1.2 +external/bsd/bind/dist/contrib/dnsperf-2.1.0.0-1/config.sub up to 1.2 +external/bsd/bind/dist/contrib/idn/idnkit-1.0-src/config.guess up to 1.2 +external/bsd/bind/dist/contrib/idn/idnkit-1.0-src/config.sub up to 1.2 +external/bsd/bind/dist/contrib/nslint-3.0a2/config.guess up to 1.2 +external/bsd/bind/dist/contrib/nslint-3.0a2/config.sub up to 1.2 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html up to 1.1.1.23 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html up to 1.1.1.20 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html up to 1.1.1.25 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html up to 1.1.1.26 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html up to 1.1.1.22 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html up to 1.1.1.11 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html up to 1.1.1.11 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html up to 1.1.1.11 +external/bsd/bind/dist/doc/arm/Bv9ARM.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.pdf up to 1.18 +external/bsd/bind/dist/doc/arm/man.arpaname.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.ddns-confgen.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.delv.htmlup to 1.13 +external/bsd/bind/dist/doc/arm/man.dig.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-settime.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-verify.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.genrandom.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.host.htmlup to 1.13 +external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.lwresd.html up to 1.1.1.5 +external/bsd/bind/dist/doc/arm/man.named-checkconf.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.named-checkzone.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.named-journalprint.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.named-rrchecker.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.named.conf.html up to 1.1.1.5 +external/bsd/bind/dist/doc/arm/man.named.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.nsec3hash.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.nsupdate.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.rndc-confgen.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.rndc.conf.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.rndc.htmlup to 1.13 +external/bsd/bind/dist/doc/arm/notes.html up to 1.1.1.11 +external/bsd/bind/dist/doc/arm/notes.pdfup to 1.1.1.11 +external/bsd/bind/dist/doc/arm/notes.xml
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: sborrill Date: Mon Feb 20 16:28:37 UTC 2017 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1363 To generate a diff of this commit: cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.27 src/doc/CHANGES-7.0.3:1.1.2.28 --- src/doc/CHANGES-7.0.3:1.1.2.27 Sun Feb 19 05:03:40 2017 +++ src/doc/CHANGES-7.0.3 Mon Feb 20 16:28:37 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.27 2017/02/19 05:03:40 snj Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.28 2017/02/20 16:28:37 sborrill Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -1157,3 +1157,79 @@ external/bsd/tcpdump/include/config.h CVE-2017-5484 CVE-2017-5485 CVE-2017-5486 [spz, ticket #1362] +doc/3RDPARTY patch +external/bsd/bind/Makefile.inc up to 1.25 via patch +external/bsd/bind/dist/CHANGES up to 1.25 +external/bsd/bind/dist/README up to 1.13 +external/bsd/bind/dist/bin/named/query.cup to 1.23 +external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl up to 1.1.1.1 +external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db up to 1.1.1.3 +external/bsd/bind/dist/bin/tests/system/dname/tests.sh up to 1.1.1.5 +external/bsd/bind/dist/config.guess up to 1.2 +external/bsd/bind/dist/config.sub up to 1.2 +external/bsd/bind/dist/contrib/dnsperf-2.1.0.0-1/config.guess up to 1.2 +external/bsd/bind/dist/contrib/dnsperf-2.1.0.0-1/config.sub up to 1.2 +external/bsd/bind/dist/contrib/idn/idnkit-1.0-src/config.guess up to 1.2 +external/bsd/bind/dist/contrib/idn/idnkit-1.0-src/config.sub up to 1.2 +external/bsd/bind/dist/contrib/nslint-3.0a2/config.guess up to 1.2 +external/bsd/bind/dist/contrib/nslint-3.0a2/config.sub up to 1.2 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html up to 1.1.1.23 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html up to 1.1.1.20 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html up to 1.1.1.25 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html up to 1.1.1.26 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html up to 1.1.1.22 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html up to 1.1.1.11 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html up to 1.1.1.11 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html up to 1.1.1.11 +external/bsd/bind/dist/doc/arm/Bv9ARM.html up to 1.13 +external/bsd/bind/dist/doc/arm/Bv9ARM.pdf up to 1.18 +external/bsd/bind/dist/doc/arm/man.arpaname.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.ddns-confgen.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.delv.htmlup to 1.13 +external/bsd/bind/dist/doc/arm/man.dig.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-settime.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.dnssec-verify.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.genrandom.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.host.htmlup to 1.13 +external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.lwresd.html up to 1.1.1.5 +external/bsd/bind/dist/doc/arm/man.named-checkconf.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.named-checkzone.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.named-journalprint.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.named-rrchecker.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.named.conf.html up to 1.1.1.5 +external/bsd/bind/dist/doc/arm/man.named.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.nsec3hash.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.nsupdate.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.rndc-confgen.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.rndc.conf.html up to 1.13 +external/bsd/bind/dist/doc/arm/man.rndc.htmlup to 1.13 +external/bsd/bind/dist/doc/arm/notes.html up to 1.1.1.11 +external/bsd/bind/dist/doc/arm/notes.pdfup to 1.1.1.11
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: sborrill Date: Tue Oct 4 14:36:46 UTC 2016 Modified Files: src/sys/external/bsd/ipf/netinet: ip_nat.c ip_nat6.c Log Message: Fix lookup of original destination address when using a redirect rule. This is required for transparent proxying by squid, for example. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/ipf/netinet/ip_nat.c cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/ipf/netinet/ip_nat6.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/external/bsd/ipf/netinet/ip_nat.c diff -u src/sys/external/bsd/ipf/netinet/ip_nat.c:1.16 src/sys/external/bsd/ipf/netinet/ip_nat.c:1.17 --- src/sys/external/bsd/ipf/netinet/ip_nat.c:1.16 Thu Mar 17 04:07:41 2016 +++ src/sys/external/bsd/ipf/netinet/ip_nat.c Tue Oct 4 14:36:46 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_nat.c,v 1.16 2016/03/17 04:07:41 khorben Exp $ */ +/* $NetBSD: ip_nat.c,v 1.17 2016/10/04 14:36:46 sborrill Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -113,7 +113,7 @@ extern struct ifnet vpnif; #if !defined(lint) #if defined(__NetBSD__) #include -__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.16 2016/03/17 04:07:41 khorben Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.17 2016/10/04 14:36:46 sborrill Exp $"); #else static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed"; static const char rcsid[] = "@(#)Id: ip_nat.c,v 1.1.1.2 2012/07/22 13:45:27 darrenr Exp"; @@ -4621,8 +4621,8 @@ ipf_nat_lookupredir(ipf_main_softc_t *so } } - np->nl_realip = nat->nat_ndstip; - np->nl_realport = nat->nat_ndport; + np->nl_realip = nat->nat_odstip; + np->nl_realport = nat->nat_odport; } } Index: src/sys/external/bsd/ipf/netinet/ip_nat6.c diff -u src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.9 src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.10 --- src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.9 Tue Oct 6 10:21:08 2015 +++ src/sys/external/bsd/ipf/netinet/ip_nat6.c Tue Oct 4 14:36:46 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_nat6.c,v 1.9 2015/10/06 10:21:08 prlw1 Exp $ */ +/* $NetBSD: ip_nat6.c,v 1.10 2016/10/04 14:36:46 sborrill Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -2471,8 +2471,8 @@ ipf_nat6_lookupredir(ipf_main_softc_t *s } } - np->nl_realip6 = nat->nat_ndst6.in6; - np->nl_realport = nat->nat_ndport; + np->nl_realip6 = nat->nat_odst6.in6; + np->nl_realport = nat->nat_odport; } }
CVS commit: [netbsd-7] src/lib/libc/net
Module Name:src
Committed By: sborrill
Date: Fri Jan 15 17:37:45 UTC 2016
Modified Files:
src/lib/libc/net [netbsd-7]: getaddrinfo.c
Log Message:
Pull up to netbsd-7 (missing part of ticket #1012):
lib/libc/net/getaddrinfo.c 1.110
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.106.4.1 src/lib/libc/net/getaddrinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.106 src/lib/libc/net/getaddrinfo.c:1.106.4.1
--- src/lib/libc/net/getaddrinfo.c:1.106 Sun Dec 22 02:40:48 2013
+++ src/lib/libc/net/getaddrinfo.c Fri Jan 15 17:37:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.106 2013/12/22 02:40:48 christos Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.106.4.1 2016/01/15 17:37:45 sborrill Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.106 2013/12/22 02:40:48 christos Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.106.4.1 2016/01/15 17:37:45 sborrill Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -221,8 +221,8 @@ static int addrconfig(uint64_t *);
static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *);
#endif
-static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
-const struct addrinfo *);
+static struct addrinfo *getanswer(res_state, const querybuf *, int,
+const char *, int, const struct addrinfo *);
static void aisort(struct addrinfo *s, res_state res);
static struct addrinfo * _dns_query(struct res_target *,
const struct addrinfo *, res_state, int);
@@ -1157,9 +1157,11 @@ ip6_str2scopeid(char *scope, struct sock
static const char AskedForGot[] =
"gethostby*.getanswer: asked for \"%s\", got \"%s\"";
+#define maybe_ok(res, nm, ok) (((res)->options & RES_NOCHECKNAME) != 0U || \
+ (ok)(nm) != 0)
static struct addrinfo *
-getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-const struct addrinfo *pai)
+getanswer(res_state res, const querybuf *answer, int anslen, const char *qname,
+int qtype, const struct addrinfo *pai)
{
struct addrinfo sentinel, *cur;
struct addrinfo ai, *aip;
@@ -1181,6 +1183,7 @@ getanswer(const querybuf *answer, int an
_DIAGASSERT(answer != NULL);
_DIAGASSERT(qname != NULL);
_DIAGASSERT(pai != NULL);
+ _DIAGASSERT(res != NULL);
memset(, 0, sizeof(sentinel));
cur =
@@ -1213,7 +1216,7 @@ getanswer(const querybuf *answer, int an
return (NULL);
}
n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
- if ((n < 0) || !(*name_ok)(bp)) {
+ if ((n < 0) || !maybe_ok(res, bp, name_ok)) {
h_errno = NO_RECOVERY;
return (NULL);
}
@@ -1238,7 +1241,7 @@ getanswer(const querybuf *answer, int an
srvlist = NULL;
while (ancount-- > 0 && cp < eom && !had_error) {
n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
- if ((n < 0) || !(*name_ok)(bp)) {
+ if ((n < 0) || !maybe_ok(res, bp, name_ok)) {
had_error++;
continue;
}
@@ -1257,7 +1260,7 @@ getanswer(const querybuf *answer, int an
if ((qtype == T_A || qtype == T_ || qtype == T_ANY) &&
type == T_CNAME) {
n = dn_expand(answer->buf, eom, cp, tbuf, (int)sizeof tbuf);
- if ((n < 0) || !(*name_ok)(tbuf)) {
+ if ((n < 0) || !maybe_ok(res, tbuf, name_ok)) {
had_error++;
continue;
}
@@ -1348,7 +1351,7 @@ getanswer(const querybuf *answer, int an
cp += INT16SZ;
n = dn_expand(answer->buf, eom, cp, tbuf,
(int)sizeof(tbuf));
- if ((n < 0) || !res_hnok(tbuf)) {
+ if ((n < 0) || !maybe_ok(res, tbuf, res_hnok)) {
had_error++;
continue;
}
@@ -1394,7 +1397,6 @@ getanswer(const querybuf *answer, int an
}
if (srvlist) {
- res_state res;
/*
* Check for explicit rejection.
*/
@@ -1403,16 +1405,6 @@ getanswer(const querybuf *answer, int an
h_errno = HOST_NOT_FOUND;
return NULL;
}
- res = __res_get_state();
- if (res == NULL) {
- while (srvlist != NULL) {
-srv = srvlist;
-srvlist = srvlist->next;
-free(srv);
- }
- h_errno = NETDB_INTERNAL;
- return NULL;
- }
while (srvlist) {
struct res_target q, q2;
@@ -1447,7 +1439,6 @@ getanswer(const querybuf *answer, int an
}
free(srv);
}
- __res_put_state(res);
}
if (haveanswer) {
if (!sentinel.ai_next->ai_canonname)
@@ -1536,14 +1527,14 @@ _dns_query(struct res_target *q, const s
goto out;
}
- ai = getanswer(buf, q->n, q->name, q->qtype, pai);
+ ai = getanswer(res, buf, q->n, q->name, q->qtype, pai);
if (ai) {
cur->ai_next = ai;
while (cur && cur->ai_next)
cur = cur->ai_next;
}
if (q2) {
- ai = getanswer(buf2, q2->n, q2->name, q2->qtype, pai);
+ ai = getanswer(res, buf2, q2->n, q2->name, q2->qtype, pai);
CVS commit: [netbsd-7-0] src/lib/libc/net
Module Name:src
Committed By: sborrill
Date: Fri Jan 15 18:09:19 UTC 2016
Modified Files:
src/lib/libc/net [netbsd-7-0]: getaddrinfo.c
Log Message:
Pull up to netbsd-7 (missing part of ticket #1012):
lib/libc/net/getaddrinfo.c 1.110
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.106.6.1 src/lib/libc/net/getaddrinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.106 src/lib/libc/net/getaddrinfo.c:1.106.6.1
--- src/lib/libc/net/getaddrinfo.c:1.106 Sun Dec 22 02:40:48 2013
+++ src/lib/libc/net/getaddrinfo.c Fri Jan 15 18:09:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.106 2013/12/22 02:40:48 christos Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.106.6.1 2016/01/15 18:09:19 sborrill Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.106 2013/12/22 02:40:48 christos Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.106.6.1 2016/01/15 18:09:19 sborrill Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -221,8 +221,8 @@ static int addrconfig(uint64_t *);
static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *);
#endif
-static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
-const struct addrinfo *);
+static struct addrinfo *getanswer(res_state, const querybuf *, int,
+const char *, int, const struct addrinfo *);
static void aisort(struct addrinfo *s, res_state res);
static struct addrinfo * _dns_query(struct res_target *,
const struct addrinfo *, res_state, int);
@@ -1157,9 +1157,11 @@ ip6_str2scopeid(char *scope, struct sock
static const char AskedForGot[] =
"gethostby*.getanswer: asked for \"%s\", got \"%s\"";
+#define maybe_ok(res, nm, ok) (((res)->options & RES_NOCHECKNAME) != 0U || \
+ (ok)(nm) != 0)
static struct addrinfo *
-getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-const struct addrinfo *pai)
+getanswer(res_state res, const querybuf *answer, int anslen, const char *qname,
+int qtype, const struct addrinfo *pai)
{
struct addrinfo sentinel, *cur;
struct addrinfo ai, *aip;
@@ -1181,6 +1183,7 @@ getanswer(const querybuf *answer, int an
_DIAGASSERT(answer != NULL);
_DIAGASSERT(qname != NULL);
_DIAGASSERT(pai != NULL);
+ _DIAGASSERT(res != NULL);
memset(, 0, sizeof(sentinel));
cur =
@@ -1213,7 +1216,7 @@ getanswer(const querybuf *answer, int an
return (NULL);
}
n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
- if ((n < 0) || !(*name_ok)(bp)) {
+ if ((n < 0) || !maybe_ok(res, bp, name_ok)) {
h_errno = NO_RECOVERY;
return (NULL);
}
@@ -1238,7 +1241,7 @@ getanswer(const querybuf *answer, int an
srvlist = NULL;
while (ancount-- > 0 && cp < eom && !had_error) {
n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
- if ((n < 0) || !(*name_ok)(bp)) {
+ if ((n < 0) || !maybe_ok(res, bp, name_ok)) {
had_error++;
continue;
}
@@ -1257,7 +1260,7 @@ getanswer(const querybuf *answer, int an
if ((qtype == T_A || qtype == T_ || qtype == T_ANY) &&
type == T_CNAME) {
n = dn_expand(answer->buf, eom, cp, tbuf, (int)sizeof tbuf);
- if ((n < 0) || !(*name_ok)(tbuf)) {
+ if ((n < 0) || !maybe_ok(res, tbuf, name_ok)) {
had_error++;
continue;
}
@@ -1348,7 +1351,7 @@ getanswer(const querybuf *answer, int an
cp += INT16SZ;
n = dn_expand(answer->buf, eom, cp, tbuf,
(int)sizeof(tbuf));
- if ((n < 0) || !res_hnok(tbuf)) {
+ if ((n < 0) || !maybe_ok(res, tbuf, res_hnok)) {
had_error++;
continue;
}
@@ -1394,7 +1397,6 @@ getanswer(const querybuf *answer, int an
}
if (srvlist) {
- res_state res;
/*
* Check for explicit rejection.
*/
@@ -1403,16 +1405,6 @@ getanswer(const querybuf *answer, int an
h_errno = HOST_NOT_FOUND;
return NULL;
}
- res = __res_get_state();
- if (res == NULL) {
- while (srvlist != NULL) {
-srv = srvlist;
-srvlist = srvlist->next;
-free(srv);
- }
- h_errno = NETDB_INTERNAL;
- return NULL;
- }
while (srvlist) {
struct res_target q, q2;
@@ -1447,7 +1439,6 @@ getanswer(const querybuf *answer, int an
}
free(srv);
}
- __res_put_state(res);
}
if (haveanswer) {
if (!sentinel.ai_next->ai_canonname)
@@ -1536,14 +1527,14 @@ _dns_query(struct res_target *q, const s
goto out;
}
- ai = getanswer(buf, q->n, q->name, q->qtype, pai);
+ ai = getanswer(res, buf, q->n, q->name, q->qtype, pai);
if (ai) {
cur->ai_next = ai;
while (cur && cur->ai_next)
cur = cur->ai_next;
}
if (q2) {
- ai = getanswer(buf2, q2->n, q2->name, q2->qtype, pai);
+ ai = getanswer(res, buf2, q2->n, q2->name, q2->qtype, pai);
if
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: sborrill Date: Fri Jan 15 18:10:11 UTC 2016 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.1 Log Message: Pullup missing part of ticket #1012 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-7.0.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.1 diff -u src/doc/CHANGES-7.0.1:1.1.2.25 src/doc/CHANGES-7.0.1:1.1.2.26 --- src/doc/CHANGES-7.0.1:1.1.2.25 Tue Jan 12 10:27:48 2016 +++ src/doc/CHANGES-7.0.1 Fri Jan 15 18:10:10 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.1,v 1.1.2.25 2016/01/12 10:27:48 snj Exp $ +# $NetBSD: CHANGES-7.0.1,v 1.1.2.26 2016/01/15 18:10:10 sborrill Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1 release: @@ -116,6 +116,7 @@ sys/arch/x86/x86/bus_dma.c 1.72-1.74 [christos, ticket #1011] external/gpl3/binutils/dist/binutils/arsup.c 1.2 +lib/libc/net/getaddrinfo.c 1.10 lib/libc/net/getnetnamadr.c 1.43-1.44 Resolve hostnames with "_". PR#50367.
CVS commit: [netbsd-5] src/doc
Module Name:src
Committed By: sborrill
Date: Mon Nov 9 12:38:41 UTC 2015
Modified Files:
src/doc [netbsd-5]: CHANGES-5.3
Log Message:
Ticket #1983
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.127 -r1.1.2.128 src/doc/CHANGES-5.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.3
diff -u src/doc/CHANGES-5.3:1.1.2.127 src/doc/CHANGES-5.3:1.1.2.128
--- src/doc/CHANGES-5.3:1.1.2.127 Mon Nov 9 10:36:46 2015
+++ src/doc/CHANGES-5.3 Mon Nov 9 12:38:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.3,v 1.1.2.127 2015/11/09 10:36:46 sborrill Exp $
+# $NetBSD: CHANGES-5.3,v 1.1.2.128 2015/11/09 12:38:41 sborrill Exp $
A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3
release:
@@ -4101,3 +4101,131 @@ sys/dev/mii/miidevs_data.h regen
- Update comment.
[msaitoh, ticket #1982]
+sys/dev/pci/pcidevs 1.1079, 1.1134, 1.1148-1.1149, 1.1151
+sys/dev/pci/pcidevs.h regen
+sys/dev/pci/pcidevs_data.h regen
+sys/dev/pci/if_bge.c 1.183-1.185, 1.187, 1.189-1.193, 1.195-1.199, 1.202-1.226, 1.228-1.237, 1.240-1.264, 1.267-1.276, 1.278-1.280, 1.283-1.287 via patch
+sys/dev/pci/if_bgereg.h 1.57-1.74, 1.76-1.90 via patch
+sys/dev/pci/if_bgevar.h 1.6, 1.10-1.13, 1.15-1.17 via patch
+sys/dev/pci/if_bnx.c 1.32, 1.34-1.43, 1.48-1.49, 1.52
+sys/dev/pci/if_bnxreg.h 1.8, 1.11-1.14
+sys/dev/pci/if_bnxvar.h 1.1-1.3
+sys/dev/mii/brgphy.c 1.53-1.63, 1.65-69, 1.72-1.74 via patch
+sys/dev/mii/brgphyreg.h 1.5-1.8
+sys/dev/mii/miivar.h 1.61
+sys/dev/pci/pcireg.h patch
+
+ Sync bge(4) up to if_bge.c rev. 1.287. Sync brgphy(4) up to 1.74.
+ Fix some bugs on bnx(4). Details as follows:
+ Common:
+ - Add device IDs for Broadcom BCM57710, BCM57711(E), BCM57712(E) and
+ BCM57766 (pcidevs only).
+ - Fix BCM5709 PHY detection.
+ - Fix detection of BGEPHYF_FIBER_{MII|TBI}
+ - Add BCM5708S support in brgphy(4).
+ - Don't use the WIRESPEED function for fiber devices.
+ bge(4):
+ - Add some Fujitsu's device support from Michael Moll.
+ - Add BCM57762 support (PR#46961 from Ryo Onodera).
+ - Add Altima AC1003, APPLE BCM5701, Broadcom BCM5785F. BCM5785G,
+ BCM5787F, BCM5719, BCM5720, BCM57766, BCM57782 and BCM57786.
+ - Fix DMA setting for read/write on conventional PCI bus devices.
+ - Fix printing "discarding oversize frame (len=-4)" message and crash
+ by NULL pointer dereferencing.
+ - The BCM5785 is a PCIe chip but does not report PCIe capabilities.
+ Check for this chip explicitly and enable PCIe. Fixes
+ 'firmware handshake timeout'.
+ - Allow disabling interrupt mitigation.
+ - Workaround for BCM5906 silicon bug. When auto-negotiation results in
+ half-duplex operation, excess collision on the ethernet link may
+ cause internal chip delays that may result in subsequent valid
+ frames being dropped due to insufficient receive buffer resources.
+ (FreeBSD: r214219, r214251, r214292).
+ - Allow write DMA to request larger DMA burst size to get better
+ performance on BCM5785. (FreeBSD r21: OpenBSD 1.294)
+ - Enable TX MAC state machine lockup fix for both BCM5755 or higher
+ and BCM5906. Publicly available data sheet just says it may happen
+ due to corrupted TxMbuf. (FreeBSD r214216)
+ - Follow Broadcom datasheet:
+ Delay 100 microseconds after enabling transmit MAC.
+ Delay 10 microseconds after enabling receive MAC. (FreeBSD r241220)
+ - Insert the completion barrier between register write and the
+ consecutive delay(). It will fix some device timeout problems we have
+ seen before.
+ - Add DELAY(40) after turning on write DMA state machine.
+ - Add some workarounds for 5717 A0 and 5776[56] to be stable.
+ - Check BGE_RXBDFLAG_IPV6 flag for 5717_PLUS case. Note that
+ {tcp,udp}6csum flag is currently not added in the capability.
+ - Add delay after clearing BGE_MACMODE_TBI_SEND_CFGS for the link
+ checking.
+ - Do not touch the jumbo replenish threshold register on chips that do
+ not have jumbo support.
+ - Wait for the bootcode to complete initialization for 5717 and newer
+ devices.
+ - 5718 and 57785 document say we should wait 100us in init.
+ - Fix a bug that chips which have BCM5906 ASIC touch GPIO wrongly.
+ - Fix the setting of Tx Random Backoff Register.
+ - Check the hardware config words and print them.
+ - Set BGE_MISC_CTL's byte/word swap options before using
+ bge_readmem_ind(). Fixes PR#47716.
+ - For BGE_IS_575X_PLUS() devices, don't set
+ BGE_RXLPSTATCONTROL_DACK_FIX bits because these bits are reserved.
+ - Document says 5717 and newer chips have no
+ BGE_PCISTATE_INTR_NOT_ACTIVE bit, so don't use the bit on those
+ chips. Same as OpenBSD.
+ - Fix a bug that the PHY address bits in MI_MODE register is wrongly
+ cleared. Set the PHY address correctly.
+ - Use BGE_SETBIT() instead of CSR_WRITE_4() for the BGE_MISC_LOCAL_CTL
+ register to not to modify some GPIO bits.
+ - Set DMA
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: sborrill
Date: Mon Nov 9 12:35:32 UTC 2015
Added Files:
src/sys/dev/pci [netbsd-5]: if_bnxvar.h
Log Message:
Pull up the following revisions(s) (requested by msaitoh in ticket #1983):
sys/dev/pci/pcidevs:revisions 1.1079, 1.1134,
1.1148-1.1149, 1.1151
sys/dev/pci/pcidevs.h: regen
sys/dev/pci/pcidevs_data.h: regen
sys/dev/pci/if_bge.c: revisions 1.183-1.185, 1.187,
1.189-1.193, 1.195-1.199, 1.202-1.226, 1.228-1.237, 1.240-1.264, 1.267-1.276,
1.278-1.280, 1.283-1.287 via patch
sys/dev/pci/if_bgereg.h:revisions 1.57-1.74, 1.76-1.90 via patch
sys/dev/pci/if_bgevar.h:revisions 1.6, 1.10-1.13, 1.15-1.17 via
patch
sys/dev/pci/if_bnx.c: revisions 1.32, 1.34-1.43, 1.48-1.49,
1.52
sys/dev/pci/if_bnxreg.h:revisions 1.8, 1.11-1.14
sys/dev/pci/if_bnxvar.h:revisions 1.1-1.3
sys/dev/mii/brgphy.c: revisions 1.53-1.63, 1.65-69, 1.72-1.74
via patch
sys/dev/mii/brgphyreg.h:revisions 1.5-1.8
sys/dev/mii/miivar.h: revisions 1.61
sys/dev/pci/pcireg.h: patch
Sync bge(4) up to if_bge.c rev. 1.287. Sync brgphy(4) up to 1.74.
Fix some bugs on bnx(4).
Common:
- Add device IDs for Broadcom BCM57710, BCM57711(E), BCM57712(E) and
BCM57766 (pcidevs only).
- Fix BCM5709 PHY detection.
- Fix detection of BGEPHYF_FIBER_{MII|TBI}
- Add BCM5708S support in brgphy(4).
- Don't use the WIRESPEED function for fiber devices.
bge(4):
- Add some Fujitsu's device support from Michael Moll.
- Add BCM57762 support (PR#46961 from Ryo Onodera).
- Add Altima AC1003, APPLE BCM5701, Broadcom BCM5785F. BCM5785G,
BCM5787F, BCM5719, BCM5720, BCM57766, BCM57782 and BCM57786.
- Fix DMA setting for read/write on conventional PCI bus devices.
This bug was added in rev. 1.166.
- Fix printing "discarding oversize frame (len=-4)" message and
crash by NULL pointer dereferencing.
- The BCM5785 is a PCIe chip but does not report PCIe capabilities.
Check for this chip explicitely and enable PCIe. Fixes
'firmware handshake timeout'.
- Allow disabling interrupt mitigation.
- Workaround for BCM5906 silicon bug. When auto-negotiation results
in half-duplex operation, excess collision on the ethernet link may
cause internal chip delays that may result in subsequent valid
frames being dropped due to insufficient receive buffer resources.
(FreeBSD: r214219, r214251, r214292).
- Allow write DMA to request larger DMA burst size to get better
performance on BCM5785. (FreeBSD r21: OpenBSD 1.294)
- Enable TX MAC state machine lockup fix for both BCM5755 or higher
and BCM5906. Publicly available data sheet just says it may happen
due to corrupted TxMbuf. (FreeBSD r214216)
- Follow Broadcom datasheet:
Delay 100 microseconds after enabling transmit MAC.
Delay 10 microseconds after enabling receive MAC. (FreeBSD
r241220)
- Insert the completion barrier between register write and the
consecutive delay(). It will fix some device timeout problems we have
seen before.
- Add DELAY(40) after turning on write DMA state machine.
- Add some workarounds for 5717 A0 and 5776[56] to be stable.
- Check BGE_RXBDFLAG_IPV6 flag for 5717_PLUS case. Note that
{tcp,udp}6csum flag is currently not added in the capability.
- Add delay after clearing BGE_MACMODE_TBI_SEND_CFGS for the link
checking.
- Do not touch the jumbo replenish threshold register on chips that do
not have jumbo support.
- Wait for the bootcode to complete initialization for 5717 and newer
devices.
- 5718 and 57785 document say we should wait 100us in init.
- Fix a bug that chips which have BCM5906 ASIC touch GPIO wrongly.
- Fix the setting of Tx Random Backoff Register.
- Check the hardware config words and print them.
- Set BGE_MISC_CTL's byte/word swap options before using
bge_readmem_ind(). Fixes PR#47716.
- For BGE_IS_575X_PLUS() devices, don't set
BGE_RXLPSTATCONTROL_DACK_FIX bits because these bits are reserved.
- Document says 5717 and newer chips have no
BGE_PCISTATE_INTR_NOT_ACTIVE bit, so don't use the bit on those
chips. Same as OpenBSD.
- Fix a bug that the PHY address bits in MI_MODE register is wrongly
cleard. Set the PHY address correctly.
- Use BGE_SETBIT() instead of CSR_WRITE_4() for the BGE_MISC_LOCAL_CTL
register to not to modify some GPIO bits.
- Set DMA watermark depend on the PCI max payload size.
- Set BGE_JUMBO_CAPABLE correctly.
- Fix a link detect bug on non-autopoll systems.
- Change the TX ring size for 5717 series and 57764 series.
- Set maximum read byte count to 2048 for PCI-X BCM5703/5704 devices.
- For PCI-X BCM5704, set maximum outstanding split transactions to 0.
- Add 40bit DMA bug workaround(BGEF_40BIT_BUG) from FreeBSD.
This workaround is for 5714/5715 controllers and is not actually a
MAC controller bug but an issue with the embedded PCIe to PCI-X
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src Committed By: sborrill Date: Mon Nov 9 12:33:51 UTC 2015 Modified Files: src/sys/dev/pci [netbsd-5]: pcidevs.h pcidevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.963.4.20 -r1.963.4.21 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.962.4.20 -r1.962.4.21 src/sys/dev/pci/pcidevs_data.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/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.963.4.20 src/sys/dev/pci/pcidevs.h:1.963.4.21 --- src/sys/dev/pci/pcidevs.h:1.963.4.20 Thu Apr 30 20:01:45 2015 +++ src/sys/dev/pci/pcidevs.h Mon Nov 9 12:33:32 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.963.4.20 2015/04/30 20:01:45 snj Exp $ */ +/* $NetBSD: pcidevs.h,v 1.963.4.21 2015/11/09 12:33:32 sborrill Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.962.4.20 2015/04/30 20:00:27 snj Exp + * NetBSD: pcidevs,v 1.962.4.21 2015/11/09 12:33:02 sborrill Exp */ /* @@ -261,7 +261,8 @@ #define PCI_VENDOR_ADVSYS 0x10cd /* Advanced System Products */ #define PCI_VENDOR_RADIUS 0x10ce /* Radius */ #define PCI_VENDOR_CITICORP 0x10cf /* Citicorp TTI */ -#define PCI_VENDOR_FUJITSU2 0x10d0 /* Fujitsu Limited (2nd PCI Vendor ID) */ +#define PCI_VENDOR_FUJITSU4 0x10cf /* Fujitsu (4th PCI Vendor ID) */ +#define PCI_VENDOR_FUJITSU2 0x10d0 /* Fujitsu (2nd PCI Vendor ID) */ #define PCI_VENDOR_FUTUREPLUS 0x10d1 /* Future+ Systems */ #define PCI_VENDOR_MOLEX 0x10d2 /* Molex */ #define PCI_VENDOR_JABIL 0x10d3 /* Jabil Circuit */ @@ -885,6 +886,7 @@ #define PCI_PRODUCT_ALTIMA_AC1000 0x03e8 /* AC1000 Gigabit Ethernet */ #define PCI_PRODUCT_ALTIMA_AC1001 0x03e9 /* AC1001 Gigabit Ethernet */ #define PCI_PRODUCT_ALTIMA_AC9100 0x03ea /* AC9100 Gigabit Ethernet */ +#define PCI_PRODUCT_ALTIMA_AC1003 0x03eb /* AC1003 Gigabit Ethernet */ /* AMD products */ #define PCI_PRODUCT_AMD_AMD64_HT 0x1100 /* K8 AMD64 HyperTransport configuration */ @@ -1034,6 +1036,7 @@ #define PCI_PRODUCT_APPLE_INTREPID2_ATA 0x0069 /* Intrepid 2 ATA */ #define PCI_PRODUCT_APPLE_INTREPID2_FW 0x006a /* Intrepid 2 FireWire */ #define PCI_PRODUCT_APPLE_INTREPID2_GMAC 0x006b /* Intrepid 2 GMAC */ +#define PCI_PRODUCT_APPLE_BCM5701 0x1645 /* BCM5701 */ /* ARC Logic products */ #define PCI_PRODUCT_ARC_1000PV 0xa091 /* 1000PV */ @@ -1426,17 +1429,23 @@ #define PCI_PRODUCT_BROADCOM_BCM5706 0x164a /* BCM5706 NetXtreme II 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5708 0x164c /* BCM5708 NetXtreme II 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5702FE 0x164d /* BCM5702FE 10/100 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57710 0x164e /* BCM57710 NetXtreme II 10Gb Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57711 0x164f /* BCM57711 NetXtreme II 10Gb Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57711E 0x1650 /* BCM57711E NetXtreme II 10Gb Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5705 0x1653 /* BCM5705 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5705K 0x1654 /* BCM5705K 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5717 0x1655 /* BCM5717 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5718 0x1656 /* BCM5718 10/100/1000 Ethernet */ -#define PCI_PRODUCT_BROADCOM_BCM5720 0x1658 /* BCM5720 NetXtreme 1000baseT Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5719 0x1657 /* BCM5719 NetXtreme 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5721 0x1659 /* BCM5721 NetXtreme 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5722 0x165a /* BCM5722 NetXtreme 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5723 0x165b /* BCM5723 NetXtreme 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5724 0x165c /* BCM5724 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5705M 0x165d /* BCM5705M 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5705M_ALT 0x165e /* BCM5705M 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5720 0x165f /* BCM5720 NetXtreme 1000baseT Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57712 0x1662 /* BCM57712 NetXtreme II 10Gb Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57712E 0x1663 /* BCM57712E NetXtreme II 10Gb Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5714 0x1668 /* BCM5714 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5714S 0x1669 /* BCM5714S 1000baseSX Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5780 0x166a /* BCM5780 NetXtreme 1000baseT Ethernet */ @@ -1457,7 +1466,9 @@ #define PCI_PRODUCT_BROADCOM_BCM5787F 0x167f /* BCM5787F 10/100 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5761E 0x1680 /* BCM5761E 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5761 0x1681 /* BCM5761 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57762 0x1682 /* BCM57762 Gigabit Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5764 0x1684 /* BCM5764 NetXtreme 1000baseT
CVS commit: [netbsd-5] src/sys/dev/mii
Module Name:src Committed By: sborrill Date: Mon Nov 9 10:31:26 UTC 2015 Modified Files: src/sys/dev/mii [netbsd-5]: miidevs.h miidevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.81.4.5 -r1.81.4.6 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.71.4.5 -r1.71.4.6 src/sys/dev/mii/miidevs_data.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/mii/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.81.4.5 src/sys/dev/mii/miidevs.h:1.81.4.6 --- src/sys/dev/mii/miidevs.h:1.81.4.5 Wed Jun 19 07:51:45 2013 +++ src/sys/dev/mii/miidevs.h Mon Nov 9 10:31:26 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.81.4.5 2013/06/19 07:51:45 bouyer Exp $ */ +/* $NetBSD: miidevs.h,v 1.81.4.6 2015/11/09 10:31:26 sborrill Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.78.4.5 2013/06/19 07:50:15 bouyer Exp + * NetBSD: miidevs,v 1.78.4.6 2015/11/09 10:31:06 sborrill Exp */ /*- @@ -47,7 +47,7 @@ * mapping; the bit positions are defined in IEEE 802-1990, figure 5.2. * (There is a formal 802.3 interpretation, number 1-07/98 of July 09 1998, * about this.) - * The MII_OUI() macro in "mii.h" reflects this. + * The MII_OUI() macro in "miivar.h" reflects this. * If a vendor uses a different mapping, an "xx" prefixed OUI is defined here * which is mangled accordingly to compensate. */ @@ -56,12 +56,14 @@ * Use "make -f Makefile.miidevs" to regenerate miidevs.h and miidevs_data.h */ +#define MII_OUI_AGERE 0x00053d /* Agere */ #define MII_OUI_ALTIMA 0x0010a9 /* Altima Communications */ #define MII_OUI_AMD 0x1a /* Advanced Micro Devices */ #define MII_OUI_ATHEROS 0x001374 /* Atheros */ #define MII_OUI_ATTANSIC 0x00c82e /* Attansic Technology */ #define MII_OUI_BROADCOM 0x001018 /* Broadcom Corporation */ #define MII_OUI_BROADCOM2 0x000af7 /* Broadcom Corporation */ +#define MII_OUI_BROADCOM3 0x001be9 /* Broadcom Corporation */ #define MII_OUI_CICADA 0x0003F1 /* Cicada Semiconductor */ #define MII_OUI_DAVICOM 0x00606e /* Davicom Semiconductor */ #define MII_OUI_ENABLESEMI 0x0010dd /* Enable Semiconductor */ @@ -71,13 +73,16 @@ #define MII_OUI_JMICRON 0x00d831 /* JMicron */ #define MII_OUI_LEVEL1 0x00207b /* Level 1 */ #define MII_OUI_MARVELL 0x005043 /* Marvell Semiconductor */ +#define MII_OUI_MICREL 0x0010a1 /* Micrel */ #define MII_OUI_MYSON 0x00c0b4 /* Myson Technology */ #define MII_OUI_NATSEMI 0x080017 /* National Semiconductor */ #define MII_OUI_PMCSIERRA 0x00e004 /* PMC-Sierra */ +#define MII_OUI_RDC 0x00d02d /* RDC Semiconductor */ #define MII_OUI_REALTEK 0x00e04c /* RealTek */ #define MII_OUI_QUALSEMI 0x006051 /* Quality Semiconductor */ #define MII_OUI_SEEQ 0x00a07d /* Seeq */ #define MII_OUI_SIS 0x00e006 /* Silicon Integrated Systems */ +#define MII_OUI_SMSC 0x00800f /* SMSC */ #define MII_OUI_TI 0x080028 /* Texas Instruments */ #define MII_OUI_TSC 0x00c039 /* TDK Semiconductor */ #define MII_OUI_XAQTI 0x00e0ae /* XaQti Corp. */ @@ -125,6 +130,16 @@ #define MII_STR_ATTANSIC_L1 "L1 10/100/1000 PHY" #define MII_MODEL_ATTANSIC_L2 0x0002 #define MII_STR_ATTANSIC_L2 "L2 10/100 PHY" +#define MII_MODEL_ATTANSIC_AR8021 0x0004 +#define MII_STR_ATTANSIC_AR8021 "Atheros AR8021 10/100/1000 PHY" +#define MII_MODEL_ATTANSIC_AR8035 0x0007 +#define MII_STR_ATTANSIC_AR8035 "Atheros AR8035 10/100/1000 PHY" + +/* + * Agere PHYs + */ +#define MII_MODEL_AGERE_ET1011 0x0004 +#define MII_STR_AGERE_ET1011 "Agere ET1011 10/100/1000baseT PHY" /* Altima Communications PHYs */ /* Don't know the model for ACXXX */ @@ -166,6 +181,8 @@ #define MII_STR_xxBROADCOM_BCM5222 "BCM5222 Dual 10/100 media interface" #define MII_MODEL_xxBROADCOM_BCM4401 0x0036 #define MII_STR_xxBROADCOM_BCM4401 "BCM4401 10/100 media interface" +#define MII_MODEL_xxBROADCOM_BCM5365 0x0037 +#define MII_STR_xxBROADCOM_BCM5365 "BCM5365 10/100 5-port PHY switch" #define MII_MODEL_BROADCOM_BCM5400 0x0004 #define MII_STR_BROADCOM_BCM5400 "BCM5400 1000BASE-T media interface" #define MII_MODEL_BROADCOM_BCM5401 0x0005 @@ -184,6 +201,8 @@ #define MII_STR_BROADCOM_BCM5752 "BCM5752 1000BASE-T media interface" #define MII_MODEL_BROADCOM_BCM5701 0x0011 #define MII_STR_BROADCOM_BCM5701 "BCM5701 1000BASE-T media interface" +#define MII_MODEL_BROADCOM_BCM5706 0x0015 +#define MII_STR_BROADCOM_BCM5706 "BCM5706 1000BASE-T/SX media interface" #define MII_MODEL_BROADCOM_BCM5703 0x0016 #define MII_STR_BROADCOM_BCM5703 "BCM5703 1000BASE-T media interface" #define MII_MODEL_BROADCOM_BCM5750 0x0018 @@ -195,17 +214,29 @@ #define MII_MODEL_BROADCOM_BCM54K2 0x002e #define MII_STR_BROADCOM_BCM54K2 "BCM54K2 1000BASE-T media interface" #define MII_MODEL_BROADCOM_BCM5714 0x0034 -#define MII_STR_BROADCOM_BCM5714 "BCM5714 1000BASE-T media interface" +#define MII_STR_BROADCOM_BCM5714 "BCM5714 1000BASE-T/X media interface" #define
CVS commit: [netbsd-5] src/sys/dev/mii
Module Name:src Committed By: sborrill Date: Mon Nov 9 10:31:06 UTC 2015 Modified Files: src/sys/dev/mii [netbsd-5]: miidevs Log Message: Pull up the following revisions(s) (requested by msaitoh in ticket #1982): sys/dev/mii/miidevs:revisions 1.79-1.80, 1.84, 1.86-1.88, 1.91-1.92, 1.94-1.96, 1.98-1.99, 1.101-1.112 via patch Sync miidevs up to rev. 1.112: - Add Agere ET1101 (PR#39094) - Add some CICADA PHYs. - AddMarvell 88E1000[S], 88E1116R, 88E1118, 88E1145, 88E1149[R], - 88E1543, 88E3016, PHYG65G - Add NS DP83849(PR#41256), DP83865. - Add Broadcom BCM5325, BCM5365, BCM548[12], BCM5706, BCM570[89]S, - BCM571[79]C, BCM5720C, BCM5756, BCM5785, BCM57765, BCM57780 - Add Atheros AR8021, AR8035 - Add RDC Semiconductor R6040 10/100 integrated PHY - Add Vitesse VSC8221 - Add SMSC LAN 87[012]0 - Add Intel I21[07]. - Add IC Plus IP100, IP1000A and IP1001 - Add Micrel KSZ9021RN - Add Relatek RTL8251 - Update comment. To generate a diff of this commit: cvs rdiff -u -r1.78.4.5 -r1.78.4.6 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.78.4.5 src/sys/dev/mii/miidevs:1.78.4.6 --- src/sys/dev/mii/miidevs:1.78.4.5 Wed Jun 19 07:50:15 2013 +++ src/sys/dev/mii/miidevs Mon Nov 9 10:31:06 2015 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.78.4.5 2013/06/19 07:50:15 bouyer Exp $ +$NetBSD: miidevs,v 1.78.4.6 2015/11/09 10:31:06 sborrill Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ $NetBSD: miidevs,v 1.78.4.5 2013/06/19 0 * mapping; the bit positions are defined in IEEE 802-1990, figure 5.2. * (There is a formal 802.3 interpretation, number 1-07/98 of July 09 1998, * about this.) - * The MII_OUI() macro in "mii.h" reflects this. + * The MII_OUI() macro in "miivar.h" reflects this. * If a vendor uses a different mapping, an "xx" prefixed OUI is defined here * which is mangled accordingly to compensate. */ @@ -49,12 +49,14 @@ $NetBSD: miidevs,v 1.78.4.5 2013/06/19 0 * Use "make -f Makefile.miidevs" to regenerate miidevs.h and miidevs_data.h */ +oui AGERE 0x00053d Agere oui ALTIMA 0x0010a9 Altima Communications oui AMD0x1a Advanced Micro Devices oui ATHEROS 0x001374 Atheros oui ATTANSIC 0x00c82e Attansic Technology oui BROADCOM 0x001018 Broadcom Corporation oui BROADCOM2 0x000af7 Broadcom Corporation +oui BROADCOM3 0x001be9 Broadcom Corporation oui CICADA 0x0003F1 Cicada Semiconductor oui DAVICOM 0x00606e Davicom Semiconductor oui ENABLESEMI 0x0010dd Enable Semiconductor @@ -64,13 +66,16 @@ oui INTEL 0x00aa00 Intel oui JMICRON 0x00d831 JMicron oui LEVEL1 0x00207b Level 1 oui MARVELL 0x005043 Marvell Semiconductor +oui MICREL 0x0010a1 Micrel oui MYSON 0x00c0b4 Myson Technology oui NATSEMI 0x080017 National Semiconductor oui PMCSIERRA 0x00e004 PMC-Sierra +oui RDC0x00d02d RDC Semiconductor oui REALTEK 0x00e04c RealTek oui QUALSEMI 0x006051 Quality Semiconductor oui SEEQ 0x00a07d Seeq oui SIS0x00e006 Silicon Integrated Systems +oui SMSC 0x00800f SMSC oui TI0x080028 Texas Instruments oui TSC0x00c039 TDK Semiconductor oui XAQTI 0x00e0ae XaQti Corp. @@ -114,6 +119,13 @@ model ATHEROS F2 0x0002 F2 10/100 PHY /* Attansic PHYs */ model ATTANSIC L1 0x0001 L1 10/100/1000 PHY model ATTANSIC L2 0x0002 L2 10/100 PHY +model ATTANSIC AR8021 0x0004 Atheros AR8021 10/100/1000 PHY +model ATTANSIC AR8035 0x0007 Atheros AR8035 10/100/1000 PHY + +/* + * Agere PHYs + */ +model AGERE ET1011 0x0004 Agere ET1011 10/100/1000baseT PHY /* Altima Communications PHYs */ /* Don't know the model for ACXXX */ @@ -139,6 +151,7 @@ model xxBROADCOM BCM5214 0x0028 BCM5214 model xxBROADCOM BCM5221 0x001e BCM5221 10/100 media interface model xxBROADCOM BCM5222 0x0032 BCM5222 Dual 10/100 media interface model xxBROADCOM BCM4401 0x0036 BCM4401 10/100 media interface +model xxBROADCOM BCM5365 0x0037 BCM5365 10/100 5-port PHY switch model BROADCOM BCM5400 0x0004 BCM5400 1000BASE-T media interface model BROADCOM BCM5401 0x0005 BCM5401 1000BASE-T media interface model BROADCOM BCM5411 0x0007 BCM5411 1000BASE-T media interface @@ -148,28 +161,45 @@ model BROADCOM BCM5462 0x000d BCM5462 1 model BROADCOM BCM5421 0x000e BCM5421 1000BASE-T media interface model BROADCOM BCM5752 0x0010 BCM5752 1000BASE-T media interface model BROADCOM BCM5701 0x0011 BCM5701 1000BASE-T media interface +model BROADCOM BCM5706 0x0015 BCM5706 1000BASE-T/SX media interface model BROADCOM BCM5703 0x0016 BCM5703 1000BASE-T media interface model BROADCOM BCM5750 0x0018 BCM5750 1000BASE-T media interface model BROADCOM BCM5704 0x0019 BCM5704 1000BASE-T media interface model BROADCOM BCM5705 0x001a BCM5705 1000BASE-T media interface model BROADCOM BCM54K2 0x002e BCM54K2 1000BASE-T media interface -model
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Mon Nov 9 10:36:46 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket #1982 To generate a diff of this commit: cvs rdiff -u -r1.1.2.126 -r1.1.2.127 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.126 src/doc/CHANGES-5.3:1.1.2.127 --- src/doc/CHANGES-5.3:1.1.2.126 Sat Nov 7 20:52:40 2015 +++ src/doc/CHANGES-5.3 Mon Nov 9 10:36:46 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.126 2015/11/07 20:52:40 snj Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.127 2015/11/09 10:36:46 sborrill Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -4078,3 +4078,26 @@ sys/kern/kern_exit.c1.248 Update value of p_stat before we release the proc_lock. [pgoyette, ticket #1981] +sys/dev/mii/miidevs1.79-1.80, 1.84, 1.86-1.88, 1.91-1.92, 1.94-1.96, 1.98-1.99, 1.101-1.112 via patch +sys/dev/mii/miidevs.hregen +sys/dev/mii/miidevs_data.h regen + + Sync miidevs up to rev. 1.112: + - Add Agere ET1101 (PR#39094) + - Add some CICADA PHYs. + - AddMarvell 88E1000[S], 88E1116R, 88E1118, 88E1145, 88E1149[R], + 88E1543, 88E3016, PHYG65G + - Add NS DP83849(PR#41256), DP83865. + - Add Broadcom BCM5325, BCM5365, BCM548[12], BCM5706, BCM570[89]S, + BCM571[79]C, BCM5720C, BCM5756, BCM5785, BCM57765, BCM57780 + - Add Atheros AR8021, AR8035 + - Add RDC Semiconductor R6040 10/100 integrated PHY + - Add Vitesse VSC8221 + - Add SMSC LAN 87[012]0 + - Add Intel I21[07]. + - Add IC Plus IP100, IP1000A and IP1001 + - Add Micrel KSZ9021RN + - Add Relatek RTL8251 + - Update comment. + [msaitoh, ticket #1982] +
CVS commit: [netbsd-5] src/sys/ufs/lfs
Module Name:src
Committed By: sborrill
Date: Mon Nov 9 09:59:18 UTC 2015
Modified Files:
src/sys/ufs/lfs [netbsd-5]: lfs_segment.c
Log Message:
Fix breakage from ticket #1974
To generate a diff of this commit:
cvs rdiff -u -r1.213.8.1 -r1.213.8.2 src/sys/ufs/lfs/lfs_segment.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/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.213.8.1 src/sys/ufs/lfs/lfs_segment.c:1.213.8.2
--- src/sys/ufs/lfs/lfs_segment.c:1.213.8.1 Sat Nov 7 20:30:41 2015
+++ src/sys/ufs/lfs/lfs_segment.c Mon Nov 9 09:59:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.213.8.1 2015/11/07 20:30:41 snj Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.213.8.2 2015/11/09 09:59:18 sborrill Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.213.8.1 2015/11/07 20:30:41 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.213.8.2 2015/11/09 09:59:18 sborrill Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -1700,7 +1700,7 @@ lfs_rewind(struct lfs *fs, int newsn)
panic("lfs_rewind: no clean segments");
if (newsn >= 0 && sn >= newsn)
return ENOENT;
- fs->lfs_nextseg = lfs_sntod(fs, sn);
+ fs->lfs_nextseg = sntod(fs, sn);
lfs_newseg(fs);
fs->lfs_offset = fs->lfs_curseg;
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Tue Aug 11 08:29:03 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Fix typos To generate a diff of this commit: cvs rdiff -u -r1.1.2.365 -r1.1.2.366 src/doc/CHANGES-7.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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.365 src/doc/CHANGES-7.0:1.1.2.366 --- src/doc/CHANGES-7.0:1.1.2.365 Tue Aug 11 05:37:41 2015 +++ src/doc/CHANGES-7.0 Tue Aug 11 08:29:03 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.365 2015/08/11 05:37:41 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.366 2015/08/11 08:29:03 sborrill Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -33897,14 +33897,14 @@ sys/arch/x86/x86/coretemp.c 1.34 sys/arch/x86/x86/cpu_ucode_intel.c 1.7, 1.8 - Re-allocale buffer if a buffer for microcode is not 16byte + Re-allocate buffer if a buffer for microcode is not 16-byte aligned. [msaitoh, ticket #945] sys/arch/x86/x86/mpacpi.c 1.98 Fix wrong output in mpacpi_pci_foundbus() with MPVERBOSE. - Assign vaues before printing them. + Assign values before printing them. [msaitoh, ticket #947] distrib/notes/common/main patched by hand
CVS commit: src/sbin/raidctl
Module Name:src
Committed By: sborrill
Date: Tue Jun 30 17:02:14 UTC 2015
Modified Files:
src/sbin/raidctl: raidctl.c
Log Message:
Compare correct length string for force option to -A
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sbin/raidctl/raidctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/raidctl/raidctl.c
diff -u src/sbin/raidctl/raidctl.c:1.60 src/sbin/raidctl/raidctl.c:1.61
--- src/sbin/raidctl/raidctl.c:1.60 Fri Jun 26 01:16:54 2015
+++ src/sbin/raidctl/raidctl.c Tue Jun 30 17:02:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: raidctl.c,v 1.60 2015/06/26 01:16:54 pooka Exp $ */
+/* $NetBSD: raidctl.c,v 1.61 2015/06/30 17:02:14 sborrill Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: raidctl.c,v 1.60 2015/06/26 01:16:54 pooka Exp $);
+__RCSID($NetBSD: raidctl.c,v 1.61 2015/06/30 17:02:14 sborrill Exp $);
#endif
@@ -812,7 +812,7 @@ set_autoconfig(int fd, int raidID, char
if (strncasecmp(autoconf, root, 4) == 0 ||
strncasecmp(autoconf, hard, 4) == 0 ||
- strncasecmp(autoconf, force, 4) == 0) {
+ strncasecmp(autoconf, force, 5) == 0) {
root_config = 1;
} else if (strncasecmp(autoconf, soft, 4) == 0) {
root_config = 2;
CVS commit: src/sbin/raidctl
Module Name:src Committed By: sborrill Date: Tue Jun 30 17:18:14 UTC 2015 Modified Files: src/sbin/raidctl: raidctl.8 Log Message: Clarify that what was previously known as -A root is now -A forceroot, not -A softroot and that -A root can still be used for historical reasons. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sbin/raidctl/raidctl.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/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.67 src/sbin/raidctl/raidctl.8:1.68 --- src/sbin/raidctl/raidctl.8:1.67 Thu Apr 3 18:54:10 2014 +++ src/sbin/raidctl/raidctl.8 Tue Jun 30 17:18:13 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: raidctl.8,v 1.67 2014/04/03 18:54:10 christos Exp $ +.\ $NetBSD: raidctl.8,v 1.68 2015/06/30 17:18:13 sborrill Exp $ .\ .\ Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -175,6 +175,16 @@ in the disklabel. Note that only certain architectures .Pq currently alpha, amd64, i386, pmax, sandpoint, sparc, sparc64, and vax support booting a kernel directly from a RAID set. +Please note that +.Ic forceroot +mode was referred to as +.Ic root +mode on earlier versions of +.Nx . +For compatibility reasons, +.Ic root +can be used as an alias for +.Ic forceroot. .It Fl A Ic softroot Ar dev Like .Ic forceroot , @@ -1265,7 +1275,7 @@ partition of such a RAID set being used .Pa / . To use raid0a as the root file system, simply use: .Bd -literal -offset indent -raidctl -A root raid0 +raidctl -A forceroot raid0 .Ed .Pp To return raid0a to be just an auto-configuring set simply use the
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Tue Jun 2 10:14:45 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #817 To generate a diff of this commit: cvs rdiff -u -r1.1.2.314 -r1.1.2.315 src/doc/CHANGES-7.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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.314 src/doc/CHANGES-7.0:1.1.2.315 --- src/doc/CHANGES-7.0:1.1.2.314 Mon Jun 1 19:40:04 2015 +++ src/doc/CHANGES-7.0 Tue Jun 2 10:14:45 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.314 2015/06/01 19:40:04 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.315 2015/06/02 10:14:45 sborrill Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -23614,3 +23614,9 @@ external/gpl3/gcc/dist/gcc/config/arm/t- libraries on earm* machines. [martin, ticket #816] +sys/arch/vax/vsa/vsbus.c 1.61 + + Fix VAX46 and VAX48 vsbus attach config. Addresses PR + port-vax/49935. + [abs, ticket #817] +
CVS commit: [netbsd-7] src/sys/arch/vax/vsa
Module Name:src Committed By: sborrill Date: Tue Jun 2 10:14:22 UTC 2015 Modified Files: src/sys/arch/vax/vsa [netbsd-7]: vsbus.c Log Message: Pull up the following revisions(s) (requested by abs in ticket #817): sys/arch/vax/vsa/vsbus.c: revision 1.61 Fix VAX46 and VAX48 vsbus attach config. Addresses PR port-vax/49935. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.60.14.1 src/sys/arch/vax/vsa/vsbus.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/vax/vsa/vsbus.c diff -u src/sys/arch/vax/vsa/vsbus.c:1.60 src/sys/arch/vax/vsa/vsbus.c:1.60.14.1 --- src/sys/arch/vax/vsa/vsbus.c:1.60 Thu Jun 28 13:58:21 2012 +++ src/sys/arch/vax/vsa/vsbus.c Tue Jun 2 10:14:22 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $ */ +/* $NetBSD: vsbus.c,v 1.60.14.1 2015/06/02 10:14:22 sborrill Exp $ */ /* * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $); +__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.60.14.1 2015/06/02 10:14:22 sborrill Exp $); #include opt_cputype.h @@ -138,6 +138,7 @@ vsbus_attach(device_t parent, device_t s sc-sc_intclr = (char *)sc-sc_vsregs + 15; sc-sc_intmsk = (char *)sc-sc_vsregs + 12; vsbus_dma_init(sc, 32768); + break; #endif default:
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: sborrill Date: Tue Jun 2 14:51:11 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #818 To generate a diff of this commit: cvs rdiff -u -r1.1.2.315 -r1.1.2.316 src/doc/CHANGES-7.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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.315 src/doc/CHANGES-7.0:1.1.2.316 --- src/doc/CHANGES-7.0:1.1.2.315 Tue Jun 2 10:14:45 2015 +++ src/doc/CHANGES-7.0 Tue Jun 2 14:51:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.315 2015/06/02 10:14:45 sborrill Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.316 2015/06/02 14:51:11 sborrill Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -23620,3 +23620,9 @@ sys/arch/vax/vsa/vsbus.c 1.61 port-vax/49935. [abs, ticket #817] +sys/external/bsd/drm2/radeon/radeon_pci.c 1.10 + + Disable drmkms on R100 and most R200 cards. Works around + PR#49744. + [mrg, ticket #818] +
CVS commit: [netbsd-7] src/sys/external/bsd/drm2/radeon
Module Name:src
Committed By: sborrill
Date: Tue Jun 2 14:50:50 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/radeon [netbsd-7]: radeon_pci.c
Log Message:
Pull up the following revisions(s) (requested by mrg in ticket #818):
sys/external/bsd/drm2/radeon/radeon_pci.c: revision 1.10
Disable drmkms on R100 and most R200 cards. Works around PR#49744.
To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 \
src/sys/external/bsd/drm2/radeon/radeon_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.4.4.2 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.4.4.3
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.4.4.2 Thu Apr 23 07:31:17 2015
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Tue Jun 2 14:50:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.4.4.2 2015/04/23 07:31:17 snj Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.4.4.3 2015/06/02 14:50:50 sborrill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeon_pci.c,v 1.4.4.2 2015/04/23 07:31:17 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeon_pci.c,v 1.4.4.3 2015/06/02 14:50:50 sborrill Exp $);
#ifdef _KERNEL_OPT
#include vga.h
@@ -118,10 +118,14 @@ extern struct drm_driver *const radeon_d
extern const struct pci_device_id *const radeon_device_ids;
extern const size_t radeon_n_device_ids;
+/* Set this to false if you want to match R100/R200 */
+bool radeon_pci_ignore_r100_r200 = true;
+
static bool
radeon_pci_lookup(const struct pci_attach_args *pa, unsigned long *flags)
{
size_t i;
+ enum radeon_family fam;
for (i = 0; i radeon_n_device_ids; i++) {
if ((PCI_VENDOR(pa-pa_id) == radeon_device_ids[i].vendor)
@@ -133,6 +137,11 @@ radeon_pci_lookup(const struct pci_attac
if (i == radeon_n_device_ids)
return false;
+ /* NetBSD drm2 fails on R100 and many R200 chipsets, disable for now */
+ fam = radeon_device_ids[i].driver_data RADEON_FAMILY_MASK;
+ if (radeon_pci_ignore_r100_r200 fam CHIP_RV280)
+ return false;
+
if (flags)
*flags = radeon_device_ids[i].driver_data;
return true;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Mon Jun 1 15:48:07 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket #1968 To generate a diff of this commit: cvs rdiff -u -r1.1.2.117 -r1.1.2.118 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.117 src/doc/CHANGES-5.3:1.1.2.118 --- src/doc/CHANGES-5.3:1.1.2.117 Mon Jun 1 14:44:31 2015 +++ src/doc/CHANGES-5.3 Mon Jun 1 15:48:07 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.117 2015/06/01 14:44:31 sborrill Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.118 2015/06/01 15:48:07 sborrill Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -3909,3 +3909,9 @@ sys/arch/i386/i386/cpufunc.S 1.16-1.17 Backport rdmsr_safe() to access MSR safely. [msaitoh, ticket #1969] +sys/arch/x86/include/specialreg.h 1.72 via patch + + Add CPUID_TO_*() macros to avoid bug. Old macros are kept for + compatibility. + [msaitoh, ticket #1968] +
CVS commit: [netbsd-5-1] src/sys/arch/x86/include
Module Name:src Committed By: sborrill Date: Mon Jun 1 15:49:47 UTC 2015 Modified Files: src/sys/arch/x86/include [netbsd-5-1]: specialreg.h Log Message: Pull up the following revisions(s) (requested by msaitoh in ticket #1968): sys/arch/x86/include/specialreg.h: revision 1.72 via patch Backup CPUID_TO_*() macros. Old macros are kept for compatibility. To generate a diff of this commit: cvs rdiff -u -r1.31.4.1 -r1.31.4.1.2.1 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.31.4.1 src/sys/arch/x86/include/specialreg.h:1.31.4.1.2.1 --- src/sys/arch/x86/include/specialreg.h:1.31.4.1 Tue Jun 16 02:23:31 2009 +++ src/sys/arch/x86/include/specialreg.h Mon Jun 1 15:49:47 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.31.4.1 2009/06/16 02:23:31 snj Exp $ */ +/* $NetBSD: specialreg.h,v 1.31.4.1.2.1 2015/06/01 15:49:47 sborrill Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -240,13 +240,39 @@ \11TM2\12SSSE3\13CID\16CX16\17xTPR\20PDCM\23DCA \ \24SSE41\25SSE42\26X2APIC\30POPCNT -#define CPUID2FAMILY(cpuid) (((cpuid) 8) 0xf) -#define CPUID2MODEL(cpuid) (((cpuid) 4) 0xf) -#define CPUID2STEPPING(cpuid) ((cpuid) 0xf) - -/* Extended family and model are defined on amd64 processors */ -#define CPUID2EXTFAMILY(cpuid) (((cpuid) 20) 0xff) -#define CPUID2EXTMODEL(cpuid) (((cpuid) 16) 0xf) +/* CPUID Fn0001 %eax */ + +#define CPUID_TO_BASEFAMILY(cpuid) (((cpuid) 8) 0xf) +#define CPUID_TO_BASEMODEL(cpuid) (((cpuid) 4) 0xf) +#define CPUID_TO_STEPPING(cpuid) ((cpuid) 0xf) + +/* Old macros for compatibility */ +#define CPUID2FAMILY(cpuid) CPUID_TO_BASEFAMILY(cpuid) +#define CPUID2MODEL(cpuid) CPUID_TO_BASEMODEL(cpuid) +#define CPUID2STEPPING(cpuid) CPUID_TO_STEPPING(cpuid) + +/* + * The Extended family bits should only be inspected when CPUID_TO_BASEFAMILY() + * returns 15. They are use to encode family value 16 to 270 (add 15). + * The Extended model bits are the high 4 bits of the model. + * They are only valid for family = 15 or family 6 (intel, but all amd + * family 6 are documented to return zero bits for them). + */ +#define CPUID_TO_EXTFAMILY(cpuid) (((cpuid) 20) 0xff) +#define CPUID_TO_EXTMODEL(cpuid) (((cpuid) 16) 0xf) + +/* Old macros for compatibility */ +#define CPUID2EXTFAMILY(cpuid) CPUID_TO_EXTFAMILY(cpuid) +#define CPUID2EXTMODEL(cpuid) CPUID_TO_EXTMODEL(cpuid) + +/* The macros for the Display Family and the Display Model */ +#define CPUID_TO_FAMILY(cpuid) (CPUID_TO_BASEFAMILY(cpuid) \ + + ((CPUID_TO_BASEFAMILY(cpuid) != 0x0f) \ + ? 0 : CPUID_TO_EXTFAMILY(cpuid))) +#define CPUID_TO_MODEL(cpuid) (CPUID_TO_BASEMODEL(cpuid) \ + | ((CPUID_TO_BASEFAMILY(cpuid) != 0x0f) \ + (CPUID_TO_BASEFAMILY(cpuid) != 0x06) \ + ? 0 : (CPUID_TO_EXTMODEL(cpuid) 4))) /* * Model-specific registers for the i386 family
CVS commit: [netbsd-5-2] src/sys/arch/x86/include
Module Name:src Committed By: sborrill Date: Mon Jun 1 15:49:16 UTC 2015 Modified Files: src/sys/arch/x86/include [netbsd-5-2]: specialreg.h Log Message: Pull up the following revisions(s) (requested by msaitoh in ticket #1968): sys/arch/x86/include/specialreg.h: revision 1.72 via patch Backup CPUID_TO_*() macros. Old macros are kept for compatibility. To generate a diff of this commit: cvs rdiff -u -r1.31.4.2 -r1.31.4.2.2.1 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.31.4.2 src/sys/arch/x86/include/specialreg.h:1.31.4.2.2.1 --- src/sys/arch/x86/include/specialreg.h:1.31.4.2 Wed Nov 28 04:39:03 2012 +++ src/sys/arch/x86/include/specialreg.h Mon Jun 1 15:49:16 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.31.4.2 2012/11/28 04:39:03 riz Exp $ */ +/* $NetBSD: specialreg.h,v 1.31.4.2.2.1 2015/06/01 15:49:16 sborrill Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -240,13 +240,39 @@ \11TM2\12SSSE3\13CID\16CX16\17xTPR\20PDCM\23DCA \ \24SSE41\25SSE42\26X2APIC\30POPCNT -#define CPUID2FAMILY(cpuid) (((cpuid) 8) 0xf) -#define CPUID2MODEL(cpuid) (((cpuid) 4) 0xf) -#define CPUID2STEPPING(cpuid) ((cpuid) 0xf) - -/* Extended family and model are defined on amd64 processors */ -#define CPUID2EXTFAMILY(cpuid) (((cpuid) 20) 0xff) -#define CPUID2EXTMODEL(cpuid) (((cpuid) 16) 0xf) +/* CPUID Fn0001 %eax */ + +#define CPUID_TO_BASEFAMILY(cpuid) (((cpuid) 8) 0xf) +#define CPUID_TO_BASEMODEL(cpuid) (((cpuid) 4) 0xf) +#define CPUID_TO_STEPPING(cpuid) ((cpuid) 0xf) + +/* Old macros for compatibility */ +#define CPUID2FAMILY(cpuid) CPUID_TO_BASEFAMILY(cpuid) +#define CPUID2MODEL(cpuid) CPUID_TO_BASEMODEL(cpuid) +#define CPUID2STEPPING(cpuid) CPUID_TO_STEPPING(cpuid) + +/* + * The Extended family bits should only be inspected when CPUID_TO_BASEFAMILY() + * returns 15. They are use to encode family value 16 to 270 (add 15). + * The Extended model bits are the high 4 bits of the model. + * They are only valid for family = 15 or family 6 (intel, but all amd + * family 6 are documented to return zero bits for them). + */ +#define CPUID_TO_EXTFAMILY(cpuid) (((cpuid) 20) 0xff) +#define CPUID_TO_EXTMODEL(cpuid) (((cpuid) 16) 0xf) + +/* Old macros for compatibility */ +#define CPUID2EXTFAMILY(cpuid) CPUID_TO_EXTFAMILY(cpuid) +#define CPUID2EXTMODEL(cpuid) CPUID_TO_EXTMODEL(cpuid) + +/* The macros for the Display Family and the Display Model */ +#define CPUID_TO_FAMILY(cpuid) (CPUID_TO_BASEFAMILY(cpuid) \ + + ((CPUID_TO_BASEFAMILY(cpuid) != 0x0f) \ + ? 0 : CPUID_TO_EXTFAMILY(cpuid))) +#define CPUID_TO_MODEL(cpuid) (CPUID_TO_BASEMODEL(cpuid) \ + | ((CPUID_TO_BASEFAMILY(cpuid) != 0x0f) \ + (CPUID_TO_BASEFAMILY(cpuid) != 0x06) \ + ? 0 : (CPUID_TO_EXTMODEL(cpuid) 4))) /* * Model-specific registers for the i386 family
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: sborrill Date: Mon Jun 1 15:52:03 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Ticket #1968 To generate a diff of this commit: cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-5.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.6 diff -u src/doc/CHANGES-5.1.6:1.1.2.28 src/doc/CHANGES-5.1.6:1.1.2.29 --- src/doc/CHANGES-5.1.6:1.1.2.28 Mon Jun 1 14:45:27 2015 +++ src/doc/CHANGES-5.1.6 Mon Jun 1 15:52:03 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.28 2015/06/01 14:45:27 sborrill Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.29 2015/06/01 15:52:03 sborrill Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -2619,3 +2619,9 @@ sys/arch/i386/i386/cpufunc.S 1.16-1.17 Backport rdmsr_safe() to access MSR safely. [msaitoh, ticket #1969] +sys/arch/x86/include/specialreg.h 1.72 via patch + + Add CPUID_TO_*() macros to avoid bug. Old macros are kept for + compatibility. + [msaitoh, ticket #1968] +
