Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'core/signal...

[cascardo/linux.git] / drivers / net / 3c501.c

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 7d25368..7d15e7c 100644 (file)
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -17,7 +17,7 @@
        Annapolis MD 21403
 
     Fixed (again!) the missing interrupt locking on TX/RX shifting.
        Annapolis MD 21403
 
     Fixed (again!) the missing interrupt locking on TX/RX shifting.

-       Alan Cox <Alan.Cox@linux.org>
+       Alan Cox <alan@lxorguk.ukuu.org.uk>

 
     Removed calls to init_etherdev since they are no longer needed, and
     cleaned up modularization just a bit. The driver still allows only
 
     Removed calls to init_etherdev since they are no longer needed, and
     cleaned up modularization just a bit. The driver still allows only


@@ -29,16 +29,16 @@
     the board. Now getting 150K/second FTP with a 3c501 card. Still playing
     with a TX-TX optimisation to see if we can touch 180-200K/second as seems
     theoretically maximum.
     the board. Now getting 150K/second FTP with a 3c501 card. Still playing
     with a TX-TX optimisation to see if we can touch 180-200K/second as seems
     theoretically maximum.

-               19950402 Alan Cox <Alan.Cox@linux.org>
+               19950402 Alan Cox <alan@lxorguk.ukuu.org.uk>

 
     Cleaned up for 2.3.x because we broke SMP now.
 
     Cleaned up for 2.3.x because we broke SMP now.

-               20000208 Alan Cox <alan@redhat.com>
+               20000208 Alan Cox <alan@lxorguk.ukuu.org.uk>

 
     Check up pass for 2.5. Nothing significant changed
 
     Check up pass for 2.5. Nothing significant changed

-               20021009 Alan Cox <alan@redhat.com>
+               20021009 Alan Cox <alan@lxorguk.ukuu.org.uk>

 
     Fixed zero fill corner case
 
     Fixed zero fill corner case

-               20030104 Alan Cox <alan@redhat.com>
+               20030104 Alan Cox <alan@lxorguk.ukuu.org.uk>

 
 
    For the avoidance of doubt the "preferred form" of this code is one which
 
 
    For the avoidance of doubt the "preferred form" of this code is one which


@@ -104,7 +104,7 @@
 
 
 static const char version[] =
 
 
 static const char version[] =

-       DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@redhat.com).\n";
+       DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@lxorguk.ukuu.org.uk).\n";

 
 /*
  *     Braindamage remaining:
 
 /*
  *     Braindamage remaining:


@@ -485,9 +485,7 @@ static int el_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        printk(KERN_DEBUG "%s: burped during tx load.\n",
                                dev->name);
                spin_lock_irqsave(&lp->lock, flags);
                        printk(KERN_DEBUG "%s: burped during tx load.\n",
                                dev->name);
                spin_lock_irqsave(&lp->lock, flags);

-       }
-       while (1);
-
+       } while (1);

 }
 
 /**
 }
 
 /**


@@ -612,7 +610,8 @@ static irqreturn_t el_interrupt(int irq, void *dev_id)
                        dev->stats.tx_packets++;
                        if (el_debug > 6)
                                printk(KERN_DEBUG " Tx succeeded %s\n",
                        dev->stats.tx_packets++;
                        if (el_debug > 6)
                                printk(KERN_DEBUG " Tx succeeded %s\n",

-                                       (txsr & TX_RDY) ? "." : "but tx is busy!");
+                                       (txsr & TX_RDY) ? "." :
+                                                       "but tx is busy!");

                        /*
                         *      This is safe the interrupt is atomic WRT itself.
                         */
                        /*
                         *      This is safe the interrupt is atomic WRT itself.
                         */


@@ -693,7 +692,8 @@ static void el_receive(struct net_device *dev)
 
        if (pkt_len < 60 || pkt_len > 1536) {
                if (el_debug)
 
        if (pkt_len < 60 || pkt_len > 1536) {
                if (el_debug)

-                       printk(KERN_DEBUG "%s: bogus packet, length=%d\n", dev->name, pkt_len);
+                       printk(KERN_DEBUG "%s: bogus packet, length=%d\n",
+                                               dev->name, pkt_len);

                dev->stats.rx_over_errors++;
                return;
        }
                dev->stats.rx_over_errors++;
                return;
        }


@@ -711,7 +711,8 @@ static void el_receive(struct net_device *dev)
 
        outw(0x00, GP_LOW);
        if (skb == NULL) {
 
        outw(0x00, GP_LOW);
        if (skb == NULL) {

-               printk(KERN_INFO "%s: Memory squeeze, dropping packet.\n", dev->name);
+               printk(KERN_INFO "%s: Memory squeeze, dropping packet.\n",
+                                                               dev->name);

                dev->stats.rx_dropped++;
                return;
        } else {
                dev->stats.rx_dropped++;
                return;
        } else {


@@ -748,7 +749,8 @@ static void  el_reset(struct net_device *dev)
        if (el_debug > 2)
                printk(KERN_INFO "3c501 reset...");
        outb(AX_RESET, AX_CMD);         /* Reset the chip */
        if (el_debug > 2)
                printk(KERN_INFO "3c501 reset...");
        outb(AX_RESET, AX_CMD);         /* Reset the chip */

-       outb(AX_LOOP, AX_CMD);          /* Aux control, irq and loopback enabled */
+       /* Aux control, irq and loopback enabled */
+       outb(AX_LOOP, AX_CMD);

        {
                int i;
                for (i = 0; i < 6; i++) /* Set the station address. */
        {
                int i;
                for (i = 0; i < 6; i++) /* Set the station address. */