X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/eddab67494c78e80c717b1ac80d2ac7f2c495a4a..94b42bc235621ab72c23113394fb89717508ffe5:/openwrt/target/linux/Config.in

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index ba8e4113c..0c8d38a36 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -188,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_IPTABLES_V6
+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_IP6TABLES
 	prompt "kmod-ip6tables.................... Kernel modules for ip6tables"
 	tristate
 	default m
@@ -405,18 +525,18 @@ config BR2_PACKAGE_KMOD_NET_AIRO
 	  and Cisco proprietary API, so both the Linux Wireless Tools and the 
 	  Cisco Linux utilities can be used to configure the card.
 
-config BR2_PACKAGE_KMOD_E100
+config BR2_PACKAGE_KMOD_NET_E100
 	prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
 	tristate
 	default m
 	help
 	  Intel(R) PRO/100+ cards kernel support
 
-config BR2_PACKAGE_KMOD_B44
+config BR2_PACKAGE_KMOD_NET_B44
 	prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
 	tristate
-	default m
 	default y if BR2_LINUX_2_6_BRCM
+	default m
 	help
 	  Free driver for Broadcom Ethernet chipsets (without switch support)
 
@@ -514,6 +634,12 @@ config BR2_PACKAGE_KMOD_PCMCIA_CORE
 	tristate
 	default m
 
+config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
+	prompt   "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support"
+	tristate
+	default m
+	depends BR2_PACKAGE_KMOD_PCMCIA_CORE
+
 comment "USB support"
 
 config BR2_PACKAGE_KMOD_USB