Merge branch 'iov_iter' into for-next

[firefly-linux-kernel-4.4.55.git] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 9dd3746994a42cb73c585848876ff3e878963f24..4d332dc93b70591f071e305e0f18bac3975d7adc 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2222,7 +2222,7 @@ static int tun_chr_close(struct inode *inode, struct file *file)
 }
 
 #ifdef CONFIG_PROC_FS
-static int tun_chr_show_fdinfo(struct seq_file *m, struct file *f)
+static void tun_chr_show_fdinfo(struct seq_file *m, struct file *f)
 {
        struct tun_struct *tun;
        struct ifreq ifr;
@@ -2238,7 +2238,7 @@ static int tun_chr_show_fdinfo(struct seq_file *m, struct file *f)
        if (tun)
                tun_put(tun);
 
-       return seq_printf(m, "iff:\t%s\n", ifr.ifr_name);
+       seq_printf(m, "iff:\t%s\n", ifr.ifr_name);
 }
 #endif