From owner-freebsd-usb@FreeBSD.ORG Wed Jun 13 11:30:03 2007 Return-Path: X-Original-To: freebsd-usb@hub.freebsd.org Delivered-To: freebsd-usb@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2136B16A400 for ; Wed, 13 Jun 2007 11:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id D587213C483 for ; Wed, 13 Jun 2007 11:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l5DBU2FN064500 for ; Wed, 13 Jun 2007 11:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l5DBU2DO064496; Wed, 13 Jun 2007 11:30:02 GMT (envelope-from gnats) Resent-Date: Wed, 13 Jun 2007 11:30:02 GMT Resent-Message-Id: <200706131130.l5DBU2DO064496@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-usb@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Henrik Brix Andersen Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC3A816A46D for ; Wed, 13 Jun 2007 11:26:14 +0000 (UTC) (envelope-from brix@lothlorien.brixandersen.dk) Received: from solow.pil.dk (relay.pil.dk [195.41.47.164]) by mx1.freebsd.org (Postfix) with ESMTP id 85B7913C455 for ; Wed, 13 Jun 2007 11:26:14 +0000 (UTC) (envelope-from brix@lothlorien.brixandersen.dk) Received: from lothlorien.brixandersen.dk (fw2.pil.dk [83.90.227.58]) by solow.pil.dk (Postfix) with ESMTP id 004C21CC0DE; Wed, 13 Jun 2007 13:26:13 +0200 (CEST) Received: by lothlorien.brixandersen.dk (Postfix, from userid 1001) id 3720D1141B; Wed, 13 Jun 2007 13:26:12 +0200 (CEST) Message-Id: <20070613112612.3720D1141B@lothlorien.brixandersen.dk> Date: Wed, 13 Jun 2007 13:26:12 +0200 (CEST) From: Henrik Brix Andersen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Warner Losh Subject: usb/113651: [patch] Fix build of ng_ubt(4) after recent USBDEV() cleanup X-BeenThere: freebsd-usb@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Henrik Brix Andersen List-Id: FreeBSD support for USB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2007 11:30:03 -0000 >Number: 113651 >Category: usb >Synopsis: [patch] Fix build of ng_ubt(4) after recent USBDEV() cleanup >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-usb >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Jun 13 11:30:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Henrik Brix Andersen >Release: FreeBSD 7.0-CURRENT i386 >Organization: pil.dk >Environment: System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #41: Wed Jun 6 16:22:53 CEST 2007 root@lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386 >Description: Seems the USBDEV() macros used in ng_ubt.c was forgotten in the recent USB stack overhaul. >How-To-Repeat: >Fix: --- ng_ubt.c.diff begins here --- --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c.orig Wed Jun 13 13:15:32 2007 +++ sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Wed Jun 13 13:16:11 2007 @@ -747,8 +747,7 @@ USB_ATTACH(ubt) for (i = 0; i < uaa->nifaces; i++) uaa->ifaces[i] = NULL; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return 0; bad: @@ -840,8 +839,7 @@ USB_DETACH(ubt) NG_BT_MBUFQ_DRAIN(&sc->sc_aclq); NG_BT_MBUFQ_DRAIN(&sc->sc_scoq); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return (0); } /* USB_DETACH(ubt) */ --- ng_ubt.c.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: