Commit 43250901 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jakub Kicinski
Browse files

nfp: flower: Remove usage of the deprecated ida_simple_xxx API 



Use ida_alloc_xxx()/ida_free() instead to
ida_simple_get()/ida_simple_remove().
The latter is deprecated and more verbose.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20220301131212.26348-1-simon.horman@corigine.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9ae1ef4b

drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c

+5 −5
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ nfp_tunnel_add_shared_mac(struct nfp_app *app, struct net_device *netdev, 
	if (!nfp_mac_idx) {

		/* Assign a global index if non-repr or MAC is now shared. */

		if (entry || !port) {

			ida_idx = ida_simple_get(&priv->tun.mac_off_ids, 0,

			ida_idx = ida_alloc_max(&priv->tun.mac_off_ids,

						NFP_MAX_MAC_INDEX, GFP_KERNEL);

			if (ida_idx < 0)

				return ida_idx;
@@ -998,7 +998,7 @@ nfp_tunnel_add_shared_mac(struct nfp_app *app, struct net_device *netdev, 
	kfree(entry);

err_free_ida:

	if (ida_idx != -1)

		ida_simple_remove(&priv->tun.mac_off_ids, ida_idx);

		ida_free(&priv->tun.mac_off_ids, ida_idx);



	return err;

}
@@ -1061,7 +1061,7 @@ nfp_tunnel_del_shared_mac(struct nfp_app *app, struct net_device *netdev, 
		}



		ida_idx = nfp_tunnel_get_ida_from_global_mac_idx(entry->index);

		ida_simple_remove(&priv->tun.mac_off_ids, ida_idx);

		ida_free(&priv->tun.mac_off_ids, ida_idx);

		entry->index = nfp_mac_idx;

		return 0;

	}
@@ -1081,7 +1081,7 @@ nfp_tunnel_del_shared_mac(struct nfp_app *app, struct net_device *netdev, 
	/* If MAC has global ID then extract and free the ida entry. */

	if (nfp_tunnel_is_mac_idx_global(nfp_mac_idx)) {

		ida_idx = nfp_tunnel_get_ida_from_global_mac_idx(entry->index);

		ida_simple_remove(&priv->tun.mac_off_ids, ida_idx);

		ida_free(&priv->tun.mac_off_ids, ida_idx);

	}



	kfree(entry);