From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Aleksandrov Subject: Re: [bpf-next PATCH] net: br_vlan build error Date: Tue, 27 Mar 2018 18:49:07 +0300 Message-ID: References: <20180327153859.28865.74511.stgit@john-Precision-Tower-5810> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Cc: netdev@vger.kernel.org, davem@davemloft.net To: John Fastabend , stephen@networkplumber.org, 3chas3@gmail.com Return-path: Received: from mail-wm0-f67.google.com ([74.125.82.67]:36056 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751179AbeC0PtK (ORCPT ); Tue, 27 Mar 2018 11:49:10 -0400 Received: by mail-wm0-f67.google.com with SMTP id x82so22609369wmg.1 for ; Tue, 27 Mar 2018 08:49:10 -0700 (PDT) In-Reply-To: <20180327153859.28865.74511.stgit@john-Precision-Tower-5810> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: 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 > --- > 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 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