Ilya Maximets <[email protected]> writes:

> On 10/9/24 22:31, Aaron Conole wrote:
>> Paolo Valerio <[email protected]> writes:
>> 
>>> While at it update no longer valid comment.
>>>
>>> Signed-off-by: Paolo Valerio <[email protected]>
>>> ---
>> 
>> Thanks for the work on this, Paolo.  I've merged the series.
>> 
>> Given there is something of a bugfix for this series, if you think it
>> should be backported to the other branches please chime in.  There is
>> some churn in here that should be okay, but I'm hesitant to just do the
>> backport.
>
>
> Hi, Paolo and Aaron.
>
> There is a syntax error in this set that breaks Windows build:
>   
> https://ci.appveyor.com/project/blp/ovs/builds/50766118/job/0r2xcuqvyb76x69b#L3172
>
>   lib/conntrack.c(316): error C2059: syntax error: ':'
>
> Could you, please, take a look?

Hrrm... I guess it would prefer something like below.  For some reason
both my appveyor and cirrus support got disabled in the repo I was using
so I didn't catch it.

---
diff --git a/lib/conntrack.c b/lib/conntrack.c
index 0061a56364..f4b150bee5 100644
--- a/lib/conntrack.c
+++ b/lib/conntrack.c
@@ -313,7 +313,7 @@ zone_limit_get_limit(struct conntrack *ct, struct 
conntrack_zone_limit *czl)
 
     if (limit == ZONE_LIMIT_CONN_DEFAULT) {
         atomic_read_relaxed(&ct->default_zone_limit, &limit);
-        limit = limit ? : -1;
+        limit = limit ? limit : -1;
     }
 
     return limit;
---

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to