]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net: bridge: fix direct access to bridge vlan_enabled and use helper
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Fri, 23 Mar 2018 16:27:06 +0000 (18:27 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Mar 2018 16:41:14 +0000 (12:41 -0400)
commit82792a070b168a9659c78e6a19efe5b6d1a7ce73
treebe0c2eac05f6fbaa7c2fae7c50d75de72df62f63
parent452a26138a8355a8502d91317cab10419332ce58
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@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_if.c