diff options
| author | Thomas Graf <tgraf@suug.ch> | 2015-07-29 13:52:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-29 23:03:10 -0700 |
| commit | dcc38c033b32b81b88b798f0c0b8453839ac996b (patch) | |
| tree | 21db1c580a5c2e8b034ac185a27bad7af14a76fa /net/openvswitch/Makefile | |
| parent | 1ce4b2f44df74bac91ff5ddcbf903572577005bc (diff) | |
openvswitch: Re-add CONFIG_OPENVSWITCH_VXLAN
This readds the config option CONFIG_OPENVSWITCH_VXLAN to avoid a
hard dependency of OVS on VXLAN. It moves the VXLAN config compat
code to vport-vxlan.c and allows compliation as a module.
Fixes: 614732eaa12d ("openvswitch: Use regular VXLAN net_device device")
Fixes: 2661371ace96 ("openvswitch: fix compilation when vxlan is a module")
Cc: Pravin B Shelar <pshelar@nicira.com>
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/Makefile')
| -rw-r--r-- | net/openvswitch/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 38e0e149c55e..6e1701de04d8 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -15,5 +15,6 @@ openvswitch-y := \ vport-internal_dev.o \ vport-netdev.o +obj-$(CONFIG_OPENVSWITCH_VXLAN)+= vport-vxlan.o obj-$(CONFIG_OPENVSWITCH_GENEVE)+= vport-geneve.o obj-$(CONFIG_OPENVSWITCH_GRE) += vport-gre.o |