X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=datapath%2Factions.h;h=3348ae2c2be6f339a356297be4b99de6af14c033;hb=dde0c4faf54836833388191b405ac2f81dda4b6c;hp=09e35bd7a8837feb55f5bd2690a838ddec58f35d;hpb=fceb2a5bb2063023777fc75c68a2670b5169fa13;p=sliver-openvswitch.git

diff --git a/datapath/actions.h b/datapath/actions.h
index 09e35bd7a..3348ae2c2 100644
--- a/datapath/actions.h
+++ b/datapath/actions.h
@@ -9,34 +9,21 @@
 #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 set_skb_csum_bits(const struct sk_buff *old_skb,
-				     struct sk_buff *new_skb)
+static inline void skb_clear_rxhash(struct sk_buff *skb)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-	/* Before 2.6.24 these fields were not copied when
-	 * doing an skb_copy_expand. */
-	new_skb->ip_summed = old_skb->ip_summed;
-	new_skb->csum = old_skb->csum;
-#endif
-#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
-	/* These fields are copied in skb_clone but not in
-	 * skb_copy or related functions.  We need to manually
-	 * copy them over here. */
-	new_skb->proto_data_valid = old_skb->proto_data_valid;
-	new_skb->proto_csum_blank = old_skb->proto_csum_blank;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
+	skb->rxhash = 0;
 #endif
 }