From: Haiyang Zhang <haiyangz@microsoft.com>
To: haiyangz@microsoft.com, hjanssen@microsoft.com,
kys@microsoft.com, gregkh@suse.de, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, virtualization@lists.osdl.org
Subject: [PATCH 08/10] staging: hv: fix the return status of netvsc_start_xmit()
Date: Thu, 1 Sep 2011 12:19:46 -0700 [thread overview]
Message-ID: <1314904788-32746-9-git-send-email-haiyangz@microsoft.com> (raw)
In-Reply-To: <1314904788-32746-1-git-send-email-haiyangz@microsoft.com>
Fix the return status, so the upper layer will retry if transmission
fails.
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
drivers/staging/hv/netvsc_drv.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 81e3c49..30b9c80 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;
}
/*
--
1.6.3.2
next prev parent reply other threads:[~2011-09-01 19:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-01 19:19 [PATCH 00/10] netvsc bug fixes and cleanups Haiyang Zhang
2011-09-01 19:19 ` [PATCH 01/10] staging: hv: remove unnecessary includes in netvsc Haiyang Zhang
2011-09-01 19:19 ` [PATCH 02/10] staging: hv: add newline to log messages " Haiyang Zhang
2011-09-01 19:19 ` [PATCH 03/10] staging: hv: convert dev_<loglevel> to netdev_<loglevel> " Haiyang Zhang
2011-09-01 19:19 ` [PATCH 04/10] staging: hv: fix a kernel warning in netvsc_linkstatus_callback() Haiyang Zhang
2011-09-01 19:19 ` [PATCH 05/10] staging: hv: re-order the code in netvsc_probe() Haiyang Zhang
2011-09-01 19:19 ` [PATCH 06/10] staging: hv: fix counting of #outstanding-sends in failed sends Haiyang Zhang
2011-09-01 19:19 ` [PATCH 07/10] staging: hv: fix counting of available buffer slots when send fails Haiyang Zhang
2011-09-01 19:19 ` Haiyang Zhang [this message]
2011-09-01 19:19 ` [PATCH 09/10] staging: hv: fix the page buffer when rndis data go across page boundary Haiyang Zhang
2011-09-01 19:19 ` [PATCH 10/10] staging: hv: fix some typos in netvsc.c Haiyang Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314904788-32746-9-git-send-email-haiyangz@microsoft.com \
--to=haiyangz@microsoft.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=hjanssen@microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=virtualization@lists.osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox