aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-05-30 18:51:36 -0400
committerScott Murray <scott.murray@konsulko.com>2022-07-06 14:00:05 -0400
commite5349e7b7beeed120e6cbfb1175bf823dd30b032 (patch)
treeffb09ac8f386d7727ddd03f118176dfaf7a7aecc /recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch
parentca7d98904253c7404c3e6384ebb53d922a3c538a (diff)
sllin: switch to updated upstream
Changes: - Switch the SRC_URI of the sllin driver recipe to point at the new revived upstream location, update to their latest commit to get newer kernel support, and drop all the now unnecessary local patches. - Added a patch to fix compilation against 5.4 kernels before 5.4.110. This will be worked with upstream as time permits. - Rename the sllin driver recipe with a _git suffix to match OE style expectations. - Added the sllin driver to packagegroup-agl-demo as was being done in previous releases. - Split the demo script + service unit and lin_config configuration out of the sllin driver recipe into a new sllin-demo recipe so that they're no longer conflated. This should make it easier for others to reuse the sllin driver recipe. - Update the SRC_URI and SRCREV of the lin_config recipe to also point at the new upstream location/version since it comes out of the same repository. - Add the new master mode "-m" flag to the lin_config command line in the start_lin_demo.sh script (now in sllin-demo). This turns out to be required for our demo usecase as upstream seem to have inadvertently changed the default behavior. Bug-AGL: SPEC-4404 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: If42a825e65d93b3fa11cfddd5d6b33ec410f7cc4
Diffstat (limited to 'recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch')
-rw-r--r--recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch69
1 files changed, 0 insertions, 69 deletions
diff --git a/recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch b/recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch
deleted file mode 100644
index c8f2f9268..000000000
--- a/recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From fcebb8f510bbb5c681f1f9af4506b4de241837dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org>
-Date: Wed, 31 Oct 2018 20:48:20 +0000
-Subject: [PATCH] Allow recent kernels newer 4.11.x to build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-API changes enforce porting.
-
-Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
----
- sllin/sllin.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/sllin/sllin.c b/sllin/sllin.c
-index 2969448..7e17127 100644
---- a/sllin/sllin.c
-+++ b/sllin/sllin.c
-@@ -56,7 +56,12 @@
- #include <linux/rtnetlink.h>
- #include <linux/if_arp.h>
- #include <linux/if_ether.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
- #include <linux/sched.h>
-+#else
-+#include <uapi/linux/sched/types.h>
-+#endif
- #include <linux/delay.h>
- #include <linux/init.h>
- #include <linux/can.h>
-@@ -447,7 +451,9 @@ static int sll_open(struct net_device *dev)
- static void sll_free_netdev(struct net_device *dev)
- {
- int i = dev->base_addr;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,9)
- free_netdev(dev);
-+#endif
- sllin_devs[i] = NULL;
- }
-
-@@ -460,7 +466,12 @@ static const struct net_device_ops sll_netdev_ops = {
- static void sll_setup(struct net_device *dev)
- {
- dev->netdev_ops = &sll_netdev_ops;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,9)
- dev->destructor = sll_free_netdev;
-+#else
-+ dev->needs_free_netdev = true;
-+ dev->priv_destructor = sll_free_netdev;
-+#endif
-
- dev->hard_header_len = 0;
- dev->addr_len = 0;
-@@ -1685,8 +1696,10 @@ static void __exit sllin_exit(void)
- sl = netdev_priv(dev);
- if (sl->tty) {
- netdev_dbg(sl->dev, "tty discipline still running\n");
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,9)
- /* Intentionally leak the control block. */
- dev->destructor = NULL;
-+#endif
- }
-
- unregister_netdev(dev);
---
-2.13.7
-