diff options
Diffstat (limited to '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 0e0e9d7b34c8..3138ae79fa21 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[]) | |||
| 1022 | return err; | 1022 | return err; |
| 1023 | } | 1023 | } |
| 1024 | 1024 | ||
| 1025 | #if defined(CONFIG_IP_NF_CONNTRACK_MARK) | 1025 | #if defined(CONFIG_NF_CONNTRACK_MARK) |
| 1026 | if (cda[CTA_MARK-1]) | 1026 | if (cda[CTA_MARK-1]) |
| 1027 | ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1])); | 1027 | ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1])); |
| 1028 | #endif | 1028 | #endif |
| @@ -1062,7 +1062,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[], | |||
| 1062 | return err; | 1062 | return err; |
| 1063 | } | 1063 | } |
| 1064 | 1064 | ||
| 1065 | #if defined(CONFIG_IP_NF_CONNTRACK_MARK) | 1065 | #if defined(CONFIG_NF_CONNTRACK_MARK) |
| 1066 | if (cda[CTA_MARK-1]) | 1066 | if (cda[CTA_MARK-1]) |
| 1067 | ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1])); | 1067 | ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1])); |
| 1068 | #endif | 1068 | #endif |