OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: dts: am437x-gp-evm: Add DCAN sleep pins
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
net
/
openvswitch
/
conntrack.h
diff --git
a/net/openvswitch/conntrack.h
b/net/openvswitch/conntrack.h
index
3cb3066
..
43f5dd7
100644
(file)
--- a/
net/openvswitch/conntrack.h
+++ b/
net/openvswitch/conntrack.h
@@
-19,7
+19,7
@@
struct ovs_conntrack_info;
enum ovs_key_attr;
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);
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) { }
}
static inline void ovs_ct_free_action(const struct nlattr *a) { }
-#endif
+#endif
/* CONFIG_NF_CONNTRACK */
#endif /* ovs_conntrack.h */
#endif /* ovs_conntrack.h */