From 1065a002c281de5321e952b03ded492e11d8a504 Mon Sep 17 00:00:00 2001 From: Denis Cheng Date: Sun, 16 Sep 2007 16:36:02 -0700 Subject: [PATCH] --- yaml --- r: 66611 b: refs/heads/master c: 26ff5ddc5ab11e37ab3db469f24324e0ef1d6f63 h: refs/heads/master i: 66609: 91d4099c3e25c5c80ffa47d5883dbc7f9f1efc24 66607: a5635ddcd7b04430570ac25fe4dd41f53060d6b0 v: v3 --- [refs] | 2 +- trunk/net/netlink/af_netlink.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b1817c2a55f4..896a66410b8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99406c885ab27c369fa4a1b15c4a5a5ad0d61fcd +refs/heads/master: 26ff5ddc5ab11e37ab3db469f24324e0ef1d6f63 diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c index bca93e19bf40..46eb5ea1fbd7 100644 --- a/trunk/net/netlink/af_netlink.c +++ b/trunk/net/netlink/af_netlink.c @@ -1949,7 +1949,7 @@ static int __init netlink_proto_init(void) { struct sk_buff *dummy_skb; int i; - unsigned long max; + unsigned long limit; unsigned int order; int err = proto_register(&netlink_proto, 0); @@ -1963,13 +1963,13 @@ static int __init netlink_proto_init(void) goto panic; if (num_physpages >= (128 * 1024)) - max = num_physpages >> (21 - PAGE_SHIFT); + limit = num_physpages >> (21 - PAGE_SHIFT); else - max = num_physpages >> (23 - PAGE_SHIFT); + limit = num_physpages >> (23 - PAGE_SHIFT); - order = get_bitmask_order(max) - 1 + PAGE_SHIFT; - max = (1UL << order) / sizeof(struct hlist_head); - order = get_bitmask_order(min(max, (unsigned long)UINT_MAX)) - 1; + order = get_bitmask_order(limit) - 1 + PAGE_SHIFT; + limit = (1UL << order) / sizeof(struct hlist_head); + order = get_bitmask_order(min(limit, (unsigned long)UINT_MAX)) - 1; for (i = 0; i < MAX_LINKS; i++) { struct nl_pid_hash *hash = &nl_table[i].hash;