diff options
| author | Ying Xue <ying.xue@windriver.com> | 2012-08-16 08:09:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-20 05:26:31 -0400 |
| commit | f046e7d9be1cbb3335694c7f9a31d18e1f998ff5 (patch) | |
| tree | 0644a23e59875b07bc027f8ab716315f12d11d5d | |
| parent | 379c0456afc170d56ceb712a5689ede91d293e88 (diff) | |
tipc: convert tipc_nametbl_size type from variable to macro
There is nothing changing this variable dynamically, so change
it to a macro to make that more obvious when reading the code.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/tipc/name_table.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index 360c478b0b53..4ebdcc96cb04 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #include "subscr.h" | 41 | #include "subscr.h" |
| 42 | #include "port.h" | 42 | #include "port.h" |
| 43 | 43 | ||
| 44 | static int tipc_nametbl_size = 1024; /* must be a power of 2 */ | 44 | #define TIPC_NAMETBL_SIZE 1024 /* must be a power of 2 */ |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * struct name_info - name sequence publication info | 47 | * struct name_info - name sequence publication info |
| @@ -114,7 +114,7 @@ DEFINE_RWLOCK(tipc_nametbl_lock); | |||
| 114 | 114 | ||
| 115 | static int hash(int x) | 115 | static int hash(int x) |
| 116 | { | 116 | { |
| 117 | return x & (tipc_nametbl_size - 1); | 117 | return x & (TIPC_NAMETBL_SIZE - 1); |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | /** | 120 | /** |
| @@ -871,7 +871,7 @@ static int nametbl_list(char *buf, int len, u32 depth_info, | |||
| 871 | ret += nametbl_header(buf, len, depth); | 871 | ret += nametbl_header(buf, len, depth); |
| 872 | lowbound = 0; | 872 | lowbound = 0; |
| 873 | upbound = ~0; | 873 | upbound = ~0; |
| 874 | for (i = 0; i < tipc_nametbl_size; i++) { | 874 | for (i = 0; i < TIPC_NAMETBL_SIZE; i++) { |
| 875 | seq_head = &table.types[i]; | 875 | seq_head = &table.types[i]; |
| 876 | hlist_for_each_entry(seq, seq_node, seq_head, ns_list) { | 876 | hlist_for_each_entry(seq, seq_node, seq_head, ns_list) { |
| 877 | ret += nameseq_list(seq, buf + ret, len - ret, | 877 | 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) | |||
| 935 | 935 | ||
| 936 | int tipc_nametbl_init(void) | 936 | int tipc_nametbl_init(void) |
| 937 | { | 937 | { |
| 938 | table.types = kcalloc(tipc_nametbl_size, sizeof(struct hlist_head), | 938 | table.types = kcalloc(TIPC_NAMETBL_SIZE, sizeof(struct hlist_head), |
| 939 | GFP_ATOMIC); | 939 | GFP_ATOMIC); |
| 940 | if (!table.types) | 940 | if (!table.types) |
| 941 | return -ENOMEM; | 941 | return -ENOMEM; |
| @@ -953,7 +953,7 @@ void tipc_nametbl_stop(void) | |||
| 953 | 953 | ||
| 954 | /* Verify name table is empty, then release it */ | 954 | /* Verify name table is empty, then release it */ |
| 955 | write_lock_bh(&tipc_nametbl_lock); | 955 | write_lock_bh(&tipc_nametbl_lock); |
| 956 | for (i = 0; i < tipc_nametbl_size; i++) { | 956 | for (i = 0; i < TIPC_NAMETBL_SIZE; i++) { |
| 957 | if (hlist_empty(&table.types[i])) | 957 | if (hlist_empty(&table.types[i])) |
| 958 | continue; | 958 | continue; |
| 959 | pr_err("nametbl_stop(): orphaned hash chain detected\n"); | 959 | pr_err("nametbl_stop(): orphaned hash chain detected\n"); |
