diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-10-08 00:24:06 +0200 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-10-08 00:24:06 +0200 |
commit | 9fe1155233c8290ca6e206053e531ef87f9026ea (patch) | |
tree | ef0d45b2562e01beb8ce4cb4cd016155b4e32a65 /net/bridge | |
parent | ethernet: ti: cpts: Use devm_kcalloc() instead of devm_kzalloc() (diff) | |
parent | Merge tag 'nfsd-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/... (diff) | |
download | linux-9fe1155233c8290ca6e206053e531ef87f9026ea.tar.xz linux-9fe1155233c8290ca6e206053e531ef87f9026ea.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_netlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 6c58fc14d2cb..5c6c4305ed23 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -1666,7 +1666,8 @@ static size_t br_get_linkxstats_size(const struct net_device *dev, int attr) } return numvls * nla_total_size(sizeof(struct bridge_vlan_xstats)) + - nla_total_size(sizeof(struct br_mcast_stats)) + + nla_total_size_64bit(sizeof(struct br_mcast_stats)) + + (p ? nla_total_size_64bit(sizeof(p->stp_xstats)) : 0) + nla_total_size(0); } |