Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353571
b: refs/heads/master
c: f9ceb16
h: refs/heads/master
i:
  353569: e871822
  353567: ea0ec5c
v: v3
  • Loading branch information
Kees Cook committed Jan 11, 2013
1 parent 4a7cd97 commit d1fcdec
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44fbe92001d7aeca8f364142409dde3c57025be0
refs/heads/master: f9ceb16ec458710753697b8bfe7c9288867ab5ff
24 changes: 10 additions & 14 deletions trunk/net/ipv6/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,15 @@ config IPV6_ROUTER_PREF
If unsure, say N.

config IPV6_ROUTE_INFO
bool "IPv6: Route Information (RFC 4191) support (EXPERIMENTAL)"
depends on IPV6_ROUTER_PREF && EXPERIMENTAL
bool "IPv6: Route Information (RFC 4191) support"
depends on IPV6_ROUTER_PREF
---help---
This is experimental support of Route Information.

If unsure, say N.

config IPV6_OPTIMISTIC_DAD
bool "IPv6: Enable RFC 4429 Optimistic DAD (EXPERIMENTAL)"
depends on EXPERIMENTAL
bool "IPv6: Enable RFC 4429 Optimistic DAD"
---help---
This is experimental support for optimistic Duplicate
Address Detection. It allows for autoconfigured addresses
Expand Down Expand Up @@ -105,8 +104,7 @@ config INET6_IPCOMP
If unsure, say Y.

config IPV6_MIP6
tristate "IPv6: Mobility (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "IPv6: Mobility"
select XFRM
---help---
Support for IPv6 Mobility described in RFC 3775.
Expand Down Expand Up @@ -150,8 +148,7 @@ config INET6_XFRM_MODE_BEET
If unsure, say Y.

config INET6_XFRM_MODE_ROUTEOPTIMIZATION
tristate "IPv6: MIPv6 route optimization mode (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "IPv6: MIPv6 route optimization mode"
select XFRM
---help---
Support for MIPv6 route optimization mode.
Expand All @@ -171,8 +168,8 @@ config IPV6_SIT
Saying M here will produce a module called sit. If unsure, say Y.

config IPV6_SIT_6RD
bool "IPv6: IPv6 Rapid Deployment (6RD) (EXPERIMENTAL)"
depends on IPV6_SIT && EXPERIMENTAL
bool "IPv6: IPv6 Rapid Deployment (6RD)"
depends on IPV6_SIT
default n
---help---
IPv6 Rapid Deployment (6rd; draft-ietf-softwire-ipv6-6rd) builds upon
Expand Down Expand Up @@ -219,7 +216,6 @@ config IPV6_GRE

config IPV6_MULTIPLE_TABLES
bool "IPv6: Multiple Routing Tables"
depends on EXPERIMENTAL
select FIB_RULES
---help---
Support multiple routing tables.
Expand All @@ -239,8 +235,8 @@ config IPV6_SUBTREES
If unsure, say N.

config IPV6_MROUTE
bool "IPv6: multicast routing (EXPERIMENTAL)"
depends on IPV6 && EXPERIMENTAL
bool "IPv6: multicast routing"
depends on IPV6
---help---
Experimental support for IPv6 multicast forwarding.
If unsure, say N.
Expand All @@ -260,7 +256,7 @@ config IPV6_MROUTE_MULTIPLE_TABLES
If unsure, say N.

config IPV6_PIMSM_V2
bool "IPv6: PIM-SM version 2 support (EXPERIMENTAL)"
bool "IPv6: PIM-SM version 2 support"
depends on IPV6_MROUTE
---help---
Support for IPv6 PIM multicast routing protocol PIM-SMv2.
Expand Down

0 comments on commit d1fcdec

Please sign in to comment.