summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBert Kenward <bkenward@solarflare.com>2016-06-06 17:29:30 +0100
committerDavid S. Miller <davem@davemloft.net>2016-06-08 11:18:45 -0700
commit3497ed8c852a5a3d48957ca91baaa443d9bfcd4d (patch)
tree4297894b92d0ae90cdfaa822befbf6ec622f389c
parente0d194adfa9f5f473068cc546bee60fb84ab77ba (diff)
downloadlinux-stable-3497ed8c852a5a3d48957ca91baaa443d9bfcd4d.tar.gz
linux-stable-3497ed8c852a5a3d48957ca91baaa443d9bfcd4d.tar.bz2
linux-stable-3497ed8c852a5a3d48957ca91baaa443d9bfcd4d.zip
sfc: report supported link speeds on SFP connections
7000-series SFC NICs connected with an SFP+ module currently fail to report any supported link speeds. Reported-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Bert Kenward <bkenward@solarflare.com> Reviewed-by: Jarod Wilson <jarod@redhat.com> Tested-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/sfc/mcdi_port.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/mcdi_port.c b/drivers/net/ethernet/sfc/mcdi_port.c
index 7f295c4d7b80..2a9228a6e4a0 100644
--- a/drivers/net/ethernet/sfc/mcdi_port.c
+++ b/drivers/net/ethernet/sfc/mcdi_port.c
@@ -189,11 +189,12 @@ static u32 mcdi_to_ethtool_cap(u32 media, u32 cap)
case MC_CMD_MEDIA_XFP:
case MC_CMD_MEDIA_SFP_PLUS:
- result |= SUPPORTED_FIBRE;
- break;
-
case MC_CMD_MEDIA_QSFP_PLUS:
result |= SUPPORTED_FIBRE;
+ if (cap & (1 << MC_CMD_PHY_CAP_1000FDX_LBN))
+ result |= SUPPORTED_1000baseT_Full;
+ if (cap & (1 << MC_CMD_PHY_CAP_10000FDX_LBN))
+ result |= SUPPORTED_10000baseT_Full;
if (cap & (1 << MC_CMD_PHY_CAP_40000FDX_LBN))
result |= SUPPORTED_40000baseCR4_Full;
break;