From 6c31b8f6fa4bbfdc5d20a7567f6e71ab28f161de Mon Sep 17 00:00:00 2001 From: Haiyang Zhang Date: Wed, 28 Sep 2011 13:24:15 -0700 Subject: [PATCH] --- yaml --- r: 268553 b: refs/heads/master c: d515d0ff36a7afd528f32e3511780ad8385d957e h: refs/heads/master i: 268551: 6a6a23595a3d12c160ccd75fa66c9ebfadcc4456 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/TODO | 2 -- trunk/drivers/staging/hv/netvsc_drv.c | 19 +++++++------------ 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 0d4e6fc5f905..6fdf998a9fcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 657d1b0dfc97e2256257320f0818e21cf360d0ce +refs/heads/master: d515d0ff36a7afd528f32e3511780ad8385d957e diff --git a/trunk/drivers/staging/hv/TODO b/trunk/drivers/staging/hv/TODO index fcc57c245803..ed4d63619df2 100644 --- a/trunk/drivers/staging/hv/TODO +++ b/trunk/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 , diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c index 69c233e5fbe0..561ba58f0e1f 100644 --- a/trunk/drivers/staging/hv/netvsc_drv.c +++ b/trunk/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; }