From fb2326b1ed896c56998b7395ba650c1c404089be Mon Sep 17 00:00:00 2001
From: "Hsu, Kenny" <kenny.hsu@intel.com>
Date: Fri, 2 Dec 2011 08:48:28 -0800
Subject: [PATCH] --- yaml --- r: 278611 b: refs/heads/master c:
 a2f759fc41579205ad86ef17efe57e730a1af9e6 h: refs/heads/master i:   278609:
 0e6871bd00f3af26482eaa8f5597383913c4f83c   278607:
 2574927c9fccbab20b4b8b5a5940cefdb22e42d4 v: v3

---
 [refs]                                        |  2 +-
 .../net/wireless/iwlwifi/iwl-sv-open.c        | 20 +++++++++----------
 .../net/wireless/iwlwifi/iwl-testmode.h       |  4 +++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 413ab7f1dc7a..90bd0aa2cc1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 835df183011db2342b42d06e17c708854ab6defb
+refs/heads/master: a2f759fc41579205ad86ef17efe57e730a1af9e6
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-sv-open.c b/trunk/drivers/net/wireless/iwlwifi/iwl-sv-open.c
index a8d0ef649a7c..4ea64d65b35b 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-sv-open.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-sv-open.c
@@ -575,7 +575,7 @@ static int iwl_testmode_trace(struct ieee80211_hw *hw, struct nlattr **tb)
 		}
 		priv->testmode_trace.num_chunks =
 			DIV_ROUND_UP(priv->testmode_trace.buff_size,
-				     TRACE_CHUNK_SIZE);
+				     DUMP_CHUNK_SIZE);
 		break;
 
 	case IWL_TM_CMD_APP2DEV_END_TRACE:
@@ -607,15 +607,15 @@ static int iwl_testmode_trace_dump(struct ieee80211_hw *hw, struct nlattr **tb,
 		idx = cb->args[4];
 		if (idx >= priv->testmode_trace.num_chunks)
 			return -ENOENT;
-		length = TRACE_CHUNK_SIZE;
+		length = DUMP_CHUNK_SIZE;
 		if (((idx + 1) == priv->testmode_trace.num_chunks) &&
-		    (priv->testmode_trace.buff_size % TRACE_CHUNK_SIZE))
+		    (priv->testmode_trace.buff_size % DUMP_CHUNK_SIZE))
 			length = priv->testmode_trace.buff_size %
-				TRACE_CHUNK_SIZE;
+				DUMP_CHUNK_SIZE;
 
 		NLA_PUT(skb, IWL_TM_ATTR_TRACE_DUMP, length,
 			priv->testmode_trace.trace_addr +
-			(TRACE_CHUNK_SIZE * idx));
+			(DUMP_CHUNK_SIZE * idx));
 		idx++;
 		cb->args[4] = idx;
 		return 0;
@@ -728,7 +728,7 @@ static int iwl_testmode_sram(struct ieee80211_hw *hw, struct nlattr **tb)
 					priv->testmode_sram.buff_addr,
 					priv->testmode_sram.buff_size / 4);
 	priv->testmode_sram.num_chunks =
-		DIV_ROUND_UP(priv->testmode_sram.buff_size, TRACE_CHUNK_SIZE);
+		DIV_ROUND_UP(priv->testmode_sram.buff_size, DUMP_CHUNK_SIZE);
 	priv->testmode_sram.sram_readed = true;
 	return 0;
 }
@@ -746,15 +746,15 @@ static int iwl_testmode_sram_dump(struct ieee80211_hw *hw, struct nlattr **tb,
 			iwl_sram_cleanup(priv);
 			return -ENOENT;
 		}
-		length = TRACE_CHUNK_SIZE;
+		length = DUMP_CHUNK_SIZE;
 		if (((idx + 1) == priv->testmode_sram.num_chunks) &&
-		    (priv->testmode_sram.buff_size % TRACE_CHUNK_SIZE))
+		    (priv->testmode_sram.buff_size % DUMP_CHUNK_SIZE))
 			length = priv->testmode_sram.buff_size %
-				TRACE_CHUNK_SIZE;
+				DUMP_CHUNK_SIZE;
 
 		NLA_PUT(skb, IWL_TM_ATTR_SRAM_DUMP, length,
 			priv->testmode_sram.buff_addr +
-			(TRACE_CHUNK_SIZE * idx));
+			(DUMP_CHUNK_SIZE * idx));
 		idx++;
 		cb->args[4] = idx;
 		return 0;
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.h b/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.h
index 95c87058677b..e20f3d390271 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.h
@@ -250,6 +250,8 @@ enum iwl_tm_attr_t {
 #define TRACE_BUFF_SIZE_MIN	0x20000
 #define TRACE_BUFF_SIZE_DEF	TRACE_BUFF_SIZE_MIN
 #define TRACE_BUFF_PADD		0x2000
-#define TRACE_CHUNK_SIZE	(PAGE_SIZE - 1024)
+
+/* Maximum data size of each dump it packet */
+#define DUMP_CHUNK_SIZE		(PAGE_SIZE - 1024)
 
 #endif