aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Tkhai <ktkhai@virtuozzo.com>2019-03-20 12:16:53 +0300
committerDavid S. Miller <davem@davemloft.net>2019-03-21 13:19:15 -0700
commit12132768dc4a79be65af75ac6262117d0adf93f3 (patch)
tree5160cff304d4ff748f2644c463e70e7355b0c2e6
parenttun: Add ioctl() TUNGETDEVNETNS cmd to allow obtaining real net ns of tun device (diff)
downloadlinux-dev-12132768dc4a79be65af75ac6262117d0adf93f3.tar.xz
linux-dev-12132768dc4a79be65af75ac6262117d0adf93f3.zip
tun: Remove unused first parameter of tun_get_iff()
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tun.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 60d0a4e60ec5..27798aacb671 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2872,8 +2872,7 @@ err_free_dev:
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");
@@ -3106,7 +3105,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;
@@ -3464,7 +3463,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)