diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-06-20 15:08:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-24 00:16:46 -0700 |
| commit | 479b1a5825f68f9b63d26a13ca25ffbb7d2617ad (patch) | |
| tree | b7f5f392a74f685eabf5244f1216e754de909dcd | |
| parent | 7c77602f57da3f526fa7cf7bb02c49d3397c0729 (diff) | |
| download | op-kernel-dev-479b1a5825f68f9b63d26a13ca25ffbb7d2617ad.zip op-kernel-dev-479b1a5825f68f9b63d26a13ca25ffbb7d2617ad.tar.gz | |
openvswitch: Use correct config guard.
This bug was introduced by commit aa310701e787087
(openvswitch: Add gre tunnel support.)
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/openvswitch/vport-gre.c | 2 | ||||
| -rw-r--r-- | net/openvswitch/vport.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 }; |
