ipv6: Remove __ipv6_only_sock().

Since commit 9fe516ba3fb2 ("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: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 918bfea4ef5f495e16bda92e047e5179a9b023f5..ec5ca392eaa31e83a022b1124fae6b607ba168cd 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -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
 

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index eab3bd1ee9a0a0064c04ff97fd8363e60daa0079..4d95b6400915db56e1058099e6d7015d2d64647e 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -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;

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 206f66310a88d1d4e792dadc8e11553781fb6564..39b2327edc4e993d5a74a03eae8986a9152dea2b 100644 (file)
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -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;
                }

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 782df529ff69e0b2fc5f9d12fc72538b7041a392..54277de7474b78f1fea033b7978acebc0647f3ad 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -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;

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index db9449b52dbe5dfca292b6d2335f91c2a4ecea4d..688af6f809fe79355f4aaded01109480344f0d65 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -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);
                }

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 470dbdc27d584a6ce99691a879891359c85619f6..d081858c2d073ff3458dbd4d0a485d7df96ec3f8 100644 (file)
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -926,7 +926,7 @@ static int sctp_inet6_af_supported(sa_family_t family, struct sctp_sock *sp)
                return 1;
        /* v4-mapped-v6 addresses */
        case AF_INET:
-               if (!__ipv6_only_sock(sctp_opt2sk(sp)))
+               if (!ipv6_only_sock(sctp_opt2sk(sp)))
                        return 1;
                fallthrough;
        default:
@@ -952,7 +952,7 @@ static int sctp_inet6_cmp_addr(const union sctp_addr *addr1,
                return 0;
 
        /* If the socket is IPv6 only, v4 addrs will not match */
-       if (__ipv6_only_sock(sk) && af1 != af2)
+       if (ipv6_only_sock(sk) && af1 != af2)
                return 0;
 
        /* Today, wildcard AF_INET/AF_INET6. */