aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
diff options
context:
space:
mode:
authorYaniv Rosner <yanivr@broadcom.com>2012-11-26 22:46:35 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-28 10:59:22 -0500
commit52160da71abcd6fed96b06f40badbb7cf6173e45 (patch)
tree8cb4cef6cc1795396cd1fe4fc5ff66de028eaffb /drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
parent503976e99842665b3ebd6aec602525b9e8f38812 (diff)
bnx2x: Add warning message in case of non-10G SFP module
The string was split to several lines since it reached over 180 chars, which seems too much. Signed-off-by: Yaniv Rosner <yanivr@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_link.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 661d3ea21635..ebab35d1309d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -7986,9 +7986,8 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
7986{ 7986{
7987 struct bnx2x *bp = params->bp; 7987 struct bnx2x *bp = params->bp;
7988 u32 sync_offset = 0, phy_idx, media_types; 7988 u32 sync_offset = 0, phy_idx, media_types;
7989 u8 val[2], check_limiting_mode = 0; 7989 u8 gport, val[2], check_limiting_mode = 0;
7990 *edc_mode = EDC_MODE_LIMITING; 7990 *edc_mode = EDC_MODE_LIMITING;
7991
7992 phy->media_type = ETH_PHY_UNSPECIFIED; 7991 phy->media_type = ETH_PHY_UNSPECIFIED;
7993 /* First check for copper cable */ 7992 /* First check for copper cable */
7994 if (bnx2x_read_sfp_module_eeprom(phy, 7993 if (bnx2x_read_sfp_module_eeprom(phy,
@@ -8043,8 +8042,15 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
8043 SFP_EEPROM_COMP_CODE_LR_MASK | 8042 SFP_EEPROM_COMP_CODE_LR_MASK |
8044 SFP_EEPROM_COMP_CODE_LRM_MASK)) == 0) { 8043 SFP_EEPROM_COMP_CODE_LRM_MASK)) == 0) {
8045 DP(NETIF_MSG_LINK, "1G Optic module detected\n"); 8044 DP(NETIF_MSG_LINK, "1G Optic module detected\n");
8045 gport = params->port;
8046 phy->media_type = ETH_PHY_SFP_1G_FIBER; 8046 phy->media_type = ETH_PHY_SFP_1G_FIBER;
8047 phy->req_line_speed = SPEED_1000; 8047 phy->req_line_speed = SPEED_1000;
8048 if (!CHIP_IS_E1x(bp))
8049 gport = BP_PATH(bp) + (params->port << 1);
8050 netdev_err(bp->dev, "Warning: Link speed was forced to 1000Mbps."
8051 " Current SFP module in port %d is not"
8052 " compliant with 10G Ethernet\n",
8053 gport);
8048 } else { 8054 } else {
8049 int idx, cfg_idx = 0; 8055 int idx, cfg_idx = 0;
8050 DP(NETIF_MSG_LINK, "10G Optic module detected\n"); 8056 DP(NETIF_MSG_LINK, "10G Optic module detected\n");