* [PATCH nf-next] netfilter: xt_connlimit: don't store address in the conn nodes
@ 2017-10-15 9:00 Florian Westphal
2017-10-24 16:05 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2017-10-15 9:00 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
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>
---
net/netfilter/xt_connlimit.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index ffa8eec980e9..ce2870428631 100644
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -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);
--
2.13.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf-next] netfilter: xt_connlimit: don't store address in the conn nodes
2017-10-15 9:00 [PATCH nf-next] netfilter: xt_connlimit: don't store address in the conn nodes Florian Westphal
@ 2017-10-24 16:05 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-10-24 16:05 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Sun, Oct 15, 2017 at 11:00:34AM +0200, Florian Westphal wrote:
> 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.
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-24 16:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-15 9:00 [PATCH nf-next] netfilter: xt_connlimit: don't store address in the conn nodes Florian Westphal
2017-10-24 16:05 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).