backport netfilter modules split introduced by changeset:2083 in whiterussian (fix...

[openwrt.git] / target / linux / Config.in

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 443dca4..cd7feba 100644 (file)
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -36,6 +36,14 @@ config BR2_LINUX_2_6_BRCM
          Build firmware images for Broadcom based routers
          (e.g. Netgear WGT634u)
 
+config BR2_LINUX_2_6_X86
+       bool "Support for x86 boards [2.6]"
+       default n
+       depends BR2_i386
+       help
+         Build firmware images for x86 based boards
+         (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
+
 endchoice
        
 comment "Device specific modules"
@@ -56,6 +64,15 @@ config BR2_PACKAGE_KMOD_BRCM_WL
        help
          Proprietary driver for Broadcom Wireless chipsets
 
+config BR2_PACKAGE_KMOD_BRCM_WL2
+       prompt "kmod-brcm-wl2..................... Broadcom Wireless Network Driver (new)"
+       tristate
+       depends BR2_LINUX_2_4_BRCM
+       default m
+       help
+         Proprietary driver for Broadcom Wireless chipsets
+         New version with Multi-BSS capability
+
 config BR2_PACKAGE_KMOD_CPMAC
        prompt "kmod-cpmac........................ AR7 CPMAC Network Driver"
        tristate
@@ -171,21 +188,141 @@ config BR2_PACKAGE_KMOD_EBTABLES
        help
          Kernel modules for bridge firewalling
 
-config BR2_PACKAGE_KMOD_IPTABLES_V4
-       prompt "kmod-iptables..................... Basic set of kernel modules for iptables"
+config BR2_PACKAGE_KMOD_IPTABLES
+       prompt "kmod-iptables..................... Core Netfilter modules for IPv4 firewalling"
        tristate
        default y
        help
          Kernel modules for IPv4 firewalling
 
-config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
-       prompt "kmod-iptables-extra............... Extra modules for iptables"
+config BR2_PACKAGE_KMOD_IPTABLES_EXTRA
+       prompt "kmod-iptables-extra............... Extra Netfilter modules for IPv4 firewalling (meta-package)"
        tristate
        default m
+       select BR2_PACKAGE_KMOD_IPT_CONNTRACK
+       select BR2_PACKAGE_KMOD_IPT_FILTER
+       select BR2_PACKAGE_KMOD_IPT_IPOPT
+       select BR2_PACKAGE_KMOD_IPT_IPSEC
+       select BR2_PACKAGE_KMOD_IPT_NAT
+       select BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
+       select BR2_PACKAGE_KMOD_IPT_QUEUE
+       select BR2_PACKAGE_KMOD_IPT_ULOG
+       select BR2_PACKAGE_KMOD_IPT_EXTRA
        help
-         Extra kernel modules for IPv4 firewalling
+         Extra Netfilter kernel modules for IPv4 firewalling (meta-package)
+
+config BR2_PACKAGE_KMOD_IPT_CONNTRACK
+       prompt "kmod-ipt-conntrack................ Netfilter modules for connection tracking"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) kernel modules for connection tracking
+
+         Includes:
+           * ipt_conntrack
+           * ipt_helper
+           * ipt_connmark/CONNMARK
+
+config BR2_PACKAGE_KMOD_IPT_FILTER
+       prompt "kmod-ipt-filter................... Netfilter modules for packet content inspection"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) kernel modules for packet content inspection
+
+         Includes:
+           * ipt_ipp2p
+           * ipt_layer7
+
+config BR2_PACKAGE_KMOD_IPT_IPOPT
+       prompt "kmod-ipt-ipopt.................... Netfilter modules for matching/changing IP packet options"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) kernel modules for matching/changing IP packet options
+         
+         Includes:
+           * ipt_dscp/DSCP
+           * ipt_ecn/ECN
+           * ipt_length
+           * ipt_mac
+           * ipt_tos/TOS
+           * ipt_tcpmms
+           * ipt_ttl/TTL
+           * ipt_unclean
+
+config BR2_PACKAGE_KMOD_IPT_IPSEC
+       prompt "kmod-ipt-ipsec.................... Netfilter modules for matching IPsec packets"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) kernel modules for matching IPsec packets
+         
+         Includes:
+           * ipt_ah
+           * ipt_esp
+
+config BR2_PACKAGE_KMOD_IPT_NAT
+       prompt "kmod-ipt-nat...................... Netfilter modules for different NAT targets"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) kernel modules for different NAT targets
+
+         Includes: 
+           * ipt_REDIRECT
+
+config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
+       prompt "kmod-ipt-nat-extra................ Extra Netfilter NAT modules for special protocols"
+       tristate
+       default m
+       help
+         Extra Netfilter (IPv4) NAT kernel modules for special protocols
+         
+         Includes:
+           * ip_conntrack_amanda
+           * ip_conntrack_proto_gre
+           * ip_nat_proto_gre
+           * ip_conntrack_pptp
+           * ip_nat_pptp
+           * ip_nat_snmp_basic
+           * ip_conntrack_tftp
+
+config BR2_PACKAGE_KMOD_IPT_QUEUE
+       prompt "kmod-ipt-queue.................... Netfilter module for user-space packet queueing"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) module for user-space packet queueing
+         
+         Includes:
+           * ipt_QUEUE
+
+config BR2_PACKAGE_KMOD_IPT_ULOG
+       prompt "kmod-ipt-ulog..................... Netfilter module for user-space packet logging"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) module for user-space packet logging
+         
+         Includes:
+           * ipt_ULOG
+
+config BR2_PACKAGE_KMOD_IPT_EXTRA
+       prompt "kmod-ipt-extra.................... Other extra Netfilter modules"
+       tristate
+       default m
+       help
+         Other extra Netfilter (IPv4) kernel modules
+
+         Includes:
+           * ipt_limit
+           * ipt_owner
+           * ipt_physdev
+           * ipt_pkttype
+           * ipt_recent
 
-config BR2_PACKAGE_KMOD_IPTABLES_V6
+config BR2_PACKAGE_KMOD_IP6TABLES
        prompt "kmod-ip6tables.................... Kernel modules for ip6tables"
        tristate
        default m