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-18-fib_trie-Add-tracking-value-for-suffix-length.patch | |
| parent | 87568ebeacd733d211da5dcce8d82df4aa872b84 (diff) | |
| download | mtk-20170518-17afb853eec6dc4f39f0815831379be004f98cc5.zip mtk-20170518-17afb853eec6dc4f39f0815831379be004f98cc5.tar.gz mtk-20170518-17afb853eec6dc4f39f0815831379be004f98cc5.tar.bz2 | |
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-18-fib_trie-Add-tracking-value-for-suffix-length.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/080-18-fib_trie-Add-tracking-value-for-suffix-length.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/080-18-fib_trie-Add-tracking-value-for-suffix-length.patch b/target/linux/generic/patches-3.18/080-18-fib_trie-Add-tracking-value-for-suffix-length.patch index c9cd1cf..6a4a45e 100644 --- a/target/linux/generic/patches-3.18/080-18-fib_trie-Add-tracking-value-for-suffix-length.patch +++ b/target/linux/generic/patches-3.18/080-18-fib_trie-Add-tracking-value-for-suffix-length.patch @@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> tn->pos = pos; tn->bits = bits; tn->key = (shift < KEYLENGTH) ? (key >> shift) << shift : 0; -@@ -387,6 +390,9 @@ static void put_child(struct tnode *tn, +@@ -387,6 +390,9 @@ static void put_child(struct tnode *tn, else if (!wasfull && isfull) tn->full_children++; @@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> rcu_assign_pointer(tn->child[i], n); } -@@ -635,6 +641,41 @@ static int halve(struct trie *t, struct +@@ -635,6 +641,41 @@ static int halve(struct trie *t, struct return 0; } @@ -120,7 +120,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> -static void insert_leaf_info(struct hlist_head *head, struct leaf_info *new) +static void leaf_pull_suffix(struct tnode *l) - { ++{ + struct tnode *tp = node_parent(l); + + while (tp && (tp->slen > tp->pos) && (tp->slen > l->slen)) { @@ -169,7 +169,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> +} + +static void insert_leaf_info(struct tnode *l, struct leaf_info *new) -+{ + { + struct hlist_head *head = &l->list; struct leaf_info *li = NULL, *last = NULL; |