Commit 1449c24e authored by Ke Liu's avatar Ke Liu Committed by Johannes Berg

wifi: mac80211_hwsim: Directly use ida_alloc()/free()

Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove().
Signed-off-by: default avatarKe Liu <liuke94@huawei.com>
Link: https://lore.kernel.org/r/20220528093140.1573816-1-liuke94@huawei.comSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8cbf0c2a
...@@ -290,8 +290,7 @@ static inline int hwsim_net_set_netgroup(struct net *net) ...@@ -290,8 +290,7 @@ static inline int hwsim_net_set_netgroup(struct net *net)
{ {
struct hwsim_net *hwsim_net = net_generic(net, hwsim_net_id); struct hwsim_net *hwsim_net = net_generic(net, hwsim_net_id);
hwsim_net->netgroup = ida_simple_get(&hwsim_netgroup_ida, hwsim_net->netgroup = ida_alloc(&hwsim_netgroup_ida, GFP_KERNEL);
0, 0, GFP_KERNEL);
return hwsim_net->netgroup >= 0 ? 0 : -ENOMEM; return hwsim_net->netgroup >= 0 ? 0 : -ENOMEM;
} }
...@@ -4733,7 +4732,7 @@ static void __net_exit hwsim_exit_net(struct net *net) ...@@ -4733,7 +4732,7 @@ static void __net_exit hwsim_exit_net(struct net *net)
NULL); NULL);
} }
ida_simple_remove(&hwsim_netgroup_ida, hwsim_net_get_netgroup(net)); ida_free(&hwsim_netgroup_ida, hwsim_net_get_netgroup(net));
} }
static struct pernet_operations hwsim_net_ops = { static struct pernet_operations hwsim_net_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment