net: tcp_memcontrol: remove dead per-memcg count of allocated sockets

[linux-drm-fsl-dcu.git] / net / bridge / br_stp.c

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 5f3f6455317924e0e74281d23075d2af68d72d73..b3cca126b103d24ddaee0b13d7eb73f4e8617f3a 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -40,6 +40,7 @@ void br_log_state(const struct net_bridge_port *p)
 void br_set_state(struct net_bridge_port *p, unsigned int state)
 {
        struct switchdev_attr attr = {
+               .orig_dev = p->dev,
                .id = SWITCHDEV_ATTR_ID_PORT_STP_STATE,
                .flags = SWITCHDEV_F_DEFER,
                .u.stp_state = state,
@@ -570,6 +571,7 @@ int br_set_max_age(struct net_bridge *br, unsigned long val)
 int br_set_ageing_time(struct net_bridge *br, u32 ageing_time)
 {
        struct switchdev_attr attr = {
+               .orig_dev = br->dev,
                .id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,
                .flags = SWITCHDEV_F_SKIP_EOPNOTSUPP,
                .u.ageing_time = ageing_time,