From: Haiyang Zhang Date: Thu, 1 Sep 2011 19:19:46 +0000 (-0700) Subject: staging: hv: fix the return status of netvsc_start_xmit() X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~757 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf769375c9175b29fe72b10394888e0090c6b133;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: hv: fix the return status of netvsc_start_xmit() Fix the return status, so the upper layer will retry if transmission fails. Signed-off-by: Haiyang Zhang Signed-off-by: K. Y. Srinivasan Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 81e3c496e28e..30b9c80e2009 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -140,12 +140,12 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) (num_pages * sizeof(struct hv_page_buffer)) + sizeof(struct rndis_filter_packet), GFP_ATOMIC); if (!packet) { - /* out of memory, silently drop packet */ + /* out of memory, drop packet */ netdev_err(net, "unable to allocate hv_netvsc_packet\n"); dev_kfree_skb(skb); net->stats.tx_dropped++; - return NETDEV_TX_OK; + return NETDEV_TX_BUSY; } packet->extension = (void *)(unsigned long)packet + @@ -194,7 +194,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) dev_kfree_skb_any(skb); } - return NETDEV_TX_OK; + return ret ? NETDEV_TX_BUSY : NETDEV_TX_OK; } /*