X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Flinux-2.6%2Fcompat-2.6%2Finclude%2Flinux%2Fskbuff.h;h=5ed0e48ff3c73fc8f60447e2023748da776c96fd;hb=85444c3f79f594c838d4b3e72ff27e263514f194;hp=6a6b0950be27c3283cb3c3fe59ac7fdcd6acc083;hpb=468991ad6c1b2c86220f7b6fb34c7b2b9248848a;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 6a6b0950b..5ed0e48ff 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
@@ -83,7 +83,7 @@ static inline int skb_clone_writable(struct sk_buff *skb, int len)
 }
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+#ifndef HAVE_SKB_DST_ACCESSOR_FUNCS
 static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
 {
 	return (struct dst_entry *)skb->dst;
@@ -205,16 +205,15 @@ static inline struct sk_buff *skb_gso_segment(struct sk_buff *skb,
 }
 #endif	/* before 2.6.18 */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-
-extern void __skb_warn_lro_forwarding(const struct sk_buff *skb);
-
+#ifndef HAVE_SKB_WARN_LRO
 #ifndef NETIF_F_LRO
 static inline bool skb_warn_if_lro(const struct sk_buff *skb)
 {
 	return false;
 }
 #else
+extern void __skb_warn_lro_forwarding(const struct sk_buff *skb);
+
 static inline bool skb_warn_if_lro(const struct sk_buff *skb)
 {
 	/* LRO sets gso_size but not gso_type, whereas if GSO is really
@@ -227,7 +226,7 @@ static inline bool skb_warn_if_lro(const struct sk_buff *skb)
 	return false;
 }
 #endif /* NETIF_F_LRO */
-#endif /* kernel < 2.6.27 */
+#endif /* HAVE_SKB_WARN_LRO */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
 static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,