On 03/27/2018 08:49 AM, Nikolay Aleksandrov wrote: > On 27/03/18 18:38, John Fastabend wrote: >> Fix build error in br_if.c >> >> 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] >> } >> ^ >> Fixes: 419d14af9e07f ("bridge: Allow max MTU when multiple VLANs present") >> Signed-off-by: John Fastabend <john.fastab...@gmail.com> >> --- >> net/bridge/br_if.c | 27 +++++++++++++++++---------- >> 1 file changed, 17 insertions(+), 10 deletions(-) >> > > I'm not sure what the rules about merging are, but just in case I > already fixed this in net-next couple of days ago. > > commit 82792a070b16 > Author: Nikolay Aleksandrov <niko...@cumulusnetworks.com> > Date: Fri Mar 23 18:27:06 2018 +0200 > > net: bridge: fix direct access to bridge vlan_enabled and use helper > > https://patchwork.ozlabs.org/patch/890043/ > > > Cheers, > Nik >
Ah dang sorry about the noise then drop my patch.