From 6025ea134969cf3e6c72a243d9be9c4abf4a3f4c Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Wed, 13 Nov 2019 22:49:35 -0500 Subject: [PATCH] v2.0.4 Ensure carrier is up on new kernels which require it --- CHANGELOG | 3 +++ README.md | 2 +- intrepid.c | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8ebde86..8f511b0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +v2.0.4 + Ensure carrier is up on new kernels which require it + v2.0.3 Add support for kernels 5.1+ Tested on 5.3.0 (Ubuntu 19.10) diff --git a/README.md b/README.md index e99e348..0c1fe6b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Version 2.0.3 +Version 2.0.4 This is the kernel object portion of the Intrepid Control Systems SocketCAN support. For SocketCAN to work with Intrepid devices you will need to have this kernel object loaded on your system. Once the module is built and loaded run [icsscand](https://github.com/intrepidcs/icsscand) to turn on SocketCAN support. diff --git a/intrepid.c b/intrepid.c index 54586a7..3aa8c5d 100644 --- a/intrepid.c +++ b/intrepid.c @@ -57,7 +57,7 @@ #define KO_DESC "Netdevice driver for Intrepid CAN/Ethernet devices" #define KO_MAJOR 2 #define KO_MINOR 0 -#define KO_PATCH 3 +#define KO_PATCH 4 #define KO_VERSION str(KO_MAJOR) "." str(KO_MINOR) "." str(KO_PATCH) #define KO_VERSION_INT (KO_MAJOR << 16) | (KO_MINOR << 8) | KO_PATCH @@ -273,6 +273,7 @@ static int intrepid_netdevice_stop(struct net_device *dev) spin_lock_bh(&ics->lock); netif_stop_queue(dev); + netif_carrier_off(dev); spin_unlock_bh(&ics->lock); return 0; @@ -281,6 +282,7 @@ static int intrepid_netdevice_stop(struct net_device *dev) static int intrepid_netdevice_open(struct net_device *dev) { netif_start_queue(dev); + netif_carrier_on(dev); return 0; }