Commit ac1fab2d authored by David Ahern's avatar David Ahern Committed by David S. Miller

ipv4: export fib_check_nh

Change fib_check_nh to take net, table and scope as input arguments
over struct fib_config and export for use by nexthop code.
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1bff1a0c
...@@ -436,6 +436,8 @@ void fib_sync_mtu(struct net_device *dev, u32 orig_mtu); ...@@ -436,6 +436,8 @@ void fib_sync_mtu(struct net_device *dev, u32 orig_mtu);
int fib_multipath_hash(const struct net *net, const struct flowi4 *fl4, int fib_multipath_hash(const struct net *net, const struct flowi4 *fl4,
const struct sk_buff *skb, struct flow_keys *flkeys); const struct sk_buff *skb, struct flow_keys *flkeys);
#endif #endif
int fib_check_nh(struct net *net, struct fib_nh *nh, u32 table, u8 scope,
struct netlink_ext_ack *extack);
void fib_select_multipath(struct fib_result *res, int hash); void fib_select_multipath(struct fib_result *res, int hash);
void fib_select_path(struct net *net, struct fib_result *res, void fib_select_path(struct net *net, struct fib_result *res,
struct flowi4 *fl4, const struct sk_buff *skb); struct flowi4 *fl4, const struct sk_buff *skb);
......
...@@ -1092,15 +1092,13 @@ static int fib_check_nh_nongw(struct net *net, struct fib_nh *nh, ...@@ -1092,15 +1092,13 @@ static int fib_check_nh_nongw(struct net *net, struct fib_nh *nh,
return err; return err;
} }
static int fib_check_nh(struct fib_config *cfg, struct fib_nh *nh, int fib_check_nh(struct net *net, struct fib_nh *nh, u32 table, u8 scope,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct net *net = cfg->fc_nlinfo.nl_net;
u32 table = cfg->fc_table;
int err; int err;
if (nh->fib_nh_gw_family == AF_INET) if (nh->fib_nh_gw_family == AF_INET)
err = fib_check_nh_v4_gw(net, nh, table, cfg->fc_scope, extack); err = fib_check_nh_v4_gw(net, nh, table, scope, extack);
else if (nh->fib_nh_gw_family == AF_INET6) else if (nh->fib_nh_gw_family == AF_INET6)
err = fib_check_nh_v6_gw(net, nh, table, extack); err = fib_check_nh_v6_gw(net, nh, table, extack);
else else
...@@ -1377,7 +1375,9 @@ struct fib_info *fib_create_info(struct fib_config *cfg, ...@@ -1377,7 +1375,9 @@ struct fib_info *fib_create_info(struct fib_config *cfg,
int linkdown = 0; int linkdown = 0;
change_nexthops(fi) { change_nexthops(fi) {
err = fib_check_nh(cfg, nexthop_nh, extack); err = fib_check_nh(cfg->fc_nlinfo.nl_net, nexthop_nh,
cfg->fc_table, cfg->fc_scope,
extack);
if (err != 0) if (err != 0)
goto failure; goto failure;
if (nexthop_nh->fib_nh_flags & RTNH_F_LINKDOWN) if (nexthop_nh->fib_nh_flags & RTNH_F_LINKDOWN)
......
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