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

Commit bbbdff9e authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: enable PS by default 



Enable PS by default (depending on Kconfig) -- rely on drivers
to control the level using pm_qos. Due to the previous patch
we turn off PS when necessary due to latency requirements.

This has a Kconfig symbol so people can, if they really want,
configure the default in their kernels. We may want to keep it
at "default y" only in wireless-testing for a while.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d91f36db

net/mac80211/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -11,6 +11,22 @@ config MAC80211 
	  This option enables the hardware independent IEEE 802.11

	  networking stack.



config MAC80211_DEFAULT_PS

	bool "enable powersave by default"

	depends on MAC80211

	default y

	help

	  This option enables powersave mode by default.



	  If this causes your applications to misbehave you should fix your

	  applications instead -- they need to register their network

	  latency requirement, see Documentation/power/pm_qos_interface.txt.



config MAC80211_DEFAULT_PS_VALUE

	int

	default 1 if MAC80211_DEFAULT_PS

	default 0



menu "Rate control algorithm selection"

	depends on MAC80211 != n

net/mac80211/mlme.c

+8 −0
Original line number Diff line number Diff line
@@ -2192,6 +2192,7 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata) 
void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_managed *ifmgd;

	u32 hw_flags;



	ifmgd = &sdata->u.mgd;

	INIT_WORK(&ifmgd->work, ieee80211_sta_work);
@@ -2211,6 +2212,13 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata) 
		IEEE80211_STA_AUTO_CHANNEL_SEL;

	if (sdata->local->hw.queues >= 4)

		ifmgd->flags |= IEEE80211_STA_WMM_ENABLED;



	hw_flags = sdata->local->hw.flags;



	if (hw_flags & IEEE80211_HW_SUPPORTS_PS) {

		ifmgd->powersave = CONFIG_MAC80211_DEFAULT_PS_VALUE;

		sdata->local->hw.conf.dynamic_ps_timeout = 500;

	}

}



/* configuration hooks */