net: Re-enable CGROUP_NET_PRIO as builtin (it can no longer be modular)
svn path=/dists/trunk/linux/; revision=21580
This commit is contained in:
parent
dcb40eedc6
commit
3bc821bbfb
|
@ -10,6 +10,7 @@ linux (3.16~rc5-1~exp2) experimental; urgency=medium
|
||||||
|
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
* [x86] wireless: Enable R8192EE as module (Closes: #755310)
|
* [x86] wireless: Enable R8192EE as module (Closes: #755310)
|
||||||
|
* net: Re-enable CGROUP_NET_PRIO as builtin
|
||||||
|
|
||||||
-- Aurelien Jarno <aurel32@debian.org> Wed, 16 Jul 2014 18:07:48 +0200
|
-- Aurelien Jarno <aurel32@debian.org> Wed, 16 Jul 2014 18:07:48 +0200
|
||||||
|
|
||||||
|
|
|
@ -5063,7 +5063,7 @@ CONFIG_NETFILTER=y
|
||||||
# CONFIG_NETFILTER_DEBUG is not set
|
# CONFIG_NETFILTER_DEBUG is not set
|
||||||
CONFIG_NETFILTER_ADVANCED=y
|
CONFIG_NETFILTER_ADVANCED=y
|
||||||
CONFIG_BRIDGE_NETFILTER=y
|
CONFIG_BRIDGE_NETFILTER=y
|
||||||
CONFIG_CGROUP_NET_PRIO=m
|
CONFIG_CGROUP_NET_PRIO=y
|
||||||
CONFIG_BPF_JIT=y
|
CONFIG_BPF_JIT=y
|
||||||
CONFIG_NET_PKTGEN=m
|
CONFIG_NET_PKTGEN=m
|
||||||
# CONFIG_NET_TCPPROBE is not set
|
# CONFIG_NET_TCPPROBE is not set
|
||||||
|
|
Loading…
Reference in New Issue