diff options
| author | Denis Cheng <crquan@gmail.com> | 2007-09-16 16:36:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:51:25 -0700 |
| commit | 26ff5ddc5ab11e37ab3db469f24324e0ef1d6f63 (patch) | |
| tree | c4f68c97ef2421dce8b0289ecd56b1d48b9dff15 | |
| parent | 99406c885ab27c369fa4a1b15c4a5a5ad0d61fcd (diff) | |
| download | talos-op-linux-26ff5ddc5ab11e37ab3db469f24324e0ef1d6f63.tar.gz talos-op-linux-26ff5ddc5ab11e37ab3db469f24324e0ef1d6f63.zip | |
[NETLINK]: the temp variable name max is ambiguous
with the macro max provided by <linux/kernel.h>, so changed its name
to a more proper one: limit
Signed-off-by: Denis Cheng <crquan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netlink/af_netlink.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index bca93e19bf40..46eb5ea1fbd7 100644 --- a/net/netlink/af_netlink.c +++ b/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; |
