aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch/conntrack.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/openvswitch/conntrack.h')
-rw-r--r--net/openvswitch/conntrack.h9
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
19struct ovs_conntrack_info; 19struct ovs_conntrack_info;
20struct ovs_ct_limit_info;
20enum ovs_key_attr; 21enum ovs_key_attr;
21 22
22#if IS_ENABLED(CONFIG_NF_CONNTRACK) 23#if IS_ENABLED(CONFIG_NF_CONNTRACK)
23void ovs_ct_init(struct net *); 24int ovs_ct_init(struct net *);
24void ovs_ct_exit(struct net *); 25void ovs_ct_exit(struct net *);
25bool ovs_ct_verify(struct net *, enum ovs_key_attr attr); 26bool ovs_ct_verify(struct net *, enum ovs_key_attr attr);
26int ovs_ct_copy_action(struct net *, const struct nlattr *, 27int 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
47static inline void ovs_ct_init(struct net *net) { } 48static inline int ovs_ct_init(struct net *net) { return 0; }
48 49
49static inline void ovs_ct_exit(struct net *net) { } 50static 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)
110extern struct genl_family dp_ct_limit_genl_family;
111#endif
107#endif /* ovs_conntrack.h */ 112#endif /* ovs_conntrack.h */