mwl8k: disable softirqs when accessing sta_notify_list

[safe/jmp/linux-2.6] / drivers / net / ni65.c

diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index 81a0617..ae19aaf 100644 (file)
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -252,7 +252,8 @@ static void ni65_xmit_intr(struct net_device *dev,int);
 static int  ni65_open(struct net_device *dev);
 static int  ni65_lance_reinit(struct net_device *dev);
 static void ni65_init_lance(struct priv *p,unsigned char*,int,int);
-static int  ni65_send_packet(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t ni65_send_packet(struct sk_buff *skb,
+                                   struct net_device *dev);
 static void  ni65_timeout(struct net_device *dev);
 static int  ni65_close(struct net_device *dev);
 static int  ni65_alloc_buffer(struct net_device *dev);
@@ -293,7 +294,7 @@ static void ni65_set_performance(struct priv *p)
 static int ni65_open(struct net_device *dev)
 {
        struct priv *p = dev->ml_priv;
-       int irqval = request_irq(dev->irq, &ni65_interrupt,0,
+       int irqval = request_irq(dev->irq, ni65_interrupt,0,
                         cards[p->cardno].cardname,dev);
        if (irqval) {
                printk(KERN_ERR "%s: unable to get IRQ %d (irqval=%d).\n",
@@ -1157,7 +1158,8 @@ static void ni65_timeout(struct net_device *dev)
  *     Send a packet
  */
 
-static int ni65_send_packet(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t ni65_send_packet(struct sk_buff *skb,
+                                   struct net_device *dev)
 {
        struct priv *p = dev->ml_priv;