Commit 7f897db3 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller

ipvlan: fix building with modular IPV6

We no longer depend on IPV6, but that now causes a link error with
CONFIG_IPV6=m and CONFIG_IPVLAN=y:

drivers/net/ipvlan/ipvlan_core.o: In function `ipvlan_queue_xmit':
ipvlan_core.c:(.text+0x1440): undefined reference to `ip6_route_output_flags'
drivers/net/ipvlan/ipvlan_core.o: In function `ipvlan_l3_rcv':
ipvlan_core.c:(.text+0x1818): undefined reference to `ip6_route_input_lookup'

This adds back the dependency on IPV6, with the option of building without
IPV6, but forcing IPVLAN to be a module when IPV6 is a module.

Fixes: 94333fac ("ipvlan: drop ipv6 dependency")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3808b519
...@@ -149,6 +149,7 @@ config MACVTAP ...@@ -149,6 +149,7 @@ config MACVTAP
config IPVLAN config IPVLAN
tristate "IP-VLAN support" tristate "IP-VLAN support"
depends on INET depends on INET
depends on IPV6 || !IPV6
depends on NETFILTER depends on NETFILTER
select NET_L3_MASTER_DEV select NET_L3_MASTER_DEV
---help--- ---help---
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment