* [PATCH 1/1] ipv4: fix definition of FIB_TABLE_HASHSZ
@ 2013-03-13 8:43 Denis V. Lunev
2013-03-13 9:15 ` Li Wei
0 siblings, 1 reply; 3+ messages in thread
From: Denis V. Lunev @ 2013-03-13 8:43 UTC (permalink / raw)
To: davem; +Cc: netdev, Denis V. Lunev, Tingwei Liu, Alexey Kuznetsov
From: "Denis V. Lunev" <den@openvz.org>
a long time ago by the commit
commit 93456b6d7753def8760b423ac6b986eb9d5a4a95
Author: Denis V. Lunev <den@openvz.org>
Date: Thu Jan 10 03:23:38 2008 -0800
[IPV4]: Unify access to the routing tables.
the defenition of FIB_HASH_TABLE size has obtained wrong dependency:
it should depend upon CONFIG_IP_MULTIPLE_TABLES (as was in the original
code) but it was depended from CONFIG_IP_ROUTE_MULTIPATH
This patch returns the situation to the original state.
The problem was spotted by Tingwei Liu.
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Tingwei Liu <tingw.liu@gmail.com>
CC: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
---
include/net/ip_fib.h | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 9497be1..3b12d5c 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -152,18 +152,16 @@ struct fib_result_nl {
};
#ifdef CONFIG_IP_ROUTE_MULTIPATH
-
#define FIB_RES_NH(res) ((res).fi->fib_nh[(res).nh_sel])
-
-#define FIB_TABLE_HASHSZ 2
-
#else /* CONFIG_IP_ROUTE_MULTIPATH */
-
#define FIB_RES_NH(res) ((res).fi->fib_nh[0])
+#endif /* CONFIG_IP_ROUTE_MULTIPATH */
+#ifdef CONFIG_IP_ROUTE_MULTIPLE_TABLES
+#define FIB_TABLE_HASHSZ 2
+#else
#define FIB_TABLE_HASHSZ 256
-
-#endif /* CONFIG_IP_ROUTE_MULTIPATH */
+#endif
extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] ipv4: fix definition of FIB_TABLE_HASHSZ
2013-03-13 8:43 [PATCH 1/1] ipv4: fix definition of FIB_TABLE_HASHSZ Denis V. Lunev
@ 2013-03-13 9:15 ` Li Wei
2013-03-13 9:27 ` Denis V. Lunev
0 siblings, 1 reply; 3+ messages in thread
From: Li Wei @ 2013-03-13 9:15 UTC (permalink / raw)
To: Denis V. Lunev; +Cc: davem, netdev, Tingwei Liu, Alexey Kuznetsov
On 03/13/2013 04:43 PM, Denis V. Lunev wrote:
> From: "Denis V. Lunev" <den@openvz.org>
>
> a long time ago by the commit
>
> commit 93456b6d7753def8760b423ac6b986eb9d5a4a95
> Author: Denis V. Lunev <den@openvz.org>
> Date: Thu Jan 10 03:23:38 2008 -0800
>
> [IPV4]: Unify access to the routing tables.
>
> the defenition of FIB_HASH_TABLE size has obtained wrong dependency:
> it should depend upon CONFIG_IP_MULTIPLE_TABLES (as was in the original
> code) but it was depended from CONFIG_IP_ROUTE_MULTIPATH
>
> This patch returns the situation to the original state.
>
> The problem was spotted by Tingwei Liu.
>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Tingwei Liu <tingw.liu@gmail.com>
> CC: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
> ---
> include/net/ip_fib.h | 12 +++++-------
> 1 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
> index 9497be1..3b12d5c 100644
> --- a/include/net/ip_fib.h
> +++ b/include/net/ip_fib.h
> @@ -152,18 +152,16 @@ struct fib_result_nl {
> };
>
> #ifdef CONFIG_IP_ROUTE_MULTIPATH
> -
> #define FIB_RES_NH(res) ((res).fi->fib_nh[(res).nh_sel])
> -
> -#define FIB_TABLE_HASHSZ 2
> -
> #else /* CONFIG_IP_ROUTE_MULTIPATH */
> -
> #define FIB_RES_NH(res) ((res).fi->fib_nh[0])
> +#endif /* CONFIG_IP_ROUTE_MULTIPATH */
>
> +#ifdef CONFIG_IP_ROUTE_MULTIPLE_TABLES
> +#define FIB_TABLE_HASHSZ 2
> +#else
> #define FIB_TABLE_HASHSZ 256
> -
> -#endif /* CONFIG_IP_ROUTE_MULTIPATH */
> +#endif
With CONFIG_IP_ROUTE_MULTIPLE_TABLES defined we use a smaller FIB_TABLE_HASHSZ ?
Thanks.
>
> extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] ipv4: fix definition of FIB_TABLE_HASHSZ
2013-03-13 9:15 ` Li Wei
@ 2013-03-13 9:27 ` Denis V. Lunev
0 siblings, 0 replies; 3+ messages in thread
From: Denis V. Lunev @ 2013-03-13 9:27 UTC (permalink / raw)
To: Li Wei; +Cc: Denis V. Lunev, davem, netdev, Tingwei Liu, Alexey Kuznetsov
On 3/13/13 1:15 PM, Li Wei wrote:
> On 03/13/2013 04:43 PM, Denis V. Lunev wrote:
>> From: "Denis V. Lunev" <den@openvz.org>
>>
>> a long time ago by the commit
>>
>> commit 93456b6d7753def8760b423ac6b986eb9d5a4a95
>> Author: Denis V. Lunev <den@openvz.org>
>> Date: Thu Jan 10 03:23:38 2008 -0800
>>
>> [IPV4]: Unify access to the routing tables.
>>
>> the defenition of FIB_HASH_TABLE size has obtained wrong dependency:
>> it should depend upon CONFIG_IP_MULTIPLE_TABLES (as was in the original
>> code) but it was depended from CONFIG_IP_ROUTE_MULTIPATH
>>
>> This patch returns the situation to the original state.
>>
>> The problem was spotted by Tingwei Liu.
>>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> CC: Tingwei Liu <tingw.liu@gmail.com>
>> CC: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
>> ---
>> include/net/ip_fib.h | 12 +++++-------
>> 1 files changed, 5 insertions(+), 7 deletions(-)
>>
>> diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
>> index 9497be1..3b12d5c 100644
>> --- a/include/net/ip_fib.h
>> +++ b/include/net/ip_fib.h
>> @@ -152,18 +152,16 @@ struct fib_result_nl {
>> };
>>
>> #ifdef CONFIG_IP_ROUTE_MULTIPATH
>> -
>> #define FIB_RES_NH(res) ((res).fi->fib_nh[(res).nh_sel])
>> -
>> -#define FIB_TABLE_HASHSZ 2
>> -
>> #else /* CONFIG_IP_ROUTE_MULTIPATH */
>> -
>> #define FIB_RES_NH(res) ((res).fi->fib_nh[0])
>> +#endif /* CONFIG_IP_ROUTE_MULTIPATH */
>>
>> +#ifdef CONFIG_IP_ROUTE_MULTIPLE_TABLES
>> +#define FIB_TABLE_HASHSZ 2
>> +#else
>> #define FIB_TABLE_HASHSZ 256
>> -
>> -#endif /* CONFIG_IP_ROUTE_MULTIPATH */
>> +#endif
> With CONFIG_IP_ROUTE_MULTIPLE_TABLES defined we use a smaller FIB_TABLE_HASHSZ ?
>
> Thanks.
pfff :((( I have mistaken once again. Thank you for pointing this out.
I'll resend the patch.
>>
>> extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
>>
>>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-13 9:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-13 8:43 [PATCH 1/1] ipv4: fix definition of FIB_TABLE_HASHSZ Denis V. Lunev
2013-03-13 9:15 ` Li Wei
2013-03-13 9:27 ` Denis V. Lunev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox