diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-30 15:27:34 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-30 15:27:34 +0100 |
| commit | 2875c0ee841e74e272e832fdfb91dc8c73013ccd (patch) | |
| tree | 20d0ec969f51b9eb3410090f64a1fc6e092b9fb0 /target/linux/config | |
| parent | 86ada69f32491de2415d237605370e7f4e8d5e01 (diff) | |
| parent | 47e50c10a8bb626f3366912bc4691bd5fbddea45 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.misc | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netfilter | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.network | 15 |
3 files changed, 17 insertions, 4 deletions
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index bed0ac451..f48866460 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -68,7 +68,7 @@ config ADK_KPACKAGE_KMOD_PPDEV Kernel module for userland parallel port access config ADK_KPACKAGE_KMOD_FW_LOADER - prompt "kmod-fw-loader.................. userspace firmware loading support" + prompt "kmod-fw-loader.................... userspace firmware loading support" tristate default n help @@ -76,7 +76,7 @@ config ADK_KPACKAGE_KMOD_FW_LOADER loading of external firmware files. config ADK_KPACKAGE_KMOD_EEPROM_93CX6 - prompt "kmod-eeprom-93cx6................ 93cx6 eeprom support" + prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support" tristate default n help diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index ef2e1285a..79acfe564 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -352,7 +352,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER config ADK_KPACKAGE_KMOD_NF_NAT tristate 'Full NAT' - depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES + depends on ADK_KPACKAGE_KMOD_NF_IP_IPTABLES help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index bbee048e7..0f38986d5 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -66,7 +66,7 @@ config ADK_KPACKAGE_KMOD_ATM_BR2684 help config ADK_KPACKAGE_KMOD_BRIDGE - prompt "kmod-net-bridge................... 802.1d Ethernet Bridging" + prompt "kmod-bridge....................... 802.1d Ethernet Bridging" tristate select ADK_KERNEL_LLC default n @@ -91,6 +91,19 @@ config ADK_KPACKAGE_KMOD_BRIDGE Enabling arptables support when bridging will let arptables see bridged ARP traffic in the arptables FORWARD chain. +config ADK_KPACKAGE_KMOD_VLAN_8021Q + prompt "kmod-vlan......................... 802.1q VLAN support" + tristate + default n + help + Select this and you will be able to create 802.1Q VLAN interfaces + on your ethernet interfaces. 802.1Q VLAN supports almost + everything a regular ethernet interface does, including + firewalling, bridging, and of course IP traffic. You will need + the 'vconfig' tool from the VLAN project in order to effectively + use VLANs. See the VLAN web page for more information: + <http://www.candelatech.com/~greear/vlan.html> + config ADK_KPACKAGE_KMOD_INET_TUNNEL tristate default n |