Module Name: src
Committed By: riastradh
Date: Fri Mar 18 23:32:25 UTC 2022
Modified Files:
src/sys/dev/ic: arn5008.c athn.c
src/sys/net80211: ieee80211_netbsd.h
Log Message:
net80211: Use getticks(), not hardclock_ticks.
Less extern in .c this way too.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/arn5008.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/athn.c
cvs rdiff -u -r1.23 -r1.24 src/sys/net80211/ieee80211_netbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/arn5008.c
diff -u src/sys/dev/ic/arn5008.c:1.18 src/sys/dev/ic/arn5008.c:1.19
--- src/sys/dev/ic/arn5008.c:1.18 Mon Sep 7 10:45:23 2020
+++ src/sys/dev/ic/arn5008.c Fri Mar 18 23:32:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: arn5008.c,v 1.18 2020/09/07 10:45:23 mrg Exp $ */
+/* $NetBSD: arn5008.c,v 1.19 2022/03/18 23:32:24 riastradh Exp $ */
/* $OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.18 2020/09/07 10:45:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.19 2022/03/18 23:32:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2487,7 +2487,6 @@ ar5008_hw_init(struct athn_softc *sc, st
ar5008_init_chains(sc);
if (sc->sc_flags & ATHN_FLAG_OLPC) {
- extern int ticks;
sc->sc_olpc_ticks = ticks;
ops->olpc_init(sc);
}
Index: src/sys/dev/ic/athn.c
diff -u src/sys/dev/ic/athn.c:1.25 src/sys/dev/ic/athn.c:1.26
--- src/sys/dev/ic/athn.c:1.25 Wed Jun 16 00:21:18 2021
+++ src/sys/dev/ic/athn.c Fri Mar 18 23:32:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: athn.c,v 1.25 2021/06/16 00:21:18 riastradh Exp $ */
+/* $NetBSD: athn.c,v 1.26 2022/03/18 23:32:24 riastradh Exp $ */
/* $OpenBSD: athn.c,v 1.83 2014/07/22 13:12:11 mpi Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.25 2021/06/16 00:21:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.26 2022/03/18 23:32:24 riastradh Exp $");
#ifndef _MODULE
#include "athn_usb.h" /* for NATHN_USB */
@@ -1293,7 +1293,6 @@ athn_iter_func(void *arg, struct ieee802
Static void
athn_calib_to(void *arg)
{
- extern int ticks;
struct athn_softc *sc = arg;
struct athn_ops *ops = &sc->sc_ops;
struct ieee80211com *ic = &sc->sc_ic;
@@ -1354,7 +1353,6 @@ athn_init_calib(struct athn_softc *sc, s
if (!AR_SREV_9380_10_OR_LATER(sc)) {
/* Do PA calibration. */
if (AR_SREV_9285_11_OR_LATER(sc)) {
- extern int ticks;
sc->sc_pa_calib_ticks = ticks;
if (AR_SREV_9271(sc))
ar9271_pa_calib(sc);
Index: src/sys/net80211/ieee80211_netbsd.h
diff -u src/sys/net80211/ieee80211_netbsd.h:1.23 src/sys/net80211/ieee80211_netbsd.h:1.24
--- src/sys/net80211/ieee80211_netbsd.h:1.23 Sun Mar 15 23:04:51 2020
+++ src/sys/net80211/ieee80211_netbsd.h Fri Mar 18 23:32:25 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.h,v 1.23 2020/03/15 23:04:51 thorpej Exp $ */
+/* $NetBSD: ieee80211_netbsd.h,v 1.24 2022/03/18 23:32:25 riastradh Exp $ */
/*-
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -235,7 +235,7 @@ struct ieee80211_michael_event {
#define RTM_IEEE80211_REJOIN 108 /* station re-associate (ap mode) */
#ifdef _KERNEL
-#define ticks hardclock_ticks
+#define ticks getticks()
void if_printf(struct ifnet *, const char *, ...);
void get_random_bytes(void *, size_t);
