Commit 9380d891 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'in6addr_any-cleanups' 

Kuniyuki Iwashima says:

====================
ipv6: Random cleanup for in6addr_any.

The first patch removes in6addr_any alternatives and the second
removes redundant initialisation of a local variable.

Changes:
  v2: Use ipv6_addr_any() in patch 1. (David Ahern)

  v1: https://lore.kernel.org/netdev/20230322012204.33157-1-kuniyu@amazon.com/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5a8c8b72 be689c71

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c

+2 −3
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ int mlx5e_tc_set_attr_rx_tun(struct mlx5e_tc_flow *flow, 
#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)

	else if (ip_version == 6) {

		int ipv6_size = MLX5_FLD_SZ_BYTES(ipv6_layout, ipv6);

		struct in6_addr zerov6 = {};



		daddr = MLX5_ADDR_OF(fte_match_param, spec->match_value,

				     outer_headers.dst_ipv4_dst_ipv6.ipv6_layout.ipv6);
@@ -106,8 +105,8 @@ int mlx5e_tc_set_attr_rx_tun(struct mlx5e_tc_flow *flow, 
				     outer_headers.src_ipv4_src_ipv6.ipv6_layout.ipv6);

		memcpy(&tun_attr->dst_ip.v6, daddr, ipv6_size);

		memcpy(&tun_attr->src_ip.v6, saddr, ipv6_size);

		if (!memcmp(&tun_attr->dst_ip.v6, &zerov6, sizeof(zerov6)) ||

		    !memcmp(&tun_attr->src_ip.v6, &zerov6, sizeof(zerov6)))

		if (ipv6_addr_any(&tun_attr->dst_ip.v6) ||

		    ipv6_addr_any(&tun_attr->src_ip.v6))

			return 0;

	}

#endif

include/net/ip6_fib.h

+3 −6
Original line number Diff line number Diff line
@@ -469,13 +469,10 @@ void rt6_get_prefsrc(const struct rt6_info *rt, struct in6_addr *addr) 
	rcu_read_lock();



	from = rcu_dereference(rt->from);

	if (from) {

	if (from)

		*addr = from->fib6_prefsrc.addr;

	} else {

		struct in6_addr in6_zero = {};



		*addr = in6_zero;

	}

	else

		*addr = in6addr_any;



	rcu_read_unlock();

}

include/trace/events/fib.h

+2 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ TRACE_EVENT(fib_table_lookup, 
	),



	TP_fast_assign(

		struct in6_addr in6_zero = {};

		struct net_device *dev;

		struct in6_addr *in6;

		__be32 *p32;
@@ -74,7 +73,7 @@ TRACE_EVENT(fib_table_lookup, 
				*p32 = nhc->nhc_gw.ipv4;



				in6 = (struct in6_addr *)__entry->gw6;

				*in6 = in6_zero;

				*in6 = in6addr_any;

			} else if (nhc->nhc_gw_family == AF_INET6) {

				p32 = (__be32 *) __entry->gw4;

				*p32 = 0;
@@ -87,7 +86,7 @@ TRACE_EVENT(fib_table_lookup, 
			*p32 = 0;



			in6 = (struct in6_addr *)__entry->gw6;

			*in6 = in6_zero;

			*in6 = in6addr_any;

		}

	),

include/trace/events/fib6.h

+1 −4
Original line number Diff line number Diff line
@@ -68,11 +68,8 @@ TRACE_EVENT(fib6_table_lookup, 
			strcpy(__entry->name, "-");

		}

		if (res->f6i == net->ipv6.fib6_null_entry) {

			struct in6_addr in6_zero = {};



			in6 = (struct in6_addr *)__entry->gw;

			*in6 = in6_zero;



			*in6 = in6addr_any;

		} else if (res->nh) {

			in6 = (struct in6_addr *)__entry->gw;

			*in6 = res->nh->fib_nh_gw6;

net/6lowpan/iphc.c

+1 −1
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ static u8 lowpan_compress_ctx_addr(u8 **hc_ptr, const struct net_device *dev, 
				   const struct lowpan_iphc_ctx *ctx,

				   const unsigned char *lladdr, bool sam)

{

	struct in6_addr tmp = {};

	struct in6_addr tmp;

	u8 dam;



	switch (lowpan_dev(dev)->lltype) {