diff options
Diffstat (limited to 'drivers/net/e1000e/param.c')
-rw-r--r-- | drivers/net/e1000e/param.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c index 34aeec13bb16..4dd9b63273f6 100644 --- a/drivers/net/e1000e/param.c +++ b/drivers/net/e1000e/param.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************************* | 1 | /******************************************************************************* |
2 | 2 | ||
3 | Intel PRO/1000 Linux driver | 3 | Intel PRO/1000 Linux driver |
4 | Copyright(c) 1999 - 2010 Intel Corporation. | 4 | Copyright(c) 1999 - 2011 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, |
@@ -62,10 +62,9 @@ MODULE_PARM_DESC(copybreak, | |||
62 | module_param_array_named(X, X, int, &num_##X, 0); \ | 62 | module_param_array_named(X, X, int, &num_##X, 0); \ |
63 | MODULE_PARM_DESC(X, desc); | 63 | MODULE_PARM_DESC(X, desc); |
64 | 64 | ||
65 | |||
66 | /* | 65 | /* |
67 | * Transmit Interrupt Delay in units of 1.024 microseconds | 66 | * Transmit Interrupt Delay in units of 1.024 microseconds |
68 | * Tx interrupt delay needs to typically be set to something non zero | 67 | * Tx interrupt delay needs to typically be set to something non-zero |
69 | * | 68 | * |
70 | * Valid Range: 0-65535 | 69 | * Valid Range: 0-65535 |
71 | */ | 70 | */ |
@@ -91,7 +90,6 @@ E1000_PARAM(TxAbsIntDelay, "Transmit Absolute Interrupt Delay"); | |||
91 | * Valid Range: 0-65535 | 90 | * Valid Range: 0-65535 |
92 | */ | 91 | */ |
93 | E1000_PARAM(RxIntDelay, "Receive Interrupt Delay"); | 92 | E1000_PARAM(RxIntDelay, "Receive Interrupt Delay"); |
94 | #define DEFAULT_RDTR 0 | ||
95 | #define MAX_RXDELAY 0xFFFF | 93 | #define MAX_RXDELAY 0xFFFF |
96 | #define MIN_RXDELAY 0 | 94 | #define MIN_RXDELAY 0 |
97 | 95 | ||
@@ -101,7 +99,6 @@ E1000_PARAM(RxIntDelay, "Receive Interrupt Delay"); | |||
101 | * Valid Range: 0-65535 | 99 | * Valid Range: 0-65535 |
102 | */ | 100 | */ |
103 | E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay"); | 101 | E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay"); |
104 | #define DEFAULT_RADV 8 | ||
105 | #define MAX_RXABSDELAY 0xFFFF | 102 | #define MAX_RXABSDELAY 0xFFFF |
106 | #define MIN_RXABSDELAY 0 | 103 | #define MIN_RXABSDELAY 0 |
107 | 104 | ||
@@ -114,6 +111,7 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate"); | |||
114 | #define DEFAULT_ITR 3 | 111 | #define DEFAULT_ITR 3 |
115 | #define MAX_ITR 100000 | 112 | #define MAX_ITR 100000 |
116 | #define MIN_ITR 100 | 113 | #define MIN_ITR 100 |
114 | |||
117 | /* IntMode (Interrupt Mode) | 115 | /* IntMode (Interrupt Mode) |
118 | * | 116 | * |
119 | * Valid Range: 0 - 2 | 117 | * Valid Range: 0 - 2 |
@@ -423,7 +421,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter) | |||
423 | static const struct e1000_option opt = { | 421 | static const struct e1000_option opt = { |
424 | .type = enable_option, | 422 | .type = enable_option, |
425 | .name = "CRC Stripping", | 423 | .name = "CRC Stripping", |
426 | .err = "defaulting to enabled", | 424 | .err = "defaulting to Enabled", |
427 | .def = OPTION_ENABLED | 425 | .def = OPTION_ENABLED |
428 | }; | 426 | }; |
429 | 427 | ||