X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.h;h=3348ae2c2be6f339a356297be4b99de6af14c033;hb=ed4031e4676affcb39962942ff437382d8f30c27;hp=04bc65444494ab4350e0a8450ebfe65f51a4dc08;hpb=f2459fe7d91c4c325dfaa3ed18f56200b63ae27e;p=openvswitch

diff --git a/datapath/actions.h b/datapath/actions.h
index 04bc6544..3348ae2c 100644
--- 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 */