diff options
| author | Mahesh Bandewar <maheshb@google.com> | 2014-11-27 06:13:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-30 05:53:05 +0100 |
| commit | 265de6d19cdd56745bf2277f0bc81ba5109b8717 (patch) | |
| tree | 6b529ab359a0b9b6c2fda1d7d4627e2fb42d1de0 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-265de6d19cdd56745bf2277f0bc81ba5109b8717.tar.xz linux-265de6d19cdd56745bf2277f0bc81ba5109b8717.zip | |
ipvlan: ipvlan depends on INET and IPV6
This driver uses ip_out_local() and ip6_route_output() which are
defined only if CONFIG_INET and CONFIG_IPV6 are enabled respectively.
Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/ipvlan/ipvlan.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b6d64f546574..d6607ee9c855 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -148,6 +148,8 @@ config MACVTAP config IPVLAN tristate "IP-VLAN support" + depends on INET + depends on IPV6 ---help--- This allows one to create virtual devices off of a main interface and packets will be delivered based on the dest L3 (IPv6/IPv4 addr) diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h index ab3e7614ed71..c44d29eca6c0 100644 --- a/drivers/net/ipvlan/ipvlan.h +++ b/drivers/net/ipvlan/ipvlan.h @@ -23,8 +23,9 @@ #include <linux/if_vlan.h> #include <linux/ip.h> #include <linux/inetdevice.h> +#include <net/ip.h> +#include <net/ip6_route.h> #include <net/rtnetlink.h> -#include <net/gre.h> #include <net/route.h> #include <net/addrconf.h> |