summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2010-10-03 15:37:42 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-03 21:46:23 -0700
commitc5d3557103f8bef81d7a150ab9cc970099cd58a2 (patch)
tree2806f87647db3cf9e37598f4bbe8386abd7300ec
parent482964e56e1320cb7952faa1932d8ecf59c4bf75 (diff)
downloadlinux-c5d3557103f8bef81d7a150ab9cc970099cd58a2.tar.bz2
Revert "ipv4: Make INET_LRO a bool instead of tristate."
This reverts commit e81963b180ac502fda0326edf059b1e29cdef1a2. LRO is now deprecated in favour of GRO, and only a few drivers use it, so it is desirable to build it as a module in distribution kernels. The original change to prevent building it as a module was made in an attempt to avoid the case where some dependents are set to y and some to m, and INET_LRO can be set to m rather than y. However, the Kconfig system will reliably set INET_LRO=y in this case. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 72380a30d1c8..7cd7760144f7 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -413,7 +413,7 @@ config INET_XFRM_MODE_BEET
If unsure, say Y.
config INET_LRO
- bool "Large Receive Offload (ipv4/tcp)"
+ tristate "Large Receive Offload (ipv4/tcp)"
default y
---help---
Support for Large Receive Offload (ipv4/tcp).