From patchwork Fri Apr 28 10:11:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 756328 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 3wDqPX1thVz9s7x for ; Fri, 28 Apr 2017 20:12:32 +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="pElAIGj8"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035634AbdD1KM3 (ORCPT ); Fri, 28 Apr 2017 06:12:29 -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 S1947888AbdD1KMP (ORCPT ); Fri, 28 Apr 2017 06:12:15 -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 7EED325B82D; 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=fnkWEX3yM5+jaVAfXMH2H5rfHnJ1X+9AHMxd3oEab3k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pElAIGj8SqsR7mFV5C6uy6kitWFV3tS1PqPS1aA08J9IpbtxAI9PusBWt3REd/Vre 4v0C1q7AqMY1ALvNOfjx7gmFto+66GKMAGf3OyYGYk2AX5UltyWwR/OMq7qQYXlU7S 8XIsDuqPS5YrxWUFDqGJvCHjbPdlhUVFxRzR14eQ= Received: by penelope.horms.nl (Postfix, from userid 7100) id DEB5060618; 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 2/2] ipvs: change comparison on sync_refresh_period Date: Fri, 28 Apr 2017 12:11:59 +0200 Message-Id: <20170428101159.9810-3-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 The sync_refresh_period variable is unsigned, so it can never be < 0. Signed-off-by: Aaron Conole Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index 30d6b2cc00a0..0e5b64a75da0 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -520,7 +520,7 @@ static int ip_vs_sync_conn_needed(struct netns_ipvs *ipvs, if (!(cp->flags & IP_VS_CONN_F_TEMPLATE) && pkts % sync_period != sysctl_sync_threshold(ipvs)) return 0; - } else if (sync_refresh_period <= 0 && + } else if (!sync_refresh_period && pkts != sysctl_sync_threshold(ipvs)) return 0;