Skip to content

Commit

Permalink
staging: hv: remove the carrier status check from netvsc_open()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Haiyang Zhang authored and Greg Kroah-Hartman committed Sep 30, 2011
1 parent 657d1b0 commit d515d0f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
2 changes: 0 additions & 2 deletions drivers/staging/hv/TODO
Original file line number Diff line number Diff line change
@@ -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>,
Expand Down
19 changes: 7 additions & 12 deletions drivers/staging/hv/netvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit d515d0f

Please sign in to comment.