diff options
Diffstat (limited to 'drivers/net/sfc/efx.c')
-rw-r--r-- | drivers/net/sfc/efx.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index bba11490ef41..957a6320bbcb 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/ethtool.h> | 21 | #include <linux/ethtool.h> |
22 | #include <linux/topology.h> | 22 | #include <linux/topology.h> |
23 | #include "net_driver.h" | 23 | #include "net_driver.h" |
24 | #include "gmii.h" | ||
25 | #include "ethtool.h" | 24 | #include "ethtool.h" |
26 | #include "tx.h" | 25 | #include "tx.h" |
27 | #include "rx.h" | 26 | #include "rx.h" |
@@ -551,26 +550,8 @@ static void efx_link_status_changed(struct efx_nic *efx) | |||
551 | 550 | ||
552 | /* Status message for kernel log */ | 551 | /* Status message for kernel log */ |
553 | if (efx->link_up) { | 552 | if (efx->link_up) { |
554 | struct mii_if_info *gmii = &efx->mii; | 553 | EFX_INFO(efx, "link up at %uMbps %s-duplex (MTU %d)%s\n", |
555 | unsigned adv, lpa; | 554 | efx->link_speed, efx->link_fd ? "full" : "half", |
556 | /* NONE here means direct XAUI from the controller, with no | ||
557 | * MDIO-attached device we can query. */ | ||
558 | if (efx->phy_type != PHY_TYPE_NONE) { | ||
559 | adv = gmii_advertised(gmii); | ||
560 | lpa = gmii_lpa(gmii); | ||
561 | } else { | ||
562 | lpa = GM_LPA_10000 | LPA_DUPLEX; | ||
563 | adv = lpa; | ||
564 | } | ||
565 | EFX_INFO(efx, "link up at %dMbps %s-duplex " | ||
566 | "(adv %04x lpa %04x) (MTU %d)%s\n", | ||
567 | (efx->link_options & GM_LPA_10000 ? 10000 : | ||
568 | (efx->link_options & GM_LPA_1000 ? 1000 : | ||
569 | (efx->link_options & GM_LPA_100 ? 100 : | ||
570 | 10))), | ||
571 | (efx->link_options & GM_LPA_DUPLEX ? | ||
572 | "full" : "half"), | ||
573 | adv, lpa, | ||
574 | efx->net_dev->mtu, | 555 | efx->net_dev->mtu, |
575 | (efx->promiscuous ? " [PROMISC]" : "")); | 556 | (efx->promiscuous ? " [PROMISC]" : "")); |
576 | } else { | 557 | } else { |