Skip to contentSkip to conversation

gcc4 fixes ip_conntrack_core.c/nf_conntrack.h.

PATCH In review Pawel Sikora 2 participants 2 messages Apr 22, 2005 – Apr 24, 2005 netfilter

lore
Share & tools
lore

Pawel Sikora

author
#0 lore raw

PATCH 1/1 gcc4 fixes ip_conntrack_core.c/nf_conntrack.h.

Hi,

Attached patches fix build issues exposed by gcc4. Please review and apply.

Regards,
Pawel.

Signature · 3 lines
/* Copyright (C) 2003, SCO, Inc. This is valuable Intellectual Property. */

                           #define say(x) lie(x)

CC [M] net/ipv4/netfilter/ip_conntrack_core.o net/ipv4/netfilter/ip_conntrack_core.c: In function 'destroy_conntrack':
include/linux/netfilter_ipv4/ip_conntrack.h:353:
sorry, unimplemented: inlining failed in call to 'ip_conntrack_free':
function body not available
net/ipv4/netfilter/ip_conntrack_core.c:299:
sorry, unimplemented: called from here

linux/netfilter/nf_conntrack.h +1 -1
Index: include/linux/netfilter/nf_conntrack.h
===================================================================
@@ -218,7 +218,7 @@
 }
 
 /* decrement reference count on a conntrack */
-extern inline void nf_ct_put(struct nf_conn *ct);
+extern void nf_ct_put(struct nf_conn *ct);
 
 /* call to create an explicit dependency on nf_conntrack. */
 extern void need_nf_conntrack(void);
linux/netfilter_ipv4/ip_conntrack.h +2 -2
Index: include/linux/netfilter_ipv4/ip_conntrack.h
===================================================================
@@ -350,9 +350,9 @@
 extern struct ip_conntrack *ip_conntrack_alloc(struct ip_conntrack_tuple *,
 					       struct ip_conntrack_tuple *);
 
-extern inline void ip_conntrack_free(struct ip_conntrack *ct);
+extern void ip_conntrack_free(struct ip_conntrack *ct);
 
-extern inline void ip_conntrack_insert(struct ip_conntrack *ct);
+extern void ip_conntrack_insert(struct ip_conntrack *ct);
 
 extern struct ip_conntrack_expect *
 __ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);

CC [M] net/ipv4/netfilter/ip_conntrack_core.o include/linux/netfilter_ipv4/ip_conntrack.h:353: warning:
'ip_conntrack_free' declared inline after being called
include/linux/netfilter_ipv4/ip_conntrack.h:353: warning:
previous declaration of 'ip_conntrack_free' was here

ipv4/netfilter/ip_conntrack_core.c +7 -7
Index: net/ipv4/netfilter/ip_conntrack_core.c
===================================================================
@@ -247,6 +247,13 @@
 	ip_ct_remove_expectations(ct);
 }
 
+inline void
+ip_conntrack_free(struct ip_conntrack *conntrack)
+{
+	atomic_dec(&ip_conntrack_count);
+	kmem_cache_free(ip_conntrack_cachep, conntrack);
+}
+
 static void
 destroy_conntrack(struct nf_conntrack *nfct)
 {

@@ -559,13 +566,6 @@
 	return conntrack;
 }
 
-inline void
-ip_conntrack_free(struct ip_conntrack *conntrack)
-{
-	atomic_dec(&ip_conntrack_count);
-	kmem_cache_free(ip_conntrack_cachep, conntrack);
-}
-
 /* Allocate a new conntrack: we return -ENOMEM if classification
    failed due to stress.  Otherwise it really is unclassifiable. */
 static struct ip_conntrack_tuple_hash *
#1 lore raw
Quoted 10 lines · Pawel Sikora

Attached patches fix build issues exposed by gcc4. Please review and apply.

Regards,
Pawel.

Signature · 2 lines
/* Copyright (C) 2003, SCO, Inc. This is valuable Intellectual Property. */
#define say(x) lie(x)

Am I the only one getting nervous when somebody sends a patch which has no Signed-off-by line, but includes a comment saying that this is "(C) 2003, SCO, Inc."?

Regards,
Carl-Daniel