Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d0f24a7 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

ipv6: icmp6_dst_gc return change 



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

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75307c0f

include/net/ip6_route.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ extern struct rt6_info *rt6_lookup(struct net *net, 
extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev,

					 struct neighbour *neigh,

					 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);

net/ipv6/ip6_fib.c

+1 −2
Original line number Diff line number Diff line
@@ -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.more = 0;



	icmp6_dst_gc(&gc_args.more);

	gc_args.more = icmp6_dst_gc();



	fib6_clean_all(net, fib6_age, 0, NULL);

net/ipv6/route.c

+4 −6
Original line number Diff line number Diff line
@@ -978,13 +978,12 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, 
	return &rt->u.dst;

}



int icmp6_dst_gc(int *more)

int icmp6_dst_gc(void)

{

	struct dst_entry *dst, *next, **pprev;

	int freed;

	int more = 0;



	next = NULL;

	freed = 0;



	spin_lock_bh(&icmp6_dst_lock);

	pprev = &icmp6_dst_gc_list;
@@ -993,16 +992,15 @@ int icmp6_dst_gc(int *more) 
		if (!atomic_read(&dst->__refcnt)) {

			*pprev = dst->next;

			dst_free(dst);

			freed++;

		} else {

			pprev = &dst->next;

			(*more)++;

			++more;

		}

	}



	spin_unlock_bh(&icmp6_dst_lock);



	return freed;

	return more;

}



static int ip6_dst_gc(struct dst_ops *ops)