diff options
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> | 2006-08-28 20:50:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 18:18:27 -0400 |
| commit | 0719bdf1b5e7eb0d9c3c73ebbd9c9d5d382bb9e1 (patch) | |
| tree | 35ae31c424391b1ea48bf00f2528f8f2f68633fe /net | |
| parent | 33cc48966827165e49de1cb8ff4fb57c127d4be0 (diff) | |
[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: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/xt_CONNMARK.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c index 0e4249ddc17b..6ccb45ee0880 100644 --- a/net/netfilter/xt_CONNMARK.c +++ b/net/netfilter/xt_CONNMARK.c | |||
| @@ -53,7 +53,7 @@ target(struct sk_buff **pskb, | |||
| 53 | newmark = (*ctmark & ~markinfo->mask) | markinfo->mark; | 53 | newmark = (*ctmark & ~markinfo->mask) | markinfo->mark; |
| 54 | if (newmark != *ctmark) { | 54 | if (newmark != *ctmark) { |
| 55 | *ctmark = newmark; | 55 | *ctmark = newmark; |
| 56 | #ifdef CONFIG_IP_NF_CONNTRACK_EVENTS | 56 | #if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE) |
| 57 | ip_conntrack_event_cache(IPCT_MARK, *pskb); | 57 | ip_conntrack_event_cache(IPCT_MARK, *pskb); |
| 58 | #else | 58 | #else |
| 59 | nf_conntrack_event_cache(IPCT_MARK, *pskb); | 59 | nf_conntrack_event_cache(IPCT_MARK, *pskb); |
| @@ -65,7 +65,7 @@ target(struct sk_buff **pskb, | |||
| 65 | ((*pskb)->nfmark & markinfo->mask); | 65 | ((*pskb)->nfmark & markinfo->mask); |
| 66 | if (*ctmark != newmark) { | 66 | if (*ctmark != newmark) { |
| 67 | *ctmark = newmark; | 67 | *ctmark = newmark; |
| 68 | #ifdef CONFIG_IP_NF_CONNTRACK_EVENTS | 68 | #if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE) |
| 69 | ip_conntrack_event_cache(IPCT_MARK, *pskb); | 69 | ip_conntrack_event_cache(IPCT_MARK, *pskb); |
| 70 | #else | 70 | #else |
| 71 | nf_conntrack_event_cache(IPCT_MARK, *pskb); | 71 | nf_conntrack_event_cache(IPCT_MARK, *pskb); |