Commit 98bf8362 authored by Arvid Brodin's avatar Arvid Brodin Committed by David S. Miller

net/hsr: Support iproute print_opt ('ip -details ...')

This implements the rtnl_link_ops fill_info routine for HSR.
Signed-off-by: default avatarArvid Brodin <arvid.brodin@alten.se>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 213e3bc7
...@@ -488,7 +488,9 @@ enum { ...@@ -488,7 +488,9 @@ enum {
IFLA_HSR_UNSPEC, IFLA_HSR_UNSPEC,
IFLA_HSR_SLAVE1, IFLA_HSR_SLAVE1,
IFLA_HSR_SLAVE2, IFLA_HSR_SLAVE2,
IFLA_HSR_MULTICAST_SPEC, IFLA_HSR_MULTICAST_SPEC, /* Last byte of supervision addr */
IFLA_HSR_SUPERVISION_ADDR, /* Supervision frame multicast addr */
IFLA_HSR_SEQ_NR,
__IFLA_HSR_MAX, __IFLA_HSR_MAX,
}; };
......
...@@ -23,6 +23,8 @@ static const struct nla_policy hsr_policy[IFLA_HSR_MAX + 1] = { ...@@ -23,6 +23,8 @@ static const struct nla_policy hsr_policy[IFLA_HSR_MAX + 1] = {
[IFLA_HSR_SLAVE1] = { .type = NLA_U32 }, [IFLA_HSR_SLAVE1] = { .type = NLA_U32 },
[IFLA_HSR_SLAVE2] = { .type = NLA_U32 }, [IFLA_HSR_SLAVE2] = { .type = NLA_U32 },
[IFLA_HSR_MULTICAST_SPEC] = { .type = NLA_U8 }, [IFLA_HSR_MULTICAST_SPEC] = { .type = NLA_U8 },
[IFLA_HSR_SUPERVISION_ADDR] = { .type = NLA_BINARY, .len = ETH_ALEN },
[IFLA_HSR_SEQ_NR] = { .type = NLA_U16 },
}; };
...@@ -59,6 +61,31 @@ static int hsr_newlink(struct net *src_net, struct net_device *dev, ...@@ -59,6 +61,31 @@ static int hsr_newlink(struct net *src_net, struct net_device *dev,
return hsr_dev_finalize(dev, link, multicast_spec); return hsr_dev_finalize(dev, link, multicast_spec);
} }
static int hsr_fill_info(struct sk_buff *skb, const struct net_device *dev)
{
struct hsr_priv *hsr_priv;
hsr_priv = netdev_priv(dev);
if (hsr_priv->slave[0])
if (nla_put_u32(skb, IFLA_HSR_SLAVE1, hsr_priv->slave[0]->ifindex))
goto nla_put_failure;
if (hsr_priv->slave[1])
if (nla_put_u32(skb, IFLA_HSR_SLAVE2, hsr_priv->slave[1]->ifindex))
goto nla_put_failure;
if (nla_put(skb, IFLA_HSR_SUPERVISION_ADDR, ETH_ALEN,
hsr_priv->sup_multicast_addr) ||
nla_put_u16(skb, IFLA_HSR_SEQ_NR, hsr_priv->sequence_nr))
goto nla_put_failure;
return 0;
nla_put_failure:
return -EMSGSIZE;
}
static struct rtnl_link_ops hsr_link_ops __read_mostly = { static struct rtnl_link_ops hsr_link_ops __read_mostly = {
.kind = "hsr", .kind = "hsr",
.maxtype = IFLA_HSR_MAX, .maxtype = IFLA_HSR_MAX,
...@@ -66,6 +93,7 @@ static struct rtnl_link_ops hsr_link_ops __read_mostly = { ...@@ -66,6 +93,7 @@ static struct rtnl_link_ops hsr_link_ops __read_mostly = {
.priv_size = sizeof(struct hsr_priv), .priv_size = sizeof(struct hsr_priv),
.setup = hsr_dev_setup, .setup = hsr_dev_setup,
.newlink = hsr_newlink, .newlink = hsr_newlink,
.fill_info = hsr_fill_info,
}; };
......
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