leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ixgbe: Create separate media type for CX4 adapters

Browse Source 
Currently the media type detection for CX4 adapters lumps them into a
type of fiber.  This causes some strange fallout when firmware verification
is done on the NIC, and certain fiber NIC rules get enforced incorrectly.

This patch introduces a new media type for CX4, and puts both 82598 and
82599 CX4 adapters into this bucket.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Peter P Waskiewicz Jr 2009-09-14 07:48:10 +00:00 committed by David S. Miller
parent 8911184fed
commit 6b1be1990d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ixgbe/ixgbe_82598.c
View File

@ -322,14 +322,16 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)
break; break;
case IXGBE_DEV_ID_82598AF_DUAL_PORT: case IXGBE_DEV_ID_82598AF_DUAL_PORT:
case IXGBE_DEV_ID_82598AF_SINGLE_PORT: case IXGBE_DEV_ID_82598AF_SINGLE_PORT:
case IXGBE_DEV_ID_82598EB_CX4:
case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:
case IXGBE_DEV_ID_82598_DA_DUAL_PORT: case IXGBE_DEV_ID_82598_DA_DUAL_PORT:
case IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM: case IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM:
case IXGBE_DEV_ID_82598EB_XF_LR: case IXGBE_DEV_ID_82598EB_XF_LR:
case IXGBE_DEV_ID_82598EB_SFP_LOM: case IXGBE_DEV_ID_82598EB_SFP_LOM:
media_type = ixgbe_media_type_fiber; media_type = ixgbe_media_type_fiber;
break; break;
case IXGBE_DEV_ID_82598EB_CX4:
case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:
media_type = ixgbe_media_type_cx4;
break;
case IXGBE_DEV_ID_82598AT: case IXGBE_DEV_ID_82598AT:
case IXGBE_DEV_ID_82598AT2: case IXGBE_DEV_ID_82598AT2:
media_type = ixgbe_media_type_copper; media_type = ixgbe_media_type_copper;

2
drivers/net/ixgbe/ixgbe_82599.c
View File

@ -338,7 +338,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
media_type = ixgbe_media_type_fiber; media_type = ixgbe_media_type_fiber;
break; break;
case IXGBE_DEV_ID_82599_CX4: case IXGBE_DEV_ID_82599_CX4:
media_type = ixgbe_media_type_fiber; media_type = ixgbe_media_type_cx4;
break; break;
default: default:
media_type = ixgbe_media_type_unknown; media_type = ixgbe_media_type_unknown;

1
drivers/net/ixgbe/ixgbe_type.h
View File

@ -2144,6 +2144,7 @@ enum ixgbe_media_type {
ixgbe_media_type_fiber, ixgbe_media_type_fiber,
ixgbe_media_type_copper, ixgbe_media_type_copper,
ixgbe_media_type_backplane, ixgbe_media_type_backplane,
ixgbe_media_type_cx4,
ixgbe_media_type_virtual ixgbe_media_type_virtual
}; };