diff options
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
-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 ce3581266b8..8406aee1cde 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -257,7 +257,7 @@ nla_put_failure: | |||
257 | static inline int | 257 | static inline int |
258 | ctnetlink_dump_id(struct sk_buff *skb, const struct nf_conn *ct) | 258 | ctnetlink_dump_id(struct sk_buff *skb, const struct nf_conn *ct) |
259 | { | 259 | { |
260 | __be32 id = htonl(ct->id); | 260 | __be32 id = htonl((unsigned long)ct); |
261 | NLA_PUT(skb, CTA_ID, sizeof(u_int32_t), &id); | 261 | NLA_PUT(skb, CTA_ID, sizeof(u_int32_t), &id); |
262 | return 0; | 262 | return 0; |
263 | 263 | ||
@@ -723,7 +723,7 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb, | |||
723 | 723 | ||
724 | if (cda[CTA_ID]) { | 724 | if (cda[CTA_ID]) { |
725 | u_int32_t id = ntohl(*(__be32 *)nla_data(cda[CTA_ID])); | 725 | u_int32_t id = ntohl(*(__be32 *)nla_data(cda[CTA_ID])); |
726 | if (ct->id != id) { | 726 | if (id != (u32)(unsigned long)ct) { |
727 | nf_ct_put(ct); | 727 | nf_ct_put(ct); |
728 | return -ENOENT; | 728 | return -ENOENT; |
729 | } | 729 | } |