From owner-svn-src-head@FreeBSD.ORG Thu Nov 25 08:32:11 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3547B1065693; Thu, 25 Nov 2010 08:32:11 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe02.c2i.net [212.247.154.34]) by mx1.freebsd.org (Postfix) with ESMTP id 2D10D8FC1E; Thu, 25 Nov 2010 08:32:09 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=yevn+QCjI6xy199BDvBOOiO14qYvyLq62he9tTtU3M8= c=1 sm=1 a=66BwjV4OQYgA:10 a=N659UExz7-8A:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=6I5d2MoRAAAA:8 a=ET1TI6MP39LMKkfRPOEA:9 a=rjuETav2lvSFxux6WfYA:7 a=eAZtwzHOOHa9GSgQlcL0U3cDo6YA:4 a=pILNOxqGKmIA:10 a=loB-QriZlXLibcsn:21 a=_uSYTEJV7auFVk6E:21 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe02.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 53539354; Thu, 25 Nov 2010 09:32:08 +0100 From: Hans Petter Selasky To: Weongyo Jeong Date: Thu, 25 Nov 2010 09:32:54 +0100 User-Agent: KMail/1.13.5 (FreeBSD/8.1-STABLE; KDE/4.4.5; amd64; ; ) References: <201011250330.oAP3UhAG092470@svn.freebsd.org> In-Reply-To: <201011250330.oAP3UhAG092470@svn.freebsd.org> X-Face: +~\`s("[*|O,="7?X@L.elg*F"OA\I/3%^p8g?ab%RN'(; _IjlA: hGE..Ew, XAQ*o#\/M~SC=S1-f9{EzRfT'|Hhll5Q]ha5Bt-s|oTlKMusi:1e[wJl}kd}GR Z0adGx-x_0zGbZj'e(Y[(UNle~)8CQWXW@:DX+9)_YlB[tIccCPN$7/L' MIME-Version: 1.0 Content-Type: Text/Plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Message-Id: <201011250932.54119.hselasky@c2i.net> Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Subject: Re: svn commit: r215812 - in head/sys/dev/usb: . controller X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Nov 2010 08:32:11 -0000 On Thursday 25 November 2010 04:30:43 Weongyo Jeong wrote: > Author: weongyo > Date: Thu Nov 25 03:30:43 2010 > New Revision: 215812 > URL: http://svn.freebsd.org/changeset/base/215812 > > Log: > Handles the unit number correctly that the previous commit had a problem > (wrong unit number for a host controller) when the module is load / > unloaded repeatly. Attaching the USB pf is moved to usbus device's > attach. > > Pointed by: yongari > > Modified: > head/sys/dev/usb/controller/usb_controller.c > head/sys/dev/usb/usb_pf.c > > Modified: head/sys/dev/usb/controller/usb_controller.c > =========================================================================== > === --- head/sys/dev/usb/controller/usb_controller.c Thu Nov 25 03:16:31 > 2010 (r215811) +++ head/sys/dev/usb/controller/usb_controller.c Thu Nov 25 > 03:30:43 2010 (r215812) @@ -207,6 +207,8 @@ usb_detach(device_t dev) > > usb_proc_free(&bus->control_xfer_proc); > > + usbpf_detach(bus); > + > return (0); > } > > @@ -435,6 +437,8 @@ usb_attach_sub(device_t dev, struct usb_ > usb_devclass_ptr = devclass_find("usbus"); > mtx_unlock(&Giant); > > + usbpf_attach(bus); > + > /* Initialise USB process messages */ > bus->explore_msg[0].hdr.pm_callback = &usb_bus_explore; > bus->explore_msg[0].bus = bus; > @@ -548,8 +552,6 @@ usb_bus_mem_alloc_all(struct usb_bus *bu > > TAILQ_INIT(&bus->intr_q.head); > > - usbpf_attach(bus); > - > #if USB_HAVE_BUSDMA > usb_dma_tag_setup(bus->dma_parent_tag, bus->dma_tags, > dmat, &bus->bus_mtx, NULL, 32, USB_BUS_DMA_TAG_MAX); > @@ -597,8 +599,6 @@ usb_bus_mem_free_all(struct usb_bus *bus > usb_dma_tag_unsetup(bus->dma_parent_tag); > #endif > > - usbpf_detach(bus); > - > mtx_destroy(&bus->bus_mtx); > } > > > Modified: head/sys/dev/usb/usb_pf.c > =========================================================================== > === --- head/sys/dev/usb/usb_pf.c Thu Nov 25 03:16:31 2010 (r215811) > +++ head/sys/dev/usb/usb_pf.c Thu Nov 25 03:30:43 2010 (r215812) > @@ -61,10 +61,9 @@ void > usbpf_attach(struct usb_bus *ubus) > { > struct ifnet *ifp; > - devclass_t dc = devclass_find("usbus"); > > ifp = ubus->ifp = if_alloc(IFT_USB); > - if_initname(ifp, "usbus", devclass_get_count(dc)); > + if_initname(ifp, "usbus", device_get_unit(ubus->bdev)); > if_attach(ifp); > > KASSERT(sizeof(struct usbpf_pkthdr) == USBPF_HDR_LEN, Ok. This will work. --HPS