Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 727a282f authored by Nikita Kiryanov's avatar Nikita Kiryanov Committed by David S. Miller
Browse files

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: default avatarNikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09ee9f87

drivers/net/ethernet/davicom/dm9000.c

+9 −4
Original line number Diff line number Diff line
@@ -753,16 +753,21 @@ static const struct ethtool_ops dm9000_ethtool_ops = { 
static void dm9000_show_carrier(board_info_t *db,

				unsigned carrier, unsigned nsr)

{

	int lpa;

	struct net_device *ndev = db->ndev;

	struct mii_if_info *mii = &db->mii;

	unsigned ncr = dm9000_read_locked(db, DM9000_NCR);



	if (carrier)

		dev_info(db->dev, "%s: link up, %dMbps, %s-duplex, no LPA\n",

	if (carrier) {

		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,

			 (ncr & NCR_FDX) ? "full" : "half");

	else

			 (ncr & NCR_FDX) ? "full" : "half", lpa);

	} else {

		dev_info(db->dev, "%s: link down\n", ndev->name);

	}

}



static void

dm9000_poll_work(struct work_struct *w)