diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-05-14 12:15:36 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-05-14 12:15:36 -0400 |
| commit | b86173d0ca012f419381c1112d5e49167f5cf914 (patch) | |
| tree | f8869eccfe78bbc9af76ba98e074b8b932f20f44 | |
| parent | 0c14650a47493f7a61b0753fcc771e5be3a3f4b9 (diff) | |
| download | kernel-b86173d0ca012f419381c1112d5e49167f5cf914.tar.gz kernel-b86173d0ca012f419381c1112d5e49167f5cf914.tar.xz kernel-b86173d0ca012f419381c1112d5e49167f5cf914.zip | |
switch NF_CONNTRACK to modular
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 56e9ba6a4..5e073bba9 100644 --- a/config-generic +++ b/config-generic @@ -849,7 +849,7 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y CONFIG_NETFILTER_ADVANCED=y -CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m diff --git a/kernel.spec b/kernel.spec index 6c00e563d..bb437aac3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1942,6 +1942,7 @@ fi used to host mockroots for mass rebuilds. - Drop IMA disabling patch, which is no longer necessary since it's run time (but unused) cost is now minimized. +- Switch NF_CONNTRACK to modular, it'll get autoloaded where necessary. * Sat May 14 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc7.git6.0 - Update to 2.6.39-rc7-git6 |