From patchwork Wed Dec 4 09:29:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 296460 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BAC0C2C00B3 for ; Wed, 4 Dec 2013 20:30:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755261Ab3LDJ3U (ORCPT ); Wed, 4 Dec 2013 04:29:20 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:60367 "EHLO e8.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755250Ab3LDJ3R (ORCPT ); Wed, 4 Dec 2013 04:29:17 -0500 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Dec 2013 04:29:16 -0500 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e8.ny.us.ibm.com (192.168.1.108) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 4 Dec 2013 04:29:13 -0500 Received: from b01cxnp22035.gho.pok.ibm.com (b01cxnp22035.gho.pok.ibm.com [9.57.198.25]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 5495538C8045; Wed, 4 Dec 2013 04:29:11 -0500 (EST) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by b01cxnp22035.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rB49TCJu9372022; Wed, 4 Dec 2013 09:29:12 GMT Received: from d01av03.pok.ibm.com (localhost [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rB49TCr1025204; Wed, 4 Dec 2013 04:29:12 -0500 Received: from us.ibm.com ([9.115.122.226]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with SMTP id rB49T9wf025050; Wed, 4 Dec 2013 04:29:10 -0500 Received: by us.ibm.com (sSMTP sendmail emulation); Wed, 4 Dec 2013 17:29:06 +0800 From: Zhi Yong Wu To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Zhi Yong Wu Subject: [PATCH 2/2] macvtap: remove unused paramter in macvtap_do_read() Date: Wed, 4 Dec 2013 17:29:01 +0800 Message-Id: <1386149341-10485-2-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1386149341-10485-1-git-send-email-zwu.kernel@gmail.com> References: <1386149341-10485-1-git-send-email-zwu.kernel@gmail.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13120409-0320-0000-0000-000001E2DB07 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zhi Yong Wu Signed-off-by: Zhi Yong Wu --- drivers/net/macvtap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 957cc5c..c0d412e 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -823,7 +823,7 @@ done: return ret ? ret : copied; } -static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb, +static ssize_t macvtap_do_read(struct macvtap_queue *q, const struct iovec *iv, unsigned long len, int noblock) { @@ -874,7 +874,7 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv, goto out; } - ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK); + ret = macvtap_do_read(q, iv, len, file->f_flags & O_NONBLOCK); ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */ if (ret > 0) iocb->ki_pos = ret; @@ -1108,7 +1108,7 @@ static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock, int ret; if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) return -EINVAL; - ret = macvtap_do_read(q, iocb, m->msg_iov, total_len, + ret = macvtap_do_read(q, m->msg_iov, total_len, flags & MSG_DONTWAIT); if (ret > total_len) { m->msg_flags |= MSG_TRUNC;