Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 90857
b: refs/heads/master
c: 0b50d75
h: refs/heads/master
i:
  90855: 32b9d30
v: v3
  • Loading branch information
Ishizaki Kou authored and Jeff Garzik committed Apr 17, 2008
1 parent f27612d commit f802564
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: 9a11fcb5215d6ecade9aca1f1fba272746a3882d
refs/heads/master: 0b50d753874ad4843d305bf841ba5e28fc0f0ce7
10 changes: 6 additions & 4 deletions trunk/drivers/net/spider_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -2045,7 +2045,8 @@ static void spider_net_link_phy(unsigned long data)
/* if link didn't come up after SPIDER_NET_ANEG_TIMEOUT tries, setup phy again */
if (card->aneg_count > SPIDER_NET_ANEG_TIMEOUT) {

pr_info("%s: link is down trying to bring it up\n", card->netdev->name);
pr_debug("%s: link is down trying to bring it up\n",
card->netdev->name);

switch (card->medium) {
case BCM54XX_COPPER:
Expand Down Expand Up @@ -2096,9 +2097,10 @@ static void spider_net_link_phy(unsigned long data)

card->aneg_count = 0;

pr_debug("Found %s with %i Mbps, %s-duplex %sautoneg.\n",
phy->def->name, phy->speed, phy->duplex==1 ? "Full" : "Half",
phy->autoneg==1 ? "" : "no ");
pr_info("%s: link up, %i Mbps, %s-duplex %sautoneg.\n",
card->netdev->name, phy->speed,
phy->duplex == 1 ? "Full" : "Half",
phy->autoneg == 1 ? "" : "no ");

return;
}
Expand Down

0 comments on commit f802564

Please sign in to comment.