staging: hv: remove the carrier status check from netvsc_open()

Checking carrier status in netvsc_open() is not necessary.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Haiyang Zhang 2011-09-28 13:24:15 -07:00 committed by Greg Kroah-Hartman
parent 657d1b0dfc
commit d515d0ff36
2 changed files with 7 additions and 14 deletions

View File

@ -1,7 +1,5 @@
TODO:
- audit the network driver
- checking for carrier inside open is wrong, network device API
confusion??
- audit the scsi driver
Please send patches for this code to Greg Kroah-Hartman <gregkh@suse.de>,

View File

@ -69,20 +69,15 @@ static int netvsc_open(struct net_device *net)
struct hv_device *device_obj = net_device_ctx->device_ctx;
int ret = 0;
if (netif_carrier_ok(net)) {
/* Open up the device */
ret = rndis_filter_open(device_obj);
if (ret != 0) {
netdev_err(net, "unable to open device (ret %d).\n",
ret);
return ret;
}
netif_start_queue(net);
} else {
netdev_err(net, "unable to open device...link is down.\n");
/* Open up the device */
ret = rndis_filter_open(device_obj);
if (ret != 0) {
netdev_err(net, "unable to open device (ret %d).\n", ret);
return ret;
}
netif_start_queue(net);
return ret;
}