From b38e740903f87882cf5b45a56fb0254faa4b7ab0 Mon Sep 17 00:00:00 2001 From: "subashab@codeaurora.org" Date: Mon, 9 May 2016 14:54:36 -0600 Subject: [PATCH 1/2] ss: Remove unused argument from kill_inet_sock addr is not used here. Signed-off-by: Subash Abhinov Kasiviswanathan --- misc/ss.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index deefc967..5cda728a 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -2232,8 +2232,7 @@ struct inet_diag_arg { struct rtnl_handle *rth; }; -static int kill_inet_sock(const struct sockaddr_nl *addr, - struct nlmsghdr *h, void *arg) +static int kill_inet_sock(struct nlmsghdr *h, void *arg) { struct inet_diag_msg *d = NLMSG_DATA(h); struct inet_diag_arg *diag_arg = arg; @@ -2260,7 +2259,7 @@ static int show_one_inet_sock(const struct sockaddr_nl *addr, if (!(diag_arg->f->families & (1 << r->idiag_family))) return 0; - if (diag_arg->f->kill && kill_inet_sock(addr, h, arg) != 0) { + if (diag_arg->f->kill && kill_inet_sock(h, arg) != 0) { if (errno == EOPNOTSUPP || errno == ENOENT) { /* Socket can't be closed, or is already closed. */ return 0; From c13363e4cd4c9499fc33d798036081a674461d1b Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 13 May 2016 14:48:32 -0700 Subject: [PATCH 2/2] devlink: remove more unused code --- devlink/devlink.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 68bdf397..89a30831 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -307,23 +307,6 @@ static int ifname_map_lookup(struct dl *dl, const char *ifname, return -ENOENT; } -static int ifname_map_rev_lookup(struct dl *dl, const char *bus_name, - const char *dev_name, uint32_t port_index, - char **p_ifname) -{ - struct ifname_map *ifname_map; - - list_for_each_entry(ifname_map, &dl->ifname_map_list, list) { - if (strcmp(bus_name, ifname_map->bus_name) == 0 && - strcmp(dev_name, ifname_map->dev_name) == 0 && - port_index == ifname_map->port_index) { - *p_ifname = ifname_map->ifname; - return 0; - } - } - return -ENOENT; -} - static unsigned int strslashcount(char *str) { unsigned int count = 0; @@ -665,26 +648,6 @@ static void pr_out_port_handle(struct nlattr **tb) mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_INDEX])); } -static void __pr_out_port_handle_nice(struct dl *dl, const char *bus_name, - const char *dev_name, uint32_t port_index) -{ - char *ifname; - int err; - - if (dl->no_nice_names) - goto no_nice_names; - - err = ifname_map_rev_lookup(dl, bus_name, dev_name, - port_index, &ifname); - if (err) - goto no_nice_names; - pr_out("%s", ifname); - return; - -no_nice_names: - __pr_out_port_handle(bus_name, dev_name, port_index); -} - static void pr_out_dev(struct nlattr **tb) { pr_out_handle(tb);