netdev - [PATCH] bridge: Fix redefined references

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1412043404-27494-1-git-send-email-therbert@google.com>
Date:	Mon, 29 Sep 2014 19:16:44 -0700
From:	Tom Herbert <therbert@...gle.com>
To:	davem@...emloft.net, pablo@...filter.org, netdev@...r.kernel.org
Subject: [PATCH] bridge: Fix redefined references

Commit 34666d467cbf1e2e3 ("netfilter: bridge: move br_netfilter out of
the core") cause compiler errors when CONFIG_BRIDGE_NETFILTER is not
defined.

net/bridge/br_nf_core.c:77:1: error: expected identifier or '(' before '{' token
net/bridge/br_nf_core.c:88:115: error: redefinition of 'br_nf_core_init'
In file included from net/bridge/br_nf_core.c:23:0:
net/bridge/br_private.h:762:59: note: previous definition of 'br_nf_core_init' was here
net/bridge/br_nf_core.c:93:6: error: redefinition of 'br_nf_core_fini'
In file included from net/bridge/br_nf_core.c:23:0:
net/bridge/br_private.h:763:60: note: previous definition of 'br_nf_core_fini' was here

Add #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) around definitions of
the redefined functions.

Signed-off-by: Tom Herbert <therbert@...gle.com>
---
 net/bridge/br_nf_core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/bridge/br_nf_core.c b/net/bridge/br_nf_core.c
index 387cb3b..ac4bea1 100644
--- a/net/bridge/br_nf_core.c
+++ b/net/bridge/br_nf_core.c
@@ -73,6 +73,7 @@ static const u32 br_dst_default_metrics[RTAX_MAX] = {
 	[RTAX_MTU - 1] = 1500,
 };
 
+#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
 void br_netfilter_rtable_init(struct net_bridge *br)
 {
 	struct rtable *rt = &br->fake_rtable;
@@ -94,3 +95,4 @@ void br_nf_core_fini(void)
 {
 	dst_entries_destroy(&fake_dst_ops);
 }
+#endif
-- 
2.1.0.rc2.206.gedb03e5

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html