Commit aef36b88 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: Remove ndo_get_port_parent_id implementation 



Remove implementation of get_port_parent_id ndo and rely on core calling
into devlink for the information directly.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cdf29f4a

drivers/net/ethernet/mellanox/mlxsw/minimal.c

+0 −13
Original line number Diff line number Diff line
@@ -51,18 +51,6 @@ static int mlxsw_m_port_dummy_open_stop(struct net_device *dev) 
	return 0;

}



static int mlxsw_m_port_get_port_parent_id(struct net_device *dev,

					   struct netdev_phys_item_id *ppid)

{

	struct mlxsw_m_port *mlxsw_m_port = netdev_priv(dev);

	struct mlxsw_m *mlxsw_m = mlxsw_m_port->mlxsw_m;



	ppid->id_len = sizeof(mlxsw_m->base_mac);

	memcpy(&ppid->id, &mlxsw_m->base_mac, ppid->id_len);



	return 0;

}



static struct devlink_port *

mlxsw_m_port_get_devlink_port(struct net_device *dev)

{
@@ -76,7 +64,6 @@ mlxsw_m_port_get_devlink_port(struct net_device *dev) 
static const struct net_device_ops mlxsw_m_port_netdev_ops = {

	.ndo_open		= mlxsw_m_port_dummy_open_stop,

	.ndo_stop		= mlxsw_m_port_dummy_open_stop,

	.ndo_get_port_parent_id	= mlxsw_m_port_get_port_parent_id,

	.ndo_get_devlink_port	= mlxsw_m_port_get_devlink_port,

};

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+0 −13
Original line number Diff line number Diff line
@@ -1704,18 +1704,6 @@ static int mlxsw_sp_set_features(struct net_device *dev, 
				       mlxsw_sp_feature_hw_tc);

}



static int mlxsw_sp_port_get_port_parent_id(struct net_device *dev,

					    struct netdev_phys_item_id *ppid)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;



	ppid->id_len = sizeof(mlxsw_sp->base_mac);

	memcpy(&ppid->id, &mlxsw_sp->base_mac, ppid->id_len);



	return 0;

}



static struct devlink_port *

mlxsw_sp_port_get_devlink_port(struct net_device *dev)

{
@@ -1740,7 +1728,6 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = { 
	.ndo_vlan_rx_add_vid	= mlxsw_sp_port_add_vid,

	.ndo_vlan_rx_kill_vid	= mlxsw_sp_port_kill_vid,

	.ndo_set_features	= mlxsw_sp_set_features,

	.ndo_get_port_parent_id	= mlxsw_sp_port_get_port_parent_id,

	.ndo_get_devlink_port	= mlxsw_sp_port_get_devlink_port,

};

drivers/net/ethernet/mellanox/mlxsw/switchx2.c

+0 −13
Original line number Diff line number Diff line
@@ -379,18 +379,6 @@ mlxsw_sx_port_get_stats64(struct net_device *dev, 
	stats->tx_dropped	= tx_dropped;

}



static int mlxsw_sx_port_get_port_parent_id(struct net_device *dev,

					    struct netdev_phys_item_id *ppid)

{

	struct mlxsw_sx_port *mlxsw_sx_port = netdev_priv(dev);

	struct mlxsw_sx *mlxsw_sx = mlxsw_sx_port->mlxsw_sx;



	ppid->id_len = sizeof(mlxsw_sx->hw_id);

	memcpy(&ppid->id, &mlxsw_sx->hw_id, ppid->id_len);



	return 0;

}



static struct devlink_port *

mlxsw_sx_port_get_devlink_port(struct net_device *dev)

{
@@ -407,7 +395,6 @@ static const struct net_device_ops mlxsw_sx_port_netdev_ops = { 
	.ndo_start_xmit		= mlxsw_sx_port_xmit,

	.ndo_change_mtu		= mlxsw_sx_port_change_mtu,

	.ndo_get_stats64	= mlxsw_sx_port_get_stats64,

	.ndo_get_port_parent_id	= mlxsw_sx_port_get_port_parent_id,

	.ndo_get_devlink_port	= mlxsw_sx_port_get_devlink_port,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE