projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
23375a0
)
switchdev: fix CONFIG_IP_MULTIPLE_TABLES compile issue
author
Scott Feldman
<
[email protected]
>
Fri, 6 Mar 2015 09:14:36 +0000
(
01:14
-0800)
committer
David S. Miller
<
[email protected]
>
Fri, 6 Mar 2015 17:43:54 +0000
(12:43 -0500)
Signed-off-by: Scott Feldman <
[email protected]
>
Acked-by: Jiri Pirko <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/switchdev/switchdev.c
patch
|
blob
|
history
diff --git
a/net/switchdev/switchdev.c
b/net/switchdev/switchdev.c
index f4fd575aa2a3fc508d3b240b5f0204958af0a2f8..19e4e72a1e39ea1300d109750cb781c7fbca5989 100644
(file)
--- 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);