ipv6: use standard lists for FIB walks
Subsystems (3)
PATCH 1/1 ipv6: use standard lists for FIB walks
Signed-off-by Alexey Dobriyan <[email protected]>
---
include/net/ip6_fib.h | 2 +- net/ipv6/ip6_fib.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-)
include/net/ip6_fib.h +1 -1
@@ -124,7 +124,7 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst) }struct fib6_walker_t { -struct fib6_walker_t *prev, *next; +struct list_head lh;struct fib6_node *root, *node;struct rt6_info *leaf;unsigned char state;
net/ipv6/ip6_fib.c +4 -13
@@ -93,29 +93,20 @@ static __u32 rt_sernum;static void fib6_gc_timer_cb (unsigned long arg); -static struct fib6_walker_t fib6_walker_list = { - .prev = &fib6_walker_list, - .next = &fib6_walker_list, -}; - -#define FOR_WALKERS (w) for ((w)=fib6_walker_list.next; (w) != &fib6_walker_list; (w)=(w)->next) +static LIST_HEAD (fib6_walkers); +#define FOR_WALKERS (w) list_for_each_entry(w, &fib6_walkers, lh)static inline void fib6_walker_link (struct fib6_walker_t *w) {write_lock_bh (&fib6_walker_lock); - w->next = fib6_walker_list.next; - w->prev = &fib6_walker_list; - w->next->prev = w; - w->prev->next = w; +list_add (&w->lh, &fib6_walkers);write_unlock_bh (&fib6_walker_lock); }static inline void fib6_walker_unlink (struct fib6_walker_t *w) {write_lock_bh (&fib6_walker_lock); - w->next->prev = w->prev; - w->prev->next = w->next; - w->prev = w->next = w; +list_del (&w->lh);write_unlock_bh (&fib6_walker_lock); }static __inline__u32 fib6_new_sernum (void )
From: Alexey Dobriyan <[email protected]>
Date: Thu, 18 Feb 2010 20:13:30 +0200
Quoted 1 line
Signed-off-by Alexey Dobriyan <[email protected]>
Applied, thanks for doing this.