patch-2.4.10 linux/net/ipv6/ipv6_sockglue.c

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

diff -u --recursive --new-file v2.4.9/linux/net/ipv6/ipv6_sockglue.c linux/net/ipv6/ipv6_sockglue.c
@@ -7,7 +7,7 @@
  *
  *	Based on linux/net/ipv4/ip_sockglue.c
  *
- *	$Id: ipv6_sockglue.c,v 1.39 2001/08/13 18:56:13 davem Exp $
+ *	$Id: ipv6_sockglue.c,v 1.40 2001/09/18 22:29:10 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -535,7 +535,7 @@
 		return -EINVAL;
 #endif
 	}
-	len = min(unsigned int, sizeof(int), len);
+	len = min_t(unsigned int, sizeof(int), len);
 	if(put_user(len, optlen))
 		return -EFAULT;
 	if(copy_to_user(optval,&val,len))