Skip to content

Commit 43da141

Browse files
krzkdavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5421cf8 commit 43da141

File tree

5 files changed

+148
-148
lines changed

5 files changed

+148
-148
lines changed

net/Kconfig

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ config XPS
258258
default y
259259

260260
config HWBM
261-
bool
261+
bool
262262

263263
config CGROUP_NET_PRIO
264264
bool "Network priority cgroup"
@@ -309,12 +309,12 @@ config BPF_STREAM_PARSER
309309
select STREAM_PARSER
310310
select NET_SOCK_MSG
311311
---help---
312-
Enabling this allows a stream parser to be used with
313-
BPF_MAP_TYPE_SOCKMAP.
312+
Enabling this allows a stream parser to be used with
313+
BPF_MAP_TYPE_SOCKMAP.
314314

315-
BPF_MAP_TYPE_SOCKMAP provides a map type to use with network sockets.
316-
It can be used to enforce socket policy, implement socket redirects,
317-
etc.
315+
BPF_MAP_TYPE_SOCKMAP provides a map type to use with network sockets.
316+
It can be used to enforce socket policy, implement socket redirects,
317+
etc.
318318

319319
config NET_FLOW_LIMIT
320320
bool
@@ -349,12 +349,12 @@ config NET_DROP_MONITOR
349349
tristate "Network packet drop alerting service"
350350
depends on INET && TRACEPOINTS
351351
---help---
352-
This feature provides an alerting service to userspace in the
353-
event that packets are discarded in the network stack. Alerts
354-
are broadcast via netlink socket to any listening user space
355-
process. If you don't need network drop alerts, or if you are ok
356-
just checking the various proc files and other utilities for
357-
drop statistics, say N here.
352+
This feature provides an alerting service to userspace in the
353+
event that packets are discarded in the network stack. Alerts
354+
are broadcast via netlink socket to any listening user space
355+
process. If you don't need network drop alerts, or if you are ok
356+
just checking the various proc files and other utilities for
357+
drop statistics, say N here.
358358

359359
endmenu
360360

@@ -433,7 +433,7 @@ config NET_DEVLINK
433433
imply NET_DROP_MONITOR
434434

435435
config PAGE_POOL
436-
bool
436+
bool
437437

438438
config FAILOVER
439439
tristate "Generic failover module"

net/ipv4/Kconfig

Lines changed: 109 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ config NET_IPIP
180180
config NET_IPGRE_DEMUX
181181
tristate "IP: GRE demultiplexer"
182182
help
183-
This is helper module to demultiplex GRE packets on GRE version field criteria.
184-
Required by ip_gre and pptp modules.
183+
This is helper module to demultiplex GRE packets on GRE version field criteria.
184+
Required by ip_gre and pptp modules.
185185

186186
config NET_IP_TUNNEL
187187
tristate
@@ -459,200 +459,200 @@ config TCP_CONG_BIC
459459
tristate "Binary Increase Congestion (BIC) control"
460460
default m
461461
---help---
462-
BIC-TCP is a sender-side only change that ensures a linear RTT
463-
fairness under large windows while offering both scalability and
464-
bounded TCP-friendliness. The protocol combines two schemes
465-
called additive increase and binary search increase. When the
466-
congestion window is large, additive increase with a large
467-
increment ensures linear RTT fairness as well as good
468-
scalability. Under small congestion windows, binary search
469-
increase provides TCP friendliness.
470-
See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/
462+
BIC-TCP is a sender-side only change that ensures a linear RTT
463+
fairness under large windows while offering both scalability and
464+
bounded TCP-friendliness. The protocol combines two schemes
465+
called additive increase and binary search increase. When the
466+
congestion window is large, additive increase with a large
467+
increment ensures linear RTT fairness as well as good
468+
scalability. Under small congestion windows, binary search
469+
increase provides TCP friendliness.
470+
See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/
471471

472472
config TCP_CONG_CUBIC
473473
tristate "CUBIC TCP"
474474
default y
475475
---help---
476-
This is version 2.0 of BIC-TCP which uses a cubic growth function
477-
among other techniques.
478-
See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/cubic-paper.pdf
476+
This is version 2.0 of BIC-TCP which uses a cubic growth function
477+
among other techniques.
478+
See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/cubic-paper.pdf
479479

