summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2013-08-20 10:48:15 -0700
committerJesse Gross <jesse@nicira.com>2013-08-23 16:43:07 -0700
commit3fa34de67861abfc4846ccec886ca549d46ae56c (patch)
treeb043c4686c6b40283b6900e19d8907b94ac59f84
parent2694838d608db701e5ed1e95d741cdbddd9aa864 (diff)
downloadlinux-3fa34de67861abfc4846ccec886ca549d46ae56c.tar.gz
linux-3fa34de67861abfc4846ccec886ca549d46ae56c.tar.bz2
linux-3fa34de67861abfc4846ccec886ca549d46ae56c.zip
openvswitch: check CONFIG_OPENVSWITCH_GRE in makefile
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>
-rw-r--r--net/openvswitch/Makefile5
-rw-r--r--net/openvswitch/vport-gre.c3
2 files changed, 4 insertions, 4 deletions
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 82e4ee54a44b..ea36e99089af 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -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
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c
index 493e9775dcda..21d5073e148e 100644
--- a/net/openvswitch/vport-gre.c
+++ b/net/openvswitch/vport-gre.c
@@ -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 */