kernel: Compile in IPv6 and conntrack support.

These have been modules, but as we need them anyway, we should
compile them in.

diff --git a/kernel/config-generic b/kernel/config-generic
index 201c0b06ed7493d564d0f172ef3e1cafd11d3aa7..044a46c5c6e0ea95685197e62014f337af853cf4 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -374,7 +374,7 @@ CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
@@ -413,7 +413,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index d81d9888a19bc4a7ec83994aa75b4738b35163e4..c2e98d5982bae10ce27072145d5c4e1e1767d378 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.4.4
-release    = 2
+release    = 3
 thisapp    = linux-%{version}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>