conntrack-mms / gcc4 fix.

PATCH In review Pawel Sikora 2 participants 2 messages May 3, 2005 2 messages not in the archive netfilter

lore

Share & tools

lore

Pawel Sikora

author

2005-05-03 07:22 UTC #2 lore raw

PATCH 1/1 conntrack-mms / gcc4 fix.

In reply to a message not in the archive

Hi All,

During build with gcc4 I get:

CC [M] net/ipv4/netfilter/ip_conntrack_mms.o

          net/ipv4/netfilter/ip_conntrack_mms.c:55:

error: static declaration of 'ip_nat_mms_hook' follows non-static declaration include/linux/netfilter_ipv4/ip_conntrack_mms.h:37:
error: previous declaration of 'ip_nat_mms_hook' was here

Attached patch fixes it and should be applied.

Regards,
Pawel.

Signature · 3 lines

The only thing necessary for the triumph of evil
  is for good men to do nothing.
                                           - Edmund Burke

linux-2.6.11/net/ipv4/netfilter/ip_conntrack_mms.c +4 -4

@@ -49,10 +49,10 @@
 static char mms_buffer[65536];
 static DECLARE_LOCK(mms_buffer_lock);
 
-static unsigned int (*ip_nat_mms_hook)(struct sk_buff **pskb,
-				       enum ip_conntrack_info ctinfo,
-				       const struct ip_ct_mms_expect *exp_mms_info,
-				       struct ip_conntrack_expect *exp);
+unsigned int (*ip_nat_mms_hook)(struct sk_buff **pskb,
+				enum ip_conntrack_info ctinfo,
+				const struct ip_ct_mms_expect *exp_mms_info,
+				struct ip_conntrack_expect *exp);
 EXPORT_SYMBOL(ip_nat_mms_hook);
 
 #if 0

Patrick McHardy

2005-05-03 18:01 UTC #3 lore raw

Quoted 4 lines · Pawel Sikora

Hi All,
During build with gcc4 I get:

Quoted 8 lines

CC [M] net/ipv4/netfilter/ip_conntrack_mms.o
          net/ipv4/netfilter/ip_conntrack_mms.c:55:
error: static declaration of 'ip_nat_mms_hook' follows non-static declaration include/linux/netfilter_ipv4/ip_conntrack_mms.h:37:
error: previous declaration of 'ip_nat_mms_hook' was here
Attached patch fixes it and should be applied.

Done, thanks Pawel.

Regards
Patrick