diff options
| author | Tejun Heo <tj@kernel.org> | 2015-12-07 17:38:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-08 22:02:33 -0500 |
| commit | 2a56a1fec290bf0bc4676bbf4efdb3744953a3e7 (patch) | |
| tree | c02ca93b96c4fa2c8aacf24f72f63d861794e567 /net/Kconfig | |
| parent | 297dbde19cf6a0ccb6fd4396c6220a5912ed61e8 (diff) | |
| download | linux-2a56a1fec290bf0bc4676bbf4efdb3744953a3e7.tar.bz2 | |
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
Introduce sock->sk_cgrp_data which is a struct sock_cgroup_data.
->sk_cgroup_prioidx and ->sk_classid are moved into it. The struct
and its accessors are defined in cgroup-defs.h. This is to prepare
for overloading the fields with a cgroup pointer.
This patch mostly performs equivalent conversions but the followings
are noteworthy.
* Equality test before updating classid is removed from
sock_update_classid(). This shouldn't make any noticeable
difference and a similar test will be implemented on the helper side
later.
* sock_update_netprioidx() now takes struct sock_cgroup_data and can
be moved to netprio_cgroup.h without causing include dependency
loop. Moved.
* The dummy version of sock_update_netprioidx() converted to a static
inline function while at it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/Kconfig b/net/Kconfig index 127da94ae25e..11f8c22af34d 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -250,9 +250,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 +265,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. |