From patchwork Thu Nov 15 22:36:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998592 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="G4ebuZvb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx854Tx7z9s3Z for ; Fri, 16 Nov 2018 09:37:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389152AbeKPIrY (ORCPT ); Fri, 16 Nov 2018 03:47:24 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:46740 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbeKPIqc (ORCPT ); Fri, 16 Nov 2018 03:46:32 -0500 Received: by mail-pl1-f196.google.com with SMTP id t13so7178391ply.13 for ; Thu, 15 Nov 2018 14:36:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=T4gg30to4yreSnLfth5iZ0oPJ33TAqmbEt0/VJx4APc=; b=G4ebuZvbTtJIs8QFFi0o4vSRP6AQGH2sO0EWnMofwMkdgRxCzN2QEh+ZdqRVo/XNkJ k5EeVJqXHccawzyQrcc93TzaQP2YFxQVhAcIlWmPIg7lleIwsnyEmvq3HPvsWD3cmj/F 6iShkjaSc3TUdU0u2AxjDEL+HqZv4GXHmIWWRoPi2Qk/rLr1PIF7skz6agTg9FAswr/z myR1Ra8zTFvDNp+6H9y0K2vY4ESz7sPZZ/2BIYGau8VYHmOnwUC5ls0fgNp5T2rFAr3Q mGeplFQxP7SogvLdb8WFweVYo9aZC7iEODxKE4WvqAopOU5rkuSZw1IfNlN+HINntigI eZow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=T4gg30to4yreSnLfth5iZ0oPJ33TAqmbEt0/VJx4APc=; b=PDjkl/yh62iXkl6uiBpIH0aEX51D5FI/tAct+9SMQAgIIhPCpcCUozrkUOdWp8Z3wt ertQ9BbFf/AaF6U0qrgdEYzqwXaqQgcOxsEI5mQAPXSKZczgG5rPakl23gRHx8eXSFc2 +EZGIdZFy20Hd4rko9M1yo/9QOxOrs70c8tNd9U2LUJdpvF8OIUWPAywcEOprTS0XMPY svZmmbyd5HL8uPYgCCp84eeVy+iQUuiV6qBZhTAnCUBCuDgEFoZdZcqqWNwkxe7v5wgk ChHIE8Ofen8bzOIX2IJ8IYfyMrf2cvtI8krck+2fAIL0uOhVYvhGXj8forWHLusxZxjK mAag== X-Gm-Message-State: AGRZ1gJIFnFYIsGpBpXgRiTkbiZ/9ujNhtvnz7QDqQZngnCdBq4ot63b fDXZN/KhMDu9T+L2UBJoMzwVqoEdNWXDvA== X-Google-Smtp-Source: AJdET5cRRKKlRGrod28Be66btFH45BLeT1WpQq9VCs/+NxUDU7nb55saphx7j+0R7gBQyzId6JOnXA== X-Received: by 2002:a17:902:598e:: with SMTP id p14mr8096473pli.260.1542321408439; Thu, 15 Nov 2018 14:36:48 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:47 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 06/22] genl: remove dead code Date: Thu, 15 Nov 2018 14:36:24 -0800 Message-Id: <20181115223640.411-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115223640.411-1-stephen@networkplumber.org> References: <20181115223640.411-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The function genl_ctrl_resolve_family is defined but never used in current code. Signed-off-by: Stephen Hemminger --- genl/ctrl.c | 71 ----------------------------------------------- genl/genl_utils.h | 2 -- 2 files changed, 73 deletions(-) diff --git a/genl/ctrl.c b/genl/ctrl.c index 6133336ab435..0fb464b01cfb 100644 --- a/genl/ctrl.c +++ b/genl/ctrl.c @@ -38,77 +38,6 @@ static int usage(void) return -1; } -int genl_ctrl_resolve_family(const char *family) -{ - struct rtnl_handle rth; - int ret = 0; - struct { - struct nlmsghdr n; - struct genlmsghdr g; - char buf[4096]; - } req = { - .n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN), - .n.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK, - .n.nlmsg_type = GENL_ID_CTRL, - .g.cmd = CTRL_CMD_GETFAMILY, - }; - struct nlmsghdr *nlh = &req.n; - struct genlmsghdr *ghdr = &req.g; - struct nlmsghdr *answer = NULL; - - if (rtnl_open_byproto(&rth, 0, NETLINK_GENERIC) < 0) { - fprintf(stderr, "Cannot open generic netlink socket\n"); - exit(1); - } - - addattr_l(nlh, 128, CTRL_ATTR_FAMILY_NAME, family, strlen(family) + 1); - - if (rtnl_talk(&rth, nlh, &answer) < 0) { - fprintf(stderr, "Error talking to the kernel\n"); - goto errout; - } - - { - struct rtattr *tb[CTRL_ATTR_MAX + 1]; - int len = answer->nlmsg_len; - struct rtattr *attrs; - - if (answer->nlmsg_type != GENL_ID_CTRL) { - fprintf(stderr, "Not a controller message, nlmsg_len=%d " - "nlmsg_type=0x%x\n", answer->nlmsg_len, answer->nlmsg_type); - goto errout; - } - - if (ghdr->cmd != CTRL_CMD_NEWFAMILY) { - fprintf(stderr, "Unknown controller command %d\n", ghdr->cmd); - goto errout; - } - - len -= NLMSG_LENGTH(GENL_HDRLEN); - - if (len < 0) { - fprintf(stderr, "wrong controller message len %d\n", len); - free(answer); - return -1; - } - - attrs = (struct rtattr *) ((char *) answer + NLMSG_LENGTH(GENL_HDRLEN)); - parse_rtattr(tb, CTRL_ATTR_MAX, attrs, len); - - if (tb[CTRL_ATTR_FAMILY_ID] == NULL) { - fprintf(stderr, "Missing family id TLV\n"); - goto errout; - } - - ret = rta_getattr_u16(tb[CTRL_ATTR_FAMILY_ID]); - } - -errout: - free(answer); - rtnl_close(&rth); - return ret; -} - static void print_ctrl_cmd_flags(FILE *fp, __u32 fl) { fprintf(fp, "\n\t\tCapabilities (0x%x):\n ", fl); diff --git a/genl/genl_utils.h b/genl/genl_utils.h index cc1f3fb76596..a8d433a9574f 100644 --- a/genl/genl_utils.h +++ b/genl/genl_utils.h @@ -13,6 +13,4 @@ struct genl_util int (*print_genlopt)(struct nlmsghdr *n, void *arg); }; -int genl_ctrl_resolve_family(const char *family); - #endif