X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.h;h=3348ae2c2be6f339a356297be4b99de6af14c033;hb=76f1c218bd84e44666c5a0ae54d543dbce42c376;hp=410e3ba79da92e4ece97595bb8e2a1765aad2d40;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch

diff --git a/datapath/actions.h b/datapath/actions.h
index 410e3ba7..3348ae2c 100644
--- a/datapath/actions.h
+++ b/datapath/actions.h
@@ -1,18 +1,30 @@
+/*
+ * Copyright (c) 2009, 2010 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/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;
 
-struct sk_buff *make_writable(struct sk_buff *, gfp_t gfp);
-int dp_xmit_skb(struct sk_buff *);
 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 */