Staging: comedi: ni_labbc_cs: cleaned up debug define a bit

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

diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index f71b354..9257d7c 100644 (file)
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -886,7 +886,7 @@ static int elp_open(struct net_device *dev)
        /*
         * install our interrupt service routine
         */
-       if ((retval = request_irq(dev->irq, &elp_interrupt, 0, dev->name, dev))) {
+       if ((retval = request_irq(dev->irq, elp_interrupt, 0, dev->name, dev))) {
                pr_err("%s: could not allocate IRQ%d\n", dev->name, dev->irq);
                return retval;
        }
@@ -976,7 +976,7 @@ static int elp_open(struct net_device *dev)
  *
  ******************************************************/
 
-static bool send_packet(struct net_device *dev, struct sk_buff *skb)
+static netdev_tx_t send_packet(struct net_device *dev, struct sk_buff *skb)
 {
        elp_device *adapter = netdev_priv(dev);
        unsigned long target;
@@ -1067,7 +1067,7 @@ static void elp_timeout(struct net_device *dev)
  *
  ******************************************************/
 
-static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        unsigned long flags;
        elp_device *adapter = netdev_priv(dev);
@@ -1101,7 +1101,7 @@ static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
        prime_rx(dev);
        spin_unlock_irqrestore(&adapter->lock, flags);
        netif_start_queue(dev);
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 /******************************************************