提交 0719bdf1 编写于 作者: B Benoit Boissinot 提交者: David S. Miller

[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: NBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Acked-by: NPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 33cc4896
...@@ -53,7 +53,7 @@ target(struct sk_buff **pskb, ...@@ -53,7 +53,7 @@ target(struct sk_buff **pskb,
newmark = (*ctmark & ~markinfo->mask) | markinfo->mark; newmark = (*ctmark & ~markinfo->mask) | markinfo->mark;
if (newmark != *ctmark) { if (newmark != *ctmark) {
*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); ip_conntrack_event_cache(IPCT_MARK, *pskb);
#else #else
nf_conntrack_event_cache(IPCT_MARK, *pskb); nf_conntrack_event_cache(IPCT_MARK, *pskb);
...@@ -65,7 +65,7 @@ target(struct sk_buff **pskb, ...@@ -65,7 +65,7 @@ target(struct sk_buff **pskb,
((*pskb)->nfmark & markinfo->mask); ((*pskb)->nfmark & markinfo->mask);
if (*ctmark != newmark) { if (*ctmark != newmark) {
*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); ip_conntrack_event_cache(IPCT_MARK, *pskb);
#else #else
nf_conntrack_event_cache(IPCT_MARK, *pskb); nf_conntrack_event_cache(IPCT_MARK, *pskb);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册