patch-2.4.10 linux/net/ipv4/ipmr.c

• Lines: 18
• Date: Thu Sep 20 14:12:56 2001
• Orig file: v2.4.9/linux/net/ipv4/ipmr.c
• Orig date: Mon Aug 27 12:41:49 2001

diff -u --recursive --new-file v2.4.9/linux/net/ipv4/ipmr.c linux/net/ipv4/ipmr.c
@@ -9,7 +9,7 @@
  *	as published by the Free Software Foundation; either version
  *	2 of the License, or (at your option) any later version.
  *
- *	Version: $Id: ipmr.c,v 1.63 2001/08/13 18:56:12 davem Exp $
+ *	Version: $Id: ipmr.c,v 1.64 2001/09/18 22:29:09 davem Exp $
  *
  *	Fixes:
  *	Michael Chastain	:	Incorrect size of copying.
@@ -979,7 +979,7 @@
 	if (get_user(olr, optlen))
 		return -EFAULT;
 
-	olr = min(unsigned int, olr, sizeof(int));
+	olr = min_t(unsigned int, olr, sizeof(int));
 	if (olr < 0)
 		return -EINVAL;