aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2007-07-08 01:50:37 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-11 01:18:34 -0400
commit9b1084b8f99a6b5e97c0c9bc1b4455db4fa51a07 (patch)
tree43db5eeb705032e8a4596d13d98c2ad6df92b56b
parent7b6b83474cb9bdd07dadfb7497a29c3005ad9d1d (diff)
[BNX2]: Modify link up message.
Modify the link up dmesg to report remote copper or Serdes link. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bnx2.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index d7fad6938bdd..439f4827addc 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -604,12 +604,21 @@ bnx2_report_fw_link(struct bnx2 *bp)
604 REG_WR_IND(bp, bp->shmem_base + BNX2_LINK_STATUS, fw_link_status); 604 REG_WR_IND(bp, bp->shmem_base + BNX2_LINK_STATUS, fw_link_status);
605} 605}
606 606
607static char *
608bnx2_xceiver_str(struct bnx2 *bp)
609{
610 return ((bp->phy_port == PORT_FIBRE) ? "SerDes" :
611 ((bp->phy_flags & PHY_SERDES_FLAG) ? "Remote Copper" :
612 "Copper"));
613}
614
607static void 615static void
608bnx2_report_link(struct bnx2 *bp) 616bnx2_report_link(struct bnx2 *bp)
609{ 617{
610 if (bp->link_up) { 618 if (bp->link_up) {
611 netif_carrier_on(bp->dev); 619 netif_carrier_on(bp->dev);
612 printk(KERN_INFO PFX "%s NIC Link is Up, ", bp->dev->name); 620 printk(KERN_INFO PFX "%s NIC %s Link is Up, ", bp->dev->name,
621 bnx2_xceiver_str(bp));
613 622
614 printk("%d Mbps ", bp->line_speed); 623 printk("%d Mbps ", bp->line_speed);
615 624
@@ -633,7 +642,8 @@ bnx2_report_link(struct bnx2 *bp)
633 } 642 }
634 else { 643 else {
635 netif_carrier_off(bp->dev); 644 netif_carrier_off(bp->dev);
636 printk(KERN_ERR PFX "%s NIC Link is Down\n", bp->dev->name); 645 printk(KERN_ERR PFX "%s NIC %s Link is Down\n", bp->dev->name,
646 bnx2_xceiver_str(bp));
637 } 647 }
638 648
639 bnx2_report_fw_link(bp); 649 bnx2_report_fw_link(bp);