9
0
Fork 0

Merge branch 'pu/mii-tool'

This commit is contained in:
Sascha Hauer 2014-06-11 08:48:45 +02:00
commit 693b92d58a
1 changed files with 4 additions and 4 deletions

View File

@ -61,12 +61,12 @@ const struct {
static const char *media_list(unsigned mask, unsigned mask2, int best)
{
static char buf[100];
static char buf[256];
int i;
*buf = '\0';
if (mask & BMCR_SPEED1000) {
if (mask2) {
if (mask2 & ADVERTISE_1000FULL) {
strcat(buf, " ");
strcat(buf, "1000baseT-FD");
@ -209,7 +209,7 @@ static int show_basic_mii(struct mii_bus *mii, struct phy_device *phydev,
printf("remote fault, ");
printf((bmsr & BMSR_LSTATUS) ? "link ok" : "no link");
printf("\n capabilities:%s", media_list(bmsr >> 6, bmcr2, 0));
printf("\n advertising: %s", media_list(advert, lpa2 >> 2, 0));
printf("\n advertising: %s", media_list(advert, bmcr2, 0));
#define LPA_ABILITY_MASK (LPA_10HALF | LPA_10FULL \
| LPA_100HALF | LPA_100FULL \
@ -217,7 +217,7 @@ static int show_basic_mii(struct mii_bus *mii, struct phy_device *phydev,
if (lkpar & LPA_ABILITY_MASK)
printf("\n link partner:%s",
media_list(lkpar, bmcr2, 0));
media_list(lkpar, lpa2 >> 2, 0));
printf("\n");
}