ipv6: by default join ff01::1 and in case of forwarding ff01::2 and ff05:2

[pandora-kernel.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 30b48f5..5a1888b 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -209,7 +209,6 @@ source "net/ipx/Kconfig"
 source "drivers/net/appletalk/Kconfig"
 source "net/x25/Kconfig"
 source "net/lapb/Kconfig"
-source "net/wanrouter/Kconfig"
 source "net/phonet/Kconfig"
 source "net/ieee802154/Kconfig"
 source "net/mac802154/Kconfig"
@@ -218,6 +217,7 @@ source "net/dcb/Kconfig"
 source "net/dns_resolver/Kconfig"
 source "net/batman-adv/Kconfig"
 source "net/openvswitch/Kconfig"
+source "net/vmw_vsock/Kconfig"
 
 config RPS
        boolean
@@ -232,7 +232,7 @@ config RFS_ACCEL
 
 config XPS
        boolean
-       depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
+       depends on SMP && USE_GENERIC_SMP_HELPERS
        default y
 
 config NETPRIO_CGROUP