Make some USB ioctls return ENXIO, instead of EIO, if usbd_is_dying().

Brings us one step closer towards making this condition's error code
consistent across all USB drivers.
Patch by Moritz Buhl
ok mpi@ bluhm@

10 files changed, 20 insertions, 20 deletions

diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 83c9043f305..39a2560e209 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aue.c,v 1.108 2018/07/03 14:33:43 kevlo Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.109 2018/10/02 19:49:10 stsp Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1428,7 +1428,7 @@ aue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	int			s, error = 0;
 
 	if (usbd_is_dying(sc->aue_udev))
-		return (EIO);
+		return ENXIO;
 
 	s = splnet();
 
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index c24f849c4fd..abf0521ccd6 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cdce.c,v 1.74 2017/04/21 09:42:53 mpi Exp $ */
+/*	$OpenBSD: if_cdce.c,v 1.75 2018/10/02 19:49:10 stsp Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -501,7 +501,7 @@ cdce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	int			 s, error = 0;
 
 	if (usbd_is_dying(sc->cdce_udev))
-		return (EIO);
+		return ENXIO;
 
 	s = splnet();
 
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index fb13562625e..804b1ecef45 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.77 2017/01/22 10:17:39 dlg Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.78 2018/10/02 19:49:10 stsp Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1033,7 +1033,7 @@ cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	int			s, error = 0;
 
 	if (usbd_is_dying(sc->cue_udev))
-		return (EIO);
+		return ENXIO;
 
 	s = splnet();
 
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index fb4df182258..308d8d9db38 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.88 2017/04/08 02:57:25 deraadt Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.89 2018/10/02 19:49:10 stsp Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -998,7 +998,7 @@ kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	DPRINTFN(5,("%s: %s: enter\n", sc->kue_dev.dv_xname,__func__));
 
 	if (usbd_is_dying(sc->kue_udev))
-		return (EIO);
+		return ENXIO;
 
 #ifdef DIAGNOSTIC
 	if (!curproc) {
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 1ccab331e64..941e81870ec 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.80 2018/07/03 14:33:43 kevlo Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.81 2018/10/02 19:49:10 stsp Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -1134,7 +1134,7 @@ udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	DPRINTF(("%s: %s: enter\n", sc->sc_dev.dv_xname, __func__));
 
 	if (usbd_is_dying(sc->sc_udev))
-		return (EIO);
+		return ENXIO;
 
 	s = splnet();
 
diff --git a/sys/dev/usb/if_ugl.c b/sys/dev/usb/if_ugl.c
index fd176cf7334..e9e87895a6e 100644
--- a/sys/dev/usb/if_ugl.c
+++ b/sys/dev/usb/if_ugl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ugl.c,v 1.22 2018/03/15 21:36:59 uaa Exp $	*/
+/*	$OpenBSD: if_ugl.c,v 1.23 2018/10/02 19:49:10 stsp Exp $	*/
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk>
@@ -749,7 +749,7 @@ ugl_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	int			s, error = 0;
 
 	if (usbd_is_dying(sc->sc_udev))
-		return (EIO);
+		return ENXIO;
 
 	DPRINTFN(5,("%s: %s: cmd=0x%08lx\n",
 		    sc->sc_dev.dv_xname, __func__, command));
diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c
index e5a48292f30..567bba697af 100644
--- a/sys/dev/usb/if_umb.c
+++ b/sys/dev/usb/if_umb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_umb.c,v 1.20 2018/09/10 17:00:45 gerhard Exp $ */
+/*	$OpenBSD: if_umb.c,v 1.21 2018/10/02 19:49:10 stsp Exp $ */
 
 /*
  * Copyright (c) 2016 genua mbH
@@ -686,7 +686,7 @@ umb_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct umb_parameter mp;
 
 	if (usbd_is_dying(sc->sc_udev))
-		return EIO;
+		return ENXIO;
 
 	s = splnet();
 	switch (cmd) {
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 32408e71293..0a0bebc7c86 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.74 2017/10/29 21:54:22 mpi Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.75 2018/10/02 19:49:10 stsp Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -736,7 +736,7 @@ upl_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	int			s, error = 0;
 
 	if (usbd_is_dying(sc->sc_udev))
-		return (EIO);
+		return ENXIO;
 
 	DPRINTFN(5,("%s: %s: cmd=0x%08lx\n",
 		    sc->sc_dev.dv_xname, __func__, command));
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 5438c41c540..06f54e4db8a 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.83 2018/07/03 14:33:43 kevlo Exp $ */
+/*	$OpenBSD: if_url.c,v 1.84 2018/10/02 19:49:10 stsp Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -995,7 +995,7 @@ url_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	DPRINTF(("%s: %s: enter\n", sc->sc_dev.dv_xname, __func__));
 
 	if (usbd_is_dying(sc->sc_udev))
-		return (EIO);
+		return ENXIO;
 
 	s = splnet();
 
diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c
index 5d148da4ab5..f6b3c7bad9d 100644
--- a/sys/dev/usb/if_urndis.c
+++ b/sys/dev/usb/if_urndis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urndis.c,v 1.67 2017/07/19 16:31:56 mikeb Exp $ */
+/*	$OpenBSD: if_urndis.c,v 1.68 2018/10/02 19:49:10 stsp Exp $ */
 
 /*
  * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
@@ -1010,7 +1010,7 @@ urndis_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	int			 s, error = 0;
 
 	if (usbd_is_dying(sc->sc_udev))
-		return (EIO);
+		return ENXIO;
 
 	s = splnet();