From: Aaron Conole <[email protected]>

In the cited commit a ternary using syntax extension slipped in.

The extension allows omitting the second operand and it is not
supported by MSVC resulting in a build failure.

Fix it by simply specifying the second operand.

Fixes: b57c1da5c39a ("conntrack: Use a per zone default limit.")
Reported-by: Ilya Maximets <[email protected]>
Signed-off-by: Aaron Conole <[email protected]>
[Paolo: added commit message]
Signed-off-by: Paolo Valerio <[email protected]>
---
 lib/conntrack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/conntrack.c b/lib/conntrack.c
index 0061a5636..f4b150bee 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;
-- 
2.46.1

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

Reply via email to