Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b1be199 authored by Peter P Waskiewicz Jr's avatar Peter P Waskiewicz Jr Committed by David S. Miller
Browse files

ixgbe: Create separate media type for CX4 adapters 



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: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8911184f

drivers/net/ixgbe/ixgbe_82598.c

+4 −2
Original line number Diff line number Diff line
@@ -322,14 +322,16 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw) 
		break;

	case IXGBE_DEV_ID_82598AF_DUAL_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_SR_DUAL_PORT_EM:

	case IXGBE_DEV_ID_82598EB_XF_LR:

	case IXGBE_DEV_ID_82598EB_SFP_LOM:

		media_type = ixgbe_media_type_fiber;

		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_82598AT2:

		media_type = ixgbe_media_type_copper;

drivers/net/ixgbe/ixgbe_82599.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) 
		media_type = ixgbe_media_type_fiber;

		break;

	case IXGBE_DEV_ID_82599_CX4:

		media_type = ixgbe_media_type_fiber;

		media_type = ixgbe_media_type_cx4;

		break;

	default:

		media_type = ixgbe_media_type_unknown;

drivers/net/ixgbe/ixgbe_type.h

+1 −0
Original line number Diff line number Diff line
@@ -2144,6 +2144,7 @@ enum ixgbe_media_type { 
	ixgbe_media_type_fiber,

	ixgbe_media_type_copper,

	ixgbe_media_type_backplane,

	ixgbe_media_type_cx4,

	ixgbe_media_type_virtual

};