diff options
Diffstat (limited to 'drivers/usb/gadget/u_ether.c')
-rw-r--r-- | drivers/usb/gadget/u_ether.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index 3791e6271903..66948b72bb9b 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c | |||
@@ -52,7 +52,7 @@ | |||
52 | * this single "physical" link to be used by multiple virtual links.) | 52 | * this single "physical" link to be used by multiple virtual links.) |
53 | */ | 53 | */ |
54 | 54 | ||
55 | #define DRIVER_VERSION "29-May-2008" | 55 | #define UETH__VERSION "29-May-2008" |
56 | 56 | ||
57 | struct eth_dev { | 57 | struct eth_dev { |
58 | /* lock is held while accessing port_usb | 58 | /* lock is held while accessing port_usb |
@@ -170,7 +170,7 @@ static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p) | |||
170 | struct eth_dev *dev = netdev_priv(net); | 170 | struct eth_dev *dev = netdev_priv(net); |
171 | 171 | ||
172 | strlcpy(p->driver, "g_ether", sizeof p->driver); | 172 | strlcpy(p->driver, "g_ether", sizeof p->driver); |
173 | strlcpy(p->version, DRIVER_VERSION, sizeof p->version); | 173 | strlcpy(p->version, UETH__VERSION, sizeof p->version); |
174 | strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version); | 174 | strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version); |
175 | strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info); | 175 | strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info); |
176 | } | 176 | } |
@@ -873,6 +873,13 @@ struct net_device *gether_connect(struct gether *link) | |||
873 | spin_lock(&dev->lock); | 873 | spin_lock(&dev->lock); |
874 | dev->port_usb = link; | 874 | dev->port_usb = link; |
875 | link->ioport = dev; | 875 | link->ioport = dev; |
876 | if (netif_running(dev->net)) { | ||
877 | if (link->open) | ||
878 | link->open(link); | ||
879 | } else { | ||
880 | if (link->close) | ||
881 | link->close(link); | ||
882 | } | ||
876 | spin_unlock(&dev->lock); | 883 | spin_unlock(&dev->lock); |
877 | 884 | ||
878 | netif_carrier_on(dev->net); | 885 | netif_carrier_on(dev->net); |