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-13-fib_trie-Add-functions-should_inflate-and-should_hal.patch | |
| parent | 87568ebeacd733d211da5dcce8d82df4aa872b84 (diff) | |
| download | upstream-17afb853eec6dc4f39f0815831379be004f98cc5.tar.gz upstream-17afb853eec6dc4f39f0815831379be004f98cc5.tar.bz2 upstream-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-13-fib_trie-Add-functions-should_inflate-and-should_hal.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/080-13-fib_trie-Add-functions-should_inflate-and-should_hal.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/080-13-fib_trie-Add-functions-should_inflate-and-should_hal.patch b/target/linux/generic/patches-3.18/080-13-fib_trie-Add-functions-should_inflate-and-should_hal.patch index 42c0394689..c01d57af0f 100644 --- a/target/linux/generic/patches-3.18/080-13-fib_trie-Add-functions-should_inflate-and-should_hal.patch +++ b/target/linux/generic/patches-3.18/080-13-fib_trie-Add-functions-should_inflate-and-should_hal.patch @@ -139,7 +139,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int max_work; if (!tn) -@@ -668,86 +750,12 @@ static struct tnode *resize(struct trie +@@ -668,86 +750,12 @@ static struct tnode *resize(struct trie /* One child */ if (tn->empty_children == (tnode_child_length(tn) - 1)) goto one_child; @@ -229,7 +229,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> old_tn = tn; tn = inflate(t, tn); -@@ -764,16 +772,11 @@ static struct tnode *resize(struct trie +@@ -764,16 +772,11 @@ static struct tnode *resize(struct trie if (max_work != MAX_WORK) return tn; |