Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A023C43218 for ; Sun, 28 Apr 2019 18:48:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D056B20652 for ; Sun, 28 Apr 2019 18:48:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HOZ3W+uW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727253AbfD1SsV (ORCPT ); Sun, 28 Apr 2019 14:48:21 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44952 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727190AbfD1SsE (ORCPT ); Sun, 28 Apr 2019 14:48:04 -0400 Received: by mail-wr1-f67.google.com with SMTP id c5so12453401wrs.11 for ; Sun, 28 Apr 2019 11:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KTQotqdzkh0w78HTsLkN74LwMIwD481PIF19PCYcDH8=; b=HOZ3W+uWDWDQXYNrMre3hednsptV9TW80tDR2RXwJ1qtMi5RXCowIfg1d1O/yLE0kl Jgqic/V3avvWnesNYVJNmxwp8Ctpckt+2zILqwIEjKmLvWT2orHuQ7hkKmVArahij4Ft QIvsnHrE4HOuBLpv6y04GiwIveLVMIXVcEUoYBuzt+oFaF1u8mhMgTY6H8Qf+sAsgRWA Qc+AprU0voLHcQG2CMk5WIYWOv5UJVg2V09dqCy+4MfRbPujkAjMTs8e/ri5UizymWmE ZtKUd04I0zrSTcXHNNjrNvaE6rFBfhCMlWJcaAd+kp4eQzT3iJiX/yDyrky/SeaBCfdu Cb0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KTQotqdzkh0w78HTsLkN74LwMIwD481PIF19PCYcDH8=; b=YRGzUXslOdxnP3/StBfjy63MGPwsaKsaU5vj3/lfAU2LR2siLbbJPQVtGYp3Q1gQZv p/h9ZVHk5c3atFw7SauwvLowAlmgUxFPz+BHJHxvdAeSnstgxyRNWw30RDb2pepQZQjt Ex9oP/jDTwtjseGG+xtCr2vLNRXgABddJGTBQxUnccfhEoVMHWZpbo1ewk0KNnk7tQ12 jOFGXt5c0xBIoCq/PyTu7bu7XOP3NoX3sGfgwu7VXi+p7WgSbBv4OlAGkYkrQcYZWngr esOr26t2Q/4dWP2ANnubsqSV5elz1IBbxR78D60CBypqzSsYK3S6Ox39d+Vm8Cf8sxxX +4Fg== X-Gm-Message-State: APjAAAXuXFtG1ppy3keiRSLnuqQSvFvsb5/HLwrF1ihYxzF2OY1goFhr nsRlciFgb4QqvHdauHqv9G0= X-Google-Smtp-Source: APXvYqxmL9wTJ+Zgbsb6/4KXYnIFj39Bl4Bj2ge6ALtihRBHv7HuO5bLo0fSQTfB6pfh4FqH5+kpLw== X-Received: by 2002:adf:dc4b:: with SMTP id m11mr39291719wrj.66.1556477282677; Sun, 28 Apr 2019 11:48:02 -0700 (PDT) Received: from localhost.localdomain (5-12-225-227.residential.rdsnet.ro. [5.12.225.227]) by smtp.gmail.com with ESMTPSA id h5sm12254910wmf.38.2019.04.28.11.48.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 11:48:02 -0700 (PDT) From: Vladimir Oltean To: f.fainelli@gmail.com, vivien.didelot@gmail.com, andrew@lunn.ch, davem@davemloft.net Cc: netdev@vger.kernel.org, Vladimir Oltean Subject: [PATCH net-next 07/13] net: dsa: Keep the vlan_filtering setting in dsa_switch if it's global Date: Sun, 28 Apr 2019 21:45:48 +0300 Message-Id: <20190428184554.9968-8-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190428184554.9968-1-olteanv@gmail.com> References: <20190428184554.9968-1-olteanv@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current behavior is not as obvious as one would assume (which is that, if the driver set vlan_filtering_is_global = 1, then checking any dp->vlan_filtering would yield the same result). Only the ports which are actively enslaved into a bridge would have vlan_filtering set. This makes it tricky for drivers to check what the global state is. So fix this and make the struct dsa_switch hold this global setting. Signed-off-by: Vladimir Oltean --- include/net/dsa.h | 5 +++++ net/dsa/port.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/net/dsa.h b/include/net/dsa.h index aab3c2029edd..4e0f7e9c5aa1 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -233,6 +233,11 @@ struct dsa_switch { */ bool vlan_filtering_is_global; + /* In case vlan_filtering_is_global is set, the VLAN awareness state + * should be retrieved from here and not from the per-port settings. + */ + bool vlan_filtering; + unsigned long *bitmap; unsigned long _bitmap; diff --git a/net/dsa/port.c b/net/dsa/port.c index 67bfad30cd40..555fdbf0a3f4 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -208,7 +208,10 @@ int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, if (err) return err; - dp->vlan_filtering = vlan_filtering; + if (ds->vlan_filtering_is_global) + ds->vlan_filtering = vlan_filtering; + else + dp->vlan_filtering = vlan_filtering; return 0; } -- 2.17.1