net: Fix Kconfig indentation, continued

Adjust indentation from spaces to tab (+optional two spaces) as in
coding style.  This fixes various indentation mixups (seven spaces,
tab+one space, etc).

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Krzysztof Kozlowski 2019-11-21 21:28:35 +08:00 committed by David S. Miller
parent 5421cf84af
commit 43da14110c
5 changed files with 147 additions and 147 deletions

View File

@ -258,7 +258,7 @@ config XPS
default y default y
config HWBM config HWBM
bool bool
config CGROUP_NET_PRIO config CGROUP_NET_PRIO
bool "Network priority cgroup" bool "Network priority cgroup"
@ -309,12 +309,12 @@ config BPF_STREAM_PARSER
select STREAM_PARSER select STREAM_PARSER
select NET_SOCK_MSG select NET_SOCK_MSG
---help--- ---help---
Enabling this allows a stream parser to be used with Enabling this allows a stream parser to be used with
BPF_MAP_TYPE_SOCKMAP. BPF_MAP_TYPE_SOCKMAP.
BPF_MAP_TYPE_SOCKMAP provides a map type to use with network sockets. BPF_MAP_TYPE_SOCKMAP provides a map type to use with network sockets.
It can be used to enforce socket policy, implement socket redirects, It can be used to enforce socket policy, implement socket redirects,
etc. etc.
config NET_FLOW_LIMIT config NET_FLOW_LIMIT
bool bool
@ -349,12 +349,12 @@ config NET_DROP_MONITOR
tristate "Network packet drop alerting service" tristate "Network packet drop alerting service"
depends on INET && TRACEPOINTS depends on INET && TRACEPOINTS
---help--- ---help---
This feature provides an alerting service to userspace in the This feature provides an alerting service to userspace in the
event that packets are discarded in the network stack. Alerts event that packets are discarded in the network stack. Alerts
are broadcast via netlink socket to any listening user space are broadcast via netlink socket to any listening user space
process. If you don't need network drop alerts, or if you are ok process. If you don't need network drop alerts, or if you are ok
just checking the various proc files and other utilities for just checking the various proc files and other utilities for
drop statistics, say N here. drop statistics, say N here.
endmenu endmenu
@ -433,7 +433,7 @@ config NET_DEVLINK
imply NET_DROP_MONITOR imply NET_DROP_MONITOR
config PAGE_POOL config PAGE_POOL
bool bool
config FAILOVER config FAILOVER
tristate "Generic failover module" tristate "Generic failover module"

View File

