patch-2.4.27 linux-2.4.27/net/8021q/vlanproc.c

• Lines: 29
• Date: 2004-08-07 16:26:06.690430437 -0700
• Orig file: linux-2.4.26/net/8021q/vlanproc.c
• Orig date: 2003-11-28 10:26:21.000000000 -0800

diff -urN linux-2.4.26/net/8021q/vlanproc.c linux-2.4.27/net/8021q/vlanproc.c
@@ -234,7 +234,9 @@
 	struct inode *inode = file->f_dentry->d_inode;
 	struct proc_dir_entry *dent;
 	char *page;
-	int pos, offs, len;
+	int pos, len;
+	loff_t n = *ppos;
+	unsigned offs = n;
 
 	if (count <= 0)
 		return 0;
@@ -251,15 +253,14 @@
 		return -ENOBUFS;
 
 	pos = dent->get_info(page, dent->data, 0, 0);
-	offs = file->f_pos;
-	if (offs < pos) {
+	if (offs == n && offs < pos) {
 		len = min_t(int, pos - offs, count);
 		if (copy_to_user(buf, (page + offs), len)) {
 			kfree(page);
 			return -EFAULT;
 		}
 
-		file->f_pos += len;
+		*ppos = offs + len;
 	} else {
 		len = 0;
 	}