Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net80211: Use getticks(), not hardclock_ticks. 

Less extern in .c this way too.
This commit is contained in:
riastradh 2022-03-18 23:32:24 +00:00
parent 4e7bd1dfb2
commit acef9115d3
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/ic/arn5008.c
View File

@ -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, struct ieee80211_channel *c,
ar5008_init_chains(sc);
if (sc->sc_flags & ATHN_FLAG_OLPC) {
extern int ticks;
sc->sc_olpc_ticks = ticks;
ops->olpc_init(sc);
}

6
sys/dev/ic/athn.c
View File

@ -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 ieee80211_node *ni)
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, struct ieee80211_channel *curchan,
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);

4
sys/net80211/ieee80211_netbsd.h
View File

@ -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);