Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21e90408 authored by Jukka Rissanen's avatar Jukka Rissanen Committed by Alistair Strachan
Browse files

UPSTREAM: mac80211-hwsim: Provide multicast event for HWSIM_CMD_DEL_RADIO 



When deleting old radio via HWSIM_CMD_DEL_RADIO then listeners on the
multicast group "config" are informed.

Signed-off-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
(cherry picked from commit 579a05f29611dcef94b6bda21f1d059ab189a263)
Bug: 70214720
Change-Id: I87fb99fccf4340e0eb87c85595c5e5620f9729bc
Signed-off-by: default avatarAlistair Strachan <astrachan@google.com>
parent 73defdda

drivers/net/wireless/mac80211_hwsim.c

+47 −7
Original line number Diff line number Diff line
@@ -2206,8 +2206,48 @@ failed: 
	return err;

}



static void mac80211_hwsim_destroy_radio(struct mac80211_hwsim_data *data)

static void hwsim_mcast_del_radio(int id, const char *hwname,

				  struct genl_info *info)

{

	struct sk_buff *skb;

	void *data;

	int ret;



	skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!skb)

		return;



	data = genlmsg_put(skb, 0, 0, &hwsim_genl_family, 0,

			   HWSIM_CMD_DEL_RADIO);

	if (!data)

		goto error;



	ret = nla_put_u32(skb, HWSIM_ATTR_RADIO_ID, id);

	if (ret < 0)

		goto error;



	if (hwname) {

		ret = nla_put(skb, HWSIM_ATTR_RADIO_NAME, strlen(hwname),

			      hwname);

		if (ret < 0)

			goto error;

	}



	genlmsg_end(skb, data);



	hwsim_mcast_config_msg(skb, info);



	return;



error:

	nlmsg_free(skb);

}



static void mac80211_hwsim_del_radio(struct mac80211_hwsim_data *data,

				     const char *hwname,

				     struct genl_info *info)

{

	hwsim_mcast_del_radio(data->idx, hwname, info);

	debugfs_remove_recursive(data->debugfs);

	ieee80211_unregister_hw(data->hw);

	device_release_driver(data->dev);
@@ -2225,7 +2265,7 @@ static void mac80211_hwsim_free(void) 
						list))) {

		list_del(&data->list);

		spin_unlock_bh(&hwsim_radio_lock);

		mac80211_hwsim_destroy_radio(data);

		mac80211_hwsim_del_radio(data, NULL, NULL);

		spin_lock_bh(&hwsim_radio_lock);

	}

	spin_unlock_bh(&hwsim_radio_lock);
@@ -2487,7 +2527,7 @@ static int hwsim_create_radio_nl(struct sk_buff *msg, struct genl_info *info) 
					   hwname, no_vif);

}



static int hwsim_destroy_radio_nl(struct sk_buff *msg, struct genl_info *info)

static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)

{

	struct mac80211_hwsim_data *data;

	s64 idx = -1;
@@ -2513,7 +2553,7 @@ static int hwsim_destroy_radio_nl(struct sk_buff *msg, struct genl_info *info) 


		list_del(&data->list);

		spin_unlock_bh(&hwsim_radio_lock);

		mac80211_hwsim_destroy_radio(data);

		mac80211_hwsim_del_radio(data, hwname, info);

		return 0;

	}

	spin_unlock_bh(&hwsim_radio_lock);
@@ -2546,9 +2586,9 @@ static const struct genl_ops hwsim_ops[] = { 
		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = HWSIM_CMD_DESTROY_RADIO,

		.cmd = HWSIM_CMD_DEL_RADIO,

		.policy = hwsim_genl_policy,

		.doit = hwsim_destroy_radio_nl,

		.doit = hwsim_del_radio_nl,

		.flags = GENL_ADMIN_PERM,

	},

};
@@ -2558,7 +2598,7 @@ static void destroy_radio(struct work_struct *work) 
	struct mac80211_hwsim_data *data =

		container_of(work, struct mac80211_hwsim_data, destroy_work);



	mac80211_hwsim_destroy_radio(data);

	mac80211_hwsim_del_radio(data, NULL, NULL);

}



static void remove_user_radios(u32 portid)