From: sfeldma@gmail.com
To: netdev@vger.kernel.org, davem@davemloft.net, jiri@resnulli.us
Subject: [PATCH net-next 1/2] switchdev: fix CONFIG_IP_MULTIPLE_TABLES compile issue
Date: Fri, 6 Mar 2015 01:14:36 -0800 [thread overview]
Message-ID: <1425633277-32929-1-git-send-email-sfeldma@gmail.com> (raw)
From: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
net/switchdev/switchdev.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index f4fd575..19e4e72 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);
--
1.7.10.4
next reply other threads:[~2015-03-06 9:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-06 9:14 sfeldma [this message]
2015-03-06 9:14 ` [PATCH net-next 2/2] rocker: fix some sparse warnings sfeldma
2015-03-06 11:52 ` Jiri Pirko
2015-03-06 17:44 ` David Miller
2015-03-06 11:49 ` [PATCH net-next 1/2] switchdev: fix CONFIG_IP_MULTIPLE_TABLES compile issue Jiri Pirko
2015-03-06 17:44 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425633277-32929-1-git-send-email-sfeldma@gmail.com \
--to=sfeldma@gmail.com \
--cc=davem@davemloft.net \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).