git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Fix build with backported netdev_alloc_skb_ip_align()
[sliver-openvswitch.git]
/
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
15acea9
..
f9358b5
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
@@
-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 */
#endif /* NETIF_F_LRO */
#endif /* HAVE_SKB_WARN_LRO */
-#if
LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+#if
ndef HAVE_NETDEV_ALLOC_SKB_IP_ALIGN
static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
unsigned int length)
{
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;
}
skb_reserve(skb, NET_IP_ALIGN);
return skb;
}
-#endif
/* kernel < 2.6.33 */
+#endif
#endif
#endif