diff options
| author | Haiyang Zhang <haiyangz@microsoft.com> | 2011-09-28 13:24:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-29 17:34:50 -0700 |
| commit | d515d0ff36a7afd528f32e3511780ad8385d957e (patch) | |
| tree | 3c2199fca9e66c3783c06c7d365f064d1d03d7bf | |
| parent | 657d1b0dfc97e2256257320f0818e21cf360d0ce (diff) | |
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>
| -rw-r--r-- | drivers/staging/hv/TODO | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/netvsc_drv.c | 19 |
2 files changed, 7 insertions, 14 deletions
diff --git a/drivers/staging/hv/TODO b/drivers/staging/hv/TODO index fcc57c245803..ed4d63619df2 100644 --- a/drivers/staging/hv/TODO +++ b/drivers/staging/hv/TODO @@ -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>, diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 69c233e5fbe0..561ba58f0e1f 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -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; } |