[NETFILTER]: nf_conntrack: kill unique ID

Remove the per-conntrack ID, its not necessary anymore for dumping.
For compatiblity reasons we send the address of the conntrack to
userspace as ID.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

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:
 static inline int
 ctnetlink_dump_id(struct sk_buff *skb, const struct nf_conn *ct)
 {
-        __be32 id = htonl(ct->id);
+        __be32 id = htonl((unsigned long)ct);
         NLA_PUT(skb, CTA_ID, sizeof(u_int32_t), &id);
         return 0;
 
@@ -723,7 +723,7 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
 
         if (cda[CTA_ID]) {
                 u_int32_t id = ntohl(*(__be32 *)nla_data(cda[CTA_ID]));
-                if (ct->id != id) {
+                if (id != (u32)(unsigned long)ct) {
                         nf_ct_put(ct);
                         return -ENOENT;
                 }