vsprintf: use TOLOWER whenever possible

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

diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index 15ebae9..04d0502 100644 (file)
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -181,6 +181,18 @@ out:
 }
 #endif
 
+static const struct net_device_ops netcard_netdev_ops = {
+       .ndo_open               = net_open,
+       .ndo_stop               = net_close,
+       .ndo_start_xmit         = net_send_packet,
+       .ndo_get_stats          = net_get_stats,
+       .ndo_set_multicast_list = set_multicast_list,
+       .ndo_tx_timeout         = net_tx_timeout,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_change_mtu         = eth_change_mtu,
+};
+
 /*
  * This is the real probe routine. Linux has a history of friendly device
  * probes on the ISA bus. A good device probes avoids doing writes, and
@@ -202,9 +214,9 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
         * contains the manufacturer's unique code. That might be a good probe
         * method. Ideally you would add additional checks.
         */
-       if (inb(ioaddr + 0) != SA_ADDR0
-               ||       inb(ioaddr + 1) != SA_ADDR1
-               ||       inb(ioaddr + 2) != SA_ADDR2)
+       if (inb(ioaddr + 0) != SA_ADDR0 ||
+           inb(ioaddr + 1) != SA_ADDR1 ||
+           inb(ioaddr + 2) != SA_ADDR2)
                goto out;
 
        if (net_debug  &&  version_printed++ == 0)
@@ -248,7 +260,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
                dev->irq = 9;
 
        {
-               int irqval = request_irq(dev->irq, &net_interrupt, 0, cardname, dev);
+               int irqval = request_irq(dev->irq, net_interrupt, 0, cardname, dev);
                if (irqval) {
                        printk("%s: unable to get IRQ %d (irqval=%d).\n",
                                   dev->name, dev->irq, irqval);
@@ -303,13 +315,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
        np = netdev_priv(dev);
        spin_lock_init(&np->lock);
 
-       dev->open               = net_open;
-       dev->stop               = net_close;
-       dev->hard_start_xmit    = net_send_packet;
-       dev->get_stats          = net_get_stats;
-       dev->set_multicast_list = &set_multicast_list;
-
-        dev->tx_timeout                = &net_tx_timeout;
+        dev->netdev_ops                = &netcard_netdev_ops;
         dev->watchdog_timeo    = MY_TX_TIMEOUT;
 
        err = register_netdev(dev);
@@ -372,7 +378,7 @@ net_open(struct net_device *dev)
         * This is used if the interrupt line can turned off (shared).
         * See 3c503.c for an example of selecting the IRQ at config-time.
         */
-       if (request_irq(dev->irq, &net_interrupt, 0, cardname, dev)) {
+       if (request_irq(dev->irq, net_interrupt, 0, cardname, dev)) {
                return -EAGAIN;
        }
        /*
@@ -424,7 +430,8 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev)
         * hardware interrupt handler.  Queue flow control is
         * thus managed under this lock as well.
         */
-       spin_lock_irq(&np->lock);
+       unsigned long flags;
+       spin_lock_irqsave(&np->lock, flags);
 
        add_to_tx_ring(np, skb, length);
        dev->trans_start = jiffies;
@@ -440,7 +447,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev)
         * is when the transmit statistics are updated.
         */
 
-       spin_unlock_irq(&np->lock);
+       spin_unlock_irqrestore(&np->lock, flags);
 #else
        /* This is the case for older hardware which takes
         * a single transmit buffer at a time, and it is
@@ -461,7 +468,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev)
        dev_kfree_skb (skb);
 #endif
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 #if TX_RING
@@ -709,15 +716,3 @@ cleanup_module(void)
 }
 
 #endif /* MODULE */
-
-/*
- * Local variables:
- *  compile-command:
- *     gcc -D__KERNEL__ -Wall -Wstrict-prototypes -Wwrite-strings
- *     -Wredundant-decls -O2 -m486 -c skeleton.c
- *  version-control: t
- *  kept-new-versions: 5
- *  tab-width: 4
- *  c-indent-level: 4
- * End:
- */