]> www.infradead.org Git - users/jedix/linux-maple.git/commit
openvswitch: Re-add CONFIG_OPENVSWITCH_VXLAN
authorVenkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Mon, 10 Jun 2019 03:24:50 +0000 (20:24 -0700)
committerBrian Maly <brian.maly@oracle.com>
Wed, 12 Jun 2019 15:15:33 +0000 (11:15 -0400)
commitfd124bdceaacbdc4d681351b39a58133614ef7d7
treeb5c1d1e9b42ede98c3a1a66d6a6c0bac9c83ae22
parentf727259c4519b56f8d9293ae73d13b687274854f
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.

Orabug: 29755932

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>
(cherry picked from commit dcc38c033b32b81b88b798f0c0b8453839ac996b)

Reviewed-by: Rama Nichanamatlu <rama.nichanamatlu@oracle.com>
Signed-off-by: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
net/openvswitch/vport-netdev.c

Signed-off-by: Brian Maly <brian.maly@oracle.com>
net/openvswitch/Kconfig
net/openvswitch/Makefile
net/openvswitch/vport-netdev.c
net/openvswitch/vport-netdev.h
net/openvswitch/vport-vxlan.c [new file with mode: 0644]