summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorJulius Volz <juliusv@google.com>2008-09-02 15:55:50 +0200
committerSimon Horman <horms@verge.net.au>2008-09-05 11:17:11 +1000
commitc6883f587341a3ed113856de8769d0992b4bbd85 (patch)
treeb0a69e64730a9b1fd936f946d445ebfa673bb666 /net/ipv4
parent667a5f18162e803e30722af46ade1737e3b93198 (diff)
downloadlinux-3.10-c6883f587341a3ed113856de8769d0992b4bbd85.tar.gz
linux-3.10-c6883f587341a3ed113856de8769d0992b4bbd85.tar.bz2
linux-3.10-c6883f587341a3ed113856de8769d0992b4bbd85.zip
IVPS: Disable sync daemon for IPv6 connections
Disable the sync daemon for IPv6 connections, works only with IPv4 for now. Signed-off-by: Julius Volz <juliusv@google.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ipvs/ip_vs_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c
index 27bef1d67aa..5a7a81778b0 100644
--- a/net/ipv4/ipvs/ip_vs_core.c
+++ b/net/ipv4/ipvs/ip_vs_core.c
@@ -1321,7 +1321,8 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb,
* encorage the standby servers to update the connections timeout
*/
atomic_inc(&cp->in_pkts);
- if ((ip_vs_sync_state & IP_VS_STATE_MASTER) &&
+ if (af == AF_INET &&
+ (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
(((cp->protocol != IPPROTO_TCP ||
cp->state == IP_VS_TCP_S_ESTABLISHED) &&
(atomic_read(&cp->in_pkts) % sysctl_ip_vs_sync_threshold[1]