From: Geliang Tang <geliangt...@gmail.com>

To make the code clearer, use rb_entry() instead of container_of() to
deal with rbtree.

Signed-off-by: Geliang Tang <geliangt...@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org>
---
 net/netfilter/xt_connlimit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index 2aff2b7c4689..660b61dbd776 100644
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -218,7 +218,7 @@ count_tree(struct net *net, struct rb_root *root,
                int diff;
                bool addit;
 
-               rbconn = container_of(*rbnode, struct xt_connlimit_rb, node);
+               rbconn = rb_entry(*rbnode, struct xt_connlimit_rb, node);
 
                parent = *rbnode;
                diff = same_source_net(addr, mask, &rbconn->addr, family);
@@ -398,7 +398,7 @@ static void destroy_tree(struct rb_root *r)
        struct rb_node *node;
 
        while ((node = rb_first(r)) != NULL) {
-               rbconn = container_of(node, struct xt_connlimit_rb, node);
+               rbconn = rb_entry(node, struct xt_connlimit_rb, node);
 
                rb_erase(node, r);
 
-- 
2.1.4

Reply via email to