diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-02-26 10:41:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-27 16:37:14 +0100 |
| commit | 7f897db37b76235d50151dfea7d543568d54535a (patch) | |
| tree | ab7597937810758dd1171bc2c67feb694c53f9bf | |
| parent | Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe... (diff) | |
| download | linux-7f897db37b76235d50151dfea7d543568d54535a.tar.xz linux-7f897db37b76235d50151dfea7d543568d54535a.zip | |
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: 94333fac44d1 ("ipvlan: drop ipv6 dependency")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d88b78a17440..08b85215c2be 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -149,6 +149,7 @@ config MACVTAP config IPVLAN tristate "IP-VLAN support" depends on INET + depends on IPV6 || !IPV6 depends on NETFILTER select NET_L3_MASTER_DEV ---help--- |