Patchwork [net-next,1/2] openvswitch: Allow GRE ports when compiled as a module.

login
register
mail settings
Submitter Jesse Gross
Date June 21, 2013, 11:17 p.m.
Message ID <1371856631-47807-1-git-send-email-jesse@nicira.com>
Download mbox | patch
Permalink /patch/253321/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Jesse Gross - June 21, 2013, 11:17 p.m.
Open vSwitch GRE tunnels are currently only enabled if the GRE
datapath code is statically compiled in but it should be possible
to use it as a module as well.

CC: Pravin Shelar <pshelar@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---
 net/openvswitch/vport-gre.c | 2 +-
 net/openvswitch/vport.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
David Miller - June 24, 2013, 7:19 a.m.
From: Jesse Gross <jesse@nicira.com>
Date: Fri, 21 Jun 2013 16:17:10 -0700

> Open vSwitch GRE tunnels are currently only enabled if the GRE
> datapath code is statically compiled in but it should be possible
> to use it as a module as well.
> 
> CC: Pravin Shelar <pshelar@nicira.com>
> Signed-off-by: Jesse Gross <jesse@nicira.com>

Pravin's copy of this same exact patch hit my inbox first, so I applied
his.  Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c
index 3a8d190..943e5c4 100644
--- a/net/openvswitch/vport-gre.c
+++ b/net/openvswitch/vport-gre.c
@@ -16,7 +16,7 @@ 
  * 02110-1301, USA
  */
 
-#ifdef CONFIG_NET_IPGRE_DEMUX
+#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX)
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/if.h>
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index f52dfb9..ba81294 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -39,7 +39,7 @@  static const struct vport_ops *vport_ops_list[] = {
 	&ovs_netdev_vport_ops,
 	&ovs_internal_vport_ops,
 
-#ifdef CONFIG_NET_IPGRE_DEMUX
+#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX)
 	&ovs_gre_vport_ops,
 #endif
 };