Commit 4fc4871f authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller

bridge: mrp: Extend br_mrp_fill_info

This patch extends the function br_mrp_fill_info to return also the
status for the interconnect ring.
Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 559139cb
...@@ -474,6 +474,11 @@ int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br) ...@@ -474,6 +474,11 @@ int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br)
p->dev->ifindex)) p->dev->ifindex))
goto nla_put_failure; goto nla_put_failure;
p = rcu_dereference(mrp->i_port);
if (p && nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_I_IFINDEX,
p->dev->ifindex))
goto nla_put_failure;
if (nla_put_u16(skb, IFLA_BRIDGE_MRP_INFO_PRIO, if (nla_put_u16(skb, IFLA_BRIDGE_MRP_INFO_PRIO,
mrp->prio)) mrp->prio))
goto nla_put_failure; goto nla_put_failure;
...@@ -493,6 +498,19 @@ int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br) ...@@ -493,6 +498,19 @@ int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br)
mrp->test_monitor)) mrp->test_monitor))
goto nla_put_failure; goto nla_put_failure;
if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_STATE,
mrp->in_state))
goto nla_put_failure;
if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_ROLE,
mrp->in_role))
goto nla_put_failure;
if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_TEST_INTERVAL,
mrp->in_test_interval))
goto nla_put_failure;
if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_TEST_MAX_MISS,
mrp->in_test_max_miss))
goto nla_put_failure;
nla_nest_end(skb, tb); nla_nest_end(skb, tb);
} }
nla_nest_end(skb, mrp_tb); nla_nest_end(skb, mrp_tb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment