summaryrefslogtreecommitdiffstats
path: root/net/switchdev
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@gmail.com>2015-03-06 01:14:36 -0800
committerDavid S. Miller <davem@davemloft.net>2015-03-06 12:43:54 -0500
commite1315db17dc81238e6eb048b2221ccae88d8ef67 (patch)
treeb50da80e37af2234f63ea44035cf85ac2f2acf15 /net/switchdev
parent23375a0fd549aa0a8c96b9f56a0b8120ae1389dd (diff)
downloadlinux-e1315db17dc81238e6eb048b2221ccae88d8ef67.tar.gz
linux-e1315db17dc81238e6eb048b2221ccae88d8ef67.tar.bz2
linux-e1315db17dc81238e6eb048b2221ccae88d8ef67.zip
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>
Diffstat (limited to 'net/switchdev')
-rw-r--r--net/switchdev/switchdev.c8
1 files changed, 6 insertions, 2 deletions
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);