From patchwork Fri Apr 28 10:11:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 756327 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wDqPM4wjqz9s7x for ; Fri, 28 Apr 2017 20:12:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=verge.net.au header.i=@verge.net.au header.b="kWW/jr/G"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035624AbdD1KMW (ORCPT ); Fri, 28 Apr 2017 06:12:22 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:48564 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947894AbdD1KMH (ORCPT ); Fri, 28 Apr 2017 06:12:07 -0400 Received: from penelope.horms.nl (52D9BC73.cm-11-1c.dynamic.ziggo.nl [82.217.188.115]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 5C05625B801; Fri, 28 Apr 2017 20:12:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1493374324; bh=S/k+keJlHh4YLG4ZmCwFGDE39iIPNBfK/KUsMWOBpLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kWW/jr/Gtsy3530iE5oa2EwHfqea56ZB+y/I8azqDvrSr9qQPDgcYxIfmCzHC0j3k NPKF0QFHM/pE0DVyc11NUqe3T0G8Gbcm0umsWPAajojWz2a6iQdp2H13vQ8rkAD09h QP0T4l4twgl5Hab+tZxhNt6N5ELkLcmawt7dM1hI= Received: by penelope.horms.nl (Postfix, from userid 7100) id DAC1760613; Fri, 28 Apr 2017 12:12:00 +0200 (CEST) From: Simon Horman To: Pablo Neira Ayuso Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Wensong Zhang , Julian Anastasov , Aaron Conole , Simon Horman Subject: [PATCH 1/2] ipvs: remove unused function ip_vs_set_state_timeout Date: Fri, 28 Apr 2017 12:11:58 +0200 Message-Id: <20170428101159.9810-2-horms@verge.net.au> X-Mailer: git-send-email 2.12.2.816.g2cccc81164 In-Reply-To: <20170428101159.9810-1-horms@verge.net.au> References: <20170428101159.9810-1-horms@verge.net.au> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aaron Conole There are no in-tree callers of this function and it isn't exported. Signed-off-by: Aaron Conole Signed-off-by: Simon Horman --- 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 632082300e77..4f4f786255ef 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 8ae480715cea..ca880a3ad033 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);