staging: hv: remove unnecessary code in netvsc_probe().
authorHaiyang Zhang <haiyangz@microsoft.com>
Mon, 23 May 2011 16:03:45 +0000 (09:03 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 7 Jun 2011 20:35:59 +0000 (13:35 -0700)
netif_carrier_off() was called earlier in this function, and there is
no other thread access this device yet. The status checking code is not
necessary here.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/netvsc_drv.c

index 7b9c229f7295a0a6b50a16d78d7ba19a818557e8..456d3dfebf9b2917b16aa7e3e5294c7f7479ea9b 100644 (file)
@@ -364,17 +364,7 @@ static int netvsc_probe(struct hv_device *dev)
                return ret;
        }
 
-       /*
-        * If carrier is still off ie we did not get a link status callback,
-        * update it if necessary
-        */
-       /*
-        * FIXME: We should use a atomic or test/set instead to avoid getting
-        * out of sync with the device's link status
-        */
-       if (!netif_carrier_ok(net))
-               if (!device_info.link_state)
-                       netif_carrier_on(net);
+       netif_carrier_on(net);
 
        memcpy(net->dev_addr, device_info.mac_adr, ETH_ALEN);