patch-2.4.9 linux/drivers/s390/net/netiucv.c

• Lines: 18
• Date: Wed Aug 15 01:22:16 2001
• Orig file: v2.4.8/linux/drivers/s390/net/netiucv.c
• Orig date: Sun Aug 12 13:28:00 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/s390/net/netiucv.c linux/drivers/s390/net/netiucv.c
@@ -91,7 +91,6 @@
 #include <linux/init.h>		/* __setup()                    */
 #include <asm/string.h>		/* memset, memcpy, etc.         */
 #include "iucv.h"
-#define min(a,b) (a < b) ? a : b
 
 #if defined( DEBUG )
 #undef KERN_INFO
@@ -828,7 +827,8 @@
 	net_device *dev;
 
 	memset (iucv_userid[devnumber], ' ', 8);
-	memcpy (iucv_userid[devnumber], userid, min (strlen (userid), 8));
+	memcpy (iucv_userid[devnumber], userid,
+		min(unsigned int, strlen(userid), 8));
 	dev = &iucv_netdev[devnumber];
 	sprintf (dev->name, "iucv%i", devnumber);