Skip to content

Instantly share code, notes, and snippets.

@bverhagen
Created May 10, 2021 15:00
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save bverhagen/2c1ff8ad071c83a4802858023d801322 to your computer and use it in GitHub Desktop.
Save bverhagen/2c1ff8ad071c83a4802858023d801322 to your computer and use it in GitHub Desktop.
--- "SocketCAN - Linux (V1.1.148.0)/usb-to-can_socketcan/ixx_usb_core.c" 2021-05-10 16:53:05.112543492 +0200
+++ "SocketCAN - Linux (V1.1.148.0)/usb-to-can_socketcan/ixx_usb_core.c" 2021-05-10 15:15:00.090856769 +0200
@@ -239,7 +239,7 @@
}
/* should always release echo skb and corresponding context */
- can_get_echo_skb(netdev, context->echo_index);
+ can_free_echo_skb(netdev, context->echo_index);
context->echo_index = IXXAT_USB_MAX_TX_URBS;
/* do wakeup tx queue in case of success only */
@@ -298,7 +298,7 @@
usb_anchor_urb(urb, &dev->tx_submitted);
- can_put_echo_skb(skb, netdev, context->echo_index);
+ can_put_echo_skb(skb, netdev, context->echo_index, size);
atomic_inc(&dev->active_tx_urbs);
--- "SocketCAN - Linux (V1.1.148.0)/usb-to-can_socketcan/ixx_usb_v2.c" 2017-07-07 13:34:44.000000000 +0200
+++ "SocketCAN - Linux (V1.1.148.0)/usb-to-can_socketcan/ixx_usb_v2.c" 2021-05-10 16:54:12.222548148 +0200
@@ -31,7 +31,7 @@
#include "ixx_usb_core.h"
-MODULE_SUPPORTED_DEVICE("IXXAT Automation GmbH USB-to-CAN V2");
+/*MODULE_SUPPORTED_DEVICE("IXXAT Automation GmbH USB-to-CAN V2");*/
/* use sja 1000 clock due to internal bittiming calculations */
#define SJA1000_CRYSTAL_HZ 8000000
--- "SocketCAN - Linux (V1.1.148.0)/usb-to-can_socketcan/ixx_usb_fd.c" 2017-07-07 13:34:44.000000000 +0200
+++ "SocketCAN - Linux (V1.1.148.0)/usb-to-can_socketcan/ixx_usb_fd.c" 2021-05-10 15:06:25.534154595 +0200
@@ -33,7 +33,7 @@
#ifdef CANFD_CAPABLE
-MODULE_SUPPORTED_DEVICE("IXXAT Automation GmbH USB-to-CAN FD");
+/*MODULE_SUPPORTED_DEVICE("IXXAT Automation GmbH USB-to-CAN FD");*/
/* use ifi can fd clock due to internal bittiming calculations */
#define IFIFD_CRYSTAL_HZ 80000000
@@ -622,13 +622,13 @@
can_frame->flags |= CANFD_ESI;
can_frame->len =
- can_dlc2len(
- get_canfd_dlc((flags & IXXAT_USBFD_MSG_FLAGS_DLC)
- >> 16));
+ can_fd_dlc2len(
+ (flags & IXXAT_USBFD_MSG_FLAGS_DLC)
+ >> 16);
} else {
can_frame->len =
- get_canfd_dlc((flags & IXXAT_USBFD_MSG_FLAGS_DLC)
- >> 16);
+ (flags & IXXAT_USBFD_MSG_FLAGS_DLC)
+ >> 16;
}
if (flags & IXXAT_USBFD_MSG_FLAGS_OVR) {
@@ -896,7 +896,7 @@
can_msg.flags |= IXXAT_USBFD_MSG_FLAGS_FDR;
}
- can_msg.flags |= (can_len2dlc(cf->len) << 16) &
+ can_msg.flags |= (can_fd_len2dlc(cf->len) << 16) &
IXXAT_USBFD_MSG_FLAGS_DLC;
can_msg.flags = cpu_to_le32(can_msg.flags);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment