From 1b9b9bf9d7a0a0d66db38c4614a4a86ef81c1b3a Mon Sep 17 00:00:00 2001
From: Haiyang Zhang <haiyangz@microsoft.com>
Date: Thu, 1 Sep 2011 12:19:45 -0700
Subject: [PATCH] --- yaml --- r: 268135 b: refs/heads/master c:
 8a5f9edc4dd6c1f9fb2446a36e7cd44b79412271 h: refs/heads/master i:   268133:
 7df7d631c75cf8d71e03f8804df149aa64faf39b   268131:
 13706c76880104f2a71d59602e41a7c413ccfd5e   268127:
 ea631b8f042b9a2efd7fef60b102886fb75c0499 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/hv/netvsc_drv.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dc725591d7b1..9d95a030b58a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7db1d946c4db748b631fe4885110349cc259987f
+refs/heads/master: 8a5f9edc4dd6c1f9fb2446a36e7cd44b79412271
diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c
index b49a08f4ed5a..81e3c496e28e 100644
--- a/trunk/drivers/staging/hv/netvsc_drv.c
+++ b/trunk/drivers/staging/hv/netvsc_drv.c
@@ -190,7 +190,8 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
 	} else {
 		/* we are shutting down or bus overloaded, just drop packet */
 		net->stats.tx_dropped++;
-		netvsc_xmit_completion(packet);
+		kfree(packet);
+		dev_kfree_skb_any(skb);
 	}
 
 	return NETDEV_TX_OK;