diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-12-06 00:15:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:56:36 -0500 |
commit | 1ff1cc202e9a7dbd9f54d1bce5adb44283497185 (patch) | |
tree | f96bc57c92bd111931a26abf95f0c0828a0d17de /net/ipv4/route.c | |
parent | 107f163428b846d7cef68cb6f436788bb2f6c2e1 (diff) |
[IPV4] ROUTE: Convert rt_hash_lock_init() macro into function
There's no need in having this function exist in a form
of macro. Properly formatted function looks much better.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r-- | net/ipv4/route.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 193788381a59..d95e48e8d65c 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -235,16 +235,25 @@ struct rt_hash_bucket { | |||
235 | 235 | ||
236 | static spinlock_t *rt_hash_locks; | 236 | static spinlock_t *rt_hash_locks; |
237 | # define rt_hash_lock_addr(slot) &rt_hash_locks[(slot) & (RT_HASH_LOCK_SZ - 1)] | 237 | # define rt_hash_lock_addr(slot) &rt_hash_locks[(slot) & (RT_HASH_LOCK_SZ - 1)] |
238 | # define rt_hash_lock_init() { \ | 238 | |
239 | int i; \ | 239 | static __init void rt_hash_lock_init(void) |
240 | rt_hash_locks = kmalloc(sizeof(spinlock_t) * RT_HASH_LOCK_SZ, GFP_KERNEL); \ | 240 | { |
241 | if (!rt_hash_locks) panic("IP: failed to allocate rt_hash_locks\n"); \ | 241 | int i; |
242 | for (i = 0; i < RT_HASH_LOCK_SZ; i++) \ | 242 | |
243 | spin_lock_init(&rt_hash_locks[i]); \ | 243 | rt_hash_locks = kmalloc(sizeof(spinlock_t) * RT_HASH_LOCK_SZ, |
244 | } | 244 | GFP_KERNEL); |
245 | if (!rt_hash_locks) | ||
246 | panic("IP: failed to allocate rt_hash_locks\n"); | ||
247 | |||
248 | for (i = 0; i < RT_HASH_LOCK_SZ; i++) | ||
249 | spin_lock_init(&rt_hash_locks[i]); | ||
250 | } | ||
245 | #else | 251 | #else |
246 | # define rt_hash_lock_addr(slot) NULL | 252 | # define rt_hash_lock_addr(slot) NULL |
247 | # define rt_hash_lock_init() | 253 | |
254 | static inline void rt_hash_lock_init(void) | ||
255 | { | ||
256 | } | ||
248 | #endif | 257 | #endif |
249 | 258 | ||
250 | static struct rt_hash_bucket *rt_hash_table; | 259 | static struct rt_hash_bucket *rt_hash_table; |