X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=datapath%2Flinux-2.6%2Fcompat-2.6%2Finclude%2Flinux%2Fskbuff.h;h=f9358b5757055ef842de868753e16f5527b5ccc3;hb=55cc89d6b427ca99dbc1217653033e6308318409;hp=15acea9e63565506c062e622b9d5ca81671243e8;hpb=a644bae6eec521119252221d4aa989168eccc22b;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 15acea9e6..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 @@ -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