From: Alexei Starovoitov <ast@plumgrid.com>
Date: Sun, 18 May 2014 17:30:28 +0000 (-0700)
Subject: net: bridge: fix build
X-Git-Tag: v3.16-rc1~27^2~197
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4f0e0958dbacaa1c678d88bf02a4794c66fb832;p=platform%2Fkernel%2Flinux-stable.git

net: bridge: fix build

fix build when BRIDGE_VLAN_FILTERING is not set

Fixes: 2796d0c648c94 ("bridge: Automatically manage port promiscuous mode")

Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 2b2286d..af067711 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -727,7 +727,7 @@ static inline u16 br_get_pvid(const struct net_port_vlans *v)
 	return VLAN_N_VID;	/* Returns invalid vid */
 }
 
-static inline int br_vlan_enabled(struct net_bridge *br);
+static inline int br_vlan_enabled(struct net_bridge *br)
 {
 	return 0;
 }