openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Kirill Tkhai 2019-03-20 12:16:53 +03:00 committed by David S. Miller
parent 0c3e0e3bb6
commit 12132768dc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/tun.c
View File

@ -2872,8 +2872,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
return err; return err;
} }
static void tun_get_iff(struct net *net, struct tun_struct *tun, static void tun_get_iff(struct tun_struct *tun, struct ifreq *ifr)
struct ifreq *ifr)
{ {
tun_debug(KERN_INFO, tun, "tun_get_iff\n"); 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; ret = 0;
switch (cmd) { switch (cmd) {
case TUNGETIFF: case TUNGETIFF:
tun_get_iff(current->nsproxy->net_ns, tun, &ifr); tun_get_iff(tun, &ifr);
if (tfile->detached) if (tfile->detached)
ifr.ifr_flags |= IFF_DETACH_QUEUE; 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(); rtnl_lock();
tun = tun_get(tfile); tun = tun_get(tfile);
if (tun) if (tun)
tun_get_iff(current->nsproxy->net_ns, tun, &ifr); tun_get_iff(tun, &ifr);
rtnl_unlock(); rtnl_unlock();
if (tun) if (tun)