net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS

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

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 1f1410f8d312a3c9efde755f7997f33fbbc874e5..6856a6d9282b830fce00cce256d671c17c08638f 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -45,6 +45,17 @@ void br_set_state(struct net_bridge_port *p, unsigned int state)
                br_info(p->br, "port %u(%s) entered %s state\n",
                                (unsigned int) p->port_no, p->dev->name,
                                br_port_state_names[p->state]);
+
+       if (p->br->stp_enabled == BR_KERNEL_STP) {
+               switch (p->state) {
+               case BR_STATE_BLOCKING:
+                       p->stp_xstats.transition_blk++;
+                       break;
+               case BR_STATE_FORWARDING:
+                       p->stp_xstats.transition_fwd++;
+                       break;
+               }
+       }
 }
 
 /* called under bridge lock */
@@ -484,6 +495,8 @@ void br_received_config_bpdu(struct net_bridge_port *p,
        struct net_bridge *br;
        int was_root;
 
+       p->stp_xstats.rx_bpdu++;
+
        br = p->br;
        was_root = br_is_root_bridge(br);
 
@@ -517,6 +530,8 @@ void br_received_config_bpdu(struct net_bridge_port *p,
 /* called under bridge lock */
 void br_received_tcn_bpdu(struct net_bridge_port *p)
 {
+       p->stp_xstats.rx_tcn++;
+
        if (br_is_designated_port(p)) {
                br_info(p->br, "port %u(%s) received tcn bpdu\n",
                        (unsigned int) p->port_no, p->dev->name);