forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8 
 kernel/net/sched/Kconfig
....@@ -1,3 +1,4 @@
1
+# SPDX-License-Identifier: GPL-2.0-only
12 #
23 # Traffic control configuration.
34 #
....@@ -5,7 +6,7 @@
56 menuconfig NET_SCHED
67 	bool "QoS and/or fair queueing"
78 	select NET_SCH_FIFO
8
-	---help---
9
+	help
910 	  When the kernel has several packets to send out over a network
1011 	  device, it has to decide which ones to send first, which ones to
1112 	  delay, and which ones to drop. This is the job of the queueing
....@@ -46,7 +47,7 @@
4647 
4748 config NET_SCH_CBQ
4849 	tristate "Class Based Queueing (CBQ)"
49
-	---help---
50
+	help
5051 	  Say Y here if you want to use the Class-Based Queueing (CBQ) packet
5152 	  scheduling algorithm. This algorithm classifies the waiting packets
5253 	  into a tree-like hierarchy of classes; the leaves of this tree are
....@@ -63,7 +64,7 @@
6364 
6465 config NET_SCH_HTB
6566 	tristate "Hierarchical Token Bucket (HTB)"
66
-	---help---
67
+	help
6768 	  Say Y here if you want to use the Hierarchical Token Buckets (HTB)
6869 	  packet scheduling algorithm. See
6970 	  <http://luxik.cdi.cz/~devik/qos/htb/> for complete manual and
....@@ -77,7 +78,7 @@
7778 
7879 config NET_SCH_HFSC
7980 	tristate "Hierarchical Fair Service Curve (HFSC)"
80
-	---help---
81
+	help
8182 	  Say Y here if you want to use the Hierarchical Fair Service Curve
8283 	  (HFSC) packet scheduling algorithm.
8384 
....@@ -87,7 +88,7 @@
8788 config NET_SCH_ATM
8889 	tristate "ATM Virtual Circuits (ATM)"
8990 	depends on ATM
90
-	---help---
91
+	help
9192 	  Say Y here if you want to use the ATM pseudo-scheduler.  This
9293 	  provides a framework for invoking classifiers, which in turn
9394 	  select classes of this queuing discipline.  Each class maps
....@@ -100,7 +101,7 @@
100101 
101102 config NET_SCH_PRIO
102103 	tristate "Multi Band Priority Queueing (PRIO)"
103
-	---help---
104
+	help
104105 	  Say Y here if you want to use an n-band priority queue packet
105106 	  scheduler.
106107 
....@@ -109,7 +110,7 @@
109110 
110111 config NET_SCH_MULTIQ
111112 	tristate "Hardware Multiqueue-aware Multi Band Queuing (MULTIQ)"
112
-	---help---
113
+	help
113114 	  Say Y here if you want to use an n-band queue packet scheduler
114115 	  to support devices that have multiple hardware transmit queues.
115116 
....@@ -118,7 +119,7 @@
118119 
119120 config NET_SCH_RED
120121 	tristate "Random Early Detection (RED)"
121
-	---help---
122
+	help
122123 	  Say Y here if you want to use the Random Early Detection (RED)
123124 	  packet scheduling algorithm.
124125 
....@@ -129,7 +130,7 @@
129130 
130131 config NET_SCH_SFB
131132 	tristate "Stochastic Fair Blue (SFB)"
132
-	---help---
133
+	help
133134 	  Say Y here if you want to use the Stochastic Fair Blue (SFB)
134135 	  packet scheduling algorithm.
135136 
....@@ -140,7 +141,7 @@
140141 
141142 config NET_SCH_SFQ
142143 	tristate "Stochastic Fairness Queueing (SFQ)"
143
-	---help---
144
+	help
144145 	  Say Y here if you want to use the Stochastic Fairness Queueing (SFQ)
145146 	  packet scheduling algorithm.
146147 
....@@ -151,7 +152,7 @@
151152 
152153 config NET_SCH_TEQL
153154 	tristate "True Link Equalizer (TEQL)"
154
-	---help---
155
+	help
155156 	  Say Y here if you want to use the True Link Equalizer (TLE) packet
156157 	  scheduling algorithm. This queueing discipline allows the combination
157158 	  of several physical devices into one virtual device.
....@@ -163,7 +164,7 @@
163164 
164165 config NET_SCH_TBF
165166 	tristate "Token Bucket Filter (TBF)"
166
-	---help---
167
+	help
167168 	  Say Y here if you want to use the Token Bucket Filter (TBF) packet
168169 	  scheduling algorithm.
169170 
....@@ -174,7 +175,7 @@
174175 
175176 config NET_SCH_CBS
176177 	tristate "Credit Based Shaper (CBS)"
177
-	---help---
178
+	help
178179 	  Say Y here if you want to use the Credit Based Shaper (CBS) packet
179180 	  scheduling algorithm.
180181 
....@@ -194,9 +195,20 @@
194195 	  To compile this code as a module, choose M here: the
195196 	  module will be called sch_etf.
196197 
198
+config NET_SCH_TAPRIO
199
+	tristate "Time Aware Priority (taprio) Scheduler"
200
+	help
201
+	  Say Y here if you want to use the Time Aware Priority (taprio) packet
202
+	  scheduling algorithm.
203
+
204
+	  See the top of <file:net/sched/sch_taprio.c> for more details.
205
+
206
+	  To compile this code as a module, choose M here: the
207
+	  module will be called sch_taprio.
208
+
197209 config NET_SCH_GRED
198210 	tristate "Generic Random Early Detection (GRED)"
199
-	---help---
211
+	help
200212 	  Say Y here if you want to use the Generic Random Early Detection
201213 	  (GRED) packet scheduling algorithm for some of your network devices
202214 	  (see the top of <file:net/sched/sch_red.c> for details and
....@@ -207,7 +219,7 @@
207219 
208220 config NET_SCH_DSMARK
209221 	tristate "Differentiated Services marker (DSMARK)"
210
-	---help---
222
+	help
211223 	  Say Y if you want to schedule packets according to the
212224 	  Differentiated Services architecture proposed in RFC 2475.
213225 	  Technical information on this method, with pointers to associated
....@@ -218,7 +230,7 @@
218230 
219231 config NET_SCH_NETEM
220232 	tristate "Network emulator (NETEM)"
221
-	---help---
233
+	help
222234 	  Say Y if you want to emulate network delay, loss, and packet
223235 	  re-ordering. This is often useful to simulate networks when
224236 	  testing applications or protocols.
....@@ -312,7 +324,7 @@
312324 	tristate "Common Applications Kept Enhanced (CAKE)"
313325 	help
314326 	  Say Y here if you want to use the Common Applications Kept Enhanced
315
-          (CAKE) queue management algorithm.
327
+	  (CAKE) queue management algorithm.
316328 
317329 	  To compile this driver as a module, choose M here: the module
318330 	  will be called sch_cake.
....@@ -347,11 +359,23 @@
347359 	help
348360 	  Say Y here if you want to use the Proportional Integral controller
349361 	  Enhanced scheduler packet scheduling algorithm.
350
-	  For more information, please see
351
-	  http://tools.ietf.org/html/draft-pan-tsvwg-pie-00
362
+	  For more information, please see https://tools.ietf.org/html/rfc8033
352363 
353364 	  To compile this driver as a module, choose M here: the module
354365 	  will be called sch_pie.
366
+
367
+	  If unsure, say N.
368
+
369
+config NET_SCH_FQ_PIE
370
+	depends on NET_SCH_PIE
371
+	tristate "Flow Queue Proportional Integral controller Enhanced (FQ-PIE)"
372
+	help
373
+	  Say Y here if you want to use the Flow Queue Proportional Integral
374
+	  controller Enhanced (FQ-PIE) packet scheduling algorithm.
375
+	  For more information, please see https://tools.ietf.org/html/rfc8033
376
+
377
+	  To compile this driver as a module, choose M here: the module
378
+	  will be called sch_fq_pie.
355379 
356380 	  If unsure, say N.
357381 
....@@ -360,7 +384,7 @@
360384 	depends on NET_CLS_ACT
361385 	select NET_INGRESS
362386 	select NET_EGRESS
363
-	---help---
387
+	help
364388 	  Say Y here if you want to use classifiers for incoming and/or outgoing
365389 	  packets. This qdisc doesn't do anything else besides running classifiers,
366390 	  which can also have actions attached to them. In case of outgoing packets,
....@@ -374,7 +398,7 @@
374398 
375399 config NET_SCH_PLUG
376400 	tristate "Plug network traffic until release (PLUG)"
377
-	---help---
401
+	help
378402 
379403 	  This queuing discipline allows userspace to plug/unplug a network
380404 	  output queue, using the netlink interface.  When it receives an
....@@ -398,9 +422,26 @@
398422 	  To compile this code as a module, choose M here: the
399423 	  module will be called sch_plug.
400424 
425
+config NET_SCH_ETS
426
+	tristate "Enhanced transmission selection scheduler (ETS)"
427
+	help
428
+          The Enhanced Transmission Selection scheduler is a classful
429
+          queuing discipline that merges functionality of PRIO and DRR
430
+          qdiscs in one scheduler. ETS makes it easy to configure a set of
431
+          strict and bandwidth-sharing bands to implement the transmission
432
+          selection described in 802.1Qaz.
433
+
434
+	  Say Y here if you want to use the ETS packet scheduling
435
+	  algorithm.
436
+
437
+	  To compile this driver as a module, choose M here: the module
438
+	  will be called sch_ets.
439
+
440
+	  If unsure, say N.
441
+
401442 menuconfig NET_SCH_DEFAULT
402443 	bool "Allow override default queue discipline"
403
-	---help---
444
+	help
404445 	  Support for selection of default queuing discipline.
405446 
406447 	  Nearly all users can safely say no here, and the default
....@@ -427,6 +468,9 @@
427468 	config DEFAULT_FQ_CODEL
428469 		bool "Fair Queue Controlled Delay" if NET_SCH_FQ_CODEL
429470 
471
+	config DEFAULT_FQ_PIE
472
+		bool "Flow Queue Proportional Integral controller Enhanced" if NET_SCH_FQ_PIE
473
+
430474 	config DEFAULT_SFQ
431475 		bool "Stochastic Fair Queue" if NET_SCH_SFQ
432476 
....@@ -439,6 +483,7 @@
439483 	default "pfifo_fast" if DEFAULT_PFIFO_FAST
440484 	default "fq" if DEFAULT_FQ
441485 	default "fq_codel" if DEFAULT_FQ_CODEL
486
+	default "fq_pie" if DEFAULT_FQ_PIE
442487 	default "sfq" if DEFAULT_SFQ
443488 	default "pfifo_fast"
444489 endif
....@@ -451,30 +496,19 @@
451496 config NET_CLS_BASIC
452497 	tristate "Elementary classification (BASIC)"
453498 	select NET_CLS
454
-	---help---
499
+	help
455500 	  Say Y here if you want to be able to classify packets using
456501 	  only extended matches and actions.
457502 
458503 	  To compile this code as a module, choose M here: the
459504 	  module will be called cls_basic.
460505 
461
-config NET_CLS_TCINDEX
462
-	tristate "Traffic-Control Index (TCINDEX)"
463
-	select NET_CLS
464
-	---help---
465
-	  Say Y here if you want to be able to classify packets based on
466
-	  traffic control indices. You will want this feature if you want
467
-	  to implement Differentiated Services together with DSMARK.
468
-
469
-	  To compile this code as a module, choose M here: the
470
-	  module will be called cls_tcindex.
471
-
472506 config NET_CLS_ROUTE4
473507 	tristate "Routing decision (ROUTE)"
474508 	depends on INET
475509 	select IP_ROUTE_CLASSID
476510 	select NET_CLS
477
-	---help---
511
+	help
478512 	  If you say Y here, you will be able to classify packets
479513 	  according to the route table entry they matched.
480514 
....@@ -484,7 +518,7 @@
484518 config NET_CLS_FW
485519 	tristate "Netfilter mark (FW)"
486520 	select NET_CLS
487
-	---help---
521
+	help
488522 	  If you say Y here, you will be able to classify packets
489523 	  according to netfilter/firewall marks.
490524 
....@@ -494,7 +528,7 @@
494528 config NET_CLS_U32
495529 	tristate "Universal 32bit comparisons w/ hashing (U32)"
496530 	select NET_CLS
497
-	---help---
531
+	help
498532 	  Say Y here to be able to classify packets using a universal
499533 	  32bit pieces based comparison scheme.
500534 
....@@ -504,48 +538,20 @@
504538 config CLS_U32_PERF
505539 	bool "Performance counters support"
506540 	depends on NET_CLS_U32
507
-	---help---
541
+	help
508542 	  Say Y here to make u32 gather additional statistics useful for
509543 	  fine tuning u32 classifiers.
510544 
511545 config CLS_U32_MARK
512546 	bool "Netfilter marks support"
513547 	depends on NET_CLS_U32
514
-	---help---
548
+	help
515549 	  Say Y here to be able to use netfilter marks as u32 key.
516
-
517
-config NET_CLS_RSVP
518
-	tristate "IPv4 Resource Reservation Protocol (RSVP)"
519
-	select NET_CLS
520
-	---help---
521
-	  The Resource Reservation Protocol (RSVP) permits end systems to
522
-	  request a minimum and maximum data flow rate for a connection; this
523
-	  is important for real time data such as streaming sound or video.
524
-
525
-	  Say Y here if you want to be able to classify outgoing packets based
526
-	  on their RSVP requests.
527
-
528
-	  To compile this code as a module, choose M here: the
529
-	  module will be called cls_rsvp.
530
-
531
-config NET_CLS_RSVP6
532
-	tristate "IPv6 Resource Reservation Protocol (RSVP6)"
533
-	select NET_CLS
534
-	---help---
535
-	  The Resource Reservation Protocol (RSVP) permits end systems to
536
-	  request a minimum and maximum data flow rate for a connection; this
537
-	  is important for real time data such as streaming sound or video.
538
-
539
-	  Say Y here if you want to be able to classify outgoing packets based
540
-	  on their RSVP requests and you are using the IPv6 protocol.
541
-
542
-	  To compile this code as a module, choose M here: the
543
-	  module will be called cls_rsvp6.
544550 
545551 config NET_CLS_FLOW
546552 	tristate "Flow classifier"
547553 	select NET_CLS
548
-	---help---
554
+	help
549555 	  If you say Y here, you will be able to classify packets based on
550556 	  a configurable combination of packet keys. This is mostly useful
551557 	  in combination with SFQ.
....@@ -558,7 +564,7 @@
558564 	select NET_CLS
559565 	select CGROUP_NET_CLASSID
560566 	depends on CGROUPS
561
-	---help---
567
+	help
562568 	  Say Y here if you want to classify packets based on the control
563569 	  cgroup of their process.
564570 
....@@ -568,7 +574,7 @@
568574 config NET_CLS_BPF
569575 	tristate "BPF-based classifier"
570576 	select NET_CLS
571
-	---help---
577
+	help
572578 	  If you say Y here, you will be able to classify packets based on
573579 	  programmable BPF (JIT'ed) filters as an alternative to ematches.
574580 
....@@ -578,7 +584,7 @@
578584 config NET_CLS_FLOWER
579585 	tristate "Flower classifier"
580586 	select NET_CLS
581
-	---help---
587
+	help
582588 	  If you say Y here, you will be able to classify packets based on
583589 	  a configurable combination of packet keys and masks.
584590 
....@@ -588,7 +594,7 @@
588594 config NET_CLS_MATCHALL
589595 	tristate "Match-all classifier"
590596 	select NET_CLS
591
-	---help---
597
+	help
592598 	  If you say Y here, you will be able to classify packets based on
593599 	  nothing. Every packet will match.
594600 
....@@ -598,7 +604,7 @@
598604 config NET_EMATCH
599605 	bool "Extended Matches"
600606 	select NET_CLS
601
-	---help---
607
+	help
602608 	  Say Y here if you want to use extended matches on top of classifiers
603609 	  and select the extended matches below.
604610 
....@@ -612,7 +618,7 @@
612618 	int "Stack size"
613619 	depends on NET_EMATCH
614620 	default "32"
615
-	---help---
621
+	help
616622 	  Size of the local stack variable used while evaluating the tree of
617623 	  ematches. Limits the depth of the tree, i.e. the number of
618624 	  encapsulated precedences. Every level requires 4 bytes of additional
....@@ -621,7 +627,7 @@
621627 config NET_EMATCH_CMP
622628 	tristate "Simple packet data comparison"
623629 	depends on NET_EMATCH
624
-	---help---
630
+	help
625631 	  Say Y here if you want to be able to classify packets based on
626632 	  simple packet data comparisons for 8, 16, and 32bit values.
627633 
....@@ -631,7 +637,7 @@
631637 config NET_EMATCH_NBYTE
632638 	tristate "Multi byte comparison"
633639 	depends on NET_EMATCH
634
-	---help---
640
+	help
635641 	  Say Y here if you want to be able to classify packets based on
636642 	  multiple byte comparisons mainly useful for IPv6 address comparisons.
637643 
....@@ -641,7 +647,7 @@
641647 config NET_EMATCH_U32
642648 	tristate "U32 key"
643649 	depends on NET_EMATCH
644
-	---help---
650
+	help
645651 	  Say Y here if you want to be able to classify packets using
646652 	  the famous u32 key in combination with logic relations.
647653 
....@@ -651,7 +657,7 @@
651657 config NET_EMATCH_META
652658 	tristate "Metadata"
653659 	depends on NET_EMATCH
654
-	---help---
660
+	help
655661 	  Say Y here if you want to be able to classify packets based on
656662 	  metadata such as load average, netfilter attributes, socket
657663 	  attributes and routing decisions.
....@@ -666,7 +672,7 @@
666672 	select TEXTSEARCH_KMP
667673 	select TEXTSEARCH_BM
668674 	select TEXTSEARCH_FSM
669
-	---help---
675
+	help
670676 	  Say Y here if you want to be able to classify packets based on
671677 	  textsearch comparisons.
672678 
....@@ -676,7 +682,7 @@
676682 config NET_EMATCH_CANID
677683 	tristate "CAN Identifier"
678684 	depends on NET_EMATCH && (CAN=y || CAN=m)
679
-	---help---
685
+	help
680686 	  Say Y here if you want to be able to classify CAN frames based
681687 	  on CAN Identifier.
682688 
....@@ -686,7 +692,7 @@
686692 config NET_EMATCH_IPSET
687693 	tristate "IPset"
688694 	depends on NET_EMATCH && IP_SET
689
-	---help---
695
+	help
690696 	  Say Y here if you want to be able to classify packets based on
691697 	  ipset membership.
692698 
....@@ -696,7 +702,7 @@
696702 config NET_EMATCH_IPT
697703 	tristate "IPtables Matches"
698704 	depends on NET_EMATCH && NETFILTER && NETFILTER_XTABLES
699
-	---help---
705
+	help
700706 	  Say Y here to be able to classify packets based on iptables
701707 	  matches.
702708 	  Current supported match is "policy" which allows packet classification
....@@ -708,7 +714,7 @@
708714 config NET_CLS_ACT
709715 	bool "Actions"
710716 	select NET_CLS
711
-	---help---
717
+	help
712718 	  Say Y here if you want to use traffic control actions. Actions
713719 	  get attached to classifiers and are invoked after a successful
714720 	  classification. They are used to overwrite the classification
....@@ -719,8 +725,8 @@
719725 
720726 config NET_ACT_POLICE
721727 	tristate "Traffic Policing"
722
-        depends on NET_CLS_ACT
723
-        ---help---
728
+	depends on NET_CLS_ACT
729
+	help
724730 	  Say Y here if you want to do traffic policing, i.e. strict
725731 	  bandwidth limiting. This action replaces the existing policing
726732 	  module.
....@@ -729,9 +735,9 @@
729735 	  module will be called act_police.
730736 
731737 config NET_ACT_GACT
732
-        tristate "Generic actions"
733
-        depends on NET_CLS_ACT
734
-        ---help---
738
+	tristate "Generic actions"
739
+	depends on NET_CLS_ACT
740
+	help
735741 	  Say Y here to take generic actions such as dropping and
736742 	  accepting packets.
737743 
....@@ -739,15 +745,15 @@
739745 	  module will be called act_gact.
740746 
741747 config GACT_PROB
742
-        bool "Probability support"
743
-        depends on NET_ACT_GACT
744
-        ---help---
748
+	bool "Probability support"
749
+	depends on NET_ACT_GACT
750
+	help
745751 	  Say Y here to use the generic action randomly or deterministically.
746752 
747753 config NET_ACT_MIRRED
748
-        tristate "Redirecting and Mirroring"
749
-        depends on NET_CLS_ACT
750
-        ---help---
754
+	tristate "Redirecting and Mirroring"
755
+	depends on NET_CLS_ACT
756
+	help
751757 	  Say Y here to allow packets to be mirrored or redirected to
752758 	  other devices.
753759 
....@@ -755,10 +761,10 @@
755761 	  module will be called act_mirred.
756762 
757763 config NET_ACT_SAMPLE
758
-        tristate "Traffic Sampling"
759
-        depends on NET_CLS_ACT
760
-        select PSAMPLE
761
-        ---help---
764
+	tristate "Traffic Sampling"
765
+	depends on NET_CLS_ACT
766
+	select PSAMPLE
767
+	help
762768 	  Say Y here to allow packet sampling tc action. The packet sample
763769 	  action consists of statistically choosing packets and sampling
764770 	  them using the psample module.
....@@ -767,9 +773,9 @@
767773 	  module will be called act_sample.
768774 
769775 config NET_ACT_IPT
770
-        tristate "IPtables targets"
771
-        depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
772
-        ---help---
776
+	tristate "IPtables targets"
777
+	depends on NET_CLS_ACT && NETFILTER && NETFILTER_XTABLES
778
+	help
773779 	  Say Y here to be able to invoke iptables targets after successful
774780 	  classification.
775781 
....@@ -777,9 +783,9 @@
777783 	  module will be called act_ipt.
778784 
779785 config NET_ACT_NAT
780
-        tristate "Stateless NAT"
781
-        depends on NET_CLS_ACT
782
-        ---help---
786
+	tristate "Stateless NAT"
787
+	depends on NET_CLS_ACT
788
+	help
783789 	  Say Y here to do stateless NAT on IPv4 packets.  You should use
784790 	  netfilter for NAT unless you know what you are doing.
785791 
....@@ -787,18 +793,18 @@
787793 	  module will be called act_nat.
788794 
789795 config NET_ACT_PEDIT
790
-        tristate "Packet Editing"
791
-        depends on NET_CLS_ACT
792
-        ---help---
796
+	tristate "Packet Editing"
797
+	depends on NET_CLS_ACT
798
+	help
793799 	  Say Y here if you want to mangle the content of packets.
794800 
795801 	  To compile this code as a module, choose M here: the
796802 	  module will be called act_pedit.
797803 
798804 config NET_ACT_SIMP
799
-        tristate "Simple Example (Debug)"
800
-        depends on NET_CLS_ACT
801
-        ---help---
805
+	tristate "Simple Example (Debug)"
806
+	depends on NET_CLS_ACT
807
+	help
802808 	  Say Y here to add a simple action for demonstration purposes.
803809 	  It is meant as an example and for debugging purposes. It will
804810 	  print a configured policy string followed by the packet count
....@@ -810,9 +816,9 @@
810816 	  module will be called act_simple.
811817 
812818 config NET_ACT_SKBEDIT
813
-        tristate "SKB Editing"
814
-        depends on NET_CLS_ACT
815
-        ---help---
819
+	tristate "SKB Editing"
820
+	depends on NET_CLS_ACT
821
+	help
816822 	  Say Y here to change skb priority or queue_mapping settings.
817823 
818824 	  If unsure, say N.
....@@ -821,20 +827,31 @@
821827 	  module will be called act_skbedit.
822828 
823829 config NET_ACT_CSUM
824
-        tristate "Checksum Updating"
825
-        depends on NET_CLS_ACT && INET
826
-        select LIBCRC32C
827
-        ---help---
830
+	tristate "Checksum Updating"
831
+	depends on NET_CLS_ACT && INET
832
+	select LIBCRC32C
833
+	help
828834 	  Say Y here to update some common checksum after some direct
829835 	  packet alterations.
830836 
831837 	  To compile this code as a module, choose M here: the
832838 	  module will be called act_csum.
833839 
840
+config NET_ACT_MPLS
841
+	tristate "MPLS manipulation"
842
+	depends on NET_CLS_ACT
843
+	help
844
+	  Say Y here to push or pop MPLS headers.
845
+
846
+	  If unsure, say N.
847
+
848
+	  To compile this code as a module, choose M here: the
849
+	  module will be called act_mpls.
850
+
834851 config NET_ACT_VLAN
835
-        tristate "Vlan manipulation"
836
-        depends on NET_CLS_ACT
837
-        ---help---
852
+	tristate "Vlan manipulation"
853
+	depends on NET_CLS_ACT
854
+	help
838855 	  Say Y here to push or pop vlan headers.
839856 
840857 	  If unsure, say N.
....@@ -843,9 +860,9 @@
843860 	  module will be called act_vlan.
844861 
845862 config NET_ACT_BPF
846
-        tristate "BPF based action"
847
-        depends on NET_CLS_ACT
848
-        ---help---
863
+	tristate "BPF based action"
864
+	depends on NET_CLS_ACT
865
+	help
849866 	  Say Y here to execute BPF code on packets. The BPF code will decide
850867 	  if the packet should be dropped or not.
851868 
....@@ -855,10 +872,10 @@
855872 	  module will be called act_bpf.
856873 
857874 config NET_ACT_CONNMARK
858
-        tristate "Netfilter Connection Mark Retriever"
859
-        depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
860
-        depends on NF_CONNTRACK && NF_CONNTRACK_MARK
861
-        ---help---
875
+	tristate "Netfilter Connection Mark Retriever"
876
+	depends on NET_CLS_ACT && NETFILTER
877
+	depends on NF_CONNTRACK && NF_CONNTRACK_MARK
878
+	help
862879 	  Say Y here to allow retrieving of conn mark
863880 
864881 	  If unsure, say N.
....@@ -866,22 +883,39 @@
866883 	  To compile this code as a module, choose M here: the
867884 	  module will be called act_connmark.
868885 
886
+config NET_ACT_CTINFO
887
+	tristate "Netfilter Connection Mark Actions"
888
+	depends on NET_CLS_ACT && NETFILTER
889
+	depends on NF_CONNTRACK && NF_CONNTRACK_MARK
890
+	help
891
+	  Say Y here to allow transfer of a connmark stored information.
892
+	  Current actions transfer connmark stored DSCP into
893
+	  ipv4/v6 diffserv and/or to transfer connmark to packet
894
+	  mark.  Both are useful for restoring egress based marks
895
+	  back onto ingress connections for qdisc priority mapping
896
+	  purposes.
897
+
898
+	  If unsure, say N.
899
+
900
+	  To compile this code as a module, choose M here: the
901
+	  module will be called act_ctinfo.
902
+
869903 config NET_ACT_SKBMOD
870
-        tristate "skb data modification action"
871
-        depends on NET_CLS_ACT
872
-        ---help---
873
-         Say Y here to allow modification of skb data
904
+	tristate "skb data modification action"
905
+	depends on NET_CLS_ACT
906
+	help
907
+	 Say Y here to allow modification of skb data
874908 
875
-         If unsure, say N.
909
+	 If unsure, say N.
876910 
877
-         To compile this code as a module, choose M here: the
878
-         module will be called act_skbmod.
911
+	 To compile this code as a module, choose M here: the
912
+	 module will be called act_skbmod.
879913 
880914 config NET_ACT_IFE
881
-        tristate "Inter-FE action based on IETF ForCES InterFE LFB"
882
-        depends on NET_CLS_ACT
883
-        select NET_IFE
884
-        ---help---
915
+	tristate "Inter-FE action based on IETF ForCES InterFE LFB"
916
+	depends on NET_CLS_ACT
917
+	select NET_IFE
918
+	help
885919 	  Say Y here to allow for sourcing and terminating metadata
886920 	  For details refer to netdev01 paper:
887921 	  "Distributing Linux Traffic Control Classifier-Action Subsystem"
....@@ -891,9 +925,9 @@
891925 	  module will be called act_ife.
892926 
893927 config NET_ACT_TUNNEL_KEY
894
-        tristate "IP tunnel metadata manipulation"
895
-        depends on NET_CLS_ACT
896
-        ---help---
928
+	tristate "IP tunnel metadata manipulation"
929
+	depends on NET_CLS_ACT
930
+	help
897931 	  Say Y here to set/release ip tunnel metadata.
898932 
899933 	  If unsure, say N.
....@@ -901,25 +935,52 @@
901935 	  To compile this code as a module, choose M here: the
902936 	  module will be called act_tunnel_key.
903937 
938
+config NET_ACT_CT
939
+	tristate "connection tracking tc action"
940
+	depends on NET_CLS_ACT && NF_CONNTRACK && (!NF_NAT || NF_NAT) && NF_FLOW_TABLE
941
+	help
942
+	  Say Y here to allow sending the packets to conntrack module.
943
+
944
+	  If unsure, say N.
945
+
946
+	  To compile this code as a module, choose M here: the
947
+	  module will be called act_ct.
948
+
949
+config NET_ACT_GATE
950
+	tristate "Frame gate entry list control tc action"
951
+	depends on NET_CLS_ACT
952
+	help
953
+	  Say Y here to allow to control the ingress flow to be passed at
954
+	  specific time slot and be dropped at other specific time slot by
955
+	  the gate entry list.
956
+
957
+	  If unsure, say N.
958
+	  To compile this code as a module, choose M here: the
959
+	  module will be called act_gate.
960
+
904961 config NET_IFE_SKBMARK
905
-        tristate "Support to encoding decoding skb mark on IFE action"
906
-        depends on NET_ACT_IFE
962
+	tristate "Support to encoding decoding skb mark on IFE action"
963
+	depends on NET_ACT_IFE
907964 
908965 config NET_IFE_SKBPRIO
909
-        tristate "Support to encoding decoding skb prio on IFE action"
910
-        depends on NET_ACT_IFE
966
+	tristate "Support to encoding decoding skb prio on IFE action"
967
+	depends on NET_ACT_IFE
911968 
912969 config NET_IFE_SKBTCINDEX
913
-        tristate "Support to encoding decoding skb tcindex on IFE action"
914
-        depends on NET_ACT_IFE
970
+	tristate "Support to encoding decoding skb tcindex on IFE action"
971
+	depends on NET_ACT_IFE
915972 
916
-config NET_CLS_IND
917
-	bool "Incoming device classification"
918
-	depends on NET_CLS_U32 || NET_CLS_FW
919
-	---help---
920
-	  Say Y here to extend the u32 and fw classifier to support
921
-	  classification based on the incoming device. This option is
922
-	  likely to disappear in favour of the metadata ematch.
973
+config NET_TC_SKB_EXT
974
+	bool "TC recirculation support"
975
+	depends on NET_CLS_ACT
976
+	select SKB_EXTENSIONS
977
+
978
+	help
979
+	  Say Y here to allow tc chain misses to continue in OvS datapath in
980
+	  the correct recirc_id, and hardware chain misses to continue in
981
+	  the correct chain in tc software datapath.
982
+
983
+	  Say N here if you won't be using tc<->ovs offload or tc chains offload.
923984 
924985 endif # NET_SCHED
925986