netxen: hold tx lock while sending firmware commands

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

diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index 6c4b53ffbcaccf453067a4e58b99d96df887fe8a..941164076a2b1f675b68b492be4c206549308841 100644 (file)
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -53,7 +53,6 @@ static int au1k_irda_hard_xmit(struct sk_buff *, struct net_device *);
 static int au1k_irda_rx(struct net_device *);
 static void au1k_irda_interrupt(int, void *);
 static void au1k_tx_timeout(struct net_device *);
-static struct net_device_stats *au1k_irda_stats(struct net_device *);
 static int au1k_irda_ioctl(struct net_device *, struct ifreq *, int);
 static int au1k_irda_set_speed(struct net_device *dev, int speed);
 
@@ -213,7 +212,6 @@ static int au1k_irda_net_init(struct net_device *dev)
        dev->open = au1k_irda_start;
        dev->hard_start_xmit = au1k_irda_hard_xmit;
        dev->stop = au1k_irda_stop;
-       dev->get_stats = au1k_irda_stats;
        dev->do_ioctl = au1k_irda_ioctl;
        dev->tx_timeout = au1k_tx_timeout;
 
@@ -596,7 +594,7 @@ static int au1k_irda_rx(struct net_device *dev)
                        update_rx_stats(dev, flags, count);
                        skb=alloc_skb(count+1,GFP_ATOMIC);
                        if (skb == NULL) {
-                               aup->stats.rx_dropped++;
+                               aup->netdev->stats.rx_dropped++;
                                continue;
                        }
                        skb_reserve(skb, 1);
@@ -832,13 +830,6 @@ au1k_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)
        return ret;
 }
 
-
-static struct net_device_stats *au1k_irda_stats(struct net_device *dev)
-{
-       struct au1k_private *aup = netdev_priv(dev);
-       return &aup->stats;
-}
-
 MODULE_AUTHOR("Pete Popov <ppopov@mvista.com>");
 MODULE_DESCRIPTION("Au1000 IrDA Device Driver");