diff options
| author | Martin Josefsson <gandalf@wlug.westbo.se> | 2006-04-01 02:23:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-04-01 02:23:21 -0800 |
| commit | bcd1e830a5ac37d708647d492a1436a8a9babb07 (patch) | |
| tree | d953546890bb20d3c5191cc39b8e1ea9861a98ec | |
| parent | a89ecb6a2ef732d04058d87801e2b6bd7e5c7089 (diff) | |
| download | kernel_samsung_aries-bcd1e830a5ac37d708647d492a1436a8a9babb07.zip kernel_samsung_aries-bcd1e830a5ac37d708647d492a1436a8a9babb07.tar.gz kernel_samsung_aries-bcd1e830a5ac37d708647d492a1436a8a9babb07.tar.bz2 | |
[NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink
When ctnetlink was ported from ip_conntrack to nf_conntrack two #ifdef's
for connmark support were left unchanged and this code was never
compiled.
Problem noticed by Daniel De Graaf.
Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 0e0e9d7..3138ae7 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -1022,7 +1022,7 @@ ctnetlink_change_conntrack(struct nf_conn *ct, struct nfattr *cda[]) return err; } -#if defined(CONFIG_IP_NF_CONNTRACK_MARK) +#if defined(CONFIG_NF_CONNTRACK_MARK) if (cda[CTA_MARK-1]) ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1])); #endif @@ -1062,7 +1062,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[], return err; } -#if defined(CONFIG_IP_NF_CONNTRACK_MARK) +#if defined(CONFIG_NF_CONNTRACK_MARK) if (cda[CTA_MARK-1]) ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1])); #endif |