datapath: Copy Xen's checksumming fields when doing skb_copy.

[sliver-openvswitch.git] / datapath / actions.c

diff --git a/datapath/actions.c b/datapath/actions.c
index 30b840c..226a4f9 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -1,6 +1,9 @@
 /*
  * Distributed under the terms of the GNU GPL version 2.
  * Copyright (c) 2007, 2008, 2009 Nicira Networks.
+ *
+ * Significant portions of this file may be copied from parts of the Linux
+ * kernel, by Linus Torvalds and others.
  */
 
 /* Functions for executing flow actions. */
@@ -25,6 +28,13 @@ make_writable(struct sk_buff *skb, gfp_t gfp)
        if (skb_shared(skb) || skb_cloned(skb)) {
                struct sk_buff *nskb = skb_copy(skb, gfp);
                if (nskb) {
+#if defined(CONFIG_XEN) && LINUX_VERSION_CODE == KERNEL_VERSION(2,6,18)
+                       /* These fields are copied in skb_clone but not in
+                        * skb_copy or related functions.  We need to manually
+                        * copy them over here. */
+                       nskb->proto_data_valid = skb->proto_data_valid;
+                       nskb->proto_csum_blank = skb->proto_csum_blank;
+#endif
                        kfree_skb(skb);
                        return nskb;
                }