]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
cdc_ether: Partially revert "usbnet: Set link down initially ..."
authorBen Hutchings <ben@decadent.org.uk>
Fri, 29 Jan 2010 05:37:18 +0000 (21:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Jan 2010 05:37:18 +0000 (21:37 -0800)
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>
drivers/net/usb/cdc_ether.c

index 21e183a83b994dd07569a3a925623cccbc785669..4f27f022fbf7b93bb65aace8189e3b3039192b61 100644 (file)
@@ -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,