From: "Kok, Auke" Signed-off-by: Manasi Deval Signed-off-by: Auke Kok Signed-off-by: Andrew Morton --- drivers/net/ixgb/ixgb_hw.c | 11 +++++++++++ drivers/net/ixgb/ixgb_ids.h | 1 + 2 files changed, 12 insertions(+) diff -puN drivers/net/ixgb/ixgb_hw.c~ixgb-add-cx4-phy-type-detection-and-subdevice-id drivers/net/ixgb/ixgb_hw.c --- a/drivers/net/ixgb/ixgb_hw.c~ixgb-add-cx4-phy-type-detection-and-subdevice-id +++ a/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 -puN drivers/net/ixgb/ixgb_ids.h~ixgb-add-cx4-phy-type-detection-and-subdevice-id drivers/net/ixgb/ixgb_ids.h --- a/drivers/net/ixgb/ixgb_ids.h~ixgb-add-cx4-phy-type-detection-and-subdevice-id +++ a/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 */ _