UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Yaniv Rosner 2012-11-27 03:46:35 +00:00 committed by David S. Miller
parent 503976e998
commit 52160da71a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
View File

@ -7986,9 +7986,8 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
{ {
struct bnx2x *bp = params->bp; struct bnx2x *bp = params->bp;
u32 sync_offset = 0, phy_idx, media_types; u32 sync_offset = 0, phy_idx, media_types;
u8 val[2], check_limiting_mode = 0; u8 gport, val[2], check_limiting_mode = 0;
*edc_mode = EDC_MODE_LIMITING; *edc_mode = EDC_MODE_LIMITING;
phy->media_type = ETH_PHY_UNSPECIFIED; phy->media_type = ETH_PHY_UNSPECIFIED;
/* First check for copper cable */ /* First check for copper cable */
if (bnx2x_read_sfp_module_eeprom(phy, if (bnx2x_read_sfp_module_eeprom(phy,
@ -8043,8 +8042,15 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
SFP_EEPROM_COMP_CODE_LR_MASK | SFP_EEPROM_COMP_CODE_LR_MASK |
SFP_EEPROM_COMP_CODE_LRM_MASK)) == 0) { SFP_EEPROM_COMP_CODE_LRM_MASK)) == 0) {
DP(NETIF_MSG_LINK, "1G Optic module detected\n"); DP(NETIF_MSG_LINK, "1G Optic module detected\n");
gport = params->port;
phy->media_type = ETH_PHY_SFP_1G_FIBER; phy->media_type = ETH_PHY_SFP_1G_FIBER;
phy->req_line_speed = SPEED_1000; phy->req_line_speed = SPEED_1000;
if (!CHIP_IS_E1x(bp))
gport = BP_PATH(bp) + (params->port << 1);
netdev_err(bp->dev, "Warning: Link speed was forced to 1000Mbps."
" Current SFP module in port %d is not"
" compliant with 10G Ethernet\n",
gport);
} else { } else {
int idx, cfg_idx = 0; int idx, cfg_idx = 0;
DP(NETIF_MSG_LINK, "10G Optic module detected\n"); DP(NETIF_MSG_LINK, "10G Optic module detected\n");