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

Commit 343d60aa authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

ipv6: change ipv6_stub_impl.ipv6_dst_lookup to take net argument 



This patch adds net argument to ipv6_stub_impl.ipv6_dst_lookup
for use cases where sk is not available (like mpls).
sk appears to be needed to get the namespace 'net' and is optional
otherwise. This patch series changes ipv6_stub_impl.ipv6_dst_lookup
to take net argument. sk remains optional.

All callers of ipv6_stub_impl.ipv6_dst_lookup have been modified
to pass net. I have modified them to use already available
'net' in the scope of the call. I can change them to
sock_net(sk) to avoid any unintended change in behaviour if sock
namespace is different. They dont seem to be from code inspection.

Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3aa45ce

drivers/net/vxlan.c

+1 −1
Original line number Diff line number Diff line
@@ -2034,7 +2034,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
		fl6.flowi6_mark = skb->mark;

		fl6.flowi6_proto = IPPROTO_UDP;



		if (ipv6_stub->ipv6_dst_lookup(sk, &ndst, &fl6)) {

		if (ipv6_stub->ipv6_dst_lookup(vxlan->net, sk, &ndst, &fl6)) {

			netdev_dbg(dev, "no route to %pI6\n",

				   &dst->sin6.sin6_addr);

			dev->stats.tx_carrier_errors++;

include/net/addrconf.h

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ struct ipv6_stub { 
				 const struct in6_addr *addr);

	int (*ipv6_sock_mc_drop)(struct sock *sk, int ifindex,

				 const struct in6_addr *addr);

	int (*ipv6_dst_lookup)(struct sock *sk, struct dst_entry **dst,

				struct flowi6 *fl6);

	int (*ipv6_dst_lookup)(struct net *net, struct sock *sk,

			       struct dst_entry **dst, struct flowi6 *fl6);

	void (*udpv6_encap_enable)(void);

	void (*ndisc_send_na)(struct net_device *dev, struct neighbour *neigh,

			      const struct in6_addr *daddr,

include/net/ipv6.h

+2 −1
Original line number Diff line number Diff line
@@ -813,7 +813,8 @@ static inline struct sk_buff *ip6_finish_skb(struct sock *sk) 
			      &inet6_sk(sk)->cork);

}



int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi6 *fl6);

int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst,

		   struct flowi6 *fl6);

struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,

				      const struct in6_addr *final_dst);

struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,

net/ipv6/addrconf_core.c

+10 −1
Original line number Diff line number Diff line
@@ -107,7 +107,16 @@ int inet6addr_notifier_call_chain(unsigned long val, void *v) 
}

EXPORT_SYMBOL(inet6addr_notifier_call_chain);



const struct ipv6_stub *ipv6_stub __read_mostly;

static int eafnosupport_ipv6_dst_lookup(struct net *net, struct sock *u1,

					struct dst_entry **u2,

					struct flowi6 *u3)

{

	return -EAFNOSUPPORT;

}



const struct ipv6_stub *ipv6_stub __read_mostly = &(struct ipv6_stub) {

	.ipv6_dst_lookup = eafnosupport_ipv6_dst_lookup,

};

EXPORT_SYMBOL_GPL(ipv6_stub);



/* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */

net/ipv6/icmp.c

+3 −3
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static struct dst_entry *icmpv6_route_lookup(struct net *net, 
	struct flowi6 fl2;

	int err;



	err = ip6_dst_lookup(sk, &dst, fl6);

	err = ip6_dst_lookup(net, sk, &dst, fl6);

	if (err)

		return ERR_PTR(err);
@@ -361,7 +361,7 @@ static struct dst_entry *icmpv6_route_lookup(struct net *net, 
	if (err)

		goto relookup_failed;



	err = ip6_dst_lookup(sk, &dst2, &fl2);

	err = ip6_dst_lookup(net, sk, &dst2, &fl2);

	if (err)

		goto relookup_failed;
@@ -591,7 +591,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
	else if (!fl6.flowi6_oif)

		fl6.flowi6_oif = np->ucast_oif;



	err = ip6_dst_lookup(sk, &dst, &fl6);

	err = ip6_dst_lookup(net, sk, &dst, &fl6);

	if (err)

		goto out;

	dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), sk, 0);