Commit 7d1988a9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2025-11-05' of... 

Merge tag 'wireless-2025-11-05' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless

Johannes Berg says:

====================
Just two small fixes:

 - ath12k: revert a change that caused performance regressions
 - hwsim: don't ignore netns on netlink socket matching

* tag 'wireless-2025-11-05' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: mac80211_hwsim: Limit destroy_on_close radio removal to netgroup
  Revert "wifi: ath12k: Fix missing station power save configuration"
====================

Link: https://patch.msgid.link/20251105152827.53254-3-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4d6ec3a7 4c740c4d

drivers/net/wireless/ath/ath12k/mac.c

+55 −67
Original line number Diff line number Diff line
@@ -4064,68 +4064,12 @@ static int ath12k_mac_fils_discovery(struct ath12k_link_vif *arvif, 
	return ret;

}



static void ath12k_mac_vif_setup_ps(struct ath12k_link_vif *arvif)

{

	struct ath12k *ar = arvif->ar;

	struct ieee80211_vif *vif = arvif->ahvif->vif;

	struct ieee80211_conf *conf = &ath12k_ar_to_hw(ar)->conf;

	enum wmi_sta_powersave_param param;

	struct ieee80211_bss_conf *info;

	enum wmi_sta_ps_mode psmode;

	int ret;

	int timeout;

	bool enable_ps;



	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);



	if (vif->type != NL80211_IFTYPE_STATION)

		return;



	enable_ps = arvif->ahvif->ps;

	if (enable_ps) {

		psmode = WMI_STA_PS_MODE_ENABLED;

		param = WMI_STA_PS_PARAM_INACTIVITY_TIME;



		timeout = conf->dynamic_ps_timeout;

		if (timeout == 0) {

			info = ath12k_mac_get_link_bss_conf(arvif);

			if (!info) {

				ath12k_warn(ar->ab, "unable to access bss link conf in setup ps for vif %pM link %u\n",

					    vif->addr, arvif->link_id);

				return;

			}



			/* firmware doesn't like 0 */

			timeout = ieee80211_tu_to_usec(info->beacon_int) / 1000;

		}



		ret = ath12k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param,

						  timeout);

		if (ret) {

			ath12k_warn(ar->ab, "failed to set inactivity time for vdev %d: %i\n",

				    arvif->vdev_id, ret);

			return;

		}

	} else {

		psmode = WMI_STA_PS_MODE_DISABLED;

	}



	ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %d psmode %s\n",

		   arvif->vdev_id, psmode ? "enable" : "disable");



	ret = ath12k_wmi_pdev_set_ps_mode(ar, arvif->vdev_id, psmode);

	if (ret)

		ath12k_warn(ar->ab, "failed to set sta power save mode %d for vdev %d: %d\n",

			    psmode, arvif->vdev_id, ret);

}



static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw,

					  struct ieee80211_vif *vif,

					  u64 changed)

{

	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);

	unsigned long links = ahvif->links_map;

	struct ieee80211_vif_cfg *vif_cfg;

	struct ieee80211_bss_conf *info;

	struct ath12k_link_vif *arvif;

	struct ieee80211_sta *sta;
