diff mbox

[v2] wl12xx: fix tx power setting

Message ID CAN44aq1na7XbhArseUVwKybMS7bhn_0uCFXxVvEvgX=RfUbBGQ@mail.gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Alex Gal Jan. 9, 2014, 5:06 p.m. UTC 
Fixes wl12xx tx power.

Signed-off-by: Alex Gal <a.gal@motsai.com>
---
 drivers/net/wireless/ti/wlcore/main.c | 9 +++++++++
 1 file changed, 9 insertions(+)

                wl1271_bss_info_changed_ap(wl, vif, bss_conf, changed);
        else

Comments

John W. Linville Jan. 9, 2014, 5:28 p.m. UTC | #1 
On Thu, Jan 09, 2014 at 12:06:36PM -0500, Alex Gal wrote:
> Fixes wl12xx tx power.
> 
> Signed-off-by: Alex Gal <a.gal@motsai.com>
> ---
>  drivers/net/wireless/ti/wlcore/main.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/net/wireless/ti/wlcore/main.c
> b/drivers/net/wireless/ti/wlcore/main.c
> index e9da47c..3f77a8d 100644
> --- a/drivers/net/wireless/ti/wlcore/main.c
> +++ b/drivers/net/wireless/ti/wlcore/main.c
> @@ -4457,6 +4457,15 @@ 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) {

This line needs to be broken after the '&&'.  FWIW, I think the
rest of the patch is whitespace-damaged as well...

> +
> +        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
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
diff mbox

Patch

diff --git a/drivers/net/wireless/ti/wlcore/main.c
b/drivers/net/wireless/ti/wlcore/main.c
index e9da47c..3f77a8d 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -4457,6 +4457,15 @@  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)