Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3af3f21d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

ipv4/route: avoid unused-but-set-variable warning 



[ Upstream commit cf1b7201df59fb936f40f4a807433fe3f2ce310a ]

The log_martians variable is only used in an #ifdef, causing a 'make W=1'
warning with gcc:

net/ipv4/route.c: In function 'ip_rt_send_redirect':
net/ipv4/route.c:880:13: error: variable 'log_martians' set but not used [-Werror=unused-but-set-variable]

Change the #ifdef to an equivalent IS_ENABLED() to let the compiler
see where the variable is used.

Fixes: 30038fc6 ("net: ip_rt_send_redirect() optimization")
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240408074219.3030256-2-arnd@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e9f4cfe4

net/ipv4/route.c

+1 −3
Original line number Diff line number Diff line
@@ -945,13 +945,11 @@ void ip_rt_send_redirect(struct sk_buff *skb) 
		icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, gw);

		peer->rate_last = jiffies;

		++peer->n_redirects;

#ifdef CONFIG_IP_ROUTE_VERBOSE

		if (log_martians &&

		if (IS_ENABLED(CONFIG_IP_ROUTE_VERBOSE) && log_martians &&

		    peer->n_redirects == ip_rt_redirect_number)

			net_warn_ratelimited("host %pI4/if%d ignores redirects for %pI4 to %pI4\n",

					     &ip_hdr(skb)->saddr, inet_iif(skb),

					     &ip_hdr(skb)->daddr, &gw);

#endif

	}

out_put_peer:

	inet_putpeer(peer);