[ovs-dev] [PATCH ovn] Fix compilation error due to recent OVS commit.

Mark Michelson mmichels at redhat.com
Thu Oct 22 20:26:19 UTC 2020


As you're well aware, this patch started a big discussion regarding 
OVN's policy for building OVS. With our current policy, this is the 
proper way to handle this.

Acked-by: Mark Michelson <mmichels at redhat.com>

On 10/22/20 11:53 AM, numans at ovn.org wrote:
> From: Numan Siddique <numans at ovn.org>
> 
> 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 <numans at ovn.org>
> ---
>   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;
> 



More information about the dev mailing list