socket-util: Properly set socket permissions in make_unix_socket().

[sliver-openvswitch.git] / datapath / actions.h

diff --git a/datapath/actions.h b/datapath/actions.h
index 04bc654..3348ae2 100644 (file)
--- a/datapath/actions.h
+++ b/datapath/actions.h
@@ -9,16 +9,22 @@
 #ifndef ACTIONS_H
 #define ACTIONS_H 1
 
-#include <linux/gfp.h>
+#include <linux/skbuff.h>
+#include <linux/version.h>
 
 struct datapath;
 struct sk_buff;
-struct odp_flow_key;
-union odp_action;
+struct sw_flow_key;
 
 int execute_actions(struct datapath *dp, struct sk_buff *skb,
-                   struct odp_flow_key *key,
-                   const union odp_action *, int n_actions,
-                   gfp_t gfp);
+                   const struct sw_flow_key *,
+                   const struct nlattr *, u32 actions_len);
+
+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 */