X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=net%2Fopenvswitch%2Fconntrack.h;h=43f5dd7a55774414aeb7aad8c0560db3e0596035;hb=f95b1064b30a59d93a8df65284b770a2d774040f;hp=3cb30667a7dcb83d0009a0f870f31e8dd72fccb7;hpb=6f0a2fc1feb19bd142961a39dc118e7e55418b3f;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

diff --git a/net/openvswitch/conntrack.h b/net/openvswitch/conntrack.h
index 3cb30667a7dc..43f5dd7a5577 100644
--- a/net/openvswitch/conntrack.h
+++ b/net/openvswitch/conntrack.h
@@ -19,7 +19,7 @@
 struct ovs_conntrack_info;
 enum ovs_key_attr;
 
-#if defined(CONFIG_OPENVSWITCH_CONNTRACK)
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
 void ovs_ct_init(struct net *);
 void ovs_ct_exit(struct net *);
 bool ovs_ct_verify(struct net *, enum ovs_key_attr attr);
@@ -82,5 +82,5 @@ static inline int ovs_ct_put_key(const struct sw_flow_key *key,
 }
 
 static inline void ovs_ct_free_action(const struct nlattr *a) { }
-#endif
+#endif /* CONFIG_NF_CONNTRACK */
 #endif /* ovs_conntrack.h */