diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-11 08:48:45 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-11 08:48:45 +0200 |
| commit | 693b92d58a50e7ed3d6f5c4ddfbec980228ecc55 (patch) | |
| tree | 249cfc3e801466c47a545e377f57c3552ca6e990 | |
| parent | 40a1897e885c238697ff65610ea4c2772fd9b634 (diff) | |
| parent | 7eb8f2a59cb98e747f621913596364e2db808e27 (diff) | |
| download | barebox-693b92d58a50e7ed3d6f5c4ddfbec980228ecc55.tar.gz | |
Merge branch 'pu/mii-tool'
| -rw-r--r-- | commands/miitool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/commands/miitool.c b/commands/miitool.c index 5a5278d34d..b08be9c683 100644 --- a/commands/miitool.c +++ b/commands/miitool.c @@ -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"); } |