Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12132768 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by David S. Miller
Browse files

tun: Remove unused first parameter of tun_get_iff() 



Signed-off-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c3e0e3b

drivers/net/tun.c

+3 −4
Original line number Diff line number Diff line
@@ -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");
@@ -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)