diff options
author | Pravin B Shelar <pshelar@nicira.com> | 2011-11-10 19:35:37 -0800 |
---|---|---|
committer | Pravin B Shelar <pshelar@nicira.com> | 2011-11-10 19:35:37 -0800 |
commit | eba9291a25a9d38f3382510de52e619a65b2f711 (patch) | |
tree | 4c57da034b7c7272b8c743284a5fb454dc47fbdc /datapath | |
parent | ae05bcfd103fcd67953ad86cbd541288014c3443 (diff) |
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>
Diffstat (limited to 'datapath')
-rw-r--r-- | datapath/Modules.mk | 1 | ||||
-rw-r--r-- | datapath/actions.c | 1 | ||||
-rw-r--r-- | datapath/actions.h | 28 | ||||
-rw-r--r-- | datapath/compat.h | 7 | ||||
-rw-r--r-- | datapath/datapath.c | 1 | ||||
-rw-r--r-- | datapath/datapath.h | 1 | ||||
-rw-r--r-- | datapath/tunnel.c | 1 |
7 files changed, 8 insertions, 32 deletions
diff --git a/datapath/Modules.mk b/datapath/Modules.mk index 087cf44b..22b328c6 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 61b903f6..dc74a376 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 a832295c..00000000 --- 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 c484a5d7..4e057537 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 6ebe7a05..49d93aac 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 c6371ca1..c7014c3b 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 a6fdfa94..dd6c648d 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" |