Linux Ethernet Bridging - Mar 2018 - [Bridge] [PATCH net-next] net: bridge: fix direct access to bridge vlan_enabled and use helper

We need to use br_vlan_enabled() helper otherwise we'll break builds
without bridge vlans:
net/bridge//br_if.c: In function ?br_mtu?:
net/bridge//br_if.c:458:8: error: ?const struct net_bridge? has no
member named ?vlan_enabled?
  if (br->vlan_enabled)
        ^
net/bridge//br_if.c:462:1: warning: control reaches end of non-void
function [-Wreturn-type]
 }
 ^
scripts/Makefile.build:324: recipe for target 'net/bridge//br_if.o'
failed

Fixes: 419d14af9e07 ("bridge: Allow max MTU when multiple VLANs
present")
Signed-off-by: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
---
 net/bridge/br_if.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 48dc4d2e2be3..87b2afd455c7 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -455,7 +455,7 @@ static int __br_mtu(const struct net_bridge *br, bool
(compare_fn)(int, int))
 
 int br_mtu(const struct net_bridge *br)
 {
-	if (br->vlan_enabled)
+	if (br_vlan_enabled(br->dev))
 		return __br_mtu(br, max_mtu);
 	else
 		return __br_mtu(br, min_mtu);
-- 
2.1.4

From: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
Date: Fri, 23 Mar 2018 18:27:06 +0200
> We need to use br_vlan_enabled() helper otherwise we'll break builds
> without bridge vlans:
> net/bridge//br_if.c: In function ?br_mtu?:
> net/bridge//br_if.c:458:8: error: ?const struct net_bridge? has no
> member named ?vlan_enabled?
>   if (br->vlan_enabled)
>         ^
> net/bridge//br_if.c:462:1: warning: control reaches end of non-void
> function [-Wreturn-type]
>  }
>  ^
> scripts/Makefile.build:324: recipe for target 'net/bridge//br_if.o'
> failed
> 
> Fixes: 419d14af9e07 ("bridge: Allow max MTU when multiple VLANs
present")
> Signed-off-by: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
Applied, thanks for responding to this issue so quickly.