summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sun/niu.c
diff options
context:
space:
mode:
authorMatt Carlson2011-11-17 15:30:55 +0100
committerDavid S. Miller2011-11-21 21:27:19 +0100
commit37f07023d30708b5da091fe6d6be9b60783c6d82 (patch)
treee4f576abd841cdeddc6cbdc9da6b083277784295 /drivers/net/ethernet/sun/niu.c
parentgianfar: Use kmemdup rather than duplicating its implementation (diff)
downloadkernel-qcow2-linux-37f07023d30708b5da091fe6d6be9b60783c6d82.tar.gz
kernel-qcow2-linux-37f07023d30708b5da091fe6d6be9b60783c6d82.tar.xz
kernel-qcow2-linux-37f07023d30708b5da091fe6d6be9b60783c6d82.zip
net: Change mii to ethtool advertisement function names
This patch implements advice by Ben Hutchings to change the mii side of the function names to look more like the register whose values they convert. New LPA translation functions have been added as well. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sun/niu.c')
-rw-r--r--drivers/net/ethernet/sun/niu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 9997be525089..680b107fdabd 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -1151,8 +1151,8 @@ static int link_status_mii(struct niu *np, int *link_up_p)
supported |= SUPPORTED_1000baseT_Full;
lp->supported = supported;
- advertising = mii_adv_to_ethtool_100bt(advert);
- advertising |= mii_adv_to_ethtool_1000T(ctrl1000);
+ advertising = mii_adv_to_ethtool_adv_t(advert);
+ advertising |= mii_ctrl1000_to_ethtool_adv_t(ctrl1000);
if (bmcr & BMCR_ANENABLE) {
int neg, neg1000;