aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2013-04-11 00:40:33 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-11 15:57:16 -0400
commit8a34b0ae8778f6b42ed38857486b769a224e2536 (patch)
tree1278ed241a8d88417715281419c1e1b0dea7e9cc /drivers/net/usb
parent4be74c130d1c5c03bccef0ab8d7a6bb71c7de53a (diff)
usbnet: cdc_ncm: apply usbnet_link_change
Use the introduced usbnet_link_change to handle link change. Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/cdc_ncm.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 67012cbd5582..43afde8f48d2 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -610,7 +610,7 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
610 * (carrier is OFF) during attach, so the IP network stack does not 610 * (carrier is OFF) during attach, so the IP network stack does not
611 * start IPv6 negotiation and more. 611 * start IPv6 negotiation and more.
612 */ 612 */
613 netif_carrier_off(dev->net); 613 usbnet_link_change(dev, 0, 0);
614 return ret; 614 return ret;
615} 615}
616 616
@@ -1106,12 +1106,9 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
1106 " %sconnected\n", 1106 " %sconnected\n",
1107 ctx->netdev->name, ctx->connected ? "" : "dis"); 1107 ctx->netdev->name, ctx->connected ? "" : "dis");
1108 1108
1109 if (ctx->connected) 1109 usbnet_link_change(dev, ctx->connected, 0);
1110 netif_carrier_on(dev->net); 1110 if (!ctx->connected)
1111 else {
1112 netif_carrier_off(dev->net);
1113 ctx->tx_speed = ctx->rx_speed = 0; 1111 ctx->tx_speed = ctx->rx_speed = 0;
1114 }
1115 break; 1112 break;
1116 1113
1117 case USB_CDC_NOTIFY_SPEED_CHANGE: 1114 case USB_CDC_NOTIFY_SPEED_CHANGE: