Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122354
b: refs/heads/master
c: f411303
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Kirsher authored and David S. Miller committed Nov 27, 2008
1 parent ffd81d2 commit 84cc379
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 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: d276016cf990f492cb33a1ff61d789730b3f0d6d
refs/heads/master: f4113030e73db80bc5368a8303458008975402dd
10 changes: 6 additions & 4 deletions trunk/drivers/net/e100.c
Original file line number Diff line number Diff line change
Expand Up @@ -1580,11 +1580,13 @@ static void e100_watchdog(unsigned long data)
mii_ethtool_gset(&nic->mii, &cmd);

if(mii_link_ok(&nic->mii) && !netif_carrier_ok(nic->netdev)) {
DPRINTK(LINK, INFO, "link up, %sMbps, %s-duplex\n",
cmd.speed == SPEED_100 ? "100" : "10",
cmd.duplex == DUPLEX_FULL ? "full" : "half");
printk(KERN_INFO "e100: %s NIC Link is Up %s Mbps %s Duplex\n",
nic->netdev->name,
cmd.speed == SPEED_100 ? "100" : "10",
cmd.duplex == DUPLEX_FULL ? "Full" : "Half");
} else if(!mii_link_ok(&nic->mii) && netif_carrier_ok(nic->netdev)) {
DPRINTK(LINK, INFO, "link down\n");
printk(KERN_INFO "e100: %s NIC Link is Down\n",
nic->netdev->name);
}

mii_check_link(&nic->mii);
Expand Down

0 comments on commit 84cc379

Please sign in to comment.