480480
config TCP_CONG_WESTWOOD
481481
tristate "TCP Westwood+"
482482
default m
483483
---help---
484-
TCP Westwood+ is a sender-side only modification of the TCP Reno
485-
protocol stack that optimizes the performance of TCP congestion
486-
control. It is based on end-to-end bandwidth estimation to set
487-
congestion window and slow start threshold after a congestion
488-
episode. Using this estimation, TCP Westwood+ adaptively sets a
489-
slow start threshold and a congestion window which takes into
490-
account the bandwidth used at the time congestion is experienced.
491-
TCP Westwood+ significantly increases fairness wrt TCP Reno in
492-
wired networks and throughput over wireless links.
484+
TCP Westwood+ is a sender-side only modification of the TCP Reno
485+
protocol stack that optimizes the performance of TCP congestion
486+
control. It is based on end-to-end bandwidth estimation to set
487+
congestion window and slow start threshold after a congestion
488+
episode. Using this estimation, TCP Westwood+ adaptively sets a
489+
slow start threshold and a congestion window which takes into
490+
account the bandwidth used at the time congestion is experienced.
491+
TCP Westwood+ significantly increases fairness wrt TCP Reno in
492+
wired networks and throughput over wireless links.
493493

494494
config TCP_CONG_HTCP
495495
tristate "H-TCP"
496496
default m
497497
---help---
498-
H-TCP is a send-side only modifications of the TCP Reno
499-
protocol stack that optimizes the performance of TCP
500-
congestion control for high speed network links. It uses a
501-
modeswitch to change the alpha and beta parameters of TCP Reno
502-
based on network conditions and in a way so as to be fair with
503-
other Reno and H-TCP flows.
498+
H-TCP is a send-side only modifications of the TCP Reno
499+
protocol stack that optimizes the performance of TCP
500+
congestion control for high speed network links. It uses a
501+
modeswitch to change the alpha and beta parameters of TCP Reno
502+
based on network conditions and in a way so as to be fair with
503+
other Reno and H-TCP flows.
504504

505505
config TCP_CONG_HSTCP
506506
tristate "High Speed TCP"
507507
default n
508508
---help---
509-
Sally Floyd's High Speed TCP (RFC 3649) congestion control.
510-
A modification to TCP's congestion control mechanism for use
511-
with large congestion windows. A table indicates how much to
512-
increase the congestion window by when an ACK is received.
513-
For more detail see http://www.icir.org/floyd/hstcp.html
509+
Sally Floyd's High Speed TCP (RFC 3649) congestion control.
510+
A modification to TCP's congestion control mechanism for use
511+
with large congestion windows. A table indicates how much to
512+
increase the congestion window by when an ACK is received.
513+
For more detail see http://www.icir.org/floyd/hstcp.html
514514

515515
config TCP_CONG_HYBLA
516516
tristate "TCP-Hybla congestion control algorithm"
517517
default n
518518
---help---
519-
TCP-Hybla is a sender-side only change that eliminates penalization of
520-
long-RTT, large-bandwidth connections, like when satellite legs are
521-
involved, especially when sharing a common bottleneck with normal
522-
terrestrial connections.
519+
TCP-Hybla is a sender-side only change that eliminates penalization of
520+
long-RTT, large-bandwidth connections, like when satellite legs are
521+
involved, especially when sharing a common bottleneck with normal
522+
terrestrial connections.
523523

524524
config TCP_CONG_VEGAS
525525
tristate "TCP Vegas"
526526
default n
527527
---help---
528-
TCP Vegas is a sender-side only change to TCP that anticipates
529-
the onset of congestion by estimating the bandwidth. TCP Vegas
530-
adjusts the sending rate by modifying the congestion
531-
window. TCP Vegas should provide less packet loss, but it is
532-
not as aggressive as TCP Reno.
528+
TCP Vegas is a sender-side only change to TCP that anticipates
529+
the onset of congestion by estimating the bandwidth. TCP Vegas
530+
adjusts the sending rate by modifying the congestion
531+
window. TCP Vegas should provide less packet loss, but it is
532+
not as aggressive as TCP Reno.
533533

534534
config TCP_CONG_NV
535-
tristate "TCP NV"
536-
default n
537-
---help---
538-
TCP NV is a follow up to TCP Vegas. It has been modified to deal with
539-
10G networks, measurement noise introduced by LRO, GRO and interrupt
540-
coalescence. In addition, it will decrease its cwnd multiplicatively
541-
instead of linearly.
535+
tristate "TCP NV"
536+
default n
537+
---help---
538+
TCP NV is a follow up to TCP Vegas. It has been modified to deal with
539+
10G networks, measurement noise introduced by LRO, GRO and interrupt
540+
coalescence. In addition, it will decrease its cwnd multiplicatively
541+
instead of linearly.
542542

