diff options
| author | Alexei Starovoitov <ast@plumgrid.com> | 2014-05-18 10:30:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-18 20:09:50 -0400 |
| commit | d4f0e0958dbacaa1c678d88bf02a4794c66fb832 (patch) | |
| tree | 11d9d65ba8912204bfd2011a385293624a78d36a /net/bridge | |
| parent | 33fcc5e05ea2b43ce0c6d356424ee5e25406f4c2 (diff) | |
| download | blackbird-op-linux-d4f0e0958dbacaa1c678d88bf02a4794c66fb832.tar.gz blackbird-op-linux-d4f0e0958dbacaa1c678d88bf02a4794c66fb832.zip | |
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>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 2b2286d8572d..af067711574f 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; } |
