diff options
| author | Rami Rosen <ramirose@gmail.com> | 2012-11-23 03:58:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-23 14:24:46 -0500 |
| commit | 9ce99cf6dc011a98ef8d64638d4353501de6f6c9 (patch) | |
| tree | 819a4f03e488dd0c911909d71814be29ab483806 /drivers | |
| parent | 319b95b5f47e2ee67782f39fbb2c7fbd2c60c631 (diff) | |
| download | blackbird-obmc-linux-9ce99cf6dc011a98ef8d64638d4353501de6f6c9.tar.gz blackbird-obmc-linux-9ce99cf6dc011a98ef8d64638d4353501de6f6c9.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tun.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index b01e8c0c422b..3bd9932a8cde 100644 --- 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; } -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"); @@ -1671,7 +1671,6 @@ static int tun_get_iff(struct net *net, struct tun_struct *tun, ifr->ifr_flags = tun_flags(tun); - return 0; } /* 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 = 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; |
