]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
switchdev: fix CONFIG_IP_MULTIPLE_TABLES compile issue
authorScott Feldman <sfeldma@gmail.com>
Fri, 6 Mar 2015 09:14:36 +0000 (01:14 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Mar 2015 17:43:54 +0000 (12:43 -0500)
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/switchdev/switchdev.c

index f4fd575aa2a3fc508d3b240b5f0204958af0a2f8..19e4e72a1e39ea1300d109750cb781c7fbca5989 100644 (file)
@@ -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);