diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-04 14:56:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-04 14:56:38 -0400 |
| commit | 21a180cda012e1f93e362dd4a9b0bfd3d8c92940 (patch) | |
| tree | 0e0d10baa3fdcd8ffbc6881076ff1695808dad9d /net/ipv4/Kconfig | |
| parent | c7d4426a98a5f6654cd0b4b33d9dab2e77192c18 (diff) | |
| parent | 51e97a12bef19b7e43199fc153cf9bd5f2140362 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/Kconfig
net/ipv4/tcp_timer.c
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 5462e2d147a6..e848e6c062cd 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -223,7 +223,7 @@ config NET_IPGRE_DEMUX | |||
| 223 | 223 | ||
| 224 | config NET_IPGRE | 224 | config NET_IPGRE |
| 225 | tristate "IP: GRE tunnels over IP" | 225 | tristate "IP: GRE tunnels over IP" |
| 226 | depends on NET_IPGRE_DEMUX | 226 | depends on (IPV6 || IPV6=n) && NET_IPGRE_DEMUX |
| 227 | help | 227 | help |
| 228 | Tunneling means encapsulating data of one protocol type within | 228 | Tunneling means encapsulating data of one protocol type within |
| 229 | another protocol and sending it over a channel that understands the | 229 | another protocol and sending it over a channel that understands the |
| @@ -419,7 +419,7 @@ config INET_XFRM_MODE_BEET | |||
| 419 | If unsure, say Y. | 419 | If unsure, say Y. |
| 420 | 420 | ||
| 421 | config INET_LRO | 421 | config INET_LRO |
| 422 | bool "Large Receive Offload (ipv4/tcp)" | 422 | tristate "Large Receive Offload (ipv4/tcp)" |
| 423 | default y | 423 | default y |
| 424 | ---help--- | 424 | ---help--- |
| 425 | Support for Large Receive Offload (ipv4/tcp). | 425 | Support for Large Receive Offload (ipv4/tcp). |