From 8792833618958b2f91f3239d9ca63685b8a11267 Mon Sep 17 00:00:00 2001 From: Haiyang Zhang Date: Mon, 19 Mar 2012 17:27:06 -0400 Subject: [PATCH] --- yaml --- r: 291611 b: refs/heads/master c: da24e906cbfc08171d24a2b7cf66fad565fdd121 h: refs/heads/master i: 291609: 711163181675f34e4f65b24393f5f26b1bd35d70 291607: 8a2a7aec08728183a11abca5d638c594c3e94a98 v: v3 --- [refs] | 2 +- trunk/drivers/net/hyperv/netvsc_drv.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1c2f93a01f99..45acf00542f9 100644 --- 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 index 2517d209d602..dd294783b5c5 100644 --- 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; } /*