tun: Remove unused first parameter of tun_get_iff() (12132768) · Commits · 戴 / test

drivers/net/tun.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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)