summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2017-03-08 11:38:09 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2017-03-08 11:38:09 +0000
commit9611c5147047880523b01ea5506c4fb401fe324f (patch)
tree66d88d720a90bbdd7dcfdfaa8ea72132682fec5f /sys/dev
parent808b3ee302a7827c3b079c333ff522e6be970f96 (diff)
Do not clear IFF_UP, even in the error path.
This flag should only be set by the stack, drivers shouldn't mess with it. Discussed with dlg@ and mikeb@, ok gerhard@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/if_umb.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c
index 4bed97d0ee1..6014e0496a1 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.9 2017/01/22 10:17:39 dlg Exp $ */
+/* $OpenBSD: if_umb.c,v 1.10 2017/03/08 11:38:08 mpi Exp $ */
/*
* Copyright (c) 2016 genua mbH
@@ -919,8 +919,6 @@ umb_state_task(void *arg)
void
umb_up(struct umb_softc *sc)
{
- struct ifnet *ifp = GET_IFP(sc);
-
splassert(IPL_NET);
switch (sc->sc_state) {
@@ -974,7 +972,6 @@ umb_up(struct umb_softc *sc)
DPRINTF("%s: init: reached state UP\n", DEVNAM(sc));
if (!umb_alloc_bulkpipes(sc)) {
printf("%s: opening bulk pipes failed\n", DEVNAM(sc));
- ifp->if_flags &= ~IFF_UP;
umb_down(sc, 1);
}
break;