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

Commit 7576012e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mpls-build-fix' 



Roopa Prabhu says:

====================
af_mpls: fix undefined reference to ip6_route_output with CONFIG_IPV6=n

This patch series uses ipv6_stub_impl.ipv6_dst_lookup instead of
ip6_route_output. Follows the vxlan drivers usage of
ipv6_stub_impl.ipv6_dst_lookup.

There is no sk in the af_mpls context from where
ipv6_stub_impl.ipv6_dst_lookup is used. 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.

v1 - v2: use IS_BUILTIN

v2 - v3: Use new Kconfig option that depends on (IPV6 || IPV6=n) as
	 suggested by Dave. Also uses IS_ERR as suggested by Thomas.

v3 - v4: Include missed case of (MPLS_ROUTING=y && IPV6=m) reported by
         Dave.

v4 - v5: Use ipv6_stub_impl.ipv6_dst_lookup as suggested by Hannes

v5 - v6: protect against null ipv6_stub by statically declaring
	 a ipv6_dst_lookup NOP func
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d3aa45ce bf21563a

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);