drivers/net: Trim trailing whitespace

[sfrench/cifs-2.6.git] / drivers / net / ifb.c

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 3a42afab50362983fc2b393b191757d59f5d5c21..6469130c1413f532633e0a87df31c821a1ae36c2 100644 (file)
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -1,4 +1,4 @@
-/* drivers/net/ifb.c: 
+/* drivers/net/ifb.c:

 
        The purpose of this driver is to provide a device that allows
        for sharing of resources:
 
        The purpose of this driver is to provide a device that allows
        for sharing of resources:


@@ -8,8 +8,8 @@
        an impression of sharing.
 
        2) Allows for queueing incoming traffic for shaping instead of
        an impression of sharing.
 
        2) Allows for queueing incoming traffic for shaping instead of

-       dropping. 
-       
+       dropping.
+

        The original concept is based on what is known as the IMQ
        driver initially written by Martin Devera, later rewritten
        by Patrick McHardy and then maintained by Andre Correa.
        The original concept is based on what is known as the IMQ
        driver initially written by Martin Devera, later rewritten
        by Patrick McHardy and then maintained by Andre Correa.


@@ -21,9 +21,9 @@
        modify it under the terms of the GNU General Public License
        as published by the Free Software Foundation; either version
        2 of the License, or (at your option) any later version.
        modify it under the terms of the GNU General Public License
        as published by the Free Software Foundation; either version
        2 of the License, or (at your option) any later version.

- 
+

        Authors:        Jamal Hadi Salim (2005)
        Authors:        Jamal Hadi Salim (2005)

- 
+

 */
 
 
 */
 
 


@@ -33,10 +33,10 @@
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/moduleparam.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/moduleparam.h>

-#include <net/pkt_sched.h> 
+#include <net/pkt_sched.h>

 
 #define TX_TIMEOUT  (2*HZ)
 
 #define TX_TIMEOUT  (2*HZ)

-                                                                                
+

 #define TX_Q_LIMIT    32
 struct ifb_private {
        struct net_device_stats stats;
 #define TX_Q_LIMIT    32
 struct ifb_private {
        struct net_device_stats stats;


@@ -64,7 +64,7 @@ static struct net_device_stats *ifb_get_stats(struct net_device *dev);
 static int ifb_open(struct net_device *dev);
 static int ifb_close(struct net_device *dev);
 
 static int ifb_open(struct net_device *dev);
 static int ifb_close(struct net_device *dev);
 

-static void ri_tasklet(unsigned long dev) 
+static void ri_tasklet(unsigned long dev)

 {
 
        struct net_device *_dev = (struct net_device *)dev;
 {
 
        struct net_device *_dev = (struct net_device *)dev;


@@ -163,7 +163,7 @@ dropped:
                stats->rx_dropped++;
                return ret;
        } else {
                stats->rx_dropped++;
                return ret;
        } else {

-               /* 
+               /*

                 * note we could be going
                 * ingress -> egress or
                 * egress -> ingress
                 * note we could be going
                 * ingress -> egress or
                 * egress -> ingress


@@ -199,7 +199,7 @@ static struct net_device_stats *ifb_get_stats(struct net_device *dev)
        struct net_device_stats *stats = &dp->stats;
 
        pr_debug("tasklets stats %ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld \n",
        struct net_device_stats *stats = &dp->stats;
 
        pr_debug("tasklets stats %ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld \n",

-               dp->st_task_enter, dp->st_txq_refl_try, dp->st_rxq_enter, 
+               dp->st_task_enter, dp->st_txq_refl_try, dp->st_rxq_enter,

                dp->st_rx2tx_tran dp->st_rxq_notenter, dp->st_rx_frm_egr,
                dp->st_rx_frm_ing, dp->st_rxq_check, dp->st_rxq_rsch );
 
                dp->st_rx2tx_tran dp->st_rxq_notenter, dp->st_rx_frm_egr,
                dp->st_rx_frm_ing, dp->st_rxq_check, dp->st_rxq_rsch );
 


@@ -250,7 +250,7 @@ static int __init ifb_init_one(int index)
                free_netdev(dev_ifb);
                dev_ifb = NULL;
        } else {
                free_netdev(dev_ifb);
                dev_ifb = NULL;
        } else {

-               ifbs[index] = dev_ifb; 
+               ifbs[index] = dev_ifb;

        }
 
        return err;
        }
 
        return err;


@@ -260,31 +260,32 @@ static void ifb_free_one(int index)
 {
        unregister_netdev(ifbs[index]);
        free_netdev(ifbs[index]);
 {
        unregister_netdev(ifbs[index]);
        free_netdev(ifbs[index]);

-} 
+}

 
 static int __init ifb_init_module(void)
 
 static int __init ifb_init_module(void)

-{ 
+{

        int i, err = 0;
        int i, err = 0;

-       ifbs = kmalloc(numifbs * sizeof(void *), GFP_KERNEL); 
+       ifbs = kmalloc(numifbs * sizeof(void *), GFP_KERNEL);

        if (!ifbs)
        if (!ifbs)

-               return -ENOMEM; 
+               return -ENOMEM;

        for (i = 0; i < numifbs && !err; i++)
        for (i = 0; i < numifbs && !err; i++)

-               err = ifb_init_one(i); 
-       if (err) { 
+               err = ifb_init_one(i);
+       if (err) {
+               i--;

                while (--i >= 0)
                        ifb_free_one(i);
        }
 
        return err;
                while (--i >= 0)
                        ifb_free_one(i);
        }
 
        return err;

-} 
+}

 
 static void __exit ifb_cleanup_module(void)
 {
        int i;
 
 
 static void __exit ifb_cleanup_module(void)
 {
        int i;
 

-       for (i = 0; i < numifbs; i++) 
-               ifb_free_one(i); 
-       kfree(ifbs);    
+       for (i = 0; i < numifbs; i++)
+               ifb_free_one(i);
+       kfree(ifbs);

 }
 
 module_init(ifb_init_module);
 }
 
 module_init(ifb_init_module);