Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0719bdf1 authored by Benoit Boissinot's avatar Benoit Boissinot Committed by David S. Miller
Browse files

[NETFILTER]: xt_CONNMARK.c build fix 

net/netfilter/xt_CONNMARK.c: In function 'target':
net/netfilter/xt_CONNMARK.c:59: warning: implicit declaration of
function 'nf_conntrack_event_cache'

The warning is due to the following .config:
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_CONNTRACK_MARK=y
# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
CONFIG_IP_NF_CONNTRACK_NETLINK=m

This change was introduced by:
http://www.kernel.org/git/?p=linux/kernel/git/davem/net-2.6.19.git;a=commit;h=76e4b41009b8a2e9dd246135cf43c7fe39553aa5



Proposed solution (based on the define in
include/net/netfilter/nf_conntrack_compat.h:

Signed-off-by: default avatarBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Acked-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33cc4896

net/netfilter/xt_CONNMARK.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ target(struct sk_buff **pskb, 
			newmark = (*ctmark & ~markinfo->mask) | markinfo->mark;

			if (newmark != *ctmark) {

				*ctmark = newmark;

#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS

#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)

				ip_conntrack_event_cache(IPCT_MARK, *pskb);

#else

				nf_conntrack_event_cache(IPCT_MARK, *pskb);
@@ -65,7 +65,7 @@ target(struct sk_buff **pskb, 
				  ((*pskb)->nfmark & markinfo->mask);

			if (*ctmark != newmark) {

				*ctmark = newmark;

#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS

#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)

				ip_conntrack_event_cache(IPCT_MARK, *pskb);

#else

				nf_conntrack_event_cache(IPCT_MARK, *pskb);