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

Commit 48ee3569 authored by David S. Miller's avatar David S. Miller
Browse files

ipv6: Move ipv6 twsk accessors outside of CONFIG_IPV6 ifdefs. 



Fixes build when ipv6 is disabled.

Reported-by: default avatarFengguang Wu <wfg@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4715213d

include/linux/ipv6.h

+16 −16
Original line number Diff line number Diff line
@@ -410,6 +410,22 @@ struct tcp6_sock { 


extern int inet6_sk_rebuild_header(struct sock *sk);



struct inet6_timewait_sock {

	struct in6_addr tw_v6_daddr;

	struct in6_addr	tw_v6_rcv_saddr;

};



struct tcp6_timewait_sock {

	struct tcp_timewait_sock   tcp6tw_tcp;

	struct inet6_timewait_sock tcp6tw_inet6;

};



static inline struct inet6_timewait_sock *inet6_twsk(const struct sock *sk)

{

	return (struct inet6_timewait_sock *)(((u8 *)sk) +

					      inet_twsk(sk)->tw_ipv6_offset);

}



#if IS_ENABLED(CONFIG_IPV6)

static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)

{
@@ -459,28 +475,12 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to, 
#define __ipv6_only_sock(sk)	(inet6_sk(sk)->ipv6only)

#define ipv6_only_sock(sk)	((sk)->sk_family == PF_INET6 && __ipv6_only_sock(sk))



struct inet6_timewait_sock {

	struct in6_addr tw_v6_daddr;

	struct in6_addr	tw_v6_rcv_saddr;

};



struct tcp6_timewait_sock {

	struct tcp_timewait_sock   tcp6tw_tcp;

	struct inet6_timewait_sock tcp6tw_inet6;

};



static inline u16 inet6_tw_offset(const struct proto *prot)

{

	return prot->twsk_prot->twsk_obj_size -

			sizeof(struct inet6_timewait_sock);

}



static inline struct inet6_timewait_sock *inet6_twsk(const struct sock *sk)

{

	return (struct inet6_timewait_sock *)(((u8 *)sk) +

					      inet_twsk(sk)->tw_ipv6_offset);

}



static inline struct in6_addr *__inet6_rcv_saddr(const struct sock *sk)

{

	return likely(sk->sk_state != TCP_TIME_WAIT) ?