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 <pshe...@nicira.com>
---
datapath/Modules.mk | 1 -
datapath/actions.c | 1 -
datapath/actions.h | 28 ----------------------------
datapath/compat.h | 7 +++++++
datapath/datapath.c | 1 -
datapath/datapath.h | 1 +
datapath/tunnel.c | 1 -
7 files changed, 8 insertions(+), 32 deletions(-)
delete mode 100644 datapath/actions.h
diff --git a/datapath/Modules.mk b/datapath/Modules.mk
index 087cf44..22b328c 100644
--- 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 61b903f..dc74a37 100644
--- 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
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 c484a5d..4e05753 100644
--- 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 5660f2d..09949f4 100644
--- 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 c6371ca..c7014c3 100644
--- 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 19056b9..d1eb001 100644
--- 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"
--
1.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
