Skip to content

Commit

Permalink
tun: Remove unused first parameter of tun_get_iff()
Browse files Browse the repository at this point in the history
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Kirill Tkhai authored and davem330 committed Mar 21, 2019
1 parent 0c3e0e3 commit 1213276
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/net/tun.c
Original file line number Diff line number Diff line change
Expand Up @@ -2872,8 +2872,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");

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 1213276

Please sign in to comment.