[.joined/src/trunk]: .joined/src/sys/net/lagg sys: Use if_stop wrapper function.

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

details:   https://anonhg.NetBSD.org/.joined/src/rev/3b19ab3572b9
branches:  trunk
changeset: 359341:3b19ab3572b9
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Dec 31 14:24:38 2021 +0000

description:
sys: Use if_stop 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:

 sys/arch/arm/xscale/ixp425_if_npe.c |   6 +++---
 sys/net/if_bridge.c                 |   6 +++---
 sys/net/if_ethersubr.c              |   6 +++---
 sys/net/if_wg.c                     |   6 +++---
 sys/net/lagg/if_lagg.c              |  10 +++++-----
 5 files changed, 17 insertions(+), 17 deletions(-)

diffs (153 lines):

diff -r d8636251029c -r 3b19ab3572b9 sys/arch/arm/xscale/ixp425_if_npe.c
--- a/sys/arch/arm/xscale/ixp425_if_npe.c       Fri Dec 31 14:24:26 2021 +0000
+++ b/sys/arch/arm/xscale/ixp425_if_npe.c       Fri Dec 31 14:24:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp425_if_npe.c,v 1.48 2021/09/19 10:34:08 andvar Exp $ */
+/*     $NetBSD: ixp425_if_npe.c,v 1.49 2021/12/31 14:24:38 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.48 2021/09/19 10:34:08 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.49 2021/12/31 14:24:38 riastradh Exp $");
 
 /*
  * Intel XScale NPE Ethernet driver.
@@ -1429,7 +1429,7 @@
                         * If interface is marked down and it is running,
                         * then stop and disable it.
                         */
-                       (*ifp->if_stop)(ifp, 1);
+                       if_stop(ifp, 1);
                } else if ((ifp->if_flags & (IFF_UP |IFF_RUNNING)) == IFF_UP) {
                        /*
                         * If interface is marked up and it is stopped, then
diff -r d8636251029c -r 3b19ab3572b9 sys/net/if_bridge.c
--- a/sys/net/if_bridge.c       Fri Dec 31 14:24:26 2021 +0000
+++ b/sys/net/if_bridge.c       Fri Dec 31 14:24:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bridge.c,v 1.183 2021/09/30 03:57:48 yamaguchi Exp $        */
+/*     $NetBSD: if_bridge.c,v 1.184 2021/12/31 14:24:38 riastradh Exp $        */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.183 2021/09/30 03:57:48 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.184 2021/12/31 14:24:38 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -611,7 +611,7 @@
                         * If interface is marked down and it is running,
                         * then stop and disable it.
                         */
-                       (*ifp->if_stop)(ifp, 1);
+                       if_stop(ifp, 1);
                        break;
                case IFF_UP:
                        /*
diff -r d8636251029c -r 3b19ab3572b9 sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c    Fri Dec 31 14:24:26 2021 +0000
+++ b/sys/net/if_ethersubr.c    Fri Dec 31 14:24:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ethersubr.c,v 1.307 2021/12/10 01:18:29 msaitoh Exp $       */
+/*     $NetBSD: if_ethersubr.c,v 1.308 2021/12/31 14:24:38 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.307 2021/12/10 01:18:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.308 2021/12/31 14:24:38 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1461,7 +1461,7 @@
                 * If interface is marked down and it is running,
                 * then stop and disable it.
                 */
-               (*ifp->if_stop)(ifp, 1);
+               if_stop(ifp, 1);
                break;
        case IFF_UP:
                /*
diff -r d8636251029c -r 3b19ab3572b9 sys/net/if_wg.c
--- a/sys/net/if_wg.c   Fri Dec 31 14:24:26 2021 +0000
+++ b/sys/net/if_wg.c   Fri Dec 31 14:24:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wg.c,v 1.65 2021/08/17 17:31:13 christos Exp $      */
+/*     $NetBSD: if_wg.c,v 1.66 2021/12/31 14:24:38 riastradh Exp $     */
 
 /*
  * Copyright (C) Ryota Ozaki <ozaki.ryota%gmail.com@localhost>
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.65 2021/08/17 17:31:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.66 2021/12/31 14:24:38 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_altq_enabled.h"
@@ -4666,7 +4666,7 @@
                         * If interface is marked down and it is running,
                         * then stop and disable it.
                         */
-                       (*ifp->if_stop)(ifp, 1);
+                       if_stop(ifp, 1);
                        break;
                case IFF_UP:
                        /*
diff -r d8636251029c -r 3b19ab3572b9 sys/net/lagg/if_lagg.c
--- a/sys/net/lagg/if_lagg.c    Fri Dec 31 14:24:26 2021 +0000
+++ b/sys/net/lagg/if_lagg.c    Fri Dec 31 14:24:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_lagg.c,v 1.26 2021/11/15 07:07:05 yamaguchi Exp $   */
+/*     $NetBSD: if_lagg.c,v 1.27 2021/12/31 14:24:38 riastradh Exp $   */
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk%openbsd.org@localhost>
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.26 2021/11/15 07:07:05 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.27 2021/12/31 14:24:38 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -721,7 +721,7 @@
 
                switch (ifp->if_flags & (IFF_UP | IFF_RUNNING)) {
                case IFF_RUNNING:
-                       ifp->if_stop(ifp, 1);
+                       if_stop(ifp, 1);
                        break;
                case IFF_UP:
                case IFF_UP | IFF_RUNNING:
@@ -2354,7 +2354,7 @@
 
        if (ISSET(ifp_port->if_flags, IFF_RUNNING) &&
            ifp_port->if_init != NULL) {
-               ifp_port->if_stop(ifp_port, 0);
+               if_stop(ifp_port, 0);
                stopped = true;
        }
 
@@ -2475,7 +2475,7 @@
        IFNET_LOCK(ifp_port);
        if (ISSET(ifp_port->if_flags, IFF_RUNNING) &&
            ifp_port->if_init != NULL) {
-               ifp_port->if_stop(ifp_port, 0);
+               if_stop(ifp_port, 0);
                stopped = true;
        }