Commit 26ff5ddc authored by Denis Cheng's avatar Denis Cheng Committed by David S. Miller

[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: default avatarDenis Cheng <crquan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99406c88
...@@ -1949,7 +1949,7 @@ static int __init netlink_proto_init(void) ...@@ -1949,7 +1949,7 @@ static int __init netlink_proto_init(void)
{ {
struct sk_buff *dummy_skb; struct sk_buff *dummy_skb;
int i; int i;
unsigned long max; unsigned long limit;
unsigned int order; unsigned int order;
int err = proto_register(&netlink_proto, 0); int err = proto_register(&netlink_proto, 0);
...@@ -1963,13 +1963,13 @@ static int __init netlink_proto_init(void) ...@@ -1963,13 +1963,13 @@ static int __init netlink_proto_init(void)
goto panic; goto panic;
if (num_physpages >= (128 * 1024)) if (num_physpages >= (128 * 1024))
max = num_physpages >> (21 - PAGE_SHIFT); limit = num_physpages >> (21 - PAGE_SHIFT);
else else
max = num_physpages >> (23 - PAGE_SHIFT); limit = num_physpages >> (23 - PAGE_SHIFT);
order = get_bitmask_order(max) - 1 + PAGE_SHIFT; order = get_bitmask_order(limit) - 1 + PAGE_SHIFT;
max = (1UL << order) / sizeof(struct hlist_head); limit = (1UL << order) / sizeof(struct hlist_head);
order = get_bitmask_order(min(max, (unsigned long)UINT_MAX)) - 1; order = get_bitmask_order(min(limit, (unsigned long)UINT_MAX)) - 1;
for (i = 0; i < MAX_LINKS; i++) { for (i = 0; i < MAX_LINKS; i++) {
struct nl_pid_hash *hash = &nl_table[i].hash; struct nl_pid_hash *hash = &nl_table[i].hash;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment