diff options
author | Simon Horman <horms@verge.net.au> | 2011-02-04 04:33:01 -0500 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2011-03-14 20:36:58 -0400 |
commit | 71a8ab6cad63b4816711f2ea518755677a870f6f (patch) | |
tree | b5f8c0eb8b35a488d549bff001d5d09291ad6875 /net | |
parent | 7532e8d40ccfdde6667169eeac4fd7778d6eb462 (diff) |
IPVS: Add sysctl_expire_nodest_conn()
In preparation for not including sysctl_expire_nodest_conn in
struct netns_ipvs when CONFIG_SYCTL is not defined.
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_core.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 6a0053d91741..d418bc60d00d 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c | |||
@@ -613,10 +613,16 @@ static int sysctl_nat_icmp_send(struct net *net) | |||
613 | return ipvs->sysctl_nat_icmp_send; | 613 | return ipvs->sysctl_nat_icmp_send; |
614 | } | 614 | } |
615 | 615 | ||
616 | static int sysctl_expire_nodest_conn(struct netns_ipvs *ipvs) | ||
617 | { | ||
618 | return ipvs->sysctl_expire_nodest_conn; | ||
619 | } | ||
620 | |||
616 | #else | 621 | #else |
617 | 622 | ||
618 | static int sysctl_snat_reroute(struct sk_buff *skb) { return 0; } | 623 | static int sysctl_snat_reroute(struct sk_buff *skb) { return 0; } |
619 | static int sysctl_nat_icmp_send(struct net *net) { return 0; } | 624 | static int sysctl_nat_icmp_send(struct net *net) { return 0; } |
625 | static int sysctl_expire_nodest_conn(struct netns_ipvs *ipvs) { return 0; } | ||
620 | 626 | ||
621 | #endif | 627 | #endif |
622 | 628 | ||
@@ -1583,7 +1589,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) | |||
1583 | if (cp->dest && !(cp->dest->flags & IP_VS_DEST_F_AVAILABLE)) { | 1589 | if (cp->dest && !(cp->dest->flags & IP_VS_DEST_F_AVAILABLE)) { |
1584 | /* the destination server is not available */ | 1590 | /* the destination server is not available */ |
1585 | 1591 | ||
1586 | if (ipvs->sysctl_expire_nodest_conn) { | 1592 | if (sysctl_expire_nodest_conn(ipvs)) { |
1587 | /* try to expire the connection immediately */ | 1593 | /* try to expire the connection immediately */ |
1588 | ip_vs_conn_expire_now(cp); | 1594 | ip_vs_conn_expire_now(cp); |
1589 | } | 1595 | } |