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

Commit 8d792cd9 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Garzik
Browse files

ixgbe: add cx4 device ID 



This is a simple device ID add for adapters that support
CX4 (copper infiniband style cable) connectors for 10GbE.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 05c550ba

drivers/net/ixgbe/ixgbe_82598.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -190,6 +190,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw) 
	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_82598EB_CX4:

	case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:

		media_type = ixgbe_media_type_fiber;

		media_type = ixgbe_media_type_fiber;

		break;

		break;

	case IXGBE_DEV_ID_82598AT_DUAL_PORT:

	case IXGBE_DEV_ID_82598AT_DUAL_PORT:

drivers/net/ixgbe/ixgbe_main.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ char ixgbe_driver_name[] = "ixgbe"; 
static const char ixgbe_driver_string[] =

static const char ixgbe_driver_string[] =

	"Intel(R) 10 Gigabit PCI Express Network Driver";

	"Intel(R) 10 Gigabit PCI Express Network Driver";





#define DRV_VERSION "1.3.18-k2"

#define DRV_VERSION "1.3.18-k4"

const char ixgbe_driver_version[] = DRV_VERSION;

const char ixgbe_driver_version[] = DRV_VERSION;

static const char ixgbe_copyright[] =

static const char ixgbe_copyright[] =

	 "Copyright (c) 1999-2007 Intel Corporation.";

	 "Copyright (c) 1999-2007 Intel Corporation.";
@@ -72,6 +72,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = { 
	 board_82598 },

	 board_82598 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),

	 board_82598 },

	 board_82598 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT),

	 board_82598 },





	/* required last entry */

	/* required last entry */

	{0, }

	{0, }

drivers/net/ixgbe/ixgbe_type.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7

#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7

#define IXGBE_DEV_ID_82598AT_DUAL_PORT   0x10C8

#define IXGBE_DEV_ID_82598AT_DUAL_PORT   0x10C8

#define IXGBE_DEV_ID_82598EB_CX4         0x10DD

#define IXGBE_DEV_ID_82598EB_CX4         0x10DD

#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC





/* General Registers */

/* General Registers */

#define IXGBE_CTRL      0x00000

#define IXGBE_CTRL      0x00000