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 8/8] tun: remove unused parameter in tun_do_read()
Date: Fri, 6 Dec 2013 10:24:09 +0800 [thread overview]
Message-ID: <1386296649-6453-9-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/tun.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e26cbea..fd8cc47 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1289,8 +1289,7 @@ done:
}
static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
- struct kiocb *iocb, const struct iovec *iv,
- ssize_t len, int noblock)
+ const struct iovec *iv, ssize_t len, int noblock)
{
DECLARE_WAITQUEUE(wait, current);
struct sk_buff *skb;
@@ -1353,7 +1352,7 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
goto out;
}
- ret = tun_do_read(tun, tfile, iocb, iv, len,
+ ret = tun_do_read(tun, tfile, iv, len,
file->f_flags & O_NONBLOCK);
ret = min_t(ssize_t, ret, len);
if (ret > 0)
@@ -1454,7 +1453,7 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
SOL_PACKET, TUN_TX_TIMESTAMP);
goto out;
}
- ret = tun_do_read(tun, tfile, iocb, m->msg_iov, total_len,
+ ret = tun_do_read(tun, tfile, m->msg_iov, total_len,
flags & MSG_DONTWAIT);
if (ret > total_len) {
m->msg_flags |= MSG_TRUNC;
--
1.7.6.5
next prev parent reply other threads:[~2013-12-06 2:25 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 ` [net-next PATCHv2 3/8] macvtap: remove the dead branch Zhi Yong Wu
2013-12-06 2:24 ` [net-next PATCHv2 4/8] macvtap: adjust macvtap_skb_to_vnet_hdr() to be void 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 ` Zhi Yong Wu [this message]
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-9-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.