leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipv6: remove prune parameter for fib6_clean_all

Browse Source 
since the prune parameter for fib6_clean_all always is 0, remove it.

Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Li RongQing 2013-12-27 16:32:38 +08:00 committed by David S. Miller
parent b055597697
commit 0c3584d589
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/ip6_fib.h
View File

@ -282,7 +282,7 @@ struct fib6_node *fib6_locate(struct fib6_node *root,
const struct in6_addr *saddr, int src_len); const struct in6_addr *saddr, int src_len);
void fib6_clean_all(struct net *net, int (*func)(struct rt6_info *, void *arg), 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); int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info);

6
net/ipv6/ip6_fib.c
View File

@ -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), 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 fib6_table *table;
struct hlist_head *head; 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) { hlist_for_each_entry_rcu(table, head, tb6_hlist) {
write_lock_bh(&table->tb6_lock); write_lock_bh(&table->tb6_lock);
fib6_clean_tree(net, &table->tb6_root, fib6_clean_tree(net, &table->tb6_root,
func, prune, arg); func, 0, arg);
write_unlock_bh(&table->tb6_lock); 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(); gc_args.more = icmp6_dst_gc();
fib6_clean_all(net, fib6_age, 0, NULL); fib6_clean_all(net, fib6_age, NULL);
now = jiffies; now = jiffies;
net->ipv6.ip6_rt_last_gc = now; net->ipv6.ip6_rt_last_gc = now;

6
net/ipv6/route.c
View File

@ -2258,7 +2258,7 @@ void rt6_remove_prefsrc(struct inet6_ifaddr *ifp)
.net = net, .net = net,
.addr = &ifp->addr, .addr = &ifp->addr,
}; };
fib6_clean_all(net, fib6_remove_prefsrc, 0, &adni); fib6_clean_all(net, fib6_remove_prefsrc, &adni);
} }
struct arg_dev_net { struct arg_dev_net {
@ -2285,7 +2285,7 @@ void rt6_ifdown(struct net *net, struct net_device *dev)
.net = net, .net = net,
}; };
fib6_clean_all(net, fib6_ifdown, 0, &adn); fib6_clean_all(net, fib6_ifdown, &adn);
icmp6_clean_all(fib6_ifdown, &adn); icmp6_clean_all(fib6_ifdown, &adn);
} }
@ -2340,7 +2340,7 @@ void rt6_mtu_change(struct net_device *dev, unsigned int mtu)
.mtu = 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] = { static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = {