projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
generic
/
patches-3.18
/
080-16-fib_trie-inflate-halve-nodes-in-a-more-RCU-friendly-.patch
diff --git
a/target/linux/generic/patches-3.18/080-16-fib_trie-inflate-halve-nodes-in-a-more-RCU-friendly-.patch
b/target/linux/generic/patches-3.18/080-16-fib_trie-inflate-halve-nodes-in-a-more-RCU-friendly-.patch
index caa2e0e4b1a74f6d6b08d74d8e7af63767926efe..d6b600c5dd5ad79b37a3031ac14b3b58b5f2070b 100644
(file)
--- a/
target/linux/generic/patches-3.18/080-16-fib_trie-inflate-halve-nodes-in-a-more-RCU-friendly-.patch
+++ b/
target/linux/generic/patches-3.18/080-16-fib_trie-inflate-halve-nodes-in-a-more-RCU-friendly-.patch
@@
-17,7
+17,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
-@@ -391,8 +391,6 @@ static void put_child(struct tnode *tn,
+@@ -391,8 +391,6 @@ static void put_child(struct tnode *tn,
else if (!wasfull && isfull)
tn->full_children++;
else if (!wasfull && isfull)
tn->full_children++;
@@
-235,7
+235,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
pr_debug("In halve\n");
pr_debug("In halve\n");
-@@ -577,68 +575,64 @@ static int halve(struct trie *t, struct
+@@ -577,68 +575,64 @@ static int halve(struct trie *t, struct
if (!tn)
return -ENOMEM;
if (!tn)
return -ENOMEM;