diff options
author | Cong Wang <amwang@redhat.com> | 2013-07-31 23:10:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-01 18:11:17 -0400 |
commit | e0d1095ae3405404d247afb00233ef837d58da83 (patch) | |
tree | 1f83aed50dbe9298ca0cdc5a0d51a3750f0fd720 /Documentation/sysctl | |
parent | dfcefb0be1231982784df2152213103ad33c1cfd (diff) |
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
Eliezer renames several *ll_poll to *busy_poll, but forgets
CONFIG_NET_LL_RX_POLL, so in case of confusion, rename it too.
Cc: Eliezer Tamir <eliezer.tamir@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/sysctl')
-rw-r--r-- | Documentation/sysctl/net.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt index 1c15043aaee4..d569f2a424d5 100644 --- a/Documentation/sysctl/net.txt +++ b/Documentation/sysctl/net.txt | |||
@@ -52,7 +52,7 @@ Default: 64 | |||
52 | 52 | ||
53 | busy_read | 53 | busy_read |
54 | ---------------- | 54 | ---------------- |
55 | Low latency busy poll timeout for socket reads. (needs CONFIG_NET_LL_RX_POLL) | 55 | Low latency busy poll timeout for socket reads. (needs CONFIG_NET_RX_BUSY_POLL) |
56 | Approximate time in us to busy loop waiting for packets on the device queue. | 56 | Approximate time in us to busy loop waiting for packets on the device queue. |
57 | This sets the default value of the SO_BUSY_POLL socket option. | 57 | This sets the default value of the SO_BUSY_POLL socket option. |
58 | Can be set or overridden per socket by setting socket option SO_BUSY_POLL, | 58 | Can be set or overridden per socket by setting socket option SO_BUSY_POLL, |
@@ -63,7 +63,7 @@ Default: 0 (off) | |||
63 | 63 | ||
64 | busy_poll | 64 | busy_poll |
65 | ---------------- | 65 | ---------------- |
66 | Low latency busy poll timeout for poll and select. (needs CONFIG_NET_LL_RX_POLL) | 66 | Low latency busy poll timeout for poll and select. (needs CONFIG_NET_RX_BUSY_POLL) |
67 | Approximate time in us to busy loop waiting for events. | 67 | Approximate time in us to busy loop waiting for events. |
68 | Recommended value depends on the number of sockets you poll on. | 68 | Recommended value depends on the number of sockets you poll on. |
69 | For several sockets 50, for several hundreds 100. | 69 | For several sockets 50, for several hundreds 100. |