summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2021-12-31 14:25:22 +0000
committerriastradh <riastradh@NetBSD.org>2021-12-31 14:25:22 +0000
commitb9691d4d1215b3e51b3826e8e1ca6aa12e8cdebd (patch)
treed2f73f68594c2e6b4f611ce5d3a4e489e49a7caf /sys/dev
parentf6c8c8e3a5c8c35d1715dd10c9cf2cd367396624 (diff)
sys: Use if_init wrapper function.
Exception: Not in kern_pmf.c, for the kind of silly reason that it avoids having kern_pmf.c refer to symbols defined only in net; this avoids a pain in the rump.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cadence/if_cemac.c6
-rw-r--r--sys/dev/ic/bcmgenet.c6
-rw-r--r--sys/dev/ic/dm9000.c4
-rw-r--r--sys/dev/ic/rtl8169.c6
-rw-r--r--sys/dev/pci/if_dge.c8
-rw-r--r--sys/dev/pci/if_iwn.c6
-rw-r--r--sys/dev/pci/if_kse.c6
-rw-r--r--sys/dev/pci/if_sip.c6
-rw-r--r--sys/dev/pci/if_wm.c6
-rw-r--r--sys/dev/pci/ixgbe/ixgbe.c8
-rw-r--r--sys/dev/usb/if_urtw.c10
11 files changed, 36 insertions, 36 deletions
diff --git a/sys/dev/cadence/if_cemac.c b/sys/dev/cadence/if_cemac.c
index fd5aaf36ad3..5809effc192 100644
--- a/sys/dev/cadence/if_cemac.c
+++ b/sys/dev/cadence/if_cemac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.23 2020/06/28 12:43:00 skrll Exp $ */
+/* $NetBSD: if_cemac.c,v 1.24 2021/12/31 14:25:22 riastradh Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.23 2020/06/28 12:43:00 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.24 2021/12/31 14:25:22 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -759,7 +759,7 @@ cemac_ifioctl(struct ifnet *ifp, u_long cmd, void *data)
error = 0;
if (cmd == SIOCSIFCAP) {
- error = (*ifp->if_init)(ifp);
+ error = if_init(ifp);
} else if (cmd != SIOCADDMULTI && cmd != SIOCDELMULTI)
;
else if (ifp->if_flags & IFF_RUNNING) {
diff --git a/sys/dev/ic/bcmgenet.c b/sys/dev/ic/bcmgenet.c
index 2040f1e12bc..1afc29de87f 100644
--- a/sys/dev/ic/bcmgenet.c
+++ b/sys/dev/ic/bcmgenet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgenet.c,v 1.10 2021/08/10 15:28:44 jmcneill Exp $ */
+/* $NetBSD: bcmgenet.c,v 1.11 2021/12/31 14:25:22 riastradh Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <jmcneill@invisible.ca>
@@ -34,7 +34,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.10 2021/08/10 15:28:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.11 2021/12/31 14:25:22 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -916,7 +916,7 @@ genet_ioctl(struct ifnet *ifp, u_long cmd, void *data)
error = 0;
if (cmd == SIOCSIFCAP)
- error = (*ifp->if_init)(ifp);
+ error = if_init(ifp);
else if (cmd != SIOCADDMULTI && cmd != SIOCDELMULTI)
;
else if ((ifp->if_flags & IFF_RUNNING) != 0) {
diff --git a/sys/dev/ic/dm9000.c b/sys/dev/ic/dm9000.c
index e3c68052c42..0eb4eda1629 100644
--- a/sys/dev/ic/dm9000.c
+++ b/sys/dev/ic/dm9000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000.c,v 1.32 2021/12/05 07:26:35 msaitoh Exp $ */
+/* $NetBSD: dm9000.c,v 1.33 2021/12/31 14:25:22 riastradh Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -833,7 +833,7 @@ dme_ioctl(struct ifnet *ifp, u_long cmd, void *data)
break;
error = 0;
if (cmd == SIOCSIFCAP)
- error = (*ifp->if_init)(ifp);
+ error = if_init(ifp);
else if (cmd != SIOCADDMULTI && cmd != SIOCDELMULTI)
;
else if (ifp->if_flags && IFF_RUNNING) {
diff --git a/sys/dev/ic/rtl8169.c b/sys/dev/ic/rtl8169.c
index dd36ea119cb..c89ff6c387d 100644
--- a/sys/dev/ic/rtl8169.c
+++ b/sys/dev/ic/rtl8169.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.168 2021/09/04 19:27:43 jakllsch Exp $ */
+/* $NetBSD: rtl8169.c,v 1.169 2021/12/31 14:25:22 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.168 2021/09/04 19:27:43 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.169 2021/12/31 14:25:22 riastradh Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -2130,7 +2130,7 @@ re_ioctl(struct ifnet *ifp, u_long command, void *data)
error = 0;
if (command == SIOCSIFCAP)
- error = (*ifp->if_init)(ifp);
+ error = if_init(ifp);
else if (command != SIOCADDMULTI && command != SIOCDELMULTI)
;
else if (ifp->if_flags & IFF_RUNNING)
diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c
index 565a16a70b0..29bc2d3f119 100644
--- a/sys/dev/pci/if_dge.c
+++ b/sys/dev/pci/if_dge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dge.c,v 1.62 2021/12/05 04:32:36 msaitoh Exp $ */
+/* $NetBSD: if_dge.c,v 1.63 2021/12/31 14:25:23 riastradh Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.62 2021/12/05 04:32:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.63 2021/12/31 14:25:23 riastradh Exp $");
@@ -1453,7 +1453,7 @@ dge_ioctl(struct ifnet *ifp, u_long cmd, void *data)
else if ((error = ifioctl_common(ifp, cmd, data)) != ENETRESET)
break;
else if (ifp->if_flags & IFF_UP)
- error = (*ifp->if_init)(ifp);
+ error = if_init(ifp);
else
error = 0;
break;
@@ -1488,7 +1488,7 @@ dge_ioctl(struct ifnet *ifp, u_long cmd, void *data)
error = 0;
if (cmd == SIOCSIFCAP)
- error = (*ifp->if_init)(ifp);
+ error = if_init(ifp);
else if (cmd != SIOCADDMULTI && cmd != SIOCDELMULTI)
;
else if (ifp->if_flags & IFF_RUNNING) {
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 0c63cef8c1d..a3c6930db8e 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.97 2021/09/19 11:37:01 andvar Exp $ */
+/* $NetBSD: if_iwn.c,v 1.98 2021/12/31 14:25:23 riastradh Exp $ */
/* $OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.97 2021/09/19 11:37:01 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.98 2021/12/31 14:25:23 riastradh Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -973,7 +973,7 @@ iwn_power(int why, void *arg)
s = splnet();
ifp = &sc->sc_ic.ic_if;
if (ifp->if_flags & IFF_UP) {
- ifp->if_init(ifp);
+ if_init(ifp);
if (ifp->if_flags & IFF_RUNNING)
ifp->if_start(ifp);
}
diff --git a/sys/dev/pci/if_kse.c b/sys/dev/pci/if_kse.c
index f3f5c2ce102..03cbba6a6e6 100644
--- a/sys/dev/pci/if_kse.c
+++ b/sys/dev/pci/if_kse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kse.c,v 1.57 2021/05/08 00:27:02 thorpej Exp $ */
+/* $NetBSD: if_kse.c,v 1.58 2021/12/31 14:25:23 riastradh Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.57 2021/05/08 00:27:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.58 2021/12/31 14:25:23 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -689,7 +689,7 @@ kse_ioctl(struct ifnet *ifp, u_long cmd, void *data)
break;
error = 0;
if (cmd == SIOCSIFCAP)
- error = (*ifp->if_init)(ifp);
+ error = if_init(ifp);
if (cmd != SIOCADDMULTI && cmd != SIOCDELMULTI)
;
else if (ifp->if_flags & IFF_RUNNING) {
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index bc340603ffc..3b85c2b81b5 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.183 2021/10/21 13:21:54 andvar Exp $ */
+/* $NetBSD: if_sip.c,v 1.184 2021/12/31 14:25:23 riastradh Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.183 2021/10/21 13:21:54 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.184 2021/12/31 14:25:23 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1869,7 +1869,7 @@ sipcom_ioctl(struct ifnet *ifp, u_long cmd, void *data)
error = 0;
if (cmd == SIOCSIFCAP)
- error = (*ifp->if_init)(ifp);
+ error = if_init(ifp);
else if (cmd != SIOCADDMULTI && cmd != SIOCDELMULTI)
;
else if (ifp->if_flags & IFF_RUNNING) {
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index 1c2a6a9f2b5..77d11fb1662 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.725 2021/12/23 17:05:49 hannken Exp $ */
+/* $NetBSD: if_wm.c,v 1.726 2021/12/31 14:25:23 riastradh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.725 2021/12/23 17:05:49 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.726 2021/12/31 14:25:23 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3675,7 +3675,7 @@ wm_ioctl(struct ifnet *ifp, u_long cmd, void *data)
error = 0;
if (cmd == SIOCSIFCAP)
- error = (*ifp->if_init)(ifp);
+ error = if_init(ifp);
else if (cmd != SIOCADDMULTI && cmd != SIOCDELMULTI)
;
else if (ifp->if_flags & IFF_RUNNING) {
diff --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c
index 1bdc1a8db3b..449c22adbdc 100644
--- a/sys/dev/pci/ixgbe/ixgbe.c
+++ b/sys/dev/pci/ixgbe/ixgbe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.301 2021/12/24 05:11:04 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.302 2021/12/31 14:25:23 riastradh Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.301 2021/12/24 05:11:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.302 2021/12/31 14:25:23 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -5770,7 +5770,7 @@ ixgbe_sysctl_dmac(SYSCTLFN_ARGS)
/* Re-initialize hardware if it's already running */
if (ifp->if_flags & IFF_RUNNING)
- ifp->if_init(ifp);
+ if_init(ifp);
return (0);
}
@@ -6103,7 +6103,7 @@ ixgbe_sysctl_eee_state(SYSCTLFN_ARGS)
}
/* Restart auto-neg */
- ifp->if_init(ifp);
+ if_init(ifp);
device_printf(dev, "New EEE state: %d\n", new_eee);
diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c
index d0a55c95183..162141c8072 100644
--- a/sys/dev/usb/if_urtw.c
+++ b/sys/dev/usb/if_urtw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.24 2020/03/15 23:04:51 thorpej Exp $ */
+/* $NetBSD: if_urtw.c,v 1.25 2021/12/31 14:25:24 riastradh Exp $ */
/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.24 2020/03/15 23:04:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.25 2021/12/31 14:25:24 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1045,7 +1045,7 @@ urtw_media_change(struct ifnet *ifp)
if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) ==
(IFF_UP | IFF_RUNNING))
- ifp->if_init(ifp);
+ if_init(ifp);
return 0;
}
@@ -2395,7 +2395,7 @@ urtw_ioctl(struct ifnet *ifp, u_long cmd, void *data)
case IFF_UP|IFF_RUNNING:
break;
case IFF_UP:
- ifp->if_init(ifp);
+ if_init(ifp);
break;
case IFF_RUNNING:
urtw_stop(ifp, 1);
@@ -2419,7 +2419,7 @@ urtw_ioctl(struct ifnet *ifp, u_long cmd, void *data)
if (error == ENETRESET) {
if (IS_RUNNING(ifp) &&
(ic->ic_roaming != IEEE80211_ROAMING_MANUAL))
- ifp->if_init(ifp);
+ if_init(ifp);
error = 0;
}