Merge remote-tracking branch 'sound-asoc/for-next'

[karo-tx-linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 127da94ae25eb73e8ffd45e7e7dbc9e07d937033..174354618f8a65536c0657544ef16a9dee2d0ae5 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -48,6 +48,9 @@ config COMPAT_NETLINK_MESSAGES
 config NET_INGRESS
        bool
 
+config NET_EGRESS
+       bool
+
 menu "Networking options"
 
 source "net/packet/Kconfig"
@@ -250,9 +253,14 @@ config XPS
        depends on SMP
        default y
 
+config SOCK_CGROUP_DATA
+       bool
+       default n
+
 config CGROUP_NET_PRIO
        bool "Network priority cgroup"
        depends on CGROUPS
+       select SOCK_CGROUP_DATA
        ---help---
          Cgroup subsystem for use in assigning processes to network priorities on
          a per-interface basis.
@@ -260,6 +268,7 @@ config CGROUP_NET_PRIO
 config CGROUP_NET_CLASSID
        bool "Network classid cgroup"
        depends on CGROUPS
+       select SOCK_CGROUP_DATA
        ---help---
          Cgroup subsystem for use as general purpose socket classid marker that is
          being used in cls_cgroup and for netfilter matching.