diff options
Diffstat (limited to 'drivers/net/can/usb/etas_es58x/es58x_core.h')
| -rw-r--r-- | drivers/net/can/usb/etas_es58x/es58x_core.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.h b/drivers/net/can/usb/etas_es58x/es58x_core.h index 0e7a7dcc48d4..5f4e7dc5be35 100644 --- a/drivers/net/can/usb/etas_es58x/es58x_core.h +++ b/drivers/net/can/usb/etas_es58x/es58x_core.h @@ -19,12 +19,15 @@ #include <linux/can/dev.h> #include "es581_4.h" +#include "es58x_fd.h" /* Driver constants */ #define ES58X_RX_URBS_MAX 5 /* Empirical value */ #define ES58X_TX_URBS_MAX 6 /* Empirical value */ -#define ES58X_MAX(param) (ES581_4_##param) +#define ES58X_MAX(param) \ + (ES581_4_##param > ES58X_FD_##param ? \ + ES581_4_##param : ES58X_FD_##param) #define ES58X_TX_BULK_MAX ES58X_MAX(TX_BULK_MAX) #define ES58X_RX_BULK_MAX ES58X_MAX(RX_BULK_MAX) #define ES58X_ECHO_BULK_MAX ES58X_MAX(ECHO_BULK_MAX) @@ -213,6 +216,7 @@ enum es58x_ret_type { union es58x_urb_cmd { struct es581_4_urb_cmd es581_4_urb_cmd; + struct es58x_fd_urb_cmd es58x_fd_urb_cmd; struct { /* Common header parts of all variants */ __le16 sof; u8 cmd_type; |