From: David Woodhouse <[email protected]> CONFIG_IPV6 depends on CONFIG_INET, so: - 'IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)' simplifies to just 'IS_ENABLED(CONFIG_IPV6)' - 'IS_ENABLED(CONFIG_INET) || IS_ENABLED(CONFIG_IPV6)' simplifies to just 'IS_ENABLED(CONFIG_INET)'
No functional change. Signed-off-by: David Woodhouse (Kiro) <[email protected]> --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 6 +++--- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 2 +- drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +- net/core/filter.c | 2 +- net/core/secure_seq.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c index a14f216048cd..889dc1785772 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -439,7 +439,7 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv, return err; } -#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) static int mlx5e_route_lookup_ipv6_get(struct mlx5e_priv *priv, struct net_device *dev, struct mlx5e_tc_tun_route_attr *attr) @@ -727,7 +727,7 @@ int mlx5e_tc_tun_route_lookup(struct mlx5e_priv *priv, attr.fl.fl4.daddr = esw_attr->rx_tun_attr->src_ip.v4; err = mlx5e_route_lookup_ipv4_get(priv, filter_dev, &attr); } -#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) else if (flow_attr->tun_ip_version == 6) { /* Addresses are swapped for decap */ attr.fl.fl6.saddr = esw_attr->rx_tun_attr->dst_ip.v6; @@ -762,7 +762,7 @@ int mlx5e_tc_tun_route_lookup(struct mlx5e_priv *priv, out: if (flow_attr->tun_ip_version == 4) mlx5e_route_lookup_ipv4_put(&attr); -#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) else if (flow_attr->tun_ip_version == 6) mlx5e_route_lookup_ipv6_put(&attr); #endif diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h index 6873c1201803..f3c0e2d0f388 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h @@ -73,7 +73,7 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv, struct net_device *mirred_dev, struct mlx5e_encap_entry *e); -#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, struct net_device *mirred_dev, struct mlx5e_encap_entry *e); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c index bfd401bee9e8..b2973e8a7df8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c @@ -104,7 +104,7 @@ int mlx5e_tc_set_attr_rx_tun(struct mlx5e_tc_flow *flow, if (!tun_attr->dst_ip.v4 || !tun_attr->src_ip.v4) return 0; } -#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) else if (ip_version == 6) { int ipv6_size = MLX5_FLD_SZ_BYTES(ipv6_layout, ipv6); diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c index 0cef0e2b85d0..5eb47e1a8d5e 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c @@ -814,7 +814,7 @@ void nfp_tunnel_request_route_v6(struct nfp_app *app, struct sk_buff *skb) flow.daddr = payload->ipv6_addr; flow.flowi6_proto = IPPROTO_UDP; -#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) dst = ipv6_stub->ipv6_dst_lookup_flow(dev_net(netdev), NULL, &flow, NULL); if (IS_ERR(dst)) diff --git a/net/core/filter.c b/net/core/filter.c index 78b548158fb0..ad71ceefcb5e 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6083,7 +6083,7 @@ static const struct bpf_func_proto bpf_skb_get_xfrm_state_proto = { }; #endif -#if IS_ENABLED(CONFIG_INET) || IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_INET) static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params, u32 mtu) { params->h_vlan_TCI = 0; diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c index 6a6f2cda5aae..4de049635db0 100644 --- a/net/core/secure_seq.c +++ b/net/core/secure_seq.c @@ -15,7 +15,7 @@ #include <linux/siphash.h> #include <net/secure_seq.h> -#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_INET) +#if IS_ENABLED(CONFIG_INET) #include <linux/in6.h> #include <net/tcp.h> -- 2.51.0
