From: Zhi Yong Wu <zwu.kernel@gmail.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Subject: [net-next PATCHv2 3/8] macvtap: remove the dead branch
Date: Fri, 6 Dec 2013 10:24:04 +0800 [thread overview]
Message-ID: <1386296649-6453-4-git-send-email-zwu.kernel@gmail.com> (raw)
In-Reply-To: <1386296649-6453-1-git-send-email-zwu.kernel@gmail.com>
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/net/macvtap.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 9093004..d271fb4 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -779,8 +779,6 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
return -EINVAL;
ret = macvtap_skb_to_vnet_hdr(skb, &vnet_hdr);
- if (ret)
- return ret;
if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))
return -EFAULT;
--
1.7.6.5
next prev parent reply other threads:[~2013-12-06 2:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-06 2:24 [net-next PATCHv2 0/8] net: some cleanups Zhi Yong Wu
2013-12-06 2:24 ` [net-next PATCHv2 1/8] vhost: remove the dead branch Zhi Yong Wu
2013-12-06 2:24 ` [net-next PATCHv2 2/8] vhost: adjust vhost_dev_init() to be void Zhi Yong Wu
2013-12-06 2:24 ` Zhi Yong Wu [this message]
2013-12-06 2:24 ` [net-next PATCHv2 4/8] macvtap: adjust macvtap_skb_to_vnet_hdr() " Zhi Yong Wu
2013-12-06 2:24 ` [net-next PATCHv2 5/8] macvtap: update file current position Zhi Yong Wu
2013-12-06 2:24 ` [net-next PATCHv2 6/8] macvtap: remove unused parameter in macvtap_do_read() Zhi Yong Wu
2013-12-06 2:24 ` [net-next PATCHv2 7/8] tun: update file current position Zhi Yong Wu
2013-12-06 2:24 ` [net-next PATCHv2 8/8] tun: remove unused parameter in tun_do_read() Zhi Yong Wu
2013-12-06 4:37 ` [net-next PATCHv2 0/8] net: some cleanups David Miller
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=1386296649-6453-4-git-send-email-zwu.kernel@gmail.com \
--to=zwu.kernel@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=wuzhy@linux.vnet.ibm.com \
/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;
as well as URLs for NNTP newsgroup(s).