@ -180,8 +180,8 @@ config NET_IPIP
config NET_IPGRE_DEMUX config NET_IPGRE_DEMUX
tristate "IP: GRE demultiplexer" tristate "IP: GRE demultiplexer"
help help
This is helper module to demultiplex GRE packets on GRE version field criteria. This is helper module to demultiplex GRE packets on GRE version field criteria.
Required by ip_gre and pptp modules. Required by ip_gre and pptp modules.
config NET_IP_TUNNEL config NET_IP_TUNNEL
tristate tristate
@ -459,200 +459,200 @@ config TCP_CONG_BIC
tristate "Binary Increase Congestion (BIC) control" tristate "Binary Increase Congestion (BIC) control"
default m default m
---help--- ---help---
BIC-TCP is a sender-side only change that ensures a linear RTT BIC-TCP is a sender-side only change that ensures a linear RTT
fairness under large windows while offering both scalability and fairness under large windows while offering both scalability and
bounded TCP-friendliness. The protocol combines two schemes bounded TCP-friendliness. The protocol combines two schemes
called additive increase and binary search increase. When the called additive increase and binary search increase. When the
congestion window is large, additive increase with a large congestion window is large, additive increase with a large
increment ensures linear RTT fairness as well as good increment ensures linear RTT fairness as well as good
scalability. Under small congestion windows, binary search scalability. Under small congestion windows, binary search
increase provides TCP friendliness. increase provides TCP friendliness.
See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/ See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/
config TCP_CONG_CUBIC config TCP_CONG_CUBIC
tristate "CUBIC TCP" tristate "CUBIC TCP"
default y default y
---help--- ---help---
This is version 2.0 of BIC-TCP which uses a cubic growth function This is version 2.0 of BIC-TCP which uses a cubic growth function
among other techniques. among other techniques.
See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/cubic-paper.pdf See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/cubic-paper.pdf
config TCP_CONG_WESTWOOD config TCP_CONG_WESTWOOD
tristate "TCP Westwood+" tristate "TCP Westwood+"
default m default m
---help--- ---help---
TCP Westwood+ is a sender-side only modification of the TCP Reno TCP Westwood+ is a sender-side only modification of the TCP Reno
protocol stack that optimizes the performance of TCP congestion protocol stack that optimizes the performance of TCP congestion
control. It is based on end-to-end bandwidth estimation to set control. It is based on end-to-end bandwidth estimation to set
congestion window and slow start threshold after a congestion congestion window and slow start threshold after a congestion
episode. Using this estimation, TCP Westwood+ adaptively sets a episode. Using this estimation, TCP Westwood+ adaptively sets a
slow start threshold and a congestion window which takes into slow start threshold and a congestion window which takes into
account the bandwidth used at the time congestion is experienced. account the bandwidth used at the time congestion is experienced.
TCP Westwood+ significantly increases fairness wrt TCP Reno in TCP Westwood+ significantly increases fairness wrt TCP Reno in
wired networks and throughput over wireless links. wired networks and throughput over wireless links.
config TCP_CONG_HTCP config TCP_CONG_HTCP
tristate "H-TCP" tristate "H-TCP"
default m default m
---help--- ---help---
H-TCP is a send-side only modifications of the TCP Reno H-TCP is a send-side only modifications of the TCP Reno
protocol stack that optimizes the performance of TCP protocol stack that optimizes the performance of TCP
congestion control for high speed network links. It uses a congestion control for high speed network links. It uses a
modeswitch to change the alpha and beta parameters of TCP Reno modeswitch to change the alpha and beta parameters of TCP Reno
based on network conditions and in a way so as to be fair with based on network conditions and in a way so as to be fair with
other Reno and H-TCP flows. other Reno and H-TCP flows.
config TCP_CONG_HSTCP config TCP_CONG_HSTCP
tristate "High Speed TCP" tristate "High Speed TCP"
default n default n
---help--- ---help---
Sally Floyd's High Speed TCP (RFC 3649) congestion control. Sally Floyd's High Speed TCP (RFC 3649) congestion control.
A modification to TCP's congestion control mechanism for use A modification to TCP's congestion control mechanism for use
with large congestion windows. A table indicates how much to with large congestion windows. A table indicates how much to
increase the congestion window by when an ACK is received. increase the congestion window by when an ACK is received.
For more detail see http://www.icir.org/floyd/hstcp.html For more detail see http://www.icir.org/floyd/hstcp.html
config TCP_CONG_HYBLA config TCP_CONG_HYBLA
tristate "TCP-Hybla congestion control algorithm" tristate "TCP-Hybla congestion control algorithm"
default n default n
---help--- ---help---
TCP-Hybla is a sender-side only change that eliminates penalization of TCP-Hybla is a sender-side only change that eliminates penalization of
long-RTT, large-bandwidth connections, like when satellite legs are long-RTT, large-bandwidth connections, like when satellite legs are
involved, especially when sharing a common bottleneck with normal involved, especially when sharing a common bottleneck with normal
terrestrial connections. terrestrial connections.
config TCP_CONG_VEGAS config TCP_CONG_VEGAS
tristate "TCP Vegas" tristate "TCP Vegas"
default n default n
---help--- ---help---
TCP Vegas is a sender-side only change to TCP that anticipates TCP Vegas is a sender-side only change to TCP that anticipates
the onset of congestion by estimating the bandwidth. TCP Vegas the onset of congestion by estimating the bandwidth. TCP Vegas
adjusts the sending rate by modifying the congestion adjusts the sending rate by modifying the congestion
window. TCP Vegas should provide less packet loss, but it is window. TCP Vegas should provide less packet loss, but it is
not as aggressive as TCP Reno. not as aggressive as TCP Reno.
config TCP_CONG_NV config TCP_CONG_NV
tristate "TCP NV" tristate "TCP NV"
default n default n
---help--- ---help---
TCP NV is a follow up to TCP Vegas. It has been modified to deal with TCP NV is a follow up to TCP Vegas. It has been modified to deal with
10G networks, measurement noise introduced by LRO, GRO and interrupt 10G networks, measurement noise introduced by LRO, GRO and interrupt
coalescence. In addition, it will decrease its cwnd multiplicatively coalescence. In addition, it will decrease its cwnd multiplicatively
instead of linearly. instead of linearly.
Note that in general congestion avoidance (cwnd decreased when # packets Note that in general congestion avoidance (cwnd decreased when # packets
queued grows) cannot coexist with congestion control (cwnd decreased only queued grows) cannot coexist with congestion control (cwnd decreased only
when there is packet loss) due to fairness issues. One scenario when they when there is packet loss) due to fairness issues. One scenario when they
can coexist safely is when the CA flows have RTTs << CC flows RTTs. can coexist safely is when the CA flows have RTTs << CC flows RTTs.
For further details see http://www.brakmo.org/networking/tcp-nv/ For further details see http://www.brakmo.org/networking/tcp-nv/
config TCP_CONG_SCALABLE config TCP_CONG_SCALABLE
tristate "Scalable TCP" tristate "Scalable TCP"
default n default n
---help--- ---help---
Scalable TCP is a sender-side only change to TCP which uses a Scalable TCP is a sender-side only change to TCP which uses a
MIMD congestion control algorithm which has some nice scaling MIMD congestion control algorithm which has some nice scaling
properties, though is known to have fairness issues. properties, though is known to have fairness issues.
See http://www.deneholme.net/tom/scalable/ See http://www.deneholme.net/tom/scalable/
config TCP_CONG_LP config TCP_CONG_LP
tristate "TCP Low Priority" tristate "TCP Low Priority"
default n default n
---help--- ---help---
TCP Low Priority (TCP-LP), a distributed algorithm whose goal is TCP Low Priority (TCP-LP), a distributed algorithm whose goal is
to utilize only the excess network bandwidth as compared to the to utilize only the excess network bandwidth as compared to the
``fair share`` of bandwidth as targeted by TCP. ``fair share`` of bandwidth as targeted by TCP.
See http://www-ece.rice.edu/networks/TCP-LP/ See http://www-ece.rice.edu/networks/TCP-LP/
config TCP_CONG_VENO config TCP_CONG_VENO
tristate "TCP Veno" tristate "TCP Veno"
default n default n
---help--- ---help---
TCP Veno is a sender-side only enhancement of TCP to obtain better TCP Veno is a sender-side only enhancement of TCP to obtain better
throughput over wireless networks. TCP Veno makes use of state throughput over wireless networks. TCP Veno makes use of state
distinguishing to circumvent the difficult judgment of the packet loss distinguishing to circumvent the difficult judgment of the packet loss
type. TCP Veno cuts down less congestion window in response to random type. TCP Veno cuts down less congestion window in response to random
loss packets. loss packets.
See <http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186> See <http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186>
config TCP_CONG_YEAH config TCP_CONG_YEAH
tristate "YeAH TCP" tristate "YeAH TCP"
select TCP_CONG_VEGAS select TCP_CONG_VEGAS
default n default n
---help--- ---help---
YeAH-TCP is a sender-side high-speed enabled TCP congestion control YeAH-TCP is a sender-side high-speed enabled TCP congestion control
algorithm, which uses a mixed loss/delay approach to compute the algorithm, which uses a mixed loss/delay approach to compute the
congestion window. It's design goals target high efficiency, congestion window. It's design goals target high efficiency,
internal, RTT and Reno fairness, resilience to link loss while internal, RTT and Reno fairness, resilience to link loss while
keeping network elements load as low as possible. keeping network elements load as low as possible.
For further details look here: For further details look here:
http://wil.cs.caltech.edu/pfldnet2007/paper/YeAH_TCP.pdf http://wil.cs.caltech.edu/pfldnet2007/paper/YeAH_TCP.pdf
config TCP_CONG_ILLINOIS config TCP_CONG_ILLINOIS
tristate "TCP Illinois" tristate "TCP Illinois"
default n default n
---help--- ---help---
TCP-Illinois is a sender-side modification of TCP Reno for TCP-Illinois is a sender-side modification of TCP Reno for
high speed long delay links. It uses round-trip-time to high speed long delay links. It uses round-trip-time to
adjust the alpha and beta parameters to achieve a higher average adjust the alpha and beta parameters to achieve a higher average
throughput and maintain fairness. throughput and maintain fairness.
For further details see: For further details see:
http://www.ews.uiuc.edu/~shaoliu/tcpillinois/index.html http://www.ews.uiuc.edu/~shaoliu/tcpillinois/index.html
config TCP_CONG_DCTCP config TCP_CONG_DCTCP
tristate "DataCenter TCP (DCTCP)" tristate "DataCenter TCP (DCTCP)"
default n default n
---help--- ---help---
DCTCP leverages Explicit Congestion Notification (ECN) in the network to DCTCP leverages Explicit Congestion Notification (ECN) in the network to
provide multi-bit feedback to the end hosts. It is designed to provide: provide multi-bit feedback to the end hosts. It is designed to provide:
- High burst tolerance (incast due to partition/aggregate), - High burst tolerance (incast due to partition/aggregate),
- Low latency (short flows, queries), - Low latency (short flows, queries),
- High throughput (continuous data updates, large file transfers) with - High throughput (continuous data updates, large file transfers) with
commodity, shallow-buffered switches. commodity, shallow-buffered switches.
All switches in the data center network running DCTCP must support All switches in the data center network running DCTCP must support
ECN marking and be configured for marking when reaching defined switch ECN marking and be configured for marking when reaching defined switch
buffer thresholds. The default ECN marking threshold heuristic for buffer thresholds. The default ECN marking threshold heuristic for
DCTCP on switches is 20 packets (30KB) at 1Gbps, and 65 packets DCTCP on switches is 20 packets (30KB) at 1Gbps, and 65 packets
(~100KB) at 10Gbps, but might need further careful tweaking. (~100KB) at 10Gbps, but might need further careful tweaking.
For further details see: For further details see:
http://simula.stanford.edu/~alizade/Site/DCTCP_files/dctcp-final.pdf http://simula.stanford.edu/~alizade/Site/DCTCP_files/dctcp-final.pdf
config TCP_CONG_CDG config TCP_CONG_CDG
tristate "CAIA Delay-Gradient (CDG)" tristate "CAIA Delay-Gradient (CDG)"
default n default n
---help--- ---help---
CAIA Delay-Gradient (CDG) is a TCP congestion control that modifies CAIA Delay-Gradient (CDG) is a TCP congestion control that modifies
the TCP sender in order to: the TCP sender in order to:
o Use the delay gradient as a congestion signal. o Use the delay gradient as a congestion signal.
o Back off with an average probability that is independent of the RTT. o Back off with an average probability that is independent of the RTT.
o Coexist with flows that use loss-based congestion control. o Coexist with flows that use loss-based congestion control.
o Tolerate packet loss unrelated to congestion. o Tolerate packet loss unrelated to congestion.
For further details see: For further details see:
D.A. Hayes and G. Armitage. "Revisiting TCP congestion control using D.A. Hayes and G. Armitage. "Revisiting TCP congestion control using
delay gradients." In Networking 2011. Preprint: http://goo.gl/No3vdg delay gradients." In Networking 2011. Preprint: http://goo.gl/No3vdg
config TCP_CONG_BBR config TCP_CONG_BBR
tristate "BBR TCP" tristate "BBR TCP"
default n default n
---help--- ---help---
BBR (Bottleneck Bandwidth and RTT) TCP congestion control aims to BBR (Bottleneck Bandwidth and RTT) TCP congestion control aims to
maximize network utilization and minimize queues. It builds an explicit maximize network utilization and minimize queues. It builds an explicit
model of the the bottleneck delivery rate and path round-trip model of the the bottleneck delivery rate and path round-trip
propagation delay. It tolerates packet loss and delay unrelated to propagation delay. It tolerates packet loss and delay unrelated to
congestion. It can operate over LAN, WAN, cellular, wifi, or cable congestion. It can operate over LAN, WAN, cellular, wifi, or cable
modem links. It can coexist with flows that use loss-based congestion modem links. It can coexist with flows that use loss-based congestion
control, and can operate with shallow buffers, deep buffers, control, and can operate with shallow buffers, deep buffers,
bufferbloat, policers, or AQM schemes that do not provide a delay bufferbloat, policers, or AQM schemes that do not provide a delay
signal. It requires the fq ("Fair Queue") pacing packet scheduler. signal. It requires the fq ("Fair Queue") pacing packet scheduler.
choice choice
prompt "Default TCP congestion control" prompt "Default TCP congestion control"

