ipv4: move fib4_has_custom_rules() helper to public header

So that we can use it in the next patch.
Additionally constify the helper argument.

Suggested-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 52b2406a5dfcd13598c3336df3f2e98284e2e5c2..b9cba41c6d4f6d3881a3440f25bc85c894010c72 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -311,6 +311,11 @@ static inline int fib_lookup(struct net *net, const struct flowi4 *flp,
        return err;
 }
 
+static inline bool fib4_has_custom_rules(const struct net *net)
+{
+       return false;
+}
+
 static inline bool fib4_rule_default(const struct fib_rule *rule)
 {
        return true;
@@ -378,6 +383,11 @@ out:
        return err;
 }
 
+static inline bool fib4_has_custom_rules(const struct net *net)
+{
+       return net->ipv4.fib_has_custom_rules;
+}
+
 bool fib4_rule_default(const struct fib_rule *rule);
 int fib4_rules_dump(struct net *net, struct notifier_block *nb,
                    struct netlink_ext_ack *extack);

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 71c78d223dfd32b1b95ee9e9aeffdaa95fd1a8c6..577db1d50a24ae0aba16023f846981425d08e59b 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -70,11 +70,6 @@ fail:
        fib_free_table(main_table);
        return -ENOMEM;
 }
-
-static bool fib4_has_custom_rules(struct net *net)
-{
-       return false;
-}
 #else
 
 struct fib_table *fib_new_table(struct net *net, u32 id)
@@ -131,11 +126,6 @@ struct fib_table *fib_get_table(struct net *net, u32 id)
        }
        return NULL;
 }
-
-static bool fib4_has_custom_rules(struct net *net)
-{
-       return net->ipv4.fib_has_custom_rules;
-}
 #endif /* CONFIG_IP_MULTIPLE_TABLES */
 
 static void fib_replace_table(struct net *net, struct fib_table *old,