CVS commit: src/sys/dev/pci
Module Name:src Committed By: yamaguchi Date: Wed Oct 11 04:44:20 UTC 2023 Modified Files: src/sys/dev/pci: if_ixl.c Log Message: ixl(4): update link status in workqueue To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 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/sys/dev/pci
Module Name:src
Committed By: yamaguchi
Date: Wed Oct 11 04:44:20 UTC 2023
Modified Files:
src/sys/dev/pci: if_ixl.c
Log Message:
ixl(4): update link status in workqueue
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 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.91 src/sys/dev/pci/if_ixl.c:1.92
--- src/sys/dev/pci/if_ixl.c:1.91 Wed Oct 11 04:29:47 2023
+++ src/sys/dev/pci/if_ixl.c Wed Oct 11 04:44:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.91 2023/10/11 04:29:47 yamaguchi Exp $ */
+/* $NetBSD: if_ixl.c,v 1.92 2023/10/11 04:44:20 yamaguchi Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.91 2023/10/11 04:29:47 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.92 2023/10/11 04:44:20 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -651,6 +651,7 @@ struct ixl_softc {
unsigned int sc_arq_cons;
struct ixl_work sc_link_state_task;
+ struct ixl_work sc_link_state_done_task;
struct ixl_atq sc_link_state_atq;
struct ixl_dmamem sc_hmc_sd;
@@ -715,6 +716,11 @@ do { \
#define IXL_QUEUE_NUM 0
#endif
+enum ixl_link_flags {
+ IXL_LINK_NOFLAGS = 0,
+ IXL_LINK_FLAG_WAITDONE = __BIT(0),
+};
+
static bool ixl_param_nomsix = false;
static int ixl_param_stats_interval = IXL_STATS_INTERVAL_MSEC;
static int ixl_param_nqps_limit = IXL_QUEUE_NUM;
@@ -738,6 +744,7 @@ static int ixl_atq_poll(struct ixl_softc
unsigned int);
static void ixl_atq_set(struct ixl_atq *,
void (*)(struct ixl_softc *, const struct ixl_aq_desc *));
+static void ixl_wakeup(struct ixl_softc *, const struct ixl_aq_desc *);
static int ixl_atq_post_locked(struct ixl_softc *, struct ixl_atq *);
static void ixl_atq_done(struct ixl_softc *);
static int ixl_atq_exec(struct ixl_softc *, struct ixl_atq *);
@@ -759,10 +766,12 @@ static void ixl_hmc_free(struct ixl_soft
static int ixl_get_vsi(struct ixl_softc *);
static int ixl_set_vsi(struct ixl_softc *);
static void ixl_set_filter_control(struct ixl_softc *);
-static void ixl_get_link_status(void *);
+static int ixl_get_link_status(struct ixl_softc *, enum ixl_link_flags);
+static void ixl_get_link_status_work(void *);
static int ixl_get_link_status_poll(struct ixl_softc *, int *);
static void ixl_get_link_status_done(struct ixl_softc *,
const struct ixl_aq_desc *);
+static void ixl_get_link_status_done_work(void *);
static int ixl_set_link_status_locked(struct ixl_softc *,
const struct ixl_aq_desc *);
static uint64_t ixl_search_link_speed(uint8_t);
@@ -1347,7 +1356,10 @@ ixl_attach(device_t parent, device_t sel
if_link_state_change(ifp, link);
ixl_atq_set(>sc_link_state_atq, ixl_get_link_status_done);
- ixl_work_set(>sc_link_state_task, ixl_get_link_status, sc);
+ ixl_work_set(>sc_link_state_task,
+ ixl_get_link_status_work, sc);
+ ixl_work_set(>sc_link_state_done_task,
+ ixl_get_link_status_done_work, sc);
ixl_config_other_intr(sc);
ixl_enable_other_intr(sc);
@@ -2087,8 +2099,10 @@ ixl_init(struct ifnet *ifp)
error = ixl_init_locked(sc);
mutex_exit(>sc_cfg_lock);
- if (error == 0)
- (void)ixl_get_link_status(sc);
+ if (error == 0) {
+ error = ixl_get_link_status(sc,
+ IXL_LINK_FLAG_WAITDONE);
+ }
return error;
}
@@ -3579,50 +3593,88 @@ ixl_other_intr(void *xsc)
}
static void
-ixl_get_link_status_done(struct ixl_softc *sc,
-const struct ixl_aq_desc *iaq)
+ixl_get_link_status_done_work(void *xsc)
{
- struct ixl_aq_desc iaq_buf;
-
- memcpy(_buf, iaq, sizeof(iaq_buf));
+ struct ixl_softc *sc = xsc;
+ struct ixl_aq_desc *iaq, iaq_buf;
- /*
- * The lock can be released here
- * because there is no post processing about ATQ
- */
+ mutex_enter(>sc_atq_lock);
+ iaq = >sc_link_state_atq.iatq_desc;
+ iaq_buf = *iaq;
mutex_exit(>sc_atq_lock);
+
ixl_link_state_update(sc, _buf);
+
mutex_enter(>sc_atq_lock);
+ CLR(iaq->iaq_flags, htole16(IXL_AQ_DD));
+ ixl_wakeup(sc, iaq);
+ mutex_exit(>sc_atq_lock);
}
static void
-ixl_get_link_status(void *xsc)
+ixl_get_link_status_done(struct ixl_softc *sc,
+const struct ixl_aq_desc *iaq)
{
- struct ixl_softc *sc = xsc;
+
+ ixl_work_add(sc->sc_workq, >sc_link_state_done_task);
+}
+
+static int
+ixl_get_link_status(struct ixl_softc *sc, enum ixl_link_flags flags)
+{
+ struct ixl_atq *iatq;
struct ixl_aq_desc *iaq;
struct ixl_aq_link_param *param;
int error;
mutex_enter(>sc_atq_lock);
- if (sc->sc_link_state_atq.iatq_inuse)
- goto done;
+ iatq = >sc_link_state_atq;
+ iaq = >iatq_desc;
- iaq = >sc_link_state_atq.iatq_desc;
- memset(iaq, 0, sizeof(*iaq));
- iaq->iaq_opcode = htole16(IXL_AQ_OP_PHY_LINK_STATUS);
- param = (struct ixl_aq_link_param *)iaq->iaq_param;
- param->notify =
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: yamaguchi
Date: Wed Oct 11 04:29:47 UTC 2023
Modified Files:
src/sys/dev/pci: if_ixl.c
Log Message:
ixl(4): use cv_broadcast to wakeup ioctl and workqueue context.
Commands may be issued at the same time from the both context.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 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.90 src/sys/dev/pci/if_ixl.c:1.91
--- src/sys/dev/pci/if_ixl.c:1.90 Wed Oct 11 04:24:24 2023
+++ src/sys/dev/pci/if_ixl.c Wed Oct 11 04:29:47 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.90 2023/10/11 04:24:24 yamaguchi Exp $ */
+/* $NetBSD: if_ixl.c,v 1.91 2023/10/11 04:29:47 yamaguchi Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.90 2023/10/11 04:24:24 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.91 2023/10/11 04:29:47 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3840,7 +3840,7 @@ ixl_wakeup(struct ixl_softc *sc, const s
KASSERT(mutex_owned(>sc_atq_lock));
- cv_signal(>sc_atq_cv);
+ cv_broadcast(>sc_atq_cv);
}
static int
@@ -3869,8 +3869,12 @@ ixl_atq_exec_locked(struct ixl_softc *sc
if (error)
return error;
- error = cv_timedwait(>sc_atq_cv, >sc_atq_lock,
- IXL_ATQ_EXEC_TIMEOUT);
+ do {
+ error = cv_timedwait(>sc_atq_cv, >sc_atq_lock,
+ IXL_ATQ_EXEC_TIMEOUT);
+ if (error == EWOULDBLOCK)
+ break;
+ } while (iatq->iatq_inuse);
return error;
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: yamaguchi Date: Wed Oct 11 04:29:47 UTC 2023 Modified Files: src/sys/dev/pci: if_ixl.c Log Message: ixl(4): use cv_broadcast to wakeup ioctl and workqueue context. Commands may be issued at the same time from the both context. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 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/sys/dev/pci
Module Name:src
Committed By: yamaguchi
Date: Wed Oct 11 04:24:25 UTC 2023
Modified Files:
src/sys/dev/pci: if_ixl.c
Log Message:
ixl(4): skip getting link status if the last command is running
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 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.89 src/sys/dev/pci/if_ixl.c:1.90
--- src/sys/dev/pci/if_ixl.c:1.89 Sun Mar 26 19:10:33 2023
+++ src/sys/dev/pci/if_ixl.c Wed Oct 11 04:24:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.89 2023/03/26 19:10:33 andvar Exp $ */
+/* $NetBSD: if_ixl.c,v 1.90 2023/10/11 04:24:24 yamaguchi Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.89 2023/03/26 19:10:33 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.90 2023/10/11 04:24:24 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -446,6 +446,7 @@ struct ixl_atq {
struct ixl_aq_desc iatq_desc;
void (*iatq_fn)(struct ixl_softc *,
const struct ixl_aq_desc *);
+ bool iatq_inuse;
};
SIMPLEQ_HEAD(ixl_atq_list, ixl_atq);
@@ -3604,6 +3605,9 @@ ixl_get_link_status(void *xsc)
mutex_enter(>sc_atq_lock);
+ if (sc->sc_link_state_atq.iatq_inuse)
+ goto done;
+
iaq = >sc_link_state_atq.iatq_desc;
memset(iaq, 0, sizeof(*iaq));
iaq->iaq_opcode = htole16(IXL_AQ_OP_PHY_LINK_STATUS);
@@ -3617,6 +3621,7 @@ ixl_get_link_status(void *xsc)
ixl_get_link_status_done(sc, iaq);
}
+done:
mutex_exit(>sc_atq_lock);
}
@@ -3766,6 +3771,7 @@ ixl_atq_post_locked(struct ixl_softc *sc
sc->sc_atq_prod = prod_next;
ixl_wr(sc, sc->sc_aq_regs->atq_tail, sc->sc_atq_prod);
+ iatq->iatq_inuse = true;
return 0;
}
@@ -3799,6 +3805,7 @@ ixl_atq_done_locked(struct ixl_softc *sc
iatq = (struct ixl_atq *)((intptr_t)slot->iaq_cookie);
iatq->iatq_desc = *slot;
+ iatq->iatq_inuse = false;
memset(slot, 0, sizeof(*slot));
CVS commit: src/sys/dev/pci
Module Name:src Committed By: yamaguchi Date: Wed Oct 11 04:24:25 UTC 2023 Modified Files: src/sys/dev/pci: if_ixl.c Log Message: ixl(4): skip getting link status if the last command is running To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 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/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Oct 11 03:48:35 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
ixg(4): Whitespace. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 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.338 src/sys/dev/pci/ixgbe/ixgbe.c:1.339
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.338 Fri Oct 6 14:48:08 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Oct 11 03:48:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.338 2023/10/06 14:48:08 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.339 2023/10/11 03:48:35 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.338 2023/10/06 14:48:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.339 2023/10/11 03:48:35 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2822,7 +2822,7 @@ static int
ixgbe_msix_que(void *arg)
{
struct ix_queue *que = arg;
- struct ixgbe_softc *sc = que->sc;
+ struct ixgbe_softc *sc = que->sc;
struct ifnet *ifp = sc->ifp;
struct tx_ring *txr = que->txr;
struct rx_ring *rxr = que->rxr;
@@ -3336,7 +3336,7 @@ ixgbe_sysctl_interrupt_rate_handler(SYSC
{
struct sysctlnode node = *rnode;
struct ix_queue *que = (struct ix_queue *)node.sysctl_data;
- struct ixgbe_softc *sc;
+ struct ixgbe_softc *sc;
uint32_t reg, usec, rate;
int error;
@@ -4615,7 +4615,7 @@ ixgbe_local_timer(void *arg)
static void
ixgbe_handle_timer(struct work *wk, void *context)
{
- struct ixgbe_softc *sc = context;
+ struct ixgbe_softc *sc = context;
struct ixgbe_hw *hw = >hw;
device_t dev = sc->dev;
struct ix_queue *que = sc->queues;
@@ -4796,7 +4796,7 @@ ixgbe_handle_recovery_mode_timer(struct
static void
ixgbe_handle_mod(void *context, bool int_en)
{
- struct ixgbe_softc *sc = context;
+ struct ixgbe_softc *sc = context;
struct ixgbe_hw *hw = >hw;
device_t dev = sc->dev;
enum ixgbe_sfp_type last_sfp_type;
@@ -4887,7 +4887,7 @@ out:
static void
ixgbe_handle_msf(void *context)
{
- struct ixgbe_softc *sc = context;
+ struct ixgbe_softc *sc = context;
struct ixgbe_hw *hw = >hw;
u32 autoneg;
bool negotiate;
@@ -4909,7 +4909,7 @@ ixgbe_handle_msf(void *context)
static void
ixgbe_handle_phy(void *context)
{
- struct ixgbe_softc *sc = context;
+ struct ixgbe_softc *sc = context;
struct ixgbe_hw *hw = >hw;
int error;
@@ -4929,7 +4929,7 @@ ixgbe_handle_phy(void *context)
static void
ixgbe_handle_admin(struct work *wk, void *context)
{
- struct ixgbe_softc *sc = context;
+ struct ixgbe_softc *sc = context;
struct ifnet *ifp = sc->ifp;
struct ixgbe_hw *hw = >hw;
u32 task_requests;
@@ -5013,7 +5013,7 @@ static void
ixgbe_stop_locked(void *arg)
{
struct ifnet *ifp;
- struct ixgbe_softc *sc = arg;
+ struct ixgbe_softc *sc = arg;
struct ixgbe_hw *hw = >hw;
ifp = sc->ifp;
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Oct 11 03:48:35 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: ixg(4): Whitespace. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.338 -r1.339 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/share/misc
Module Name:src Committed By: jschauma Date: Wed Oct 11 01:21:21 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: well, kinda have to add CSRF now, don't we? +CSRF cross-site request forgery To generate a diff of this commit: cvs rdiff -u -r1.374 -r1.375 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.374 src/share/misc/acronyms.comp:1.375 --- src/share/misc/acronyms.comp:1.374 Wed Oct 11 01:15:16 2023 +++ src/share/misc/acronyms.comp Wed Oct 11 01:21:21 2023 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.374 2023/10/11 01:15:16 jschauma Exp $ +$NetBSD: acronyms.comp,v 1.375 2023/10/11 01:21:21 jschauma Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -322,6 +322,7 @@ CRQC cryptanalytically relevant quantum CRLF carriage return line feed CSIRT computer security incident response team CSPM cloud security posture management +CSRF cross-site request forgery CSU C start up CRT cathode ray tube CRTP curiously recurring template pattern
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Wed Oct 11 01:21:21 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: well, kinda have to add CSRF now, don't we? +CSRF cross-site request forgery To generate a diff of this commit: cvs rdiff -u -r1.374 -r1.375 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Wed Oct 11 01:15:16 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +SSRF server-side request forgery To generate a diff of this commit: cvs rdiff -u -r1.373 -r1.374 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.373 src/share/misc/acronyms.comp:1.374 --- src/share/misc/acronyms.comp:1.373 Tue Oct 10 01:17:19 2023 +++ src/share/misc/acronyms.comp Wed Oct 11 01:15:16 2023 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.373 2023/10/10 01:17:19 jschauma Exp $ +$NetBSD: acronyms.comp,v 1.374 2023/10/11 01:15:16 jschauma Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1642,6 +1642,7 @@ SSFDC solid state floppy disc card SSH secure shell SSI server side includes SSID service set identifier +SSRF server-side request forgery SSTP secure socket tunneling protocol SSL secure sockets layer SSP stack smashing protection
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Wed Oct 11 01:15:16 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +SSRF server-side request forgery To generate a diff of this commit: cvs rdiff -u -r1.373 -r1.374 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src Committed By: riastradh Date: Tue Oct 10 21:51:01 UTC 2023 Modified Files: src/share/man/man7: hier.7 Log Message: hier(7): Document /usr/share/certs/mozilla. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/share/man/man7/hier.7 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/man7/hier.7 diff -u src/share/man/man7/hier.7:1.141 src/share/man/man7/hier.7:1.142 --- src/share/man/man7/hier.7:1.141 Sat Sep 2 17:40:45 2023 +++ src/share/man/man7/hier.7 Tue Oct 10 21:51:01 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: hier.7,v 1.141 2023/09/02 17:40:45 riastradh Exp $ +.\" $NetBSD: hier.7,v 1.142 2023/10/10 21:51:01 riastradh Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -586,6 +586,30 @@ Architecture-independent files, mostly t .It Pa calendar/ A variety of calendar files; see .Xr calendar 1 . +.It Pa certs/mozilla/ +X.509 certificates from Mozilla's curated set of certificate +authorities (CAs), +.Pa certdata.txt , +in PEM format. +See +.%U https://wiki.mozilla.org/CA/Included_Certificates +for details. +Used by +.Xr certctl 8 +to populate OpenSSL trust anchors at +.Pa /etc/openssl/certs . +.Bl -tag -width "server/" -compact +.It Pa all/ +Certificates of all CAs in Mozilla +.Pa certdata.txt , +for all purposes, including CAs Mozilla may no longer trust. +.It Pa code/ +Certificates of CAs trusted by Mozilla for code-signing. +.It Pa email/ +Certificates of CAs trusted by Mozilla for email with S/MIME. +.It Pa code/ +Certificates of CAs trusted by Mozilla for TLS server authentication. +.El .It Pa dict/ Word lists; see
CVS commit: src/share/man/man7
Module Name:src Committed By: riastradh Date: Tue Oct 10 21:51:01 UTC 2023 Modified Files: src/share/man/man7: hier.7 Log Message: hier(7): Document /usr/share/certs/mozilla. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/share/man/man7/hier.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/onewire
Module Name:src Committed By: kardel Date: Tue Oct 10 19:21:39 UTC 2023 Modified Files: src/sys/dev/onewire: owtemp.c Log Message: PR kern/57088: add missing "onewire" link dependency Thanks Lloyd for pointing me to this PR as I independently fixed the missing module functionality (and also missing the link dependency). To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/onewire/owtemp.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/onewire
Module Name:src Committed By: kardel Date: Tue Oct 10 19:21:39 UTC 2023 Modified Files: src/sys/dev/onewire: owtemp.c Log Message: PR kern/57088: add missing "onewire" link dependency Thanks Lloyd for pointing me to this PR as I independently fixed the missing module functionality (and also missing the link dependency). To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/onewire/owtemp.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/onewire/owtemp.c diff -u src/sys/dev/onewire/owtemp.c:1.20 src/sys/dev/onewire/owtemp.c:1.21 --- src/sys/dev/onewire/owtemp.c:1.20 Sun Aug 27 13:20:09 2023 +++ src/sys/dev/onewire/owtemp.c Tue Oct 10 19:21:38 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: owtemp.c,v 1.20 2023/08/27 13:20:09 kardel Exp $ */ +/* $NetBSD: owtemp.c,v 1.21 2023/10/10 19:21:38 kardel Exp $ */ /* $OpenBSD: owtemp.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */ /*- @@ -51,7 +51,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.20 2023/08/27 13:20:09 kardel Exp $"); +__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.21 2023/10/10 19:21:38 kardel Exp $"); #include #include @@ -318,7 +318,7 @@ owtemp_decode_ds1920(const uint8_t *buf) return (temp + 27315); } -MODULE(MODULE_CLASS_DRIVER, owtemp, NULL); +MODULE(MODULE_CLASS_DRIVER, owtemp, "onewire"); #ifdef _MODULE #include "ioconf.c"
Re: CVS commit: src/sys
On Tue, Oct 10, 2023 at 06:00:57PM +0200, J. Hannken-Illjes wrote: > > cvs rdiff -u -r1.63 -r1.64 src/sys/kern/sys_select.c > > -sleepq_unsleep(l, false); > +sleepq_remove(l->l_sleepq, l, true); > } >} >mutex_spin_exit(lock); > > Looks like sleepq_remove() unlocks l->l_mutex == lock and > then mutex_spin_exit(lock) will unlock an unlocked mutex. lock is held before the call to sleepq_remove() and this is also true at the time: l->l_mutex == lock. After the call lock is still held, but now l->l_mutex != lock, because l has changed state (e.g LSSLEEP -> LSRUN) which causes l_mutex to change in concert. There is a rough overview here: https://nxr.netbsd.org/xref/src/sys/kern/kern_lwp.c#156 Did you encounter a problem? Cheers, Andrew
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 18:56:33 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ammend ticket #1747 for additional changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.108 src/doc/CHANGES-9.4:1.1.2.109 --- src/doc/CHANGES-9.4:1.1.2.108 Tue Oct 10 13:09:28 2023 +++ src/doc/CHANGES-9.4 Tue Oct 10 18:56:33 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.108 2023/10/10 13:09:28 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.109 2023/10/10 18:56:33 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -2242,6 +2242,7 @@ sys/dev/pci/if_wm.c1.785-1.789 - Modify some event counters' descriptions to clarify meaning. [msaitoh, ticket #1746] +sys/arch/evbmips/conf/INSTALL_CI20 1.3 sys/arch/evbmips/conf/INSTALL_OMSAL400 1.4 distrib/evbmips/instkernel/ramdisk/Makefile 1.19 lib/libm/Makefile1.222
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 18:56:33 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ammend ticket #1747 for additional changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 18:55:58 UTC 2023 Modified Files: src/sys/arch/evbmips/conf [netbsd-9]: INSTALL_CI20 Log Message: Additionally pull up following revision(s) (requested by he in ticket #1747): sys/arch/evbmips/conf/INSTALL_CI20: revision 1.3 INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.26.1 src/sys/arch/evbmips/conf/INSTALL_CI20 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/INSTALL_CI20 diff -u src/sys/arch/evbmips/conf/INSTALL_CI20:1.1 src/sys/arch/evbmips/conf/INSTALL_CI20:1.1.26.1 --- src/sys/arch/evbmips/conf/INSTALL_CI20:1.1 Mon Apr 6 14:18:09 2015 +++ src/sys/arch/evbmips/conf/INSTALL_CI20 Tue Oct 10 18:55:58 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_CI20,v 1.1 2015/04/06 14:18:09 joerg Exp $ +# $NetBSD: INSTALL_CI20,v 1.1.26.1 2023/10/10 18:55:58 martin Exp $ include "arch/evbmips/conf/CI20" -#ident "INSTALL_CI20-$Revision: 1.1 $" +#ident "INSTALL_CI20-$Revision: 1.1.26.1 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,4 +11,4 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=12416 # size of memory disk, in blocks
CVS commit: [netbsd-9] src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 18:55:58 UTC 2023 Modified Files: src/sys/arch/evbmips/conf [netbsd-9]: INSTALL_CI20 Log Message: Additionally pull up following revision(s) (requested by he in ticket #1747): sys/arch/evbmips/conf/INSTALL_CI20: revision 1.3 INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.26.1 src/sys/arch/evbmips/conf/INSTALL_CI20 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 18:54:08 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ammend ticket #397 for additional changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.136 -r1.1.2.137 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.136 src/doc/CHANGES-10.0:1.1.2.137 --- src/doc/CHANGES-10.0:1.1.2.136 Tue Oct 10 13:18:53 2023 +++ src/doc/CHANGES-10.0 Tue Oct 10 18:54:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.136 2023/10/10 13:18:53 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.137 2023/10/10 18:54:07 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12268,6 +12268,7 @@ sys/dev/pci/if_wm.c1.785-1.789 - Modify some event counters' descriptions to clarify meaning. [msaitoh, ticket #396] +sys/arch/evbmips/conf/INSTALL_CI20 1.3 sys/arch/evbmips/conf/INSTALL_OMSAL400 1.4 distrib/evbmips/instkernel/ramdisk/Makefile 1.19 lib/libm/Makefile1.222
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 18:54:08 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ammend ticket #397 for additional changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.136 -r1.1.2.137 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 18:53:08 UTC 2023 Modified Files: src/sys/arch/evbmips/conf [netbsd-10]: INSTALL_CI20 Log Message: Additionally pull up following revision(s) (requested by he in ticket #397): sys/arch/evbmips/conf/INSTALL_CI20: revision 1.3 INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.52.1 src/sys/arch/evbmips/conf/INSTALL_CI20 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/INSTALL_CI20 diff -u src/sys/arch/evbmips/conf/INSTALL_CI20:1.1 src/sys/arch/evbmips/conf/INSTALL_CI20:1.1.52.1 --- src/sys/arch/evbmips/conf/INSTALL_CI20:1.1 Mon Apr 6 14:18:09 2015 +++ src/sys/arch/evbmips/conf/INSTALL_CI20 Tue Oct 10 18:53:08 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_CI20,v 1.1 2015/04/06 14:18:09 joerg Exp $ +# $NetBSD: INSTALL_CI20,v 1.1.52.1 2023/10/10 18:53:08 martin Exp $ include "arch/evbmips/conf/CI20" -#ident "INSTALL_CI20-$Revision: 1.1 $" +#ident "INSTALL_CI20-$Revision: 1.1.52.1 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,4 +11,4 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=12416 # size of memory disk, in blocks
CVS commit: [netbsd-10] src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 18:53:08 UTC 2023 Modified Files: src/sys/arch/evbmips/conf [netbsd-10]: INSTALL_CI20 Log Message: Additionally pull up following revision(s) (requested by he in ticket #397): sys/arch/evbmips/conf/INSTALL_CI20: revision 1.3 INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.52.1 src/sys/arch/evbmips/conf/INSTALL_CI20 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: abs
Date: Tue Oct 10 16:46:56 UTC 2023
Modified Files:
src/sys/dev/pci: ahcisata_pci.c
Log Message:
Add support for ASMEDIA 0x0624
... an AHCI SATA adaptor which identifies itself as an IDE storage device
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/ahcisata_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/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.70 src/sys/dev/pci/ahcisata_pci.c:1.71
--- src/sys/dev/pci/ahcisata_pci.c:1.70 Sun Sep 10 14:04:28 2023
+++ src/sys/dev/pci/ahcisata_pci.c Tue Oct 10 16:46:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.70 2023/09/10 14:04:28 abs Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.71 2023/10/10 16:46:56 abs Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.70 2023/09/10 14:04:28 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.71 2023/10/10 16:46:56 abs Exp $");
#ifdef _KERNEL_OPT
#include "opt_ahcisata_pci.h"
@@ -198,6 +198,8 @@ static const struct ahci_pci_quirk ahci_
AHCI_PCI_QUIRK_FORCE },
{ PCI_VENDOR_ASMEDIA, PCI_PRODUCT_ASMEDIA_ASM1061_12,
AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_ASMEDIA, PCI_PRODUCT_ASMEDIA_ASM1062_JMB575,
+ AHCI_PCI_QUIRK_FORCE },
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_HUDSON_SATA,
AHCI_PCI_QUIRK_FORCE },
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_HUDSON_SATA_AHCI,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: abs Date: Tue Oct 10 16:46:56 UTC 2023 Modified Files: src/sys/dev/pci: ahcisata_pci.c Log Message: Add support for ASMEDIA 0x0624 ... an AHCI SATA adaptor which identifies itself as an IDE storage device To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/ahcisata_pci.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: abs Date: Tue Oct 10 16:45:54 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regenerate for ASMEDIA 0x0624 To generate a diff of this commit: cvs rdiff -u -r1.1476 -r1.1477 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1475 -r1.1476 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. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/dev/pci
Module Name:src Committed By: abs Date: Tue Oct 10 16:45:54 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regenerate for ASMEDIA 0x0624 To generate a diff of this commit: cvs rdiff -u -r1.1476 -r1.1477 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1475 -r1.1476 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: abs Date: Tue Oct 10 16:44:16 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add entry for ASMEDIA 0x0624 - ASM1062 + JMB575 Port Multiplier To generate a diff of this commit: cvs rdiff -u -r1.1495 -r1.1496 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.1495 src/sys/dev/pci/pcidevs:1.1496 --- src/sys/dev/pci/pcidevs:1.1495 Sun Oct 8 08:04:41 2023 +++ src/sys/dev/pci/pcidevs Tue Oct 10 16:44:16 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1495 2023/10/08 08:04:41 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1496 2023/10/10 16:44:16 abs Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1510,6 +1510,7 @@ product ASMEDIA ASM1061_01 0x0601 ASM106 product ASMEDIA ASM1061_02 0x0602 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_11 0x0611 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_12 0x0612 ASM1061 AHCI SATA III Controller +product ASMEDIA ASM1062_JMB575 0x0624 ASM1062 + JMB575 Port Multiplier product ASMEDIA ASM106X 0x0625 ASM106x AHCI SATA III Controller product ASMEDIA ASM1042 0x1042 ASM1042 USB 3.0 Host Controller product ASMEDIA ASM1083 0x1080 ASM1083/1085 PCIe-PCI Bridge
CVS commit: src/sys/dev/pci
Module Name:src Committed By: abs Date: Tue Oct 10 16:44:16 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add entry for ASMEDIA 0x0624 - ASM1062 + JMB575 Port Multiplier To generate a diff of this commit: cvs rdiff -u -r1.1495 -r1.1496 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/arch/evbmips/conf
Module Name:src Committed By: he Date: Tue Oct 10 16:23:56 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_CI20 Log Message: INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/INSTALL_CI20 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/INSTALL_CI20 diff -u src/sys/arch/evbmips/conf/INSTALL_CI20:1.2 src/sys/arch/evbmips/conf/INSTALL_CI20:1.3 --- src/sys/arch/evbmips/conf/INSTALL_CI20:1.2 Fri Jun 9 21:33:16 2023 +++ src/sys/arch/evbmips/conf/INSTALL_CI20 Tue Oct 10 16:23:56 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_CI20,v 1.2 2023/06/09 21:33:16 gutteridge Exp $ +# $NetBSD: INSTALL_CI20,v 1.3 2023/10/10 16:23:56 he Exp $ include "arch/evbmips/conf/CI20" -#ident "INSTALL_CI20-$Revision: 1.2 $" +#ident "INSTALL_CI20-$Revision: 1.3 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,4 +11,4 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=12416 # size of memory disk, in blocks
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: he Date: Tue Oct 10 16:23:56 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_CI20 Log Message: INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/INSTALL_CI20 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys
> On 8. Oct 2023, at 15:23, Andrew Doran wrote: > > Module Name: src > Committed By: ad > Date: Sun Oct 8 13:23:05 UTC 2023 > > Modified Files: > src/sys/kern: kern_condvar.c kern_sleepq.c kern_timeout.c >kern_turnstile.c sys_lwp.c sys_select.c > src/sys/rump/librump/rumpkern: sleepq.c > src/sys/sys: sleepq.h syncobj.h > > Log Message: > Ensure that an LWP that has taken a legitimate wakeup never produces an > error code from sleepq_block(). Then, it's possible to make cv_signal() > work as expected and only ever wake a singular LWP. > > > To generate a diff of this commit: ... > cvs rdiff -u -r1.63 -r1.64 src/sys/kern/sys_select.c -sleepq_unsleep(l, false); +sleepq_remove(l->l_sleepq, l, true); } } mutex_spin_exit(lock); Looks like sleepq_remove() unlocks l->l_mutex == lock and then mutex_spin_exit(lock) will unlock an unlocked mutex. -- J. Hannken-Illjes - hann...@mailbox.org signature.asc Description: Message signed with OpenPGP
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 13:18:53 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #402 To generate a diff of this commit: cvs rdiff -u -r1.1.2.135 -r1.1.2.136 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.135 src/doc/CHANGES-10.0:1.1.2.136 --- src/doc/CHANGES-10.0:1.1.2.135 Tue Oct 10 13:04:40 2023 +++ src/doc/CHANGES-10.0 Tue Oct 10 13:18:53 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.135 2023/10/10 13:04:40 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.136 2023/10/10 13:18:53 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12349,3 +12349,12 @@ sys/arch/zaurus/conf/GENERIC (apply pa Remove options DIAGNOSTIC/DEBUG. [martin, ticket #401] +lib/libcurses/addbytes.c 1.69 +lib/libcurses/tty.c1.50 +tests/lib/libcurses/check_files/addstr3.chk 1.5 +tests/lib/libcurses/check_files/waddstr2.chk 1.2 + + libcurses: fix for PR 56467: scrolling does not work in some curses + applications (like sysinst). + [kim, ticket #402] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 13:18:53 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #402 To generate a diff of this commit: cvs rdiff -u -r1.1.2.135 -r1.1.2.136 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Tue Oct 10 13:17:46 UTC 2023
Modified Files:
src/lib/libcurses [netbsd-10]: addbytes.c tty.c
src/tests/lib/libcurses/check_files [netbsd-10]: addstr3.chk
waddstr2.chk
Log Message:
Pull up following revision(s) (requested by kim in ticket #402):
tests/lib/libcurses/check_files/waddstr2.chk: revision 1.2
tests/lib/libcurses/check_files/addstr3.chk: revision 1.5
lib/libcurses/addbytes.c: revision 1.69
lib/libcurses/tty.c: revision 1.50
Fix for install/56467
Set x to 0 before calling scroll based on a proposed fix by RVP (thanks!)
Update check files affected by a fix to addbyte.c in libcurses.
Correct the fd closed check so we actually check the outfd as per
the comment. Thanks for jdc%netbsd.org@localhost for catching this one.
To generate a diff of this commit:
cvs rdiff -u -r1.67.2.1 -r1.67.2.2 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.49 -r1.49.2.1 src/lib/libcurses/tty.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/tests/lib/libcurses/check_files/addstr3.chk
cvs rdiff -u -r1.1 -r1.1.2.1 src/tests/lib/libcurses/check_files/waddstr2.chk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.67.2.1 src/lib/libcurses/addbytes.c:1.67.2.2
--- src/lib/libcurses/addbytes.c:1.67.2.1 Wed Dec 21 09:38:38 2022
+++ src/lib/libcurses/addbytes.c Tue Oct 10 13:17:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.67.2.1 2022/12/21 09:38:38 martin Exp $ */
+/* $NetBSD: addbytes.c,v 1.67.2.2 2023/10/10 13:17:46 martin Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addbytes.c 8.4 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addbytes.c,v 1.67.2.1 2022/12/21 09:38:38 martin Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.67.2.2 2023/10/10 13:17:46 martin Exp $");
#endif
#endif/* not lint */
@@ -584,6 +584,8 @@ _cursesi_addwchar(WINDOW *win, __LINE **
return ERR;
__CTRACE(__CTRACE_INPUT,
"_cursesi_addwchar: do a scroll\n");
+ if (!__NONL)
+*x = 0;
scroll(win);
}
newx = win->maxx - 1 + win->ch_off;
Index: src/lib/libcurses/tty.c
diff -u src/lib/libcurses/tty.c:1.49 src/lib/libcurses/tty.c:1.49.2.1
--- src/lib/libcurses/tty.c:1.49 Mon Sep 6 07:03:50 2021
+++ src/lib/libcurses/tty.c Tue Oct 10 13:17:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.49 2021/09/06 07:03:50 rin Exp $ */
+/* $NetBSD: tty.c,v 1.49.2.1 2023/10/10 13:17:46 martin Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.6 (Berkeley) 1/10/95";
#else
-__RCSID("$NetBSD: tty.c,v 1.49 2021/09/06 07:03:50 rin Exp $");
+__RCSID("$NetBSD: tty.c,v 1.49.2.1 2023/10/10 13:17:46 martin Exp $");
#endif
#endif/* not lint */
@@ -113,7 +113,7 @@ _cursesi_gettmode(SCREEN *screen)
if (tcgetattr(fileno(screen->infd), >orig_termios)) {
/* if the input fd is not a tty try the output */
- if (tcgetattr(fileno(screen->infd), >orig_termios)) {
+ if (tcgetattr(fileno(screen->outfd), >orig_termios)) {
/* not a tty ... we will disable tty related stuff */
screen->notty = TRUE;
__GT = 0;
Index: src/tests/lib/libcurses/check_files/addstr3.chk
diff -u src/tests/lib/libcurses/check_files/addstr3.chk:1.4 src/tests/lib/libcurses/check_files/addstr3.chk:1.4.2.1
--- src/tests/lib/libcurses/check_files/addstr3.chk:1.4 Fri Nov 4 06:17:58 2022
+++ src/tests/lib/libcurses/check_files/addstr3.chk Tue Oct 10 13:17:46 2023
@@ -1,2 +1,2 @@
-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*cup24;1X()cup24;76Xel()clearcup23;76Xa
+0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*cup24;1X()cup24;76Xel()clearcup23;76Xa
hello
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/waddstr2.chk
diff -u src/tests/lib/libcurses/check_files/waddstr2.chk:1.1 src/tests/lib/libcurses/check_files/waddstr2.chk:1.1.2.1
--- src/tests/lib/libcurses/check_files/waddstr2.chk:1.1 Thu Nov 10 06:13:29 2022
+++ src/tests/lib/libcurses/check_files/waddstr2.chk Tue Oct 10 13:17:46 2023
@@ -1,3 +1,6 @@
-012345cup5;6X6cup6;8Xel
+ 8el
+ 012345
+ 012345
+ 6 el
8el
el
\ No newline at end of file
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Tue Oct 10 13:17:46 UTC 2023 Modified Files: src/lib/libcurses [netbsd-10]: addbytes.c tty.c src/tests/lib/libcurses/check_files [netbsd-10]: addstr3.chk waddstr2.chk Log Message: Pull up following revision(s) (requested by kim in ticket #402): tests/lib/libcurses/check_files/waddstr2.chk: revision 1.2 tests/lib/libcurses/check_files/addstr3.chk: revision 1.5 lib/libcurses/addbytes.c: revision 1.69 lib/libcurses/tty.c: revision 1.50 Fix for install/56467 Set x to 0 before calling scroll based on a proposed fix by RVP (thanks!) Update check files affected by a fix to addbyte.c in libcurses. Correct the fd closed check so we actually check the outfd as per the comment. Thanks for jdc%netbsd.org@localhost for catching this one. To generate a diff of this commit: cvs rdiff -u -r1.67.2.1 -r1.67.2.2 src/lib/libcurses/addbytes.c cvs rdiff -u -r1.49 -r1.49.2.1 src/lib/libcurses/tty.c cvs rdiff -u -r1.4 -r1.4.2.1 src/tests/lib/libcurses/check_files/addstr3.chk cvs rdiff -u -r1.1 -r1.1.2.1 src/tests/lib/libcurses/check_files/waddstr2.chk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 13:09:29 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ammend ticket #1747 for additional changes. To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.107 src/doc/CHANGES-9.4:1.1.2.108 --- src/doc/CHANGES-9.4:1.1.2.107 Sun Oct 8 18:50:46 2023 +++ src/doc/CHANGES-9.4 Tue Oct 10 13:09:28 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.107 2023/10/08 18:50:46 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.108 2023/10/10 13:09:28 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -2242,6 +2242,7 @@ sys/dev/pci/if_wm.c1.785-1.789 - Modify some event counters' descriptions to clarify meaning. [msaitoh, ticket #1746] +sys/arch/evbmips/conf/INSTALL_OMSAL400 1.4 distrib/evbmips/instkernel/ramdisk/Makefile 1.19 lib/libm/Makefile1.222
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 13:09:29 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ammend ticket #1747 for additional changes. To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 13:07:51 UTC 2023 Modified Files: src/sys/arch/evbmips/conf [netbsd-9]: INSTALL_OMSAL400 Log Message: Additionally pull up the following revision for ticket #397 to fix the build: sys/arch/evbmips/conf/INSTALL_OMSAL400 1.4 Make more room for ramdisk image (which recently grew a bit) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.70.1 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/INSTALL_OMSAL400 diff -u src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.2 src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.2.70.1 --- src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.2 Fri Feb 6 18:50:27 2009 +++ src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Tue Oct 10 13:07:50 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_OMSAL400,v 1.2 2009/02/06 18:50:27 jym Exp $ +# $NetBSD: INSTALL_OMSAL400,v 1.2.70.1 2023/10/10 13:07:50 martin Exp $ include "arch/evbmips/conf/OMSAL400" -#ident "INSTALL_OMSAL400-$Revision: 1.2 $" +#ident "INSTALL_OMSAL400-$Revision: 1.2.70.1 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,5 +11,5 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=8192 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=8350 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: [netbsd-9] src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 13:07:51 UTC 2023 Modified Files: src/sys/arch/evbmips/conf [netbsd-9]: INSTALL_OMSAL400 Log Message: Additionally pull up the following revision for ticket #397 to fix the build: sys/arch/evbmips/conf/INSTALL_OMSAL400 1.4 Make more room for ramdisk image (which recently grew a bit) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.70.1 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 13:04:41 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ammend ticket #397 for additional changes. To generate a diff of this commit: cvs rdiff -u -r1.1.2.134 -r1.1.2.135 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Oct 10 13:04:41 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ammend ticket #397 for additional changes. To generate a diff of this commit: cvs rdiff -u -r1.1.2.134 -r1.1.2.135 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.134 src/doc/CHANGES-10.0:1.1.2.135 --- src/doc/CHANGES-10.0:1.1.2.134 Mon Oct 9 23:35:42 2023 +++ src/doc/CHANGES-10.0 Tue Oct 10 13:04:40 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.134 2023/10/09 23:35:42 snj Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.135 2023/10/10 13:04:40 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12268,6 +12268,7 @@ sys/dev/pci/if_wm.c1.785-1.789 - Modify some event counters' descriptions to clarify meaning. [msaitoh, ticket #396] +sys/arch/evbmips/conf/INSTALL_OMSAL400 1.4 distrib/evbmips/instkernel/ramdisk/Makefile 1.19 lib/libm/Makefile1.222
CVS commit: [netbsd-10] src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 13:02:28 UTC 2023 Modified Files: src/sys/arch/evbmips/conf [netbsd-10]: INSTALL_OMSAL400 Log Message: Additionally pull up the following revision for ticket #397 to fix the build sys/arch/evbmips/conf/INSTALL_OMSAL400 1.4 Make more room for ramdisk image (which recently grew a bit) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.96.1 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/INSTALL_OMSAL400 diff -u src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.2 src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.2.96.1 --- src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.2 Fri Feb 6 18:50:27 2009 +++ src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Tue Oct 10 13:02:28 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_OMSAL400,v 1.2 2009/02/06 18:50:27 jym Exp $ +# $NetBSD: INSTALL_OMSAL400,v 1.2.96.1 2023/10/10 13:02:28 martin Exp $ include "arch/evbmips/conf/OMSAL400" -#ident "INSTALL_OMSAL400-$Revision: 1.2 $" +#ident "INSTALL_OMSAL400-$Revision: 1.2.96.1 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,5 +11,5 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=8192 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=8350 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: [netbsd-10] src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 13:02:28 UTC 2023 Modified Files: src/sys/arch/evbmips/conf [netbsd-10]: INSTALL_OMSAL400 Log Message: Additionally pull up the following revision for ticket #397 to fix the build sys/arch/evbmips/conf/INSTALL_OMSAL400 1.4 Make more room for ramdisk image (which recently grew a bit) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.96.1 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: simonb
Date: Tue Oct 10 10:58:03 UTC 2023
Modified Files:
src/sys/dev/usb: ugen.c
Log Message:
Debug printf tidy up, KNF comma,space nits.
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/sys/dev/usb/ugen.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/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.173 src/sys/dev/usb/ugen.c:1.174
--- src/sys/dev/usb/ugen.c:1.173 Mon Jul 31 17:41:18 2023
+++ src/sys/dev/usb/ugen.c Tue Oct 10 10:58:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.173 2023/07/31 17:41:18 christos Exp $ */
+/* $NetBSD: ugen.c,v 1.174 2023/10/10 10:58:03 simonb Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.173 2023/07/31 17:41:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.174 2023/10/10 10:58:03 simonb Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -529,7 +529,7 @@ ugen_set_config(struct ugen_softc *sc, i
if (err)
goto out;
for (endptno = 0; endptno < nendpt; endptno++) {
- ed = usbd_interface2endpoint_descriptor(iface,endptno);
+ ed = usbd_interface2endpoint_descriptor(iface, endptno);
KASSERT(ed != NULL);
endpt = ed->bEndpointAddress;
dir = UE_GET_DIR(endpt) == UE_DIR_IN ? IN : OUT;
@@ -1346,8 +1346,8 @@ ugenintr(struct usbd_xfer *xfer, void *a
usbd_get_xfer_status(xfer, NULL, NULL, , NULL);
ibuf = sce->ibuf;
- DPRINTFN(5, "xfer=%#jx status=%d count=%d",
- (uintptr_t)xfer, status, count, 0);
+ DPRINTFN(5, "xfer=%p status=%d count=%d",
+ xfer, status, count, 0);
DPRINTFN(5, " data = %02x %02x %02x",
ibuf[0], ibuf[1], ibuf[2], 0);
@@ -1595,7 +1595,7 @@ ugen_set_interface(struct ugen_softc *sc
ugen_clear_endpoints(sc);
for (endptno = 0; endptno < nendpt; endptno++) {
- ed = usbd_interface2endpoint_descriptor(iface,endptno);
+ ed = usbd_interface2endpoint_descriptor(iface, endptno);
KASSERT(ed != NULL);
endpt = ed->bEndpointAddress;
dir = UE_GET_DIR(endpt) == UE_DIR_IN ? IN : OUT;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: simonb Date: Tue Oct 10 10:58:03 UTC 2023 Modified Files: src/sys/dev/usb: ugen.c Log Message: Debug printf tidy up, KNF comma,space nits. To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/sys/dev/usb/ugen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 10:36:42 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_OMSAL400 Log Message: Make more room for ramdisk image (which recently grew a bit) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/INSTALL_OMSAL400 diff -u src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.3 src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.4 --- src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.3 Fri Jun 9 21:33:16 2023 +++ src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Tue Oct 10 10:36:42 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_OMSAL400,v 1.3 2023/06/09 21:33:16 gutteridge Exp $ +# $NetBSD: INSTALL_OMSAL400,v 1.4 2023/10/10 10:36:42 martin Exp $ include "arch/evbmips/conf/OMSAL400" -#ident "INSTALL_OMSAL400-$Revision: 1.3 $" +#ident "INSTALL_OMSAL400-$Revision: 1.4 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,5 +11,5 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=8192 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=8350 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 10:36:42 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_OMSAL400 Log Message: Make more room for ramdisk image (which recently grew a bit) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/examples/wpa_supplicant
Module Name:src
Committed By: nia
Date: Tue Oct 10 07:21:00 UTC 2023
Modified Files:
src/share/examples/wpa_supplicant: wpa_supplicant.conf
Log Message:
Add an example of connecting to an unsecured network with wpa_supplicant
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/share/examples/wpa_supplicant/wpa_supplicant.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/wpa_supplicant/wpa_supplicant.conf
diff -u src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.4 src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.5
--- src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.4 Fri Sep 29 14:05:28 2023
+++ src/share/examples/wpa_supplicant/wpa_supplicant.conf Tue Oct 10 07:21:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: wpa_supplicant.conf,v 1.4 2023/09/29 14:05:28 gutteridge Exp $
+# $NetBSD: wpa_supplicant.conf,v 1.5 2023/10/10 07:21:00 nia Exp $
#
# example wpa_supplicant config
#
@@ -12,11 +12,19 @@ ctrl_interface=/var/run/wpa_supplicant/
# name a group whose members will be Allowed(tm)
ctrl_interface_group=wheel
+# an unencrypted network
+network={
+ ssid="Freifunk"
+ key_mgmt=NONE
+ priority=10
+}
+
# simple WPA-PSK, a favourite with conferences and hotel networks
network={
ssid="SomeConference"
key_mgmt=WPA-PSK
psk="secretKey"
+ priority=20
}
# a private WPA-PSK that doesn't broadcast its SSID
@@ -25,6 +33,7 @@ network={
key_mgmt=WPA-PSK
psk="secretKey"
scan_ssid=1
+ priority=30
}
# WEP .. all the stopping power of a "please keep off the lawn" sign
CVS commit: src/share/examples/wpa_supplicant
Module Name:src Committed By: nia Date: Tue Oct 10 07:21:00 UTC 2023 Modified Files: src/share/examples/wpa_supplicant: wpa_supplicant.conf Log Message: Add an example of connecting to an unsecured network with wpa_supplicant To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/share/examples/wpa_supplicant/wpa_supplicant.conf 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: msaitoh Date: Tue Oct 10 06:21:09 UTC 2023 Modified Files: src/sys/dev/pci/igc: if_igc.c Log Message: igc(4): Fix half duplex setting From FreeBSD: 3b8d04f845b416d29a258658b8a48d1afb4a2e81 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 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.3 src/sys/dev/pci/igc/if_igc.c:1.4 --- src/sys/dev/pci/igc/if_igc.c:1.3 Wed Oct 4 07:41:55 2023 +++ src/sys/dev/pci/igc/if_igc.c Tue Oct 10 06:21:09 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: if_igc.c,v 1.3 2023/10/04 07:41:55 rin Exp $ */ +/* $NetBSD: if_igc.c,v 1.4 2023/10/10 06:21:09 msaitoh 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.3 2023/10/04 07:41:55 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.4 2023/10/10 06:21:09 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -2378,16 +2378,16 @@ igc_media_change(struct ifnet *ifp) sc->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; break; case IFM_100_TX: - if ((ifm->ifm_media & IFM_GMASK) == IFM_HDX) - sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; - else + if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) sc->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; + else + sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; break; case IFM_10_T: - if ((ifm->ifm_media & IFM_GMASK) == IFM_HDX) - sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; - else + if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) sc->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; + else + sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; break; default: return EINVAL;
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: msaitoh Date: Tue Oct 10 06:21:09 UTC 2023 Modified Files: src/sys/dev/pci/igc: if_igc.c Log Message: igc(4): Fix half duplex setting From FreeBSD: 3b8d04f845b416d29a258658b8a48d1afb4a2e81 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 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.
