From patchwork Sun Mar 31 17:42:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1071854 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sCNLlk7T"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44XNCj1HgRz9sR9 for ; Mon, 1 Apr 2019 04:45:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731631AbfCaRpA (ORCPT ); Sun, 31 Mar 2019 13:45:00 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41058 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731373AbfCaRmz (ORCPT ); Sun, 31 Mar 2019 13:42:55 -0400 Received: by mail-wr1-f66.google.com with SMTP id r4so8875755wrq.8; Sun, 31 Mar 2019 10:42:53 -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=bBZwwBixeF/Fs0m6UziEqOecYenQFflee0raiIlvWPc=; b=sCNLlk7T89sAM7YjfDs59i4AxZTVDW3PNaJfclRhrGO7IiTKuFJ1ca4TfpOJKOc7Gm rc8P2TTeHCjcCjJEXKx6Y+3L26Hx9T9cpJysOyJm0vOWyaPdOc2hAyy0N9Hdxs5Z9HnM D/jsuK+WHDYDDqytx8TbHGpnOZombkiWYthbuxxfsGaHVHhqTU60jtvXlO+GuriX5+7m 7pfNc9P90FKBP9hIY5dFampOEMfvHxWfvjqodbYtsB0NKRBHgJhVm5CS0ML2885j7eca IHfJvL/xW6GPPLGaEjRIkQZ8n8Z3tkM2LkYdQLad9arlsjXwHCo17ogDr0q2Ooowph0O X5uw== 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=bBZwwBixeF/Fs0m6UziEqOecYenQFflee0raiIlvWPc=; b=iQFsNk5a3tCDqPEFD1cCkJTIr3uChdUZbmrdq+2iXk0C2cqJvaIe283O7jM6jj/J9v WIuREyjTKrOR5k+XLNPUqRNc6QHT5H+hG/2qO2elF+7D62+uMmZrwCPAwr/LgSrLzRfB Jx7GT4oyS7KifYHLQpjfX3kaBUbkCiMOOk0BrfVPS9x67Z3M+waBG/oQKZYIKSfVYDPC 2+kNgPSAKdNq/ASoTSBI9GuFKywKH2uz2FD7C6cuvb8OvIqTOuO89Pq8CDjLhIgRgOVZ YyjshJjODPyFRXT90HceFDcU/bN09VGmiZbs5ImYKJtjEVqZ7s9Ys6QQrzef/BpxhjfU nL+Q== X-Gm-Message-State: APjAAAUU8uHN4iEz3JDkpADNE5rvDnCIWHfl7Ue2sWDr1sSagbeuDp1E GPHpTgDDxDjm3UNk7W3guok= X-Google-Smtp-Source: APXvYqxGw/a4PPJ/DeVIZ3hObhtqdV4OPi4vQmPnQkTJtrGyyR4k8hc6CWB4ZZurvhzlXweUnfTcpA== X-Received: by 2002:a5d:6a08:: with SMTP id m8mr37401037wru.30.1554054173222; Sun, 31 Mar 2019 10:42:53 -0700 (PDT) Received: from localhost.localdomain (5-12-225-227.residential.rdsnet.ro. [5.12.225.227]) by smtp.gmail.com with ESMTPSA id v192sm10892354wme.24.2019.03.31.10.42.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 10:42:52 -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, linux-kernel@vger.kernel.org, linus.walleij@linaro.org, georg.waibel@sensor-technik.de, Vladimir Oltean Subject: [PATCH net-next 03/17] net: dsa: Store vlan_filtering as a property of dsa_port Date: Sun, 31 Mar 2019 20:42:18 +0300 Message-Id: <20190331174232.22060-4-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190331174232.22060-1-olteanv@gmail.com> References: <20190331174232.22060-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 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; }