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

Commit 097f8821 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wl12xx: always initialize AP-mode max power level 



Sometimes we only get the Tx power level via op->config when the FW is
off. Record the received power level when this happens and use it to
initialize the firmware during boot.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 6cfa5cff

drivers/net/wireless/wl12xx/acx.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ int wl1271_acx_tx_power(struct wl1271 *wl, int power) 
	struct acx_current_tx_power *acx;

	int ret;



	wl1271_debug(DEBUG_ACX, "acx dot11_cur_tx_pwr");

	wl1271_debug(DEBUG_ACX, "acx dot11_cur_tx_pwr %d", power);



	if (power < 0 || power > 25)

		return -EINVAL;

drivers/net/wireless/wl12xx/init.c

+5 −0
Original line number Diff line number Diff line
@@ -455,6 +455,11 @@ static int wl1271_ap_hw_init(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	/* initialize Tx power */

	ret = wl1271_acx_tx_power(wl, wl->power_level);

	if (ret < 0)

		return ret;



	return 0;

}

drivers/net/wireless/wl12xx/main.c

+3 −0
Original line number Diff line number Diff line
@@ -2278,6 +2278,9 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed) 
			wl->channel = channel;

		}



		if ((changed & IEEE80211_CONF_CHANGE_POWER))

			wl->power_level = conf->power_level;



		goto out;

	}