kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4

[openwrt/openwrt.git] / target / linux / generic / patches-3.18 / 080-13-fib_trie-Add-functions-should_inflate-and-should_hal.patch

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 42c03946895bc114f314aa070f4df4828a7fc1c2..c01d57af0fd0a1e5595d61d2a174e4389ada406b 100644 (file)
--- 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;