diff options
Diffstat (limited to 'net/openvswitch/conntrack.h')
-rw-r--r-- | net/openvswitch/conntrack.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/openvswitch/conntrack.h b/net/openvswitch/conntrack.h index 399dfdd2c4f9..900dadd70974 100644 --- a/net/openvswitch/conntrack.h +++ b/net/openvswitch/conntrack.h | |||
@@ -17,10 +17,11 @@ | |||
17 | #include "flow.h" | 17 | #include "flow.h" |
18 | 18 | ||
19 | struct ovs_conntrack_info; | 19 | struct ovs_conntrack_info; |
20 | struct ovs_ct_limit_info; | ||
20 | enum ovs_key_attr; | 21 | enum ovs_key_attr; |
21 | 22 | ||
22 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) | 23 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) |
23 | void ovs_ct_init(struct net *); | 24 | int ovs_ct_init(struct net *); |
24 | void ovs_ct_exit(struct net *); | 25 | void ovs_ct_exit(struct net *); |
25 | bool ovs_ct_verify(struct net *, enum ovs_key_attr attr); | 26 | bool ovs_ct_verify(struct net *, enum ovs_key_attr attr); |
26 | int ovs_ct_copy_action(struct net *, const struct nlattr *, | 27 | int ovs_ct_copy_action(struct net *, const struct nlattr *, |
@@ -44,7 +45,7 @@ void ovs_ct_free_action(const struct nlattr *a); | |||
44 | #else | 45 | #else |
45 | #include <linux/errno.h> | 46 | #include <linux/errno.h> |
46 | 47 | ||
47 | static inline void ovs_ct_init(struct net *net) { } | 48 | static inline int ovs_ct_init(struct net *net) { return 0; } |
48 | 49 | ||
49 | static inline void ovs_ct_exit(struct net *net) { } | 50 | static inline void ovs_ct_exit(struct net *net) { } |
50 | 51 | ||
@@ -104,4 +105,8 @@ static inline void ovs_ct_free_action(const struct nlattr *a) { } | |||
104 | 105 | ||
105 | #define CT_SUPPORTED_MASK 0 | 106 | #define CT_SUPPORTED_MASK 0 |
106 | #endif /* CONFIG_NF_CONNTRACK */ | 107 | #endif /* CONFIG_NF_CONNTRACK */ |
108 | |||
109 | #if IS_ENABLED(CONFIG_NETFILTER_CONNCOUNT) | ||
110 | extern struct genl_family dp_ct_limit_genl_family; | ||
111 | #endif | ||
107 | #endif /* ovs_conntrack.h */ | 112 | #endif /* ovs_conntrack.h */ |