ipvlan: Remove usage of the deprecated ida_simple_xx() API

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

This is less verbose.

Note that the upper bound of ida_alloc_range() is inclusive while the one
of ida_simple_get() was exclusive. So calls have been updated accordingly.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index e080e4fc41e482c002cda7a1f81b5ded4c600f4f..df7c43a109e1a7376c6ce3216cb3dd4223eac04c 100644 (file)
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -605,11 +605,11 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev,
         * Assign IDs between 0x1 and 0xFFFE (used by the master) to each
         * slave link [see addrconf_ifid_eui48()].
         */
-       err = ida_simple_get(&port->ida, port->dev_id_start, 0xFFFE,
-                            GFP_KERNEL);
+       err = ida_alloc_range(&port->ida, port->dev_id_start, 0xFFFD,
+                             GFP_KERNEL);
        if (err < 0)
-               err = ida_simple_get(&port->ida, 0x1, port->dev_id_start,
-                                    GFP_KERNEL);
+               err = ida_alloc_range(&port->ida, 0x1, port->dev_id_start - 1,
+                                     GFP_KERNEL);
        if (err < 0)
                goto unregister_netdev;
        dev->dev_id = err;
@@ -641,7 +641,7 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev,
 unlink_netdev:
        netdev_upper_dev_unlink(phy_dev, dev);
 remove_ida:
-       ida_simple_remove(&port->ida, dev->dev_id);
+       ida_free(&port->ida, dev->dev_id);
 unregister_netdev:
        unregister_netdevice(dev);
        return err;
@@ -661,7 +661,7 @@ void ipvlan_link_delete(struct net_device *dev, struct list_head *head)
        }
        spin_unlock_bh(&ipvlan->addrs_lock);
 
-       ida_simple_remove(&ipvlan->port->ida, dev->dev_id);
+       ida_free(&ipvlan->port->ida, dev->dev_id);
        list_del_rcu(&ipvlan->pnode);
        unregister_netdevice_queue(dev, head);
        netdev_upper_dev_unlink(ipvlan->phy_dev, dev);