fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / net / eql.c

diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index fd66d27..a93700e 100644 (file)
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -8,7 +8,7 @@
  *
  *     This software may be used and distributed according to the terms
  *     of the GNU General Public License, incorporated herein by reference.
- * 
+ *
  * The author may be reached as simon@ncm.com, or C/O
  *    NCM
  *    Attn: Simon Janes
@@ -23,7 +23,7 @@
  * Inspirations:
  *   The Harried and Overworked Alan Cox
  * Conspiracies:
- *   The Alan Cox and Mike McLagan plot to get someone else to do the code, 
+ *   The Alan Cox and Mike McLagan plot to get someone else to do the code,
  *   which turned out to be me.
  */
 
@@ -132,13 +132,13 @@ static struct net_device_stats *eql_get_stats(struct net_device *dev);
 #define eql_is_slave(dev)      ((dev->flags & IFF_SLAVE) == IFF_SLAVE)
 #define eql_is_master(dev)     ((dev->flags & IFF_MASTER) == IFF_MASTER)
 
-static void eql_kill_one_slave(slave_t *slave);
+static void eql_kill_one_slave(slave_queue_t *queue, slave_t *slave);
 
 static void eql_timer(unsigned long param)
 {
        equalizer_t *eql = (equalizer_t *) param;
        struct list_head *this, *tmp, *head;
-       
+
        spin_lock_bh(&eql->queue.lock);
        head = &eql->queue.all_slaves;
        list_for_each_safe(this, tmp, head) {
@@ -149,7 +149,7 @@ static void eql_timer(unsigned long param)
                        if (slave->bytes_queued < 0)
                                slave->bytes_queued = 0;
                } else {
-                       eql_kill_one_slave(slave);
+                       eql_kill_one_slave(&eql->queue, slave);
                }
 
        }
@@ -159,7 +159,7 @@ static void eql_timer(unsigned long param)
        add_timer(&eql->timer);
 }
 
-static char version[] __initdata = 
+static char version[] __initdata =
        "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)\n";
 
 static void __init eql_setup(struct net_device *dev)
@@ -182,12 +182,12 @@ static void __init eql_setup(struct net_device *dev)
        dev->do_ioctl           = eql_ioctl;
        dev->hard_start_xmit    = eql_slave_xmit;
        dev->get_stats          = eql_get_stats;
-  
+
        /*
         *      Now we undo some of the things that eth_setup does
-        *      that we don't like 
+        *      that we don't like
         */
-        
+
        dev->mtu                = EQL_DEFAULT_MTU;      /* set to 576 in if_eql.h */
        dev->flags              = IFF_MASTER;
 
@@ -203,8 +203,7 @@ static int eql_open(struct net_device *dev)
        printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on "
               "your slave devices.\n", dev->name);
 
-       if (!list_empty(&eql->queue.all_slaves))
-               BUG();
+       BUG_ON(!list_empty(&eql->queue.all_slaves));
 
        eql->min_slaves = 1;
        eql->max_slaves = EQL_DEFAULT_MAX_SLAVES; /* 4 usually... */
@@ -214,16 +213,17 @@ static int eql_open(struct net_device *dev)
        return 0;
 }
 
-static void eql_kill_one_slave(slave_t *slave)
+static void eql_kill_one_slave(slave_queue_t *queue, slave_t *slave)
 {
        list_del(&slave->list);
+       queue->num_slaves--;
        slave->dev->flags &= ~IFF_SLAVE;
        dev_put(slave->dev);
        kfree(slave);
 }
 
 static void eql_kill_slave_queue(slave_queue_t *queue)
