rdma: Properly mark RDMAtool license

[mirror_iproute2.git] / ip / iplink_bridge.c

diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
index d3250980c68d41a9ae661b322d8452597e48d6fd..fbf8a79bfbbb6ec7009db1d9cb26e6059091acb3 100644 (file)
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@ -524,7 +524,7 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        if (tb[IFLA_BR_GROUP_FWD_MASK])
                print_0xhex(PRINT_ANY,
                            "group_fwd_mask",
-                           "group_fwd_mask %#x ",
+                           "group_fwd_mask %#llx ",
                            rta_getattr_u16(tb[IFLA_BR_GROUP_FWD_MASK]));
 
        if (tb[IFLA_BR_GROUP_ADDR]) {
@@ -757,8 +757,7 @@ static void bridge_print_stats_attr(FILE *f, struct rtattr *attr, int ifindex)
        }
 }
 
-int bridge_print_xstats(const struct sockaddr_nl *who,
-                       struct nlmsghdr *n, void *arg)
+int bridge_print_xstats(struct nlmsghdr *n, void *arg)
 {
        struct if_stats_msg *ifsm = NLMSG_DATA(n);
        struct rtattr *tb[IFLA_STATS_MAX+1];
@@ -792,12 +791,9 @@ int bridge_parse_xstats(struct link_util *lu, int argc, char **argv)
                        xstats_print_attr = BRIDGE_XSTATS_MCAST;
                } else if (strcmp(*argv, "dev") == 0) {
                        NEXT_ARG();
-                       filter_index = if_nametoindex(*argv);
-                       if (filter_index == 0) {
-                               fprintf(stderr, "Cannot find device \"%s\"\n",
-                                       *argv);
-                               return -1;
-                       }
+                       filter_index = ll_name_to_index(*argv);
+                       if (!filter_index)
+                               return nodev(*argv);
                } else if (strcmp(*argv, "help") == 0) {
                        bridge_print_xstats_help(lu, stdout);
                        exit(0);