diff options
| author | Deepak Saxena <dsaxena@laptop.org> | 2008-08-01 00:43:40 -0700 |
|---|---|---|
| committer | Deepak Saxena <dsaxena@laptop.org> | 2008-08-01 00:43:40 -0700 |
| commit | 4cb5af5103d70b9989d5e520fc869e9c0669df2b (patch) | |
| tree | 5fac4192c8fe7f53c93b9c0bfa2eeee3d1783349 /arch | |
| parent | 85e8ce3752b87a20b329356e624c37a253586622 (diff) | |
| download | lwn-4cb5af5103d70b9989d5e520fc869e9c0669df2b.tar.gz lwn-4cb5af5103d70b9989d5e520fc869e9c0669df2b.zip | |
Enable network bridging for use with HostAP and libertastf
As per http://wiki.laptop.org/go/Libertas_Thinfirmware_HOWTO
and http://wiki.laptop.org/go/XO_as_AP, this patch enables
CONFIG_BRIDGE to allow for use of the XO with the libertastf
driver (http://wireless.kernel.org/en/users/Drivers/libertastf)
as an access point and bridge to a wired network.
Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/configs/olpc_defconfig | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/x86/configs/olpc_defconfig b/arch/x86/configs/olpc_defconfig index 0180f1dbd54c..1b3002af60f7 100644 --- a/arch/x86/configs/olpc_defconfig +++ b/arch/x86/configs/olpc_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.25.11 -# Tue Jul 22 12:24:16 2008 +# Linux kernel version: 2.6.25.13 +# Thu Jul 31 23:58:24 2008 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -406,6 +406,7 @@ CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y # # Core Netfilter Configuration @@ -454,6 +455,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m # CONFIG_NETFILTER_XT_MATCH_OWNER is not set # CONFIG_NETFILTER_XT_MATCH_POLICY is not set # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set @@ -506,13 +508,19 @@ CONFIG_NF_NAT_IRC=m # CONFIG_NF_CONNTRACK_IPV6 is not set # CONFIG_IP6_NF_QUEUE is not set # CONFIG_IP6_NF_IPTABLES is not set + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -# CONFIG_BRIDGE is not set +CONFIG_BRIDGE=m # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set +CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set |