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

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

ipv6: Remove external dependency on rt6i_dst and rt6i_src 



This patch removes the assumptions that the returned rt is always
a RTF_CACHE entry with the rt6i_dst and rt6i_src containing the
destination and source address.  The dst and src can be recovered from
the calling site.

We may consider to rename (rt6i_dst, rt6i_src) to
(rt6i_key_dst, rt6i_key_src) later.

Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Reviewed-by: default avatarHannes 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 286c2349

drivers/scsi/cxgbi/libcxgbi.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static struct cxgbi_sock *cxgbi_check_route6(struct sockaddr *dst_addr) 
	}

	ndev = n->dev;



	if (ipv6_addr_is_multicast(&rt->rt6i_dst.addr)) {

	if (ipv6_addr_is_multicast(&daddr6->sin6_addr)) {

		pr_info("multi-cast route %pI6 port %u, dev %s.\n",

			daddr6->sin6_addr.s6_addr,

			ntohs(daddr6->sin6_port), ndev->name);

include/net/ipv6.h

+3 −1
Original line number Diff line number Diff line
@@ -671,7 +671,9 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_add 
	return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr));

}



u32 ipv6_select_ident(struct net *net, struct rt6_info *rt);

u32 ipv6_select_ident(struct net *net,

		      const struct in6_addr *daddr,

		      const struct in6_addr *saddr);

void ipv6_proxy_select_ident(struct net *net, struct sk_buff *skb);



int ip6_dst_hoplimit(struct dst_entry *dst);

net/ipv6/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static bool icmpv6_xrlim_allow(struct sock *sk, u8 type, 
			struct inet_peer *peer;



			peer = inet_getpeer_v6(net->ipv6.peers,

					       &rt->rt6i_dst.addr, 1);

					       &fl6->daddr, 1);

			res = inet_peer_xrlim_allow(peer, tmo);

			if (peer)

				inet_putpeer(peer);

net/ipv6/ip6_output.c

+8 −5
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ int ip6_forward(struct sk_buff *skb) 
		else

			target = &hdr->daddr;



		peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1);

		peer = inet_getpeer_v6(net->ipv6.peers, &hdr->daddr, 1);



		/* Limit redirects both by destination (here)

		   and by source (inside ndisc_send_redirect)
@@ -584,7 +584,8 @@ int ip6_fragment(struct sock *sk, struct sk_buff *skb, 
	}

	mtu -= hlen + sizeof(struct frag_hdr);



	frag_id = ipv6_select_ident(net, rt);

	frag_id = ipv6_select_ident(net, &ipv6_hdr(skb)->daddr,

				    &ipv6_hdr(skb)->saddr);



	if (skb_has_frag_list(skb)) {

		int first_len = skb_pagelen(skb);
@@ -1057,7 +1058,7 @@ static inline int ip6_ufo_append_data(struct sock *sk, 
			int odd, struct sk_buff *skb),

			void *from, int length, int hh_len, int fragheaderlen,

			int transhdrlen, int mtu, unsigned int flags,

			struct rt6_info *rt)

			const struct flowi6 *fl6)



{

	struct sk_buff *skb;
@@ -1102,7 +1103,9 @@ static inline int ip6_ufo_append_data(struct sock *sk, 
	skb_shinfo(skb)->gso_size = (mtu - fragheaderlen -

				     sizeof(struct frag_hdr)) & ~7;

	skb_shinfo(skb)->gso_type = SKB_GSO_UDP;

	skb_shinfo(skb)->ip6_frag_id = ipv6_select_ident(sock_net(sk), rt);

	skb_shinfo(skb)->ip6_frag_id = ipv6_select_ident(sock_net(sk),

							 &fl6->daddr,

							 &fl6->saddr);



append:

	return skb_append_datato_frags(sk, skb, getfrag, from,
@@ -1327,7 +1330,7 @@ emsgsize: 
	    (sk->sk_type == SOCK_DGRAM)) {

		err = ip6_ufo_append_data(sk, queue, getfrag, from, length,

					  hh_len, fragheaderlen,

					  transhdrlen, mtu, flags, rt);

					  transhdrlen, mtu, flags, fl6);

		if (err)

			goto error;

		return 0;

net/ipv6/ndisc.c

+1 −1
Original line number Diff line number Diff line
@@ -1506,7 +1506,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) 
			  "Redirect: destination is not a neighbour\n");

		goto release;

	}

	peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1);

	peer = inet_getpeer_v6(net->ipv6.peers, &ipv6_hdr(skb)->saddr, 1);

	ret = inet_peer_xrlim_allow(peer, 1*HZ);

	if (peer)

		inet_putpeer(peer);