ipv6: Use ipv6_only_sock() helper in condition.

This patch replaces some sk_ipv6only tests with ipv6_only_sock().

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/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 38e152548126101b1c7a8f85014c55fed4d88de0..c9e75a9de2821434b40067c7c24a58bf2cb647fb 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -5226,7 +5226,7 @@ static void bond_sk_to_flow(struct sock *sk, struct flow_keys *flow)
        switch (sk->sk_family) {
 #if IS_ENABLED(CONFIG_IPV6)
        case AF_INET6:
-               if (sk->sk_ipv6only ||
+               if (ipv6_only_sock(sk) ||
                    ipv6_addr_type(&sk->sk_v6_daddr) != IPV6_ADDR_MAPPED) {
                        flow->control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;
                        flow->addrs.v6addrs.src = inet6_sk(sk)->saddr;

diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
index 59683f79959ced63f03b02d6a5ac8d00d489b162..60b648b46f75c40979ec3210374410b61c22ed63 100644 (file)
--- a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
+++ b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
@@ -483,7 +483,7 @@ static int chcr_ktls_dev_add(struct net_device *netdev, struct sock *sk,
                tx_info->ip_family = AF_INET;
 #if IS_ENABLED(CONFIG_IPV6)
        } else {
-               if (!sk->sk_ipv6only &&
+               if (!ipv6_only_sock(sk) &&
                    ipv6_addr_type(&sk->sk_v6_daddr) == IPV6_ADDR_MAPPED) {
                        memcpy(daaddr, &sk->sk_daddr, 4);
                        tx_info->ip_family = AF_INET;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
index 4c4ee524176c7a931a898bf1b67a52cdb37d18aa..3ae6067c7e6b684f45c76340571cb8797cdd5119 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
@@ -102,7 +102,7 @@ struct mlx5_flow_handle *mlx5e_accel_fs_add_sk(struct mlx5e_priv *priv,
                break;
 #if IS_ENABLED(CONFIG_IPV6)
        case AF_INET6:
-               if (!sk->sk_ipv6only &&
+               if (!ipv6_only_sock(sk) &&
                    ipv6_addr_type(&sk->sk_v6_daddr) == IPV6_ADDR_MAPPED) {
                        accel_fs_tcp_set_ipv4_flow(spec, sk);
                        ft = &fs_tcp->tables[ACCEL_FS_IPV4_TCP];

diff --git a/drivers/net/ethernet/netronome/nfp/crypto/tls.c b/drivers/net/ethernet/netronome/nfp/crypto/tls.c
index 84d66d138c3d1a1bf8f945cbceda02e9f1f7a9be..78368e71ce836e90972f0fe503a9ff51e10ada67 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/crypto/tls.c
+++ b/drivers/net/ethernet/netronome/nfp/crypto/tls.c
@@ -289,7 +289,7 @@ nfp_net_tls_add(struct net_device *netdev, struct sock *sk,
        switch (sk->sk_family) {
 #if IS_ENABLED(CONFIG_IPV6)
        case AF_INET6:
-               if (sk->sk_ipv6only ||
+               if (ipv6_only_sock(sk) ||
                    ipv6_addr_type(&sk->sk_v6_daddr) != IPV6_ADDR_MAPPED) {
                        req_sz = sizeof(struct nfp_crypto_req_add_v6);
                        ipv6 = true;

diff --git a/net/core/filter.c b/net/core/filter.c
index 143f442a950523ff1c831d2f27e71deb2d961815..2ed81c48c282e6ea0b85a09afb05e8f838840687 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -7099,7 +7099,7 @@ BPF_CALL_5(bpf_tcp_gen_syncookie, struct sock *, sk, void *, iph, u32, iph_len,
         */
        switch (((struct iphdr *)iph)->version) {
        case 4:
-               if (sk->sk_family == AF_INET6 && sk->sk_ipv6only)
+               if (sk->sk_family == AF_INET6 && ipv6_only_sock(sk))
                        return -EINVAL;
 
                mss = tcp_v4_get_syncookie(sk, iph, th, &cookie);

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 6595a78672c800e970a85e6968e71fef62dd834f..70564ddccc4677d0e091ef6ae747b001be4bd1aa 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -318,7 +318,7 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
                /* Binding to v4-mapped address on a v6-only socket
                 * makes no sense
                 */
-               if (sk->sk_ipv6only) {
+               if (ipv6_only_sock(sk)) {
                        err = -EINVAL;
                        goto out;
                }