Commit 4627d656 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Zheng Zengkai
Browse files

Revert "wifi: cfg80211: fix CQM for non-range use" 

stable inclusion
from stable-v6.6.6
commit 9099d0682462e8664c8cbbe8989de65e50f62b17
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8SRLX

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9099d0682462e8664c8cbbe8989de65e50f62b17

--------------------------------

This reverts commit 4a7e92551618f3737b305f62451353ee05662f57 which is
commit 7e7efdda6adb385fbdfd6f819d76bc68c923c394 upstream.

It needed to have commit 076fc8775daf ("wifi: cfg80211: remove wdev
mutex") applied to properly work, otherwise regressions happen.

Link: https://lore.kernel.org/r/e374bb16-5b13-44cc-b11a-2f4eefb1ecf5@manjaro.org
Link: https://lore.kernel.org/r/87sf4belmm.fsf@turtle.gmx.de
Link: https://lore.kernel.org/r/20231210213930.61378-1-leo@leolam.fr


Reported-by: default avatarLéo Lam <leo@leolam.fr>
Reported-by: default avatarSven Joachim <svenjoac@gmx.de>
Reported-by: default avatarPhilip Müller <philm@manjaro.org>
Cc: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f31cd96b

net/wireless/core.h

+0 −1
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ struct cfg80211_cqm_config { 
	u32 rssi_hyst;

	s32 last_rssi_event_value;

	enum nl80211_cqm_rssi_threshold_event last_rssi_event_type;

	bool use_range_api;

	int n_rssi_thresholds;

	s32 rssi_thresholds[] __counted_by(n_rssi_thresholds);

};

net/wireless/nl80211.c

+19 −31
Original line number Diff line number Diff line
@@ -12824,6 +12824,10 @@ static int cfg80211_cqm_rssi_update(struct cfg80211_registered_device *rdev, 
	int i, n, low_index;

	int err;









	/* RSSI reporting disabled? */









	if (!cqm_config)









		return rdev_set_cqm_rssi_range_config(rdev, dev, 0, 0);

















	/*









	 * Obtain current RSSI value if possible, if not and no RSSI threshold









	 * event has been received yet, we should receive an event after a








@@ -12898,6 +12902,18 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,







	    wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)









		return -EOPNOTSUPP;

















	if (n_thresholds <= 1 && rdev->ops->set_cqm_rssi_config) {









		if (n_thresholds == 0 || thresholds[0] == 0) /* Disabling */









			return rdev_set_cqm_rssi_config(rdev, dev, 0, 0);

















		return rdev_set_cqm_rssi_config(rdev, dev,









						thresholds[0], hysteresis);









	}

















	if (!wiphy_ext_feature_isset(&rdev->wiphy,









				     NL80211_EXT_FEATURE_CQM_RSSI_LIST))









		return -EOPNOTSUPP;

















	if (n_thresholds == 1 && thresholds[0] == 0) /* Disabling */









		n_thresholds = 0;
















@@ -12905,20 +12921,6 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,







	old = rcu_dereference_protected(wdev->cqm_config,









					lockdep_is_held(&wdev->mtx));

















	/* if already disabled just succeed */









	if (!n_thresholds && !old)









		return 0;

















	if (n_thresholds > 1) {









		if (!wiphy_ext_feature_isset(&rdev->wiphy,









					     NL80211_EXT_FEATURE_CQM_RSSI_LIST) ||









		    !rdev->ops->set_cqm_rssi_range_config)









			return -EOPNOTSUPP;









	} else {









		if (!rdev->ops->set_cqm_rssi_config)









			return -EOPNOTSUPP;









	}

















	if (n_thresholds) {









		cqm_config = kzalloc(struct_size(cqm_config, rssi_thresholds,









						 n_thresholds),








@@ -12933,26 +12935,13 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,







		memcpy(cqm_config->rssi_thresholds, thresholds,









		       flex_array_size(cqm_config, rssi_thresholds,









				       n_thresholds));









		cqm_config->use_range_api = n_thresholds > 1 ||









					    !rdev->ops->set_cqm_rssi_config;

















		rcu_assign_pointer(wdev->cqm_config, cqm_config);

















		if (cqm_config->use_range_api)









			err = cfg80211_cqm_rssi_update(rdev, dev, cqm_config);









		else









			err = rdev_set_cqm_rssi_config(rdev, dev,









						       thresholds[0],









						       hysteresis);









	} else {









		RCU_INIT_POINTER(wdev->cqm_config, NULL);









		/* if enabled as range also disable via range */









		if (old->use_range_api)









			err = rdev_set_cqm_rssi_range_config(rdev, dev, 0, 0);









		else









			err = rdev_set_cqm_rssi_config(rdev, dev, 0, 0);









	}

















	err = cfg80211_cqm_rssi_update(rdev, dev, cqm_config);









	if (err) {









		rcu_assign_pointer(wdev->cqm_config, old);









		kfree_rcu(cqm_config, rcu_head);








@@ -19142,10 +19131,9 @@ void cfg80211_cqm_rssi_notify_work(struct wiphy *wiphy, struct wiphy_work *work)







	wdev_lock(wdev);









	cqm_config = rcu_dereference_protected(wdev->cqm_config,









					       lockdep_is_held(&wdev->mtx));









	if (!cqm_config)









	if (!wdev->cqm_config)









		goto unlock;

















	if (cqm_config->use_range_api)









	cfg80211_cqm_rssi_update(rdev, wdev->netdev, cqm_config);

















	rssi_level = cqm_config->last_rssi_event_value;