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

Commit 7b4da532 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by David S. Miller
Browse files

[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: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efa2cea0

include/net/ip6_route.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

net/ipv6/addrconf.c

+1 −1
Original line number Diff line number Diff line
@@ -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

net/ipv6/route.c

+2 −2
Original line number Diff line number Diff line
@@ -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;