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

Commit 49fdde89 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git fixes for 4.15. Major changes:

wcn36xx

* fix dynamic power save which has been broken since the driver was commited
parents 943309d4 0856655a

drivers/net/wireless/ath/wcn36xx/main.c

+12 −11
Original line number Diff line number Diff line
@@ -384,6 +384,18 @@ static int wcn36xx_config(struct ieee80211_hw *hw, u32 changed) 
		}

	}



	if (changed & IEEE80211_CONF_CHANGE_PS) {

		list_for_each_entry(tmp, &wcn->vif_list, list) {

			vif = wcn36xx_priv_to_vif(tmp);

			if (hw->conf.flags & IEEE80211_CONF_PS) {

				if (vif->bss_conf.ps) /* ps allowed ? */

					wcn36xx_pmc_enter_bmps_state(wcn, vif);

			} else {

				wcn36xx_pmc_exit_bmps_state(wcn, vif);

			}

		}

	}



	mutex_unlock(&wcn->conf_mutex);



	return 0;
@@ -747,17 +759,6 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw, 
		vif_priv->dtim_period = bss_conf->dtim_period;

	}



	if (changed & BSS_CHANGED_PS) {

		wcn36xx_dbg(WCN36XX_DBG_MAC,

			    "mac bss PS set %d\n",

			    bss_conf->ps);

		if (bss_conf->ps) {

			wcn36xx_pmc_enter_bmps_state(wcn, vif);

		} else {

			wcn36xx_pmc_exit_bmps_state(wcn, vif);

		}

	}



	if (changed & BSS_CHANGED_BSSID) {

		wcn36xx_dbg(WCN36XX_DBG_MAC, "mac bss changed_bssid %pM\n",

			    bss_conf->bssid);

drivers/net/wireless/ath/wcn36xx/pmc.c

+4 −2
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ int wcn36xx_pmc_exit_bmps_state(struct wcn36xx *wcn, 
	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);



	if (WCN36XX_BMPS != vif_priv->pw_state) {

		wcn36xx_err("Not in BMPS mode, no need to exit from BMPS mode!\n");

		return -EINVAL;

		/* Unbalanced call or last BMPS enter failed */

		wcn36xx_dbg(WCN36XX_DBG_PMC,

			    "Not in BMPS mode, no need to exit\n");

		return -EALREADY;

	}

	wcn36xx_smd_exit_bmps(wcn, vif);

	vif_priv->pw_state = WCN36XX_FULL_POWER;