0002-net-proto-ip-raw.c-fix-build-with-kernel-5.13.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From da65f0aa2bfcb4a2d9a77abfaa2955c6be3d37c9 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Sat, 17 Jul 2021 08:02:31 +0200
  4. Subject: [PATCH] net/proto-ip-raw.c: fix build with kernel >= 5.13
  5. Fix the following build failure with kernel >= 5.13:
  6. In file included from /home/buildroot/autobuild/instance-2/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/linux/icmp.h:23,
  7. from net/proto-ip-raw.c:1:
  8. /home/buildroot/autobuild/instance-2/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/netinet/in.h:33:5: error: redeclaration of enumerator 'IPPROTO_IP'
  9. 33 | IPPROTO_IP = 0, /* Dummy protocol for TCP. */
  10. | ^~~~~~~~~~
  11. /home/buildroot/autobuild/instance-2/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/linux/in.h:29:3: note: previous definition of 'IPPROTO_IP' was here
  12. 29 | IPPROTO_IP = 0, /* Dummy protocol for TCP */
  13. | ^~~~~~~~~~
  14. Fixes:
  15. - http://autobuild.buildroot.org/results/c58119baed8d7711da799e34a5ee1117f46b96f4
  16. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  17. [Upstream status: https://github.com/kernelslacker/trinity/pull/35]
  18. ---
  19. net/proto-ip-raw.c | 1 +
  20. 1 file changed, 1 insertion(+)
  21. diff --git a/net/proto-ip-raw.c b/net/proto-ip-raw.c
  22. index 95f2cb13..b407bb68 100644
  23. --- a/net/proto-ip-raw.c
  24. +++ b/net/proto-ip-raw.c
  25. @@ -1,3 +1,4 @@
  26. +#include <netinet/in.h>
  27. #include <linux/icmp.h>
  28. #include "net.h"
  29. #include "trinity.h"
  30. --
  31. 2.30.2