Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipv4: move fib4_has_custom_rules() helper to public header

Browse Source 
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>
This commit is contained in:
Paolo Abeni 2019-11-20 13:47:36 +01:00 committed by David S. Miller
parent 197dbf24e3
commit c43c3d76c0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/net/ip_fib.h
View File

@ -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 @@ out:
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);

10
net/ipv4/fib_frontend.c
View File

@ -70,11 +70,6 @@ fail:
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)
} }
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,