UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

dm9000: report the correct LPA 

Report the LPA by checking mii_if_info, instead of just saying "no LPA" every
time.

Cc: David S. Miller <davem@davemloft.net>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikita Kiryanov 2013-10-16 11:41:34 +03:00 committed by David S. Miller
parent 09ee9f87d0
commit 727a282fdb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/davicom/dm9000.c
View File

@ -753,15 +753,20 @@ static const struct ethtool_ops dm9000_ethtool_ops = {
static void dm9000_show_carrier(board_info_t *db, static void dm9000_show_carrier(board_info_t *db,
unsigned carrier, unsigned nsr) unsigned carrier, unsigned nsr)
{ {
int lpa;
struct net_device *ndev = db->ndev; struct net_device *ndev = db->ndev;
struct mii_if_info *mii = &db->mii;
unsigned ncr = dm9000_read_locked(db, DM9000_NCR); unsigned ncr = dm9000_read_locked(db, DM9000_NCR);
if (carrier) if (carrier) {
dev_info(db->dev, "%s: link up, %dMbps, %s-duplex, no LPA\n", lpa = mii->mdio_read(mii->dev, mii->phy_id, MII_LPA);
dev_info(db->dev,
"%s: link up, %dMbps, %s-duplex, lpa 0x%04X\n",
ndev->name, (nsr & NSR_SPEED) ? 10 : 100, ndev->name, (nsr & NSR_SPEED) ? 10 : 100,
(ncr & NCR_FDX) ? "full" : "half"); (ncr & NCR_FDX) ? "full" : "half", lpa);
else } else {
dev_info(db->dev, "%s: link down\n", ndev->name); dev_info(db->dev, "%s: link down\n", ndev->name);
}
} }
static void static void