X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.h;h=a832295ce8043fefcc936eff8f64b82fe535ec62;hb=5b95ab0edf18e44d6624c8aa98b658df2fbb48f2;hp=065c0e40e7e0d0c7bcddf40151975130b3006975;hpb=58fda1dab104041fc693032475ec4662c1a52849;p=openvswitch

diff --git a/datapath/actions.h b/datapath/actions.h
index 065c0e40..a832295c 100644
--- a/datapath/actions.h
+++ b/datapath/actions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * 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
@@ -9,17 +9,20 @@
 #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 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);
+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 */