From c2d41a40a4836692cadad6f56d7d6ab4bb150120 Mon Sep 17 00:00:00 2001
From: Haiyang Zhang <haiyangz@microsoft.com>
Date: Fri, 5 Apr 2013 11:44:39 +0000
Subject: [PATCH] --- yaml --- r: 362392 b: refs/heads/master c:
 fd5c07a8d6a10c7112b19f3b0d428627c62b06ab h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/hyperv/netvsc_drv.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ea48b9c6bdc8..4256c09b2da9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c988d1e8cbf722e34ee6124b8b89d47fec655b51
+refs/heads/master: fd5c07a8d6a10c7112b19f3b0d428627c62b06ab
diff --git a/trunk/drivers/net/hyperv/netvsc_drv.c b/trunk/drivers/net/hyperv/netvsc_drv.c
index 5f85205cd12b..8341b62e5521 100644
--- a/trunk/drivers/net/hyperv/netvsc_drv.c
+++ b/trunk/drivers/net/hyperv/netvsc_drv.c
@@ -241,13 +241,11 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,
 
 	if (status == 1) {
 		netif_carrier_on(net);
-		netif_wake_queue(net);
 		ndev_ctx = netdev_priv(net);
 		schedule_delayed_work(&ndev_ctx->dwork, 0);
 		schedule_delayed_work(&ndev_ctx->dwork, msecs_to_jiffies(20));
 	} else {
 		netif_carrier_off(net);
-		netif_tx_disable(net);
 	}
 }