aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/080-21-fib_trie-Fall-back-to-slen-update-on-inflate-halve-f.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-03-25 15:29:06 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2019-05-03 22:41:38 +0200
commit1325e74e0c2f9ebdafe05b1492cec77a60059920 (patch)
treeaf21c4890a4ae5c08dc08ee7cabdc14a651f33ad /target/linux/generic/pending-3.18/080-21-fib_trie-Fall-back-to-slen-update-on-inflate-halve-f.patch
parent675832de79ec14ddc1183a66d1084aff7a856289 (diff)
downloadupstream-1325e74e0c2f9ebdafe05b1492cec77a60059920.tar.gz
upstream-1325e74e0c2f9ebdafe05b1492cec77a60059920.tar.bz2
upstream-1325e74e0c2f9ebdafe05b1492cec77a60059920.zip
kernel: Remove support for kernel 3.18
No target is using kernel 3.18 anymore, remove all the generic support for kernel 3.18. The removed packages are depending on kernel 3.18 only and are not used on any recent kernel. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-3.18/080-21-fib_trie-Fall-back-to-slen-update-on-inflate-halve-f.patch')
-rw-r--r--target/linux/generic/pending-3.18/080-21-fib_trie-Fall-back-to-slen-update-on-inflate-halve-f.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/target/linux/generic/pending-3.18/080-21-fib_trie-Fall-back-to-slen-update-on-inflate-halve-f.patch b/target/linux/generic/pending-3.18/080-21-fib_trie-Fall-back-to-slen-update-on-inflate-halve-f.patch
deleted file mode 100644
index 058b33bf9d..0000000000
--- a/target/linux/generic/pending-3.18/080-21-fib_trie-Fall-back-to-slen-update-on-inflate-halve-f.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Alexander Duyck <alexander.h.duyck@redhat.com>
-Date: Thu, 22 Jan 2015 15:51:20 -0800
-Subject: [PATCH] fib_trie: Fall back to slen update on inflate/halve failure
-
-This change corrects an issue where if inflate or halve fails we were
-exiting the resize function without at least updating the slen for the
-node. To correct this I have moved the update of max_size into the while
-loop so that it is only decremented on a successful call to either inflate
-or halve.
-
-Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/net/ipv4/fib_trie.c
-+++ b/net/ipv4/fib_trie.c
-@@ -752,7 +752,7 @@ static void resize(struct trie *t, struc
- {
- struct tnode *tp = node_parent(tn), *n = NULL;
- struct tnode __rcu **cptr;
-- int max_work;
-+ int max_work = MAX_WORK;
-
- pr_debug("In tnode_resize %p inflate_threshold=%d threshold=%d\n",
- tn, inflate_threshold, halve_threshold);
-@@ -775,8 +775,7 @@ static void resize(struct trie *t, struc
- /* Double as long as the resulting node has a number of
- * nonempty nodes that are above the threshold.
- */
-- max_work = MAX_WORK;
-- while (should_inflate(tp, tn) && max_work--) {
-+ while (should_inflate(tp, tn) && max_work) {
- if (inflate(t, tn)) {
- #ifdef CONFIG_IP_FIB_TRIE_STATS
- this_cpu_inc(t->stats->resize_node_skipped);
-@@ -784,6 +783,7 @@ static void resize(struct trie *t, struc
- break;
- }
-
-+ max_work--;
- tn = rtnl_dereference(*cptr);
- }
-
-@@ -794,8 +794,7 @@ static void resize(struct trie *t, struc
- /* Halve as long as the number of empty children in this
- * node is above threshold.
- */
-- max_work = MAX_WORK;
-- while (should_halve(tp, tn) && max_work--) {
-+ while (should_halve(tp, tn) && max_work) {
- if (halve(t, tn)) {
- #ifdef CONFIG_IP_FIB_TRIE_STATS
- this_cpu_inc(t->stats->resize_node_skipped);
-@@ -803,6 +802,7 @@ static void resize(struct trie *t, struc
- break;
- }
-
-+ max_work--;
- tn = rtnl_dereference(*cptr);
- }
-