Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (353 commits)
  [IPV6] ADDRCONF: Mobile IPv6 Home Address support.
  [IPV6] ADDRCONF: Allow non-DAD'able addresses.
  [IPV6] NDISC: Fix is_router flag setting.
  [IPV6] ADDRCONF: Convert addrconf_lock to RCU.
  [IPV6] NDISC: Add proxy_ndp sysctl.
  [IPV6] NDISC: Set per-entry is_router flag in Proxy NA.
  [IPV6] NDISC: Avoid updating neighbor cache for proxied address in receiving NA.
  [IPV6]: Don't forward packets to proxied link-local address.
  [IPV6] NDISC: Handle NDP messages to proxied addresses.
  [NETFILTER]: PPTP conntrack: fix another GRE keymap leak
  [NETFILTER]: PPTP conntrack: fix GRE keymap leak
  [NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types
  [NETFILTER]: PPTP conntrack: check call ID before changing state
  [NETFILTER]: PPTP conntrack: clean up debugging cruft
  [NETFILTER]: PPTP conntrack: consolidate header parsing
  [NETFILTER]: PPTP conntrack: consolidate header size checks
  [NETFILTER]: PPTP conntrack: simplify expectation handling
  [NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers
  [NETFILTER]: PPTP conntrack: fix header definitions
  [NETFILTER]: PPTP conntrack: remove more dead code
  ...

1 files changed, 44 insertions, 0 deletions

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 0ba06c0c5d39..a2d211da2aba 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -98,6 +98,15 @@ config INET6_IPCOMP
 
           If unsure, say Y.
 
+config IPV6_MIP6
+        bool "IPv6: Mobility (EXPERIMENTAL)"
+        depends on IPV6 && EXPERIMENTAL
+        select XFRM
+        ---help---
+          Support for IPv6 Mobility described in RFC 3775.
+
+          If unsure, say N.
+
 config INET6_XFRM_TUNNEL
         tristate
         select INET6_TUNNEL
@@ -127,6 +136,13 @@ config INET6_XFRM_MODE_TUNNEL
 
           If unsure, say Y.
 
+config INET6_XFRM_MODE_ROUTEOPTIMIZATION
+        tristate "IPv6: MIPv6 route optimization mode (EXPERIMENTAL)"
+        depends on IPV6 && EXPERIMENTAL
+        select XFRM
+        ---help---
+          Support for MIPv6 route optimization mode.
+
 config IPV6_TUNNEL
         tristate "IPv6: IPv6-in-IPv6 tunnel"
         select INET6_TUNNEL
@@ -136,3 +152,31 @@ config IPV6_TUNNEL
 
           If unsure, say N.
 
+config IPV6_SUBTREES
+        bool "IPv6: source address based routing"
+        depends on IPV6 && EXPERIMENTAL
+        ---help---
+          Enable routing by source address or prefix.
+
+          The destination address is still the primary routing key, so mixing
+          normal and source prefix specific routes in the same routing table
+          may sometimes lead to unintended routing behavior.  This can be
+          avoided by defining different routing tables for the normal and
+          source prefix specific routes.
+
+          If unsure, say N.
+
+config IPV6_MULTIPLE_TABLES
+        bool "IPv6: Multiple Routing Tables"
+        depends on IPV6 && EXPERIMENTAL
+        select FIB_RULES
+        ---help---
+          Support multiple routing tables.
+
+config IPV6_ROUTE_FWMARK
+        bool "IPv6: use netfilter MARK value as routing key"
+        depends on IPV6_MULTIPLE_TABLES && NETFILTER
+        ---help---
+          If you say Y here, you will be able to specify different routes for
+          packets with different mark values (see iptables(8), MARK target).
+