netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Ido Schimmel <idosch@mellanox.com>,
	linux-kernel@vger.kernel.org (open list),
	devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM),
	bridge@lists.linux-foundation.org (moderated list:ETHERNET
	BRIDGE),
	jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com
Subject: [PATCH net-next 06/16] net: bridge: Stop calling switchdev_port_attr_get()
Date: Fri,  8 Feb 2019 16:32:38 -0800	[thread overview]
Message-ID: <20190209003248.31088-7-f.fainelli@gmail.com> (raw)
In-Reply-To: <20190209003248.31088-1-f.fainelli@gmail.com>

Now that all switchdev drivers have been converted to checking the
bridge port flags during the prepare phase of the
switchdev_port_attr_set(), we can move straight to trying to set the
desired flag through SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 net/bridge/br_switchdev.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index db9e8ab96d48..939f300522c5 100644
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -64,29 +64,15 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p,
 {
 	struct switchdev_attr attr = {
 		.orig_dev = p->dev,
-		.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT,
+		.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS,
+		.flags = SWITCHDEV_F_DEFER,
+		.u.brport_flags = flags,
 	};
 	int err;
 
 	if (mask & ~BR_PORT_FLAGS_HW_OFFLOAD)
 		return 0;
 
-	err = switchdev_port_attr_get(p->dev, &attr);
-	if (err == -EOPNOTSUPP)
-		return 0;
-	if (err)
-		return err;
-
-	/* Check if specific bridge flag attribute offload is supported */
-	if (!(attr.u.brport_flags_support & mask)) {
-		br_warn(p->br, "bridge flag offload is not supported %u(%s)\n",
-			(unsigned int)p->port_no, p->dev->name);
-		return -EOPNOTSUPP;
-	}
-
-	attr.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS;
-	attr.flags = SWITCHDEV_F_DEFER;
-	attr.u.brport_flags = flags;
 	err = switchdev_port_attr_set(p->dev, &attr);
 	if (err) {
 		br_warn(p->br, "error setting offload flag on port %u(%s)\n",
-- 
2.17.1


  parent reply	other threads:[~2019-02-09  0:33 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-09  0:32 [PATCH net-next 00/16] net: Remove switchdev_ops Florian Fainelli
2019-02-09  0:32 ` [PATCH net-next 01/16] Documentation: networking: switchdev: Update port parent ID section Florian Fainelli
2019-02-09 17:22   ` Jiri Pirko
2019-02-09  0:32 ` [PATCH net-next 02/16] mlxsw: spectrum: Check bridge flags during prepare phase Florian Fainelli
2019-02-09 17:48   ` Jiri Pirko
2019-02-09  0:32 ` [PATCH net-next 03/16] staging: fsl-dpaa2: ethsw: Check bridge port flags during set Florian Fainelli
2019-02-09 17:48   ` Jiri Pirko
2019-02-09  0:32 ` [PATCH net-next 04/16] net: dsa: Add setter for SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS Florian Fainelli
2019-02-09 17:48   ` Jiri Pirko
2019-02-09  0:32 ` [PATCH net-next 05/16] rocker: Check bridge flags during prepare phase Florian Fainelli
2019-02-09 17:48   ` Jiri Pirko
2019-02-09  0:32 ` Florian Fainelli [this message]
2019-02-09 17:48   ` [PATCH net-next 06/16] net: bridge: Stop calling switchdev_port_attr_get() Jiri Pirko
2019-02-09  0:32 ` [PATCH net-next 07/16] net: Remove SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT Florian Fainelli
2019-02-09 17:49   ` Jiri Pirko
2019-02-09  0:32 ` [PATCH net-next 08/16] net: Get rid of switchdev_port_attr_get() Florian Fainelli
2019-02-09 18:15   ` Jiri Pirko
2019-02-09  0:32 ` [PATCH net-next 09/16] switchdev: Add SWITCHDEV_PORT_ATTR_SET Florian Fainelli
2019-02-09 18:18   ` Jiri Pirko
2019-02-09  0:32 ` [PATCH net-next 10/16] rocker: Handle SWITCHDEV_PORT_ATTR_SET Florian Fainelli
2019-02-09 18:21   ` Jiri Pirko
2019-02-09 18:24     ` Jiri Pirko
2019-02-10  4:20     ` Florian Fainelli
2019-02-09  0:32 ` [PATCH net-next 11/16] net: dsa: " Florian Fainelli
2019-02-09  0:32 ` [PATCH net-next 12/16] mlxsw: spectrum_switchdev: " Florian Fainelli
2019-02-09  0:32 ` [PATCH net-next 13/16] net: mscc: ocelot: " Florian Fainelli
2019-02-09  0:32 ` [PATCH net-next 14/16] staging: fsl-dpaa2: ethsw: " Florian Fainelli
2019-02-09  0:32 ` [PATCH net-next 15/16] net: switchdev: Replace port attr set SDO with a notification Florian Fainelli
2019-02-09  0:36   ` Florian Fainelli
2019-02-09 20:38     ` Jiri Pirko
2019-02-09  0:32 ` [PATCH net-next 16/16] net: Remove switchdev_ops Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190209003248.31088-7-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=bridge@lists.linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=devel@driverdev.osuosl.org \
    --cc=idosch@mellanox.com \
    --cc=jiri@mellanox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=vivien.didelot@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).