netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ixgbe: add cx4 device ID
@ 2008-08-08 23:24 Jeff Kirsher
  2008-08-14  8:46 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kirsher @ 2008-08-08 23:24 UTC (permalink / raw)
  To: jeff; +Cc: netdev, davem, akpm, Jesse Brandeburg, Jeff Kirsher

From: Jesse Brandeburg <jesse.brandeburg@intel.com>

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

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

 drivers/net/ixgbe/ixgbe_82598.c |    1 +
 drivers/net/ixgbe/ixgbe_main.c  |    4 +++-
 drivers/net/ixgbe/ixgbe_type.h  |    1 +
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index 2f38e84..f96358b 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -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_SINGLE_PORT:
 	case IXGBE_DEV_ID_82598EB_CX4:
+	case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:
 		media_type = ixgbe_media_type_fiber;
 		break;
 	case IXGBE_DEV_ID_82598AT_DUAL_PORT:
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index e5f3da8..34bca16 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -48,7 +48,7 @@ char ixgbe_driver_name[] = "ixgbe";
 static const char ixgbe_driver_string[] =
 	"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;
 static const char ixgbe_copyright[] =
 	 "Copyright (c) 1999-2007 Intel Corporation.";
@@ -72,6 +72,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
 	 board_82598 },
 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),
 	 board_82598 },
+	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT),
+	 board_82598 },
 
 	/* required last entry */
 	{0, }
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index 1ad7cb9..c0282a2 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -39,6 +39,7 @@
 #define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7
 #define IXGBE_DEV_ID_82598AT_DUAL_PORT   0x10C8
 #define IXGBE_DEV_ID_82598EB_CX4         0x10DD
+#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC
 
 /* General Registers */
 #define IXGBE_CTRL      0x00000


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ixgbe: add cx4 device ID
  2008-08-08 23:24 [PATCH] ixgbe: add cx4 device ID Jeff Kirsher
@ 2008-08-14  8:46 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-08-14  8:46 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: netdev, davem, akpm, Jesse Brandeburg

Jeff Kirsher wrote:
> From: Jesse Brandeburg <jesse.brandeburg@intel.com>
> 
> This is a simple device ID add for adapters that support
> CX4 (copper infiniband style cable) connectors for 10GbE.
> 
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
> 
>  drivers/net/ixgbe/ixgbe_82598.c |    1 +
>  drivers/net/ixgbe/ixgbe_main.c  |    4 +++-
>  drivers/net/ixgbe/ixgbe_type.h  |    1 +
>  3 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
> index 2f38e84..f96358b 100644
> --- a/drivers/net/ixgbe/ixgbe_82598.c
> +++ b/drivers/net/ixgbe/ixgbe_82598.c
> @@ -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_SINGLE_PORT:
>  	case IXGBE_DEV_ID_82598EB_CX4:
> +	case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:
>  		media_type = ixgbe_media_type_fiber;
>  		break;
>  	case IXGBE_DEV_ID_82598AT_DUAL_PORT:
> diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
> index e5f3da8..34bca16 100644
> --- a/drivers/net/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ixgbe/ixgbe_main.c
> @@ -48,7 +48,7 @@ char ixgbe_driver_name[] = "ixgbe";
>  static const char ixgbe_driver_string[] =
>  	"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;
>  static const char ixgbe_copyright[] =
>  	 "Copyright (c) 1999-2007 Intel Corporation.";
> @@ -72,6 +72,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
>  	 board_82598 },
>  	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),
>  	 board_82598 },
> +	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT),
> +	 board_82598 },
>  
>  	/* required last entry */
>  	{0, }
> diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
> index 1ad7cb9..c0282a2 100644
> --- a/drivers/net/ixgbe/ixgbe_type.h
> +++ b/drivers/net/ixgbe/ixgbe_type.h
> @@ -39,6 +39,7 @@
>  #define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7
>  #define IXGBE_DEV_ID_82598AT_DUAL_PORT   0x10C8
>  #define IXGBE_DEV_ID_82598EB_CX4         0x10DD
> +#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC
>  

applied



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-08-14  8:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-08 23:24 [PATCH] ixgbe: add cx4 device ID Jeff Kirsher
2008-08-14  8:46 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).