* [PATCH net-next] net: bridge: fix build
@ 2014-05-18 17:30 Alexei Starovoitov
2014-05-19 0:10 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Alexei Starovoitov @ 2014-05-18 17:30 UTC (permalink / raw)
To: David S. Miller; +Cc: Vlad Yasevich, Michael S. Tsirkin, netdev
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>
---
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 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;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: bridge: fix build
2014-05-18 17:30 [PATCH net-next] net: bridge: fix build Alexei Starovoitov
@ 2014-05-19 0:10 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-05-19 0:10 UTC (permalink / raw)
To: ast; +Cc: vyasevic, mst, netdev
From: Alexei Starovoitov <ast@plumgrid.com>
Date: Sun, 18 May 2014 10:30:28 -0700
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-19 0:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-18 17:30 [PATCH net-next] net: bridge: fix build Alexei Starovoitov
2014-05-19 0:10 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).