git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull fluff into release branch
[sfrench/cifs-2.6.git]
/
net
/
ipv6
/
Kconfig
diff --git
a/net/ipv6/Kconfig
b/net/ipv6/Kconfig
index deb4101a2a81d30f3c4abcdd33c60c1da3b51ef9..79682efb14beebd08cc875eadb3bea42b83f65cf 100644
(file)
--- a/
net/ipv6/Kconfig
+++ b/
net/ipv6/Kconfig
@@
-156,6
+156,7
@@
config INET6_XFRM_MODE_ROUTEOPTIMIZATION
config IPV6_SIT
tristate "IPv6: IPv6-in-IPv4 tunnel (SIT driver)"
depends on IPV6
+ select INET_TUNNEL
default y
---help---
Tunneling means encapsulating data of one protocol type within