diff options
author | 2007-10-11 18:33:13 +0000 | |
---|---|---|
committer | 2007-10-11 18:33:13 +0000 | |
commit | fc5c6ac59ce5cbc022c1e83b8d45d511803eefc6 (patch) | |
tree | f48ba3f4f889ca73be80167ebfdbf26cc87597d9 /sys/dev/usb/if_uath.c | |
parent | serialize usbd_probe_and_attach(); only let one usb device be match'd and (diff) | |
download | wireguard-openbsd-fc5c6ac59ce5cbc022c1e83b8d45d511803eefc6.tar.xz wireguard-openbsd-fc5c6ac59ce5cbc022c1e83b8d45d511803eefc6.zip |
treat usb vendor/product names as a locator, and have usbd_print handle it,
so that it shows up before the :. as a result, all the usb devices do not
need to have name printing code anymore. all this now works and prints
nicely because usbd_probe_and_attach() is serialized. ok kettenis
Diffstat (limited to 'sys/dev/usb/if_uath.c')
-rw-r--r-- | sys/dev/usb/if_uath.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index 0cb59f2047b..0b40c365431 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.30 2007/09/11 19:53:58 damien Exp $ */ +/* $OpenBSD: if_uath.c,v 1.31 2007/10/11 18:33:14 deraadt Exp $ */ /*- * Copyright (c) 2006 @@ -253,17 +253,12 @@ uath_attach(struct device *parent, struct device *self, void *aux) struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = &ic->ic_if; usbd_status error; - char *devinfop; int i; sc->sc_udev = uaa->device; sc->sc_uhub = uaa->device->myhub; sc->sc_port = uaa->port; - devinfop = usbd_devinfo_alloc(uaa->device, 0); - printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop); - usbd_devinfo_free(devinfop); - sc->sc_flags = uath_lookup(uaa->vendor, uaa->product)->flags; if (usbd_set_config_no(sc->sc_udev, UATH_CONFIG_NO, 0) != 0) { |