diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-15 23:59:18 -0400 |
---|---|---|
committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-02 21:06:01 -0400 |
commit | de357cc01334a468e4d5b7ba66a17b0d3ca9d63e (patch) | |
tree | 8cae8de67f575dac77c265bf061f46820d6b8c68 /net/ipv6/Kconfig | |
parent | 52eeeb8481d705e61e2e9aae974e7799a93783e9 (diff) |
[IPV6] NDISC: Don't rely on node-type hint from L2 unless required.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net/ipv6/Kconfig')
-rw-r--r-- | net/ipv6/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 47263e45bacb..7d2e7f0941ac 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
@@ -168,6 +168,7 @@ config IPV6_SIT | |||
168 | tristate "IPv6: IPv6-in-IPv4 tunnel (SIT driver)" | 168 | tristate "IPv6: IPv6-in-IPv4 tunnel (SIT driver)" |
169 | depends on IPV6 | 169 | depends on IPV6 |
170 | select INET_TUNNEL | 170 | select INET_TUNNEL |
171 | select IPV6_NDISC_NODETYPE | ||
171 | default y | 172 | default y |
172 | ---help--- | 173 | ---help--- |
173 | Tunneling means encapsulating data of one protocol type within | 174 | Tunneling means encapsulating data of one protocol type within |
@@ -178,6 +179,9 @@ config IPV6_SIT | |||
178 | 179 | ||
179 | Saying M here will produce a module called sit.ko. If unsure, say Y. | 180 | Saying M here will produce a module called sit.ko. If unsure, say Y. |
180 | 181 | ||
182 | config IPV6_NDISC_NODETYPE | ||
183 | bool | ||
184 | |||
181 | config IPV6_TUNNEL | 185 | config IPV6_TUNNEL |
182 | tristate "IPv6: IP-in-IPv6 tunnel (RFC2473)" | 186 | tristate "IPv6: IP-in-IPv6 tunnel (RFC2473)" |
183 | select INET6_TUNNEL | 187 | select INET6_TUNNEL |