[src/trunk]: src/sys/net80211 net80211: Use getticks(), not hardclock_ticks.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1d424f37b2b7
branches:  trunk
changeset: 363948:1d424f37b2b7
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Mar 18 23:32:24 2022 +0000

description:
net80211: Use getticks(), not hardclock_ticks.

Less extern in .c this way too.

diffstat:

 sys/dev/ic/arn5008.c            |  5 ++---
 sys/dev/ic/athn.c               |  6 ++----
 sys/net80211/ieee80211_netbsd.h |  4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diffs (78 lines):

diff -r c43a8e5845e9 -r 1d424f37b2b7 sys/dev/ic/arn5008.c
--- a/sys/dev/ic/arn5008.c      Fri Mar 18 23:32:14 2022 +0000
+++ b/sys/dev/ic/arn5008.c      Fri Mar 18 23:32:24 2022 +0000
@@ -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_init_chains(sc);
 
        if (sc->sc_flags & ATHN_FLAG_OLPC) {
-               extern int ticks;
                sc->sc_olpc_ticks = ticks;
                ops->olpc_init(sc);
        }
diff -r c43a8e5845e9 -r 1d424f37b2b7 sys/dev/ic/athn.c
--- a/sys/dev/ic/athn.c Fri Mar 18 23:32:14 2022 +0000
+++ b/sys/dev/ic/athn.c Fri Mar 18 23:32:24 2022 +0000
@@ -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 @@
 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 @@
        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);
diff -r c43a8e5845e9 -r 1d424f37b2b7 sys/net80211/ieee80211_netbsd.h
--- a/sys/net80211/ieee80211_netbsd.h   Fri Mar 18 23:32:14 2022 +0000
+++ b/sys/net80211/ieee80211_netbsd.h   Fri Mar 18 23:32:24 2022 +0000
@@ -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 @@
 #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);