X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Factions.h;h=3348ae2c2be6f339a356297be4b99de6af14c033;hb=81e2083fe6b7c16055f01c4b1e40f25867594bf6;hp=a2585516414bc5dabf55021172eec91a5b4cf061;hpb=dd8d6b8cd4d708553037e306d41d1c501d3cecad;p=sliver-openvswitch.git

diff --git a/datapath/actions.h b/datapath/actions.h
index a25855164..3348ae2c2 100644
--- a/datapath/actions.h
+++ b/datapath/actions.h
@@ -14,11 +14,17 @@
 
 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,
-		    const struct odp_flow_key *key,
-		    const union odp_action *, int n_actions);
+		    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 */