summarylogtreecommitdiffstats
path: root/config.x86_64
diff options
context:
space:
mode:
authoryar2013-12-09 21:52:50 -0800
committeryar2015-07-03 16:58:31 -0700
commit7b37fc5815e46f9f4ee2d34a51732743cdab5883 (patch)
tree0a9d578358a65cba096398dcfb0935493b4583bd /config.x86_64
parent3c482eb92c188de8c2c2c48a878ccbf88aeca965 (diff)
downloadaur-7b37fc5815e46f9f4ee2d34a51732743cdab5883.tar.gz
enable ethernet bridging, to allow docker containers
Diffstat (limited to 'config.x86_64')
-rw-r--r--config.x86_649
1 files changed, 7 insertions, 2 deletions
diff --git a/config.x86_64 b/config.x86_64
index 5166953a114..62d8db93546 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.1-1 Kernel Configuration
+# Linux/x86 3.12.4-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -571,6 +571,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
#
# Core Netfilter Configuration
@@ -678,6 +679,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=y
CONFIG_NETFILTER_XT_MATCH_OWNER=y
CONFIG_NETFILTER_XT_MATCH_POLICY=y
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
CONFIG_NETFILTER_XT_MATCH_RATEEST=y
@@ -762,6 +764,7 @@ CONFIG_IP6_NF_SECURITY=y
CONFIG_NF_NAT_IPV6=y
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_IP_DCCP is not set
CONFIG_IP_SCTP=m
# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -774,7 +777,9 @@ CONFIG_SCTP_COOKIE_HMAC_SHA1=y
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_HAVE_NET_DSA=y
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set