[PATCH] conntrack-mms / gcc4 fix.

[PATCH] conntrack-mms / gcc4 fix.

[Pawel Sikora]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

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.

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

[-- Attachment #2: mms_conntrack-gcc4.patch --]
[-- Type: text/x-diff, Size: 703 bytes --]

--- mms-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_mms.c	(revision 3889)
+++ mms-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_mms.c	(working copy)
@@ -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 

Re: [PATCH] conntrack-mms / gcc4 fix.

[Patrick McHardy]

Pawel Sikora wrote:
> 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.

Done, thanks Pawel.

Regards
Patrick