geneve: Consolidate Geneve functionality in single module.
authorPravin B Shelar <pshelar@nicira.com>
Thu, 27 Aug 2015 06:46:54 +0000 (23:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 27 Aug 2015 22:42:48 +0000 (15:42 -0700)
geneve_core module handles send and receive functionality.
This way OVS could use the Geneve API. Now with use of
tunnel meatadata mode OVS can directly use Geneve netdevice.
So there is no need for separate module for Geneve. Following
patch consolidates Geneve protocol processing in single module.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Reviewed-by: Jesse Gross <jesse@nicira.com>
Acked-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/Kconfig
drivers/net/geneve.c
include/net/geneve.h
net/ipv4/Kconfig
net/ipv4/Makefile
net/ipv4/geneve_core.c [deleted file]

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/geneve_core.c
Simple merge