From b0ba12fa833e60bc0661cb1e3f325501f6171609 Mon Sep 17 00:00:00 2001
From: Daniel Hrisca <daniel.hrisca@gmail.com>
Date: Thu, 12 Oct 2023 21:15:04 +0300
Subject: [PATCH] Vector: Skip the can_op_mode check if the device reports
 can_op_mode=0 (#1678)

---
 can/interfaces/vector/canlib.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/can/interfaces/vector/canlib.py b/can/interfaces/vector/canlib.py
index bc564958f..024f6a4c9 100644
--- a/can/interfaces/vector/canlib.py
+++ b/can/interfaces/vector/canlib.py
@@ -538,16 +538,19 @@ def _check_can_settings(
         )
 
         # check CAN operation mode
-        if fd:
-            settings_acceptable &= bool(
-                bus_params_data.can_op_mode
-                & xldefine.XL_CANFD_BusParams_CanOpMode.XL_BUS_PARAMS_CANOPMODE_CANFD
-            )
-        elif bus_params_data.can_op_mode != 0:  # can_op_mode is always 0 for cancaseXL
-            settings_acceptable &= bool(
-                bus_params_data.can_op_mode
-                & xldefine.XL_CANFD_BusParams_CanOpMode.XL_BUS_PARAMS_CANOPMODE_CAN20
-            )
+        # skip the check if can_op_mode is 0
+        # as it happens for cancaseXL, VN7600 and sometimes on other hardware (VN1640)
+        if bus_params_data.can_op_mode:
+            if fd:
+                settings_acceptable &= bool(
+                    bus_params_data.can_op_mode
+                    & xldefine.XL_CANFD_BusParams_CanOpMode.XL_BUS_PARAMS_CANOPMODE_CANFD
+                )
+            else:
+                settings_acceptable &= bool(
+                    bus_params_data.can_op_mode
+                    & xldefine.XL_CANFD_BusParams_CanOpMode.XL_BUS_PARAMS_CANOPMODE_CAN20
+                )
 
         # check bitrates
         if bitrate: