0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch 1.8 KB

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