@@ -4189,24 +4133,61 @@ static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw, 
			}

		}

	}

}



	if (changed & BSS_CHANGED_PS) {

		links = ahvif->links_map;

		vif_cfg = &vif->cfg;

static void ath12k_mac_vif_setup_ps(struct ath12k_link_vif *arvif)

{

	struct ath12k *ar = arvif->ar;

	struct ieee80211_vif *vif = arvif->ahvif->vif;

	struct ieee80211_conf *conf = &ath12k_ar_to_hw(ar)->conf;

	enum wmi_sta_powersave_param param;

	struct ieee80211_bss_conf *info;

	enum wmi_sta_ps_mode psmode;

	int ret;

	int timeout;

	bool enable_ps;



		for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) {

			arvif = wiphy_dereference(hw->wiphy, ahvif->link[link_id]);

			if (!arvif || !arvif->ar)

				continue;

	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);



			ar = arvif->ar;

	if (vif->type != NL80211_IFTYPE_STATION)

		return;



			if (ar->ab->hw_params->supports_sta_ps) {

				ahvif->ps = vif_cfg->ps;

				ath12k_mac_vif_setup_ps(arvif);

	enable_ps = arvif->ahvif->ps;

	if (enable_ps) {

		psmode = WMI_STA_PS_MODE_ENABLED;

		param = WMI_STA_PS_PARAM_INACTIVITY_TIME;



		timeout = conf->dynamic_ps_timeout;

		if (timeout == 0) {

			info = ath12k_mac_get_link_bss_conf(arvif);

			if (!info) {

				ath12k_warn(ar->ab, "unable to access bss link conf in setup ps for vif %pM link %u\n",

					    vif->addr, arvif->link_id);

				return;

			}



			/* firmware doesn't like 0 */

			timeout = ieee80211_tu_to_usec(info->beacon_int) / 1000;

		}



		ret = ath12k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param,

						  timeout);

		if (ret) {

			ath12k_warn(ar->ab, "failed to set inactivity time for vdev %d: %i\n",

				    arvif->vdev_id, ret);

			return;

		}

	} else {

		psmode = WMI_STA_PS_MODE_DISABLED;

	}



	ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %d psmode %s\n",

		   arvif->vdev_id, psmode ? "enable" : "disable");



	ret = ath12k_wmi_pdev_set_ps_mode(ar, arvif->vdev_id, psmode);

	if (ret)

		ath12k_warn(ar->ab, "failed to set sta power save mode %d for vdev %d: %d\n",

			    psmode, arvif->vdev_id, ret);

}



static bool ath12k_mac_supports_tpc(struct ath12k *ar, struct ath12k_vif *ahvif,
@@ -4228,6 +4209,7 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar, 
{

	struct ath12k_vif *ahvif = arvif->ahvif;

	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);

	struct ieee80211_vif_cfg *vif_cfg = &vif->cfg;

	struct cfg80211_chan_def def;

	u32 param_id, param_value;

	enum nl80211_band band;
@@ -4514,6 +4496,12 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar, 
	}



	ath12k_mac_fils_discovery(arvif, info);



	if (changed & BSS_CHANGED_PS &&

	    ar->ab->hw_params->supports_sta_ps) {

		ahvif->ps = vif_cfg->ps;

		ath12k_mac_vif_setup_ps(arvif);

	}

}



static struct ath12k_vif_cache *ath12k_ahvif_get_link_cache(struct ath12k_vif *ahvif,

drivers/net/wireless/virtual/mac80211_hwsim.c

+4 −3
Original line number Diff line number Diff line
@@ -6698,14 +6698,15 @@ static struct genl_family hwsim_genl_family __ro_after_init = { 
	.n_mcgrps = ARRAY_SIZE(hwsim_mcgrps),

};



static void remove_user_radios(u32 portid)

static void remove_user_radios(u32 portid, int netgroup)

{

	struct mac80211_hwsim_data *entry, *tmp;

	LIST_HEAD(list);



	spin_lock_bh(&hwsim_radio_lock);

	list_for_each_entry_safe(entry, tmp, &hwsim_radios, list) {

		if (entry->destroy_on_close && entry->portid == portid) {

		if (entry->destroy_on_close && entry->portid == portid &&

		    entry->netgroup == netgroup) {

			list_move(&entry->list, &list);

			rhashtable_remove_fast(&hwsim_radios_rht, &entry->rht,

					       hwsim_rht_params);
@@ -6730,7 +6731,7 @@ static int mac80211_hwsim_netlink_notify(struct notifier_block *nb, 
	if (state != NETLINK_URELEASE)

		return NOTIFY_DONE;



	remove_user_radios(notify->portid);

	remove_user_radios(notify->portid, hwsim_net_get_netgroup(notify->net));



	if (notify->portid == hwsim_net_get_wmediumd(notify->net)) {

		printk(KERN_INFO "mac80211_hwsim: wmediumd released netlink"