Module Name: src
Committed By: andvar
Date: Wed Mar 16 10:08:02 UTC 2022
Modified Files:
src/sys/arch/mips/ralink: ralink_eth.c
src/sys/dev/pci: if_jme.c
Log Message:
s/watchog/watchdog in comment and log message, one wording fix in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/ralink/ralink_eth.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/if_jme.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/ralink/ralink_eth.c
diff -u src/sys/arch/mips/ralink/ralink_eth.c:1.22 src/sys/arch/mips/ralink/ralink_eth.c:1.23
--- src/sys/arch/mips/ralink/ralink_eth.c:1.22 Tue Aug 17 22:00:30 2021
+++ src/sys/arch/mips/ralink/ralink_eth.c Wed Mar 16 10:08:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_eth.c,v 1.22 2021/08/17 22:00:30 andvar Exp $ */
+/* $NetBSD: ralink_eth.c,v 1.23 2022/03/16 10:08:02 andvar Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ralink_eth.c -- Ralink Ethernet Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.22 2021/08/17 22:00:30 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.23 2022/03/16 10:08:02 andvar Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1325,7 +1325,7 @@ ralink_eth_watchdog(struct ifnet *ifp)
sc->sc_evcnt_wd_tx.ev_count++;
} else {
RALINK_DEBUG(RALINK_DEBUG_ERROR,
- "%s: spurious watchog timeout\n", ifp->if_xname);
+ "%s: spurious watchdog timeout\n", ifp->if_xname);
sc->sc_evcnt_wd_spurious.ev_count++;
return;
}
Index: src/sys/dev/pci/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.50 src/sys/dev/pci/if_jme.c:1.51
--- src/sys/dev/pci/if_jme.c:1.50 Sat May 8 00:27:02 2021
+++ src/sys/dev/pci/if_jme.c Wed Mar 16 10:08:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_jme.c,v 1.50 2021/05/08 00:27:02 thorpej Exp $ */
+/* $NetBSD: if_jme.c,v 1.51 2022/03/16 10:08:02 andvar Exp $ */
/*
* Copyright (c) 2008 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.50 2021/05/08 00:27:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.51 2022/03/16 10:08:02 andvar Exp $");
#include <sys/param.h>
@@ -1614,7 +1614,7 @@ jme_txeof(struct jme_softc *sc)
sc->jme_if.if_flags &= ~IFF_OACTIVE;
}
sc->jme_tx_cons = cons;
- /* Unarm watchog timer when there is no pending descriptors in queue. */
+ /* Unarm watchdog timer when there are no pending descriptors in queue. */
if (sc->jme_tx_cnt == 0)
ifp->if_timer = 0;
#ifdef JMEDEBUG_TX