543-
Note that in general congestion avoidance (cwnd decreased when # packets
544-
queued grows) cannot coexist with congestion control (cwnd decreased only
545-
when there is packet loss) due to fairness issues. One scenario when they
546-
can coexist safely is when the CA flows have RTTs << CC flows RTTs.
543+
Note that in general congestion avoidance (cwnd decreased when # packets
544+
queued grows) cannot coexist with congestion control (cwnd decreased only
545+
when there is packet loss) due to fairness issues. One scenario when they
546+
can coexist safely is when the CA flows have RTTs << CC flows RTTs.
547547

548-
For further details see http://www.brakmo.org/networking/tcp-nv/
548+
For further details see http://www.brakmo.org/networking/tcp-nv/
549549

550550
config TCP_CONG_SCALABLE
551551
tristate "Scalable TCP"
552552
default n
553553
---help---
554-
Scalable TCP is a sender-side only change to TCP which uses a
555-
MIMD congestion control algorithm which has some nice scaling
556-
properties, though is known to have fairness issues.
557-
See http://www.deneholme.net/tom/scalable/
554+
Scalable TCP is a sender-side only change to TCP which uses a
555+
MIMD congestion control algorithm which has some nice scaling
556+
properties, though is known to have fairness issues.
557+
See http://www.deneholme.net/tom/scalable/
558558

559559
config TCP_CONG_LP
560560
tristate "TCP Low Priority"
561561
default n
562562
---help---
563-
TCP Low Priority (TCP-LP), a distributed algorithm whose goal is
564-
to utilize only the excess network bandwidth as compared to the
565-
``fair share`` of bandwidth as targeted by TCP.
566-
See http://www-ece.rice.edu/networks/TCP-LP/
563+
TCP Low Priority (TCP-LP), a distributed algorithm whose goal is
564+
to utilize only the excess network bandwidth as compared to the
565+
``fair share`` of bandwidth as targeted by TCP.
566+
See http://www-ece.rice.edu/networks/TCP-LP/
567567

568568
config TCP_CONG_VENO
569569
tristate "TCP Veno"
570570
default n
571571
---help---
572-
TCP Veno is a sender-side only enhancement of TCP to obtain better
573-
throughput over wireless networks. TCP Veno makes use of state
574-
distinguishing to circumvent the difficult judgment of the packet loss
575-
type. TCP Veno cuts down less congestion window in response to random
576-
loss packets.
577-
See <http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186>
572+
TCP Veno is a sender-side only enhancement of TCP to obtain better
573+
throughput over wireless networks. TCP Veno makes use of state
574+
distinguishing to circumvent the difficult judgment of the packet loss
575+
type. TCP Veno cuts down less congestion window in response to random
576+
loss packets.
577+
See <http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186>
578578

579579
config TCP_CONG_YEAH
580580
tristate "YeAH TCP"
581581
select TCP_CONG_VEGAS
582582
default n
583583
---help---
584-
YeAH-TCP is a sender-side high-speed enabled TCP congestion control
585-
algorithm, which uses a mixed loss/delay approach to compute the
586-
congestion window. It's design goals target high efficiency,
587-
internal, RTT and Reno fairness, resilience to link loss while
588-
keeping network elements load as low as possible.
584+
YeAH-TCP is a sender-side high-speed enabled TCP congestion control
585+
algorithm, which uses a mixed loss/delay approach to compute the
586+
congestion window. It's design goals target high efficiency,
587+
internal, RTT and Reno fairness, resilience to link loss while
588+
keeping network elements load as low as possible.
589589

590-
For further details look here:
591-
http://wil.cs.caltech.edu/pfldnet2007/paper/YeAH_TCP.pdf
590+
For further details look here:
591+
http://wil.cs.caltech.edu/pfldnet2007/paper/YeAH_TCP.pdf
592592

593593
config TCP_CONG_ILLINOIS
594594
tristate "TCP Illinois"
595595
default n
596596
---help---
597-
TCP-Illinois is a sender-side modification of TCP Reno for
598-
high speed long delay links. It uses round-trip-time to
599-
adjust the alpha and beta parameters to achieve a higher average
600-
throughput and maintain fairness.
597+
TCP-Illinois is a sender-side modification of TCP Reno for
598+
high speed long delay links. It uses round-trip-time to
599+
adjust the alpha and beta parameters to achieve a higher average
600+
throughput and maintain fairness.
601601

