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

diff --git a/datapath/actions.h b/datapath/actions.h
index 065c0e40..f2962a73 100644
--- a/datapath/actions.h
+++ b/datapath/actions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * 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
@@ -9,17 +9,34 @@
 #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;
 
-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 odp_flow_key *key,
+		    const union odp_action *, int n_actions);
+
+static inline void set_skb_csum_bits(const struct sk_buff *old_skb,
+				     struct sk_buff *new_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;
+#endif
+}
 
 #endif /* actions.h */