diff options
Diffstat (limited to 'drivers/net/mace.c')
-rw-r--r-- | drivers/net/mace.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 451acdca2a21..b52f0507845f 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
@@ -101,7 +101,6 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i | |||
101 | struct mace_data *mp; | 101 | struct mace_data *mp; |
102 | const unsigned char *addr; | 102 | const unsigned char *addr; |
103 | int j, rev, rc = -EBUSY; | 103 | int j, rev, rc = -EBUSY; |
104 | DECLARE_MAC_BUF(mac); | ||
105 | 104 | ||
106 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { | 105 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { |
107 | printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n", | 106 | printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n", |
@@ -241,8 +240,8 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i | |||
241 | goto err_free_rx_irq; | 240 | goto err_free_rx_irq; |
242 | } | 241 | } |
243 | 242 | ||
244 | printk(KERN_INFO "%s: MACE at %s, chip revision %d.%d\n", | 243 | printk(KERN_INFO "%s: MACE at %pM, chip revision %d.%d\n", |
245 | dev->name, print_mac(mac, dev->dev_addr), | 244 | dev->name, dev->dev_addr, |
246 | mp->chipid >> 8, mp->chipid & 0xff); | 245 | mp->chipid >> 8, mp->chipid & 0xff); |
247 | 246 | ||
248 | return 0; | 247 | return 0; |
@@ -929,7 +928,6 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) | |||
929 | skb->protocol = eth_type_trans(skb, dev); | 928 | skb->protocol = eth_type_trans(skb, dev); |
930 | dev->stats.rx_bytes += skb->len; | 929 | dev->stats.rx_bytes += skb->len; |
931 | netif_rx(skb); | 930 | netif_rx(skb); |
932 | dev->last_rx = jiffies; | ||
933 | mp->rx_bufs[i] = NULL; | 931 | mp->rx_bufs[i] = NULL; |
934 | ++dev->stats.rx_packets; | 932 | ++dev->stats.rx_packets; |
935 | } | 933 | } |