aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/param.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e/param.c')
-rw-r--r--drivers/net/e1000e/param.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index 2e399778cae5..a150e48a117f 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -248,7 +248,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
248 } 248 }
249 249
250 { /* Transmit Interrupt Delay */ 250 { /* Transmit Interrupt Delay */
251 const struct e1000_option opt = { 251 static const struct e1000_option opt = {
252 .type = range_option, 252 .type = range_option,
253 .name = "Transmit Interrupt Delay", 253 .name = "Transmit Interrupt Delay",
254 .err = "using default of " 254 .err = "using default of "
@@ -267,7 +267,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
267 } 267 }
268 } 268 }
269 { /* Transmit Absolute Interrupt Delay */ 269 { /* Transmit Absolute Interrupt Delay */
270 const struct e1000_option opt = { 270 static const struct e1000_option opt = {
271 .type = range_option, 271 .type = range_option,
272 .name = "Transmit Absolute Interrupt Delay", 272 .name = "Transmit Absolute Interrupt Delay",
273 .err = "using default of " 273 .err = "using default of "
@@ -286,7 +286,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
286 } 286 }
287 } 287 }
288 { /* Receive Interrupt Delay */ 288 { /* Receive Interrupt Delay */
289 struct e1000_option opt = { 289 static struct e1000_option opt = {
290 .type = range_option, 290 .type = range_option,
291 .name = "Receive Interrupt Delay", 291 .name = "Receive Interrupt Delay",
292 .err = "using default of " 292 .err = "using default of "
@@ -305,7 +305,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
305 } 305 }
306 } 306 }
307 { /* Receive Absolute Interrupt Delay */ 307 { /* Receive Absolute Interrupt Delay */
308 const struct e1000_option opt = { 308 static const struct e1000_option opt = {
309 .type = range_option, 309 .type = range_option,
310 .name = "Receive Absolute Interrupt Delay", 310 .name = "Receive Absolute Interrupt Delay",
311 .err = "using default of " 311 .err = "using default of "
@@ -324,7 +324,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
324 } 324 }
325 } 325 }
326 { /* Interrupt Throttling Rate */ 326 { /* Interrupt Throttling Rate */
327 const struct e1000_option opt = { 327 static const struct e1000_option opt = {
328 .type = range_option, 328 .type = range_option,
329 .name = "Interrupt Throttling Rate (ints/sec)", 329 .name = "Interrupt Throttling Rate (ints/sec)",
330 .err = "using default of " 330 .err = "using default of "
@@ -351,6 +351,11 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
351 adapter->itr_setting = adapter->itr; 351 adapter->itr_setting = adapter->itr;
352 adapter->itr = 20000; 352 adapter->itr = 20000;
353 break; 353 break;
354 case 4:
355 e_info("%s set to simplified (2000-8000 ints) "
356 "mode\n", opt.name);
357 adapter->itr_setting = 4;
358 break;
354 default: 359 default:
355 /* 360 /*
356 * Save the setting, because the dynamic bits 361 * Save the setting, because the dynamic bits
@@ -381,7 +386,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
381 } 386 }
382 } 387 }
383 { /* Interrupt Mode */ 388 { /* Interrupt Mode */
384 struct e1000_option opt = { 389 static struct e1000_option opt = {
385 .type = range_option, 390 .type = range_option,
386 .name = "Interrupt Mode", 391 .name = "Interrupt Mode",
387 .err = "defaulting to 2 (MSI-X)", 392 .err = "defaulting to 2 (MSI-X)",
@@ -399,7 +404,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
399 } 404 }
400 } 405 }
401 { /* Smart Power Down */ 406 { /* Smart Power Down */
402 const struct e1000_option opt = { 407 static const struct e1000_option opt = {
403 .type = enable_option, 408 .type = enable_option,
404 .name = "PHY Smart Power Down", 409 .name = "PHY Smart Power Down",
405 .err = "defaulting to Disabled", 410 .err = "defaulting to Disabled",
@@ -415,7 +420,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
415 } 420 }
416 } 421 }
417 { /* CRC Stripping */ 422 { /* CRC Stripping */
418 const struct e1000_option opt = { 423 static const struct e1000_option opt = {
419 .type = enable_option, 424 .type = enable_option,
420 .name = "CRC Stripping", 425 .name = "CRC Stripping",
421 .err = "defaulting to enabled", 426 .err = "defaulting to enabled",
@@ -432,7 +437,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
432 } 437 }
433 } 438 }
434 { /* Kumeran Lock Loss Workaround */ 439 { /* Kumeran Lock Loss Workaround */
435 const struct e1000_option opt = { 440 static const struct e1000_option opt = {
436 .type = enable_option, 441 .type = enable_option,
437 .name = "Kumeran Lock Loss Workaround", 442 .name = "Kumeran Lock Loss Workaround",
438 .err = "defaulting to Enabled", 443 .err = "defaulting to Enabled",
@@ -452,7 +457,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
452 } 457 }
453 } 458 }
454 { /* Write-protect NVM */ 459 { /* Write-protect NVM */
455 const struct e1000_option opt = { 460 static const struct e1000_option opt = {
456 .type = enable_option, 461 .type = enable_option,
457 .name = "Write-protect NVM", 462 .name = "Write-protect NVM",
458 .err = "defaulting to Enabled", 463 .err = "defaulting to Enabled",