aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/networking/igb.txt48
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c6
2 files changed, 2 insertions, 52 deletions
diff --git a/Documentation/networking/igb.txt b/Documentation/networking/igb.txt
index 4ebbd659256f..43d3549366a0 100644
--- a/Documentation/networking/igb.txt
+++ b/Documentation/networking/igb.txt
@@ -36,54 +36,6 @@ Default Value: 0
36This parameter adds support for SR-IOV. It causes the driver to spawn up to 36This parameter adds support for SR-IOV. It causes the driver to spawn up to
37max_vfs worth of virtual function. 37max_vfs worth of virtual function.
38 38
39QueuePairs
40----------
41Valid Range: 0-1
42Default Value: 1 (TX and RX will be paired onto one interrupt vector)
43
44If set to 0, when MSI-X is enabled, the TX and RX will attempt to occupy
45separate vectors.
46
47This option can be overridden to 1 if there are not sufficient interrupts
48available. This can occur if any combination of RSS, VMDQ, and max_vfs
49results in more than 4 queues being used.
50
51Node
52----
53Valid Range: 0-n
54Default Value: -1 (off)
55
56 0 - n: where n is the number of the NUMA node that should be used to
57 allocate memory for this adapter port.
58 -1: uses the driver default of allocating memory on whichever processor is
59 running insmod/modprobe.
60
61 The Node parameter will allow you to pick which NUMA node you want to have
62 the adapter allocate memory from. All driver structures, in-memory queues,
63 and receive buffers will be allocated on the node specified. This parameter
64 is only useful when interrupt affinity is specified, otherwise some portion
65 of the time the interrupt could run on a different core than the memory is
66 allocated on, causing slower memory access and impacting throughput, CPU, or
67 both.
68
69EEE
70---
71Valid Range: 0-1
72Default Value: 1 (enabled)
73
74 A link between two EEE-compliant devices will result in periodic bursts of
75 data followed by long periods where in the link is in an idle state. This Low
76 Power Idle (LPI) state is supported in both 1Gbps and 100Mbps link speeds.
77 NOTE: EEE support requires autonegotiation.
78
79DMAC
80----
81Valid Range: 0-1
82Default Value: 1 (enabled)
83 Enables or disables DMA Coalescing feature.
84
85
86
87Additional Configurations 39Additional Configurations
88========================= 40=========================
89 41
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index d6b11522fed7..ac06492fb816 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -4347,8 +4347,7 @@ enum latency_range {
4347 * were determined based on theoretical maximum wire speed and testing 4347 * were determined based on theoretical maximum wire speed and testing
4348 * data, in order to minimize response time while increasing bulk 4348 * data, in order to minimize response time while increasing bulk
4349 * throughput. 4349 * throughput.
4350 * This functionality is controlled by the InterruptThrottleRate module 4350 * This functionality is controlled by ethtool's coalescing settings.
4351 * parameter (see igb_param.c)
4352 * NOTE: This function is called only when operating in a multiqueue 4351 * NOTE: This function is called only when operating in a multiqueue
4353 * receive environment. 4352 * receive environment.
4354 **/ 4353 **/
@@ -4422,8 +4421,7 @@ clear_counts:
4422 * based on theoretical maximum wire speed and thresholds were set based 4421 * based on theoretical maximum wire speed and thresholds were set based
4423 * on testing data as well as attempting to minimize response time 4422 * on testing data as well as attempting to minimize response time
4424 * while increasing bulk throughput. 4423 * while increasing bulk throughput.
4425 * this functionality is controlled by the InterruptThrottleRate module 4424 * This functionality is controlled by ethtool's coalescing settings.
4426 * parameter (see igb_param.c)
4427 * NOTE: These calculations are only valid when operating in a single- 4425 * NOTE: These calculations are only valid when operating in a single-
4428 * queue environment. 4426 * queue environment.
4429 **/ 4427 **/