aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/080-24-fib_trie-Move-fib_find_alias-to-file-where-it-is-use.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2016-12-25 20:11:34 +0100
committerJohn Crispin <john@phrozen.org>2017-08-05 08:46:36 +0200
commit74d00a8c3849c1340efd713eb94b786e304c201f (patch)
treede481743de61c34da96ab5f9dba3af3edcfb8260 /target/linux/generic/patches-3.18/080-24-fib_trie-Move-fib_find_alias-to-file-where-it-is-use.patch
parentde350550ef648d9728351b986b0516fa29465c45 (diff)
downloadupstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.gz
upstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.bz2
upstream-74d00a8c3849c1340efd713eb94b786e304c201f.zip
kernel: split patches folder up into backport, pending and hack folders
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/generic/patches-3.18/080-24-fib_trie-Move-fib_find_alias-to-file-where-it-is-use.patch')
-rw-r--r--target/linux/generic/patches-3.18/080-24-fib_trie-Move-fib_find_alias-to-file-where-it-is-use.patch79
1 files changed, 0 insertions, 79 deletions
diff --git a/target/linux/generic/patches-3.18/080-24-fib_trie-Move-fib_find_alias-to-file-where-it-is-use.patch b/target/linux/generic/patches-3.18/080-24-fib_trie-Move-fib_find_alias-to-file-where-it-is-use.patch
deleted file mode 100644
index 5eba700caa..0000000000
--- a/target/linux/generic/patches-3.18/080-24-fib_trie-Move-fib_find_alias-to-file-where-it-is-use.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Alexander Duyck <alexander.h.duyck@redhat.com>
-Date: Thu, 22 Jan 2015 15:51:39 -0800
-Subject: [PATCH] fib_trie: Move fib_find_alias to file where it is used
-
-The function fib_find_alias is only accessed by functions in fib_trie.c as
-such it makes sense to relocate it and cast it as static so that the
-compiler can take advantage of optimizations it can do to it as a local
-function.
-
-Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/net/ipv4/fib_lookup.h
-+++ b/net/ipv4/fib_lookup.h
-@@ -32,7 +32,6 @@ int fib_dump_info(struct sk_buff *skb, u
- unsigned int);
- void rtmsg_fib(int event, __be32 key, struct fib_alias *fa, int dst_len,
- u32 tb_id, const struct nl_info *info, unsigned int nlm_flags);
--struct fib_alias *fib_find_alias(struct list_head *fah, u8 tos, u32 prio);
-
- static inline void fib_result_assign(struct fib_result *res,
- struct fib_info *fi)
---- a/net/ipv4/fib_semantics.c
-+++ b/net/ipv4/fib_semantics.c
-@@ -410,24 +410,6 @@ errout:
- rtnl_set_sk_err(info->nl_net, RTNLGRP_IPV4_ROUTE, err);
- }
-
--/* Return the first fib alias matching TOS with
-- * priority less than or equal to PRIO.
-- */
--struct fib_alias *fib_find_alias(struct list_head *fah, u8 tos, u32 prio)
--{
-- if (fah) {
-- struct fib_alias *fa;
-- list_for_each_entry(fa, fah, fa_list) {
-- if (fa->fa_tos > tos)
-- continue;
-- if (fa->fa_info->fib_priority >= prio ||
-- fa->fa_tos < tos)
-- return fa;
-- }
-- }
-- return NULL;
--}
--
- static int fib_detect_death(struct fib_info *fi, int order,
- struct fib_info **last_resort, int *last_idx,
- int dflt)
---- a/net/ipv4/fib_trie.c
-+++ b/net/ipv4/fib_trie.c
-@@ -998,6 +998,26 @@ static struct tnode *fib_find_node(struc
- return n;
- }
-
-+/* Return the first fib alias matching TOS with
-+ * priority less than or equal to PRIO.
-+ */
-+static struct fib_alias *fib_find_alias(struct list_head *fah, u8 tos, u32 prio)
-+{
-+ struct fib_alias *fa;
-+
-+ if (!fah)
-+ return NULL;
-+
-+ list_for_each_entry(fa, fah, fa_list) {
-+ if (fa->fa_tos > tos)
-+ continue;
-+ if (fa->fa_info->fib_priority >= prio || fa->fa_tos < tos)
-+ return fa;
-+ }
-+
-+ return NULL;
-+}
-+
- static void trie_rebalance(struct trie *t, struct tnode *tn)
- {
- struct tnode *tp;