From patchwork Wed Apr 12 20:38:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 750169 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w3G3R2Pyvz9s7k for ; Thu, 13 Apr 2017 06:38:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bytheb-org.20150623.gappssmtp.com header.i=@bytheb-org.20150623.gappssmtp.com header.b="KhnP4wdX"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755379AbdDLUiV (ORCPT ); Wed, 12 Apr 2017 16:38:21 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:33339 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755251AbdDLUiU (ORCPT ); Wed, 12 Apr 2017 16:38:20 -0400 Received: by mail-qt0-f195.google.com with SMTP id c45so5445587qtb.0 for ; Wed, 12 Apr 2017 13:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytheb-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=WSRddRyfaFgXjANmmm3Glrq2a3M6ymavLz7FeXZoIvA=; b=KhnP4wdX9O9vOPGRI0BPpRXNobR9fBEkM4dDAQMDXSv7xTJWZbTXdmf/bLesvjpYbf oCxCRFLhADzQUXcxuQWhAUeUbtXVY6aFAsopUTyyXjLRLCoOq8zwJmfgcFttvTgOSzGD 7dSytevV7+jXywZ9TdHMeXmCdVWjYWm0+t37I2UKYijakclMcv2wTk+hSkAM32U+A8b/ mHIgmohzAH0NIBjeyUMvugDB+UP3BKEhty47j5hr2Tyn4MTLoKu9/kG7oNuJZ+G6PijW vwQPimtgjF2XINWDGXR6Uxs7YCYZrzyg6oeAuWoGh3SIU1akgKStJ5147cbSx9nwbvjs TTXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WSRddRyfaFgXjANmmm3Glrq2a3M6ymavLz7FeXZoIvA=; b=VgaXGcHj+gmXDVvhoBcpMK+KEU20EJsZR+yeCu87TuNQVWDzNaVp8F4jPq5TmCjwOB wknKPmLyYSi5gBfD6fOVjNKFtSaOkZnjrSJkGgAVbuDE9ZC823UNwj6uYG51Ico/8GVv pnmW4upA4TIHIf1s15kM0LWSCGy/RjCrbKLhZWEhuF1pQmT535cFrteetcMKOOZZmi9/ LrbWaptMlIUDbOvzgxXDXO9870CnBeYbYdUY7/krh6U0IuSgKcKaebcU8KwD5Wg9Skqc 2/o4j+V1id0xmxG389Ma3bJx3SfMiEP1lGlyNnKzmRaSMtAM+/keNCzWYDckFoSOQKsu v7rw== X-Gm-Message-State: AN3rC/6O5rPGL9ULymowJvGv7F/xC597rBbcC6q+x3Xi8ls2rA7ud6y0vrL12xL7dFAmsQ== X-Received: by 10.200.54.125 with SMTP id n58mr31080888qtb.145.1492029499726; Wed, 12 Apr 2017 13:38:19 -0700 (PDT) Received: from dhcp-25-97.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id q6sm1565699qtg.39.2017.04.12.13.38.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Apr 2017 13:38:18 -0700 (PDT) From: Aaron Conole To: netfilter-devel@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Wensong Zhang , Simon Horman , Julian Anastasov , Pablo Neira Ayuso , Jozsef Kadlecsik Subject: [PATCH nf-next] ip_vs_sync: change comparison on sync_refresh_period Date: Wed, 12 Apr 2017 16:38:12 -0400 Message-Id: <20170412203812.15091-1-aconole@bytheb.org> X-Mailer: git-send-email 2.9.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The sync_refresh_period variable is unsigned, so it can never be < 0. Signed-off-by: Aaron Conole --- 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 b03c280..123dc0f 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;