diff options
Diffstat (limited to 'drivers/net/at1700.c')
-rw-r--r-- | drivers/net/at1700.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 7e874d485d24..2d4b5c31652e 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
@@ -265,7 +265,6 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) | |||
265 | unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0; | 265 | unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0; |
266 | int slot, ret = -ENODEV; | 266 | int slot, ret = -ENODEV; |
267 | struct net_local *lp = netdev_priv(dev); | 267 | struct net_local *lp = netdev_priv(dev); |
268 | DECLARE_MAC_BUF(mac); | ||
269 | 268 | ||
270 | if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME)) | 269 | if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME)) |
271 | return -EBUSY; | 270 | return -EBUSY; |
@@ -397,7 +396,7 @@ found: | |||
397 | dev->dev_addr[i] = val; | 396 | dev->dev_addr[i] = val; |
398 | } | 397 | } |
399 | } | 398 | } |
400 | printk("%s", print_mac(mac, dev->dev_addr)); | 399 | printk("%pM", dev->dev_addr); |
401 | 400 | ||
402 | /* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals, | 401 | /* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals, |
403 | rather than 150 ohm shielded twisted pair compensation. | 402 | rather than 150 ohm shielded twisted pair compensation. |
@@ -768,7 +767,6 @@ net_rx(struct net_device *dev) | |||
768 | insw(ioaddr + DATAPORT, skb_put(skb,pkt_len), (pkt_len + 1) >> 1); | 767 | insw(ioaddr + DATAPORT, skb_put(skb,pkt_len), (pkt_len + 1) >> 1); |
769 | skb->protocol=eth_type_trans(skb, dev); | 768 | skb->protocol=eth_type_trans(skb, dev); |
770 | netif_rx(skb); | 769 | netif_rx(skb); |
771 | dev->last_rx = jiffies; | ||
772 | dev->stats.rx_packets++; | 770 | dev->stats.rx_packets++; |
773 | dev->stats.rx_bytes += pkt_len; | 771 | dev->stats.rx_bytes += pkt_len; |
774 | } | 772 | } |