diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-13 07:06:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-13 07:06:54 +0100 |
| commit | ab377358701a981e7fae1332e76b1e5d3b3b313d (patch) | |
| tree | 6c6207aa79eca7e7c1d33bbb3d0a460c7aef3b4a /drivers/net/sfc | |
| parent | sfc: Use mutex_lock_interruptible() for ethtool EEPROM access (diff) | |
| download | linux-ab377358701a981e7fae1332e76b1e5d3b3b313d.tar.xz linux-ab377358701a981e7fae1332e76b1e5d3b3b313d.zip | |
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.c | 2 | ||||
| -rw-r--r-- | drivers/net/sfc/net_driver.h | 6 | ||||
| -rw-r--r-- | drivers/net/sfc/xfp_phy.c | 2 |
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) 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/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 { 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/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 @@ * 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) */ |