From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>,
netdev@vger.kernel.org, David Miller <davem@davemloft.net>
Cc: John Rociak <john.ronciak@intel.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>
Subject: [PATCH 08/11] ixgb: Add support for copper 10GbE
Date: Fri, 21 Apr 2006 18:00:48 -0700 [thread overview]
Message-ID: <20060422010048.24255.65982.stgit@jk-desktop.jf.intel.com> (raw)
In-Reply-To: <20060422010016.24255.50772.stgit@jk-desktop.jf.intel.com>
- Add support for Copper 10GbE device ID 109E
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
---
drivers/net/ixgb/ixgb_hw.h | 1 +
drivers/net/ixgb/ixgb_ids.h | 4 +++-
drivers/net/ixgb/ixgb_main.c | 7 +++++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h
index 382c630..19513c6 100644
--- a/drivers/net/ixgb/ixgb_hw.h
+++ b/drivers/net/ixgb/ixgb_hw.h
@@ -57,6 +57,7 @@ typedef enum {
typedef enum {
ixgb_media_type_unknown = 0,
ixgb_media_type_fiber = 1,
+ ixgb_media_type_copper = 2,
ixgb_num_media_types
} ixgb_media_type;
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h
index aee207e..e119c05 100644
--- a/drivers/net/ixgb/ixgb_ids.h
+++ b/drivers/net/ixgb/ixgb_ids.h
@@ -43,6 +43,8 @@
#define IXGB_SUBDEVICE_ID_A11F 0xA11F
#define IXGB_SUBDEVICE_ID_A01F 0xA01F
-#endif /* #ifndef _IXGB_IDS_H_ */
+#define IXGB_DEVICE_ID_82597EX_CX4 0x109E
+#define IXGB_SUBDEVICE_ID_A00C 0xA00C
+#endif /* #ifndef _IXGB_IDS_H_ */
/* End of File */
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 9d262c8..be7b43b 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -67,6 +67,8 @@ static char ixgb_copyright[] = "Copyrigh
static struct pci_device_id ixgb_pci_tbl[] = {
{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,
@@ -570,8 +572,9 @@ ixgb_sw_init(struct ixgb_adapter *adapte
hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
if((hw->device_id == IXGB_DEVICE_ID_82597EX)
- ||(hw->device_id == IXGB_DEVICE_ID_82597EX_LR)
- ||(hw->device_id == IXGB_DEVICE_ID_82597EX_SR))
+ || (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4)
+ || (hw->device_id == IXGB_DEVICE_ID_82597EX_LR)
+ || (hw->device_id == IXGB_DEVICE_ID_82597EX_SR))
hw->mac_type = ixgb_82597;
else {
/* should never have loaded on this device */
next prev parent reply other threads:[~2006-04-22 0:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-22 1:00 [PATCH 00/11] ixgb: driver update (upstream) Jeff Kirsher
2006-04-22 1:00 ` [PATCH 01/11] ixgb: Fix compilation errors by initializing variables Jeff Kirsher
2006-04-22 8:49 ` Francois Romieu
2006-04-22 1:00 ` [PATCH 02/11] ixgb: Fix the use of dprintk rather than printk Jeff Kirsher
2006-04-22 9:03 ` Francois Romieu
2006-04-24 17:24 ` Stephen Hemminger
2006-05-19 18:35 ` Auke Kok
2006-04-22 1:00 ` [PATCH 03/11] ixgb: Fix hard coded numbers Jeff Kirsher
2006-04-22 9:17 ` Francois Romieu
2006-04-22 1:00 ` [PATCH 04/11] ixgb: Fix duplicate code Jeff Kirsher
2006-04-22 1:00 ` [PATCH 05/11] ixgb: Fix timeout code Jeff Kirsher
2006-04-22 1:00 ` [PATCH 06/11] ixgb: Fix TSO Jeff Kirsher
2006-04-22 1:00 ` [PATCH 07/11] ixgb: Fixed flow control parameters Jeff Kirsher
2006-04-22 1:00 ` Jeff Kirsher [this message]
2006-04-22 1:00 ` [PATCH 09/11] ixgb: Add performance enhancements to the buffer_info struct Jeff Kirsher
2006-04-22 1:00 ` [PATCH 10/11] ixgb: clean up whitespace Jeff Kirsher
2006-04-22 1:00 ` [PATCH 11/11] ixgb: Add prefetch Jeff Kirsher
2006-04-22 5:34 ` Eric Dumazet
2006-04-26 10:22 ` [PATCH 00/11] ixgb: driver update (upstream) Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060422010048.24255.65982.stgit@jk-desktop.jf.intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jesse.brandeburg@intel.com \
--cc=jgarzik@pobox.com \
--cc=john.ronciak@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).