aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-12-13 01:06:54 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-13 01:06:54 -0500
commitab377358701a981e7fae1332e76b1e5d3b3b313d (patch)
tree6c6207aa79eca7e7c1d33bbb3d0a460c7aef3b4a /drivers/net/sfc
parentca54a9f525236c389f464d0952c8a7d6a4035906 (diff)
sfc: Use model numbers for PHY type names
Some of the PHY type names are overly generic. Change them to include the model numbers of the PHYs they represent. Correct the model number reference at the top of xfp_phy.c. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc')
-rw-r--r--drivers/net/sfc/falcon.c2
-rw-r--r--drivers/net/sfc/net_driver.h6
-rw-r--r--drivers/net/sfc/xfp_phy.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 13627a64bce1..df844defc0a9 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -2252,7 +2252,7 @@ static int falcon_probe_phy(struct efx_nic *efx)
2252 case PHY_TYPE_SFT9001B: 2252 case PHY_TYPE_SFT9001B:
2253 efx->phy_op = &falcon_sft9001_phy_ops; 2253 efx->phy_op = &falcon_sft9001_phy_ops;
2254 break; 2254 break;
2255 case PHY_TYPE_XFP: 2255 case PHY_TYPE_QT2022C2:
2256 efx->phy_op = &falcon_xfp_phy_ops; 2256 efx->phy_op = &falcon_xfp_phy_ops;
2257 break; 2257 break;
2258 default: 2258 default:
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 17283293302a..7033dba87ed9 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -453,10 +453,10 @@ enum efx_int_mode {
453 453
454enum phy_type { 454enum phy_type {
455 PHY_TYPE_NONE = 0, 455 PHY_TYPE_NONE = 0,
456 PHY_TYPE_CX4_RTMR = 1, 456 PHY_TYPE_TXC43128 = 1,
457 PHY_TYPE_1G_ALASKA = 2, 457 PHY_TYPE_88E1111 = 2,
458 PHY_TYPE_SFX7101 = 3, 458 PHY_TYPE_SFX7101 = 3,
459 PHY_TYPE_XFP = 4, 459 PHY_TYPE_QT2022C2 = 4,
460 PHY_TYPE_PM8358 = 6, 460 PHY_TYPE_PM8358 = 6,
461 PHY_TYPE_SFT9001A = 8, 461 PHY_TYPE_SFT9001A = 8,
462 PHY_TYPE_SFT9001B = 10, 462 PHY_TYPE_SFT9001B = 10,
diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c
index 345ffc310dca..2d50b6ecf5f9 100644
--- a/drivers/net/sfc/xfp_phy.c
+++ b/drivers/net/sfc/xfp_phy.c
@@ -7,7 +7,7 @@
7 * by the Free Software Foundation, incorporated herein by reference. 7 * by the Free Software Foundation, incorporated herein by reference.
8 */ 8 */
9/* 9/*
10 * Driver for XFP optical PHYs (plus some support specific to the Quake 2032) 10 * Driver for XFP optical PHYs (plus some support specific to the Quake 2022/32)
11 * See www.amcc.com for details (search for qt2032) 11 * See www.amcc.com for details (search for qt2032)
12 */ 12 */
13 13