patch-2.4.10 linux/net/unix/af_unix.c

• Lines: 36
• Date: Thu Sep 20 14:12:56 2001
• Orig file: v2.4.9/linux/net/unix/af_unix.c
• Orig date: Mon Aug 27 12:41:50 2001

diff -u --recursive --new-file v2.4.9/linux/net/unix/af_unix.c linux/net/unix/af_unix.c
@@ -8,7 +8,7 @@
  *		as published by the Free Software Foundation; either version
  *		2 of the License, or (at your option) any later version.
  *
- * Version:	$Id: af_unix.c,v 1.121 2001/08/13 18:56:13 davem Exp $
+ * Version:	$Id: af_unix.c,v 1.123 2001/09/19 04:50:32 davem Exp $
  *
  * Fixes:
  *		Linus Torvalds	:	Assorted bug cures.
@@ -1336,7 +1336,7 @@
 		 *	fallback size buffer which is under a page and will
 		 *	succeed. [Alan]
 		 */
-		size = min(int, size, skb_tailroom(skb));
+		size = min_t(int, size, skb_tailroom(skb));
 
 		memcpy(UNIXCREDS(skb), &scm->creds, sizeof(struct ucred));
 		if (scm->fp)
@@ -1568,7 +1568,7 @@
 			sunaddr = NULL;
 		}
 
-		chunk = min(unsigned int, skb->len, size);
+		chunk = min_t(unsigned int, skb->len, size);
 		if (memcpy_toiovec(msg->msg_iov, skb->data, chunk)) {
 			skb_queue_head(&sk->receive_queue, skb);
 			if (copied == 0)
@@ -1845,7 +1845,7 @@
 static inline void unix_sysctl_unregister(void) {}
 #endif
 
-static const char banner[] __initdata = KERN_INFO "NET4: Unix domain sockets 1.0/SMP for Linux NET4.0.\n";
+static char banner[] __initdata = KERN_INFO "NET4: Unix domain sockets 1.0/SMP for Linux NET4.0.\n";
 
 static int __init af_unix_init(void)
 {