Commit 7d6850f7 authored by Alexey Kodanev's avatar Alexey Kodanev Committed by David S. Miller
Browse files

ipv6: add a wrapper for ip6_dst_store() with flowi6 checks 



Move commonly used pattern of ip6_dst_store() usage to a separate
function - ip6_sk_dst_store_flow(), which will check the addresses
for equality using the flow information, before saving them.

There is no functional changes in this patch. In addition, it will
be used in the next patch, in ip6_sk_dst_lookup_flow().

Signed-off-by: default avatarAlexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d3ad854

include/net/ip6_route.h

+3 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst, 
#endif

}



void ip6_sk_dst_store_flow(struct sock *sk, struct dst_entry *dst,

			   const struct flowi6 *fl6);



static inline bool ipv6_unicast_destination(const struct sk_buff *skb)

{

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

net/ipv6/datagram.c

+1 −8
Original line number Diff line number Diff line
@@ -106,14 +106,7 @@ int ip6_datagram_dst_update(struct sock *sk, bool fix_sk_saddr) 
		}

	}



	ip6_dst_store(sk, dst,

		      ipv6_addr_equal(&fl6.daddr, &sk->sk_v6_daddr) ?

		      &sk->sk_v6_daddr : NULL,

#ifdef CONFIG_IPV6_SUBTREES

		      ipv6_addr_equal(&fl6.saddr, &np->saddr) ?

		      &np->saddr :

#endif

		      NULL);

	ip6_sk_dst_store_flow(sk, dst, &fl6);



out:

	fl6_sock_release(flowlabel);

net/ipv6/route.c

+17 −0
Original line number Diff line number Diff line
@@ -2229,6 +2229,23 @@ void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu) 
}

EXPORT_SYMBOL_GPL(ip6_sk_update_pmtu);



void ip6_sk_dst_store_flow(struct sock *sk, struct dst_entry *dst,

			   const struct flowi6 *fl6)

{

#ifdef CONFIG_IPV6_SUBTREES

	struct ipv6_pinfo *np = inet6_sk(sk);

#endif



	ip6_dst_store(sk, dst,

		      ipv6_addr_equal(&fl6->daddr, &sk->sk_v6_daddr) ?

		      &sk->sk_v6_daddr : NULL,

#ifdef CONFIG_IPV6_SUBTREES

		      ipv6_addr_equal(&fl6->saddr, &np->saddr) ?

		      &np->saddr :

#endif

		      NULL);

}



/* Handle redirects */

struct ip6rd_flowi {

	struct flowi6 fl6;

CRA Git | Maintained and supported by SUSTech CRA and CCSE