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