Commit 42d59435 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ipv6-only-sock' 



Kuniyuki Iwashima says:

====================
ipv6: Use ipv6_only_sock helper function.

The first patch removes __ipv6_only_sock(), and the second replaces
ipv6only tests with ipv6_only_sock().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0844d36f 81ee0eb6

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

drivers/net/ethernet/netronome/nfp/crypto/tls.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

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