Module Name: src Committed By: riastradh Date: Fri Dec 31 14:25:24 UTC 2021
Modified Files: src/sys/arch/arm/imx: if_enet.c src/sys/arch/arm/sociox: if_ave.c if_scx.c src/sys/arch/arm/sunxi: sunxi_emac.c src/sys/arch/arm/xscale: ixp425_if_npe.c src/sys/dev/cadence: if_cemac.c src/sys/dev/ic: bcmgenet.c dm9000.c rtl8169.c src/sys/dev/pci: if_dge.c if_iwn.c if_kse.c if_sip.c if_wm.c src/sys/dev/pci/ixgbe: ixgbe.c src/sys/dev/usb: if_urtw.c src/sys/net: if_bridge.c if_ethersubr.c if_ieee1394subr.c if_wg.c link_proto.c src/sys/net/agr: if_agr.c src/sys/net/lagg: if_lagg.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/imx/if_enet.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/sociox/if_ave.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/sociox/if_scx.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/sunxi/sunxi_emac.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/xscale/ixp425_if_npe.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/cadence/if_cemac.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/bcmgenet.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ic/dm9000.c cvs rdiff -u -r1.168 -r1.169 src/sys/dev/ic/rtl8169.c cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/if_dge.c cvs rdiff -u -r1.97 -r1.98 src/sys/dev/pci/if_iwn.c cvs rdiff -u -r1.57 -r1.58 src/sys/dev/pci/if_kse.c cvs rdiff -u -r1.183 -r1.184 src/sys/dev/pci/if_sip.c cvs rdiff -u -r1.725 -r1.726 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.301 -r1.302 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/usb/if_urtw.c cvs rdiff -u -r1.185 -r1.186 src/sys/net/if_bridge.c cvs rdiff -u -r1.308 -r1.309 src/sys/net/if_ethersubr.c cvs rdiff -u -r1.66 -r1.67 src/sys/net/if_ieee1394subr.c src/sys/net/if_wg.c cvs rdiff -u -r1.39 -r1.40 src/sys/net/link_proto.c cvs rdiff -u -r1.53 -r1.54 src/sys/net/agr/if_agr.c cvs rdiff -u -r1.27 -r1.28 src/sys/net/lagg/if_lagg.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/arm/imx/if_enet.c diff -u src/sys/arch/arm/imx/if_enet.c:1.33 src/sys/arch/arm/imx/if_enet.c:1.34 --- src/sys/arch/arm/imx/if_enet.c:1.33 Thu Dec 31 02:16:14 2020 +++ src/sys/arch/arm/imx/if_enet.c Fri Dec 31 14:25:22 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_enet.c,v 1.33 2020/12/31 02:16:14 uwe Exp $ */ +/* $NetBSD: if_enet.c,v 1.34 2021/12/31 14:25:22 riastradh Exp $ */ /* * Copyright (c) 2014 Ryo Shimizu <r...@nerv.org> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.33 2020/12/31 02:16:14 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.34 2021/12/31 14:25:22 riastradh Exp $"); #include "vlan.h" @@ -1027,7 +1027,7 @@ enet_ioctl(struct ifnet *ifp, u_long com error = 0; switch (command) { case SIOCSIFCAP: - error = (*ifp->if_init)(ifp); + error = if_init(ifp); break; case SIOCADDMULTI: case SIOCDELMULTI: Index: src/sys/arch/arm/sociox/if_ave.c diff -u src/sys/arch/arm/sociox/if_ave.c:1.21 src/sys/arch/arm/sociox/if_ave.c:1.22 --- src/sys/arch/arm/sociox/if_ave.c:1.21 Wed Jan 27 03:10:19 2021 +++ src/sys/arch/arm/sociox/if_ave.c Fri Dec 31 14:25:22 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ave.c,v 1.21 2021/01/27 03:10:19 thorpej Exp $ */ +/* $NetBSD: if_ave.c,v 1.22 2021/12/31 14:25:22 riastradh Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ave.c,v 1.21 2021/01/27 03:10:19 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ave.c,v 1.22 2021/12/31 14:25:22 riastradh Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -790,7 +790,7 @@ ave_ioctl(struct ifnet *ifp, u_long cmd, 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) { Index: src/sys/arch/arm/sociox/if_scx.c diff -u src/sys/arch/arm/sociox/if_scx.c:1.33 src/sys/arch/arm/sociox/if_scx.c:1.34 --- src/sys/arch/arm/sociox/if_scx.c:1.33 Tue Dec 21 21:30:49 2021 +++ src/sys/arch/arm/sociox/if_scx.c Fri Dec 31 14:25:22 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_scx.c,v 1.33 2021/12/21 21:30:49 nisimura Exp $ */ +/* $NetBSD: if_scx.c,v 1.34 2021/12/31 14:25:22 riastradh Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ #define NOT_MP_SAFE 0 #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_scx.c,v 1.33 2021/12/21 21:30:49 nisimura Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_scx.c,v 1.34 2021/12/31 14:25:22 riastradh Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -1201,7 +1201,7 @@ scx_ioctl(struct ifnet *ifp, u_long cmd, 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) { Index: src/sys/arch/arm/sunxi/sunxi_emac.c diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.34 src/sys/arch/arm/sunxi/sunxi_emac.c:1.35 --- src/sys/arch/arm/sunxi/sunxi_emac.c:1.34 Sun Nov 7 19:21:33 2021 +++ src/sys/arch/arm/sunxi/sunxi_emac.c Fri Dec 31 14:25:22 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_emac.c,v 1.34 2021/11/07 19:21:33 jmcneill Exp $ */ +/* $NetBSD: sunxi_emac.c,v 1.35 2021/12/31 14:25:22 riastradh Exp $ */ /*- * Copyright (c) 2016-2017 Jared McNeill <jmcne...@invisible.ca> @@ -33,7 +33,7 @@ #include "opt_net_mpsafe.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.34 2021/11/07 19:21:33 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.35 2021/12/31 14:25:22 riastradh Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -932,7 +932,7 @@ sunxi_emac_ioctl(struct ifnet *ifp, u_lo 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) { Index: src/sys/arch/arm/xscale/ixp425_if_npe.c diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.49 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.50 --- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.49 Fri Dec 31 14:24:38 2021 +++ src/sys/arch/arm/xscale/ixp425_if_npe.c Fri Dec 31 14:25:22 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_if_npe.c,v 1.49 2021/12/31 14:24:38 riastradh Exp $ */ +/* $NetBSD: ixp425_if_npe.c,v 1.50 2021/12/31 14:25:22 riastradh Exp $ */ /*- * Copyright (c) 2006 Sam Leffler. All rights reserved. @@ -28,7 +28,7 @@ #if 0 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); #endif -__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.49 2021/12/31 14:24:38 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.50 2021/12/31 14:25:22 riastradh Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -1435,7 +1435,7 @@ npeioctl(struct ifnet *ifp, u_long cmd, * If interface is marked up and it is stopped, then * start it. */ - error = (*ifp->if_init)(ifp); + error = if_init(ifp); } else if ((ifp->if_flags & IFF_UP) != 0) { u_short diff; @@ -1457,7 +1457,7 @@ npeioctl(struct ifnet *ifp, u_long cmd, * any other flags that affect the hardware * state. */ - error = (*ifp->if_init)(ifp); + error = if_init(ifp); } } sc->sc_if_flags = ifp->if_flags; Index: src/sys/dev/cadence/if_cemac.c diff -u src/sys/dev/cadence/if_cemac.c:1.23 src/sys/dev/cadence/if_cemac.c:1.24 --- src/sys/dev/cadence/if_cemac.c:1.23 Sun Jun 28 12:43:00 2020 +++ src/sys/dev/cadence/if_cemac.c Fri Dec 31 14:25:22 2021 @@ -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 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) { Index: src/sys/dev/ic/bcmgenet.c diff -u src/sys/dev/ic/bcmgenet.c:1.10 src/sys/dev/ic/bcmgenet.c:1.11 --- src/sys/dev/ic/bcmgenet.c:1.10 Tue Aug 10 15:28:44 2021 +++ src/sys/dev/ic/bcmgenet.c Fri Dec 31 14:25:22 2021 @@ -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 <jmcne...@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 cm 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) { Index: src/sys/dev/ic/dm9000.c diff -u src/sys/dev/ic/dm9000.c:1.32 src/sys/dev/ic/dm9000.c:1.33 --- src/sys/dev/ic/dm9000.c:1.32 Sun Dec 5 07:26:35 2021 +++ src/sys/dev/ic/dm9000.c Fri Dec 31 14:25:22 2021 @@ -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, 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) { Index: src/sys/dev/ic/rtl8169.c diff -u src/sys/dev/ic/rtl8169.c:1.168 src/sys/dev/ic/rtl8169.c:1.169 --- src/sys/dev/ic/rtl8169.c:1.168 Sat Sep 4 19:27:43 2021 +++ src/sys/dev/ic/rtl8169.c Fri Dec 31 14:25:22 2021 @@ -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 comma 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) Index: src/sys/dev/pci/if_dge.c diff -u src/sys/dev/pci/if_dge.c:1.62 src/sys/dev/pci/if_dge.c:1.63 --- src/sys/dev/pci/if_dge.c:1.62 Sun Dec 5 04:32:36 2021 +++ src/sys/dev/pci/if_dge.c Fri Dec 31 14:25:23 2021 @@ -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, 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, 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) { Index: src/sys/dev/pci/if_iwn.c diff -u src/sys/dev/pci/if_iwn.c:1.97 src/sys/dev/pci/if_iwn.c:1.98 --- src/sys/dev/pci/if_iwn.c:1.97 Sun Sep 19 11:37:01 2021 +++ src/sys/dev/pci/if_iwn.c Fri Dec 31 14:25:23 2021 @@ -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); } Index: src/sys/dev/pci/if_kse.c diff -u src/sys/dev/pci/if_kse.c:1.57 src/sys/dev/pci/if_kse.c:1.58 --- src/sys/dev/pci/if_kse.c:1.57 Sat May 8 00:27:02 2021 +++ src/sys/dev/pci/if_kse.c Fri Dec 31 14:25:23 2021 @@ -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, 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) { Index: src/sys/dev/pci/if_sip.c diff -u src/sys/dev/pci/if_sip.c:1.183 src/sys/dev/pci/if_sip.c:1.184 --- src/sys/dev/pci/if_sip.c:1.183 Thu Oct 21 13:21:54 2021 +++ src/sys/dev/pci/if_sip.c Fri Dec 31 14:25:23 2021 @@ -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 c 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) { Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.725 src/sys/dev/pci/if_wm.c:1.726 --- src/sys/dev/pci/if_wm.c:1.725 Thu Dec 23 17:05:49 2021 +++ src/sys/dev/pci/if_wm.c Fri Dec 31 14:25:23 2021 @@ -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, 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) { Index: src/sys/dev/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.301 src/sys/dev/pci/ixgbe/ixgbe.c:1.302 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.301 Fri Dec 24 05:11:04 2021 +++ src/sys/dev/pci/ixgbe/ixgbe.c Fri Dec 31 14:25:23 2021 @@ -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); Index: src/sys/dev/usb/if_urtw.c diff -u src/sys/dev/usb/if_urtw.c:1.24 src/sys/dev/usb/if_urtw.c:1.25 --- src/sys/dev/usb/if_urtw.c:1.24 Sun Mar 15 23:04:51 2020 +++ src/sys/dev/usb/if_urtw.c Fri Dec 31 14:25:24 2021 @@ -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 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 if (error == ENETRESET) { if (IS_RUNNING(ifp) && (ic->ic_roaming != IEEE80211_ROAMING_MANUAL)) - ifp->if_init(ifp); + if_init(ifp); error = 0; } Index: src/sys/net/if_bridge.c diff -u src/sys/net/if_bridge.c:1.185 src/sys/net/if_bridge.c:1.186 --- src/sys/net/if_bridge.c:1.185 Fri Dec 31 14:24:50 2021 +++ src/sys/net/if_bridge.c Fri Dec 31 14:25:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bridge.c,v 1.185 2021/12/31 14:24:50 riastradh Exp $ */ +/* $NetBSD: if_bridge.c,v 1.186 2021/12/31 14:25:24 riastradh Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.185 2021/12/31 14:24:50 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.186 2021/12/31 14:25:24 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -618,7 +618,7 @@ bridge_ioctl(struct ifnet *ifp, u_long c * If interface is marked up and it is stopped, then * start it. */ - error = (*ifp->if_init)(ifp); + error = if_init(ifp); break; default: break; Index: src/sys/net/if_ethersubr.c diff -u src/sys/net/if_ethersubr.c:1.308 src/sys/net/if_ethersubr.c:1.309 --- src/sys/net/if_ethersubr.c:1.308 Fri Dec 31 14:24:38 2021 +++ src/sys/net/if_ethersubr.c Fri Dec 31 14:25:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ethersubr.c,v 1.308 2021/12/31 14:24:38 riastradh Exp $ */ +/* $NetBSD: if_ethersubr.c,v 1.309 2021/12/31 14:25:24 riastradh Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.308 2021/12/31 14:24:38 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.309 2021/12/31 14:25:24 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1468,7 +1468,7 @@ ether_ioctl_reinit(struct ethercom *ec) * If interface is marked up and it is stopped, then * start it. */ - return (*ifp->if_init)(ifp); + return if_init(ifp); case IFF_UP | IFF_RUNNING: error = 0; if (ec->ec_ifflags_cb != NULL) { @@ -1479,10 +1479,10 @@ ether_ioctl_reinit(struct ethercom *ec) * changes in any other flags that * affect the hardware state. */ - return (*ifp->if_init)(ifp); + return if_init(ifp); } } else - error = (*ifp->if_init)(ifp); + error = if_init(ifp); return error; case 0: break; @@ -1514,7 +1514,7 @@ ether_ioctl(struct ifnet *ifp, u_long cm && (ifp->if_flags & (IFF_UP | IFF_RUNNING)) != (IFF_UP | IFF_RUNNING)) { ifp->if_flags |= IFF_UP; - if ((error = (*ifp->if_init)(ifp)) != 0) + if ((error = if_init(ifp)) != 0) return error; } #ifdef INET @@ -1539,7 +1539,7 @@ ether_ioctl(struct ifnet *ifp, u_long cm return error; else if (ifp->if_flags & IFF_UP) { /* Make sure the device notices the MTU change. */ - return (*ifp->if_init)(ifp); + return if_init(ifp); } else return 0; } Index: src/sys/net/if_ieee1394subr.c diff -u src/sys/net/if_ieee1394subr.c:1.66 src/sys/net/if_ieee1394subr.c:1.67 --- src/sys/net/if_ieee1394subr.c:1.66 Fri Aug 28 06:23:42 2020 +++ src/sys/net/if_ieee1394subr.c Fri Dec 31 14:25:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ieee1394subr.c,v 1.66 2020/08/28 06:23:42 ozaki-r Exp $ */ +/* $NetBSD: if_ieee1394subr.c,v 1.67 2021/12/31 14:25:24 riastradh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.66 2020/08/28 06:23:42 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.67 2021/12/31 14:25:24 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -681,13 +681,13 @@ ieee1394_ioctl(struct ifnet *ifp, u_long switch (ifa->ifa_addr->sa_family) { #ifdef INET case AF_INET: - if ((error = (*ifp->if_init)(ifp)) != 0) + if ((error = if_init(ifp)) != 0) break; arp_ifinit(ifp, ifa); break; #endif /* INET */ default: - error = (*ifp->if_init)(ifp); + error = if_init(ifp); break; } break; Index: src/sys/net/if_wg.c diff -u src/sys/net/if_wg.c:1.66 src/sys/net/if_wg.c:1.67 --- src/sys/net/if_wg.c:1.66 Fri Dec 31 14:24:38 2021 +++ src/sys/net/if_wg.c Fri Dec 31 14:25:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wg.c,v 1.66 2021/12/31 14:24:38 riastradh Exp $ */ +/* $NetBSD: if_wg.c,v 1.67 2021/12/31 14:25:24 riastradh Exp $ */ /* * Copyright (C) Ryota Ozaki <ozaki.ry...@gmail.com> @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.66 2021/12/31 14:24:38 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.67 2021/12/31 14:25:24 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_altq_enabled.h" @@ -4619,7 +4619,7 @@ wg_ioctl(struct ifnet *ifp, u_long cmd, (ifp->if_flags & (IFF_UP | IFF_RUNNING)) != (IFF_UP | IFF_RUNNING)) { ifp->if_flags |= IFF_UP; - error = ifp->if_init(ifp); + error = if_init(ifp); } return error; case SIOCADDMULTI: @@ -4673,7 +4673,7 @@ wg_ioctl(struct ifnet *ifp, u_long cmd, * If interface is marked up and it is stopped, then * start it. */ - error = (*ifp->if_init)(ifp); + error = if_init(ifp); break; default: break; Index: src/sys/net/link_proto.c diff -u src/sys/net/link_proto.c:1.39 src/sys/net/link_proto.c:1.40 --- src/sys/net/link_proto.c:1.39 Wed Sep 25 09:53:37 2019 +++ src/sys/net/link_proto.c Fri Dec 31 14:25:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: link_proto.c,v 1.39 2019/09/25 09:53:37 ozaki-r Exp $ */ +/* $NetBSD: link_proto.c,v 1.40 2021/12/31 14:25:24 riastradh Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: link_proto.c,v 1.39 2019/09/25 09:53:37 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: link_proto.c,v 1.40 2021/12/31 14:25:24 riastradh Exp $"); #include <sys/param.h> #include <sys/socket.h> @@ -255,7 +255,7 @@ link_control(struct socket *so, unsigned return error; else if ((ifp->if_flags & IFF_RUNNING) != 0 && ifp->if_init != NULL) - return (*ifp->if_init)(ifp); + return if_init(ifp); else return 0; default: Index: src/sys/net/agr/if_agr.c diff -u src/sys/net/agr/if_agr.c:1.53 src/sys/net/agr/if_agr.c:1.54 --- src/sys/net/agr/if_agr.c:1.53 Thu Sep 30 03:15:25 2021 +++ src/sys/net/agr/if_agr.c Fri Dec 31 14:25:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_agr.c,v 1.53 2021/09/30 03:15:25 yamaguchi Exp $ */ +/* $NetBSD: if_agr.c,v 1.54 2021/12/31 14:25:24 riastradh Exp $ */ /*- * Copyright (c)2005 YAMAMOTO Takashi, @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.53 2021/09/30 03:15:25 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.54 2021/12/31 14:25:24 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -759,7 +759,7 @@ agrport_cleanup(struct agr_softc *sc, st memcpy(LLADDR(ifp_port->if_sadl), port->port_origlladdr, ifp_port->if_addrlen); if (ifp_port->if_init != NULL) { - error = (*ifp_port->if_init)(ifp_port); + error = if_init(ifp_port); } #else union { Index: src/sys/net/lagg/if_lagg.c diff -u src/sys/net/lagg/if_lagg.c:1.27 src/sys/net/lagg/if_lagg.c:1.28 --- src/sys/net/lagg/if_lagg.c:1.27 Fri Dec 31 14:24:38 2021 +++ src/sys/net/lagg/if_lagg.c Fri Dec 31 14:25:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_lagg.c,v 1.27 2021/12/31 14:24:38 riastradh Exp $ */ +/* $NetBSD: if_lagg.c,v 1.28 2021/12/31 14:25:24 riastradh Exp $ */ /* * Copyright (c) 2005, 2006 Reyk Floeter <r...@openbsd.org> @@ -20,7 +20,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.27 2021/12/31 14:24:38 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.28 2021/12/31 14:25:24 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -725,7 +725,7 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd break; case IFF_UP: case IFF_UP | IFF_RUNNING: - error = ifp->if_init(ifp); + error = if_init(ifp); break; } @@ -2115,7 +2115,7 @@ lagg_port_setsadl(struct lagg_port *lp, if (ifp_port->if_init != NULL) { error = 0; if (ISSET(ifp_port->if_flags, IFF_RUNNING)) - error = ifp_port->if_init(ifp_port); + error = if_init(ifp_port); if (error != 0) { lagg_log(lp->lp_softc, LOG_WARNING, @@ -2161,7 +2161,7 @@ lagg_port_unsetsadl(struct lagg_port *lp if (ifp_port->if_init != NULL) { error = 0; if (ISSET(ifp_port->if_flags, IFF_RUNNING)) - error = ifp_port->if_init(ifp_port); + error = if_init(ifp_port); if (error != 0) { lagg_log(lp->lp_softc, LOG_WARNING, @@ -2385,7 +2385,7 @@ lagg_port_setup(struct lagg_softc *sc, lagg_port_syncvlan(sc, lp); if (stopped) { - error = ifp_port->if_init(ifp_port); + error = if_init(ifp_port); if (error != 0) goto remove_port; } @@ -2415,7 +2415,7 @@ restore_ipv6lla: KASSERT(IFNET_LOCKED(ifp_port)); lagg_in6_ifdetach(ifp_port); if (stopped) { - if (ifp_port->if_init(ifp_port) != 0) { + if (if_init(ifp_port) != 0) { lagg_log(sc, LOG_WARNING, "couldn't re-start port %s\n", ifp_port->if_xname); @@ -2487,7 +2487,7 @@ lagg_port_teardown(struct lagg_softc *sc IFNET_UNLOCK(ifp_port); if (stopped) { - ifp_port->if_init(ifp_port); + if_init(ifp_port); } if (is_ifdetach == false) {