iplink: bridge_slave: add support for displaying xstats

This patch adds support to the bridge_slave link type for displaying
xstats by reusing the previously added bridge xstats callbacks.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>

diff --git a/ip/ip_common.h b/ip/ip_common.h
index e046b57e92210e51e9d25c0b4454134d90736a8e..abb2b8d5d5370999a019e14fe292777054789b53 100644 (file)
--- a/ip/ip_common.h
+++ b/ip/ip_common.h
@@ -98,6 +98,9 @@ struct link_util {
 struct link_util *get_link_kind(const char *kind);
 
 void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf, size_t len);
+int bridge_parse_xstats(struct link_util *lu, int argc, char **argv);
+int bridge_print_xstats(const struct sockaddr_nl *who,
+                       struct nlmsghdr *n, void *arg);
 
 __u32 ipvrf_get_table(const char *name);
 int name_is_vrf(const char *name);

diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
index 62ceee6b571e050e7c924644dcf8dbb620bedcd5..818b43c89b5b96d284537deede7566c8b828c73a 100644 (file)
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@ -680,8 +680,8 @@ static void bridge_print_stats_attr(FILE *f, struct rtattr *attr, int ifindex)
        }
 }
 
-static int bridge_print_xstats(const struct sockaddr_nl *who,
-                              struct nlmsghdr *n, void *arg)
+int bridge_print_xstats(const struct sockaddr_nl *who,
+                       struct nlmsghdr *n, void *arg)
 {
        struct if_stats_msg *ifsm = NLMSG_DATA(n);
        struct rtattr *tb[IFLA_STATS_MAX+1];
@@ -708,7 +708,7 @@ static int bridge_print_xstats(const struct sockaddr_nl *who,
        return 0;
 }
 
-static int bridge_parse_xstats(struct link_util *lu, int argc, char **argv)
+int bridge_parse_xstats(struct link_util *lu, int argc, char **argv)
 {
        while (argc > 0) {
                if (strcmp(*argv, "igmp") == 0 || strcmp(*argv, "mcast") == 0) {

diff --git a/ip/iplink_bridge_slave.c b/ip/iplink_bridge_slave.c
index 6353fc533bf9f33ba67edf1ce49d8d8ab3cfed0e..3e883328ae0cc232e8f1910ecbc2af15129353b9 100644 (file)
--- a/ip/iplink_bridge_slave.c
+++ b/ip/iplink_bridge_slave.c
@@ -312,4 +312,6 @@ struct link_util bridge_slave_link_util = {
        .print_opt      = bridge_slave_print_opt,
        .parse_opt      = bridge_slave_parse_opt,
        .print_help     = bridge_slave_print_help,
+       .parse_ifla_xstats = bridge_parse_xstats,
+       .print_ifla_xstats = bridge_print_xstats,
 };