ath9k : Display MAC/BB and RF version at startup (v2)

[linux-2.6-omap-h63xx.git] / drivers / net / eth16i.c

diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index e3dd8b1369086369f10f30be29a6b716ff2ec552..8d9fe4dd346f24bb505b81bf2d314ebf17ba0a65 100644 (file)
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -1205,7 +1205,6 @@ static void eth16i_rx(struct net_device *dev)
                                printk(KERN_DEBUG ".\n");
                        }
                        netif_rx(skb);
-                       dev->last_rx = jiffies;
                        dev->stats.rx_packets++;
                        dev->stats.rx_bytes += pkt_len;
 
@@ -1356,7 +1355,6 @@ static void eth16i_multicast(struct net_device *dev)
 
        if(dev->mc_count || dev->flags&(IFF_ALLMULTI|IFF_PROMISC))
        {
-               dev->flags|=IFF_PROMISC;        /* Must do this */
                outb(3, ioaddr + RECEIVE_MODE_REG);
        } else {
                outb(2, ioaddr + RECEIVE_MODE_REG);
@@ -1467,7 +1465,7 @@ void __exit cleanup_module(void)
        for(this_dev = 0; this_dev < MAX_ETH16I_CARDS; this_dev++) {
                struct net_device *dev = dev_eth16i[this_dev];
 
-               if(dev->priv) {
+               if (netdev_priv(dev)) {
                        unregister_netdev(dev);
                        free_irq(dev->irq, dev);
                        release_region(dev->base_addr, ETH16I_IO_EXTENT);