-{ 
+{
        struct list_head *head, *tmp, *this;
 
        spin_lock_bh(&queue->lock);
@@ -232,8 +232,7 @@ static void eql_kill_slave_queue(slave_queue_t *queue)
        list_for_each_safe(this, tmp, head) {
                slave_t *s = list_entry(this, slave_t, list);
 
-               eql_kill_one_slave(s);
-               queue->num_slaves--;
+               eql_kill_one_slave(queue, s);
        }
 
        spin_unlock_bh(&queue->lock);
@@ -245,7 +244,7 @@ static int eql_close(struct net_device *dev)
 
        /*
         *      The timer has to be stopped first before we start hacking away
-        *      at the data structure it scans every so often... 
+        *      at the data structure it scans every so often...
         */
 
        del_timer_sync(&eql->timer);
@@ -265,7 +264,7 @@ static int eql_g_master_cfg(struct net_device *dev, master_config_t __user *mc);
 static int eql_s_master_cfg(struct net_device *dev, master_config_t __user *mc);
 
 static int eql_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{  
+{
        if (cmd != EQL_GETMASTRCFG && cmd != EQL_GETSLAVECFG &&
            !capable(CAP_NET_ADMIN))
                return -EPERM;
@@ -301,15 +300,15 @@ static slave_t *__eql_schedule_slaves(slave_queue_t *queue)
        head = &queue->all_slaves;
        list_for_each_safe(this, tmp, head) {
                slave_t *slave = list_entry(this, slave_t, list);
-               unsigned long slave_load, bytes_queued, priority_Bps; 
+               unsigned long slave_load, bytes_queued, priority_Bps;
 
                /* Go through the slave list once, updating best_slave
                 * whenever a new best_load is found.
                 */
                bytes_queued = slave->bytes_queued;
-               priority_Bps = slave->priority_Bps;    
+               priority_Bps = slave->priority_Bps;
                if ((slave->dev->flags & IFF_UP) == IFF_UP) {
-                       slave_load = (~0UL - (~0UL / 2)) - 
+                       slave_load = (~0UL - (~0UL / 2)) -
                                (priority_Bps) + bytes_queued * 8;
 
                        if (slave_load < best_load) {
@@ -318,7 +317,7 @@ static slave_t *__eql_schedule_slaves(slave_queue_t *queue)
                        }
                } else {
                        /* We found a dead slave, kill it. */
-                       eql_kill_one_slave(slave);
+                       eql_kill_one_slave(queue, slave);
                }
        }
        return best_slave;
@@ -337,13 +336,13 @@ static int eql_slave_xmit(struct sk_buff *skb, struct net_device *dev)
 
                skb->dev = slave_dev;
                skb->priority = 1;
-               slave->bytes_queued += skb->len; 
+               slave->bytes_queued += skb->len;
                dev_queue_xmit(skb);
                eql->stats.tx_packets++;
        } else {
                eql->stats.tx_dropped++;
                dev_kfree_skb(skb);
-       }         
+       }
 
        spin_unlock(&eql->queue.lock);
 
@@ -393,7 +392,7 @@ static int __eql_insert_slave(slave_queue_t *queue, slave_t *slave)
 
                duplicate_slave = __eql_find_slave_dev(queue, slave->dev);
                if (duplicate_slave != 0)
-                       eql_kill_one_slave(duplicate_slave);
+                       eql_kill_one_slave(queue, duplicate_slave);
 
                list_add(&slave->list, &queue->all_slaves);
                queue->num_slaves++;
@@ -471,7 +470,7 @@ static int eql_emancipate(struct net_device *master_dev, slaving_request_t __use
                                                              slave_dev);
 
                        if (slave) {
-                               eql_kill_one_slave(slave);
+                               eql_kill_one_slave(&eql->queue, slave);
                                ret = 0;
                        }
                }
@@ -499,8 +498,6 @@ static int eql_g_slave_cfg(struct net_device *dev, slave_config_t __user *scp)
                return -ENODEV;
 
        ret = -EINVAL;
-       if (!slave_dev)
-               return ret;
 
        spin_lock_bh(&eql->queue.lock);
        if (eql_is_slave(slave_dev)) {
@@ -536,8 +533,6 @@ static int eql_s_slave_cfg(struct net_device *dev, slave_config_t __user *scp)
                return -ENODEV;
 
        ret = -EINVAL;
-       if (!slave_dev)
-               return ret;
 
        eql = netdev_priv(dev);
        spin_lock_bh(&eql->queue.lock);
@@ -601,7 +596,7 @@ static int __init eql_init_module(void)
                return -ENOMEM;
 
        err = register_netdev(dev_eql);
-       if (err) 
+       if (err)
                free_netdev(dev_eql);
        return err;
 }