ipv6: remove prune parameter for fib6_clean_all
Subsystems (3)
PATCH 1/1 ipv6: remove prune parameter for fib6_clean_all
From: Li RongQing <[email protected]>
since the prune parameter for fib6_clean_all always is 0, remove it.
Signed-off-by Li RongQing <[email protected]>
--- include/net/ip6_fib.h | 2 +- net/ipv6/ip6_fib.c | 6 +++--- net/ipv6/route.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
include/net/ip6_fib.h +1 -1
@@ -282,7 +282,7 @@ struct fib6_node *fib6_locate(struct fib6_node *root, const struct in6_addr *saddr, int src_len);void fib6_clean_all (struct net *net,int (*func)(struct rt6_info *,void *arg), -int prune,void *arg); +void *arg);int fib6_add (struct fib6_node *root,struct rt6_info *rt,struct nl_info *info);
net/ipv6/ip6_fib.c +3 -3
@@ -1530,7 +1530,7 @@ static void fib6_clean_tree(struct net *net, struct fib6_node *root, }void fib6_clean_all (struct net *net,int (*func)(struct rt6_info *,void *arg), -int prune,void *arg) +void *arg) {struct fib6_table *table;struct hlist_head *head;
@@ -1542,7 +1542,7 @@ void fib6_clean_all(struct net *net, int (*func)(struct rt6_info *, void *arg),hlist_for_each_entry_rcu (table, head, tb6_hlist) {write_lock_bh (&table->tb6_lock);fib6_clean_tree (net, &table->tb6_root, - func, prune, arg); + func,0 , arg);write_unlock_bh (&table->tb6_lock); } }
@@ -1636,7 +1636,7 @@ void fib6_run_gc(unsigned long expires, struct net *net, bool force) gc_args.more =icmp6_dst_gc (); -fib6_clean_all (net, fib6_age,0 ,NULL ); +fib6_clean_all (net, fib6_age,NULL ); now = jiffies; net->ipv6.ip6_rt_last_gc = now;
net/ipv6/route.c +3 -3
@@ -2244,7 +2244,7 @@ void rt6_remove_prefsrc(struct inet6_ifaddr *ifp) .net = net, .addr = &ifp->addr, }; -fib6_clean_all (net, fib6_remove_prefsrc,0 , &adni); +fib6_clean_all (net, fib6_remove_prefsrc, &adni); }struct arg_dev_net {
@@ -2271,7 +2271,7 @@ void rt6_ifdown(struct net *net, struct net_device *dev) .net = net, }; -fib6_clean_all (net, fib6_ifdown,0 , &adn); +fib6_clean_all (net, fib6_ifdown, &adn);icmp6_clean_all (fib6_ifdown, &adn); }
@@ -2326,7 +2326,7 @@ void rt6_mtu_change(struct net_device *dev, unsigned int mtu) .mtu = mtu, }; -fib6_clean_all (dev_net (dev), rt6_mtu_change_route,0 , &arg); +fib6_clean_all (dev_net (dev), rt6_mtu_change_route, &arg); }static const struct nla_policy rtm_ipv6_policy[RTA_MAX +1 ] = {
Signature · 1 line
1.7.10.4
Quoted 5 lines · On Fri, Dec 27, 2013 at 04:32:38PM +0800, [email protected] wrote:
From: Li RongQing <[email protected]>
since the prune parameter for
fib6_clean_allalways is 0, remove it.Signed-off-by Li RongQing <[email protected]>
Nice cleanup, thanks!
From: [email protected]
Date: Fri, 27 Dec 2013 16:32:38 +0800
Quoted 5 lines
From: Li RongQing <[email protected]>
since the prune parameter for
fib6_clean_allalways is 0, remove it.Signed-off-by Li RongQing <[email protected]>
Applied.