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.8 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 E52DDC43381 for ; Sun, 24 Mar 2019 03:25:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA3742148D for ; Sun, 24 Mar 2019 03:25:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Niw0rKMh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728041AbfCXDZJ (ORCPT ); Sat, 23 Mar 2019 23:25:09 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41522 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727706AbfCXDZJ (ORCPT ); Sat, 23 Mar 2019 23:25:09 -0400 Received: by mail-wr1-f68.google.com with SMTP id p1so6341569wrs.8 for ; Sat, 23 Mar 2019 20:25:08 -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=yf0Zine29UI14bmjNqgnvXC5YnZPlohPrm6ossEZpOw=; b=Niw0rKMhJwRHoV/qE8TzkJLMj/ia3VDE6oJ1xMBI0t+CBW6RuBhD+XNCqmcDD/2YZU FjDPRnV/11xTEYV8mW1BVoqIv9GMg7QyKxJwnrtNMSSB21m5KJEvukyt1l410VxFiEwv cjE+OmP4BDSkKRHKnyL2x9ZM35F9DLBf+jlM2wc4P1ZL33En8xl0mMib1jp+TxI9Y2FY Pk9X/R83t+W2QzoU4Dqmbz32nKmVynNsLuhIXTwcC8ErWwNa3fFHU4SO5uOFjEAe/gjA JPv+7xMxqzYqDJ2TVmbS/oQYVZhTAT1jYQZj7UEqQYBatG8bNy0SRmBtNQQQpWOojk6i YRng== 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=yf0Zine29UI14bmjNqgnvXC5YnZPlohPrm6ossEZpOw=; b=olnkiprmbPVHzukqieF8eJ5Wz4YK0zgNzlN2F+O1/T95o56mmr3+umqdPKYIB5sboY yeSW9MISja+joZe4t3pPQ6LfZVdyg4eDGy+Iwyv2CBkP7LSL2MP5YdbQgoOICfrkOFqY aQtu0q8r3A702eSuA2xPVfR+KawkCavKfW7Vt4z4hj9ftw+bdfczcxuh6kEaXl6QQQed PSXfAElUi1ZIp/lQlJk7viVu4AoSW78RuwbZYEEe1d8FZ5RkoZ9r0GjcNhybyWGwmZmM qJBm4hYH7sPnYNtrl6aLJ4xbG2bUnLcgOyQEzug7P0exm5zMwORTbYgCrvOFRBFcrkl6 OpOA== X-Gm-Message-State: APjAAAV8BnFVcHrle5lSv0AIevKQ8R/lH0rWGtfL8vg8tLdrGr77K1A6 uVHVs4KSvbe5f3eHNo4WBfo= X-Google-Smtp-Source: APXvYqxCZh5l7oFC7BlItJJN7XHHvEGfF7L2Uad+91ok6FBHHCvbyPXtt0L0lDrgUcXa0OAZ/UIiXw== X-Received: by 2002:a5d:6682:: with SMTP id l2mr10882395wru.33.1553397907383; Sat, 23 Mar 2019 20:25:07 -0700 (PDT) Received: from localhost.localdomain ([188.26.228.227]) by smtp.gmail.com with ESMTPSA id c20sm12243049wre.28.2019.03.23.20.25.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Mar 2019 20:25:06 -0700 (PDT) From: Vladimir Oltean To: davem@davemloft.net, netdev@vger.kernel.org Cc: f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com, linus.walleij@linaro.org, Vladimir Oltean Subject: [RFC PATCH net-next 02/13] net: dsa: Store vlan_filtering as a property of dsa_port Date: Sun, 24 Mar 2019 05:23:35 +0200 Message-Id: <20190324032346.32394-3-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190324032346.32394-1-olteanv@gmail.com> References: <20190324032346.32394-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 --- 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 ae480bba11f5..a16fd577349b 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -142,6 +142,7 @@ struct dsa_port { const struct dsa_port *cpu_dp; 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 caeef4c99dc0..a86fe3be1261 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