Commit 3fa34de6 authored by Cong Wang's avatar Cong Wang Committed by Jesse Gross
Browse files

openvswitch: check CONFIG_OPENVSWITCH_GRE in makefile 



Cc: Jesse Gross <jesse@nicira.com>
Cc: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent 2694838d

net/openvswitch/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -10,10 +10,13 @@ openvswitch-y := \ 
	dp_notify.o \

	flow.o \

	vport.o \

	vport-gre.o \

	vport-internal_dev.o \

	vport-netdev.o



ifneq ($(CONFIG_OPENVSWITCH_VXLAN),)

openvswitch-y += vport-vxlan.o

endif



ifneq ($(CONFIG_OPENVSWITCH_GRE),)

openvswitch-y += vport-gre.o

endif

net/openvswitch/vport-gre.c

+0 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
 * 02110-1301, USA

 */



#ifdef CONFIG_OPENVSWITCH_GRE

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/if.h>
@@ -271,5 +270,3 @@ const struct vport_ops ovs_gre_vport_ops = { 
	.get_name	= gre_get_name,

	.send		= gre_tnl_send,

};
 


#endif /* OPENVSWITCH_GRE */