The patch titled
ixgb: Add CX4 PHY type detection and subdevice ID.
has been removed from the -mm tree. Its filename is
ixgb-add-cx4-phy-type-detection-and-subdevice-id.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ixgb: Add CX4 PHY type detection and subdevice ID.
From: "Kok, Auke" <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Manasi Deval <manasi.deval@xxxxxxxxx>
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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 */
_
Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are
git-netdev-all.patch
e1000-memory-leak-in-e1000_set_ringparam.patch
e1000-ring-buffers-resources-cleanup.patch
e1000-irq-resources-cleanup.patch
e1000-e1000_probe-resources-cleanup.patch
ixgb-add-pci-error-recovery-callbacks.patch
e100-disable-device-on-pci-error.patch
e1000-disable-device-on-pci-error.patch
e1000_7033_dump_ring.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
