diff options
| -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); |