aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
diff options
context:
space:
mode:
authorIdo Schimmel <idosch@mellanox.com>2016-09-12 13:26:26 +0200
committerDavid S. Miller <davem@davemloft.net>2016-09-13 12:16:33 -0400
commit91bdc7a43ac7cfe044caa5ab7e74dca114f15904 (patch)
tree8b0dadbf4ee128c0042f3f35479577d53beddf6d /drivers/net/ethernet/mellanox/mlxsw/spectrum.c
parentmlxsw: spectrum: Report port type according to operational speed (diff)
downloadlinux-dev-91bdc7a43ac7cfe044caa5ab7e74dca114f15904.tar.xz
linux-dev-91bdc7a43ac7cfe044caa5ab7e74dca114f15904.zip
mlxsw: spectrum: Indicate support of multiple port types
The device can support multiple port types, so don't return on first match. Signed-off-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/spectrum.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 38e4f03f9d9f..d49f51846325 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1706,21 +1706,23 @@ static const struct mlxsw_sp_port_link_mode mlxsw_sp_port_link_mode[] = {
static u32 mlxsw_sp_from_ptys_supported_port(u32 ptys_eth_proto)
{
+ u32 modes = 0;
+
if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CR |
MLXSW_REG_PTYS_ETH_SPEED_10GBASE_SR |
MLXSW_REG_PTYS_ETH_SPEED_40GBASE_CR4 |
MLXSW_REG_PTYS_ETH_SPEED_40GBASE_SR4 |
MLXSW_REG_PTYS_ETH_SPEED_100GBASE_SR4 |
MLXSW_REG_PTYS_ETH_SPEED_SGMII))
- return SUPPORTED_FIBRE;
+ modes |= SUPPORTED_FIBRE;
if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_KR |
MLXSW_REG_PTYS_ETH_SPEED_10GBASE_KX4 |
MLXSW_REG_PTYS_ETH_SPEED_40GBASE_KR4 |
MLXSW_REG_PTYS_ETH_SPEED_100GBASE_KR4 |
MLXSW_REG_PTYS_ETH_SPEED_1000BASE_KX))
- return SUPPORTED_Backplane;
- return 0;
+ modes |= SUPPORTED_Backplane;
+ return modes;
}
static u32 mlxsw_sp_from_ptys_supported_link(u32 ptys_eth_proto)