diff options
| author | David Ahern <dsahern@gmail.com> | 2019-06-03 20:19:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-04 19:26:49 -0700 |
| commit | dcb1ecb50edf8219c3bd851de35897fb024c423b (patch) | |
| tree | 29cc881d4f6e2d476a296562bdcb21c0f7f515e2 /net/ipv4/nexthop.c | |
| parent | 5481d73f81549e2a05cbbb49867a9a560c5292df (diff) | |
| download | linux-dcb1ecb50edf8219c3bd851de35897fb024c423b.tar.gz linux-dcb1ecb50edf8219c3bd851de35897fb024c423b.tar.bz2 linux-dcb1ecb50edf8219c3bd851de35897fb024c423b.zip | |
ipv4: Prepare for fib6_nh from a nexthop object
Convert more IPv4 code to use fib_nh_common over fib_nh to enable routes
to use a fib6_nh based nexthop. In the end, only code not using a
nexthop object in a fib_info should directly access fib_nh in a fib_info
without checking the famiy and going through fib_nh_common. Those
functions will be marked when it is not directly evident.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/nexthop.c')
| -rw-r--r-- | net/ipv4/nexthop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index 7a5a3d08fec3..aec4ecb145a0 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -815,7 +815,8 @@ static int nh_create_ipv4(struct net *net, struct nexthop *nh, err = fib_check_nh(net, fib_nh, tb_id, 0, extack); if (!err) { nh->nh_flags = fib_nh->fib_nh_flags; - fib_info_update_nh_saddr(net, fib_nh, fib_nh->fib_nh_scope); + fib_info_update_nhc_saddr(net, &fib_nh->nh_common, + fib_nh->fib_nh_scope); } else { fib_nh_release(net, fib_nh); } |