[NETNS][IPV6] route6 - Pass the network namespace parameter to rt6_purge_dflt_routers
Add a network namespace parameter to rt6_purge_dflt_routers. This is needed to call fib6_get_table with the appropriate network namespace. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: Benjamin Thery <benjamin.thery@bull.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
efa2cea0d9
Коммит
7b4da53229
|
@ -95,7 +95,7 @@ extern struct rt6_info * rt6_add_dflt_router(struct in6_addr *gwaddr,
|
|||
struct net_device *dev,
|
||||
unsigned int pref);
|
||||
|
||||
extern void rt6_purge_dflt_routers(void);
|
||||
extern void rt6_purge_dflt_routers(struct net *net);
|
||||
|
||||
extern int rt6_route_rcv(struct net_device *dev,
|
||||
u8 *opt, int len,
|
||||
|
|
|
@ -493,7 +493,7 @@ static void addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
|
|||
dev_forward_change((struct inet6_dev *)table->extra1);
|
||||
|
||||
if (*p)
|
||||
rt6_purge_dflt_routers();
|
||||
rt6_purge_dflt_routers(net);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1697,13 +1697,13 @@ struct rt6_info *rt6_add_dflt_router(struct in6_addr *gwaddr,
|
|||
return rt6_get_dflt_router(gwaddr, dev);
|
||||
}
|
||||
|
||||
void rt6_purge_dflt_routers(void)
|
||||
void rt6_purge_dflt_routers(struct net *net)
|
||||
{
|
||||
struct rt6_info *rt;
|
||||
struct fib6_table *table;
|
||||
|
||||
/* NOTE: Keep consistent with rt6_get_dflt_router */
|
||||
table = fib6_get_table(&init_net, RT6_TABLE_DFLT);
|
||||
table = fib6_get_table(net, RT6_TABLE_DFLT);
|
||||
if (table == NULL)
|
||||
return;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче