From: David S. Miller <davem@davemloft.net>
Date: Mon, 19 Mar 2012 03:29:41 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4da0bd736552e6377b407b3c3d3ae518ebbdd269;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
---

4da0bd736552e6377b407b3c3d3ae518ebbdd269
diff --cc drivers/net/hyperv/netvsc_drv.c
index 0f8e8344891,610860f2896..2517d209d60
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@@ -167,11 -166,9 +167,11 @@@ static int netvsc_start_xmit(struct sk_
  
  		dev_kfree_skb(skb);
  		net->stats.tx_dropped++;
- 		return NETDEV_TX_BUSY;
+ 		return NETDEV_TX_OK;
  	}
  
 +	packet->vlan_tci = skb->vlan_tci;
 +
  	packet->extension = (void *)(unsigned long)packet +
  				sizeof(struct hv_netvsc_packet) +
  				    (num_pages * sizeof(struct hv_page_buffer));