net/hsr: Support iproute print_opt ('ip -details ...')
Subsystems (3)
PATCH 3/3 net/hsr: Support iproute print_opt ('ip -details ...')
This implements the rtnl_link_ops fill_info routine for HSR.
Signed-off-by Arvid Brodin <[email protected]>
--- include/uapi/linux/if_link.h | 4 +++- net/hsr/hsr_netlink.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-)
include/uapi/linux/if_link.h +3 -1
@@ -488,7 +488,9 @@ enum {IFLA_HSR_UNSPEC ,IFLA_HSR_SLAVE1 ,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, };
net/hsr/hsr_netlink.c +28 -0
@@ -23,6 +23,8 @@ static const struct nla_policy hsr_policy[IFLA_HSR_MAX + 1] = { [IFLA_HSR_SLAVE1] = { .type = NLA_U32 }, [IFLA_HSR_SLAVE2] = { .type = NLA_U32 }, [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,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 = { .kind ="hsr" , .maxtype =IFLA_HSR_MAX ,
@@ -66,6 +93,7 @@ static struct rtnl_link_ops hsr_link_ops __read_mostly = { .priv_size = sizeof(struct hsr_priv), .setup = hsr_dev_setup, .newlink = hsr_newlink, + .fill_info = hsr_fill_info, };
Signature · 7 lines
1.8.1.5 -- Arvid Brodin | Consultant (Linux) ALTEN | Knarrarnäsgatan 7 | SE-164 40 Kista | Sweden [email protected] | www.alten.se/en/