CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Oct 12 05:50:56 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: ixg(4): Don't print wrong error message about ixgbe_num_queues. Don't override the ixgbe_num_queues global variable. It's the default value of the number of queues and should not override it because it will be referenced by later device attach. For example, the number of MSI-X vector is 64 on X540 and 18 on 82599. When both cards are inserted to a machine that the number of CPU is 24 and X540 is probed earlier, ixgbe_num_queues is overridden to 24 and the following error message is printed when attaching 82599: ixg2: autoconfiguration error: ixgbe_num_queues (24) is too large, using reduced amount (17). Note that the number of queues is in sc->num_queuss and referenced by hw.ixgN.num_queues sysctl. To generate a diff of this commit: cvs rdiff -u -r1.341 -r1.342 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.341 src/sys/dev/pci/ixgbe/ixgbe.c:1.342 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.341 Thu Oct 12 03:43:55 2023 +++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Oct 12 05:50:55 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.341 2023/10/12 03:43:55 msaitoh Exp $ */ +/* $NetBSD: ixgbe.c,v 1.342 2023/10/12 05:50:55 msaitoh Exp $ */ /** @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.341 2023/10/12 03:43:55 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.342 2023/10/12 05:50:55 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -7121,9 +7121,6 @@ ixgbe_configure_interrupts(struct ixgbe_ queues = uimin(queues, uimin(mac->max_tx_queues, mac->max_rx_queues)); - /* reflect correct sysctl value */ - ixgbe_num_queues = queues; - /* * Want one vector (RX/TX pair) per queue * plus an additional for Link.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Oct 12 05:50:56 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: ixg(4): Don't print wrong error message about ixgbe_num_queues. Don't override the ixgbe_num_queues global variable. It's the default value of the number of queues and should not override it because it will be referenced by later device attach. For example, the number of MSI-X vector is 64 on X540 and 18 on 82599. When both cards are inserted to a machine that the number of CPU is 24 and X540 is probed earlier, ixgbe_num_queues is overridden to 24 and the following error message is printed when attaching 82599: ixg2: autoconfiguration error: ixgbe_num_queues (24) is too large, using reduced amount (17). Note that the number of queues is in sc->num_queuss and referenced by hw.ixgN.num_queues sysctl. To generate a diff of this commit: cvs rdiff -u -r1.341 -r1.342 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: rin Date: Thu Oct 12 04:08:44 UTC 2023 Modified Files: src/sys/dev/pci/igc: if_igc.c Log Message: igc(4): igc_init: Enable interrupt after everything is set up Inspired by "ixgbe: Enable interrupt after setting IFF_RUNNING.": http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/pci/ixgbe/ixgbe.c#rev1.337 Just for sure, callout_schedule(9) for igc_tick() is also postponed. This is NFC for now, although. XXX Check other drivers. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/igc/if_igc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/igc/if_igc.c diff -u src/sys/dev/pci/igc/if_igc.c:1.5 src/sys/dev/pci/igc/if_igc.c:1.6 --- src/sys/dev/pci/igc/if_igc.c:1.5 Wed Oct 11 18:19:43 2023 +++ src/sys/dev/pci/igc/if_igc.c Thu Oct 12 04:08:44 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: if_igc.c,v 1.5 2023/10/11 18:19:43 riastradh Exp $ */ +/* $NetBSD: if_igc.c,v 1.6 2023/10/12 04:08:44 rin Exp $ */ /* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.5 2023/10/11 18:19:43 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.6 2023/10/12 04:08:44 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -1541,17 +1541,17 @@ igc_init_locked(struct igc_softc *sc) mutex_exit(>rxr_lock); } - igc_enable_intr(sc); - sc->sc_core_stopping = false; - callout_schedule(>sc_tick_ch, hz); - ifp->if_flags |= IFF_RUNNING; /* Save last flags for the callback */ sc->sc_if_flags = ifp->if_flags; + callout_schedule(>sc_tick_ch, hz); + + igc_enable_intr(sc); + return 0; }
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: rin Date: Thu Oct 12 04:08:44 UTC 2023 Modified Files: src/sys/dev/pci/igc: if_igc.c Log Message: igc(4): igc_init: Enable interrupt after everything is set up Inspired by "ixgbe: Enable interrupt after setting IFF_RUNNING.": http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/pci/ixgbe/ixgbe.c#rev1.337 Just for sure, callout_schedule(9) for igc_tick() is also postponed. This is NFC for now, although. XXX Check other drivers. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/igc/if_igc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu Oct 12 03:43:55 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.c ixv.c
Log Message:
ixgbe: Whitespace. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.340 -r1.341 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.189 -r1.190 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.103 src/sys/dev/pci/ixgbe/ix_txrx.c:1.104
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.103 Fri Oct 6 14:48:08 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Oct 12 03:43:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.103 2023/10/06 14:48:08 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.104 2023/10/12 03:43:55 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.103 2023/10/06 14:48:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.104 2023/10/12 03:43:55 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1274,9 +1274,9 @@ ixgbe_rsc_count(union ixgbe_adv_rx_desc
static void
ixgbe_setup_hw_rsc(struct rx_ring *rxr)
{
- struct ixgbe_softc *sc = rxr->sc;
- struct ixgbe_hw *hw = >hw;
- u32 rscctrl, rdrxctl;
+ struct ixgbe_softc *sc = rxr->sc;
+ struct ixgbe_hw *hw = >hw;
+ u32 rscctrl, rdrxctl;
/* If turning LRO/RSC off we need to disable it */
if ((sc->ifp->if_capenable & IFCAP_LRO) == 0) {
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.340 src/sys/dev/pci/ixgbe/ixgbe.c:1.341
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.340 Wed Oct 11 09:43:17 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Oct 12 03:43:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.340 2023/10/11 09:43:17 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.341 2023/10/12 03:43:55 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.340 2023/10/11 09:43:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.341 2023/10/12 03:43:55 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -5307,7 +5307,7 @@ ixgbe_legacy_irq(void *arg)
struct ixgbe_softc *sc = que->sc;
struct ixgbe_hw *hw = >hw;
struct ifnet *ifp = sc->ifp;
- struct tx_ring *txr = sc->tx_rings;
+ struct tx_ring *txr = sc->tx_rings;
u32 eicr;
u32 eims_orig;
u32 eims_enable = 0;
@@ -6868,8 +6868,8 @@ static int
ixgbe_allocate_msix(struct ixgbe_softc *sc, const struct pci_attach_args *pa)
{
device_t dev = sc->dev;
- struct ix_queue *que = sc->queues;
- struct tx_ring *txr = sc->tx_rings;
+ struct ix_queue *que = sc->queues;
+ struct tx_ring *txr = sc->tx_rings;
pci_chipset_tag_t pc;
char intrbuf[PCI_INTRSTR_LEN];
char intr_xname[32];
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.189 src/sys/dev/pci/ixgbe/ixv.c:1.190
--- src/sys/dev/pci/ixgbe/ixv.c:1.189 Fri Oct 6 14:46:31 2023
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Oct 12 03:43:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixv.c,v 1.189 2023/10/06 14:46:31 msaitoh Exp $ */
+/* $NetBSD: ixv.c,v 1.190 2023/10/12 03:43:55 msaitoh Exp $ */
/**
@@ -35,7 +35,7 @@
/*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.189 2023/10/06 14:46:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.190 2023/10/12 03:43:55 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1603,7 +1603,7 @@ ixv_free_deferred_handlers(struct ixgbe_
static void
ixv_free_pci_resources(struct ixgbe_softc *sc)
{
- struct ix_queue *que = sc->queues;
+ struct ix_queue *que = sc->queues;
int rid;
/*
@@ -3377,7 +3377,7 @@ ixv_allocate_msix(struct ixgbe_softc *sc
{
device_t dev = sc->dev;
struct ix_queue *que = sc->queues;
- struct tx_ring *txr = sc->tx_rings;
+ struct tx_ring *txr = sc->tx_rings;
int error, msix_ctrl, rid, vector = 0;
pci_chipset_tag_t pc;
pcitag_t tag;
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Oct 12 03:43:55 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.c ixv.c Log Message: ixgbe: Whitespace. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.340 -r1.341 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.189 -r1.190 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src
Committed By: uwe
Date: Thu Oct 12 01:45:07 UTC 2023
Modified Files:
src/bin/sh: sh.1
Log Message:
sh(1): touch up markup for the ENV example
Don't use Dq in a literal display, ascii quotes are \*q
While here mark up as literal a few things around this example.
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/bin/sh/sh.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.257 src/bin/sh/sh.1:1.258
--- src/bin/sh/sh.1:1.257 Fri Sep 1 01:57:54 2023
+++ src/bin/sh/sh.1 Thu Oct 12 01:45:07 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: sh.1,v 1.257 2023/09/01 01:57:54 kre Exp $
+.\" $NetBSD: sh.1,v 1.258 2023/10/12 01:45:07 uwe Exp $
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -136,14 +136,14 @@ automatically by the system
when the user first logs in.
A login shell first reads commands
(as if by using the
-.Dq \&.
+.Ql \&.
command)
from the files
.Pa /etc/profile
and
.Pa .profile
in the user's home directory
-.Pq \&$HOME ,
+.Pq Li \&$HOME ,
if they exist.
If the environment variable
.Ev ENV
@@ -164,7 +164,7 @@ Note that no error messages result from
expansions, to verify that
.Ev ENV
is correct, as desired, use:
-.Dl eval printf '%s\e\en' Dq \&${ENV}
+.Dl eval printf '%s\e\en' \*q${ENV}\*q
Otherwise if
.Ev ENV
appears to contain a command substitution,
@@ -188,7 +188,7 @@ of your home directory
.Dl ENV=$HOME/.shinit; export ENV
.Pp
substituting for
-.Dq .shinit
+.Pa .shinit
any filename you wish.
Since the
.Ev ENV
CVS commit: src/bin/sh
Module Name:src Committed By: uwe Date: Thu Oct 12 01:45:07 UTC 2023 Modified Files: src/bin/sh: sh.1 Log Message: sh(1): touch up markup for the ENV example Don't use Dq in a literal display, ascii quotes are \*q While here mark up as literal a few things around this example. To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/syslogd
Module Name:src Committed By: uwe Date: Wed Oct 11 23:22:14 UTC 2023 Modified Files: src/usr.sbin/syslogd: syslogd.c Log Message: syslogd.c: fix a typo in a comment To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 src/usr.sbin/syslogd/syslogd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/syslogd
Module Name:src
Committed By: uwe
Date: Wed Oct 11 23:22:14 UTC 2023
Modified Files:
src/usr.sbin/syslogd: syslogd.c
Log Message:
syslogd.c: fix a typo in a comment
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/usr.sbin/syslogd/syslogd.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/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.140 src/usr.sbin/syslogd/syslogd.c:1.141
--- src/usr.sbin/syslogd/syslogd.c:1.140 Tue Nov 8 01:43:09 2022
+++ src/usr.sbin/syslogd/syslogd.c Wed Oct 11 23:22:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.140 2022/11/08 01:43:09 uwe Exp $ */
+/* $NetBSD: syslogd.c,v 1.141 2023/10/11 23:22:13 uwe Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.140 2022/11/08 01:43:09 uwe Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.141 2023/10/11 23:22:13 uwe Exp $");
#endif
#endif /* not lint */
@@ -1777,7 +1777,7 @@ check_timestamp(unsigned char *from_buf,
*/
*to_buf = strdup("-");
} else {
-/* with BSD Syslog the field is reqired
+/* with BSD Syslog the field is required
* so replace it with current time
*/
*to_buf = make_timestamp(NULL, false, 0);
CVS commit: src/external/mpl/mozilla-certdata/share
Module Name:src
Committed By: riastradh
Date: Wed Oct 11 19:57:25 UTC 2023
Modified Files:
src/external/mpl/mozilla-certdata/share: certdata.awk
Log Message:
certdata.awk: Treat CKT_NSS_TRUSTED as untrusted _as a CA_.
This means the certificate is trusted for the listed purpose, not as
a CA to issue certificates for the listed purpose.
Clarify warning message in this case.
No change to imported certificates so no need to regen or pull up --
this designator does not actually appear in certdata.txt, only in
Mozilla nss source code.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/mozilla-certdata/share/certdata.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/mozilla-certdata/share/certdata.awk
diff -u src/external/mpl/mozilla-certdata/share/certdata.awk:1.1 src/external/mpl/mozilla-certdata/share/certdata.awk:1.2
--- src/external/mpl/mozilla-certdata/share/certdata.awk:1.1 Sat Aug 26 05:47:53 2023
+++ src/external/mpl/mozilla-certdata/share/certdata.awk Wed Oct 11 19:57:25 2023
@@ -160,7 +160,7 @@ function addtrust(trustfile, desc) {
return
}
trust_lineno[desc":"lolab] = NR
- if ($3 == "CKT_NSS_TRUSTED" || $3 == "CKT_NSS_TRUSTED_DELEGATOR") {
+ if ($3 == "CKT_NSS_TRUSTED_DELEGATOR") {
if (distrusted[lolab]) {
if (VERBOSE) {
printf "line %d: distrusted for %s\n", \
@@ -173,11 +173,12 @@ function addtrust(trustfile, desc) {
}
printf "%s\n", label >trustfile
}
- } else if ($3 == "CKT_NSS_MUST_VERIFY_TRUST" ||
+ } else if ($3 == "CKT_NSS_TRUSTED" ||
+ $3 == "CKT_NSS_MUST_VERIFY_TRUST" ||
$3 == "CKT_NSS_UNTRUSTED" ||
$3 == "CKT_NSS_NOT_TRUSTED") {
if (VERBOSE) {
- printf "line %d: untrusted for %s\n", \
+ printf "line %d: untrusted as CA for %s\n", \
NR, desc
}
} else {
CVS commit: src/external/mpl/mozilla-certdata/share
Module Name:src Committed By: riastradh Date: Wed Oct 11 19:57:25 UTC 2023 Modified Files: src/external/mpl/mozilla-certdata/share: certdata.awk Log Message: certdata.awk: Treat CKT_NSS_TRUSTED as untrusted _as a CA_. This means the certificate is trusted for the listed purpose, not as a CA to issue certificates for the listed purpose. Clarify warning message in this case. No change to imported certificates so no need to regen or pull up -- this designator does not actually appear in certdata.txt, only in Mozilla nss source code. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/mozilla-certdata/share/certdata.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/igc
Module Name:src
Committed By: riastradh
Date: Wed Oct 11 18:19:43 UTC 2023
Modified Files:
src/sys/dev/pci/igc: if_igc.c
Log Message:
igc(4): `nvm_ver & ...' has type int, so use %x, not %hx.
This happens even though nvm_ver is unsigned short (uint16_t),
because of the integer promotions.
Should fix clang build.
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/igc/if_igc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/igc/if_igc.c
diff -u src/sys/dev/pci/igc/if_igc.c:1.4 src/sys/dev/pci/igc/if_igc.c:1.5
--- src/sys/dev/pci/igc/if_igc.c:1.4 Tue Oct 10 06:21:09 2023
+++ src/sys/dev/pci/igc/if_igc.c Wed Oct 11 18:19:43 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.4 2023/10/10 06:21:09 msaitoh Exp $ */
+/* $NetBSD: if_igc.c,v 1.5 2023/10/11 18:19:43 riastradh Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.4 2023/10/10 06:21:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.5 2023/10/11 18:19:43 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3842,7 +3842,7 @@ igc_print_devinfo(struct igc_softc *sc)
/* Get PHY FW version */
phy->ops.read_reg(hw, 0x1e, _ver);
- aprint_normal_dev(dev, "ROM image version %x.%02hx",
+ aprint_normal_dev(dev, "ROM image version %x.%02x",
(nvm_ver & NVM_VERSION_MAJOR) >> NVM_VERSION_MAJOR_SHIFT,
(nvm_ver & NVM_VERSION_MINOR));
aprint_debug("(0x%04hx)", nvm_ver);
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: riastradh Date: Wed Oct 11 18:19:43 UTC 2023 Modified Files: src/sys/dev/pci/igc: if_igc.c Log Message: igc(4): `nvm_ver & ...' has type int, so use %x, not %hx. This happens even though nvm_ver is unsigned short (uint16_t), because of the integer promotions. Should fix clang build. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/igc/if_igc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/certctl
Module Name:src Committed By: riastradh Date: Wed Oct 11 15:28:08 UTC 2023 Modified Files: src/usr.sbin/certctl: certctl.8 Log Message: certctl(8): Reword various things in an attempt to clarify. Suggest /etc/openssl/certs.local in the example config file. Maybe we can/should formalize this but let's just start with a suggestion. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/certctl/certctl.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/certctl/certctl.8 diff -u src/usr.sbin/certctl/certctl.8:1.2 src/usr.sbin/certctl/certctl.8:1.3 --- src/usr.sbin/certctl/certctl.8:1.2 Sat Sep 2 17:41:17 2023 +++ src/usr.sbin/certctl/certctl.8 Wed Oct 11 15:28:05 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: certctl.8,v 1.2 2023/09/02 17:41:17 riastradh Exp $ +.\" $NetBSD: certctl.8,v 1.3 2023/10/11 15:28:05 riastradh Exp $ .\" .\" Copyright (c) 2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -82,9 +82,7 @@ for files called .Pa *.crt , or .Pa *.pem -in PEM format, except for those that have been excluded by -.Nm Cm untrust , -and keeps +in PEM format, and keeps .Ar certsdir .Pq default: Pa /etc/openssl/certs populated with: @@ -106,11 +104,20 @@ concatenating all the certificates in PE .El .Pp .Nm +will exclude from +.Ar certsdir +any certificates that have been marked untrustworthy with +.Nm Cm untrust , +which are persistently maintained in the private state directory +.Ar distrustdir +.Pq default: Pa /etc/openssl/untrusted . +.Pp +.Nm treats .Ar config and .Ar distrustdir -as configuration, and +as configuration, and treats .Ar certsdir strictly as a cache that can be safely deleted and rebuilt with .Nm Cm rehash . @@ -121,19 +128,19 @@ at all by putting .Cm manual in .Ar config . -. .\"" .Ss Commands .Bl -tag -width Cm .\"" .It Cm list -List absolute paths to trusted certificates, one per line, in -.Xr vis 1 -format to encode any shell metacharacters, that +List absolute paths to trusted certificates. .Nm Cm rehash -would use to populate the +will populate .Ar certsdir -cache. +with these. +Paths are printed one per line, encoded in +.Xr vis 1 +format to escape any shell metacharacters. .\"" .It Cm rehash Populate @@ -144,8 +151,10 @@ with all trusted certificates, excluding .It Cm trust Ar cert Allow .Ar cert -to be included in the certificate cache if it is in the certificate -search path, and rehash the certificate cache. +to be included in +.Ar certsdir +if it is in the certificate search path, and rehash to make it +effective immediately. In other words, reverse the persistent effect of .Nm Cm untrust Ar cert . .Pp @@ -160,23 +169,24 @@ directory in the search path. .\"" .It Cm untrust Ar cert Persistently prevent -.Ar -from being included in the certificate cache, and rehash the -certificate cache. +.Ar cert +from being included in +.Ar certsdir , +and rehash to make it effective immediately. .Pp .Ar cert must be the full absolute path to a certificate that is in the certificate search path. .\"" .It Cm untrusted -List absolute paths to untrusted certificates, one per line, in -.Xr vis 1 -format to encode any shell metacharacters, that have been excluded by -.Nm Cm untrust -so that +List absolute paths to certificates that have been excluded by +.Nm Cm untrust . .Nm Cm rehash -will not put them in +will not put these in .Ar certsdir . +Paths are printed one per line, encoded in +.Xr vis 1 +format to escape any shell metacharacters. .\"" .El .\"" @@ -220,8 +230,11 @@ will .Em not modify .Ar certsdir , -but may still check consistency of the configuration when run and -update +but may still check consistency of the configuration when run, and +.Nm Cm untrust +and +.Nm Cm trust +will still update .Ar distrustdir . .\"" .El @@ -236,7 +249,7 @@ Default single-file TLS CA certificate b Default configuration file for TLS CA certificates. .It Pa /etc/openssl/untrusted Default -.Ar untrusted +.Ar distrustdir directory of excluded TLS CA certificates. .It Pa /usr/share/certs/mozilla/all All root CA certificates published by Mozilla, including untrustworthy @@ -264,6 +277,7 @@ netbsd-certctl 20230816 # under these directories. path /usr/share/certs/mozilla/server path /usr/pkg/share/chromium-cacerts +path /etc/openssl/certs.local # If the next line is uncommented, certctl(8) will decline to # touch /etc/openssl/certs.
CVS commit: src/usr.sbin/certctl
Module Name:src Committed By: riastradh Date: Wed Oct 11 15:28:08 UTC 2023 Modified Files: src/usr.sbin/certctl: certctl.8 Log Message: certctl(8): Reword various things in an attempt to clarify. Suggest /etc/openssl/certs.local in the example config file. Maybe we can/should formalize this but let's just start with a suggestion. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/certctl/certctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Oct 11 15:14:28 UTC 2023
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
wm(4): Add I219{V,LM}({22,23}) devices (Raptor Lake).
To generate a diff of this commit:
cvs rdiff -u -r1.790 -r1.791 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.790 src/sys/dev/pci/if_wm.c:1.791
--- src/sys/dev/pci/if_wm.c:1.790 Wed Oct 11 15:05:26 2023
+++ src/sys/dev/pci/if_wm.c Wed Oct 11 15:14:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.790 2023/10/11 15:05:26 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.791 2023/10/11 15:14:28 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.790 2023/10/11 15:05:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.791 2023/10/11 15:14:28 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -1752,6 +1752,12 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM19,
"I219 LM (19) Ethernet Connection",
WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM22,
+ "I219 LM (22) Ethernet Connection",
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP(RPL) */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM23,
+ "I219 LM (23) Ethernet Connection",
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP(RPL) */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V,
"I219 V Ethernet Connection",
WM_T_PCH_SPT, WMP_F_COPPER },
@@ -1806,6 +1812,12 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V19,
"I219 V (19) Ethernet Connection",
WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V22,
+ "I219 V (22) Ethernet Connection",
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP(RPL) */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V23,
+ "I219 V (23) Ethernet Connection",
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP(RPL) */
{ 0, 0,
NULL,
0, 0 },
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Oct 11 15:05:26 UTC 2023
Modified Files:
src/sys/dev/pci: if_wm.c if_wmvar.h
Log Message:
wm(4): Add a new workaround for Tiger Lake and newer.
- Define new WM_T_PCH_TGP and use it for Tiger Lake and newer.
Note that we don't define WM_T_PCH_ADP because we have no any
Alder Lake specific workaround yet.
- Add new workaround for Tiger Lake (and newer) in wm_init_locked()
to avoid packet loss.
To generate a diff of this commit:
cvs rdiff -u -r1.789 -r1.790 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.789 src/sys/dev/pci/if_wm.c:1.790
--- src/sys/dev/pci/if_wm.c:1.789 Mon Sep 25 09:15:48 2023
+++ src/sys/dev/pci/if_wm.c Wed Oct 11 15:05:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.789 2023/09/25 09:15:48 rin Exp $ */
+/* $NetBSD: if_wm.c,v 1.790 2023/10/11 15:05:26 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.789 2023/09/25 09:15:48 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.790 2023/10/11 15:05:26 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -1733,25 +1733,25 @@ static const struct wm_product {
WM_T_PCH_SPT, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM13,
"I219 LM (13) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM14,
"I219 LM (14) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM15,
"I219 LM (15) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM16,
"I219 LM (16) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM17,
"I219 LM (17) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM18,
"I219 LM (18) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM19,
"I219 LM (19) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V,
"I219 V Ethernet Connection",
WM_T_PCH_SPT, WMP_F_COPPER },
@@ -1787,25 +1787,25 @@ static const struct wm_product {
WM_T_PCH_SPT, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V13,
"I219 V (13) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V14,
"I219 V (14) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V15,
"I219 V (15) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V16,
"I219 V (16) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V17,
"I219 V (17) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V18,
"I219 V (18) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V19,
"I219 V (19) Ethernet Connection",
- WM_T_PCH_CNP, WMP_F_COPPER },
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
{ 0, 0,
NULL,
0, 0 },
@@ -2311,7 +2311,8 @@ alloc_retry:
&& (sc->sc_type != WM_T_PCH2)
&& (sc->sc_type != WM_T_PCH_LPT)
&& (sc->sc_type != WM_T_PCH_SPT)
- && (sc->sc_type != WM_T_PCH_CNP)) {
+ && (sc->sc_type != WM_T_PCH_CNP)
+ && (sc->sc_type != WM_T_PCH_TGP)) {
/* ICH* and PCH* have no PCIe capability registers */
if (pci_get_capability(pa->pa_pc, pa->pa_tag,
PCI_CAP_PCIEXPRESS, >sc_pcixe_capoff,
@@ -2556,6 +2557,7 @@ alloc_retry:
break;
case WM_T_PCH_SPT:
case WM_T_PCH_CNP:
+ case WM_T_PCH_TGP:
sc->nvm.read = wm_nvm_read_spt;
/* SPT has no GFPREG; flash registers mapped through BAR0 */
sc->sc_flags |= WM_F_EEPROM_FLASH;
@@ -2683,6 +2685,7 @@ alloc_retry:
case WM_T_PCH_LPT:
case WM_T_PCH_SPT:
case WM_T_PCH_CNP:
+ case WM_T_PCH_TGP:
apme_mask = WUC_APME;
eeprom_data = CSR_READ(sc, WMREG_WUC);
if ((eeprom_data & apme_mask) != 0)
@@ -2817,6 +2820,7 @@
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Oct 11 15:14:28 UTC 2023
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
wm(4): Add I219{V,LM}({22,23}) devices (Raptor Lake).
To generate a diff of this commit:
cvs rdiff -u -r1.790 -r1.791 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.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Oct 11 15:05:26 UTC 2023 Modified Files: src/sys/dev/pci: if_wm.c if_wmvar.h Log Message: wm(4): Add a new workaround for Tiger Lake and newer. - Define new WM_T_PCH_TGP and use it for Tiger Lake and newer. Note that we don't define WM_T_PCH_ADP because we have no any Alder Lake specific workaround yet. - Add new workaround for Tiger Lake (and newer) in wm_init_locked() to avoid packet loss. To generate a diff of this commit: cvs rdiff -u -r1.789 -r1.790 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/if_wmvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Oct 11 14:55:26 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1477 -r1.1478 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1476 -r1.1477 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.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Oct 11 14:54:58 UTC 2023
Modified Files:
src/sys/dev/pci: pcidevs
Log Message:
pcidevs: Add Intel I219{V,LM}({22,23})
To generate a diff of this commit:
cvs rdiff -u -r1.1496 -r1.1497 src/sys/dev/pci/pcidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Oct 11 14:54:58 UTC 2023
Modified Files:
src/sys/dev/pci: pcidevs
Log Message:
pcidevs: Add Intel I219{V,LM}({22,23})
To generate a diff of this commit:
cvs rdiff -u -r1.1496 -r1.1497 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.1496 src/sys/dev/pci/pcidevs:1.1497
--- src/sys/dev/pci/pcidevs:1.1496 Tue Oct 10 16:44:16 2023
+++ src/sys/dev/pci/pcidevs Wed Oct 11 14:54:58 2023
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1496 2023/10/10 16:44:16 abs Exp $
+$NetBSD: pcidevs,v 1.1497 2023/10/11 14:54:58 msaitoh Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3937,6 +3937,10 @@ product INTEL I219_V10 0x0d4f I219-V (1
product INTEL I225_IT 0x0d9f I225-IT Ethernet Connection
product INTEL I219_LM12 0x0d53 I219-LM (12) Ethernet Connection
product INTEL I219_V12 0x0d55 I219-V (12) Ethernet Connection
+product INTEL I219_LM23 0x0dc5 I219-LM (23) Ethernet Connection
+product INTEL I219_V23 0x0dc6 I219-V (23) Ethernet Connection
+product INTEL I219_LM22 0x0dc7 I219-LM (22) Ethernet Connection
+product INTEL I219_V22 0x0dc8 I219-V (22) Ethernet Connection
product INTEL E5V2_DMI2 0x0e00 E5 v2 DMI2
product INTEL E5V2_PCIE_1 0x0e01 E5 v2 PCIe x4 (DMI2 Mode)
product INTEL E5V2_PCIE_2 0x0e02 E5 v2 PCIe
CVS commit: src
Module Name:src
Committed By: riastradh
Date: Wed Oct 11 14:08:26 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/share/mk: bsd.prog.mk
Log Message:
heimdal: No need for -lm, was only added for -lsqlite3.
PR lib/57406
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.346 -r1.347 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.9 src/crypto/external/bsd/heimdal/Makefile.inc:1.10
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.9 Wed Oct 11 12:34:42 2023
+++ src/crypto/external/bsd/heimdal/Makefile.inc Wed Oct 11 14:08:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2023/10/11 12:34:42 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.10 2023/10/11 14:08:25 riastradh Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -22,8 +22,8 @@ DPLIBROKEN= roken ${HEIMBASE}/lib/librok
DPLIBSL= sl ${HEIMBASE}/lib/libsl
DPLIBVERS= vers ${HEIMBASE}/lib/libvers
DPLIBWIND= wind ${HEIMBASE}/lib/libwind
-KRB5LDADD= -lcrypto -lcrypt -lm
-KRB5DPADD= ${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
+KRB5LDADD= -lcrypto -lcrypt
+KRB5DPADD= ${LIBCRYPTO} ${LIBCRYPT}
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.346 src/share/mk/bsd.prog.mk:1.347
--- src/share/mk/bsd.prog.mk:1.346 Wed Oct 11 14:08:17 2023
+++ src/share/mk/bsd.prog.mk Wed Oct 11 14:08:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.346 2023/10/11 14:08:17 riastradh Exp $
+# $NetBSD: bsd.prog.mk,v 1.347 2023/10/11 14:08:26 riastradh Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -206,11 +206,11 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
LIBKRB5_LDADD+= -lkrb5 -lcom_err \
-lhx509 -lcrypto -lasn1 \
-lwind -lheimbase -lcom_err -lroken \
- -lm -lcrypt -lutil
+ -lcrypt -lutil
LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \
${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
- ${LIBM} ${LIBCRYPT} ${LIBUTIL}
+ ${LIBCRYPT} ${LIBUTIL}
LIBGSSAPI_LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
LIBGSSAPI_DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
.endif
CVS commit: src
Module Name:src Committed By: riastradh Date: Wed Oct 11 14:08:26 UTC 2023 Modified Files: src/crypto/external/bsd/heimdal: Makefile.inc src/share/mk: bsd.prog.mk Log Message: heimdal: No need for -lm, was only added for -lsqlite3. PR lib/57406 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/heimdal/Makefile.inc cvs rdiff -u -r1.346 -r1.347 src/share/mk/bsd.prog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: riastradh Date: Wed Oct 11 14:08:17 UTC 2023 Modified Files: src/share/mk: bsd.prog.mk Log Message: bsd.prog.mk: krb5 stuff no longer needs to link against sqlite3. (Why is this here? Seems like it should be a .mk fragment under crypto/external/bsd/heimdal -- that way I would have found it for the previous commit.) PR lib/57406 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.345 -r1.346 src/share/mk/bsd.prog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Wed Oct 11 14:08:17 UTC 2023
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
bsd.prog.mk: krb5 stuff no longer needs to link against sqlite3.
(Why is this here? Seems like it should be a .mk fragment under
crypto/external/bsd/heimdal -- that way I would have found it for the
previous commit.)
PR lib/57406
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.345 src/share/mk/bsd.prog.mk:1.346
--- src/share/mk/bsd.prog.mk:1.345 Sun May 28 10:33:13 2023
+++ src/share/mk/bsd.prog.mk Wed Oct 11 14:08:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.345 2023/05/28 10:33:13 lukem Exp $
+# $NetBSD: bsd.prog.mk,v 1.346 2023/10/11 14:08:17 riastradh Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -206,11 +206,11 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
LIBKRB5_LDADD+= -lkrb5 -lcom_err \
-lhx509 -lcrypto -lasn1 \
-lwind -lheimbase -lcom_err -lroken \
- -lsqlite3 -lm -lcrypt -lutil
+ -lm -lcrypt -lutil
LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \
${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
- ${LIBSQLITE3} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
+ ${LIBM} ${LIBCRYPT} ${LIBUTIL}
LIBGSSAPI_LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
LIBGSSAPI_DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
.endif
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: riastradh
Date: Wed Oct 11 12:34:42 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/include: config.h
src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
heimdal: Disable sqlite3 credential cache (SCC).
SCC is not usable in Heimdal 7.8.0, and this brings a dependency on
libsqlite3 into libkrb5 and therefore libgssapi, which is problematic
downstream applications that have sqlite3 from pkgsrc or statically
built in.
SCC will undergo substantial revision in the next Heimdal version
(https://github.com/heimdal/heimdal/pull/1143). We can revisit later
how to deal with this -- perhaps by symbol-renaming a copy of sqlite3
in Heimdal as it looks like upstream intends to do.
PR lib/57406
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/heimdal/lib/libkrb5/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/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.8 src/crypto/external/bsd/heimdal/Makefile.inc:1.9
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.8 Thu Jun 22 22:39:37 2023
+++ src/crypto/external/bsd/heimdal/Makefile.inc Wed Oct 11 12:34:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2023/06/22 22:39:37 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2023/10/11 12:34:42 riastradh Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -22,8 +22,8 @@ DPLIBROKEN= roken ${HEIMBASE}/lib/librok
DPLIBSL= sl ${HEIMBASE}/lib/libsl
DPLIBVERS= vers ${HEIMBASE}/lib/libvers
DPLIBWIND= wind ${HEIMBASE}/lib/libwind
-KRB5LDADD= -lsqlite3 -lcrypto -lcrypt -lm
-KRB5DPADD= ${LIBSQLITE3} ${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
+KRB5LDADD= -lcrypto -lcrypt -lm
+KRB5DPADD= ${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
Index: src/crypto/external/bsd/heimdal/include/config.h
diff -u src/crypto/external/bsd/heimdal/include/config.h:1.11 src/crypto/external/bsd/heimdal/include/config.h:1.12
--- src/crypto/external/bsd/heimdal/include/config.h:1.11 Mon Jun 19 21:41:45 2023
+++ src/crypto/external/bsd/heimdal/include/config.h Wed Oct 11 12:34:42 2023
@@ -754,7 +754,7 @@ static /**/const char *const rcsid[] = {
#define HAVE_SA_FAMILY_T 1
/* Define if you want support for cache in sqlite. */
-#define HAVE_SCC 1
+/* #undef HAVE_SCC */
/* Define to 1 if you have the header file. */
#define HAVE_SEARCH_H 1
Index: src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.5 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.5 Mon Jun 19 23:56:55 2023
+++ src/crypto/external/bsd/heimdal/lib/libhdb/Makefile Wed Oct 11 12:34:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/19 23:56:55 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/11 12:34:42 riastradh Exp $
USE_FORT?= yes # network protocol library
@@ -18,7 +18,8 @@ LIBDPLIBS+= hx509 ${HEIMBASE}/lib/libhx
com_err ${HEIMBASE}/lib/libcom_err \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
- heimbase ${HEIMBASE}/lib/libheimbase
+ heimbase ${HEIMBASE}/lib/libheimbase \
+ sqlite3 ${NETBSDSRCDIR}/external/public-domain/sqlite/lib
HEIMSRCS= hdb_err.et hdb.asn1
ASN1_OPTS.hdb.asn1+= --one-code-file --sequence=HDB-Ext-KeySet --sequence=Keys
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.15 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.16
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.15 Tue Jun 20 17:23:02 2023
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Wed Oct 11 12:34:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/06/20 17:23:02 christos Exp $
+# $NetBSD: Makefile,v 1.16 2023/10/11 12:34:42 riastradh Exp $
USE_FORT?= yes # network protocol library
@@ -23,7 +23,6 @@ LIBDPLIBS+= \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
heimbase ${HEIMBASE}/lib/libheimbase \
- sqlite3 ${NETBSDSRCDIR}/external/public-domain/sqlite/lib \
crypt ${NETBSDSRCDIR}/lib/libcrypt
HEIMSRCS= krb_err.et krb5_err.et heim_err.et k524_err.et
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: riastradh Date: Wed Oct 11 12:34:42 UTC 2023 Modified Files: src/crypto/external/bsd/heimdal: Makefile.inc src/crypto/external/bsd/heimdal/include: config.h src/crypto/external/bsd/heimdal/lib/libhdb: Makefile src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile Log Message: heimdal: Disable sqlite3 credential cache (SCC). SCC is not usable in Heimdal 7.8.0, and this brings a dependency on libsqlite3 into libkrb5 and therefore libgssapi, which is problematic downstream applications that have sqlite3 from pkgsrc or statically built in. SCC will undergo substantial revision in the next Heimdal version (https://github.com/heimdal/heimdal/pull/1143). We can revisit later how to deal with this -- perhaps by symbol-renaming a copy of sqlite3 in Heimdal as it looks like upstream intends to do. PR lib/57406 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.inc cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/heimdal/include/config.h cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Wed Oct 11 11:00:17 UTC 2023 Modified Files: src/share/man/man4: agr.4 Log Message: agr(4): minor cleanups To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/agr.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/agr.4 diff -u src/share/man/man4/agr.4:1.11 src/share/man/man4/agr.4:1.12 --- src/share/man/man4/agr.4:1.11 Wed Oct 11 09:19:27 2023 +++ src/share/man/man4/agr.4 Wed Oct 11 11:00:17 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: agr.4,v 1.11 2023/10/11 09:19:27 yamaguchi Exp $ +.\" $NetBSD: agr.4,v 1.12 2023/10/11 11:00:17 wiz Exp $ .\" .\" Copyright (c)2005, 2007 YAMAMOTO Takashi, .\" All rights reserved. @@ -39,7 +39,7 @@ .Sh DESCRIPTION .Em The driver described in this manual page is obsolete .Em and will be removed from a future version of the system. -.Em +.Pp .Xr lagg 4 .Em should be used instead. .Pp @@ -111,8 +111,8 @@ Destroy an interface created in the abov .Ed .\" .Sh SEE ALSO +.Xr lagg 4 , .Xr ifconfig 8 -.Xr lagg 4 .\" .Sh STANDARDS IEEE 802.3ad Aggregation of Multiple Link Segments @@ -121,7 +121,8 @@ IEEE 802.3ad Aggregation of Multiple Lin The .Nm driver first appeared in -.Nx 4.0 and obsoleted in +.Nx 4.0 +and was obsoleted in .Nx 10.0 . .Pp The
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Wed Oct 11 11:00:17 UTC 2023 Modified Files: src/share/man/man4: agr.4 Log Message: agr(4): minor cleanups To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/agr.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Oct 11 09:43:17 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe_type.h
Log Message:
ixg(4): Print DEVICE_CAPS register.
To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/ixgbe/ixgbe_type.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.339 src/sys/dev/pci/ixgbe/ixgbe.c:1.340
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.339 Wed Oct 11 03:48:35 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Oct 11 09:43:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.339 2023/10/11 03:48:35 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.340 2023/10/11 09:43:17 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.339 2023/10/11 03:48:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.340 2023/10/11 09:43:17 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -809,7 +809,7 @@ ixgbe_attach(device_t parent, device_t d
struct ixgbe_hw *hw;
int error = -1;
u32 ctrl_ext;
- u16 high, low, nvmreg;
+ u16 high, low, nvmreg, dev_caps;
pcireg_t id, subid;
const ixgbe_vendor_info_t *ent;
struct pci_attach_args *pa = aux;
@@ -1277,10 +1277,15 @@ ixgbe_attach(device_t parent, device_t d
if (sc->feat_en & IXGBE_FEATURE_NETMAP)
ixgbe_netmap_attach(sc);
+ /* Print some flags */
snprintb(buf, sizeof(buf), IXGBE_FEATURE_FLAGS, sc->feat_cap);
aprint_verbose_dev(dev, "feature cap %s\n", buf);
snprintb(buf, sizeof(buf), IXGBE_FEATURE_FLAGS, sc->feat_en);
aprint_verbose_dev(dev, "feature ena %s\n", buf);
+ if (ixgbe_get_device_caps(hw, _caps) == 0) {
+ snprintb(buf, sizeof(buf), IXGBE_DEVICE_CAPS_FLAGS, dev_caps);
+ aprint_verbose_dev(dev, "device cap %s\n", buf);
+ }
if (pmf_device_register(dev, ixgbe_suspend, ixgbe_resume))
pmf_class_network_register(dev, sc->ifp);
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.60 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.61
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.60 Fri Oct 6 14:48:08 2023
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Wed Oct 11 09:43:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_type.h,v 1.60 2023/10/06 14:48:08 msaitoh Exp $ */
+/* $NetBSD: ixgbe_type.h,v 1.61 2023/10/11 09:43:17 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -2553,6 +2553,10 @@ enum {
#define IXGBE_DEVICE_CAPS_WOL_PORT0 0x8 /* WoL supported on port 0 */
#define IXGBE_DEVICE_CAPS_WOL_MASK 0xC /* Mask for WoL capabilities */
+#define IXGBE_DEVICE_CAPS_FLAGS "\20" \
+ "\1ALLOW_ANY_SFP" "\2FCOE_OFFLOAD" "\3WOL_PORT0_1" "\4WOL_PORT0" \
+ "\10NO_CROSSTALK_WR"
+
/* PCI Bus Info */
#define IXGBE_PCI_DEVICE_STATUS 0xAA
#define IXGBE_PCI_DEVICE_STATUS_TRANSACTION_PENDING 0x0020
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Oct 11 09:43:17 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixgbe_type.h Log Message: ixg(4): Print DEVICE_CAPS register. To generate a diff of this commit: cvs rdiff -u -r1.339 -r1.340 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/ixgbe/ixgbe_type.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: yamaguchi Date: Wed Oct 11 09:19:27 UTC 2023 Modified Files: src/share/man/man4: agr.4 Log Message: update history of agr(4) I proposed to make agr(4) deprecated in NetBSD 10, and there was not any disagreements. https://mail-index.netbsd.org/tech-net/2022/06/08/msg008265.html To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/agr.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/agr.4 diff -u src/share/man/man4/agr.4:1.10 src/share/man/man4/agr.4:1.11 --- src/share/man/man4/agr.4:1.10 Wed Oct 11 06:46:33 2023 +++ src/share/man/man4/agr.4 Wed Oct 11 09:19:27 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: agr.4,v 1.10 2023/10/11 06:46:33 yamaguchi Exp $ +.\" $NetBSD: agr.4,v 1.11 2023/10/11 09:19:27 yamaguchi Exp $ .\" .\" Copyright (c)2005, 2007 YAMAMOTO Takashi, .\" All rights reserved. @@ -121,7 +121,13 @@ IEEE 802.3ad Aggregation of Multiple Lin The .Nm driver first appeared in -.Nx 4.0 . +.Nx 4.0 and obsoleted in +.Nx 10.0 . +.Pp +The +.Nm +driver will be removed from +.Nx 11.0 . .\" .Sh AUTHORS The
CVS commit: src/share/man/man4
Module Name:src Committed By: yamaguchi Date: Wed Oct 11 09:19:27 UTC 2023 Modified Files: src/share/man/man4: agr.4 Log Message: update history of agr(4) I proposed to make agr(4) deprecated in NetBSD 10, and there was not any disagreements. https://mail-index.netbsd.org/tech-net/2022/06/08/msg008265.html To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/agr.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet6
Module Name:src Committed By: msaitoh Date: Wed Oct 11 09:13:51 UTC 2023 Modified Files: src/sys/netinet6: nd6.c Log Message: s/Neighour/Neighbor/ in comment. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.279 -r1.280 src/sys/netinet6/nd6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet6
Module Name:src Committed By: msaitoh Date: Wed Oct 11 09:13:51 UTC 2023 Modified Files: src/sys/netinet6: nd6.c Log Message: s/Neighour/Neighbor/ in comment. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.279 -r1.280 src/sys/netinet6/nd6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet6/nd6.c diff -u src/sys/netinet6/nd6.c:1.279 src/sys/netinet6/nd6.c:1.280 --- src/sys/netinet6/nd6.c:1.279 Thu Sep 1 18:32:17 2022 +++ src/sys/netinet6/nd6.c Wed Oct 11 09:13:51 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: nd6.c,v 1.279 2022/09/01 18:32:17 riastradh Exp $ */ +/* $NetBSD: nd6.c,v 1.280 2023/10/11 09:13:51 msaitoh Exp $ */ /* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.279 2022/09/01 18:32:17 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.280 2023/10/11 09:13:51 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -1224,7 +1224,7 @@ nd6_ioctl(u_long cmd, void *data, struct OND.flags = ifndi->flags; break; case OSIOCSIFINFO_IN6_90: - /* Allow userland to set Neighour Unreachability Detection + /* Allow userland to set Neighbor Unreachability Detection * timers. */ if (OND.chlim != 0) ifndi->chlim = OND.chlim; @@ -1250,7 +1250,7 @@ nd6_ioctl(u_long cmd, void *data, struct ND.flags = ifndi->flags; break; case SIOCSIFINFO_IN6: - /* Allow userland to set Neighour Unreachability Detection + /* Allow userland to set Neighbor Unreachability Detection * timers. */ if (ND.chlim != 0) ifndi->chlim = ND.chlim;
CVS commit: src/lib/libc/arch
Module Name:src
Committed By: skrll
Date: Wed Oct 11 09:12:21 UTC 2023
Modified Files:
src/lib/libc/arch/ia64/gen: setjmp.S
src/lib/libc/arch/or1k/gen: __setjmp14.S
src/lib/libc/arch/powerpc/gen: __setjmp14.S __sigsetjmp14.S
src/lib/libc/arch/powerpc64/gen: __setjmp14.S __sigsetjmp14.S
src/lib/libc/arch/riscv/gen: __setjmp14.S
src/lib/libc/arch/sh3/gen: setjmp.S sigsetjmp.S
src/lib/libc/arch/sparc/gen: setjmp.S
src/lib/libc/arch/sparc64/gen: setjmp.S
Log Message:
Consistently pass 0 as first and ignored argument to sigprocmask in the
setjmp implementations.
NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/ia64/gen/setjmp.S
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/or1k/gen/__setjmp14.S
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/powerpc/gen/__setjmp14.S \
src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/powerpc64/gen/__setjmp14.S
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/riscv/gen/__setjmp14.S
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/sh3/gen/setjmp.S
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/sh3/gen/sigsetjmp.S
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/sparc/gen/setjmp.S
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/sparc64/gen/setjmp.S
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/arch/ia64/gen/setjmp.S
diff -u src/lib/libc/arch/ia64/gen/setjmp.S:1.2 src/lib/libc/arch/ia64/gen/setjmp.S:1.3
--- src/lib/libc/arch/ia64/gen/setjmp.S:1.2 Wed Oct 11 06:15:36 2023
+++ src/lib/libc/arch/ia64/gen/setjmp.S Wed Oct 11 09:12:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: setjmp.S,v 1.2 2023/10/11 06:15:36 skrll Exp $ */
+/* $NetBSD: setjmp.S,v 1.3 2023/10/11 09:12:20 skrll Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -30,7 +30,7 @@
#define _LOCORE
#include
-RCSID("$NetBSD: setjmp.S,v 1.2 2023/10/11 06:15:36 skrll Exp $")
+RCSID("$NetBSD: setjmp.S,v 1.3 2023/10/11 09:12:20 skrll Exp $")
#include
@@ -49,7 +49,7 @@ ENTRY(__setjmp14, 1)
alloc loc0=ar.pfs,1,2,3,0
mov loc1=rp
;;
- mov out0=1// how = SIG_BLOCK
+ mov out0=0// how is ignored
mov out1=0// set = NULL
add out2=J_SIGSET,in0 // oset = [J_SIGSET]
br.call.sptk.few rp=_sys___sigprocmask14
Index: src/lib/libc/arch/or1k/gen/__setjmp14.S
diff -u src/lib/libc/arch/or1k/gen/__setjmp14.S:1.1 src/lib/libc/arch/or1k/gen/__setjmp14.S:1.2
--- src/lib/libc/arch/or1k/gen/__setjmp14.S:1.1 Wed Sep 3 19:34:25 2014
+++ src/lib/libc/arch/or1k/gen/__setjmp14.S Wed Oct 11 09:12:21 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: __setjmp14.S,v 1.1 2014/09/03 19:34:25 matt Exp $ */
+/* $NetBSD: __setjmp14.S,v 1.2 2023/10/11 09:12:21 skrll Exp $ */
#include "SYS.h"
#include "assym.h"
#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.1 2014/09/03 19:34:25 matt Exp $")
+__RCSID("$NetBSD: __setjmp14.S,v 1.2 2023/10/11 09:12:21 skrll Exp $")
#endif
/*
@@ -36,7 +36,7 @@ ENTRY(__setjmp14)
l.sw JB_MAGIC(r3), r4 /* note we saved sigmask */
l.addi r5, r3, JB_SIGMASK #
l.xor r4, r4, r4
- l.addi r3, r0, SIG_BLOCK
+ l.addi r3, r0, 0
_DOSYSCALL(__sigprocmask14) # assume no error XXX
l.xor r11, r11, r11
l.jr lr
Index: src/lib/libc/arch/powerpc/gen/__setjmp14.S
diff -u src/lib/libc/arch/powerpc/gen/__setjmp14.S:1.5 src/lib/libc/arch/powerpc/gen/__setjmp14.S:1.6
--- src/lib/libc/arch/powerpc/gen/__setjmp14.S:1.5 Sat Jan 15 07:31:12 2011
+++ src/lib/libc/arch/powerpc/gen/__setjmp14.S Wed Oct 11 09:12:21 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: __setjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $ */
+/* $NetBSD: __setjmp14.S,v 1.6 2023/10/11 09:12:21 skrll Exp $ */
#include "SYS.h"
#include "assym.h"
#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $")
+__RCSID("$NetBSD: __setjmp14.S,v 1.6 2023/10/11 09:12:21 skrll Exp $")
#endif
/*
@@ -19,8 +19,8 @@ __RCSID("$NetBSD: __setjmp14.S,v 1.5 201
ENTRY(__setjmp14)
mr %r6,%r3
- li %r3,SIG_BLOCK
- li %r4,0
+ li %r3,0 # how is ignored
+ li %r4,0 # set = NULL
addi %r5,%r6,4*(1+24) #
_DOSYSCALL(__sigprocmask14) # assume no error XXX
mflr %r11
Index: src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S
diff -u src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S:1.5 src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S:1.6
--- src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S:1.5 Sat Jan 15 07:31:12 2011
+++ src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S Wed Oct 11 09:12:21 2023
@@ -1,18 +1,18 @@
-/* $NetBSD: __sigsetjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $ */
+/* $NetBSD: __sigsetjmp14.S,v 1.6 2023/10/11 09:12:21 skrll Exp $ */
#include "SYS.h"
#include "assym.h"
#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __sigsetjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $")
+__RCSID("$NetBSD: __sigsetjmp14.S,v 1.6
CVS commit: src/lib/libc/arch
Module Name:src Committed By: skrll Date: Wed Oct 11 09:12:21 UTC 2023 Modified Files: src/lib/libc/arch/ia64/gen: setjmp.S src/lib/libc/arch/or1k/gen: __setjmp14.S src/lib/libc/arch/powerpc/gen: __setjmp14.S __sigsetjmp14.S src/lib/libc/arch/powerpc64/gen: __setjmp14.S __sigsetjmp14.S src/lib/libc/arch/riscv/gen: __setjmp14.S src/lib/libc/arch/sh3/gen: setjmp.S sigsetjmp.S src/lib/libc/arch/sparc/gen: setjmp.S src/lib/libc/arch/sparc64/gen: setjmp.S Log Message: Consistently pass 0 as first and ignored argument to sigprocmask in the setjmp implementations. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/ia64/gen/setjmp.S cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/or1k/gen/__setjmp14.S cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/powerpc/gen/__setjmp14.S \ src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/powerpc64/gen/__setjmp14.S cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/riscv/gen/__setjmp14.S cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/sh3/gen/setjmp.S cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/sh3/gen/sigsetjmp.S cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/sparc/gen/setjmp.S cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/sparc64/gen/setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Wed Oct 11 07:49:29 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: aarch64/GENERIC64: Add ixl(4) Works just fine for little-endian on LX2K with UEFI firmware. Not tested for big-endian yet; attach fails on ROCKPro64 due to host controller problem. OK yamaguchi@ To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.213 src/sys/arch/evbarm/conf/GENERIC64:1.214 --- src/sys/arch/evbarm/conf/GENERIC64:1.213 Wed Oct 4 07:48:55 2023 +++ src/sys/arch/evbarm/conf/GENERIC64 Wed Oct 11 07:49:29 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.213 2023/10/04 07:48:55 rin Exp $ +# $NetBSD: GENERIC64,v 1.214 2023/10/11 07:49:29 rin Exp $ # # GENERIC ARM (aarch64) kernel # @@ -286,6 +286,7 @@ bge* at pci? dev ? function ? # Broadco ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter igc* at pci? dev ? function ? # Intel 22x 2.5 gigabit ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit +ixl* at pci? dev ? function ? # Intel Ethernet 700 series ixv* at pci? dev ? function ? # Intel 8259x 10G virtual function mcx* at pci? dev ? function ? # Mellanox 5th generation Ethernet mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Wed Oct 11 07:49:29 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: aarch64/GENERIC64: Add ixl(4) Works just fine for little-endian on LX2K with UEFI firmware. Not tested for big-endian yet; attach fails on ROCKPro64 due to host controller problem. OK yamaguchi@ To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: rin
Date: Wed Oct 11 07:44:54 UTC 2023
Modified Files:
src/sys/dev/pci: if_ixl.c
Log Message:
ixl(4): Print device info on attach
Without PCIVERBOSE option:
ixl0 at pci1 dev 0 function 0: vendor 8086 product 1572 (rev. 0x01)
With PCIVERBOSE option:
ixl0 at pci1 dev 0 function 0: Intel XL710 SFP+ Ethernet (SFI) (rev. 0x01)
OK yamaguchi@
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/pci/if_ixl.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_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.92 src/sys/dev/pci/if_ixl.c:1.93
--- src/sys/dev/pci/if_ixl.c:1.92 Wed Oct 11 04:44:20 2023
+++ src/sys/dev/pci/if_ixl.c Wed Oct 11 07:44:53 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.92 2023/10/11 04:44:20 yamaguchi Exp $ */
+/* $NetBSD: if_ixl.c,v 1.93 2023/10/11 07:44:53 rin Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.92 2023/10/11 04:44:20 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.93 2023/10/11 07:44:53 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1039,6 +1039,8 @@ ixl_attach(device_t parent, device_t sel
ixl_pci_csr_setup(pa->pa_pc, pa->pa_tag);
+ pci_aprint_devinfo(pa, "Ethernet controller");
+
memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, IXL_PCIREG);
if (pci_mapreg_map(pa, IXL_PCIREG, memtype, 0,
>sc_memt, >sc_memh, NULL, >sc_mems)) {
@@ -1063,7 +1065,7 @@ ixl_attach(device_t parent, device_t sel
port &= I40E_PFGEN_PORTNUM_PORT_NUM_MASK;
port >>= I40E_PFGEN_PORTNUM_PORT_NUM_SHIFT;
sc->sc_port = port;
- aprint_normal(": port %u", sc->sc_port);
+ aprint_normal_dev(self, "port %u", sc->sc_port);
ari = ixl_rd(sc, I40E_GLPCI_CAPSUP);
ari &= I40E_GLPCI_CAPSUP_ARI_EN_MASK;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: rin Date: Wed Oct 11 07:44:54 UTC 2023 Modified Files: src/sys/dev/pci: if_ixl.c Log Message: ixl(4): Print device info on attach Without PCIVERBOSE option: ixl0 at pci1 dev 0 function 0: vendor 8086 product 1572 (rev. 0x01) With PCIVERBOSE option: ixl0 at pci1 dev 0 function 0: Intel XL710 SFP+ Ethernet (SFI) (rev. 0x01) OK yamaguchi@ To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/dev/pci/if_ixl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: yamaguchi Date: Wed Oct 11 06:46:33 UTC 2023 Modified Files: src/share/man/man4: agr.4 Log Message: Update agr(4) manual page The driver is marked as obsolete. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/agr.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/agr.4 diff -u src/share/man/man4/agr.4:1.9 src/share/man/man4/agr.4:1.10 --- src/share/man/man4/agr.4:1.9 Sat Jul 13 10:54:00 2013 +++ src/share/man/man4/agr.4 Wed Oct 11 06:46:33 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: agr.4,v 1.9 2013/07/13 10:54:00 njoly Exp $ +.\" $NetBSD: agr.4,v 1.10 2023/10/11 06:46:33 yamaguchi Exp $ .\" .\" Copyright (c)2005, 2007 YAMAMOTO Takashi, .\" All rights reserved. @@ -37,6 +37,12 @@ .Cd pseudo-device agr .\" .Sh DESCRIPTION +.Em The driver described in this manual page is obsolete +.Em and will be removed from a future version of the system. +.Em +.Xr lagg 4 +.Em should be used instead. +.Pp The .Nm driver provides link aggregation functionality (a.k.a. L2 trunking @@ -106,6 +112,7 @@ Destroy an interface created in the abov .\" .Sh SEE ALSO .Xr ifconfig 8 +.Xr lagg 4 .\" .Sh STANDARDS IEEE 802.3ad Aggregation of Multiple Link Segments
CVS commit: src/share/man/man4
Module Name:src Committed By: yamaguchi Date: Wed Oct 11 06:46:33 UTC 2023 Modified Files: src/share/man/man4: agr.4 Log Message: Update agr(4) manual page The driver is marked as obsolete. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/agr.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/sparc64/gen
Module Name:src
Committed By: skrll
Date: Wed Oct 11 06:16:13 UTC 2023
Modified Files:
src/lib/libc/arch/sparc64/gen: setjmp.S
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/sparc64/gen/setjmp.S
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/arch/sparc64/gen/setjmp.S
diff -u src/lib/libc/arch/sparc64/gen/setjmp.S:1.10 src/lib/libc/arch/sparc64/gen/setjmp.S:1.11
--- src/lib/libc/arch/sparc64/gen/setjmp.S:1.10 Thu Sep 12 15:36:16 2013
+++ src/lib/libc/arch/sparc64/gen/setjmp.S Wed Oct 11 06:16:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: setjmp.S,v 1.10 2013/09/12 15:36:16 joerg Exp $ */
+/* $NetBSD: setjmp.S,v 1.11 2023/10/11 06:16:13 skrll Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
#if 0
.asciz "@(#)setjmp.s 8.1 (Berkeley) 6/4/93"
#else
- RCSID("$NetBSD: setjmp.S,v 1.10 2013/09/12 15:36:16 joerg Exp $")
+ RCSID("$NetBSD: setjmp.S,v 1.11 2023/10/11 06:16:13 skrll Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -107,7 +107,7 @@ ENTRY(__setjmp14)
call _C_LABEL(__sigaltstack14)
#endif
add %i0, 8, %o1 /* (foo being part of the sigcontext we're overwriting) */
-
+
lduw [%i0 + 8 + 0x10], %o0 /* foo.ss_flags */
and %o0, 1, %o1 /* onstack = foo.ss_flags & SS_ONSTACK; */
st %o1, [%i0 + 0x00] /* sc.sc_onstack = current onstack; */
CVS commit: src/lib/libc/arch/sparc64/gen
Module Name:src Committed By: skrll Date: Wed Oct 11 06:16:13 UTC 2023 Modified Files: src/lib/libc/arch/sparc64/gen: setjmp.S Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/sparc64/gen/setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/powerpc64/gen
Module Name:src
Committed By: skrll
Date: Wed Oct 11 06:15:57 UTC 2023
Modified Files:
src/lib/libc/arch/powerpc64/gen: __setjmp14.S
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/gen/__setjmp14.S
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/arch/powerpc64/gen/__setjmp14.S
diff -u src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.3 src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.4
--- src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.3 Sat Aug 23 02:24:22 2014
+++ src/lib/libc/arch/powerpc64/gen/__setjmp14.S Wed Oct 11 06:15:57 2023
@@ -1,9 +1,9 @@
-/* $NetBSD: __setjmp14.S,v 1.3 2014/08/23 02:24:22 matt Exp $ */
+/* $NetBSD: __setjmp14.S,v 1.4 2023/10/11 06:15:57 skrll Exp $ */
#include "SYS.h"
#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.3 2014/08/23 02:24:22 matt Exp $")
+__RCSID("$NetBSD: __setjmp14.S,v 1.4 2023/10/11 06:15:57 skrll Exp $")
#endif
/*
@@ -68,7 +68,7 @@ ENTRY(__longjmp14)
ld %r16,72(%r6)
ld %r17,80(%r6)
ld %r18,88(%r6)
- ld %r19,96(%r6)
+ ld %r19,96(%r6)
ld %r20,104(%r6)
ld %r21,112(%r6)
ld %r22,120(%r6)
CVS commit: src/lib/libc/arch/powerpc64/gen
Module Name:src Committed By: skrll Date: Wed Oct 11 06:15:57 UTC 2023 Modified Files: src/lib/libc/arch/powerpc64/gen: __setjmp14.S Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/gen/__setjmp14.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/ia64/gen
Module Name:src Committed By: skrll Date: Wed Oct 11 06:15:37 UTC 2023 Modified Files: src/lib/libc/arch/ia64/gen: setjmp.S Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/ia64/gen/setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/ia64/gen
Module Name:src
Committed By: skrll
Date: Wed Oct 11 06:15:37 UTC 2023
Modified Files:
src/lib/libc/arch/ia64/gen: setjmp.S
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/ia64/gen/setjmp.S
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/arch/ia64/gen/setjmp.S
diff -u src/lib/libc/arch/ia64/gen/setjmp.S:1.1 src/lib/libc/arch/ia64/gen/setjmp.S:1.2
--- src/lib/libc/arch/ia64/gen/setjmp.S:1.1 Fri Apr 17 12:51:05 2015
+++ src/lib/libc/arch/ia64/gen/setjmp.S Wed Oct 11 06:15:36 2023
@@ -1,21 +1,21 @@
-/* $NetBSD: setjmp.S,v 1.1 2015/04/17 12:51:05 martin Exp $ */
+/* $NetBSD: setjmp.S,v 1.2 2023/10/11 06:15:36 skrll Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
* Author: Chris G. Demetriou
- *
+ *
* Permission to use, copy, modify and distribute this software and
* its documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
*
* Software Distribution Coordinator or software.distribut...@cs.cmu.edu
@@ -30,7 +30,7 @@
#define _LOCORE
#include
-RCSID("$NetBSD: setjmp.S,v 1.1 2015/04/17 12:51:05 martin Exp $")
+RCSID("$NetBSD: setjmp.S,v 1.2 2023/10/11 06:15:36 skrll Exp $")
#include
@@ -66,7 +66,7 @@ END(__setjmp14)
ENTRY(__longjmp14, 2)
alloc loc0=ar.pfs,2,2,3,0
mov loc1=rp
- ;;
+ ;;
mov out0=3// how = SIG_SETMASK
add out1=J_SIGSET,in0 // set = [J_SIGSET]
mov out2=0// oset = NULL
