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

Commit 5c98631c authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by David S. Miller
Browse files

net: ipv6: Introduce ip6_sk_dst_hoplimit. 



This replaces 6 identical code snippets with a call to a new
static inline function.

Signed-off-by: default avatarLorenzo Colitti <lorenzo@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a22adce5

include/net/addrconf.h

+0 −5
Original line number Diff line number Diff line
@@ -306,11 +306,6 @@ static inline void addrconf_addr_solict_mult(const struct in6_addr *addr, 
		      htonl(0xFF000000) | addr->s6_addr32[3]);

}



static inline bool ipv6_addr_is_multicast(const struct in6_addr *addr)

{

	return (addr->s6_addr32[0] & htonl(0xFF000000)) == htonl(0xFF000000);

}



static inline bool ipv6_addr_is_ll_all_nodes(const struct in6_addr *addr)

{

#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64

include/net/ipv6.h

+19 −0
Original line number Diff line number Diff line
@@ -583,6 +583,11 @@ static inline bool ipv6_addr_orchid(const struct in6_addr *a) 
	return (a->s6_addr32[0] & htonl(0xfffffff0)) == htonl(0x20010010);

}



static inline bool ipv6_addr_is_multicast(const struct in6_addr *addr)

{

	return (addr->s6_addr32[0] & htonl(0xFF000000)) == htonl(0xFF000000);

}



static inline void ipv6_addr_set_v4mapped(const __be32 addr,

					  struct in6_addr *v4mapped)

{
@@ -664,6 +669,20 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt); 


int ip6_dst_hoplimit(struct dst_entry *dst);



static inline int ip6_sk_dst_hoplimit(struct ipv6_pinfo *np, struct flowi6 *fl6,

				      struct dst_entry *dst)

{

	int hlimit;



	if (ipv6_addr_is_multicast(&fl6->daddr))

		hlimit = np->mcast_hops;

	else

		hlimit = np->hop_limit;

	if (hlimit < 0)

		hlimit = ip6_dst_hoplimit(dst);

	return hlimit;

}



/*

 *	Header manipulation

 */

net/ipv6/icmp.c

+2 −12
Original line number Diff line number Diff line
@@ -493,12 +493,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 
	if (IS_ERR(dst))

		goto out;



	if (ipv6_addr_is_multicast(&fl6.daddr))

		hlimit = np->mcast_hops;

	else

		hlimit = np->hop_limit;

	if (hlimit < 0)

		hlimit = ip6_dst_hoplimit(dst);

	hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);



	msg.skb = skb;

	msg.offset = skb_network_offset(skb);
@@ -593,12 +588,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
	if (IS_ERR(dst))

		goto out;



	if (ipv6_addr_is_multicast(&fl6.daddr))

		hlimit = np->mcast_hops;

	else

		hlimit = np->hop_limit;

	if (hlimit < 0)

		hlimit = ip6_dst_hoplimit(dst);

	hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);



	idev = __in6_dev_get(skb->dev);

net/ipv6/ip6_flowlabel.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <net/sock.h>



#include <net/ipv6.h>

#include <net/addrconf.h>

#include <net/rawv6.h>

#include <net/transp_v6.h>

net/ipv6/ping.c

+1 −6
Original line number Diff line number Diff line
@@ -168,12 +168,7 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
	pfh.wcheck = 0;

	pfh.family = AF_INET6;



	if (ipv6_addr_is_multicast(&fl6.daddr))

		hlimit = np->mcast_hops;

	else

		hlimit = np->hop_limit;

	if (hlimit < 0)

		hlimit = ip6_dst_hoplimit(dst);

	hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);



	lock_sock(sk);

	err = ip6_append_data(sk, ping_getfrag, &pfh, len,