diff options
author | Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> | 2009-09-14 03:47:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-14 20:03:42 -0400 |
commit | 8911184fed68d2cdde1a8a920813e07a6d4f997f (patch) | |
tree | f0d772e55b382209d1a149d76f35852a6da948dc /drivers/net/ixgbe | |
parent | 1b3ff02eac6dcb6d7d03a5be6a642b58ec9cf4bb (diff) |
ixgbe: Add support for 82599-based CX4 adapters
This patch adds support for CX4 adapters based on 82599.
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>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_82599.c | 3 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_type.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index 61af47e75aa1..c9006bbd2ed3 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c | |||
@@ -337,6 +337,9 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) | |||
337 | case IXGBE_DEV_ID_82599_SFP: | 337 | case IXGBE_DEV_ID_82599_SFP: |
338 | media_type = ixgbe_media_type_fiber; | 338 | media_type = ixgbe_media_type_fiber; |
339 | break; | 339 | break; |
340 | case IXGBE_DEV_ID_82599_CX4: | ||
341 | media_type = ixgbe_media_type_fiber; | ||
342 | break; | ||
340 | default: | 343 | default: |
341 | media_type = ixgbe_media_type_unknown; | 344 | media_type = ixgbe_media_type_unknown; |
342 | break; | 345 | break; |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index b47aaa881334..59ad9590e700 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -97,6 +97,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = { | |||
97 | board_82599 }, | 97 | board_82599 }, |
98 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), | 98 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), |
99 | board_82599 }, | 99 | board_82599 }, |
100 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4), | ||
101 | board_82599 }, | ||
100 | 102 | ||
101 | /* required last entry */ | 103 | /* required last entry */ |
102 | {0, } | 104 | {0, } |
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h index 8ba90eec1dc9..37303a15e6de 100644 --- a/drivers/net/ixgbe/ixgbe_type.h +++ b/drivers/net/ixgbe/ixgbe_type.h | |||
@@ -49,6 +49,7 @@ | |||
49 | #define IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM 0x10E1 | 49 | #define IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM 0x10E1 |
50 | #define IXGBE_DEV_ID_82598EB_XF_LR 0x10F4 | 50 | #define IXGBE_DEV_ID_82598EB_XF_LR 0x10F4 |
51 | #define IXGBE_DEV_ID_82599_KX4 0x10F7 | 51 | #define IXGBE_DEV_ID_82599_KX4 0x10F7 |
52 | #define IXGBE_DEV_ID_82599_CX4 0x10F9 | ||
52 | #define IXGBE_DEV_ID_82599_SFP 0x10FB | 53 | #define IXGBE_DEV_ID_82599_SFP 0x10FB |
53 | #define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC | 54 | #define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC |
54 | 55 | ||