]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ipv4: nexthop: avoid duplicate NHA_HW_STATS_ENABLE on nexthop group dump
authorFernando Fernandez Mancera <fmancera@suse.de>
Thu, 2 Apr 2026 07:26:12 +0000 (09:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Apr 2026 11:30:37 +0000 (13:30 +0200)
[ Upstream commit 06aaf04ca815f7a1f17762fd847b7bc14b8833fb ]

Currently NHA_HW_STATS_ENABLE is included twice everytime a dump of
nexthop group is performed with NHA_OP_FLAG_DUMP_STATS. As all the stats
querying were moved to nla_put_nh_group_stats(), leave only that
instance of the attribute querying.

Fixes: 5072ae00aea4 ("net: nexthop: Expose nexthop group HW stats to user space")
Signed-off-by: Fernando Fernandez Mancera <fmancera@suse.de>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20260402072613.25262-1-fmancera@suse.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/ipv4/nexthop.c

index 427c2011759490ff943a2d838b13e4a2d7c6ea64..aa53a74ac2389e166a887cfe3623ff1d1a619535 100644 (file)
@@ -905,8 +905,7 @@ static int nla_put_nh_group(struct sk_buff *skb, struct nexthop *nh,
                goto nla_put_failure;
 
        if (op_flags & NHA_OP_FLAG_DUMP_STATS &&
-           (nla_put_u32(skb, NHA_HW_STATS_ENABLE, nhg->hw_stats) ||
-            nla_put_nh_group_stats(skb, nh, op_flags)))
+           nla_put_nh_group_stats(skb, nh, op_flags))
                goto nla_put_failure;
 
        return 0;