From 5d4be21553ddc62ac97b9698c656829d7e814ee1 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 18 Mar 2015 18:21:08 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44876 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../080-08-fib_trie-Optimize-fib_table_insert.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/generic/patches-3.18/080-08-fib_trie-Optimize-fib_table_insert.patch') diff --git a/target/linux/generic/patches-3.18/080-08-fib_trie-Optimize-fib_table_insert.patch b/target/linux/generic/patches-3.18/080-08-fib_trie-Optimize-fib_table_insert.patch index dd150ebf33..b328d2c5d2 100644 --- a/target/linux/generic/patches-3.18/080-08-fib_trie-Optimize-fib_table_insert.patch +++ b/target/linux/generic/patches-3.18/080-08-fib_trie-Optimize-fib_table_insert.patch @@ -88,12 +88,12 @@ Signed-off-by: David S. Miller - * If we point to a T_TNODE, check if it matches our key. Note that - * a T_TNODE might be skipping any number of bits - its 'pos' need - * not be the parent's 'pos'+'bits'! - * +- * - * If it does match the current key, get pos/bits from it, extract - * the index from our key, push the T_TNODE and walk the tree. - * - * If it doesn't, we have to replace it with a new T_TNODE. -- * + * - * If we point to a T_LEAF, it might or might not have the same key - * as we do. If it does, just change the value, update the T_LEAF's - * value, and return it. @@ -129,13 +129,13 @@ Signed-off-by: David S. Miller + if (index >> n->bits) break; - } - +- - /* - * n ----> NULL, LEAF or TNODE - * - * tp is n's (parent) ----> NULL or TNODE - */ -- + - BUG_ON(tp && IS_LEAF(tp)); - - /* Case 1: n is a leaf. Compare prefixes */ @@ -162,9 +162,9 @@ Signed-off-by: David S. Miller - - if (!l) - return NULL; -- -- li = leaf_info_new(plen); +- li = leaf_info_new(plen); +- - if (!li) { - node_free(l); + l = leaf_new(key); -- cgit v1.2.3