---

yaml --- r: 291611 b: refs/heads/master c: da24e90 h: refs/heads/master i: 291609: 7111631 291607: 8a2a7ae v: v3
git-mirror · Mar 19, 2012 · 8792833 · 8792833
1 parent d14f120
commit 8792833
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f24fd89ab5148d00f58aaf1d8999e9966fc7215c
+refs/heads/master: da24e906cbfc08171d24a2b7cf66fad565fdd121
diff --git a/trunk/drivers/net/hyperv/netvsc_drv.c b/trunk/drivers/net/hyperv/netvsc_drv.c
@@ -223,13 +223,10 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
 		net->stats.tx_bytes += skb->len;
 		net->stats.tx_packets++;
 	} else {
-		/* we are shutting down or bus overloaded, just drop packet */
-		net->stats.tx_dropped++;
 		kfree(packet);
-		dev_kfree_skb_any(skb);
 	}
 
-	return NETDEV_TX_OK;
+	return ret ? NETDEV_TX_BUSY : NETDEV_TX_OK;
 }
 
 /*