patch-2.4.10 linux/net/ipx/af_ipx.c

• Lines: 18
• Date: Thu Sep 13 17:16:23 2001
• Orig file: v2.4.9/linux/net/ipx/af_ipx.c
• Orig date: Mon Aug 27 12:41:49 2001

diff -u --recursive --new-file v2.4.9/linux/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c
@@ -1890,7 +1890,7 @@
 	if (get_user(len, optlen))
 		goto out;
 
-	len = min(unsigned int, len, sizeof(int));
+	len = min_t(unsigned int, len, sizeof(int));
 	ret = -EINVAL;
 	if(len < 0)
 		goto out;
@@ -2536,7 +2536,7 @@
 
 static unsigned char ipx_8022_type = 0xE0;
 static unsigned char ipx_snap_id[5] = { 0x0, 0x0, 0x0, 0x81, 0x37 };
-static const char banner[] __initdata =
+static char banner[] __initdata =
 	KERN_INFO "NET4: Linux IPX 0.47 for NET4.0\n"
 	KERN_INFO "IPX Portions Copyright (c) 1995 Caldera, Inc.\n" \
 	KERN_INFO "IPX Portions Copyright (c) 2000, 2001 Conectiva, Inc.\n";