From 6d63e39ebd9661bcc89950737091a2c1fb8fe2dd Mon Sep 17 00:00:00 2001
From: Ying Xue <ying.xue@windriver.com>
Date: Thu, 16 Aug 2012 12:09:11 +0000
Subject: [PATCH] --- yaml --- r: 327551 b: refs/heads/master c:
 f046e7d9be1cbb3335694c7f9a31d18e1f998ff5 h: refs/heads/master i:   327549:
 ae43f06fdbb7f80a0f21b66dc7c34b447a46cf6d   327547:
 784f8bdbfeccf2c2ace4fbcb60389b23782ada74   327543:
 6b46117d2fa2d0103aea03e5ad64eb5fbe934efb   327535:
 ac3b273460ae3da905dca30bd7738be731884ec1   327519:
 7bf960de29f688ec5fb8954b49d691cfff38ca11   327487:
 ea26d1a695a77bb551d8ff9ffdccf81346a0620b   327423:
 5186ad1aece7ed148ada83636a46f2a4a087844c v: v3

---
 [refs]                      |  2 +-
 trunk/net/tipc/name_table.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 18960e01ba8d..b30af24aba7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 379c0456afc170d56ceb712a5689ede91d293e88
+refs/heads/master: f046e7d9be1cbb3335694c7f9a31d18e1f998ff5
diff --git a/trunk/net/tipc/name_table.c b/trunk/net/tipc/name_table.c
index 360c478b0b53..4ebdcc96cb04 100644
--- a/trunk/net/tipc/name_table.c
+++ b/trunk/net/tipc/name_table.c
@@ -41,7 +41,7 @@
 #include "subscr.h"
 #include "port.h"
 
-static int tipc_nametbl_size = 1024;		/* must be a power of 2 */
+#define TIPC_NAMETBL_SIZE 1024		/* must be a power of 2 */
 
 /**
  * struct name_info - name sequence publication info
@@ -114,7 +114,7 @@ DEFINE_RWLOCK(tipc_nametbl_lock);
 
 static int hash(int x)
 {
-	return x & (tipc_nametbl_size - 1);
+	return x & (TIPC_NAMETBL_SIZE - 1);
 }
 
 /**
@@ -871,7 +871,7 @@ static int nametbl_list(char *buf, int len, u32 depth_info,
 		ret += nametbl_header(buf, len, depth);
 		lowbound = 0;
 		upbound = ~0;
-		for (i = 0; i < tipc_nametbl_size; i++) {
+		for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {
 			seq_head = &table.types[i];
 			hlist_for_each_entry(seq, seq_node, seq_head, ns_list) {
 				ret += nameseq_list(seq, buf + ret, len - ret,
@@ -935,7 +935,7 @@ struct sk_buff *tipc_nametbl_get(const void *req_tlv_area, int req_tlv_space)
 
 int tipc_nametbl_init(void)
 {
-	table.types = kcalloc(tipc_nametbl_size, sizeof(struct hlist_head),
+	table.types = kcalloc(TIPC_NAMETBL_SIZE, sizeof(struct hlist_head),
 			      GFP_ATOMIC);
 	if (!table.types)
 		return -ENOMEM;
@@ -953,7 +953,7 @@ void tipc_nametbl_stop(void)
 
 	/* Verify name table is empty, then release it */
 	write_lock_bh(&tipc_nametbl_lock);
-	for (i = 0; i < tipc_nametbl_size; i++) {
+	for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {
 		if (hlist_empty(&table.types[i]))
 			continue;
 		pr_err("nametbl_stop(): orphaned hash chain detected\n");