提交 9ce99cf6 编写于 作者: R Rami Rosen 提交者: David S. Miller

tun: change tun_get_iff() prototype.

This patch changes tun_get_iff() prototype to return void as it never fails.
Signed-off-by: NRami Rosen <ramirose@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 319b95b5
...@@ -1662,7 +1662,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) ...@@ -1662,7 +1662,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
return err; return err;
} }
static int tun_get_iff(struct net *net, struct tun_struct *tun, static void tun_get_iff(struct net *net, 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");
...@@ -1671,7 +1671,6 @@ static int tun_get_iff(struct net *net, struct tun_struct *tun, ...@@ -1671,7 +1671,6 @@ static int tun_get_iff(struct net *net, struct tun_struct *tun,
ifr->ifr_flags = tun_flags(tun); ifr->ifr_flags = tun_flags(tun);
return 0;
} }
/* This is like a cut-down ethtool ops, except done via tun fd so no /* This is like a cut-down ethtool ops, except done via tun fd so no
...@@ -1847,9 +1846,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, ...@@ -1847,9 +1846,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
ret = 0; ret = 0;
switch (cmd) { switch (cmd) {
case TUNGETIFF: case TUNGETIFF:
ret = tun_get_iff(current->nsproxy->net_ns, tun, &ifr); tun_get_iff(current->nsproxy->net_ns, tun, &ifr);
if (ret)
break;
if (copy_to_user(argp, &ifr, ifreq_len)) if (copy_to_user(argp, &ifr, ifreq_len))
ret = -EFAULT; ret = -EFAULT;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册