From d4f0e0958dbacaa1c678d88bf02a4794c66fb832 Mon Sep 17 00:00:00 2001 From: Alexei Starovoitov Date: Sun, 18 May 2014 10:30:28 -0700 Subject: [PATCH] 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 Signed-off-by: David S. Miller --- net/bridge/br_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.7.4