meta-flow: Correctly set destination MAC in mf_set_flow_value().

[sliver-openvswitch.git] / datapath / checksum.h

diff --git a/datapath/checksum.h b/datapath/checksum.h
index abd4615..5ea2a52 100644 (file)
--- a/datapath/checksum.h
+++ b/datapath/checksum.h
@@ -1,9 +1,19 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * Copyright (c) 2007-2011 Nicira Networks.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
 #ifndef CHECKSUM_H
@@ -28,66 +38,51 @@ enum csum_type {
 };
 
 #ifdef NEED_CSUM_NORMALIZE
-void compute_ip_summed(struct sk_buff *skb, bool xmit);
+int compute_ip_summed(struct sk_buff *skb, bool xmit);
+void forward_ip_summed(struct sk_buff *skb, bool xmit);
 u8 get_ip_summed(struct sk_buff *skb);
+void set_ip_summed(struct sk_buff *skb, u8 ip_summed);
+void get_skb_csum_pointers(const struct sk_buff *skb, u16 *csum_start,
+                          u16 *csum_offset);
+void set_skb_csum_pointers(struct sk_buff *skb, u16 csum_start,
+                          u16 csum_offset);
 #else
-static inline void compute_ip_summed(struct sk_buff *skb, bool xmit) { }
-static inline u8 get_ip_summed(struct sk_buff *skb)
+static inline int compute_ip_summed(struct sk_buff *skb, bool xmit)
 {
-       return skb->ip_summed;
+       return 0;
 }
-#endif
 
-/* This function closely resembles skb_forward_csum() used by the bridge.  It
- * is slightly different because we are only concerned with bridging and not
- * other types of forwarding and can get away with slightly more optimal
- * behavior.
- */
-static inline void forward_ip_summed(struct sk_buff *skb)
+static inline void forward_ip_summed(struct sk_buff *skb, bool xmit) { }
+
+static inline u8 get_ip_summed(struct sk_buff *skb)
 {
-#ifdef CHECKSUM_HW
-       if (get_ip_summed(skb) == OVS_CSUM_COMPLETE)
-               skb->ip_summed = CHECKSUM_NONE;
-#endif
+       return skb->ip_summed;
 }
 
-#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
-int vswitch_skb_checksum_setup(struct sk_buff *skb);
-#else
-static inline int vswitch_skb_checksum_setup(struct sk_buff *skb)
+static inline void set_ip_summed(struct sk_buff *skb, u8 ip_summed)
 {
-       return 0;
+       skb->ip_summed = ip_summed;
 }
-#endif
 
 static inline void get_skb_csum_pointers(const struct sk_buff *skb,
                                         u16 *csum_start, u16 *csum_offset)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
        *csum_start = skb->csum_start;
        *csum_offset = skb->csum_offset;
-#else
-       *csum_start = skb_headroom(skb) + skb_transport_offset(skb);
-       *csum_offset = skb->csum;
-#endif
 }
 
 static inline void set_skb_csum_pointers(struct sk_buff *skb, u16 csum_start,
                                         u16 csum_offset)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
        skb->csum_start = csum_start;
        skb->csum_offset = csum_offset;
-#else
-       skb_set_transport_header(skb, csum_start - skb_headroom(skb));
-       skb->csum = csum_offset;
-#endif
 }
+#endif
 
-#if defined(NEED_CSUM_NORMALIZE) || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
 /* This is really compatibility code that belongs in the compat directory.
  * However, it needs access to our normalized checksum values, so put it here.
  */
+#if defined(NEED_CSUM_NORMALIZE) || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
 #define inet_proto_csum_replace4 rpl_inet_proto_csum_replace4
 static inline void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
                                            __be32 from, __be32 to,
@@ -107,4 +102,48 @@ static inline void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
 }
 #endif
 
+#ifdef NEED_CSUM_NORMALIZE
+static inline void update_csum_start(struct sk_buff *skb, int delta)
+{
+       if (get_ip_summed(skb) == OVS_CSUM_PARTIAL) {
+               u16 csum_start, csum_offset;
+
+               get_skb_csum_pointers(skb, &csum_start, &csum_offset);
+               set_skb_csum_pointers(skb, csum_start + delta, csum_offset);
+       }
+}
+
+static inline int rpl_pskb_expand_head(struct sk_buff *skb, int nhead,
+                                      int ntail, gfp_t gfp_mask)
+{
+       int err;
+       int old_headroom = skb_headroom(skb);
+
+       err = pskb_expand_head(skb, nhead, ntail, gfp_mask);
+       if (unlikely(err))
+               return err;
+
+       update_csum_start(skb, skb_headroom(skb) - old_headroom);
+
+       return 0;
+}
+#define pskb_expand_head rpl_pskb_expand_head
+
+static inline unsigned char *rpl__pskb_pull_tail(struct sk_buff *skb,
+                                                 int delta)
+{
+       unsigned char *ret;
+       int old_headroom = skb_headroom(skb);
+
+       ret = __pskb_pull_tail(skb, delta);
+       if (unlikely(!ret))
+               return ret;
+
+       update_csum_start(skb, skb_headroom(skb) - old_headroom);
+
+       return ret;
+}
+#define __pskb_pull_tail rpl__pskb_pull_tail
+#endif
+
 #endif /* checksum.h */