diff options
| author | Deng Qingfang <dengqf6@mail2.sysu.edu.cn> | 2019-07-03 13:32:07 +0800 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-07-04 21:40:12 +0200 |
| commit | 917eeaf26bca5342817419d0c360301896932476 (patch) | |
| tree | fd411311eee7b4b08746fc930706289193cea197 /package/network/utils/iproute2/patches/090-tc-add-support-for-action-act_ctinfo.patch | |
| parent | 92f83abc5e0f7bacd0392ce0c1cddcfb358f0d03 (diff) | |
| download | upstream-917eeaf26bca5342817419d0c360301896932476.tar.gz upstream-917eeaf26bca5342817419d0c360301896932476.tar.bz2 upstream-917eeaf26bca5342817419d0c360301896932476.zip | |
iproute2: update to 5.1.0
Update iproute2 to 5.1.0
Remove upstream patch 010-cake-fwmark.patch
Backport a patch to fix struct sysinfo redefinition error
Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
Diffstat (limited to 'package/network/utils/iproute2/patches/090-tc-add-support-for-action-act_ctinfo.patch')
| -rw-r--r-- | package/network/utils/iproute2/patches/090-tc-add-support-for-action-act_ctinfo.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/package/network/utils/iproute2/patches/090-tc-add-support-for-action-act_ctinfo.patch b/package/network/utils/iproute2/patches/090-tc-add-support-for-action-act_ctinfo.patch index 6335cca03a..4e14a09eeb 100644 --- a/package/network/utils/iproute2/patches/090-tc-add-support-for-action-act_ctinfo.patch +++ b/package/network/utils/iproute2/patches/090-tc-add-support-for-action-act_ctinfo.patch @@ -77,16 +77,14 @@ diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index 95d0db2a..a6e7e176 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h -@@ -68,7 +68,8 @@ enum { - TCA_ID_UNSPEC=0, - TCA_ID_POLICE=1, +@@ -105,6 +105,7 @@ enum tca_id { + TCA_ID_IFE = TCA_ACT_IFE, + TCA_ID_SAMPLE = TCA_ACT_SAMPLE, /* other actions go here */ -- __TCA_ID_MAX=255 + TCA_ID_CTINFO=27, -+ __TCA_ID_MAX = 255 + __TCA_ID_MAX = 255 }; - #define TCA_ID_MAX __TCA_ID_MAX diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h new file mode 100644 index 00000000..f5f26d95 |