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),
linux-rdma@vger.kernel.org (open list:MELLANOX MLX5 core VPI
driver),
oss-drivers@netronome.com (open list:NETRONOME ETHERNET DRIVERS),
devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM),
bridge@lists.linux-foundation.org (moderated list:ETHERNET
BRIDGE)
Subject: [PATCH net-next v4 06/12] mscc: ocelot: Implement ndo_get_port_parent_id()
Date: Wed, 6 Feb 2019 09:45:40 -0800 [thread overview]
Message-ID: <20190206174546.23597-7-f.fainelli@gmail.com> (raw)
In-Reply-To: <20190206174546.23597-1-f.fainelli@gmail.com>
Ocelot only supports SWITCHDEV_ATTR_ID_PORT_PARENT_ID as a valid
switchdev attribute getter, convert it to use ndo_get_port_parent_id()
and get rid of the switchdev_ops::switchdev_port_attr_get altogether.
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/mscc/ocelot.c | 33 ++++++++++++------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index c6a575eb0ff5..195306d05bcd 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -916,6 +916,18 @@ static int ocelot_set_features(struct net_device *dev,
return 0;
}
+static int ocelot_get_port_parent_id(struct net_device *dev,
+ struct netdev_phys_item_id *ppid)
+{
+ struct ocelot_port *ocelot_port = netdev_priv(dev);
+ struct ocelot *ocelot = ocelot_port->ocelot;
+
+ ppid->id_len = sizeof(ocelot->base_mac);
+ memcpy(&ppid->id, &ocelot->base_mac, ppid->id_len);
+
+ return 0;
+}
+
static const struct net_device_ops ocelot_port_netdev_ops = {
.ndo_open = ocelot_port_open,
.ndo_stop = ocelot_port_stop,
@@ -930,6 +942,7 @@ static const struct net_device_ops ocelot_port_netdev_ops = {
.ndo_vlan_rx_add_vid = ocelot_vlan_rx_add_vid,
.ndo_vlan_rx_kill_vid = ocelot_vlan_rx_kill_vid,
.ndo_set_features = ocelot_set_features,
+ .ndo_get_port_parent_id = ocelot_get_port_parent_id,
};
static void ocelot_get_strings(struct net_device *netdev, u32 sset, u8 *data)
@@ -1013,25 +1026,6 @@ static const struct ethtool_ops ocelot_ethtool_ops = {
.set_link_ksettings = phy_ethtool_set_link_ksettings,
};
-static int ocelot_port_attr_get(struct net_device *dev,
- struct switchdev_attr *attr)
-{
- struct ocelot_port *ocelot_port = netdev_priv(dev);
- struct ocelot *ocelot = ocelot_port->ocelot;
-
- switch (attr->id) {
- case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:
- attr->u.ppid.id_len = sizeof(ocelot->base_mac);
- memcpy(&attr->u.ppid.id, &ocelot->base_mac,
- attr->u.ppid.id_len);
- break;
- default:
- return -EOPNOTSUPP;
- }
-
- return 0;
-}
-
static int ocelot_port_attr_stp_state_set(struct ocelot_port *ocelot_port,
struct switchdev_trans *trans,
u8 state)
@@ -1331,7 +1325,6 @@ static int ocelot_port_obj_del(struct net_device *dev,
}
static const struct switchdev_ops ocelot_port_switchdev_ops = {
- .switchdev_port_attr_get = ocelot_port_attr_get,
.switchdev_port_attr_set = ocelot_port_attr_set,
};
--
2.17.1
next prev parent reply other threads:[~2019-02-06 17:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 17:45 [PATCH net-next v4 00/12] net: Introduce ndo_get_port_parent_id() Florian Fainelli
2019-02-06 17:45 ` [PATCH net-next v4 01/12] " Florian Fainelli
2019-02-06 19:10 ` Ido Schimmel
2019-02-06 17:45 ` [PATCH net-next v4 02/12] bnxt: Implement ndo_get_port_parent_id() Florian Fainelli
2019-02-06 17:45 ` [PATCH net-next v4 03/12] liquidio: " Florian Fainelli
2019-02-06 17:45 ` [PATCH net-next v4 04/12] net/mlx5e: " Florian Fainelli
2019-02-06 17:45 ` [PATCH net-next v4 05/12] mlxsw: " Florian Fainelli
2019-02-06 19:04 ` Ido Schimmel
2019-02-06 17:45 ` Florian Fainelli [this message]
2019-02-06 17:45 ` [PATCH net-next v4 07/12] nfp: " Florian Fainelli
2019-02-06 17:45 ` [PATCH net-next v4 08/12] rocker: " Florian Fainelli
2019-02-06 17:45 ` [PATCH net-next v4 09/12] netdevsim: " Florian Fainelli
2019-02-06 17:45 ` [PATCH net-next v4 10/12] staging: fsl-dpaa2: ethsw: " Florian Fainelli
2019-02-06 17:45 ` [PATCH net-next v4 11/12] net: dsa: " Florian Fainelli
2019-02-06 17:45 ` [PATCH net-next v4 12/12] net: Get rid of SWITCHDEV_ATTR_ID_PORT_PARENT_ID Florian Fainelli
2019-02-06 19:10 ` Ido Schimmel
2019-02-06 21:50 ` [PATCH net-next v4 00/12] net: Introduce ndo_get_port_parent_id() David Miller
2019-02-06 22:18 ` David Miller
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=20190206174546.23597-7-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=idosch@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.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).