diff options
author | Mahesh Bandewar <maheshb@google.com> | 2014-11-27 00:13:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-29 23:53:05 -0500 |
commit | 265de6d19cdd56745bf2277f0bc81ba5109b8717 (patch) | |
tree | 6b529ab359a0b9b6c2fda1d7d4627e2fb42d1de0 | |
parent | 60b7379dc5b1743427b031cca53e30860a38ada6 (diff) |
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 | |||
148 | 148 | ||
149 | config IPVLAN | 149 | config IPVLAN |
150 | tristate "IP-VLAN support" | 150 | tristate "IP-VLAN support" |
151 | depends on INET | ||
152 | depends on IPV6 | ||
151 | ---help--- | 153 | ---help--- |
152 | This allows one to create virtual devices off of a main interface | 154 | This allows one to create virtual devices off of a main interface |
153 | and packets will be delivered based on the dest L3 (IPv6/IPv4 addr) | 155 | 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 @@ | |||
23 | #include <linux/if_vlan.h> | 23 | #include <linux/if_vlan.h> |
24 | #include <linux/ip.h> | 24 | #include <linux/ip.h> |
25 | #include <linux/inetdevice.h> | 25 | #include <linux/inetdevice.h> |
26 | #include <net/ip.h> | ||
27 | #include <net/ip6_route.h> | ||
26 | #include <net/rtnetlink.h> | 28 | #include <net/rtnetlink.h> |
27 | #include <net/gre.h> | ||
28 | #include <net/route.h> | 29 | #include <net/route.h> |
29 | #include <net/addrconf.h> | 30 | #include <net/addrconf.h> |
30 | 31 | ||