patch-2.4.9 linux/drivers/net/tun.c

• Lines: 30
• Date: Sun Aug 12 10:38:48 2001
• Orig file: v2.4.8/linux/drivers/net/tun.c
• Orig date: Sun Aug 12 13:27:59 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/net/tun.c linux/drivers/net/tun.c
@@ -29,7 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/sched.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>
 #include <linux/init.h>
@@ -327,11 +327,6 @@
 	return ret;
 }
 
-static loff_t tun_chr_lseek(struct file * file, loff_t offset, int origin)
-{
-	return -ESPIPE;
-}
-
 static int tun_set_iff(struct file *file, struct ifreq *ifr)
 {
 	struct tun_struct *tun;
@@ -549,7 +544,7 @@
 
 static struct file_operations tun_fops = {
 	owner:	THIS_MODULE,	
-	llseek:	tun_chr_lseek,
+	llseek:	no_llseek,
 	read:	tun_chr_read,
 	write:	tun_chr_write,
 	poll:	tun_chr_poll,