diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-06 00:32:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-06 00:32:25 -0400 |
| commit | 45d9cc7c609680e921060d3eb4e399043eb5e4be (patch) | |
| tree | a4906c8cba2b6c2d116e7b72a71f9e1020b476cb /net/openvswitch/Makefile | |
| parent | c259c132ad284576ab44308d5d17ea6a16c971b5 (diff) | |
| parent | f5796684069e0c71c65bce6a6d4766114aec1396 (diff) | |
| download | lwn-45d9cc7c609680e921060d3eb4e399043eb5e4be.tar.gz lwn-45d9cc7c609680e921060d3eb4e399043eb5e4be.zip | |
Merge branch 'geneve'
Andy Zhou says:
====================
Add Geneve tunnel protocol support
This patch series adds kernel support for Geneve (Generic Network
Virtualization Encapsulation) based on Geneve IETF draft:
http://www.ietf.org/id/draft-gross-geneve-01.txt
Patch 1 implements Geneve tunneling protocol driver
Patch 2-6 adds openvswitch support for creating and using
Geneve tunnels by OVS user space.
v1->v2: Style fixes: use tab instead space for Kconfig
Patch 2-6 are reviewed by Pravin Shetty, add him to acked-by
Patch 6 was reviewed by Thomas Graf when commiting
to openvswitch.org, add him to acked-by.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/Makefile')
| -rw-r--r-- | net/openvswitch/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 3591cb5dae91..9a33a273c375 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -15,6 +15,10 @@ openvswitch-y := \ vport-internal_dev.o \ vport-netdev.o +ifneq ($(CONFIG_OPENVSWITCH_GENEVE),) +openvswitch-y += vport-geneve.o +endif + ifneq ($(CONFIG_OPENVSWITCH_VXLAN),) openvswitch-y += vport-vxlan.o endif |