Commit 0e6ea2a4 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Mark IPv4 specific function accordingly 



The functions to create and destroy a nexthop group are IPv4 specific
and should be renamed accordingly, so that they won't be confused with
the IPv6 specific functions in follow-up patches.

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 4f1c7f1f

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+29 −29
Original line number Diff line number Diff line
@@ -1868,7 +1868,7 @@ static void mlxsw_sp_nexthop_neigh_fini(struct mlxsw_sp *mlxsw_sp, 
	neigh_release(n);

}



static int mlxsw_sp_nexthop_init(struct mlxsw_sp *mlxsw_sp,

static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_nexthop_group *nh_grp,

				  struct mlxsw_sp_nexthop *nh,

				  struct fib_nh *fib_nh)
@@ -1910,7 +1910,7 @@ static int mlxsw_sp_nexthop_init(struct mlxsw_sp *mlxsw_sp, 
	return err;

}



static void mlxsw_sp_nexthop_fini(struct mlxsw_sp *mlxsw_sp,

static void mlxsw_sp_nexthop4_fini(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_nexthop *nh)

{

	mlxsw_sp_nexthop_neigh_fini(mlxsw_sp, nh);
@@ -1918,7 +1918,7 @@ static void mlxsw_sp_nexthop_fini(struct mlxsw_sp *mlxsw_sp, 
	mlxsw_sp_nexthop_remove(mlxsw_sp, nh);

}



static void mlxsw_sp_nexthop_event(struct mlxsw_sp *mlxsw_sp,

static void mlxsw_sp_nexthop4_event(struct mlxsw_sp *mlxsw_sp,

				    unsigned long event, struct fib_nh *fib_nh)

{

	struct mlxsw_sp_nexthop_key key;
@@ -1964,7 +1964,7 @@ static void mlxsw_sp_nexthop_rif_gone_sync(struct mlxsw_sp *mlxsw_sp, 
}



static struct mlxsw_sp_nexthop_group *

mlxsw_sp_nexthop_group_create(struct mlxsw_sp *mlxsw_sp, struct fib_info *fi)

mlxsw_sp_nexthop4_group_create(struct mlxsw_sp *mlxsw_sp, struct fib_info *fi)

{

	struct mlxsw_sp_nexthop_group *nh_grp;

	struct mlxsw_sp_nexthop *nh;
@@ -1988,9 +1988,9 @@ mlxsw_sp_nexthop_group_create(struct mlxsw_sp *mlxsw_sp, struct fib_info *fi) 
	for (i = 0; i < nh_grp->count; i++) {

		nh = &nh_grp->nexthops[i];

		fib_nh = &fi->fib_nh[i];

		err = mlxsw_sp_nexthop_init(mlxsw_sp, nh_grp, nh, fib_nh);

		err = mlxsw_sp_nexthop4_init(mlxsw_sp, nh_grp, nh, fib_nh);

		if (err)

			goto err_nexthop_init;

			goto err_nexthop4_init;

	}

	err = mlxsw_sp_nexthop_group_insert(mlxsw_sp, nh_grp);

	if (err)
@@ -1999,10 +1999,10 @@ mlxsw_sp_nexthop_group_create(struct mlxsw_sp *mlxsw_sp, struct fib_info *fi) 
	return nh_grp;



err_nexthop_group_insert:

err_nexthop_init:

err_nexthop4_init:

	for (i--; i >= 0; i--) {

		nh = &nh_grp->nexthops[i];

		mlxsw_sp_nexthop_fini(mlxsw_sp, nh);

		mlxsw_sp_nexthop4_fini(mlxsw_sp, nh);

	}

	fib_info_put(nh_grp->key.fi);

	kfree(nh_grp);
@@ -2010,7 +2010,7 @@ mlxsw_sp_nexthop_group_create(struct mlxsw_sp *mlxsw_sp, struct fib_info *fi) 
}



static void

mlxsw_sp_nexthop_group_destroy(struct mlxsw_sp *mlxsw_sp,

mlxsw_sp_nexthop4_group_destroy(struct mlxsw_sp *mlxsw_sp,

				struct mlxsw_sp_nexthop_group *nh_grp)

{

	struct mlxsw_sp_nexthop *nh;
@@ -2019,7 +2019,7 @@ mlxsw_sp_nexthop_group_destroy(struct mlxsw_sp *mlxsw_sp, 
	mlxsw_sp_nexthop_group_remove(mlxsw_sp, nh_grp);

	for (i = 0; i < nh_grp->count; i++) {

		nh = &nh_grp->nexthops[i];

		mlxsw_sp_nexthop_fini(mlxsw_sp, nh);

		mlxsw_sp_nexthop4_fini(mlxsw_sp, nh);

	}

	mlxsw_sp_nexthop_group_refresh(mlxsw_sp, nh_grp);

	WARN_ON_ONCE(nh_grp->adj_index_valid);
@@ -2027,7 +2027,7 @@ mlxsw_sp_nexthop_group_destroy(struct mlxsw_sp *mlxsw_sp, 
	kfree(nh_grp);

}



static int mlxsw_sp_nexthop_group_get(struct mlxsw_sp *mlxsw_sp,

static int mlxsw_sp_nexthop4_group_get(struct mlxsw_sp *mlxsw_sp,

				       struct mlxsw_sp_fib_entry *fib_entry,

				       struct fib_info *fi)

{
@@ -2037,7 +2037,7 @@ static int mlxsw_sp_nexthop_group_get(struct mlxsw_sp *mlxsw_sp, 
	key.fi = fi;

	nh_grp = mlxsw_sp_nexthop_group_lookup(mlxsw_sp, key);

	if (!nh_grp) {

		nh_grp = mlxsw_sp_nexthop_group_create(mlxsw_sp, fi);

		nh_grp = mlxsw_sp_nexthop4_group_create(mlxsw_sp, fi);

		if (IS_ERR(nh_grp))

			return PTR_ERR(nh_grp);

	}
@@ -2046,7 +2046,7 @@ static int mlxsw_sp_nexthop_group_get(struct mlxsw_sp *mlxsw_sp, 
	return 0;

}



static void mlxsw_sp_nexthop_group_put(struct mlxsw_sp *mlxsw_sp,

static void mlxsw_sp_nexthop4_group_put(struct mlxsw_sp *mlxsw_sp,

					struct mlxsw_sp_fib_entry *fib_entry)

{

	struct mlxsw_sp_nexthop_group *nh_grp = fib_entry->nh_group;
@@ -2054,7 +2054,7 @@ static void mlxsw_sp_nexthop_group_put(struct mlxsw_sp *mlxsw_sp, 
	list_del(&fib_entry->nexthop_group_node);

	if (!list_empty(&nh_grp->fib_list))

		return;

	mlxsw_sp_nexthop_group_destroy(mlxsw_sp, nh_grp);

	mlxsw_sp_nexthop4_group_destroy(mlxsw_sp, nh_grp);

}



static bool
@@ -2322,9 +2322,9 @@ mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp, 
	if (err)

		goto err_fib4_entry_type_set;



	err = mlxsw_sp_nexthop_group_get(mlxsw_sp, fib_entry, fen_info->fi);

	err = mlxsw_sp_nexthop4_group_get(mlxsw_sp, fib_entry, fen_info->fi);

	if (err)

		goto err_nexthop_group_get;

		goto err_nexthop4_group_get;



	fib4_entry->prio = fen_info->fi->fib_priority;

	fib4_entry->tb_id = fen_info->tb_id;
@@ -2335,7 +2335,7 @@ mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp, 


	return fib4_entry;



err_nexthop_group_get:

err_nexthop4_group_get:

err_fib4_entry_type_set:

	kfree(fib4_entry);

	return ERR_PTR(err);
@@ -2344,7 +2344,7 @@ mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp, 
static void mlxsw_sp_fib4_entry_destroy(struct mlxsw_sp *mlxsw_sp,

					struct mlxsw_sp_fib4_entry *fib4_entry)

{

	mlxsw_sp_nexthop_group_put(mlxsw_sp, &fib4_entry->common);

	mlxsw_sp_nexthop4_group_put(mlxsw_sp, &fib4_entry->common);

	kfree(fib4_entry);

}
@@ -3022,7 +3022,7 @@ static void mlxsw_sp_router_fib_event_work(struct work_struct *work) 
		break;

	case FIB_EVENT_NH_ADD: /* fall through */

	case FIB_EVENT_NH_DEL:

		mlxsw_sp_nexthop_event(mlxsw_sp, fib_work->event,

		mlxsw_sp_nexthop4_event(mlxsw_sp, fib_work->event,

					fib_work->fnh_info.fib_nh);

		fib_info_put(fib_work->fnh_info.fib_nh->nh_parent);

		break;