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

Commit 2647a9b0 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by David S. Miller
Browse files

ipv6: Remove external dependency on rt6i_gateway and RTF_ANYCAST 



When creating a RTF_CACHE route, RTF_ANYCAST is set based on rt6i_dst.
Also, rt6i_gateway is always set to the nexthop while the nexthop
could be a gateway or the rt6i_dst.addr.

After removing the rt6i_dst and rt6i_src dependency in the last patch,
we also need to stop the caller from depending on rt6i_gateway and
RTF_ANYCAST.

Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Julian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd0273d7

include/net/ip6_route.h

+14 −5
Original line number Diff line number Diff line
@@ -163,11 +163,14 @@ static inline bool ipv6_unicast_destination(const struct sk_buff *skb) 
	return rt->rt6i_flags & RTF_LOCAL;

}



static inline bool ipv6_anycast_destination(const struct sk_buff *skb)

static inline bool ipv6_anycast_destination(const struct dst_entry *dst,

					    const struct in6_addr *daddr)

{

	struct rt6_info *rt = (struct rt6_info *) skb_dst(skb);

	struct rt6_info *rt = (struct rt6_info *)dst;



	return rt->rt6i_flags & RTF_ANYCAST;

	return rt->rt6i_flags & RTF_ANYCAST ||

		(rt->rt6i_dst.plen != 128 &&

		 ipv6_addr_equal(&rt->rt6i_dst.addr, daddr));

}



int ip6_fragment(struct sock *sk, struct sk_buff *skb,
@@ -194,9 +197,15 @@ static inline bool ip6_sk_ignore_df(const struct sock *sk) 
	       inet6_sk(sk)->pmtudisc == IPV6_PMTUDISC_OMIT;

}



static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt)

static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt,

					   struct in6_addr *daddr)

{

	if (rt->rt6i_flags & RTF_GATEWAY)

		return &rt->rt6i_gateway;

	else if (rt->rt6i_flags & RTF_CACHE)

		return &rt->rt6i_dst.addr;

	else

		return daddr;

}



#endif

net/bluetooth/6lowpan.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_dev *dev, 
		if (ipv6_addr_any(nexthop))

			return NULL;

	} else {

		nexthop = rt6_nexthop(rt);

		nexthop = rt6_nexthop(rt, daddr);



		/* We need to remember the address because it is needed

		 * by bt_xmit() when sending the packet. In bt_xmit(), the

net/ipv6/icmp.c

+2 −2
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static struct dst_entry *icmpv6_route_lookup(struct net *net, 
	 * We won't send icmp if the destination is known

	 * anycast.

	 */

	if (((struct rt6_info *)dst)->rt6i_flags & RTF_ANYCAST) {

	if (ipv6_anycast_destination(dst, &fl6->daddr)) {

		net_dbg_ratelimited("icmp6_send: acast source\n");

		dst_release(dst);

		return ERR_PTR(-EINVAL);
@@ -564,7 +564,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 


	if (!ipv6_unicast_destination(skb) &&

	    !(net->ipv6.sysctl.anycast_src_echo_reply &&

	      ipv6_anycast_destination(skb)))

	      ipv6_anycast_destination(skb_dst(skb), saddr)))

		saddr = NULL;



	memcpy(&tmp_hdr, icmph, sizeof(tmp_hdr));

net/ipv6/ip6_output.c

+3 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int ip6_finish_output2(struct sock *sk, struct sk_buff *skb) 
	}



	rcu_read_lock_bh();

	nexthop = rt6_nexthop((struct rt6_info *)dst);

	nexthop = rt6_nexthop((struct rt6_info *)dst, &ipv6_hdr(skb)->daddr);

	neigh = __ipv6_neigh_lookup_noref(dst->dev, nexthop);

	if (unlikely(!neigh))

		neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false);
@@ -934,7 +934,8 @@ static int ip6_dst_lookup_tail(struct sock *sk, 
	 */

	rt = (struct rt6_info *) *dst;

	rcu_read_lock_bh();

	n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt));

	n = __ipv6_neigh_lookup_noref(rt->dst.dev,

				      rt6_nexthop(rt, &fl6->daddr));

	err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0;

	rcu_read_unlock_bh();

net/ipv6/route.c

+1 −5
Original line number Diff line number Diff line
@@ -1945,11 +1945,7 @@ static struct rt6_info *ip6_rt_copy(struct rt6_info *ort, 
		if (rt->rt6i_idev)

			in6_dev_hold(rt->rt6i_idev);

		rt->dst.lastuse = jiffies;



		if (ort->rt6i_flags & RTF_GATEWAY)

		rt->rt6i_gateway = ort->rt6i_gateway;

		else

			rt->rt6i_gateway = *dest;

		rt->rt6i_flags = ort->rt6i_flags;

		rt6_set_from(rt, ort);

		rt->rt6i_metric = 0;