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

Commit 4a733ef1 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove PM-QoS listener 



As this API has never really seen any use and most drivers don't
ever use the value derived from it, remove it.

Change the only driver using it (rt2x00) to simply use the DTIM
period instead of the "max sleep" time.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 61f6bba0

drivers/net/wireless/rt2x00/rt2x00config.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
		if (beacon_diff > beacon_int)

			beacon_diff = 0;



		autowake_timeout = (conf->max_sleep_period * beacon_int) - beacon_diff;

		autowake_timeout = (conf->ps_dtim_period * beacon_int) - beacon_diff;

		queue_delayed_work(rt2x00dev->workqueue,

				   &rt2x00dev->autowakeup_work,

				   autowake_timeout - 15);

include/net/mac80211.h

+0 −6
Original line number Diff line number Diff line
@@ -1241,11 +1241,6 @@ enum ieee80211_smps_mode { 
 * @flags: configuration flags defined above

 *

 * @listen_interval: listen interval in units of beacon interval

 * @max_sleep_period: the maximum number of beacon intervals to sleep for

 *	before checking the beacon for a TIM bit (managed mode only); this

 *	value will be only achievable between DTIM frames, the hardware

 *	needs to check for the multicast traffic bit in DTIM beacons.

 *	This variable is valid only when the CONF_PS flag is set.

 * @ps_dtim_period: The DTIM period of the AP we're connected to, for use

 *	in power saving. Power saving will not be enabled until a beacon

 *	has been received and the DTIM period is known.
@@ -1275,7 +1270,6 @@ enum ieee80211_smps_mode { 
struct ieee80211_conf {

	u32 flags;

	int power_level, dynamic_ps_timeout;

	int max_sleep_period;



	u16 listen_interval;

	u8 ps_dtim_period;

net/mac80211/cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -1428,7 +1428,7 @@ static int ieee80211_change_station(struct wiphy *wiphy, 


	if (sdata->vif.type == NL80211_IFTYPE_STATION &&

	    params->sta_flags_mask & BIT(NL80211_STA_FLAG_AUTHORIZED)) {

		ieee80211_recalc_ps(local, -1);

		ieee80211_recalc_ps(local);

		ieee80211_recalc_ps_vif(sdata);

	}
@@ -2463,7 +2463,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, 
	if (ieee80211_hw_check(&local->hw, SUPPORTS_DYNAMIC_PS))

		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);



	ieee80211_recalc_ps(local, -1);

	ieee80211_recalc_ps(local);

	ieee80211_recalc_ps_vif(sdata);



	return 0;

net/mac80211/ieee80211_i.h

+1 −4
Original line number Diff line number Diff line
@@ -1305,7 +1305,6 @@ struct ieee80211_local { 
	struct work_struct dynamic_ps_enable_work;

	struct work_struct dynamic_ps_disable_work;

	struct timer_list dynamic_ps_timer;

	struct notifier_block network_latency_notifier;

	struct notifier_block ifa_notifier;

	struct notifier_block ifa6_notifier;
@@ -1491,10 +1490,8 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, 
			   struct cfg80211_disassoc_request *req);

void ieee80211_send_pspoll(struct ieee80211_local *local,

			   struct ieee80211_sub_if_data *sdata);

void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency);

void ieee80211_recalc_ps(struct ieee80211_local *local);

void ieee80211_recalc_ps_vif(struct ieee80211_sub_if_data *sdata);

int ieee80211_max_network_latency(struct notifier_block *nb,

				  unsigned long data, void *dummy);

int ieee80211_set_arp_filter(struct ieee80211_sub_if_data *sdata);

void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata);

void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,

net/mac80211/iface.c

+2 −2
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) 
	if (hw_reconf_flags)

		ieee80211_hw_config(local, hw_reconf_flags);



	ieee80211_recalc_ps(local, -1);

	ieee80211_recalc_ps(local);



	if (sdata->vif.type == NL80211_IFTYPE_MONITOR ||

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
@@ -1016,7 +1016,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
			drv_remove_interface(local, sdata);

	}



	ieee80211_recalc_ps(local, -1);

	ieee80211_recalc_ps(local);



	if (cancel_scan)

		flush_delayed_work(&local->scan_work);