aboutsummaryrefslogtreecommitdiff
path: root/net/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'net/Kconfig')
-rw-r--r--net/Kconfig17
1 files changed, 14 insertions, 3 deletions
diff --git a/net/Kconfig b/net/Kconfig
index d334678c0bd..d92afe4204d 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -89,8 +89,12 @@ config NETWORK_SECMARK
to nfmark, but designated for security purposes.
If you are unsure how to answer this question, answer N.
+config NET_PTP_CLASSIFY
+ def_bool n
+
config NETWORK_PHY_TIMESTAMPING
bool "Timestamping in PHY devices"
+ select NET_PTP_CLASSIFY
help
This allows timestamping of network packets by PHYs with
hardware timestamping capabilities. This option adds some
@@ -238,12 +242,19 @@ config XPS
depends on SMP
default y
-config NETPRIO_CGROUP
- tristate "Network priority cgroup"
+config CGROUP_NET_PRIO
+ bool "Network priority cgroup"
depends on CGROUPS
---help---
Cgroup subsystem for use in assigning processes to network priorities on
- a per-interface basis
+ a per-interface basis.
+
+config CGROUP_NET_CLASSID
+ boolean "Network classid cgroup"
+ depends on CGROUPS
+ ---help---
+ Cgroup subsystem for use as general purpose socket classid marker that is
+ being used in cls_cgroup and for netfilter matching.
config NET_RX_BUSY_POLL
boolean