|
@@ -247,8 +247,8 @@ static int mace_probe(struct platform_device *pdev)
|
|
|
dev->netdev_ops = &mace_netdev_ops;
|
|
|
dev->watchdog_timeo = TX_TIMEOUT;
|
|
|
|
|
|
- printk(KERN_INFO "%s: 68K MACE, hardware address %pM\n",
|
|
|
- dev->name, dev->dev_addr);
|
|
|
+ pr_info("Onboard MACE, hardware address %pM, chip revision 0x%04X\n",
|
|
|
+ dev->dev_addr, mp->chipid);
|
|
|
|
|
|
err = register_netdev(dev);
|
|
|
if (!err)
|
|
@@ -589,7 +589,6 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
|
|
|
else if (fs & (UFLO|LCOL|RTRY)) {
|
|
|
++dev->stats.tx_aborted_errors;
|
|
|
if (mb->xmtfs & UFLO) {
|
|
|
- printk(KERN_ERR "%s: DMA underrun.\n", dev->name);
|
|
|
dev->stats.tx_fifo_errors++;
|
|
|
mace_txdma_reset(dev);
|
|
|
}
|
|
@@ -644,10 +643,8 @@ static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf)
|
|
|
|
|
|
if (frame_status & (RS_OFLO | RS_CLSN | RS_FRAMERR | RS_FCSERR)) {
|
|
|
dev->stats.rx_errors++;
|
|
|
- if (frame_status & RS_OFLO) {
|
|
|
- printk(KERN_DEBUG "%s: fifo overflow.\n", dev->name);
|
|
|
+ if (frame_status & RS_OFLO)
|
|
|
dev->stats.rx_fifo_errors++;
|
|
|
- }
|
|
|
if (frame_status & RS_CLSN)
|
|
|
dev->stats.collisions++;
|
|
|
if (frame_status & RS_FRAMERR)
|