patch-2.4.10 linux/net/wanrouter/wanproc.c

• Lines: 27
• Date: Mon Sep 10 07:58:35 2001
• Orig file: v2.4.9/linux/net/wanrouter/wanproc.c
• Orig date: Mon Aug 27 12:41:50 2001

diff -u --recursive --new-file v2.4.9/linux/net/wanrouter/wanproc.c linux/net/wanrouter/wanproc.c
@@ -259,7 +259,7 @@
 		pos = dent->get_info(page, dent->data, 0, 0);
 		offs = file->f_pos;
 		if (offs < pos) {
-			len = min(unsigned int, pos - offs, count);
+			len = min_t(unsigned int, pos - offs, count);
 			if (copy_to_user(buf, (page + offs), len)) {
 				kfree(page);
 				return -EFAULT;
@@ -805,7 +805,7 @@
 		pos = dent->get_info(page, dent->data, 0, 0, 0);
 		offs = file->f_pos;
 		if (offs < pos) {
-			len = min(unsigned int, pos - offs, count);
+			len = min_t(unsigned int, pos - offs, count);
 			if (copy_to_user(buf, (page + offs), len)) {
 				kfree(page);
 				return -EFAULT;
@@ -841,7 +841,7 @@
 		pos = dent->get_info(page, dent->data, 0, 0, 0);
 		offs = file->f_pos;
 		if (offs < pos) {
-			len = min(unsigned int, pos - offs, count);
+			len = min_t(unsigned int, pos - offs, count);
 			memcpy_tofs((void*)buf, (void*)(page + offs), len);
 			file->f_pos += len;
 		}