|
@@ -1,54 +0,0 @@
|
|
|
-From e6f21b0cd5a449c1bf7a4d2c6bc5ad278a2d4e8e Mon Sep 17 00:00:00 2001
|
|
|
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
-Date: Mon, 15 Jul 2019 01:01:34 +0200
|
|
|
-Subject: [PATCH] fix include to find SIOCGSTAMP with latest kernel
|
|
|
-
|
|
|
-In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115
|
|
|
-the asm-generic/sockios.h header no longer defines SIOCGSTAMP.
|
|
|
-Instead it provides only SIOCGSTAMP_OLD.
|
|
|
-
|
|
|
-The linux/sockios.h header now defines SIOCGSTAMP using either
|
|
|
-SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only
|
|
|
-header file is not pulled so we get a build failure.
|
|
|
-
|
|
|
-./state_bcm.c: In function 'state_bcm':
|
|
|
-./state_bcm.c:91:16: error: 'SIOCGSTAMP' undeclared (first use in this function); did you mean 'SIOCGARP'?
|
|
|
- if(ioctl(sc, SIOCGSTAMP, &tv) < 0) {
|
|
|
-
|
|
|
-Fixes:
|
|
|
- - http://autobuild.buildroot.org/results/3112b1ad77e805cd3ca61bb79560e8e13a466589
|
|
|
-
|
|
|
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
-[Upstream status: https://github.com/dschanoeh/socketcand/pull/26]
|
|
|
----
|
|
|
- state_bcm.c | 1 +
|
|
|
- state_isotp.c | 1 +
|
|
|
- 2 files changed, 2 insertions(+)
|
|
|
-
|
|
|
-diff --git a/state_bcm.c b/state_bcm.c
|
|
|
-index 0c980fa..d6bdd7e 100644
|
|
|
---- a/state_bcm.c
|
|
|
-+++ b/state_bcm.c
|
|
|
-@@ -21,6 +21,7 @@
|
|
|
- #include <linux/can.h>
|
|
|
- #include <linux/can/bcm.h>
|
|
|
- #include <linux/can/error.h>
|
|
|
-+#include <linux/sockios.h>
|
|
|
-
|
|
|
- #define RXLEN 128
|
|
|
-
|
|
|
-diff --git a/state_isotp.c b/state_isotp.c
|
|
|
-index 4005f94..7b515e7 100644
|
|
|
---- a/state_isotp.c
|
|
|
-+++ b/state_isotp.c
|
|
|
-@@ -20,6 +20,7 @@
|
|
|
- #include <linux/can.h>
|
|
|
- #include <linux/can/isotp.h>
|
|
|
- #include <linux/can/error.h>
|
|
|
-+#include <linux/sockios.h>
|
|
|
-
|
|
|
- int si = -1;
|
|
|
- fd_set readfds;
|
|
|
---
|
|
|
-2.20.1
|
|
|
-
|