diff options
Diffstat (limited to 'drivers/net/smc91x.c')
-rw-r--r-- | drivers/net/smc91x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 35c56abf4113..54912aadf4b2 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -518,7 +518,6 @@ static inline void smc_rcv(struct net_device *dev) | |||
518 | 518 | ||
519 | PRINT_PKT(data, packet_len - 4); | 519 | PRINT_PKT(data, packet_len - 4); |
520 | 520 | ||
521 | dev->last_rx = jiffies; | ||
522 | skb->protocol = eth_type_trans(skb, dev); | 521 | skb->protocol = eth_type_trans(skb, dev); |
523 | netif_rx(skb); | 522 | netif_rx(skb); |
524 | dev->stats.rx_packets++; | 523 | dev->stats.rx_packets++; |
@@ -1778,7 +1777,6 @@ static int __devinit smc_probe(struct net_device *dev, void __iomem *ioaddr, | |||
1778 | int retval; | 1777 | int retval; |
1779 | unsigned int val, revision_register; | 1778 | unsigned int val, revision_register; |
1780 | const char *version_string; | 1779 | const char *version_string; |
1781 | DECLARE_MAC_BUF(mac); | ||
1782 | 1780 | ||
1783 | DBG(2, "%s: %s\n", CARDNAME, __func__); | 1781 | DBG(2, "%s: %s\n", CARDNAME, __func__); |
1784 | 1782 | ||
@@ -1972,8 +1970,8 @@ static int __devinit smc_probe(struct net_device *dev, void __iomem *ioaddr, | |||
1972 | "set using ifconfig\n", dev->name); | 1970 | "set using ifconfig\n", dev->name); |
1973 | } else { | 1971 | } else { |
1974 | /* Print the Ethernet address */ | 1972 | /* Print the Ethernet address */ |
1975 | printk("%s: Ethernet addr: %s\n", | 1973 | printk("%s: Ethernet addr: %pM\n", |
1976 | dev->name, print_mac(mac, dev->dev_addr)); | 1974 | dev->name, dev->dev_addr); |
1977 | } | 1975 | } |
1978 | 1976 | ||
1979 | if (lp->phy_type == 0) { | 1977 | if (lp->phy_type == 0) { |