View File

@ -128,9 +128,9 @@ config IP6_NF_MATCH_HL
depends on NETFILTER_ADVANCED depends on NETFILTER_ADVANCED
select NETFILTER_XT_MATCH_HL select NETFILTER_XT_MATCH_HL
---help--- ---help---
This is a backwards-compat option for the user's convenience This is a backwards-compat option for the user's convenience
(e.g. when running oldconfig). It selects (e.g. when running oldconfig). It selects
CONFIG_NETFILTER_XT_MATCH_HL. CONFIG_NETFILTER_XT_MATCH_HL.
config IP6_NF_MATCH_IPV6HEADER config IP6_NF_MATCH_IPV6HEADER
tristate '"ipv6header" IPv6 Extension Headers Match' tristate '"ipv6header" IPv6 Extension Headers Match'
@ -184,9 +184,9 @@ config IP6_NF_TARGET_HL
depends on NETFILTER_ADVANCED && IP6_NF_MANGLE depends on NETFILTER_ADVANCED && IP6_NF_MANGLE
select NETFILTER_XT_TARGET_HL select NETFILTER_XT_TARGET_HL
---help--- ---help---
This is a backwards-compatible option for the user's convenience This is a backwards-compatible option for the user's convenience
(e.g. when running oldconfig). It selects (e.g. when running oldconfig). It selects
CONFIG_NETFILTER_XT_TARGET_HL. CONFIG_NETFILTER_XT_TARGET_HL.
config IP6_NF_FILTER config IP6_NF_FILTER
tristate "Packet filtering" tristate "Packet filtering"
@ -245,14 +245,14 @@ config IP6_NF_RAW
# security table for MAC policy # security table for MAC policy
config IP6_NF_SECURITY config IP6_NF_SECURITY
tristate "Security table" tristate "Security table"
depends on SECURITY depends on SECURITY
depends on NETFILTER_ADVANCED depends on NETFILTER_ADVANCED
help help
This option adds a `security' table to iptables, for use This option adds a `security' table to iptables, for use
with Mandatory Access Control (MAC) policy. with Mandatory Access Control (MAC) policy.
If unsure, say N. If unsure, say N.
config IP6_NF_NAT config IP6_NF_NAT
tristate "ip6tables NAT support" tristate "ip6tables NAT support"

View File

@ -1,12 +1,12 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config NFC_HCI config NFC_HCI
depends on NFC depends on NFC
tristate "NFC HCI implementation" tristate "NFC HCI implementation"
default n default n
help help
Say Y here if you want to build support for a kernel NFC HCI Say Y here if you want to build support for a kernel NFC HCI
implementation. This is mostly needed for devices that only process implementation. This is mostly needed for devices that only process
HCI frames, like for example the NXP pn544. HCI frames, like for example the NXP pn544.
config NFC_SHDLC config NFC_SHDLC
depends on NFC_HCI depends on NFC_HCI

View File

@ -3,13 +3,13 @@
# XFRM configuration # XFRM configuration
# #
config XFRM config XFRM
bool bool
depends on INET depends on INET
select GRO_CELLS select GRO_CELLS
select SKB_EXTENSIONS select SKB_EXTENSIONS
config XFRM_OFFLOAD config XFRM_OFFLOAD
bool bool
config XFRM_ALGO config XFRM_ALGO
tristate tristate