lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv6: icmp6_dst_gc return change

Browse Source 
Change icmp6_dst_gc to return the one value the caller cares about rather
than using call by reference.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger
2008-07-22 14:35:50 -07:00
committed by David S. Miller
parent 75307c0fe7
commit 3d0f24a74e
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/ip6_route.h
View File

@@ -68,7 +68,7 @@ extern struct rt6_info *rt6_lookup(struct net *net,
extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev, extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
struct neighbour *neigh, struct neighbour *neigh,
const struct in6_addr *addr); const struct in6_addr *addr);
extern int icmp6_dst_gc(int *more); extern int icmp6_dst_gc(void);
extern void fib6_force_start_gc(struct net *net); extern void fib6_force_start_gc(struct net *net);

3
net/ipv6/ip6_fib.c
View File

@@ -1453,9 +1453,8 @@ void fib6_run_gc(unsigned long expires, struct net *net)
} }
gc_args.timeout = net->ipv6.sysctl.ip6_rt_gc_interval; gc_args.timeout = net->ipv6.sysctl.ip6_rt_gc_interval;
} }
gc_args.more = 0;
icmp6_dst_gc(&gc_args.more); gc_args.more = icmp6_dst_gc();
fib6_clean_all(net, fib6_age, 0, NULL); fib6_clean_all(net, fib6_age, 0, NULL);

10
net/ipv6/route.c
View File

@@ -978,13 +978,12 @@ out:
return &rt->u.dst; return &rt->u.dst;
} }
int icmp6_dst_gc(int *more) int icmp6_dst_gc(void)
{ {
struct dst_entry *dst, *next, **pprev; struct dst_entry *dst, *next, **pprev;
int freed; int more = 0;
next = NULL; next = NULL;
freed = 0;
spin_lock_bh(&icmp6_dst_lock); spin_lock_bh(&icmp6_dst_lock);
pprev = &icmp6_dst_gc_list; pprev = &icmp6_dst_gc_list;
@@ -993,16 +992,15 @@ int icmp6_dst_gc(int *more)
if (!atomic_read(&dst->__refcnt)) { if (!atomic_read(&dst->__refcnt)) {
*pprev = dst->next; *pprev = dst->next;
dst_free(dst); dst_free(dst);
freed++;
} else { } else {
pprev = &dst->next; pprev = &dst->next;
(*more)++; ++more;
} }
} }
spin_unlock_bh(&icmp6_dst_lock); spin_unlock_bh(&icmp6_dst_lock);
return freed; return more;
} }
static int ip6_dst_gc(struct dst_ops *ops) static int ip6_dst_gc(struct dst_ops *ops)