Commit 5aae0d22 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller

[PKT_SCHED]: Actions are now available for all classifiers & Fix police Kconfig dependencies

Removes outdated comment and make action and old compat policer
mutually exclusive to reflect the code. Noted by Jamal Hadi Salim.
Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5ce2e25
...@@ -381,7 +381,6 @@ config NET_CLS_ACT ...@@ -381,7 +381,6 @@ config NET_CLS_ACT
---help--- ---help---
This option requires you have a new iproute2. It enables This option requires you have a new iproute2. It enables
tc extensions which can be used with tc classifiers. tc extensions which can be used with tc classifiers.
Only the u32 and fw classifiers are supported at the moment.
You MUST NOT turn this on if you dont have an update iproute2. You MUST NOT turn this on if you dont have an update iproute2.
config NET_ACT_POLICE config NET_ACT_POLICE
...@@ -392,13 +391,6 @@ config NET_ACT_POLICE ...@@ -392,13 +391,6 @@ config NET_ACT_POLICE
below to select a policer. below to select a policer.
You MUST NOT turn this on if you dont have an update iproute2. You MUST NOT turn this on if you dont have an update iproute2.
config NET_CLS_POLICE
bool "Traffic policing (needed for in/egress)"
depends on NET_CLS && NET_QOS && NET_ACT_POLICE!=y && NET_ACT_POLICE!=m
help
Say Y to support traffic policing (bandwidth limits). Needed for
ingress and egress rate limiting.
config NET_ACT_GACT config NET_ACT_GACT
tristate "generic Actions" tristate "generic Actions"
depends on NET_CLS_ACT depends on NET_CLS_ACT
...@@ -432,3 +424,11 @@ config NET_ACT_PEDIT ...@@ -432,3 +424,11 @@ config NET_ACT_PEDIT
---help--- ---help---
requires new iproute2 requires new iproute2
This allows for packets to be generically edited This allows for packets to be generically edited
config NET_CLS_POLICE
bool "Traffic policing (needed for in/egress)"
depends on NET_CLS && NET_QOS && NET_CLS_ACT!=y
help
Say Y to support traffic policing (bandwidth limits). Needed for
ingress and egress rate limiting.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment