forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376 
 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,7 +496,7 @@
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 
....@@ -461,7 +506,7 @@
461506 config NET_CLS_TCINDEX
462507 	tristate "Traffic-Control Index (TCINDEX)"
463508 	select NET_CLS
464
-	---help---
509
+	help
465510 	  Say Y here if you want to be able to classify packets based on
466511 	  traffic control indices. You will want this feature if you want
467512 	  to implement Differentiated Services together with DSMARK.
....@@ -474,7 +519,7 @@
474519 	depends on INET
475520 	select IP_ROUTE_CLASSID
476521 	select NET_CLS
477
-	---help---
522
+	help
478523 	  If you say Y here, you will be able to classify packets
479524 	  according to the route table entry they matched.
480525 
....@@ -484,7 +529,7 @@
484529 config NET_CLS_FW
485530 	tristate "Netfilter mark (FW)"
486531 	select NET_CLS
487
-	---help---
532
+	help
488533 	  If you say Y here, you will be able to classify packets
489534 	  according to netfilter/firewall marks.
490535 
....@@ -494,7 +539,7 @@
494539 config NET_CLS_U32
495540 	tristate "Universal 32bit comparisons w/ hashing (U32)"
496541 	select NET_CLS
497
-	---help---
542
+	help
498543 	  Say Y here to be able to classify packets using a universal
499544 	  32bit pieces based comparison scheme.
500545 
....@@ -504,20 +549,20 @@
504549 config CLS_U32_PERF
505550 	bool "Performance counters support"
506551 	depends on NET_CLS_U32
507
-	---help---
552
+	help
508553 	  Say Y here to make u32 gather additional statistics useful for
509554 	  fine tuning u32 classifiers.
510555 
511556 config CLS_U32_MARK
512557 	bool "Netfilter marks support"
513558 	depends on NET_CLS_U32
514
-	---help---
559
+	help
515560 	  Say Y here to be able to use netfilter marks as u32 key.
516561 
517562 config NET_CLS_RSVP
518563 	tristate "IPv4 Resource Reservation Protocol (RSVP)"
519564 	select NET_CLS
520
-	---help---
565
+	help
521566 	  The Resource Reservation Protocol (RSVP) permits end systems to
522567 	  request a minimum and maximum data flow rate for a connection; this
523568 	  is important for real time data such as streaming sound or video.
....@@ -531,7 +576,7 @@
531576 config NET_CLS_RSVP6
532577 	tristate "IPv6 Resource Reservation Protocol (RSVP6)"
533578 	select NET_CLS
534
-	---help---
579
+	help
535580 	  The Resource Reservation Protocol (RSVP) permits end systems to
536581 	  request a minimum and maximum data flow rate for a connection; this
537582 	  is important for real time data such as streaming sound or video.
....@@ -545,7 +590,7 @@
545590 config NET_CLS_FLOW
546591 	tristate "Flow classifier"
547592 	select NET_CLS
548
-	---help---
593
+	help
549594 	  If you say Y here, you will be able to classify packets based on
550595 	  a configurable combination of packet keys. This is mostly useful
551596 	  in combination with SFQ.
....@@ -558,7 +603,7 @@
558603 	select NET_CLS
559604 	select CGROUP_NET_CLASSID
560605 	depends on CGROUPS
561
-	---help---
606
+	help
562607 	  Say Y here if you want to classify packets based on the control
563608 	  cgroup of their process.
564609 
....@@ -568,7 +613,7 @@
568613 config NET_CLS_BPF
569614 	tristate "BPF-based classifier"
570615 	select NET_CLS
571
-	---help---
616
+	help
572617 	  If you say Y here, you will be able to classify packets based on
573618 	  programmable BPF (JIT'ed) filters as an alternative to ematches.
574619 
....@@ -578,7 +623,7 @@
578623 config NET_CLS_FLOWER
579624 	tristate "Flower classifier"
580625 	select NET_CLS
581
-	---help---
626
+	help
582627 	  If you say Y here, you will be able to classify packets based on
583628 	  a configurable combination of packet keys and masks.
584629 
....@@ -588,7 +633,7 @@
588633 config NET_CLS_MATCHALL
589634 	tristate "Match-all classifier"
590635 	select NET_CLS
591
-	---help---
636
+	help
592637 	  If you say Y here, you will be able to classify packets based on
593638 	  nothing. Every packet will match.
594639 
....@@ -598,7 +643,7 @@
598643 config NET_EMATCH
599644 	bool "Extended Matches"
600645 	select NET_CLS
601
-	---help---
646
+	help
602647 	  Say Y here if you want to use extended matches on top of classifiers
603648 	  and select the extended matches below.
604649 
....@@ -612,7 +657,7 @@
612657 	int "Stack size"
613658 	depends on NET_EMATCH
614659 	default "32"
615
-	---help---
660
+	help
616661 	  Size of the local stack variable used while evaluating the tree of
617662 	  ematches. Limits the depth of the tree, i.e. the number of
618663 	  encapsulated precedences. Every level requires 4 bytes of additional
....@@ -621,7 +666,7 @@
621666 config NET_EMATCH_CMP
622667 	tristate "Simple packet data comparison"
623668 	depends on NET_EMATCH
624
-	---help---
669
+	help
625670 	  Say Y here if you want to be able to classify packets based on
626671 	  simple packet data comparisons for 8, 16, and 32bit values.
627672 
....@@ -631,7 +676,7 @@
631676 config NET_EMATCH_NBYTE
632677 	tristate "Multi byte comparison"
633678 	depends on NET_EMATCH
634
-	---help---
679
+	help
635680 	  Say Y here if you want to be able to classify packets based on
636681 	  multiple byte comparisons mainly useful for IPv6 address comparisons.
637682 
....@@ -641,7 +686,7 @@
641686 config NET_EMATCH_U32
642687 	tristate "U32 key"
643688 	depends on NET_EMATCH
644
-	---help---
689
+	help
645690 	  Say Y here if you want to be able to classify packets using
646691 	  the famous u32 key in combination with logic relations.
647692 
....@@ -651,7 +696,7 @@
651696 config NET_EMATCH_META
652697 	tristate "Metadata"
653698 	depends on NET_EMATCH
654
-	---help---
699
+	help
655700 	  Say Y here if you want to be able to classify packets based on
656701 	  metadata such as load average, netfilter attributes, socket
657702 	  attributes and routing decisions.
....@@ -666,7 +711,7 @@
666711 	select TEXTSEARCH_KMP
667712 	select TEXTSEARCH_BM
668713 	select TEXTSEARCH_FSM
669
-	---help---
714
+	help
670715 	  Say Y here if you want to be able to classify packets based on
671716 	  textsearch comparisons.
672717 
....@@ -676,7 +721,7 @@
676721 config NET_EMATCH_CANID
677722 	tristate "CAN Identifier"
678723 	depends on NET_EMATCH && (CAN=y || CAN=m)
679
-	---help---
724
+	help
680725 	  Say Y here if you want to be able to classify CAN frames based
681726 	  on CAN Identifier.
682727 
....@@ -686,7 +731,7 @@
686731 config NET_EMATCH_IPSET
687732 	tristate "IPset"
688733 	depends on NET_EMATCH && IP_SET
689
-	---help---
734
+	help
690735 	  Say Y here if you want to be able to classify packets based on
691736 	  ipset membership.
692737 
....@@ -696,7 +741,7 @@
696741 config NET_EMATCH_IPT
697742 	tristate "IPtables Matches"
698743 	depends on NET_EMATCH && NETFILTER && NETFILTER_XTABLES
699
-	---help---
744
+	help
700745 	  Say Y here to be able to classify packets based on iptables
701746 	  matches.
702747 	  Current supported match is "policy" which allows packet classification
....@@ -708,7 +753,7 @@
708753 config NET_CLS_ACT
709754 	bool "Actions"
710755 	select NET_CLS
711
-	---help---
756
+	help
712757 	  Say Y here if you want to use traffic control actions. Actions
713758 	  get attached to classifiers and are invoked after a successful
714759 	  classification. They are used to overwrite the classification
....@@ -719,8 +764,8 @@
719764 
720765 config NET_ACT_POLICE
721766 	tristate "Traffic Policing"
722
-        depends on NET_CLS_ACT
723
-        ---help---
767
+	depends on NET_CLS_ACT
768
+	help
724769 	  Say Y here if you want to do traffic policing, i.e. strict
725770 	  bandwidth limiting. This action replaces the existing policing
726771 	  module.
....@@ -729,9 +774,9 @@
729774 	  module will be called act_police.
730775 
731776 config NET_ACT_GACT
732
-        tristate "Generic actions"
733
-        depends on NET_CLS_ACT
734
-        ---help---
777
+	tristate "Generic actions"
778
+	depends on NET_CLS_ACT
779
+	help
735780 	  Say Y here to take generic actions such as dropping and
736781 	  accepting packets.
737782 
....@@ -739,15 +784,15 @@
739784 	  module will be called act_gact.
740785 
741786 config GACT_PROB
742
-        bool "Probability support"
743
-        depends on NET_ACT_GACT
744
-        ---help---
787
+	bool "Probability support"
788
+	depends on NET_ACT_GACT
789
+	help
745790 	  Say Y here to use the generic action randomly or deterministically.
746791 
747792 config NET_ACT_MIRRED
748
-        tristate "Redirecting and Mirroring"
749
-        depends on NET_CLS_ACT
750
-        ---help---
793
+	tristate "Redirecting and Mirroring"
794
+	depends on NET_CLS_ACT
795
+	help
751796 	  Say Y here to allow packets to be mirrored or redirected to
752797 	  other devices.
753798 
....@@ -755,10 +800,10 @@
755800 	  module will be called act_mirred.
756801 
757802 config NET_ACT_SAMPLE
758
-        tristate "Traffic Sampling"
759
-        depends on NET_CLS_ACT
760
-        select PSAMPLE
761
-        ---help---
803
+	tristate "Traffic Sampling"
804
+	depends on NET_CLS_ACT
805
+	select PSAMPLE
806
+	help
762807 	  Say Y here to allow packet sampling tc action. The packet sample
763808 	  action consists of statistically choosing packets and sampling
764809 	  them using the psample module.
....@@ -767,9 +812,9 @@
767812 	  module will be called act_sample.
768813 
769814 config NET_ACT_IPT
770
-        tristate "IPtables targets"
771
-        depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
772
-        ---help---
815
+	tristate "IPtables targets"
816
+	depends on NET_CLS_ACT && NETFILTER && NETFILTER_XTABLES
817
+	help
773818 	  Say Y here to be able to invoke iptables targets after successful
774819 	  classification.
775820 
....@@ -777,9 +822,9 @@
777822 	  module will be called act_ipt.
778823 
779824 config NET_ACT_NAT
780
-        tristate "Stateless NAT"
781
-        depends on NET_CLS_ACT
782
-        ---help---
825
+	tristate "Stateless NAT"
826
+	depends on NET_CLS_ACT
827
+	help
783828 	  Say Y here to do stateless NAT on IPv4 packets.  You should use
784829 	  netfilter for NAT unless you know what you are doing.
785830 
....@@ -787,18 +832,18 @@
787832 	  module will be called act_nat.
788833 
789834 config NET_ACT_PEDIT
790
-        tristate "Packet Editing"
791
-        depends on NET_CLS_ACT
792
-        ---help---
835
+	tristate "Packet Editing"
836
+	depends on NET_CLS_ACT
837
+	help
793838 	  Say Y here if you want to mangle the content of packets.
794839 
795840 	  To compile this code as a module, choose M here: the
796841 	  module will be called act_pedit.
797842 
798843 config NET_ACT_SIMP
799
-        tristate "Simple Example (Debug)"
800
-        depends on NET_CLS_ACT
801
-        ---help---
844
+	tristate "Simple Example (Debug)"
845
+	depends on NET_CLS_ACT
846
+	help
802847 	  Say Y here to add a simple action for demonstration purposes.
803848 	  It is meant as an example and for debugging purposes. It will
804849 	  print a configured policy string followed by the packet count
....@@ -810,9 +855,9 @@
810855 	  module will be called act_simple.
811856 
812857 config NET_ACT_SKBEDIT
813
-        tristate "SKB Editing"
814
-        depends on NET_CLS_ACT
815
-        ---help---
858
+	tristate "SKB Editing"
859
+	depends on NET_CLS_ACT
860
+	help
816861 	  Say Y here to change skb priority or queue_mapping settings.
817862 
818863 	  If unsure, say N.
....@@ -821,20 +866,31 @@
821866 	  module will be called act_skbedit.
822867 
823868 config NET_ACT_CSUM
824
-        tristate "Checksum Updating"
825
-        depends on NET_CLS_ACT && INET
826
-        select LIBCRC32C
827
-        ---help---
869
+	tristate "Checksum Updating"
870
+	depends on NET_CLS_ACT && INET
871
+	select LIBCRC32C
872
+	help
828873 	  Say Y here to update some common checksum after some direct
829874 	  packet alterations.
830875 
831876 	  To compile this code as a module, choose M here: the
832877 	  module will be called act_csum.
833878 
879
+config NET_ACT_MPLS
880
+	tristate "MPLS manipulation"
881
+	depends on NET_CLS_ACT
882
+	help
883
+	  Say Y here to push or pop MPLS headers.
884
+
885
+	  If unsure, say N.
886
+
887
+	  To compile this code as a module, choose M here: the
888
+	  module will be called act_mpls.
889
+
834890 config NET_ACT_VLAN
835
-        tristate "Vlan manipulation"
836
-        depends on NET_CLS_ACT
837
-        ---help---
891
+	tristate "Vlan manipulation"
892
+	depends on NET_CLS_ACT
893
+	help
838894 	  Say Y here to push or pop vlan headers.
839895 
840896 	  If unsure, say N.
....@@ -843,9 +899,9 @@
843899 	  module will be called act_vlan.
844900 
845901 config NET_ACT_BPF
846
-        tristate "BPF based action"
847
-        depends on NET_CLS_ACT
848
-        ---help---
902
+	tristate "BPF based action"
903
+	depends on NET_CLS_ACT
904
+	help
849905 	  Say Y here to execute BPF code on packets. The BPF code will decide
850906 	  if the packet should be dropped or not.
851907 
....@@ -855,10 +911,10 @@
855911 	  module will be called act_bpf.
856912 
857913 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---
914
+	tristate "Netfilter Connection Mark Retriever"
915
+	depends on NET_CLS_ACT && NETFILTER
916
+	depends on NF_CONNTRACK && NF_CONNTRACK_MARK
917
+	help
862918 	  Say Y here to allow retrieving of conn mark
863919 
864920 	  If unsure, say N.
....@@ -866,22 +922,39 @@
866922 	  To compile this code as a module, choose M here: the
867923 	  module will be called act_connmark.
868924 
925
+config NET_ACT_CTINFO
926
+	tristate "Netfilter Connection Mark Actions"
927
+	depends on NET_CLS_ACT && NETFILTER
928
+	depends on NF_CONNTRACK && NF_CONNTRACK_MARK
929
+	help
930
+	  Say Y here to allow transfer of a connmark stored information.
931
+	  Current actions transfer connmark stored DSCP into
932
+	  ipv4/v6 diffserv and/or to transfer connmark to packet
933
+	  mark.  Both are useful for restoring egress based marks
934
+	  back onto ingress connections for qdisc priority mapping
935
+	  purposes.
936
+
937
+	  If unsure, say N.
938
+
939
+	  To compile this code as a module, choose M here: the
940
+	  module will be called act_ctinfo.
941
+
869942 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
943
+	tristate "skb data modification action"
944
+	depends on NET_CLS_ACT
945
+	help
946
+	 Say Y here to allow modification of skb data
874947 
875
-         If unsure, say N.
948
+	 If unsure, say N.
876949 
877
-         To compile this code as a module, choose M here: the
878
-         module will be called act_skbmod.
950
+	 To compile this code as a module, choose M here: the
951
+	 module will be called act_skbmod.
879952 
880953 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---
954
+	tristate "Inter-FE action based on IETF ForCES InterFE LFB"
955
+	depends on NET_CLS_ACT
956
+	select NET_IFE
957
+	help
885958 	  Say Y here to allow for sourcing and terminating metadata
886959 	  For details refer to netdev01 paper:
887960 	  "Distributing Linux Traffic Control Classifier-Action Subsystem"
....@@ -891,9 +964,9 @@
891964 	  module will be called act_ife.
892965 
893966 config NET_ACT_TUNNEL_KEY
894
-        tristate "IP tunnel metadata manipulation"
895
-        depends on NET_CLS_ACT
896
-        ---help---
967
+	tristate "IP tunnel metadata manipulation"
968
+	depends on NET_CLS_ACT
969
+	help
897970 	  Say Y here to set/release ip tunnel metadata.
898971 
899972 	  If unsure, say N.
....@@ -901,25 +974,52 @@
901974 	  To compile this code as a module, choose M here: the
902975 	  module will be called act_tunnel_key.
903976 
977
+config NET_ACT_CT
978
+	tristate "connection tracking tc action"
979
+	depends on NET_CLS_ACT && NF_CONNTRACK && (!NF_NAT || NF_NAT) && NF_FLOW_TABLE
980
+	help
981
+	  Say Y here to allow sending the packets to conntrack module.
982
+
983
+	  If unsure, say N.
984
+
985
+	  To compile this code as a module, choose M here: the
986
+	  module will be called act_ct.
987
+
988
+config NET_ACT_GATE
989
+	tristate "Frame gate entry list control tc action"
990
+	depends on NET_CLS_ACT
991
+	help
992
+	  Say Y here to allow to control the ingress flow to be passed at
993
+	  specific time slot and be dropped at other specific time slot by
994
+	  the gate entry list.
995
+
996
+	  If unsure, say N.
997
+	  To compile this code as a module, choose M here: the
998
+	  module will be called act_gate.
999
+
9041000 config NET_IFE_SKBMARK
905
-        tristate "Support to encoding decoding skb mark on IFE action"
906
-        depends on NET_ACT_IFE
1001
+	tristate "Support to encoding decoding skb mark on IFE action"
1002
+	depends on NET_ACT_IFE
9071003 
9081004 config NET_IFE_SKBPRIO
909
-        tristate "Support to encoding decoding skb prio on IFE action"
910
-        depends on NET_ACT_IFE
1005
+	tristate "Support to encoding decoding skb prio on IFE action"
1006
+	depends on NET_ACT_IFE
9111007 
9121008 config NET_IFE_SKBTCINDEX
913
-        tristate "Support to encoding decoding skb tcindex on IFE action"
914
-        depends on NET_ACT_IFE
1009
+	tristate "Support to encoding decoding skb tcindex on IFE action"
1010
+	depends on NET_ACT_IFE
9151011 
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.
1012
+config NET_TC_SKB_EXT
1013
+	bool "TC recirculation support"
1014
+	depends on NET_CLS_ACT
1015
+	select SKB_EXTENSIONS
1016
+
1017
+	help
1018
+	  Say Y here to allow tc chain misses to continue in OvS datapath in
1019
+	  the correct recirc_id, and hardware chain misses to continue in
1020
+	  the correct chain in tc software datapath.
1021
+
1022
+	  Say N here if you won't be using tc<->ovs offload or tc chains offload.
9231023 
9241024 endif # NET_SCHED
9251025