diff --git a/devlink/devlink.c b/devlink/devlink.c index e2e04136..68bdf397 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -634,35 +634,6 @@ static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl, return 0; } -static bool dl_dump_filter(struct dl *dl, struct nlattr **tb) -{ - struct dl_opts *opts = &dl->opts; - struct nlattr *attr_bus_name = tb[DEVLINK_ATTR_BUS_NAME]; - struct nlattr *attr_dev_name = tb[DEVLINK_ATTR_DEV_NAME]; - struct nlattr *attr_port_index = tb[DEVLINK_ATTR_PORT_INDEX]; - - if (opts->present & DL_OPT_HANDLE && - attr_bus_name && attr_dev_name) { - const char *bus_name = mnl_attr_get_str(attr_bus_name); - const char *dev_name = mnl_attr_get_str(attr_dev_name); - - if (strcmp(bus_name, opts->bus_name) != 0 || - strcmp(dev_name, opts->dev_name) != 0) - return false; - } - if (opts->present & DL_OPT_HANDLEP && - attr_bus_name && attr_dev_name && attr_port_index) { - const char *bus_name = mnl_attr_get_str(attr_bus_name); - const char *dev_name = mnl_attr_get_str(attr_dev_name); - uint32_t port_index = mnl_attr_get_u32(attr_port_index); - - if (strcmp(bus_name, opts->bus_name) != 0 || - strcmp(dev_name, opts->dev_name) != 0 || - port_index != opts->port_index) - return false; - } - return true; -} static void cmd_dev_help(void) { @@ -714,19 +685,6 @@ no_nice_names: __pr_out_port_handle(bus_name, dev_name, port_index); } -static void pr_out_port_handle_nice(struct dl *dl, struct nlattr **tb) -{ - const char *bus_name; - const char *dev_name; - uint32_t port_index; - - bus_name = mnl_attr_get_str(tb[DEVLINK_ATTR_BUS_NAME]); - dev_name = mnl_attr_get_str(tb[DEVLINK_ATTR_DEV_NAME]); - port_index = mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_INDEX]); - - __pr_out_port_handle_nice(dl, bus_name, dev_name, port_index); -} - static void pr_out_dev(struct nlattr **tb) { pr_out_handle(tb);