[src/trunk]: src/sys/dev/usb usbnet: Handle usbnet_set_link for drivers with ...

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

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

description:
usbnet: Handle usbnet_set_link for drivers with no media detect.

diffstat:

 sys/dev/usb/if_cdce.c   |   5 ++---
 sys/dev/usb/if_urndis.c |   5 ++---
 sys/dev/usb/usbnet.c    |  11 +++++++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diffs (84 lines):

diff -r 993e5e37836b -r ace96a46154f sys/dev/usb/if_cdce.c
--- a/sys/dev/usb/if_cdce.c     Thu Mar 03 05:55:45 2022 +0000
+++ b/sys/dev/usb/if_cdce.c     Thu Mar 03 05:55:52 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cdce.c,v 1.76 2022/03/03 05:55:29 riastradh Exp $ */
+/*     $NetBSD: if_cdce.c,v 1.77 2022/03/03 05:55:52 riastradh Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul%windriver.com@localhost>
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.76 2022/03/03 05:55:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.77 2022/03/03 05:55:52 riastradh Exp $");
 
 #include <sys/param.h>
 
@@ -262,7 +262,6 @@
        int rv;
 
        rv = usbnet_init_rx_tx(un);
-       usbnet_set_link(un, rv == 0);
 
        return rv;
 }
diff -r 993e5e37836b -r ace96a46154f sys/dev/usb/if_urndis.c
--- a/sys/dev/usb/if_urndis.c   Thu Mar 03 05:55:45 2022 +0000
+++ b/sys/dev/usb/if_urndis.c   Thu Mar 03 05:55:52 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urndis.c,v 1.42 2022/03/03 05:55:19 riastradh Exp $ */
+/*     $NetBSD: if_urndis.c,v 1.43 2022/03/03 05:55:52 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.42 2022/03/03 05:55:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.43 2022/03/03 05:55:52 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -878,7 +878,6 @@
        if (error)
                return EIO;     /* XXX */
        error = usbnet_init_rx_tx(un);
-       usbnet_set_link(un, error == 0);
 
        return error;
 }
diff -r 993e5e37836b -r ace96a46154f sys/dev/usb/usbnet.c
--- a/sys/dev/usb/usbnet.c      Thu Mar 03 05:55:45 2022 +0000
+++ b/sys/dev/usb/usbnet.c      Thu Mar 03 05:55:52 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbnet.c,v 1.86 2022/03/03 05:55:29 riastradh Exp $    */
+/*     $NetBSD: usbnet.c,v 1.87 2022/03/03 05:55:52 riastradh Exp $    */
 
 /*
  * Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.86 2022/03/03 05:55:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.87 2022/03/03 05:55:52 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -904,6 +904,13 @@
                usbnet_ep_close_pipes(un);
        }
 
+       /*
+        * For devices without any media autodetection, treat success
+        * here as an active link.
+        */
+       if (un->un_ops->uno_statchg == NULL)
+               usbnet_set_link(un, error == 0);
+
        usbnet_isowned_core(un);
 
        return error;