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-05-fib_trie-Merge-leaf-into-tnode.patch | |
| parent | 87568ebeacd733d211da5dcce8d82df4aa872b84 (diff) | |
| download | upstream-17afb853eec6dc4f39f0815831379be004f98cc5.tar.gz upstream-17afb853eec6dc4f39f0815831379be004f98cc5.tar.bz2 upstream-17afb853eec6dc4f39f0815831379be004f98cc5.zip | |
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-05-fib_trie-Merge-leaf-into-tnode.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/080-05-fib_trie-Merge-leaf-into-tnode.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.18/080-05-fib_trie-Merge-leaf-into-tnode.patch b/target/linux/generic/patches-3.18/080-05-fib_trie-Merge-leaf-into-tnode.patch index 20268f51c8..a3393bf93f 100644 --- a/target/linux/generic/patches-3.18/080-05-fib_trie-Merge-leaf-into-tnode.patch +++ b/target/linux/generic/patches-3.18/080-05-fib_trie-Merge-leaf-into-tnode.patch @@ -823,7 +823,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> seq_printf(seq, "Null ptrs: %u\n", stat->nullpointers); seq_printf(seq, "Total size: %u kB\n", (bytes + 1023) / 1024); } -@@ -2163,7 +2124,7 @@ static int fib_triestat_seq_show(struct +@@ -2163,7 +2124,7 @@ static int fib_triestat_seq_show(struct seq_printf(seq, "Basic info: size of leaf:" " %Zd bytes, size of tnode: %Zd bytes.\n", @@ -859,7 +859,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ++*pos; /* next node in same table */ -@@ -2330,29 +2291,26 @@ static inline const char *rtn_type(char +@@ -2329,29 +2290,26 @@ static inline const char *rtn_type(char static int fib_trie_seq_show(struct seq_file *seq, void *v) { const struct fib_trie_iter *iter = seq->private; @@ -896,7 +896,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> struct fib_alias *fa; list_for_each_entry_rcu(fa, &li->falh, fa_list) { -@@ -2402,9 +2360,9 @@ struct fib_route_iter { +@@ -2401,9 +2359,9 @@ struct fib_route_iter { t_key key; }; @@ -908,7 +908,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> struct trie *t = iter->main_trie; /* use cache location of last found key */ -@@ -2449,7 +2407,7 @@ static void *fib_route_seq_start(struct +@@ -2448,7 +2406,7 @@ static void *fib_route_seq_start(struct static void *fib_route_seq_next(struct seq_file *seq, void *v, loff_t *pos) { struct fib_route_iter *iter = seq->private; @@ -917,7 +917,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ++*pos; if (v == SEQ_START_TOKEN) { -@@ -2495,7 +2453,7 @@ static unsigned int fib_flag_trans(int t +@@ -2494,7 +2452,7 @@ static unsigned int fib_flag_trans(int t */ static int fib_route_seq_show(struct seq_file *seq, void *v) { |