mlxsw: spectrum_router: Adjust IPv6 replace logic to new notifications

Previously, IPv6 replace notifications were only sent from
fib6_add_rt2node(). The function only emitted such notifications if a
route actually replaced another route.

A previous patch added another call site in ip6_route_multipath_add()
from which such notification can be emitted even if a route was merely
added and did not replace another route.

Adjust the driver to take this into account and potentially set the
'replace' flag to 'false' if the notified route did not replace an
existing route.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 42e0e96..dff96d1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -5435,16 +5435,16 @@ mlxsw_sp_fib6_node_entry_find(const struct mlxsw_sp_fib_node *fib_node,
 
 static int
 mlxsw_sp_fib6_node_list_insert(struct mlxsw_sp_fib6_entry *new6_entry,
-                              bool replace)
+                              bool *p_replace)
 {
        struct mlxsw_sp_fib_node *fib_node = new6_entry->common.fib_node;
        struct fib6_info *nrt = mlxsw_sp_fib6_entry_rt(new6_entry);
        struct mlxsw_sp_fib6_entry *fib6_entry;
 
-       fib6_entry = mlxsw_sp_fib6_node_entry_find(fib_node, nrt, replace);
+       fib6_entry = mlxsw_sp_fib6_node_entry_find(fib_node, nrt, *p_replace);
 
-       if (replace && WARN_ON(!fib6_entry))
-               return -EINVAL;
+       if (*p_replace && !fib6_entry)
+               *p_replace = false;
 
        if (fib6_entry) {
                list_add_tail(&new6_entry->common.list,
@@ -5479,11 +5479,11 @@ mlxsw_sp_fib6_node_list_remove(struct mlxsw_sp_fib6_entry *fib6_entry)
 
 static int mlxsw_sp_fib6_node_entry_link(struct mlxsw_sp *mlxsw_sp,
                                         struct mlxsw_sp_fib6_entry *fib6_entry,
-                                        bool replace)
+                                        bool *p_replace)
 {
        int err;
 
-       err = mlxsw_sp_fib6_node_list_insert(fib6_entry, replace);
+       err = mlxsw_sp_fib6_node_list_insert(fib6_entry, p_replace);
        if (err)
                return err;
 
@@ -5596,7 +5596,7 @@ static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
                goto err_fib6_entry_create;
        }
 
-       err = mlxsw_sp_fib6_node_entry_link(mlxsw_sp, fib6_entry, replace);
+       err = mlxsw_sp_fib6_node_entry_link(mlxsw_sp, fib6_entry, &replace);
        if (err)
                goto err_fib6_node_entry_link;