[PATCH] [IPv6]: use container_of() macro in fib6_clean_node()

[PATCH] [IPv6]: use container_of() macro in fib6_clean_node()

[Benjamin Thery]

In ip6_fib.c, fib6_clean_node() casts a fib6_walker_t pointer to
a fib6_cleaner_t pointer assuming a struct fib6_walker_t (field 'w')
is the first field in struct fib6_walker_t.

To prevent any future problems that may occur if one day a field
is inadvertently inserted before the 'w' field in struct fib6_cleaner_t,
(and to improve readability), this patch uses the container_of() macro.

Patch for net-2.6.24

Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
---

 net/ipv6/ip6_fib.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 6a612a7..946cf38 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1313,7 +1313,7 @@ static int fib6_clean_node(struct fib6_walker_t *w)
 {
 	int res;
 	struct rt6_info *rt;
-	struct fib6_cleaner_t *c = (struct fib6_cleaner_t*)w;
+	struct fib6_cleaner_t *c = container_of(w, struct fib6_cleaner_t, w);
 
 	for (rt = w->leaf; rt; rt = rt->u.dst.rt6_next) {
 		res = c->func(rt, c->arg);

Re: [PATCH] [IPv6]: use container_of() macro in fib6_clean_node()

[David Miller]

From: Benjamin Thery <benjamin.thery@bull.net>
Date: Mon, 08 Oct 2007 18:33:16 +0200

> In ip6_fib.c, fib6_clean_node() casts a fib6_walker_t pointer to
> a fib6_cleaner_t pointer assuming a struct fib6_walker_t (field 'w')
> is the first field in struct fib6_walker_t.
> 
> To prevent any future problems that may occur if one day a field
> is inadvertently inserted before the 'w' field in struct fib6_cleaner_t,
> (and to improve readability), this patch uses the container_of() macro.
> 
> Patch for net-2.6.24
> 
> Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>

Applied, thanks Benjamin.