Commit c8b03077 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller

mlxsw: spectrum_router: Remove FIB info from FIB entry struct

After the previous changes, the FIB info is embedded in every nexthop
group struct, which in turn is embedded in every FIB entry struct.

We can therefore safely remove the FIB info from the entry struct. This
has the added advantage of making the router-related structs more
generic and suitable for use with IPv6 offloads.
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8399a1e
...@@ -128,7 +128,6 @@ struct mlxsw_sp_fib_entry { ...@@ -128,7 +128,6 @@ struct mlxsw_sp_fib_entry {
enum mlxsw_sp_fib_entry_type type; enum mlxsw_sp_fib_entry_type type;
unsigned int ref_count; unsigned int ref_count;
struct mlxsw_sp_vr *vr; struct mlxsw_sp_vr *vr;
struct fib_info *fi;
struct list_head nexthop_group_node; struct list_head nexthop_group_node;
struct mlxsw_sp_nexthop_group *nh_group; struct mlxsw_sp_nexthop_group *nh_group;
}; };
...@@ -1755,7 +1754,7 @@ mlxsw_sp_router_fib4_entry_fini(struct mlxsw_sp *mlxsw_sp, ...@@ -1755,7 +1754,7 @@ mlxsw_sp_router_fib4_entry_fini(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_fib_entry *fib_entry) struct mlxsw_sp_fib_entry *fib_entry)
{ {
if (fib_entry->type != MLXSW_SP_FIB_ENTRY_TYPE_TRAP) if (fib_entry->type != MLXSW_SP_FIB_ENTRY_TYPE_TRAP)
fib_info_offload_dec(fib_entry->fi); fib_info_offload_dec(fib_entry->nh_group->key.fi);
} }
static struct mlxsw_sp_fib_entry * static struct mlxsw_sp_fib_entry *
...@@ -1788,7 +1787,6 @@ mlxsw_sp_fib_entry_get(struct mlxsw_sp *mlxsw_sp, ...@@ -1788,7 +1787,6 @@ mlxsw_sp_fib_entry_get(struct mlxsw_sp *mlxsw_sp,
goto err_fib_entry_create; goto err_fib_entry_create;
} }
fib_entry->vr = vr; fib_entry->vr = vr;
fib_entry->fi = fi;
fib_entry->ref_count = 1; fib_entry->ref_count = 1;
err = mlxsw_sp_router_fib4_entry_init(mlxsw_sp, fen_info, fib_entry); err = mlxsw_sp_router_fib4_entry_init(mlxsw_sp, fen_info, fib_entry);
......
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