forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

openvswitch: check CONFIG_OPENVSWITCH_GRE in makefile

Browse source 
Cc: Jesse Gross <jesse@nicira.com>
Cc: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
This commit is contained in:
Cong Wang 2013-08-20 10:48:15 -07:00 • committed by Jesse Gross
commit 3fa34de678
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
net/openvswitch/Makefile
View file

@ -10,10 +10,13 @@ openvswitch-y := \
dp_notify.o \ dp_notify.o \
flow.o \ flow.o \
vport.o \ vport.o \
vport-gre.o \
vport-internal_dev.o \ vport-internal_dev.o \
vport-netdev.o vport-netdev.o
ifneq ($(CONFIG_OPENVSWITCH_VXLAN),) ifneq ($(CONFIG_OPENVSWITCH_VXLAN),)
openvswitch-y += vport-vxlan.o openvswitch-y += vport-vxlan.o
endif endif
ifneq ($(CONFIG_OPENVSWITCH_GRE),)
openvswitch-y += vport-gre.o
endif

3
net/openvswitch/vport-gre.c
View file

@ -16,7 +16,6 @@
* 02110-1301, USA * 02110-1301, USA
*/ */
#ifdef CONFIG_OPENVSWITCH_GRE
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/if.h> #include <linux/if.h>
@ -271,5 +270,3 @@ const struct vport_ops ovs_gre_vport_ops = {
.get_name = gre_get_name, .get_name = gre_get_name,
.send = gre_tnl_send, .send = gre_tnl_send,
}; };
#endif /* OPENVSWITCH_GRE */