From ffd81d26ae0797275e37dc61d44bf74e2e584d4e Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 27 Nov 2008 00:23:12 -0800 Subject: [PATCH] --- yaml --- r: 122353 b: refs/heads/master c: d276016cf990f492cb33a1ff61d789730b3f0d6d h: refs/heads/master i: 122351: fd5631037f8db67b09fe7736a39e650cb5c81658 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_main.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8b8dd5c6217a..7ccaa6b6aeab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b30c4d8f8210bc4ea92942ab786407ec2d780549 +refs/heads/master: d276016cf990f492cb33a1ff61d789730b3f0d6d diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c index a04e3892ddf4..820a92cc7f62 100644 --- a/trunk/drivers/net/ixgb/ixgb_main.c +++ b/trunk/drivers/net/ixgb/ixgb_main.c @@ -1110,8 +1110,15 @@ ixgb_watchdog(unsigned long data) if (adapter->hw.link_up) { if (!netif_carrier_ok(netdev)) { - DPRINTK(LINK, INFO, - "NIC Link is Up 10000 Mbps Full Duplex\n"); + printk(KERN_INFO "ixgb: %s NIC Link is Up 10 Gbps " + "Full Duplex, Flow Control: %s\n", + netdev->name, + (adapter->hw.fc.type == ixgb_fc_full) ? + "RX/TX" : + ((adapter->hw.fc.type == ixgb_fc_rx_pause) ? + "RX" : + ((adapter->hw.fc.type == ixgb_fc_tx_pause) ? + "TX" : "None"))); adapter->link_speed = 10000; adapter->link_duplex = FULL_DUPLEX; netif_carrier_on(netdev); @@ -1121,7 +1128,8 @@ ixgb_watchdog(unsigned long data) if (netif_carrier_ok(netdev)) { adapter->link_speed = 0; adapter->link_duplex = 0; - DPRINTK(LINK, INFO, "NIC Link is Down\n"); + printk(KERN_INFO "ixgb: %s NIC Link is Down\n", + netdev->name); netif_carrier_off(netdev); netif_stop_queue(netdev);