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>

diff --git a/net/ipv4/fib_lookup.h b/net/ipv4/fib_lookup.h
index 1e4f6600b31d4929cce729dcb38a3227b0de0a48..825981b1049a6c17ec065c000452cdf98e41bacf 100644 (file)
--- a/net/ipv4/fib_lookup.h
+++ b/net/ipv4/fib_lookup.h
@@ -32,7 +32,6 @@ int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, u32 tb_id,
                  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)

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 265cb72b7c1b633aa1c431487dbda9898a22d930..1e2090ea663e209b739e01186b3939802630d63f 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -411,24 +411,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)

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 90654bb64e21f81c9cf56ca453043a6a2a49f59d..7f342265968e8244603c69d921e5904ee3e8ce4d 100644 (file)
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -998,6 +998,26 @@ static struct tnode *fib_find_node(struct trie *t, u32 key)
        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;