From patchwork Thu Oct 22 15:53:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Numan Siddique X-Patchwork-Id: 1386313 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CHBk55htBz9sSC for ; Fri, 23 Oct 2020 02:54:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A56D587828; Thu, 22 Oct 2020 15:54:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mU2Numn63n-6; Thu, 22 Oct 2020 15:54:01 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 0690C87827; Thu, 22 Oct 2020 15:54:01 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id ED5B0C088B; Thu, 22 Oct 2020 15:54:00 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 08F4EC0051 for ; Thu, 22 Oct 2020 15:54:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EBFA787830 for ; Thu, 22 Oct 2020 15:53:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UQgYs6Z2m8jV for ; Thu, 22 Oct 2020 15:53:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by hemlock.osuosl.org (Postfix) with ESMTPS id B5A2387827 for ; Thu, 22 Oct 2020 15:53:58 +0000 (UTC) X-Originating-IP: 60.243.227.93 Received: from nusiddiq.home.org.com (unknown [60.243.227.93]) (Authenticated sender: numans@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 59A44C000D; Thu, 22 Oct 2020 15:53:53 +0000 (UTC) From: numans@ovn.org To: dev@openvswitch.org Date: Thu, 22 Oct 2020 21:23:39 +0530 Message-Id: <20201022155339.300989-1-numans@ovn.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn] Fix compilation error due to recent OVS commit. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Numan Siddique The commit [1] in OVS broke OVN compilation. This patch fixes it. [1] - 91fc374a9c5a("Eliminate use of term "slave" in bond, LACP, and bundle contexts.") Signed-off-by: Numan Siddique Acked-by: Mark Michelson --- controller/physical.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controller/physical.c b/controller/physical.c index a7f3efd2fa..1bc2c389bf 100644 --- a/controller/physical.c +++ b/controller/physical.c @@ -384,15 +384,15 @@ put_remote_port_redirect_overlay(const struct if (!tun) { continue; } - if (bundle->n_slaves >= BUNDLE_MAX_SLAVES) { + if (bundle->n_members >= BUNDLE_MAX_MEMBERS) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); VLOG_WARN_RL(&rl, "Remote endpoints for port beyond " - "BUNDLE_MAX_SLAVES"); + "BUNDLE_MAX_MEMBERS"); break; } ofpbuf_put(ofpacts_p, &tun->ofport, sizeof tun->ofport); bundle = ofpacts_p->header; - bundle->n_slaves++; + bundle->n_members++; } bundle->algorithm = NX_BD_ALG_ACTIVE_BACKUP;