diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
| commit | 17afb853eec6dc4f39f0815831379be004f98cc5 (patch) | |
| tree | 5feb5a032288f0a36cc3890d258bcfb95b2f1ad3 /target/linux/generic/patches-3.18/080-22-fib_trie-Add-collapse-and-should_collapse-to-resize.patch | |
| parent | 87568ebeacd733d211da5dcce8d82df4aa872b84 (diff) | |
| download | master-31e0f0ae-17afb853eec6dc4f39f0815831379be004f98cc5.tar.gz master-31e0f0ae-17afb853eec6dc4f39f0815831379be004f98cc5.tar.bz2 master-31e0f0ae-17afb853eec6dc4f39f0815831379be004f98cc5.zip | |
kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4
also refresh generic patches for 3.14, 3.18, 3.19 and 4.0
targets might need a minor refresh as well, however, it looks
like everything still applies cleanly with occasional small
offsets.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 44876
Diffstat (limited to 'target/linux/generic/patches-3.18/080-22-fib_trie-Add-collapse-and-should_collapse-to-resize.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/080-22-fib_trie-Add-collapse-and-should_collapse-to-resize.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/080-22-fib_trie-Add-collapse-and-should_collapse-to-resize.patch b/target/linux/generic/patches-3.18/080-22-fib_trie-Add-collapse-and-should_collapse-to-resize.patch index afea33ff15..19b7db7f94 100644 --- a/target/linux/generic/patches-3.18/080-22-fib_trie-Add-collapse-and-should_collapse-to-resize.patch +++ b/target/linux/generic/patches-3.18/080-22-fib_trie-Add-collapse-and-should_collapse-to-resize.patch @@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> struct tnode __rcu *child[0]; }; /* This list pointer if valid if bits == 0 (LEAF) */ -@@ -302,6 +303,16 @@ static struct tnode *tnode_alloc(size_t +@@ -302,6 +303,16 @@ static struct tnode *tnode_alloc(size_t return vzalloc(size); } @@ -79,7 +79,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } pr_debug("AT %p s=%zu %zu\n", tn, sizeof(struct tnode), -@@ -375,11 +388,11 @@ static void put_child(struct tnode *tn, +@@ -375,11 +388,11 @@ static void put_child(struct tnode *tn, BUG_ON(i >= tnode_child_length(tn)); @@ -95,7 +95,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* update fullChildren */ wasfull = tnode_full(tn, chi); -@@ -630,6 +643,24 @@ static int halve(struct trie *t, struct +@@ -630,6 +643,24 @@ static int halve(struct trie *t, struct return 0; } @@ -120,7 +120,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static unsigned char update_suffix(struct tnode *tn) { unsigned char slen = tn->pos; -@@ -729,10 +760,12 @@ static bool should_inflate(const struct +@@ -729,10 +760,12 @@ static bool should_inflate(const struct /* Keep root node larger */ threshold *= tp ? inflate_threshold : inflate_threshold_root; |