diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2017-12-30 09:20:39 +0000 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-12-30 11:05:44 +0100 |
| commit | dca4dfacf22e93017c90c308dbeec27a77b4f338 (patch) | |
| tree | d7c1fa7d20f59964607544109867873b32bde0de /package/network | |
| parent | ee55629a300db2da977780287e1e573a5fefec65 (diff) | |
| download | upstream-dca4dfacf22e93017c90c308dbeec27a77b4f338.tar.gz upstream-dca4dfacf22e93017c90c308dbeec27a77b4f338.tar.bz2 upstream-dca4dfacf22e93017c90c308dbeec27a77b4f338.zip | |
iproute2: cake: fix patch format error
Fix patch format error introduced in c4e9487cf5
Refresh patches to tidy fuzz
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network')
| -rw-r--r-- | package/network/utils/iproute2/patches/950-add-cake-to-tc.patch | 13 | ||||
| -rw-r--r-- | package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch | 9 |
2 files changed, 6 insertions, 16 deletions
diff --git a/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch b/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch index 17fe1605b0..882db8af19 100644 --- a/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch +++ b/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch @@ -1,8 +1,6 @@ -diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h -index 8d2530d..c55a9a8 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h -@@ -850,4 +850,60 @@ struct tc_pie_xstats { +@@ -850,4 +850,63 @@ struct tc_pie_xstats { __u32 maxq; /* maximum queue size */ __u32 ecn_mark; /* packets marked with ecn*/ }; @@ -23,6 +21,8 @@ index 8d2530d..c55a9a8 100644 + TCA_CAKE_ETHERNET, + TCA_CAKE_WASH, + TCA_CAKE_MPU, ++ TCA_CAKE_INGRESS, ++ TCA_CAKE_ACK_FILTER, + __TCA_CAKE_MAX +}; +#define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1) @@ -35,7 +35,7 @@ index 8d2530d..c55a9a8 100644 + +#define TC_CAKE_MAX_TINS (8) +struct tc_cake_xstats { -+ __u16 version; /* == 4, increments when struct extended */ ++ __u16 version; /* == 5, increments when struct extended */ + __u8 max_tins; /* == TC_CAKE_MAX_TINS */ + __u8 tin_cnt; /* <= TC_CAKE_MAX_TINS */ + @@ -64,8 +64,6 @@ index 8d2530d..c55a9a8 100644 +}; + #endif -diff --git a/tc/Makefile b/tc/Makefile -index 56acbaa..d421b8e 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -63,6 +63,7 @@ TCMODULES += q_codel.o @@ -76,9 +74,6 @@ index 56acbaa..d421b8e 100644 TCMODULES += q_hhf.o TCMODULES += e_bpf.o -diff --git a/tc/q_cake.c b/tc/q_cake.c -new file mode 100644 -index 0000000..acbe56c --- /dev/null +++ b/tc/q_cake.c @@ -0,0 +1,771 @@ diff --git a/package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch b/package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch index 52be021e72..610fb525ae 100644 --- a/package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch +++ b/package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch @@ -20,12 +20,10 @@ Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> ip/ipnetns.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/ip/ipnetns.c b/ip/ipnetns.c -index af87065..ccc652c 100644 --- a/ip/ipnetns.c +++ b/ip/ipnetns.c -@@ -72,8 +72,8 @@ static int ipnetns_have_nsid(void) - if (have_rtnl_getnsid < 0) { +@@ -73,8 +73,8 @@ static int ipnetns_have_nsid(void) + fd = open("/proc/self/ns/net", O_RDONLY); if (fd < 0) { - perror("open(\"/proc/self/ns/net\")"); @@ -35,6 +33,3 @@ index af87065..ccc652c 100644 } addattr32(&req.n, 1024, NETNSA_FD, fd); --- -2.6.4 - |