Commit c43c3d76 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 197dbf24
...@@ -311,6 +311,11 @@ static inline int fib_lookup(struct net *net, const struct flowi4 *flp, ...@@ -311,6 +311,11 @@ static inline int fib_lookup(struct net *net, const struct flowi4 *flp,
return err; 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) static inline bool fib4_rule_default(const struct fib_rule *rule)
{ {
return true; return true;
...@@ -378,6 +383,11 @@ static inline int fib_lookup(struct net *net, struct flowi4 *flp, ...@@ -378,6 +383,11 @@ static inline int fib_lookup(struct net *net, struct flowi4 *flp,
return err; 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); bool fib4_rule_default(const struct fib_rule *rule);
int fib4_rules_dump(struct net *net, struct notifier_block *nb, int fib4_rules_dump(struct net *net, struct notifier_block *nb,
struct netlink_ext_ack *extack); struct netlink_ext_ack *extack);
......
...@@ -70,11 +70,6 @@ static int __net_init fib4_rules_init(struct net *net) ...@@ -70,11 +70,6 @@ static int __net_init fib4_rules_init(struct net *net)
fib_free_table(main_table); fib_free_table(main_table);
return -ENOMEM; return -ENOMEM;
} }
static bool fib4_has_custom_rules(struct net *net)
{
return false;
}
#else #else
struct fib_table *fib_new_table(struct net *net, u32 id) 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) ...@@ -131,11 +126,6 @@ struct fib_table *fib_get_table(struct net *net, u32 id)
} }
return NULL; return NULL;
} }
static bool fib4_has_custom_rules(struct net *net)
{
return net->ipv4.fib_has_custom_rules;
}
#endif /* CONFIG_IP_MULTIPLE_TABLES */ #endif /* CONFIG_IP_MULTIPLE_TABLES */
static void fib_replace_table(struct net *net, struct fib_table *old, static void fib_replace_table(struct net *net, struct fib_table *old,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment