summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-10-06 00:32:25 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-06 00:32:25 -0400
commit45d9cc7c609680e921060d3eb4e399043eb5e4be (patch)
treea4906c8cba2b6c2d116e7b72a71f9e1020b476cb /net/core
parentc259c132ad284576ab44308d5d17ea6a16c971b5 (diff)
parentf5796684069e0c71c65bce6a6d4766114aec1396 (diff)
downloadlinux-45d9cc7c609680e921060d3eb4e399043eb5e4be.tar.gz
linux-45d9cc7c609680e921060d3eb4e399043eb5e4be.tar.bz2
linux-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/core')
0 files changed, 0 insertions, 0 deletions