From: Johannes Berg <johannes.berg@xxxxxxxxx>
To later allow dynamic registration, assign the index for the
struct device and MAC address from a new free-running counter.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
---
drivers/net/wireless/mac80211_hwsim.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 5670ecb..08d8d61 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -217,6 +217,7 @@ static const struct ieee80211_rate hwsim_rates[] = {
static spinlock_t hwsim_radio_lock;
static struct list_head hwsim_radios;
+static int hwsim_radio_idx;
struct mac80211_hwsim_data {
struct list_head list;
@@ -2123,7 +2124,7 @@ static const struct ieee80211_iface_combination hwsim_if_comb[] = {
}
};
-static int __init mac80211_hwsim_create_radio(int idx)
+static int __init mac80211_hwsim_create_radio(void)
{
int err;
u8 addr[ETH_ALEN];
@@ -2131,6 +2132,11 @@ static int __init mac80211_hwsim_create_radio(int idx)
struct ieee80211_hw *hw;
enum ieee80211_band band;
const struct ieee80211_ops *ops = &mac80211_hwsim_ops;
+ int idx;
+
+ spin_lock_bh(&hwsim_radio_lock);
+ idx = hwsim_radio_idx++;
+ spin_unlock_bh(&hwsim_radio_lock);
if (channels > 1)
ops = &mac80211_hwsim_mchan_ops;
@@ -2372,7 +2378,7 @@ static int __init init_mac80211_hwsim(void)
}
for (i = 0; i < radios; i++) {
- err = mac80211_hwsim_create_radio(i);
+ err = mac80211_hwsim_create_radio();
if (err)
goto out_free_radios;
}
--
1.8.5.1
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
