* [PATCH net-next] ipv6: remove prune parameter for fib6_clean_all
@ 2013-12-27 8:32 roy.qing.li
2013-12-27 15:14 ` Hannes Frederic Sowa
2014-01-02 8:30 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: roy.qing.li @ 2013-12-27 8:32 UTC (permalink / raw)
To: netdev
From: Li RongQing <roy.qing.li@gmail.com>
since the prune parameter for fib6_clean_all always is 0, remove it.
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
include/net/ip6_fib.h | 2 +-
net/ipv6/ip6_fib.c | 6 +++---
net/ipv6/route.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 2182525..aca0c27 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -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);
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 5550a81..075602f 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -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;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 89b2735..0d978b4 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -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] = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] ipv6: remove prune parameter for fib6_clean_all
2013-12-27 8:32 [PATCH net-next] ipv6: remove prune parameter for fib6_clean_all roy.qing.li
@ 2013-12-27 15:14 ` Hannes Frederic Sowa
2014-01-02 8:30 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Hannes Frederic Sowa @ 2013-12-27 15:14 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev
On Fri, Dec 27, 2013 at 04:32:38PM +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> since the prune parameter for fib6_clean_all always is 0, remove it.
>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Nice cleanup, thanks!
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] ipv6: remove prune parameter for fib6_clean_all
2013-12-27 8:32 [PATCH net-next] ipv6: remove prune parameter for fib6_clean_all roy.qing.li
2013-12-27 15:14 ` Hannes Frederic Sowa
@ 2014-01-02 8:30 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-01-02 8:30 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev
From: roy.qing.li@gmail.com
Date: Fri, 27 Dec 2013 16:32:38 +0800
> From: Li RongQing <roy.qing.li@gmail.com>
>
> since the prune parameter for fib6_clean_all always is 0, remove it.
>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-02 8:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-27 8:32 [PATCH net-next] ipv6: remove prune parameter for fib6_clean_all roy.qing.li
2013-12-27 15:14 ` Hannes Frederic Sowa
2014-01-02 8:30 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.