From eb1ae675284ee0564cca9a0186aaa57c14af97b0 Mon Sep 17 00:00:00 2001 From: Manasi Deval Date: Wed, 16 Aug 2006 13:47:20 -0700 Subject: [PATCH] --- yaml --- r: 35178 b: refs/heads/master c: 0fe198a5e10229b269624a18bbd390001a8d3476 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_hw.c | 11 +++++++++++ trunk/drivers/net/ixgb/ixgb_ids.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2c8d577b57fc..918962eaa099 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc335d9735220b3a9ece5ec2d95864b1e8ff06a0 +refs/heads/master: 0fe198a5e10229b269624a18bbd390001a8d3476 diff --git a/trunk/drivers/net/ixgb/ixgb_hw.c b/trunk/drivers/net/ixgb/ixgb_hw.c index f7fa10e47fa2..2b1515574faf 100644 --- a/trunk/drivers/net/ixgb/ixgb_hw.c +++ b/trunk/drivers/net/ixgb/ixgb_hw.c @@ -236,6 +236,17 @@ ixgb_identify_phy(struct ixgb_hw *hw) DEBUGOUT("Identified G6104 optics\n"); phy_type = ixgb_phy_type_g6104; break; + case IXGB_DEVICE_ID_82597EX_CX4: + DEBUGOUT("Identified CX4\n"); + xpak_vendor = ixgb_identify_xpak_vendor(hw); + if (xpak_vendor == ixgb_xpak_vendor_intel) { + DEBUGOUT("Identified TXN17201 optics\n"); + phy_type = ixgb_phy_type_txn17201; + } else { + DEBUGOUT("Identified G6005 optics\n"); + phy_type = ixgb_phy_type_g6005; + } + break; default: DEBUGOUT("Unknown physical layer module\n"); phy_type = ixgb_phy_type_unknown; diff --git a/trunk/drivers/net/ixgb/ixgb_ids.h b/trunk/drivers/net/ixgb/ixgb_ids.h index 40a085f94c7b..9fd61189b4b2 100644 --- a/trunk/drivers/net/ixgb/ixgb_ids.h +++ b/trunk/drivers/net/ixgb/ixgb_ids.h @@ -45,6 +45,7 @@ #define IXGB_DEVICE_ID_82597EX_CX4 0x109E #define IXGB_SUBDEVICE_ID_A00C 0xA00C +#define IXGB_SUBDEVICE_ID_A01C 0xA01C #endif /* #ifndef _IXGB_IDS_H_ */ /* End of File */