diff options
Diffstat (limited to 'drivers/net/declance.c')
-rw-r--r-- | drivers/net/declance.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 3e3506411ac0..7ce3053530f9 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -622,7 +622,6 @@ static int lance_rx(struct net_device *dev) | |||
622 | 622 | ||
623 | skb->protocol = eth_type_trans(skb, dev); | 623 | skb->protocol = eth_type_trans(skb, dev); |
624 | netif_rx(skb); | 624 | netif_rx(skb); |
625 | dev->last_rx = jiffies; | ||
626 | dev->stats.rx_packets++; | 625 | dev->stats.rx_packets++; |
627 | } | 626 | } |
628 | 627 | ||
@@ -1023,7 +1022,6 @@ static int __init dec_lance_probe(struct device *bdev, const int type) | |||
1023 | int i, ret; | 1022 | int i, ret; |
1024 | unsigned long esar_base; | 1023 | unsigned long esar_base; |
1025 | unsigned char *esar; | 1024 | unsigned char *esar; |
1026 | DECLARE_MAC_BUF(mac); | ||
1027 | 1025 | ||
1028 | if (dec_lance_debug && version_printed++ == 0) | 1026 | if (dec_lance_debug && version_printed++ == 0) |
1029 | printk(version); | 1027 | printk(version); |
@@ -1035,7 +1033,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type) | |||
1035 | dev = root_lance_dev; | 1033 | dev = root_lance_dev; |
1036 | while (dev) { | 1034 | while (dev) { |
1037 | i++; | 1035 | i++; |
1038 | lp = (struct lance_private *)dev->priv; | 1036 | lp = netdev_priv(dev); |
1039 | dev = lp->next; | 1037 | dev = lp->next; |
1040 | } | 1038 | } |
1041 | snprintf(name, sizeof(name), fmt, i); | 1039 | snprintf(name, sizeof(name), fmt, i); |
@@ -1223,8 +1221,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type) | |||
1223 | for (i = 0; i < 6; i++) | 1221 | for (i = 0; i < 6; i++) |
1224 | dev->dev_addr[i] = esar[i * 4]; | 1222 | dev->dev_addr[i] = esar[i * 4]; |
1225 | 1223 | ||
1226 | printk(", addr = %s, irq = %d\n", | 1224 | printk(", addr = %pM, irq = %d\n", dev->dev_addr, dev->irq); |
1227 | print_mac(mac, dev->dev_addr), dev->irq); | ||
1228 | 1225 | ||
1229 | dev->open = &lance_open; | 1226 | dev->open = &lance_open; |
1230 | dev->stop = &lance_close; | 1227 | dev->stop = &lance_close; |