Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index a0a54482aabc4fc8e9855f6d69ca24ac12e7d755..60136575aea45b19b75e120e014217b8d2a57ac4 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -1607,6 +1607,19 @@ static int br_fill_linkxstats(struct sk_buff *skb,
                br_multicast_get_stats(br, p, nla_data(nla));
        }
 #endif
+
+       if (p) {
+               nla = nla_reserve_64bit(skb, BRIDGE_XSTATS_STP,
+                                       sizeof(p->stp_xstats),
+                                       BRIDGE_XSTATS_PAD);
+               if (!nla)
+                       goto nla_put_failure;
+
+               spin_lock_bh(&br->lock);
+               memcpy(nla_data(nla), &p->stp_xstats, sizeof(p->stp_xstats));
+               spin_unlock_bh(&br->lock);
+       }
+
        nla_nest_end(skb, nest);
        *prividx = 0;