bnx2x: Limit 1G link enforcement

Change 1G-SFP module detection by verifying not only that it's not
compliant with 10G-Ethernet, but also that it's 1G-ethernet compliant.

Signed-off-by: Yaniv Rosner <Yaniv.Rosner@qlogic.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 549549eaf580f79518295bd4a13234cef8520968..778e4cd325714eb34e91a369726ea1818a0c8ebe 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -8119,10 +8119,11 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
        case SFP_EEPROM_CON_TYPE_VAL_LC:
        case SFP_EEPROM_CON_TYPE_VAL_RJ45:
                check_limiting_mode = 1;
-               if ((val[SFP_EEPROM_10G_COMP_CODE_ADDR] &
+               if (((val[SFP_EEPROM_10G_COMP_CODE_ADDR] &
                     (SFP_EEPROM_10G_COMP_CODE_SR_MASK |
                      SFP_EEPROM_10G_COMP_CODE_LR_MASK |
-                     SFP_EEPROM_10G_COMP_CODE_LRM_MASK)) == 0) {
+                      SFP_EEPROM_10G_COMP_CODE_LRM_MASK)) == 0) &&
+                   (val[SFP_EEPROM_1G_COMP_CODE_ADDR] != 0)) {
                        DP(NETIF_MSG_LINK, "1G SFP module detected\n");
                        phy->media_type = ETH_PHY_SFP_1G_FIBER;
                        if (phy->req_line_speed != SPEED_1000) {