datapath: remove actions.h

There are only two symbols in actions.h. Compatibility function
is moved to compat.h and execute_actions() declaration is moved
to datapath.h

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/Modules.mk b/datapath/Modules.mk
index 087cf44b8215341beaa4926bdf3a3ae98df15d7e..22b328c6b0afc3f593d113d769fa03efa6d4a24d 100644 (file)
--- a/datapath/Modules.mk
+++ b/datapath/Modules.mk
@@ -28,7 +28,6 @@ openvswitch_sources = \
        vport-patch.c
 
 openvswitch_headers = \
-       actions.h \
        checksum.h \
        compat.h \
        datapath.h \

diff --git a/datapath/actions.c b/datapath/actions.c
index 61b903f683fe24d1158dad6ea9acbf6882eeb626..dc74a3768776cf0e4d86171e439a8c4be9cbff76 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -23,7 +23,6 @@
 #include <net/checksum.h>
 #include <net/dsfield.h>
 
-#include "actions.h"
 #include "checksum.h"
 #include "datapath.h"
 #include "vlan.h"

diff --git a/datapath/actions.h b/datapath/actions.h
deleted file mode 100644 (file)
index a832295..0000000
--- a/datapath/actions.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
- *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
- */
-
-#ifndef ACTIONS_H
-#define ACTIONS_H 1
-
-#include <linux/skbuff.h>
-#include <linux/version.h>
-
-struct datapath;
-struct sk_buff;
-struct sw_flow_key;
-
-int execute_actions(struct datapath *dp, struct sk_buff *skb);
-
-static inline void skb_clear_rxhash(struct sk_buff *skb)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
-       skb->rxhash = 0;
-#endif
-}
-
-#endif /* actions.h */

diff --git a/datapath/compat.h b/datapath/compat.h
index c484a5d72a6c991586916c6b64bef70b9cb6b869..4e057537ae63d34fdcca719f163fc5109f429cfc 100644 (file)
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -36,4 +36,11 @@ static inline int CHECK_NUL_STRING(struct nlattr *attr, int maxlen)
 }
 #endif  /* !HAVE_NLA_NUL_STRING */
 
+static inline void skb_clear_rxhash(struct sk_buff *skb)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
+       skb->rxhash = 0;
+#endif
+}
+
 #endif /* compat.h */

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 6ebe7a05706c22618f706f5e2d68e3bd2ec1b589..49d93aac5c2ff15e6e5c57b36a0e840f1c3f4f00 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -45,7 +45,6 @@
 
 #include "checksum.h"
 #include "datapath.h"
-#include "actions.h"
 #include "flow.h"
 #include "vlan.h"
 #include "tunnel.h"

diff --git a/datapath/datapath.h b/datapath/datapath.h
index c6371ca12fdf5365e0e6729ab5d9e35a9fdc647d..c7014c3b0c664907aa24eced94f3b740b0dd6fbe 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -137,4 +137,5 @@ const char *dp_name(const struct datapath *dp);
 struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,
                                         u8 cmd);
 
+int execute_actions(struct datapath *dp, struct sk_buff *skb);
 #endif /* datapath.h */

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index a6fdfa94e65b1255f89b72e706657958654163d4..dd6c648dad54d2d3af214b471b0ee48d8b03b091 100644 (file)
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -32,7 +32,6 @@
 #include <net/route.h>
 #include <net/xfrm.h>
 
-#include "actions.h"
 #include "checksum.h"
 #include "datapath.h"
 #include "tunnel.h"