From 1f272ca40abd0c7c305bdd18ae304a924ea77dab Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Wed, 30 Aug 2006 15:46:48 -0400 Subject: [PATCH] --- yaml --- r: 36447 b: refs/heads/master c: b6956ffa595db97656d5901ca8fec77ef272d41a h: refs/heads/master i: 36445: a6d37a0a60377b2024a81f7914ea52cae588e1d0 36443: 34a01aa74dcab4eade4f8e9478635a6a48a4bdd6 36439: ae23f0b839dcfdb45beb81700a9853653d4e55ad 36431: 8ca1932fef3d39a25af69d126f3d8897f1014167 36415: 5ab9b0cbd779b2b679e3ad902bab985b74badfda v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/hub.c | 1 + trunk/include/linux/usb.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b7a1c5a93831..83f2d7dab571 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1ad4ea331e78a5ff90eda7718da31bcbc1a9c38 +refs/heads/master: b6956ffa595db97656d5901ca8fec77ef272d41a diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index f5adce049b35..78e910b2046c 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -2414,6 +2414,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, usb_set_device_state(udev, USB_STATE_POWERED); udev->speed = USB_SPEED_UNKNOWN; udev->bus_mA = hub->mA_per_port; + udev->level = hdev->level + 1; /* set the address */ choose_address(udev); diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index c66303285a45..df5c93eb3ce9 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -348,6 +348,7 @@ struct usb_device { unsigned short bus_mA; /* Current available from the bus */ u8 portnum; /* Parent port number (origin 1) */ + u8 level; /* Number of USB hub ancestors */ int have_langid; /* whether string_langid is valid */ int string_langid; /* language ID for strings */