summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMahesh Bandewar <maheshb@google.com>2014-11-26 21:13:45 -0800
committerDavid S. Miller <davem@davemloft.net>2014-11-29 20:53:05 -0800
commit265de6d19cdd56745bf2277f0bc81ba5109b8717 (patch)
tree6b529ab359a0b9b6c2fda1d7d4627e2fb42d1de0
parent60b7379dc5b1743427b031cca53e30860a38ada6 (diff)
downloadop-kernel-dev-265de6d19cdd56745bf2277f0bc81ba5109b8717.zip
op-kernel-dev-265de6d19cdd56745bf2277f0bc81ba5109b8717.tar.gz
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/Kconfig2
-rw-r--r--drivers/net/ipvlan/ipvlan.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b6d64f5..d6607ee 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 ab3e761..c44d29e 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>
OpenPOWER on IntegriCloud