Merge citrix branch into master.

[openvswitch] / datapath / linux-2.6 / compat-2.6 / include / linux / skbuff.h

diff --git a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h b/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
index 666ef85046360e89dfcd64b7179f4f311d66eba0..2831721264e11c6d8c4f0185058cbd1a63e80084 100644 (file)
--- a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
+++ b/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
@@ -42,7 +42,7 @@ static inline void skb_copy_to_linear_data_offset(struct sk_buff *skb,
 #define NET_SKB_PAD    16
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+#ifndef HAVE_SKB_COW
 static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom,
                             int cloned)
 {
@@ -63,7 +63,7 @@ static inline int skb_cow_head(struct sk_buff *skb, unsigned int headroom)
 {
        return __skb_cow(skb, headroom, skb_header_cloned(skb));
 }
-#endif  /* linux < 2.6.23 */
+#endif  /* !HAVE_SKB_COW */
 
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)