Commit 76e6ebfb authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

netns: add namespace parameter to rt_cache_flush 



Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f43798c2

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct in_device; 
extern int		ip_rt_init(void);

extern void		ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw,

				       __be32 src, struct net_device *dev);

extern void		rt_cache_flush(int how);

extern void		rt_cache_flush(struct net *net, int how);

extern int		__ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp);

extern int		ip_route_output_key(struct net *, struct rtable **, struct flowi *flp);

extern int		ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, int flags);

net/ipv4/arp.c

+1 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ static int arp_netdev_event(struct notifier_block *this, unsigned long event, vo 
	switch (event) {

	case NETDEV_CHANGEADDR:

		neigh_changeaddr(&arp_tbl, dev);

		rt_cache_flush(0);

		rt_cache_flush(dev_net(dev), 0);

		break;

	default:

		break;

net/ipv4/devinet.c

+5 −3
Original line number Diff line number Diff line
@@ -1348,7 +1348,7 @@ static int devinet_sysctl_forward(ctl_table *ctl, int write, 
				dev_disable_lro(idev->dev);

			}

			rtnl_unlock();

			rt_cache_flush(0);

			rt_cache_flush(net, 0);

		}

	}
@@ -1362,9 +1362,10 @@ int ipv4_doint_and_flush(ctl_table *ctl, int write, 
	int *valp = ctl->data;

	int val = *valp;

	int ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);

	struct net *net = ctl->extra2;



	if (write && *valp != val)

		rt_cache_flush(0);

		rt_cache_flush(net, 0);



	return ret;

}
@@ -1375,9 +1376,10 @@ int ipv4_doint_and_flush_strategy(ctl_table *table, int __user *name, int nlen, 
{

	int ret = devinet_conf_sysctl(table, name, nlen, oldval, oldlenp,

				      newval, newlen);

	struct net *net = table->extra2;



	if (ret == 1)

		rt_cache_flush(0);

		rt_cache_flush(net, 0);



	return ret;

}

net/ipv4/fib_frontend.c

+9 −8
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void fib_flush(struct net *net) 
	}



	if (flushed)

		rt_cache_flush(-1);

		rt_cache_flush(net, -1);

}



/*
@@ -897,21 +897,22 @@ static void fib_disable_ip(struct net_device *dev, int force) 
{

	if (fib_sync_down_dev(dev, force))

		fib_flush(dev_net(dev));

	rt_cache_flush(0);

	rt_cache_flush(dev_net(dev), 0);

	arp_ifdown(dev);

}



static int fib_inetaddr_event(struct notifier_block *this, unsigned long event, void *ptr)

{

	struct in_ifaddr *ifa = (struct in_ifaddr*)ptr;

	struct net_device *dev = ifa->ifa_dev->dev;



	switch (event) {

	case NETDEV_UP:

		fib_add_ifaddr(ifa);

#ifdef CONFIG_IP_ROUTE_MULTIPATH

		fib_sync_up(ifa->ifa_dev->dev);

		fib_sync_up(dev);

#endif

		rt_cache_flush(-1);

		rt_cache_flush(dev_net(dev), -1);

		break;

	case NETDEV_DOWN:

		fib_del_ifaddr(ifa);
@@ -919,9 +920,9 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event, 
			/* Last address was deleted from this interface.

			   Disable IP.

			 */

			fib_disable_ip(ifa->ifa_dev->dev, 1);

			fib_disable_ip(dev, 1);

		} else {

			rt_cache_flush(-1);

			rt_cache_flush(dev_net(dev), -1);

		}

		break;

	}
@@ -949,14 +950,14 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo 
#ifdef CONFIG_IP_ROUTE_MULTIPATH

		fib_sync_up(dev);

#endif

		rt_cache_flush(-1);

		rt_cache_flush(dev_net(dev), -1);

		break;

	case NETDEV_DOWN:

		fib_disable_ip(dev, 0);

		break;

	case NETDEV_CHANGEMTU:

	case NETDEV_CHANGE:

		rt_cache_flush(0);

		rt_cache_flush(dev_net(dev), 0);

		break;

	}

	return NOTIFY_DONE;

net/ipv4/fib_hash.c

+3 −3
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static int fn_hash_insert(struct fib_table *tb, struct fib_config *cfg) 


			fib_release_info(fi_drop);

			if (state & FA_S_ACCESSED)

				rt_cache_flush(-1);

				rt_cache_flush(cfg->fc_nlinfo.nl_net, -1);

			rtmsg_fib(RTM_NEWROUTE, key, fa, cfg->fc_dst_len, tb->tb_id,

				  &cfg->fc_nlinfo, NLM_F_REPLACE);

			return 0;
@@ -532,7 +532,7 @@ static int fn_hash_insert(struct fib_table *tb, struct fib_config *cfg) 


	if (new_f)

		fz->fz_nent++;

	rt_cache_flush(-1);

	rt_cache_flush(cfg->fc_nlinfo.nl_net, -1);



	rtmsg_fib(RTM_NEWROUTE, key, new_fa, cfg->fc_dst_len, tb->tb_id,

		  &cfg->fc_nlinfo, 0);
@@ -614,7 +614,7 @@ static int fn_hash_delete(struct fib_table *tb, struct fib_config *cfg) 
		write_unlock_bh(&fib_hash_lock);



		if (fa->fa_state & FA_S_ACCESSED)

			rt_cache_flush(-1);

			rt_cache_flush(cfg->fc_nlinfo.nl_net, -1);

		fn_free_alias(fa, f);

		if (kill_fn) {

			fn_free_node(f);