openvswitch: use released version 2.4.0

The previous version was an unreleased one from the OVS trunk.
This one is the released version, described here:
  http://openvswitch.org/pipermail/announce/2015-August/000078.html

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean
2015-10-02 10:22:03 +03:00
parent a8c37348b2
commit 4da84af953
9 changed files with 219 additions and 16 deletions
@@ -0,0 +1,20 @@
diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c
index b44f470..f95416e 100644
--- a/datapath/linux/compat/stt.c
+++ b/datapath/linux/compat/stt.c
@@ -1326,9 +1326,14 @@ static void clean_percpu(struct work_struct *work)
static unsigned int nf_ip_hook(FIRST_PARAM
struct sk_buff *skb,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ const struct nf_hook_state *state
+#else
const struct net_device *in,
const struct net_device *out,
- int (*okfn)(struct sk_buff *))
+ int (*okfn)(struct sk_buff *)
+#endif
+ )
{
struct stt_sock *stt_sock;
int ip_hdr_len;