Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / net / hyperv / netvsc_drv.c

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 2d59138db7f3fd688840d6bf5ce1f449838271be..8f8ed3320425b754f991193e65cdca33916e2ce6 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -211,9 +211,13 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
                net->stats.tx_packets++;
        } else {
                kfree(packet);
+               if (ret != -EAGAIN) {
+                       dev_kfree_skb_any(skb);
+                       net->stats.tx_dropped++;
+               }
        }
 
-       return ret ? NETDEV_TX_BUSY : NETDEV_TX_OK;
+       return (ret == -EAGAIN) ? NETDEV_TX_BUSY : NETDEV_TX_OK;
 }
 
 /*