summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
diff options
context:
space:
mode:
authorYaniv Rosner2013-06-20 16:39:11 +0200
committerDavid S. Miller2013-06-24 08:54:16 +0200
commitb8e0d884cba6b9cd6e43adfaab9e67096ee8fb28 (patch)
treebc05d0f39b0b2b3f35c1c1c3a0b8b1f46ab31d69 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
parentbnx2x: improve VF timings (diff)
downloadkernel-qcow2-linux-b8e0d884cba6b9cd6e43adfaab9e67096ee8fb28.tar.gz
kernel-qcow2-linux-b8e0d884cba6b9cd6e43adfaab9e67096ee8fb28.tar.xz
kernel-qcow2-linux-b8e0d884cba6b9cd6e43adfaab9e67096ee8fb28.zip
bnx2x: Fix 20G KR2 support claims
Don't claim 20G is supported if the speed is unsupported by the phys (reflected by various ethtools and ndos). Signed-off-by: Yaniv Rosner <yanivr@broadcom.com> Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 7a7e326b3509..d468fe48093a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10558,6 +10558,10 @@ static void bnx2x_link_settings_supported(struct bnx2x *bp, u32 switch_cfg)
if (!(bp->link_params.speed_cap_mask[idx] &
PORT_HW_CFG_SPEED_CAPABILITY_D0_10G))
bp->port.supported[idx] &= ~SUPPORTED_10000baseT_Full;
+
+ if (!(bp->link_params.speed_cap_mask[idx] &
+ PORT_HW_CFG_SPEED_CAPABILITY_D0_20G))
+ bp->port.supported[idx] &= ~SUPPORTED_20000baseKR2_Full;
}
BNX2X_DEV_INFO("supported 0x%x 0x%x\n", bp->port.supported[0],