From: Ido Schimmel <ido...@mellanox.com>

Prepare the driver to handle multiple routes in a single notification by
passing an array of routes to the functions that actually add / delete a
route.

Signed-off-by: Ido Schimmel <ido...@mellanox.com>
Acked-by: Jiri Pirko <j...@mellanox.com>
---
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c 
b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 49557eca48e0..2788366329b4 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -5489,10 +5489,12 @@ static void mlxsw_sp_fib6_entry_replace(struct mlxsw_sp 
*mlxsw_sp,
 }
 
 static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
-                                   struct fib6_info *rt, bool replace)
+                                   struct fib6_info **rt_arr,
+                                   unsigned int nrt6, bool replace)
 {
        struct mlxsw_sp_fib6_entry *fib6_entry;
        struct mlxsw_sp_fib_node *fib_node;
+       struct fib6_info *rt = rt_arr[0];
        int err;
 
        if (mlxsw_sp->router->aborted)
@@ -5546,10 +5548,12 @@ static int mlxsw_sp_router_fib6_add(struct mlxsw_sp 
*mlxsw_sp,
 }
 
 static void mlxsw_sp_router_fib6_del(struct mlxsw_sp *mlxsw_sp,
-                                    struct fib6_info *rt)
+                                    struct fib6_info **rt_arr,
+                                    unsigned int nrt6)
 {
        struct mlxsw_sp_fib6_entry *fib6_entry;
        struct mlxsw_sp_fib_node *fib_node;
+       struct fib6_info *rt = rt_arr[0];
 
        if (mlxsw_sp->router->aborted)
                return;
@@ -5955,7 +5959,8 @@ static void mlxsw_sp_router_fib6_event_work(struct 
work_struct *work)
        case FIB_EVENT_ENTRY_ADD:
                replace = fib_work->event == FIB_EVENT_ENTRY_REPLACE;
                err = mlxsw_sp_router_fib6_add(mlxsw_sp,
-                                              fib_work->fib6_work.rt_arr[0],
+                                              fib_work->fib6_work.rt_arr,
+                                              fib_work->fib6_work.nrt6,
                                               replace);
                if (err)
                        mlxsw_sp_router_fib_abort(mlxsw_sp);
@@ -5963,7 +5968,8 @@ static void mlxsw_sp_router_fib6_event_work(struct 
work_struct *work)
                break;
        case FIB_EVENT_ENTRY_DEL:
                mlxsw_sp_router_fib6_del(mlxsw_sp,
-                                        fib_work->fib6_work.rt_arr[0]);
+                                        fib_work->fib6_work.rt_arr,
+                                        fib_work->fib6_work.nrt6);
                mlxsw_sp_router_fib6_work_fini(&fib_work->fib6_work);
                break;
        case FIB_EVENT_RULE_ADD:
-- 
2.20.1

Reply via email to