Patchwork [net-next] openvswitch: Use correct config guard.

login
register
mail settings
Submitter Pravin B Shelar
Date June 20, 2013, 10:08 p.m.
Message ID <1371766094-3901-1-git-send-email-pshelar@nicira.com>
Download mbox | patch
Permalink /patch/253084/
State Accepted
Delegated to: David Miller
Headers show

Comments

Pravin B Shelar - June 20, 2013, 10:08 p.m.
This bug was introduced by commit aa310701e787087
(openvswitch: Add gre tunnel support.)

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
---
 net/openvswitch/vport-gre.c |    2 +-
 net/openvswitch/vport.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
 };