LTP Nightly BK Test Failure - ip_nat_helper

LTP Nightly BK Test Failure - ip_nat_helper

[Paul Larson]

The nightly bk testing last night found a new build error last night
with ip_nat_helper

This bk tree covered this range of csets:
<Starting Changeset>
ChangeSet@1.542, 2002-08-28 10:57:35+02:00, davem@redhat.com
  This converts all of the input USB drivers to manage DMA
  buffers via usb_buffer_alloc in 2.5.x  This helps platforms
  where doing a pci_{map,unmap}_single() on every input event
  is very inefficient.
  
  Also adds a missing kfree(hid), because the HID struct was never
  freed.

<Ending Changeset>
ChangeSet@1.553, 2002-08-28 17:24:08-07:00, torvalds@home.transmeta.com
  Merge with dri CVS tree:
   - update some incorrect version checks
   - update radeon driver from 1.4.0 to 1.5.0
   - use C99 named initializers

Here is the tail end of the log:
  gcc -Wp,-MD,./.ip_nat_helper.o.d -D__KERNEL__ -I/kernel/bk/linux-2.5/include -
Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-ali
asing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -nostdinc -iwit
hprefix include    -DKBUILD_BASENAME=ip_nat_helper   -c -o ip_nat_helper.o ip_na
t_helper.c
ip_nat_helper.c: In function `ip_nat_helper_register':
ip_nat_helper.c:385: parse error before string constant
ip_nat_helper.c: In function `ip_nat_helper_unregister':
ip_nat_helper.c:470: parse error before string constant
ip_nat_helper.c:471: warning: left-hand operand of comma expression has no effec
t
ip_nat_helper.c:471: parse error before `)'
make[4]: *** [ip_nat_helper.o] Error 1
make[4]: Leaving directory `/kernel/bk/linux-2.5/net/ipv4/netfilter'
make[3]: *** [netfilter] Error 2
make[3]: Leaving directory `/kernel/bk/linux-2.5/net/ipv4'
make[2]: *** [ipv4] Error 2

Thanks,
Paul Larson

Re: LTP Nightly BK Test Failure - ip_nat_helper

[David S. Miller]

   From: Paul Larson <plars@austin.ibm.com>
   Date: 29 Aug 2002 09:05:14 -0500

   The nightly bk testing last night found a new build error last night
   with ip_nat_helper

Just some __FUNCTION__ string pasting that newer GCC doesn't like.
Feel free to submit a patch.
   
Franks a lot,
David S. Miller
davem@redhat.com

[PATCH] Fix compile error in ip_nat_helper.c

[Paul Larson]

On Thu, 2002-08-29 at 09:14, David S. Miller wrote:
>    From: Paul Larson <plars@austin.ibm.com>
>    Date: 29 Aug 2002 09:05:14 -0500
> 
>    The nightly bk testing last night found a new build error last night
>    with ip_nat_helper
> 
> Just some __FUNCTION__ string pasting that newer GCC doesn't like.
> Feel free to submit a patch.

I guess this is one of the "pasters" noted in:
ChangeSet@1.552, 2002-08-28 14:53:09-07:00,
torvalds@penguin.transmeta.com
  Add some fascist code to trap __FUNCTION__ pasting, fix up
  some more pasters.

Please apply.  Thanks,
Paul Larson
Linux Test Project
http://www.linuxtestproject.org
-------------------------------

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.553   -> 1.554  
#	net/ipv4/netfilter/ip_nat_helper.c	1.5     -> 1.6    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/29	plars@austin.ibm.com	1.554
# Fix compile failure in ip_nat_helper.c
# --------------------------------------------
#
diff -Nru a/net/ipv4/netfilter/ip_nat_helper.c b/net/ipv4/netfilter/ip_nat_helper.c
--- a/net/ipv4/netfilter/ip_nat_helper.c	Thu Aug 29 10:25:10 2002
+++ b/net/ipv4/netfilter/ip_nat_helper.c	Thu Aug 29 10:25:10 2002
@@ -382,9 +382,9 @@
 			const char *tmp = me->me->name;
 			
 			if (strlen(tmp) + 6 > MODULE_MAX_NAMELEN) {
-				printk(__FUNCTION__ ": unable to "
+				printk("%s: unable to "
 				       "compute conntrack helper name "
-				       "from %s\n", tmp);
+				       "from %s\n",__FUNCTION__, tmp);
 				return -EBUSY;
 			}
 			tmp += 6;
@@ -467,7 +467,7 @@
 		    && ct_helper->me) {
 			__MOD_DEC_USE_COUNT(ct_helper->me);
 		} else 
-			printk(__FUNCTION__ ": unable to decrement usage count"
-			       " of conntrack helper %s\n", me->me->name);
+			printk("%s: unable to decrement usage count"
+			       " of conntrack helper %s\n",__FUNCTION__, me->me->name);
 	}
 }