[src/trunk]: src/sys/dev/usb usbnet drivers: Prune dead IFF_RUNNING branches ...

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

details:   https://anonhg.NetBSD.org/src/rev/c96edad68d0c
branches:  trunk
changeset: 362545:c96edad68d0c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Mar 03 05:55:19 2022 +0000

description:
usbnet drivers: Prune dead IFF_RUNNING branches in *_uno_init.

usbnet(9) guarantees !IFF_RUNNING now before calling it.

diffstat:

 sys/dev/usb/if_aue.c    |  8 ++------
 sys/dev/usb/if_mue.c    |  8 ++------
 sys/dev/usb/if_udav.c   |  8 ++------
 sys/dev/usb/if_ure.c    |  8 ++------
 sys/dev/usb/if_urndis.c |  7 ++-----
 5 files changed, 10 insertions(+), 29 deletions(-)

diffs (144 lines):

diff -r daec57fba641 -r c96edad68d0c sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c      Thu Mar 03 05:55:10 2022 +0000
+++ b/sys/dev/usb/if_aue.c      Thu Mar 03 05:55:19 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_aue.c,v 1.187 2022/03/03 05:55:01 riastradh Exp $   */
+/*     $NetBSD: if_aue.c,v 1.188 2022/03/03 05:55:19 riastradh Exp $   */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.187 2022/03/03 05:55:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.188 2022/03/03 05:55:19 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -954,10 +954,6 @@
        AUEHIST_CALLARGSN(5, "aue%jd: enter link=%jd",
            device_unit(un->un_dev), usbnet_havelink(un), 0, 0);
 
-       /* Cancel pending I/O */
-       if (ifp->if_flags & IFF_RUNNING)
-               return 0;
-
        /* Reset the interface. */
        aue_reset(sc);
 
diff -r daec57fba641 -r c96edad68d0c sys/dev/usb/if_mue.c
--- a/sys/dev/usb/if_mue.c      Thu Mar 03 05:55:10 2022 +0000
+++ b/sys/dev/usb/if_mue.c      Thu Mar 03 05:55:19 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mue.c,v 1.78 2022/03/03 05:55:01 riastradh Exp $    */
+/*     $NetBSD: if_mue.c,v 1.79 2022/03/03 05:55:19 riastradh Exp $    */
 /*     $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $  */
 
 /*
@@ -20,7 +20,7 @@
 /* Driver for Microchip LAN7500/LAN7800 chipsets. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.78 2022/03/03 05:55:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.79 2022/03/03 05:55:19 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1233,10 +1233,6 @@
 {
        struct usbnet * const un = ifp->if_softc;
 
-       /* Cancel pending I/O and free all TX/RX buffers. */
-       if (ifp->if_flags & IFF_RUNNING)
-               usbnet_stop(un, ifp, 1);
-
        mue_reset(un);
 
        /* Set MAC address. */
diff -r daec57fba641 -r c96edad68d0c sys/dev/usb/if_udav.c
--- a/sys/dev/usb/if_udav.c     Thu Mar 03 05:55:10 2022 +0000
+++ b/sys/dev/usb/if_udav.c     Thu Mar 03 05:55:19 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_udav.c,v 1.93 2022/03/03 05:55:01 riastradh Exp $   */
+/*     $NetBSD: if_udav.c,v 1.94 2022/03/03 05:55:19 riastradh Exp $   */
 /*     $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $   */
 
 /*
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.93 2022/03/03 05:55:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.94 2022/03/03 05:55:19 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -471,10 +471,6 @@
 
        DPRINTF(("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 
-       /* Cancel pending I/O and free all TX/RX buffers */
-       if (ifp->if_flags & IFF_RUNNING)
-               usbnet_stop(un, ifp, 1);
-
        memcpy(eaddr, CLLADDR(ifp->if_sadl), sizeof(eaddr));
        udav_csr_write(un, UDAV_PAR, eaddr, ETHER_ADDR_LEN);
 
diff -r daec57fba641 -r c96edad68d0c sys/dev/usb/if_ure.c
--- a/sys/dev/usb/if_ure.c      Thu Mar 03 05:55:10 2022 +0000
+++ b/sys/dev/usb/if_ure.c      Thu Mar 03 05:55:19 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ure.c,v 1.53 2022/03/03 05:55:01 riastradh Exp $    */
+/*     $NetBSD: if_ure.c,v 1.54 2022/03/03 05:55:19 riastradh Exp $    */
 /*     $OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $ */
 
 /*-
@@ -30,7 +30,7 @@
 /* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.53 2022/03/03 05:55:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.54 2022/03/03 05:55:19 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -413,10 +413,6 @@
        struct usbnet * const un = ifp->if_softc;
        uint8_t eaddr[8];
 
-       /* Cancel pending I/O. */
-       if (ifp->if_flags & IFF_RUNNING)
-               usbnet_stop(un, ifp, 1);
-
        /* Set MAC address. */
        memset(eaddr, 0, sizeof(eaddr));
        memcpy(eaddr, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN);
diff -r daec57fba641 -r c96edad68d0c sys/dev/usb/if_urndis.c
--- a/sys/dev/usb/if_urndis.c   Thu Mar 03 05:55:10 2022 +0000
+++ b/sys/dev/usb/if_urndis.c   Thu Mar 03 05:55:19 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urndis.c,v 1.41 2022/03/03 05:54:45 riastradh Exp $ */
+/*     $NetBSD: if_urndis.c,v 1.42 2022/03/03 05:55:19 riastradh Exp $ */
 /*     $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
 
 /*
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.41 2022/03/03 05:54:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.42 2022/03/03 05:55:19 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -859,9 +859,6 @@
 {
        int                      err;
 
-       if (ifp->if_flags & IFF_RUNNING)
-               return 0;
-
        err = urndis_ctrl_init(un);
        if (err != RNDIS_STATUS_SUCCESS)
                return EIO;