tun: change tun_get_iff() prototype.

This patch changes tun_get_iff() prototype to return void as it never fails.

Signed-off-by: Rami Rosen <ramirose@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index b01e8c0c422b800e2a713a4a467f695fa517efcc..3bd9932a8cded615fa68aea2a809bd465263e05e 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -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)
 {
        tun_debug(KERN_INFO, tun, "tun_get_iff\n");
                       struct ifreq *ifr)
 {
        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,
 
        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,
        ret = 0;
        switch (cmd) {
        case TUNGETIFF:
        ret = 0;
        switch (cmd) {
        case TUNGETIFF:

-               ret = tun_get_iff(current->nsproxy->net_ns, tun, &ifr);
-               if (ret)
-                       break;
+               tun_get_iff(current->nsproxy->net_ns, tun, &ifr);

 
                if (copy_to_user(argp, &ifr, ifreq_len))
                        ret = -EFAULT;
 
                if (copy_to_user(argp, &ifr, ifreq_len))
                        ret = -EFAULT;