ipmi: fix timeout calculation when bmc is disconnected

[firefly-linux-kernel-4.4.55.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index b50dacc072f0026416490e534f7f6c14fa624724..d334678c0bd8706d7c3efb6c0f35d0d62102c360 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -220,10 +220,11 @@ source "net/openvswitch/Kconfig"
 source "net/vmw_vsock/Kconfig"
 source "net/netlink/Kconfig"
 source "net/mpls/Kconfig"
+source "net/hsr/Kconfig"
 
 config RPS
        boolean
-       depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
+       depends on SMP && SYSFS
        default y
 
 config RFS_ACCEL
@@ -234,7 +235,7 @@ config RFS_ACCEL
 
 config XPS
        boolean
-       depends on SMP && USE_GENERIC_SMP_HELPERS
+       depends on SMP
        default y
 
 config NETPRIO_CGROUP