blob: a54869db89faeef57337346f8eb863e2f87de1c9 [file] [log] [blame]
Brad Bishop0f291cc2019-09-01 15:16:57 -04001From 4456e13880803a300e4b6f263ad22a37481b5df5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 29 Aug 2019 09:33:43 -0700
4Subject: [PATCH] saaldump,atmdump: Include linux/sockios.h for SIOCGSTAMP
5
6In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115
7the asm-generic/sockios.h header no longer defines SIOCGSTAMP.
8Instead it provides only SIOCGSTAMP_OLD.
9
10The linux/sockios.h header now defines SIOCGSTAMP using either
11SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only
12header file is not pulled so we get a build failure.
13
14Fixes
15../../../linux-atm-2.5.2/src/maint/atmdump.c:142:18: error: use of undeclared identifier 'SIOCGSTAMP'
16 if (ioctl(s,SIOCGSTAMP,&stamp) < 0) {
17 ^
181 error generated.
19make[3]: *** [Makefile:623: atmdump.o] Error 1
20make[3]: *** Waiting for unfinished jobs....
21../../../linux-atm-2.5.2/src/maint/saaldump.c:169:14: error: use of undeclared identifier 'SIOCGSTAMP'
22 if (ioctl(s,SIOCGSTAMP,&stamp) < 0) {
23 ^
24Upstream-Status: Pending
25Signed-off-by: Khem Raj <raj.khem@gmail.com>
26---
27 src/maint/atmdump.c | 2 +-
28 src/maint/saaldump.c | 2 +-
29 2 files changed, 2 insertions(+), 2 deletions(-)
30
31diff --git a/src/maint/atmdump.c b/src/maint/atmdump.c
32index 8b17826..9e4853b 100644
33--- a/src/maint/atmdump.c
34+++ b/src/maint/atmdump.c
35@@ -5,7 +5,7 @@
36 #if HAVE_CONFIG_H
37 #include <config.h>
38 #endif
39-
40+#include <linux/sockios.h>
41 #include <stdlib.h>
42 #include <stdio.h>
43 #include <unistd.h>
44diff --git a/src/maint/saaldump.c b/src/maint/saaldump.c
45index 83bdde9..69429a8 100644
46--- a/src/maint/saaldump.c
47+++ b/src/maint/saaldump.c
48@@ -5,7 +5,7 @@
49 #if HAVE_CONFIG_H
50 #include <config.h>
51 #endif
52-
53+#include <linux/sockios.h>
54 #include <stdlib.h>
55 #include <stdarg.h>
56 #include <stdio.h>
57--
582.23.0
59