Commit 66d7f339 authored by Scott Feldman's avatar Scott Feldman Committed by Jeff Garzik

e100 2/4:

* Added meaningful message for self-test failures
* Removed confusing messages from probe when link isn't detected
parent 6900d730
...@@ -1241,12 +1241,21 @@ e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -1241,12 +1241,21 @@ e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
static unsigned char __devinit static unsigned char __devinit
e100_init(struct e100_private *bdp) e100_init(struct e100_private *bdp)
{ {
u32 st_timeout = 0;
u32 st_result = 0;
e100_sw_init(bdp); e100_sw_init(bdp);
if (!e100_selftest(bdp, NULL, NULL)) { if (!e100_selftest(bdp, &st_timeout, &st_result)) {
printk(KERN_ERR "e100: selftest failed\n"); if (st_timeout) {
printk(KERN_ERR "e100: selftest timeout\n");
} else {
printk(KERN_ERR "e100: selftest failed. Results: %x\n",
st_result);
}
return false; return false;
} }
else
printk(KERN_DEBUG "e100: selftest OK.\n");
/* read the MAC address from the eprom */ /* read the MAC address from the eprom */
e100_rd_eaddr(bdp); e100_rd_eaddr(bdp);
...@@ -2943,11 +2952,6 @@ e100_print_brd_conf(struct e100_private *bdp) ...@@ -2943,11 +2952,6 @@ e100_print_brd_conf(struct e100_private *bdp)
" Mem:0x%08lx IRQ:%d Speed:%d Mbps Dx:%s\n", " Mem:0x%08lx IRQ:%d Speed:%d Mbps Dx:%s\n",
(unsigned long) bdp->device->mem_start, (unsigned long) bdp->device->mem_start,
bdp->device->irq, 0, "N/A"); bdp->device->irq, 0, "N/A");
/* Auto negotiation failed so we should display an error */
printk(KERN_NOTICE " Failed to detect cable link\n");
printk(KERN_NOTICE " Speed and duplex will be determined "
"at time of connection\n");
} }
/* Print the string if checksum Offloading was enabled */ /* Print the string if checksum Offloading was enabled */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment