Merge branch 'sched/latest' of git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins...

[linux-2.6-omap-h63xx.git] / drivers / net / ixgb / ixgb_param.c

diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
index 07a6980c7d8fd7f4d7361ab6638082d67f2bb4ea..af35e1ddadd6d7f50faac9adf712628206d2c0e3 100644 (file)
--- a/drivers/net/ixgb/ixgb_param.c
+++ b/drivers/net/ixgb/ixgb_param.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/10GbE Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -226,7 +226,7 @@ ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt)
                int i;
                struct ixgb_opt_list *ent;
 
-               for(i = 0; i < opt->arg.l.nr; i++) {
+               for (i = 0; i < opt->arg.l.nr; i++) {
                        ent = &opt->arg.l.p[i];
                        if (*value == ent->i) {
                                if (ent->str[0] != '\0')
@@ -363,7 +363,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                        adapter->hw.fc.high_water = opt.def;
                }
                if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
-                       printk (KERN_INFO
+                       printk(KERN_INFO
                                "Ignoring RxFCHighThresh when no RxFC\n");
        }
        { /* Receive Flow Control Low Threshold */
@@ -383,7 +383,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                        adapter->hw.fc.low_water = opt.def;
                }
                if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
-                       printk (KERN_INFO
+                       printk(KERN_INFO
                                "Ignoring RxFCLowThresh when no RxFC\n");
        }
        { /* Flow Control Pause Time Request*/
@@ -404,7 +404,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                        adapter->hw.fc.pause_time = opt.def;
                }
                if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
-                       printk (KERN_INFO
+                       printk(KERN_INFO
                                "Ignoring FCReqTimeout when no RxFC\n");
        }
        /* high low and spacing check for rx flow control thresholds */
@@ -412,7 +412,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                /* high must be greater than low */
                if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water + 8)) {
                        /* set defaults */
-                       printk (KERN_INFO
+                       printk(KERN_INFO
                                "RxFCHighThresh must be >= (RxFCLowThresh + 8), "
                                "Using Defaults\n");
                        adapter->hw.fc.high_water = DEFAULT_FCRTH;