diff options
| author | Haiyang Zhang | 2011-05-23 18:03:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-06-07 22:35:59 +0200 |
| commit | b1956a81af0c23d65a4cafee9e39c52e4c6cadcc (patch) | |
| tree | 2bd3a957a3cbd51de49755f0b2973544b687450a /drivers/staging/hv/netvsc_drv.c | |
| parent | staging: brcm80211: updated TODO with current state of affairs (diff) | |
| download | kernel-qcow2-linux-b1956a81af0c23d65a4cafee9e39c52e4c6cadcc.tar.gz kernel-qcow2-linux-b1956a81af0c23d65a4cafee9e39c52e4c6cadcc.tar.xz kernel-qcow2-linux-b1956a81af0c23d65a4cafee9e39c52e4c6cadcc.zip | |
staging: hv: remove unnecessary code in netvsc_probe().
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>
Diffstat (limited to 'drivers/staging/hv/netvsc_drv.c')
| -rw-r--r-- | drivers/staging/hv/netvsc_drv.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 7b9c229f7295..456d3dfebf9b 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -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); |