From 6f21c76dc80a0a583a58e2d3bdb367ebb86a670b Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Wed, 13 Mar 2013 00:24:15 +0000
Subject: [PATCH] --- yaml --- r: 361441 b: refs/heads/master c:
 5b9e12dbf92b441b37136ea71dac59f05f2673a9 h: refs/heads/master i:   361439:
 4ca88eb86130fb1aeea22d54d3d6b31e6358d581 v: v3

---
 [refs]                     |  2 +-
 trunk/include/net/ip_fib.h | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 5042e9f99a4c..f3b70ef5985c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2317f449af30073cfa6ec8352e4a65a89e357bdd
+refs/heads/master: 5b9e12dbf92b441b37136ea71dac59f05f2673a9
diff --git a/trunk/include/net/ip_fib.h b/trunk/include/net/ip_fib.h
index 9497be1ad4c0..e49db91593a9 100644
--- a/trunk/include/net/ip_fib.h
+++ b/trunk/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_MULTIPLE_TABLES
 #define FIB_TABLE_HASHSZ 256
-
-#endif /* CONFIG_IP_ROUTE_MULTIPATH */
+#else
+#define FIB_TABLE_HASHSZ 2
+#endif
 
 extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);