diff options
| author | Deng Qingfang <dengqf6@mail2.sysu.edu.cn> | 2019-03-20 16:05:14 +0800 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-03-20 21:48:04 +0100 |
| commit | 31078dbc763c27d9d25aac9fb08eb39da7752c87 (patch) | |
| tree | eb199a99b28ebc0d325cde7b20415cd36e20aaee /package/network/utils/iproute2/patches/135-sync-iptables-header.patch | |
| parent | 8568dcd931c53ba177f1c9601e9706d95d015062 (diff) | |
| download | upstream-31078dbc763c27d9d25aac9fb08eb39da7752c87.tar.gz upstream-31078dbc763c27d9d25aac9fb08eb39da7752c87.tar.bz2 upstream-31078dbc763c27d9d25aac9fb08eb39da7752c87.zip | |
iproute2: update to 5.0.0
Update iproute2 to 5.0.0
Remove upstream patch 001-tc-fix-undefined-XATTR_SIZE_MAX
Alter patch 170-ip_tiny as support for IPX and DECnet is dropped
Update patch 010-cake-fwmark to match upstream commit
Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
Diffstat (limited to 'package/network/utils/iproute2/patches/135-sync-iptables-header.patch')
| -rw-r--r-- | package/network/utils/iproute2/patches/135-sync-iptables-header.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/utils/iproute2/patches/135-sync-iptables-header.patch b/package/network/utils/iproute2/patches/135-sync-iptables-header.patch index a04d8ac742..bba90e69ab 100644 --- a/package/network/utils/iproute2/patches/135-sync-iptables-header.patch +++ b/package/network/utils/iproute2/patches/135-sync-iptables-header.patch @@ -7,7 +7,7 @@ Author: Cyril Brulebois <cyril@debamax.com> Last-Update: 2017-11-22 --- a/include/xtables.h +++ b/include/xtables.h -@@ -205,9 +205,24 @@ enum xtables_ext_flags { +@@ -206,9 +206,24 @@ enum xtables_ext_flags { XTABLES_EXT_ALIAS = 1 << 0, }; @@ -34,7 +34,7 @@ Last-Update: 2017-11-22 /* * ABI/API version this module requires. Must be first member, * as the rest of this struct may be subject to ABI changes. -@@ -269,6 +284,10 @@ struct xtables_match +@@ -270,6 +285,10 @@ struct xtables_match void (*x6_fcheck)(struct xt_fcheck_call *); const struct xt_option_entry *x6_options; @@ -45,7 +45,7 @@ Last-Update: 2017-11-22 /* Size of per-extension instance extra "global" scratch space */ size_t udata_size; -@@ -280,8 +299,7 @@ struct xtables_match +@@ -281,8 +300,7 @@ struct xtables_match unsigned int loaded; /* simulate loading so options are merged properly */ }; @@ -55,7 +55,7 @@ Last-Update: 2017-11-22 /* * ABI/API version this module requires. Must be first member, * as the rest of this struct may be subject to ABI changes. -@@ -346,6 +364,10 @@ struct xtables_target +@@ -347,6 +365,10 @@ struct xtables_target void (*x6_fcheck)(struct xt_fcheck_call *); const struct xt_option_entry *x6_options; @@ -66,7 +66,7 @@ Last-Update: 2017-11-22 size_t udata_size; /* Ignore these men behind the curtain: */ -@@ -406,6 +428,17 @@ struct xtables_globals +@@ -407,6 +429,17 @@ struct xtables_globals #define XT_GETOPT_TABLEEND {.name = NULL, .has_arg = false} @@ -84,7 +84,7 @@ Last-Update: 2017-11-22 #ifdef __cplusplus extern "C" { #endif -@@ -548,6 +581,14 @@ extern void xtables_lmap_free(struct xta +@@ -549,6 +582,14 @@ extern void xtables_lmap_free(struct xta extern int xtables_lmap_name2id(const struct xtables_lmap *, const char *); extern const char *xtables_lmap_id2name(const struct xtables_lmap *, int); |