diff options
Diffstat (limited to 'drivers/usb/gadget/u_ether.c')
-rw-r--r-- | drivers/usb/gadget/u_ether.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index b9e1925b2df0..90e82e288eb9 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c | |||
@@ -798,12 +798,6 @@ int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN], | |||
798 | 798 | ||
799 | SET_ETHTOOL_OPS(net, &ops); | 799 | SET_ETHTOOL_OPS(net, &ops); |
800 | 800 | ||
801 | /* two kinds of host-initiated state changes: | ||
802 | * - iff DATA transfer is active, carrier is "on" | ||
803 | * - tx queueing enabled if open *and* carrier is "on" | ||
804 | */ | ||
805 | netif_carrier_off(net); | ||
806 | |||
807 | dev->gadget = g; | 801 | dev->gadget = g; |
808 | SET_NETDEV_DEV(net, &g->dev); | 802 | SET_NETDEV_DEV(net, &g->dev); |
809 | SET_NETDEV_DEVTYPE(net, &gadget_type); | 803 | SET_NETDEV_DEVTYPE(net, &gadget_type); |
@@ -817,6 +811,12 @@ int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN], | |||
817 | INFO(dev, "HOST MAC %pM\n", dev->host_mac); | 811 | INFO(dev, "HOST MAC %pM\n", dev->host_mac); |
818 | 812 | ||
819 | the_dev = dev; | 813 | the_dev = dev; |
814 | |||
815 | /* two kinds of host-initiated state changes: | ||
816 | * - iff DATA transfer is active, carrier is "on" | ||
817 | * - tx queueing enabled if open *and* carrier is "on" | ||
818 | */ | ||
819 | netif_carrier_off(net); | ||
820 | } | 820 | } |
821 | 821 | ||
822 | return status; | 822 | return status; |