Commit 82792a07 authored Mar 23, 2018 by Nikolay Aleksandrov Committed by David S. Miller Mar 23, 2018

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: 419d14af ("bridge: Allow max MTU when multiple VLANs present")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 452a2613

net/bridge/br_if.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message