From mboxrd@z Thu Jan 1 00:00:00 1970 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 3AED9C43218 for ; Sun, 28 Apr 2019 18:48:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F27D20652 for ; Sun, 28 Apr 2019 18:48:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LgeJIIFY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727189AbfD1SsD (ORCPT ); Sun, 28 Apr 2019 14:48:03 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44949 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726299AbfD1Sr7 (ORCPT ); Sun, 28 Apr 2019 14:47:59 -0400 Received: by mail-wr1-f68.google.com with SMTP id c5so12453169wrs.11 for ; Sun, 28 Apr 2019 11:47:58 -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=SfdWk9Lh2JYYdYgj2vy6MznivzcCOEqsCMIfju4TSIk=; b=LgeJIIFY/FjYb/wFz9Nv37qMiWNPTf3/I0RwxtY6PuM9UTEzFyXAa0N3Y0qp16GnTW Gm0XHtC8yF7BV4ILZ2QEnD3wVpMkUyE76IG+0uYFsJj4ewgMf2aDgO3jyBN0K7llNpiP CVXH0Zy+XnIwLyHt7omjZZrzCIv+pzWoS6K+PKKpdy9kFPbHnXFhE7mEgDT5bE2Er1qL 0jTKKLQtORzB6CfEsVFdpJ5gXahYVwBTrWF0/JmHD0352n8V1KY9+hMr31+CgMR9PnPE Nzht1Y4AUsR/ihOhQIIwOT7odi6NbnSD6y3kCsirl381gTnVLy4NFR3yz9frNQ9cy4Ko 2TZw== 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=SfdWk9Lh2JYYdYgj2vy6MznivzcCOEqsCMIfju4TSIk=; b=GfUJ1I1JhWbD+ODyQkWoSPZ2dPu4ydZjtOHLxAYej2StakkITp9w5TYHU+9G9puKkw hAFtdu8qWg5LGAiS419DWndyQfGFYyKCXlBlcAKJeLVM1aOpEx7Jk4weai3ocmwOsdbF ZUO05E6KGCzSMpumY4s/BjpCuizI6tswv/CY/Pdgtv8HZ4CxUtPjr55esPAIz84kbcv3 K8IL5rmu8vmdPF5GXSrfS+vrOzMxl82rEKCwgUD/xsNtJGDYNGt6Zr44++YDG9F0iWdc 0H3ruCGcWE+0bop2gU47XOih5vED0dVbpgrbsqUYZQ75U9ET7a/SPL9gjjY0T3Q56Jpc jGJA== X-Gm-Message-State: APjAAAUKasxvkTvR5bXxaUy7HWVk8w9FrYOyiZz8eKdPdDclxNLbp8LF LZqatxZL05gQ7LKnf6qSEfQ= X-Google-Smtp-Source: APXvYqxrF+1jnTLzOASdLky7VmERBycJKziYpljQx6N5cEmuBlvpJ+i00u2nCROGKHsLtGBV1hI5qg== X-Received: by 2002:a05:6000:11ce:: with SMTP id i14mr10292562wrx.37.1556477277508; Sun, 28 Apr 2019 11:47:57 -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.47.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 11:47:56 -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 02/13] net: dsa: Store vlan_filtering as a property of dsa_port Date: Sun, 28 Apr 2019 21:45:43 +0300 Message-Id: <20190428184554.9968-3-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 This allows drivers to query the VLAN setting imposed by the bridge driver directly from DSA, instead of keeping their own state based on the .port_vlan_filtering callback. Signed-off-by: Vladimir Oltean Reviewed-by: Florian Fainelli --- include/net/dsa.h | 1 + net/dsa/port.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/net/dsa.h b/include/net/dsa.h index b550f7bb5314..79a87913126c 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -161,6 +161,7 @@ struct dsa_port { const char *mac; struct device_node *dn; unsigned int ageing_time; + bool vlan_filtering; u8 stp_state; struct net_device *bridge_dev; struct devlink_port devlink_port; diff --git a/net/dsa/port.c b/net/dsa/port.c index ea848596afe3..0caf7f9bfb57 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -158,15 +158,19 @@ int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, struct switchdev_trans *trans) { struct dsa_switch *ds = dp->ds; + int err; /* bridge skips -EOPNOTSUPP, so skip the prepare phase */ if (switchdev_trans_ph_prepare(trans)) return 0; - if (ds->ops->port_vlan_filtering) - return ds->ops->port_vlan_filtering(ds, dp->index, - vlan_filtering); - + if (ds->ops->port_vlan_filtering) { + err = ds->ops->port_vlan_filtering(ds, dp->index, + vlan_filtering); + if (err) + return err; + dp->vlan_filtering = vlan_filtering; + } return 0; } -- 2.17.1