From: Scott Feldman <sfeldma@gmail.com>
Date: Fri, 6 Mar 2015 09:14:36 +0000 (-0800)
Subject: switchdev: fix CONFIG_IP_MULTIPLE_TABLES compile issue
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e1315db17dc81238e6eb048b2221ccae88d8ef67;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

switchdev: fix CONFIG_IP_MULTIPLE_TABLES compile issue

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index f4fd575aa2a3..19e4e72a1e39 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -309,8 +309,12 @@ int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
 	 * IPv4 FIB offloading has been disabled completely.
 	 */
 
-	if (fi->fib_net->ipv4.fib_has_custom_rules |
-	    fi->fib_net->ipv4.fib_offload_disabled)
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+	if (fi->fib_net->ipv4.fib_has_custom_rules)
+		return 0;
+#endif
+
+	if (fi->fib_net->ipv4.fib_offload_disabled)
 		return 0;
 
 	dev = netdev_switch_get_dev_by_nhs(fi);