From e510068d42c0709ffe7ce3442135b8e5ab1fce4c Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Thu, 10 May 2012 12:14:16 +0300
Subject: [PATCH] --- yaml --- r: 314117 b: refs/heads/master c:
 5add82edd14d9bf051e06588ac65c7e2182bd330 h: refs/heads/master i:   314115:
 e3de603b651ea1739731d74b380cb52d86584bcd v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ti/wl18xx/conf.h | 1 +
 trunk/drivers/net/wireless/ti/wl18xx/main.c | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a6ba66b3fda8..05f1c2207fe5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8334271882b46e4bc15337ed27428be121156165
+refs/heads/master: 5add82edd14d9bf051e06588ac65c7e2182bd330
diff --git a/trunk/drivers/net/wireless/ti/wl18xx/conf.h b/trunk/drivers/net/wireless/ti/wl18xx/conf.h
index a6058fb86e7f..ffad302b6cb7 100644
--- a/trunk/drivers/net/wireless/ti/wl18xx/conf.h
+++ b/trunk/drivers/net/wireless/ti/wl18xx/conf.h
@@ -43,6 +43,7 @@ struct wl18xx_conf_phy {
 	u8 primary_clock_setting_time;
 	u8 clock_valid_on_wake_up;
 	u8 secondary_clock_setting_time;
+	u8 pwr_limit_reference_11_abg;
 };
 
 struct wl18xx_priv_conf {
diff --git a/trunk/drivers/net/wireless/ti/wl18xx/main.c b/trunk/drivers/net/wireless/ti/wl18xx/main.c
index 07955984face..ab3dd118f7de 100644
--- a/trunk/drivers/net/wireless/ti/wl18xx/main.c
+++ b/trunk/drivers/net/wireless/ti/wl18xx/main.c
@@ -501,6 +501,7 @@ static struct wl18xx_priv_conf wl18xx_default_priv_conf = {
 		.enable_clpc			= 0x00,
 		.enable_tx_low_pwr_on_siso_rdl	= 0x00,
 		.rx_profile			= 0x00,
+		.pwr_limit_reference_11_abg	= 0xc8,
 	},
 };
 
@@ -726,6 +727,8 @@ static void wl18xx_set_mac_and_phy(struct wl1271 *wl)
 		phy->clock_valid_on_wake_up;
 	params.secondary_clock_setting_time =
 		phy->secondary_clock_setting_time;
+	params.pwr_limit_reference_11_abg =
+		phy->pwr_limit_reference_11_abg;
 
 	params.board_type = priv->board_type;