diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-03 20:56:45 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-03 20:56:45 +0000 |
| commit | 8e9eed344245571c7684216aebc38384b6c4be2d (patch) | |
| tree | f907a7ed53ded5f9f89d8ea9d57b625b94e3c4fc /package/network/utils/iproute2/patches/911-fix_in_h_include.patch | |
| parent | f49dadb0bd6bfcf2e2d8cd12956821e063c91be6 (diff) | |
| download | upstream-8e9eed344245571c7684216aebc38384b6c4be2d.tar.gz upstream-8e9eed344245571c7684216aebc38384b6c4be2d.tar.bz2 upstream-8e9eed344245571c7684216aebc38384b6c4be2d.zip | |
iproute2: update to 4.3.0
iproute2-4.0 had connmark support added by nbd. This does not work
with 4.x kernels. iproute2-4.3 is the latest version and has his
changes mainlined. This patch updates the package to iproute2-4.3
and fixes the patches so that it compiles. This should resolve
ticket #21374.
Signed-off-by: Rob Mosher <nyt-openwrt@countercultured.net>
SVN-Revision: 48098
Diffstat (limited to 'package/network/utils/iproute2/patches/911-fix_in_h_include.patch')
| -rw-r--r-- | package/network/utils/iproute2/patches/911-fix_in_h_include.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/package/network/utils/iproute2/patches/911-fix_in_h_include.patch b/package/network/utils/iproute2/patches/911-fix_in_h_include.patch new file mode 100644 index 0000000000..cce086c3e5 --- /dev/null +++ b/package/network/utils/iproute2/patches/911-fix_in_h_include.patch @@ -0,0 +1,30 @@ +--- a/include/linux/in.h ++++ b/include/linux/in.h +@@ -15,6 +15,7 @@ + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ ++#ifndef _NETINET_IN_H + #ifndef _LINUX_IN_H + #define _LINUX_IN_H + +@@ -297,3 +298,4 @@ struct sockaddr_in { + + + #endif /* _LINUX_IN_H */ ++#endif /* _NETINET_IN_H */ +--- a/include/linux/in6.h ++++ b/include/linux/in6.h +@@ -18,6 +18,7 @@ + * 2 of the License, or (at your option) any later version. + */ + ++#ifndef _NETINET_IN_H + #ifndef _LINUX_IN6_H + #define _LINUX_IN6_H + +@@ -291,3 +292,4 @@ struct in6_flowlabel_req { + * MRT6_MAX + */ + #endif /* _LINUX_IN6_H */ ++#endif /* _NETINET_IN_H */ |