diff options
Diffstat (limited to 'drivers/net/ixgb/ixgb_param.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_param.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c index 865d14d6e5a7..af35e1ddadd6 100644 --- a/drivers/net/ixgb/ixgb_param.c +++ b/drivers/net/ixgb/ixgb_param.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************************* | 1 | /******************************************************************************* |
2 | 2 | ||
3 | Intel PRO/10GbE Linux driver | 3 | Intel PRO/10GbE Linux driver |
4 | Copyright(c) 1999 - 2006 Intel Corporation. | 4 | Copyright(c) 1999 - 2008 Intel Corporation. |
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify it | 6 | This program is free software; you can redistribute it and/or modify it |
7 | under the terms and conditions of the GNU General Public License, | 7 | under the terms and conditions of the GNU General Public License, |
@@ -136,7 +136,7 @@ IXGB_PARAM(RxFCLowThresh, "Receive Flow Control Low Threshold"); | |||
136 | /* Flow control request timeout (how long to pause the link partner's tx) | 136 | /* Flow control request timeout (how long to pause the link partner's tx) |
137 | * (PAP 15:0) | 137 | * (PAP 15:0) |
138 | * | 138 | * |
139 | * Valid Range: 1 - 65535 | 139 | * Valid Range: 1 - 65535 |
140 | * | 140 | * |
141 | * Default Value: 65535 (0xffff) (we'll send an xon if we recover) | 141 | * Default Value: 65535 (0xffff) (we'll send an xon if we recover) |
142 | */ | 142 | */ |
@@ -200,7 +200,7 @@ struct ixgb_option { | |||
200 | static int __devinit | 200 | static int __devinit |
201 | ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt) | 201 | ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt) |
202 | { | 202 | { |
203 | if(*value == OPTION_UNSET) { | 203 | if (*value == OPTION_UNSET) { |
204 | *value = opt->def; | 204 | *value = opt->def; |
205 | return 0; | 205 | return 0; |
206 | } | 206 | } |
@@ -217,7 +217,7 @@ ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt) | |||
217 | } | 217 | } |
218 | break; | 218 | break; |
219 | case range_option: | 219 | case range_option: |
220 | if(*value >= opt->arg.r.min && *value <= opt->arg.r.max) { | 220 | if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) { |
221 | printk(KERN_INFO "%s set to %i\n", opt->name, *value); | 221 | printk(KERN_INFO "%s set to %i\n", opt->name, *value); |
222 | return 0; | 222 | return 0; |
223 | } | 223 | } |
@@ -226,10 +226,10 @@ ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt) | |||
226 | int i; | 226 | int i; |
227 | struct ixgb_opt_list *ent; | 227 | struct ixgb_opt_list *ent; |
228 | 228 | ||
229 | for(i = 0; i < opt->arg.l.nr; i++) { | 229 | for (i = 0; i < opt->arg.l.nr; i++) { |
230 | ent = &opt->arg.l.p[i]; | 230 | ent = &opt->arg.l.p[i]; |
231 | if(*value == ent->i) { | 231 | if (*value == ent->i) { |
232 | if(ent->str[0] != '\0') | 232 | if (ent->str[0] != '\0') |
233 | printk(KERN_INFO "%s\n", ent->str); | 233 | printk(KERN_INFO "%s\n", ent->str); |
234 | return 0; | 234 | return 0; |
235 | } | 235 | } |
@@ -260,7 +260,7 @@ void __devinit | |||
260 | ixgb_check_options(struct ixgb_adapter *adapter) | 260 | ixgb_check_options(struct ixgb_adapter *adapter) |
261 | { | 261 | { |
262 | int bd = adapter->bd_number; | 262 | int bd = adapter->bd_number; |
263 | if(bd >= IXGB_MAX_NIC) { | 263 | if (bd >= IXGB_MAX_NIC) { |
264 | printk(KERN_NOTICE | 264 | printk(KERN_NOTICE |
265 | "Warning: no configuration for board #%i\n", bd); | 265 | "Warning: no configuration for board #%i\n", bd); |
266 | printk(KERN_NOTICE "Using defaults for all values\n"); | 266 | printk(KERN_NOTICE "Using defaults for all values\n"); |
@@ -277,7 +277,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
277 | }; | 277 | }; |
278 | struct ixgb_desc_ring *tx_ring = &adapter->tx_ring; | 278 | struct ixgb_desc_ring *tx_ring = &adapter->tx_ring; |
279 | 279 | ||
280 | if(num_TxDescriptors > bd) { | 280 | if (num_TxDescriptors > bd) { |
281 | tx_ring->count = TxDescriptors[bd]; | 281 | tx_ring->count = TxDescriptors[bd]; |
282 | ixgb_validate_option(&tx_ring->count, &opt); | 282 | ixgb_validate_option(&tx_ring->count, &opt); |
283 | } else { | 283 | } else { |
@@ -296,7 +296,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
296 | }; | 296 | }; |
297 | struct ixgb_desc_ring *rx_ring = &adapter->rx_ring; | 297 | struct ixgb_desc_ring *rx_ring = &adapter->rx_ring; |
298 | 298 | ||
299 | if(num_RxDescriptors > bd) { | 299 | if (num_RxDescriptors > bd) { |
300 | rx_ring->count = RxDescriptors[bd]; | 300 | rx_ring->count = RxDescriptors[bd]; |
301 | ixgb_validate_option(&rx_ring->count, &opt); | 301 | ixgb_validate_option(&rx_ring->count, &opt); |
302 | } else { | 302 | } else { |
@@ -312,7 +312,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
312 | .def = OPTION_ENABLED | 312 | .def = OPTION_ENABLED |
313 | }; | 313 | }; |
314 | 314 | ||
315 | if(num_XsumRX > bd) { | 315 | if (num_XsumRX > bd) { |
316 | unsigned int rx_csum = XsumRX[bd]; | 316 | unsigned int rx_csum = XsumRX[bd]; |
317 | ixgb_validate_option(&rx_csum, &opt); | 317 | ixgb_validate_option(&rx_csum, &opt); |
318 | adapter->rx_csum = rx_csum; | 318 | adapter->rx_csum = rx_csum; |
@@ -338,7 +338,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
338 | .p = fc_list }} | 338 | .p = fc_list }} |
339 | }; | 339 | }; |
340 | 340 | ||
341 | if(num_FlowControl > bd) { | 341 | if (num_FlowControl > bd) { |
342 | unsigned int fc = FlowControl[bd]; | 342 | unsigned int fc = FlowControl[bd]; |
343 | ixgb_validate_option(&fc, &opt); | 343 | ixgb_validate_option(&fc, &opt); |
344 | adapter->hw.fc.type = fc; | 344 | adapter->hw.fc.type = fc; |
@@ -356,14 +356,14 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
356 | .max = MAX_FCRTH}} | 356 | .max = MAX_FCRTH}} |
357 | }; | 357 | }; |
358 | 358 | ||
359 | if(num_RxFCHighThresh > bd) { | 359 | if (num_RxFCHighThresh > bd) { |
360 | adapter->hw.fc.high_water = RxFCHighThresh[bd]; | 360 | adapter->hw.fc.high_water = RxFCHighThresh[bd]; |
361 | ixgb_validate_option(&adapter->hw.fc.high_water, &opt); | 361 | ixgb_validate_option(&adapter->hw.fc.high_water, &opt); |
362 | } else { | 362 | } else { |
363 | adapter->hw.fc.high_water = opt.def; | 363 | adapter->hw.fc.high_water = opt.def; |
364 | } | 364 | } |
365 | if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) ) | 365 | if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) ) |
366 | printk (KERN_INFO | 366 | printk(KERN_INFO |
367 | "Ignoring RxFCHighThresh when no RxFC\n"); | 367 | "Ignoring RxFCHighThresh when no RxFC\n"); |
368 | } | 368 | } |
369 | { /* Receive Flow Control Low Threshold */ | 369 | { /* Receive Flow Control Low Threshold */ |
@@ -376,14 +376,14 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
376 | .max = MAX_FCRTL}} | 376 | .max = MAX_FCRTL}} |
377 | }; | 377 | }; |
378 | 378 | ||
379 | if(num_RxFCLowThresh > bd) { | 379 | if (num_RxFCLowThresh > bd) { |
380 | adapter->hw.fc.low_water = RxFCLowThresh[bd]; | 380 | adapter->hw.fc.low_water = RxFCLowThresh[bd]; |
381 | ixgb_validate_option(&adapter->hw.fc.low_water, &opt); | 381 | ixgb_validate_option(&adapter->hw.fc.low_water, &opt); |
382 | } else { | 382 | } else { |
383 | adapter->hw.fc.low_water = opt.def; | 383 | adapter->hw.fc.low_water = opt.def; |
384 | } | 384 | } |
385 | if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) ) | 385 | if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) ) |
386 | printk (KERN_INFO | 386 | printk(KERN_INFO |
387 | "Ignoring RxFCLowThresh when no RxFC\n"); | 387 | "Ignoring RxFCLowThresh when no RxFC\n"); |
388 | } | 388 | } |
389 | { /* Flow Control Pause Time Request*/ | 389 | { /* Flow Control Pause Time Request*/ |
@@ -396,7 +396,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
396 | .max = MAX_FCPAUSE}} | 396 | .max = MAX_FCPAUSE}} |
397 | }; | 397 | }; |
398 | 398 | ||
399 | if(num_FCReqTimeout > bd) { | 399 | if (num_FCReqTimeout > bd) { |
400 | unsigned int pause_time = FCReqTimeout[bd]; | 400 | unsigned int pause_time = FCReqTimeout[bd]; |
401 | ixgb_validate_option(&pause_time, &opt); | 401 | ixgb_validate_option(&pause_time, &opt); |
402 | adapter->hw.fc.pause_time = pause_time; | 402 | adapter->hw.fc.pause_time = pause_time; |
@@ -404,7 +404,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
404 | adapter->hw.fc.pause_time = opt.def; | 404 | adapter->hw.fc.pause_time = opt.def; |
405 | } | 405 | } |
406 | if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) ) | 406 | if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) ) |
407 | printk (KERN_INFO | 407 | printk(KERN_INFO |
408 | "Ignoring FCReqTimeout when no RxFC\n"); | 408 | "Ignoring FCReqTimeout when no RxFC\n"); |
409 | } | 409 | } |
410 | /* high low and spacing check for rx flow control thresholds */ | 410 | /* high low and spacing check for rx flow control thresholds */ |
@@ -412,7 +412,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
412 | /* high must be greater than low */ | 412 | /* high must be greater than low */ |
413 | if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water + 8)) { | 413 | if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water + 8)) { |
414 | /* set defaults */ | 414 | /* set defaults */ |
415 | printk (KERN_INFO | 415 | printk(KERN_INFO |
416 | "RxFCHighThresh must be >= (RxFCLowThresh + 8), " | 416 | "RxFCHighThresh must be >= (RxFCLowThresh + 8), " |
417 | "Using Defaults\n"); | 417 | "Using Defaults\n"); |
418 | adapter->hw.fc.high_water = DEFAULT_FCRTH; | 418 | adapter->hw.fc.high_water = DEFAULT_FCRTH; |
@@ -429,7 +429,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
429 | .max = MAX_RDTR}} | 429 | .max = MAX_RDTR}} |
430 | }; | 430 | }; |
431 | 431 | ||
432 | if(num_RxIntDelay > bd) { | 432 | if (num_RxIntDelay > bd) { |
433 | adapter->rx_int_delay = RxIntDelay[bd]; | 433 | adapter->rx_int_delay = RxIntDelay[bd]; |
434 | ixgb_validate_option(&adapter->rx_int_delay, &opt); | 434 | ixgb_validate_option(&adapter->rx_int_delay, &opt); |
435 | } else { | 435 | } else { |
@@ -446,7 +446,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
446 | .max = MAX_TIDV}} | 446 | .max = MAX_TIDV}} |
447 | }; | 447 | }; |
448 | 448 | ||
449 | if(num_TxIntDelay > bd) { | 449 | if (num_TxIntDelay > bd) { |
450 | adapter->tx_int_delay = TxIntDelay[bd]; | 450 | adapter->tx_int_delay = TxIntDelay[bd]; |
451 | ixgb_validate_option(&adapter->tx_int_delay, &opt); | 451 | ixgb_validate_option(&adapter->tx_int_delay, &opt); |
452 | } else { | 452 | } else { |
@@ -462,7 +462,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) | |||
462 | .def = OPTION_ENABLED | 462 | .def = OPTION_ENABLED |
463 | }; | 463 | }; |
464 | 464 | ||
465 | if(num_IntDelayEnable > bd) { | 465 | if (num_IntDelayEnable > bd) { |
466 | unsigned int ide = IntDelayEnable[bd]; | 466 | unsigned int ide = IntDelayEnable[bd]; |
467 | ixgb_validate_option(&ide, &opt); | 467 | ixgb_validate_option(&ide, &opt); |
468 | adapter->tx_int_delay_enable = ide; | 468 | adapter->tx_int_delay_enable = ide; |