git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
net
/
ixgb
/
ixgb_param.c
diff --git
a/drivers/net/ixgb/ixgb_param.c
b/drivers/net/ixgb/ixgb_param.c
index
39fbed2
..
8a83dfd
100644
(file)
--- a/
drivers/net/ixgb/ixgb_param.c
+++ b/
drivers/net/ixgb/ixgb_param.c
@@
-1,7
+1,7
@@
/*******************************************************************************
/*******************************************************************************
- Copyright(c) 1999 - 200
6
Intel Corporation. All rights reserved.
+ Copyright(c) 1999 - 200
5
Intel Corporation. All rights reserved.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
@@
-76,7
+76,7
@@
IXGB_PARAM(RxDescriptors, "Number of receive descriptors");
* - 2 - Tx only, generate PAUSE frames but ignore them on receive
* - 3 - Full Flow Control Support
*
* - 2 - Tx only, generate PAUSE frames but ignore them on receive
* - 3 - Full Flow Control Support
*
- * Default Value:
2 - Tx only (silicon bug avoidance)
+ * Default Value:
Read flow control settings from the EEPROM
*/
IXGB_PARAM(FlowControl, "Flow Control setting");
*/
IXGB_PARAM(FlowControl, "Flow Control setting");
@@
-137,7
+137,7
@@
IXGB_PARAM(RxFCLowThresh, "Receive Flow Control Low Threshold");
*
* Valid Range: 1 - 65535
*
*
* Valid Range: 1 - 65535
*
- * Default Value:
65535 (0xffff) (we'll send an xon if we recover
)
+ * Default Value:
256 (0x100
)
*/
IXGB_PARAM(FCReqTimeout, "Flow Control Request Timeout");
*/
IXGB_PARAM(FCReqTimeout, "Flow Control Request Timeout");
@@
-165,6
+165,8
@@
IXGB_PARAM(IntDelayEnable, "Transmit Interrupt Delay Enable");
#define XSUMRX_DEFAULT OPTION_ENABLED
#define XSUMRX_DEFAULT OPTION_ENABLED
+#define FLOW_CONTROL_FULL ixgb_fc_full
+#define FLOW_CONTROL_DEFAULT FLOW_CONTROL_FULL
#define DEFAULT_FCRTL 0x28000
#define DEFAULT_FCRTH 0x30000
#define MIN_FCRTL 0
#define DEFAULT_FCRTL 0x28000
#define DEFAULT_FCRTH 0x30000
#define MIN_FCRTL 0
@@
-172,9
+174,9
@@
IXGB_PARAM(IntDelayEnable, "Transmit Interrupt Delay Enable");
#define MIN_FCRTH 8
#define MAX_FCRTH 0x3FFF0
#define MIN_FCRTH 8
#define MAX_FCRTH 0x3FFF0
+#define DEFAULT_FCPAUSE 0x100 /* this may be too long */
#define MIN_FCPAUSE 1
#define MAX_FCPAUSE 0xffff
#define MIN_FCPAUSE 1
#define MAX_FCPAUSE 0xffff
-#define DEFAULT_FCPAUSE 0xFFFF /* this may be too long */
struct ixgb_option {
enum { enable_option, range_option, list_option } type;
struct ixgb_option {
enum { enable_option, range_option, list_option } type;
@@
-334,7
+336,7
@@
ixgb_check_options(struct ixgb_adapter *adapter)
.type = list_option,
.name = "Flow Control",
.err = "reading default settings from EEPROM",
.type = list_option,
.name = "Flow Control",
.err = "reading default settings from EEPROM",
- .def = ixgb_fc_
tx_pause
,
+ .def = ixgb_fc_
full
,
.arg = { .l = { .nr = LIST_LEN(fc_list),
.p = fc_list }}
};
.arg = { .l = { .nr = LIST_LEN(fc_list),
.p = fc_list }}
};
@@
-363,8
+365,8
@@
ixgb_check_options(struct ixgb_adapter *adapter)
} else {
adapter->hw.fc.high_water = opt.def;
}
} else {
adapter->hw.fc.high_water = opt.def;
}
- if
(!(adapter->hw.fc.type & ixgb_fc_t
x_pause) )
- printk (KERN_INFO
+ if
(!(adapter->hw.fc.type & ixgb_fc_r
x_pause) )
+ printk (KERN_INFO
"Ignoring RxFCHighThresh when no RxFC\n");
}
{ /* Receive Flow Control Low Threshold */
"Ignoring RxFCHighThresh when no RxFC\n");
}
{ /* Receive Flow Control Low Threshold */
@@
-383,8
+385,8
@@
ixgb_check_options(struct ixgb_adapter *adapter)
} else {
adapter->hw.fc.low_water = opt.def;
}
} else {
adapter->hw.fc.low_water = opt.def;
}
- if
(!(adapter->hw.fc.type & ixgb_fc_t
x_pause) )
- printk (KERN_INFO
+ if
(!(adapter->hw.fc.type & ixgb_fc_r
x_pause) )
+ printk (KERN_INFO
"Ignoring RxFCLowThresh when no RxFC\n");
}
{ /* Flow Control Pause Time Request*/
"Ignoring RxFCLowThresh when no RxFC\n");
}
{ /* Flow Control Pause Time Request*/
@@
-404,12
+406,12
@@
ixgb_check_options(struct ixgb_adapter *adapter)
} else {
adapter->hw.fc.pause_time = opt.def;
}
} else {
adapter->hw.fc.pause_time = opt.def;
}
- if
(!(adapter->hw.fc.type & ixgb_fc_t
x_pause) )
- printk (KERN_INFO
+ if
(!(adapter->hw.fc.type & ixgb_fc_r
x_pause) )
+ printk (KERN_INFO
"Ignoring FCReqTimeout when no RxFC\n");
}
/* high low and spacing check for rx flow control thresholds */
"Ignoring FCReqTimeout when no RxFC\n");
}
/* high low and spacing check for rx flow control thresholds */
- if (adapter->hw.fc.type & ixgb_fc_
t
x_pause) {
+ if (adapter->hw.fc.type & ixgb_fc_
r
x_pause) {
/* high must be greater than low */
if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water + 8)) {
/* set defaults */
/* high must be greater than low */
if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water + 8)) {
/* set defaults */