---

yaml --- r: 122627 b: refs/heads/master c: ab37735 h: refs/heads/master i: 122625: 46b3c51 122623: 79e62ae v: v3
git-mirror · Dec 13, 2008 · cd757fd · cd757fd
1 parent 2df1d49
commit cd757fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca54a9f525236c389f464d0952c8a7d6a4035906
+refs/heads/master: ab377358701a981e7fae1332e76b1e5d3b3b313d
diff --git a/trunk/drivers/net/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c
@@ -2252,7 +2252,7 @@ static int falcon_probe_phy(struct efx_nic *efx)
 	case PHY_TYPE_SFT9001B:
 		efx->phy_op = &falcon_sft9001_phy_ops;
 		break;
-	case PHY_TYPE_XFP:
+	case PHY_TYPE_QT2022C2:
 		efx->phy_op = &falcon_xfp_phy_ops;
 		break;
 	default:

diff --git a/trunk/drivers/net/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h
@@ -453,10 +453,10 @@ enum efx_int_mode {
 
 enum phy_type {
 	PHY_TYPE_NONE = 0,
-	PHY_TYPE_CX4_RTMR = 1,
-	PHY_TYPE_1G_ALASKA = 2,
+	PHY_TYPE_TXC43128 = 1,
+	PHY_TYPE_88E1111 = 2,
 	PHY_TYPE_SFX7101 = 3,
-	PHY_TYPE_XFP = 4,
+	PHY_TYPE_QT2022C2 = 4,
 	PHY_TYPE_PM8358 = 6,
 	PHY_TYPE_SFT9001A = 8,
 	PHY_TYPE_SFT9001B = 10,

diff --git a/trunk/drivers/net/sfc/xfp_phy.c b/trunk/drivers/net/sfc/xfp_phy.c
@@ -7,7 +7,7 @@
  * by the Free Software Foundation, incorporated herein by reference.
  */
 /*
- * Driver for XFP optical PHYs (plus some support specific to the Quake 2032)
+ * Driver for XFP optical PHYs (plus some support specific to the Quake 2022/32)
  * See www.amcc.com for details (search for qt2032)
  */