602-
For further details see:
603-
http://www.ews.uiuc.edu/~shaoliu/tcpillinois/index.html
602+
For further details see:
603+
http://www.ews.uiuc.edu/~shaoliu/tcpillinois/index.html
604604

605605
config TCP_CONG_DCTCP
606606
tristate "DataCenter TCP (DCTCP)"
607607
default n
608608
---help---
609-
DCTCP leverages Explicit Congestion Notification (ECN) in the network to
610-
provide multi-bit feedback to the end hosts. It is designed to provide:
609+
DCTCP leverages Explicit Congestion Notification (ECN) in the network to
610+
provide multi-bit feedback to the end hosts. It is designed to provide:
611611

612-
- High burst tolerance (incast due to partition/aggregate),
613-
- Low latency (short flows, queries),
614-
- High throughput (continuous data updates, large file transfers) with
615-
commodity, shallow-buffered switches.
612+
- High burst tolerance (incast due to partition/aggregate),
613+
- Low latency (short flows, queries),
614+
- High throughput (continuous data updates, large file transfers) with
615+
commodity, shallow-buffered switches.
616616

617-
All switches in the data center network running DCTCP must support
618-
ECN marking and be configured for marking when reaching defined switch
619-
buffer thresholds. The default ECN marking threshold heuristic for
620-
DCTCP on switches is 20 packets (30KB) at 1Gbps, and 65 packets
621-
(~100KB) at 10Gbps, but might need further careful tweaking.
617+
All switches in the data center network running DCTCP must support
618+
ECN marking and be configured for marking when reaching defined switch
619+
buffer thresholds. The default ECN marking threshold heuristic for
620+
DCTCP on switches is 20 packets (30KB) at 1Gbps, and 65 packets
621+
(~100KB) at 10Gbps, but might need further careful tweaking.
622622

623-
For further details see:
624-
http://simula.stanford.edu/~alizade/Site/DCTCP_files/dctcp-final.pdf
623+
For further details see:
624+
http://simula.stanford.edu/~alizade/Site/DCTCP_files/dctcp-final.pdf
625625

626626
config TCP_CONG_CDG
627627
tristate "CAIA Delay-Gradient (CDG)"
628628
default n
629629
---help---
630-
CAIA Delay-Gradient (CDG) is a TCP congestion control that modifies
631-
the TCP sender in order to:
630+
CAIA Delay-Gradient (CDG) is a TCP congestion control that modifies
631+
the TCP sender in order to:
632632

633633
o Use the delay gradient as a congestion signal.
634634
o Back off with an average probability that is independent of the RTT.
635635
o Coexist with flows that use loss-based congestion control.
636636
o Tolerate packet loss unrelated to congestion.
637637

638-
For further details see:
639-
D.A. Hayes and G. Armitage. "Revisiting TCP congestion control using
640-
delay gradients." In Networking 2011. Preprint: http://goo.gl/No3vdg
638+
For further details see:
639+
D.A. Hayes and G. Armitage. "Revisiting TCP congestion control using
640+
delay gradients." In Networking 2011. Preprint: http://goo.gl/No3vdg
641641

642642
config TCP_CONG_BBR
643643
tristate "BBR TCP"
644644
default n
645645
---help---
646646

647-
BBR (Bottleneck Bandwidth and RTT) TCP congestion control aims to
648-
maximize network utilization and minimize queues. It builds an explicit
649-
model of the the bottleneck delivery rate and path round-trip
650-
propagation delay. It tolerates packet loss and delay unrelated to
651-
congestion. It can operate over LAN, WAN, cellular, wifi, or cable
652-
modem links. It can coexist with flows that use loss-based congestion
653-
control, and can operate with shallow buffers, deep buffers,
654-
bufferbloat, policers, or AQM schemes that do not provide a delay
655-
signal. It requires the fq ("Fair Queue") pacing packet scheduler.
647+
BBR (Bottleneck Bandwidth and RTT) TCP congestion control aims to
648+
maximize network utilization and minimize queues. It builds an explicit
649+
model of the the bottleneck delivery rate and path round-trip
650+
propagation delay. It tolerates packet loss and delay unrelated to
651+
congestion. It can operate over LAN, WAN, cellular, wifi, or cable
652+
modem links. It can coexist with flows that use loss-based congestion
653+
control, and can operate with shallow buffers, deep buffers,
654+
bufferbloat, policers, or AQM schemes that do not provide a delay
655+
signal. It requires the fq ("Fair Queue") pacing packet scheduler.
656656

657657
choice
658658
prompt "Default TCP congestion control"

0 commit comments

Comments
 (0)