summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2010-01-28 21:37:18 -0800
committerDavid S. Miller <davem@davemloft.net>2010-01-28 21:37:18 -0800
commit71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3 (patch)
tree9a5236c71a37292b1d081b5869597787a131e294 /drivers/net
parentd291b9af1a1a12f59a464494900c6e0db26e2ec3 (diff)
downloadlinux-3.10-71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3.tar.gz
linux-3.10-71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3.tar.bz2
linux-3.10-71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3.zip
cdc_ether: Partially revert "usbnet: Set link down initially ..."
Commit 37e8273cd30592d3a82bcb70cbb1bdc4eaeb6b71 ("usbnet: Set link down initially for drivers that update link state") changed the initial link state in cdc_ether and other drivers based on the understanding that the devices they support generate link change interrupts. However, this is optional in the CDC Ethernet protocol, and two users have reported in <http://bugzilla.kernel.org/show_bug.cgi?id=14791> that the link state for their devices remains down. Therefore, revert the change in cdc_ether. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Tested-by: Avi Rozen <avi.rozen@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/usb/cdc_ether.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 21e183a83b9..4f27f022fbf 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -419,7 +419,7 @@ static int cdc_manage_power(struct usbnet *dev, int on)
static const struct driver_info cdc_info = {
.description = "CDC Ethernet Device",
- .flags = FLAG_ETHER | FLAG_LINK_INTR,
+ .flags = FLAG_ETHER,
// .check_connect = cdc_check_connect,
.bind = cdc_bind,
.unbind = usbnet_cdc_unbind,