diff options
Diffstat (limited to 'drivers/net/ewrk3.c')
-rw-r--r-- | drivers/net/ewrk3.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c index 593a120e31b2..b852303c9362 100644 --- a/drivers/net/ewrk3.c +++ b/drivers/net/ewrk3.c | |||
@@ -396,7 +396,6 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase) | |||
396 | u_long mem_start, shmem_length; | 396 | u_long mem_start, shmem_length; |
397 | u_char cr, cmr, icr, nicsr, lemac, hard_strapped = 0; | 397 | u_char cr, cmr, icr, nicsr, lemac, hard_strapped = 0; |
398 | u_char eeprom_image[EEPROM_MAX], chksum, eisa_cr = 0; | 398 | u_char eeprom_image[EEPROM_MAX], chksum, eisa_cr = 0; |
399 | DECLARE_MAC_BUF(mac); | ||
400 | 399 | ||
401 | /* | 400 | /* |
402 | ** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot. | 401 | ** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot. |
@@ -461,7 +460,7 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase) | |||
461 | if (lemac != LeMAC2) | 460 | if (lemac != LeMAC2) |
462 | DevicePresent(iobase); /* need after EWRK3_INIT */ | 461 | DevicePresent(iobase); /* need after EWRK3_INIT */ |
463 | status = get_hw_addr(dev, eeprom_image, lemac); | 462 | status = get_hw_addr(dev, eeprom_image, lemac); |
464 | printk("%s\n", print_mac(mac, dev->dev_addr)); | 463 | printk("%pM\n", dev->dev_addr); |
465 | 464 | ||
466 | if (status) { | 465 | if (status) { |
467 | printk(" which has an EEPROM CRC error.\n"); | 466 | printk(" which has an EEPROM CRC error.\n"); |
@@ -646,10 +645,8 @@ static int ewrk3_open(struct net_device *dev) | |||
646 | ewrk3_init(dev); | 645 | ewrk3_init(dev); |
647 | 646 | ||
648 | if (ewrk3_debug > 1) { | 647 | if (ewrk3_debug > 1) { |
649 | DECLARE_MAC_BUF(mac); | ||
650 | printk("%s: ewrk3 open with irq %d\n", dev->name, dev->irq); | 648 | printk("%s: ewrk3 open with irq %d\n", dev->name, dev->irq); |
651 | printk(" physical address: %s\n", | 649 | printk(" physical address: %pM\n", dev->dev_addr); |
652 | print_mac(mac, dev->dev_addr)); | ||
653 | if (lp->shmem_length == 0) { | 650 | if (lp->shmem_length == 0) { |
654 | printk(" no shared memory, I/O only mode\n"); | 651 | printk(" no shared memory, I/O only mode\n"); |
655 | } else { | 652 | } else { |
@@ -1029,7 +1026,6 @@ static int ewrk3_rx(struct net_device *dev) | |||
1029 | /* | 1026 | /* |
1030 | ** Update stats | 1027 | ** Update stats |
1031 | */ | 1028 | */ |
1032 | dev->last_rx = jiffies; | ||
1033 | dev->stats.rx_packets++; | 1029 | dev->stats.rx_packets++; |
1034 | dev->stats.rx_bytes += pkt_len; | 1030 | dev->stats.rx_bytes += pkt_len; |
1035 | } else { | 1031 | } else { |
@@ -1971,13 +1967,3 @@ module_exit(ewrk3_exit_module); | |||
1971 | module_init(ewrk3_init_module); | 1967 | module_init(ewrk3_init_module); |
1972 | #endif /* MODULE */ | 1968 | #endif /* MODULE */ |
1973 | MODULE_LICENSE("GPL"); | 1969 | MODULE_LICENSE("GPL"); |
1974 | |||
1975 | |||
1976 | |||
1977 | /* | ||
1978 | * Local variables: | ||
1979 | * compile-command: "gcc -D__KERNEL__ -I/linux/include -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2 -O2 -m486 -c ewrk3.c" | ||
1980 | * | ||
1981 | * compile-command: "gcc -D__KERNEL__ -DMODULE -I/linux/include -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2 -O2 -m486 -c ewrk3.c" | ||
1982 | * End: | ||
1983 | */ | ||