netfilter: xt_connlimit: don't store address in the conn nodes
authorFlorian Westphal <fw@strlen.de>
Sun, 15 Oct 2017 09:00:34 +0000 (11:00 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 24 Oct 2017 16:01:50 +0000 (18:01 +0200)
Only stored, never read.  This is a leftover from commit 7d08487777c8
("netfilter: connlimit: use rbtree for per-host conntrack obj storage"),
which added the rbtree node struct that stores the address instead.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/xt_connlimit.c

index ffa8eec980e9e1edf6a6a93581510736bf042558..ce2870428631775428ca374efb3f715a3490ad1f 100644 (file)
@@ -46,7 +46,6 @@
 struct xt_connlimit_conn {
        struct hlist_node               node;
        struct nf_conntrack_tuple       tuple;
-       union nf_inet_addr              addr;
 };
 
 struct xt_connlimit_rb {
@@ -125,7 +124,6 @@ static bool add_hlist(struct hlist_head *head,
        if (conn == NULL)
                return false;
        conn->tuple = *tuple;
-       conn->addr = *addr;
        hlist_add_head(&conn->node, head);
        return true;
 }
@@ -270,7 +268,6 @@ count_tree(struct net *net, struct rb_root *root,
        }
 
        conn->tuple = *tuple;
-       conn->addr = *addr;
        rbconn->addr = *addr;
 
        INIT_HLIST_HEAD(&rbconn->hhead);