diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index 838262e17376..09957f9be97d 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c | |||
| @@ -979,6 +979,11 @@ ctnetlink_change_conntrack(struct ip_conntrack *ct, struct nfattr *cda[]) | |||
| 979 | return err; | 979 | return err; |
| 980 | } | 980 | } |
| 981 | 981 | ||
| 982 | #if defined(CONFIG_IP_NF_CONNTRACK_MARK) | ||
| 983 | if (cda[CTA_MARK-1]) | ||
| 984 | ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1])); | ||
| 985 | #endif | ||
| 986 | |||
| 982 | DEBUGP("all done\n"); | 987 | DEBUGP("all done\n"); |
| 983 | return 0; | 988 | return 0; |
| 984 | } | 989 | } |
| @@ -1022,6 +1027,11 @@ ctnetlink_create_conntrack(struct nfattr *cda[], | |||
| 1022 | if (ct->helper) | 1027 | if (ct->helper) |
| 1023 | ip_conntrack_helper_put(ct->helper); | 1028 | ip_conntrack_helper_put(ct->helper); |
| 1024 | 1029 | ||
| 1030 | #if defined(CONFIG_IP_NF_CONNTRACK_MARK) | ||
| 1031 | if (cda[CTA_MARK-1]) | ||
| 1032 | ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1])); | ||
| 1033 | #endif | ||
| 1034 | |||
| 1025 | DEBUGP("conntrack with id %u inserted\n", ct->id); | 1035 | DEBUGP("conntrack with id %u inserted\n", ct->id); |
| 1026 | return 0; | 1036 | return 0; |
| 1027 | 1037 | ||