2014-01-09 19:02:02

by Alex Gal

Subject: [PATCH v3] wl12xx: fix tx power setting

Sorry for the previous format.

Fixes wl12xx tx power.

Signed-off-by: Alex Gal <[email protected]>
---
drivers/net/wireless/ti/wlcore/main.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/drivers/net/wireless/ti/wlcore/main.c
b/drivers/net/wireless/ti/wlcore/main.c
index e9da47c..cbbfc50 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -4457,6 +4457,16 @@ static void wl1271_op_bss_info_changed(struct
ieee80211_hw *hw,
if (ret < 0)
goto out;

+ if ((changed & BSS_CHANGED_TXPOWER) &&
+ bss_conf->txpower != wlvif->power_level) {
+
+ ret = wl1271_acx_tx_power(wl, wlvif, bss_conf->txpower);
+ if (ret < 0)
+ goto out;
+
+ wlvif->power_level = bss_conf->txpower;
+ }
+
if (is_ap)
wl1271_bss_info_changed_ap(wl, vif, bss_conf, changed);
else
--
1.8.5.2

2014-01-10 14:45:09

by John W. Linville

Subject: Re: [PATCH v3] wl12xx: fix tx power setting

On Thu, Jan 09, 2014 at 02:02:00PM -0500, Alex Gal wrote:
> Sorry for the previous format.
>
> Fixes wl12xx tx power.
>
> Signed-off-by: Alex Gal <[email protected]>
> ---
> drivers/net/wireless/ti/wlcore/main.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/net/wireless/ti/wlcore/main.c
> b/drivers/net/wireless/ti/wlcore/main.c
> index e9da47c..cbbfc50 100644
> --- a/drivers/net/wireless/ti/wlcore/main.c
> +++ b/drivers/net/wireless/ti/wlcore/main.c
> @@ -4457,6 +4457,16 @@ static void wl1271_op_bss_info_changed(struct
> ieee80211_hw *hw,
> if (ret < 0)
> goto out;
>
> + if ((changed & BSS_CHANGED_TXPOWER) &&
> + bss_conf->txpower != wlvif->power_level) {

The prevailing style would be to align the bss_conf clause to start
under the second parenthesis in the line above.

> +
> + ret = wl1271_acx_tx_power(wl, wlvif, bss_conf->txpower);
> + if (ret < 0)
> + goto out;
> +
> + wlvif->power_level = bss_conf->txpower;
> + }
> +
> if (is_ap)
> wl1271_bss_info_changed_ap(wl, vif, bss_conf, changed);
> else
> --
> 1.8.5.2
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.