Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

1 files changed, 0 insertions, 38 deletions

diff --git a/package/iproute2/0002-Add-missing-sys-types.h-include.patch b/package/iproute2/0002-Add-missing-sys-types.h-include.patch
deleted file mode 100644
index ef918140da..0000000000
--- a/package/iproute2/0002-Add-missing-sys-types.h-include.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 560dee4b4be54699c0c9679771c9e0d61e4db80a Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 19 Nov 2015 17:48:55 +0100
-Subject: [PATCH] Add missing <sys/types.h> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The u_intXX_t types are defined in <sys/types.h>, so it should be
-included before using those types. Otherwise, with certain C
-libraries, the build fails with:
-
-In file included from ../include/iptables.h:4:0,
-                 from m_ipt.c:18:
-../include/iptables_common.h:47:16: error: unknown type name ‘u_int32_t’
- #define __le32 u_int32_t
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- include/iptables_common.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/iptables_common.h b/include/iptables_common.h
-index 9099667..2c27a4b 100644
---- a/include/iptables_common.h
-+++ b/include/iptables_common.h
-@@ -43,6 +43,8 @@ extern char *lib_dir;
-   extern void init_extensions(void);
- #endif
- 
-+#include <sys/types.h>
-+
- #define __be32	u_int32_t
- #define __le32	u_int32_t
- #define __be16	u_int16_t
--- 
-2.6.3
-