patch-2.4.10 linux/net/ax25/af_ax25.c

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

diff -u --recursive --new-file v2.4.9/linux/net/ax25/af_ax25.c linux/net/ax25/af_ax25.c
@@ -751,7 +751,7 @@
 		return -EFAULT;
 
 	valptr = (void *) &val;
-	length = min(unsigned int, maxlen, sizeof(int));
+	length = min_t(unsigned int, maxlen, sizeof(int));
 
 	switch (optname) {
 		case AX25_WINDOW:
@@ -803,7 +803,7 @@
 
 			if (ax25_dev != NULL && ax25_dev->dev != NULL) {
 				strncpy(devname, ax25_dev->dev->name, IFNAMSIZ);
-				length = min(unsigned int, strlen(ax25_dev->dev->name)+1, maxlen);
+				length = min_t(unsigned int, strlen(ax25_dev->dev->name)+1, maxlen);
 				devname[length-1] = '\0';
 			} else {
 				*devname = '\0';
@@ -1841,7 +1841,7 @@
 EXPORT_SYMBOL(null_ax25_address);
 EXPORT_SYMBOL(ax25_display_timer);
 
-static const char banner[] __initdata = KERN_INFO "NET4: G4KLX/GW4PTS AX.25 for Linux. Version 0.37 for Linux NET4.0\n";
+static char banner[] __initdata = KERN_INFO "NET4: G4KLX/GW4PTS AX.25 for Linux. Version 0.37 for Linux NET4.0\n";
 
 static int __init ax25_init(void)
 {