Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122353
b: refs/heads/master
c: d276016
h: refs/heads/master
i:
  122351: fd56310
v: v3
  • Loading branch information
Jeff Kirsher authored and David S. Miller committed Nov 27, 2008
1 parent 26bf21f commit ffd81d2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b30c4d8f8210bc4ea92942ab786407ec2d780549
refs/heads/master: d276016cf990f492cb33a1ff61d789730b3f0d6d
14 changes: 11 additions & 3 deletions trunk/drivers/net/ixgb/ixgb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down

0 comments on commit ffd81d2

Please sign in to comment.