From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99A43C43381 for ; Wed, 20 Mar 2019 09:16:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 692722184D for ; Wed, 20 Mar 2019 09:16:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726910AbfCTJQ5 (ORCPT ); Wed, 20 Mar 2019 05:16:57 -0400 Received: from relay.sw.ru ([185.231.240.75]:51594 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726692AbfCTJQz (ORCPT ); Wed, 20 Mar 2019 05:16:55 -0400 Received: from [172.16.25.169] (helo=localhost.localdomain) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1h6XLB-00076F-G7; Wed, 20 Mar 2019 12:16:53 +0300 Subject: [PATCH 2/2] tun: Remove unused first parameter of tun_get_iff() From: Kirill Tkhai To: netdev@vger.kernel.org Cc: davem@davemloft.net, harald.albrecht@gmx.net, jasowang@redhat.com, brouer@redhat.com, edumazet@google.com, mst@redhat.com, nicolas.dichtel@6wind.com, wangli39@baidu.com, ktkhai@virtuozzo.com Date: Wed, 20 Mar 2019 12:16:53 +0300 Message-ID: <155307340980.17673.6302431836499933065.stgit@localhost.localdomain> In-Reply-To: <155307337803.17673.7357500798893442953.stgit@localhost.localdomain> References: <155307337803.17673.7357500798893442953.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Kirill Tkhai --- drivers/net/tun.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index b7137edff624..b834b0d168f9 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2873,8 +2873,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) return err; } -static void tun_get_iff(struct net *net, struct tun_struct *tun, - struct ifreq *ifr) +static void tun_get_iff(struct tun_struct *tun, struct ifreq *ifr) { tun_debug(KERN_INFO, tun, "tun_get_iff\n"); @@ -3107,7 +3106,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, ret = 0; switch (cmd) { case TUNGETIFF: - tun_get_iff(current->nsproxy->net_ns, tun, &ifr); + tun_get_iff(tun, &ifr); if (tfile->detached) ifr.ifr_flags |= IFF_DETACH_QUEUE; @@ -3465,7 +3464,7 @@ static void tun_chr_show_fdinfo(struct seq_file *m, struct file *file) rtnl_lock(); tun = tun_get(tfile); if (tun) - tun_get_iff(current->nsproxy->net_ns, tun, &ifr); + tun_get_iff(tun, &ifr); rtnl_unlock(); if (tun)