2002-09-01 02:01:12

by James Morris

Subject: [PATCH] ipv6 compile fix, __FUNCTION__ pasting, 2.5.33

Another __FUNCTION__ pasting fix, for 2.5.33.

- James
--
James Morris
<[email protected]>

diff -urN -X dontdiff linux-2.5.33.orig/net/ipv6/af_inet6.c linux-2.5.33.w1/net/ipv6/af_inet6.c
--- linux-2.5.33.orig/net/ipv6/af_inet6.c Sun Sep 1 11:34:46 2002
+++ linux-2.5.33.w1/net/ipv6/af_inet6.c Sun Sep 1 12:00:07 2002
@@ -663,8 +663,8 @@
sizeof(struct raw6_sock), 0,
SLAB_HWCACHE_ALIGN, 0, 0);
if (!tcp6_sk_cachep || !udp6_sk_cachep || !raw6_sk_cachep)
- printk(KERN_CRIT __FUNCTION__
- ": Can't create protocol sock SLAB caches!\n");
+ printk(KERN_CRIT "%s: Can't create protocol sock SLAB "
+ "caches!\n", __FUNCTION__);

/* Register the socket-side information for inet6_create. */
for(r = &inetsw6[0]; r < &inetsw6[SOCK_MAX]; ++r)

2002-09-01 06:06:11

by David Miller

Subject: Re: [PATCH] ipv6 compile fix, __FUNCTION__ pasting, 2.5.33

From: James Morris <[email protected]>
Date: Sun, 1 Sep 2002 12:05:13 +1000 (EST)

Another __FUNCTION__ pasting fix, for 2.5.33.

Applied to my tree.