From patchwork Mon Apr 10 19:50:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 749204 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w215W1yQsz9s03 for ; Tue, 11 Apr 2017 05:51:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bytheb-org.20150623.gappssmtp.com header.i=@bytheb-org.20150623.gappssmtp.com header.b="PBdLv4F0"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753827AbdDJTu7 (ORCPT ); Mon, 10 Apr 2017 15:50:59 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:33448 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753825AbdDJTu5 (ORCPT ); Mon, 10 Apr 2017 15:50:57 -0400 Received: by mail-qk0-f195.google.com with SMTP id d131so1600955qkc.0 for ; Mon, 10 Apr 2017 12:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytheb-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=djdE1hmCIJCbqoqGKbQLzLjuSxMMtTQZNGGEjqzTKYs=; b=PBdLv4F0BGBPNxSI9gUelUcUbHO94d6mhDx6AZNV0HQrELZqwN1gVbUfFh39S3e2zH oGgPf8YnsWApc2+qenH4vvhRbkX8jiu8BTILNUyZRuROHDlhsqhoZB0G4fOHjGoAcQqt MqLoNH3QnH7o9iYM3nh3+Uol6ObDAfX9Mdujf/oy5uHZOXzxG2Ctk1cTlUuzIPhcGrBe /jrx4nGh8bCcwb2zt60upYC9cfZ1qq+GPOzcs5ZzCAoTvpYOf6fC69KJ09ubAQYU0pEh KFZoQDgoY3sRTFjkTeIeCLOICKbssFUJagrgBVzPgiRBt6frl8NvvRtfzkts/cemJOYa SVfw== 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; bh=djdE1hmCIJCbqoqGKbQLzLjuSxMMtTQZNGGEjqzTKYs=; b=Qhx0AwojKIEruYMV1o929uZEw1VfgnitzaFarndlYrT/bLsZPb2VUpCsELgg11R08X bN4g8DBJzr/qyfSW9kqgFLl5UGwobddbwiGzN5DYMe5fRBFVG9P2IkXWxozZyXASEDUi /49l6WNOh6xR/J2IfpRxCqwDczceAOxrKfdoro/mumNN3ZfUuLeJoUHkoyPFsE5n/eJt 7FI4IcDQevUdj8Y/CKBudhIgU/IbSNt2d79c20hlCkZMU9FLAOqs8D7Ew7q+BsZAyWDC sIhJJKz7/sVDXzHLmorwKPrzpmWySmJB0CqRdsFVSj8WoTEtUowqoCR+iZbFAU1dr3oK 34cg== X-Gm-Message-State: AFeK/H0leZ+qkpwOqeTX0ZE9Z5/ZKR/YViJwfFcAR0UBzclGy6oATs/x4WrFbQxekN8Vkg== X-Received: by 10.55.195.142 with SMTP id r14mr30566454qkl.260.1491853851510; Mon, 10 Apr 2017 12:50:51 -0700 (PDT) Received: from dhcp-25-97.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id h23sm9456262qtc.49.2017.04.10.12.50.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2017 12:50:49 -0700 (PDT) From: Aaron Conole To: netfilter-devel@vger.kernel.org Cc: Wensong Zhang , Simon Horman , Julian Anastasov , netdev@vger.kernel.org, lvs-devel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH nf-next] ipvs: remove unused function ip_vs_set_state_timeout Date: Mon, 10 Apr 2017 15:50:44 -0400 Message-Id: <20170410195044.19646-1-aconole@bytheb.org> X-Mailer: git-send-email 2.9.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org There are no in-tree callers of this function and it isn't exported. Signed-off-by: Aaron Conole --- include/net/ip_vs.h | 2 -- net/netfilter/ipvs/ip_vs_proto.c | 22 ---------------------- 2 files changed, 24 deletions(-) diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 8a4a57b8..c76fedb 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -1349,8 +1349,6 @@ int ip_vs_protocol_init(void); void ip_vs_protocol_cleanup(void); void ip_vs_protocol_timeout_change(struct netns_ipvs *ipvs, int flags); int *ip_vs_create_timeout_table(int *table, int size); -int ip_vs_set_state_timeout(int *table, int num, const char *const *names, - const char *name, int to); void ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp, const struct sk_buff *skb, int offset, const char *msg); diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c index 8ae4807..ca880a3 100644 --- a/net/netfilter/ipvs/ip_vs_proto.c +++ b/net/netfilter/ipvs/ip_vs_proto.c @@ -193,28 +193,6 @@ ip_vs_create_timeout_table(int *table, int size) } -/* - * Set timeout value for state specified by name - */ -int -ip_vs_set_state_timeout(int *table, int num, const char *const *names, - const char *name, int to) -{ - int i; - - if (!table || !name || !to) - return -EINVAL; - - for (i = 0; i < num; i++) { - if (strcmp(names[i], name)) - continue; - table[i] = to * HZ; - return 0; - } - return -ENOENT; -} - - const char * ip_vs_state_name(__u16 proto, int state) { struct ip_vs_protocol *pp = ip_vs_proto_get(proto);