From ec94e2ffc6606919a2e439ee7f36d1cb8105f884 Mon Sep 17 00:00:00 2001
From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Tue, 27 Sep 2011 11:05:26 +0300
Subject: [PATCH] --- yaml --- r: 266623 b: refs/heads/master c:
 1b4304da0adcc31727da3ee7f89dd180f4e65473 h: refs/heads/master i:   266621:
 9a55b810278365ed0349349f8a78b7628650ed46   266619:
 c4571c6cbe5426b40f787ce5ac92deb4572967e9   266615:
 8907944a863806ea1af8786dc3be5c9a0ba017d2   266607:
 fec89b442968d3001a02cdd1239eb6de31dbd67d   266591:
 f18c66c6027f5961b20472c73fd5dcc541561242   266559:
 1c6410764b8fa61d569e31aa859a67c5093e99b9   266495:
 972db117d9635adebc8f2bd7cb22c83faece338b v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/ath6kl/core.h | 1 +
 trunk/drivers/net/wireless/ath/ath6kl/init.c | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 99840a2ba2d8..3747e358e692 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00b1edf16960695d820607845797b14e6ed1a26c
+refs/heads/master: 1b4304da0adcc31727da3ee7f89dd180f4e65473
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/core.h b/trunk/drivers/net/wireless/ath/ath6kl/core.h
index 82be42f5edc8..9ecf22bd4fc9 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/core.h
+++ b/trunk/drivers/net/wireless/ath/ath6kl/core.h
@@ -69,6 +69,7 @@ enum ath6kl_fw_ie_type {
 	ATH6KL_FW_IE_PATCH_IMAGE = 4,
 	ATH6KL_FW_IE_RESERVED_RAM_SIZE = 5,
 	ATH6KL_FW_IE_CAPABILITIES = 6,
+	ATH6KL_FW_IE_PATCH_ADDR = 7,
 };
 
 enum ath6kl_fw_capability {
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/init.c b/trunk/drivers/net/wireless/ath/ath6kl/init.c
index 80c532d7f46d..e9785feeea17 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/init.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/init.c
@@ -1000,6 +1000,13 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)
 					__set_bit(i, ar->fw_capabilities);
 			}
 			break;
+		case ATH6KL_FW_IE_PATCH_ADDR:
+			if (ie_len != sizeof(*val))
+				break;
+
+			val = (__le32 *) data;
+			ar->hw.dataset_patch_addr = le32_to_cpup(val);
+			break;
 		default:
 			ath6kl_dbg(ATH6KL_DBG_TRC, "Unknown fw ie: %u\n",
 				   le32_to_cpup(&hdr->id));