diff options
author | Denis Cheng <crquan@gmail.com> | 2007-09-16 19:36:02 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:25 -0400 |
commit | 26ff5ddc5ab11e37ab3db469f24324e0ef1d6f63 (patch) | |
tree | c4f68c97ef2421dce8b0289ecd56b1d48b9dff15 /net | |
parent | 99406c885ab27c369fa4a1b15c4a5a5ad0d61fcd (diff) |
[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>
Diffstat (limited to '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) | |||
1949 | { | 1949 | { |
1950 | struct sk_buff *dummy_skb; | 1950 | struct sk_buff *dummy_skb; |
1951 | int i; | 1951 | int i; |
1952 | unsigned long max; | 1952 | unsigned long limit; |
1953 | unsigned int order; | 1953 | unsigned int order; |
1954 | int err = proto_register(&netlink_proto, 0); | 1954 | int err = proto_register(&netlink_proto, 0); |
1955 | 1955 | ||
@@ -1963,13 +1963,13 @@ static int __init netlink_proto_init(void) | |||
1963 | goto panic; | 1963 | goto panic; |
1964 | 1964 | ||
1965 | if (num_physpages >= (128 * 1024)) | 1965 | if (num_physpages >= (128 * 1024)) |
1966 | max = num_physpages >> (21 - PAGE_SHIFT); | 1966 | limit = num_physpages >> (21 - PAGE_SHIFT); |
1967 | else | 1967 | else |
1968 | max = num_physpages >> (23 - PAGE_SHIFT); | 1968 | limit = num_physpages >> (23 - PAGE_SHIFT); |
1969 | 1969 | ||
1970 | order = get_bitmask_order(max) - 1 + PAGE_SHIFT; | 1970 | order = get_bitmask_order(limit) - 1 + PAGE_SHIFT; |
1971 | max = (1UL << order) / sizeof(struct hlist_head); | 1971 | limit = (1UL << order) / sizeof(struct hlist_head); |
1972 | order = get_bitmask_order(min(max, (unsigned long)UINT_MAX)) - 1; | 1972 | order = get_bitmask_order(min(limit, (unsigned long)UINT_MAX)) - 1; |
1973 | 1973 | ||
1974 | for (i = 0; i < MAX_LINKS; i++) { | 1974 | for (i = 0; i < MAX_LINKS; i++) { |
1975 | struct nl_pid_hash *hash = &nl_table[i].hash; | 1975 | struct nl_pid_hash *hash = &nl_table[i].hash; |