* [PATCH nf-next] ipvs: remove unused function ip_vs_set_state_timeout
@ 2017-04-10 19:50 Aaron Conole
2017-04-11 20:55 ` Simon Horman
2017-04-14 0:13 ` Pablo Neira Ayuso
0 siblings, 2 replies; 4+ messages in thread
From: Aaron Conole @ 2017-04-10 19:50 UTC (permalink / raw)
To: netfilter-devel
Cc: Wensong Zhang, Simon Horman, Julian Anastasov, netdev, lvs-devel,
linux-kernel
There are no in-tree callers of this function and it isn't exported.
Signed-off-by: Aaron Conole <aconole@bytheb.org>
---
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);
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH nf-next] ipvs: remove unused function ip_vs_set_state_timeout
2017-04-10 19:50 [PATCH nf-next] ipvs: remove unused function ip_vs_set_state_timeout Aaron Conole
@ 2017-04-11 20:55 ` Simon Horman
2017-04-14 0:13 ` Pablo Neira Ayuso
1 sibling, 0 replies; 4+ messages in thread
From: Simon Horman @ 2017-04-11 20:55 UTC (permalink / raw)
To: Aaron Conole
Cc: netfilter-devel, Wensong Zhang, Julian Anastasov, netdev,
lvs-devel, linux-kernel
On Mon, Apr 10, 2017 at 03:50:44PM -0400, Aaron Conole wrote:
> There are no in-tree callers of this function and it isn't exported.
>
> Signed-off-by: Aaron Conole <aconole@bytheb.org>
Thanks, applied to ipvs-next.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH nf-next] ipvs: remove unused function ip_vs_set_state_timeout
2017-04-10 19:50 [PATCH nf-next] ipvs: remove unused function ip_vs_set_state_timeout Aaron Conole
2017-04-11 20:55 ` Simon Horman
@ 2017-04-14 0:13 ` Pablo Neira Ayuso
2017-04-16 22:34 ` Simon Horman
1 sibling, 1 reply; 4+ messages in thread
From: Pablo Neira Ayuso @ 2017-04-14 0:13 UTC (permalink / raw)
To: Aaron Conole
Cc: netfilter-devel, Wensong Zhang, Simon Horman, Julian Anastasov,
netdev, lvs-devel, linux-kernel
On Mon, Apr 10, 2017 at 03:50:44PM -0400, Aaron Conole wrote:
> There are no in-tree callers of this function and it isn't exported.
Simon, let me know if you want to take this, or just add your
Signed-off-by.
Thanks!
> Signed-off-by: Aaron Conole <aconole@bytheb.org>
> ---
> 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);
> --
> 2.9.3
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH nf-next] ipvs: remove unused function ip_vs_set_state_timeout
2017-04-14 0:13 ` Pablo Neira Ayuso
@ 2017-04-16 22:34 ` Simon Horman
0 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2017-04-16 22:34 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Aaron Conole, netfilter-devel, Wensong Zhang, Julian Anastasov,
netdev, lvs-devel, linux-kernel
On vr, apr 14, 2017 at 02:13:09 +0200, Pablo Neira Ayuso wrote:
> On Mon, Apr 10, 2017 at 03:50:44PM -0400, Aaron Conole wrote:
> > There are no in-tree callers of this function and it isn't exported.
>
> Simon, let me know if you want to take this, or just add your
> Signed-off-by.
Hi Pablo,
I will take this.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-16 22:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-10 19:50 [PATCH nf-next] ipvs: remove unused function ip_vs_set_state_timeout Aaron Conole
2017-04-11 20:55 ` Simon Horman
2017-04-14 0:13 ` Pablo Neira Ayuso
2017-04-16 22:34 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).