xfrm: Make xfrm_state timer monotonic

[karo-tx-linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 37702491abe98eedd91738408851c56d3a8ea3a5..ee0213667272cc8eb5425af16921c69bee385311 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -244,7 +244,7 @@ config NETPRIO_CGROUP
          Cgroup subsystem for use in assigning processes to network priorities on
          a per-interface basis
 
-config NET_LL_RX_POLL
+config NET_RX_BUSY_POLL
        boolean
        default y
 
@@ -281,7 +281,7 @@ menu "Network testing"
 
 config NET_PKTGEN
        tristate "Packet Generator (USE WITH CAUTION)"
-       depends on PROC_FS
+       depends on INET && PROC_FS
        ---help---
          This module will inject preconfigured packets, at a configurable
          rate, out of a given interface.  It is used for network interface