X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Flinux-2.6%2Fcompat-2.6%2Finclude%2Flinux%2Fskbuff.h;h=f9358b5757055ef842de868753e16f5527b5ccc3;hb=55cc89d6b427ca99dbc1217653033e6308318409;hp=5ed0e48ff3c73fc8f60447e2023748da776c96fd;hpb=85444c3f79f594c838d4b3e72ff27e263514f194;p=sliver-openvswitch.git

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 5ed0e48ff..f9358b575 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
+++ b/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
@@ -53,7 +53,7 @@ static inline void skb_copy_to_linear_data_offset(struct sk_buff *skb,
 #define NET_SKB_PAD	16
 #endif
 
-#ifndef HAVE_SKB_COW
+#ifndef HAVE_SKB_COW_HEAD
 static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom,
                             int cloned)
 {
@@ -74,7 +74,7 @@ static inline int skb_cow_head(struct sk_buff *skb, unsigned int headroom)
 {
 	return __skb_cow(skb, headroom, skb_header_cloned(skb));
 }
-#endif  /* !HAVE_SKB_COW */
+#endif	/* !HAVE_SKB_COW_HEAD */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
 static inline int skb_clone_writable(struct sk_buff *skb, int len)
@@ -228,7 +228,7 @@ static inline bool skb_warn_if_lro(const struct sk_buff *skb)
 #endif /* NETIF_F_LRO */
 #endif /* HAVE_SKB_WARN_LRO */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+#ifndef HAVE_NETDEV_ALLOC_SKB_IP_ALIGN
 static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
 							unsigned int length)
 {
@@ -238,7 +238,7 @@ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
 		skb_reserve(skb, NET_IP_ALIGN);
 	return skb;
 }
-#endif /* kernel < 2.6.33 */
+#endif
 
 
 #endif