From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH] bridge: Fix redefined references
Date: Tue, 30 Sep 2014 01:01:43 -0400 (EDT)
Message-ID: <20140930.010143.591375062294828360.davem@davemloft.net>
References: <1412043404-27494-1-git-send-email-therbert@google.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: pablo@netfilter.org, netdev@vger.kernel.org
To: therbert@google.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([149.20.54.216]:38918 "EHLO
	shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750780AbaI3FBp (ORCPT
	<rfc822;netdev@vger.kernel.org>); Tue, 30 Sep 2014 01:01:45 -0400
In-Reply-To: <1412043404-27494-1-git-send-email-therbert@google.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Tom Herbert <therbert@google.com>
Date: Mon, 29 Sep 2014 19:16:44 -0700

> 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@google.com>

Pablo please either ACK this or provide an alternative fix ASAP.

This bridging build breakage is impacting a lot of people.