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

Commit 3aef934f authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv6: constify ip6_dst_lookup_{flow|tail}() sock arguments 



ip6_dst_lookup_flow() and ip6_dst_lookup_tail() do not touch
socket, lets add a const qualifier.

This will permit the same change in inet6_csk_route_req()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5895bc6

include/net/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static inline struct sk_buff *ip6_finish_skb(struct sock *sk) 


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,

struct dst_entry *ip6_dst_lookup_flow(const 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,

					 const struct in6_addr *final_dst);

net/ipv6/ip6_output.c

+2 −2
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk, 
	return dst;

}



static int ip6_dst_lookup_tail(struct net *net, struct sock *sk,

static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,

			       struct dst_entry **dst, struct flowi6 *fl6)

{

#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
@@ -1014,7 +1014,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup); 
 *	It returns a valid dst pointer on success, or a pointer encoded

 *	error code.

 */

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

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

				      const struct in6_addr *final_dst)

{

	struct dst_entry *dst = NULL;