Commit 89e9c728 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller
Browse files

ipv6: Remove __ipv6_only_sock(). 



Since commit 9fe516ba ("inet: move ipv6only in sock_common"),
ipv6_only_sock() and __ipv6_only_sock() are the same macro.  Let's
remove the one.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.co.jp>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0844d36f

include/linux/ipv6.h

+1 −3
Original line number Diff line number Diff line
@@ -340,8 +340,7 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk) 
	return (struct raw6_sock *)sk;

}



#define __ipv6_only_sock(sk)	(sk->sk_ipv6only)

#define ipv6_only_sock(sk)	(__ipv6_only_sock(sk))

#define ipv6_only_sock(sk)	(sk->sk_ipv6only)

#define ipv6_sk_rxinfo(sk)	((sk)->sk_family == PF_INET6 && \

				 inet6_sk(sk)->rxopt.bits.rxinfo)
@@ -358,7 +357,6 @@ static inline int inet_v6_ipv6only(const struct sock *sk) 
	return ipv6_only_sock(sk);

}

#else

#define __ipv6_only_sock(sk)	0

#define ipv6_only_sock(sk)	0

#define ipv6_sk_rxinfo(sk)	0

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 


		SOCK_DEBUG(sk, "connect: ipv4 mapped\n");



		if (__ipv6_only_sock(sk))

		if (ipv6_only_sock(sk))

			return -ENETUNREACH;



		sin.sin_family = AF_INET;

net/ipv6/datagram.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, 
	int			err;



	if (usin->sin6_family == AF_INET) {

		if (__ipv6_only_sock(sk))

		if (ipv6_only_sock(sk))

			return -EAFNOSUPPORT;

		err = __ip4_datagram_connect(sk, uaddr, addr_len);

		goto ipv4_connected;
@@ -178,7 +178,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, 
	if (addr_type & IPV6_ADDR_MAPPED) {

		struct sockaddr_in sin;



		if (__ipv6_only_sock(sk)) {

		if (ipv6_only_sock(sk)) {

			err = -ENETUNREACH;

			goto out;

		}

net/ipv6/tcp_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
		u32 exthdrlen = icsk->icsk_ext_hdr_len;

		struct sockaddr_in sin;



		if (__ipv6_only_sock(sk))

		if (ipv6_only_sock(sk))

			return -ENETUNREACH;



		sin.sin_family = AF_INET;

net/ipv6/udp.c

+2 −2
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr, 
	 * bytes that are out of the bound specified by user in addr_len.

	 */

	if (uaddr->sa_family == AF_INET) {

		if (__ipv6_only_sock(sk))

		if (ipv6_only_sock(sk))

			return -EAFNOSUPPORT;

		return udp_pre_connect(sk, uaddr, addr_len);

	}
@@ -1359,7 +1359,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
			msg->msg_name = &sin;

			msg->msg_namelen = sizeof(sin);

do_udp_sendmsg:

			if (__ipv6_only_sock(sk))

			if (ipv6_only_sock(sk))

				return -ENETUNREACH;

			return udp_sendmsg(sk, msg, len);

		}