nfp: flower: fix 'variable 'flow6' set but not used'
Subsystems (3)
PATCH 1/1 nfp: flower: fix 'variable 'flow6' set but not used'
From: Louis Peens <[email protected]>
Kernel test robot reported an issue after a recent patch about an unused variable when CONFIG_IPV6 is disabled. Move the variable declaration to be inside the #ifdef, and do a bit more cleanup. There is no need to use a temporary ipv6 bool value, it is just checked once, remove the extra variable and just do the check directly.
--- .../netronome/nfp/flower/tunnel_conf.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +7 -12
@@ -563,12 +563,9 @@ nfp_tun_neigh_event_handler(struct notifier_block *nb, unsigned long event, {struct nfp_flower_priv *app_priv;struct netevent_redirect *redir; -struct flowi4 flow4 = {}; -struct flowi6 flow6 = {};struct neighbour *n;struct nfp_app *app;bool neigh_invalid; -bool ipv6 = false;int err;switch (event) {
@@ -583,16 +580,8 @@ nfp_tun_neigh_event_handler(struct notifier_block *nb, unsigned long event,return NOTIFY_DONE ; } -if (n->tbl->family ==AF_INET6 ) - ipv6 = true; - neigh_invalid = !(n->nud_state &NUD_VALID ) || n->dead; -if (ipv6) - flow6.daddr = *(struct in6_addr *)n->primary_key; -else - flow4.daddr = *(__be32 *)n->primary_key; - app_priv = container_of(nb, struct nfp_flower_priv, tun.neigh_nb); app = app_priv->app;
@@ -601,8 +590,11 @@ nfp_tun_neigh_event_handler(struct notifier_block *nb, unsigned long event,return NOTIFY_DONE ;#if IS_ENABLED (CONFIG_INET ) -if (ipv6) { +if (n->tbl->family ==AF_INET6 ) {#if IS_ENABLED (CONFIG_IPV6 ) +struct flowi6 flow6 = {}; + + flow6.daddr = *(struct in6_addr *)n->primary_key;if (!neigh_invalid) {struct dst_entry *dst;/* Use ipv6_dst_lookup_flow to populate flow6->saddr
@@ -623,6 +615,9 @@ nfp_tun_neigh_event_handler(struct notifier_block *nb, unsigned long event,return NOTIFY_DONE ;#endif /* CONFIG_IPV6 */ }else { +struct flowi4 flow4 = {}; + + flow4.daddr = *(__be32 *)n->primary_key;if (!neigh_invalid) {struct rtable *rt;/* Use ip_route_output_key to populate flow4->saddr and
Signature · 1 line
2.30.2
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Tue, 10 May 2022 09:48:45 +0200 you wrote:
From: Louis Peens <[email protected]>
Kernel test robot reported an issue after a recent patch about an unused variable when
CONFIG_IPV6is disabled. Move the variable declaration to be inside the #ifdef, and do a bit more cleanup. There is no need to use a temporary ipv6 bool value, it is just checked once, remove the extra variable and just do the check directly.[...]
Here is the summary with links:
- [net-next] nfp: flower: fix 'variable 'flow6' set but not used'
https://git.kernel.org/netdev/net-next/c/61004d1d4bad
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html