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

[NETNS]: Add namespace parameter to ip_route_output_key. 



Needed to propagate it down to the ip_route_output_flow.

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

drivers/infiniband/core/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static void addr_send_arp(struct sockaddr_in *dst_in) 


	memset(&fl, 0, sizeof fl);

	fl.nl_u.ip4_u.daddr = dst_ip;

	if (ip_route_output_key(&rt, &fl))

	if (ip_route_output_key(&init_net, &rt, &fl))

		return;



	neigh_event_send(rt->u.dst.neighbour, NULL);
@@ -179,7 +179,7 @@ static int addr_resolve_remote(struct sockaddr_in *src_in, 
	memset(&fl, 0, sizeof fl);

	fl.nl_u.ip4_u.daddr = dst_ip;

	fl.nl_u.ip4_u.saddr = src_ip;

	ret = ip_route_output_key(&rt, &fl);

	ret = ip_route_output_key(&init_net, &rt, &fl);

	if (ret)

		goto out;

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2517,7 +2517,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave) 
		fl.fl4_dst = targets[i];

		fl.fl4_tos = RTO_ONLINK;



		rv = ip_route_output_key(&rt, &fl);

		rv = ip_route_output_key(&init_net, &rt, &fl);

		if (rv) {

			if (net_ratelimit()) {

				printk(KERN_WARNING DRV_NAME

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 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 int		__ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp);

extern int		ip_route_output_key(struct rtable **, 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);

extern int		ip_route_input(struct sk_buff*, __be32 dst, __be32 src, u8 tos, struct net_device *devin);

extern unsigned short	ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu);

net/atm/clip.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip) 
		unlink_clip_vcc(clip_vcc);

		return 0;

	}

	error = ip_route_output_key(&rt, &fl);

	error = ip_route_output_key(&init_net, &rt, &fl);

	if (error)

		return error;

	neigh = __neigh_lookup(&clip_tbl, &ip, rt->u.dst.dev, 1);

net/bridge/br_netfilter.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb) 
			if (err != -EHOSTUNREACH || !in_dev || IN_DEV_FORWARD(in_dev))

				goto free_skb;



			if (!ip_route_output_key(&rt, &fl)) {

			if (!ip_route_output_key(&init_net, &rt, &fl)) {

				/* - Bridged-and-DNAT'ed traffic doesn't

				 *   require ip_forwarding. */

				if (((struct dst_entry *)rt)->dev == dev) {