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

Commit 25de4668 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

ipv6: move INET6_MATCH() to include/net/inet6_hashtables.h 



It is only used in net/ipv6/inet6_hashtables.c.

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51f3d02b

include/linux/ipv6.h

+0 −10
Original line number Diff line number Diff line
@@ -317,14 +317,4 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk) 
#define tcp_twsk_ipv6only(__sk)		0

#define inet_v6_ipv6only(__sk)		0

#endif /* IS_ENABLED(CONFIG_IPV6) */



#define INET6_MATCH(__sk, __net, __saddr, __daddr, __ports, __dif)	\

	(((__sk)->sk_portpair == (__ports))			&&	\

	 ((__sk)->sk_family == AF_INET6)			&&	\

	 ipv6_addr_equal(&(__sk)->sk_v6_daddr, (__saddr))		&&	\

	 ipv6_addr_equal(&(__sk)->sk_v6_rcv_saddr, (__daddr))	&&	\

	 (!(__sk)->sk_bound_dev_if	||				\

	   ((__sk)->sk_bound_dev_if == (__dif))) 		&&	\

	 net_eq(sock_net(__sk), (__net)))



#endif /* _IPV6_H */

include/net/inet6_hashtables.h

+10 −0
Original line number Diff line number Diff line
@@ -99,4 +99,14 @@ struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo, 
			  const struct in6_addr *daddr, const __be16 dport,

			  const int dif);

#endif /* IS_ENABLED(CONFIG_IPV6) */



#define INET6_MATCH(__sk, __net, __saddr, __daddr, __ports, __dif)	\

	(((__sk)->sk_portpair == (__ports))			&&	\

	 ((__sk)->sk_family == AF_INET6)			&&	\

	 ipv6_addr_equal(&(__sk)->sk_v6_daddr, (__saddr))		&&	\

	 ipv6_addr_equal(&(__sk)->sk_v6_rcv_saddr, (__daddr))	&&	\

	 (!(__sk)->sk_bound_dev_if	||				\

	   ((__sk)->sk_bound_dev_if == (__dif))) 		&&	\

	 net_eq(sock_net(__sk), (__net)))



#endif /* _INET6_HASHTABLES_H */