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
e8dc72e
..
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
@@
-53,7
+53,7
@@
static inline void skb_copy_to_linear_data_offset(struct sk_buff *skb,
#define NET_SKB_PAD 16
#endif
#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)
{
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));
}
{
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)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
static inline int skb_clone_writable(struct sk_buff *skb, int len)
@@
-83,7
+83,7
@@
static inline int skb_clone_writable(struct sk_buff *skb, int len)
}
#endif
}
#endif
-#if
LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+#if
ndef HAVE_SKB_DST_ACCESSOR_FUNCS
static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
{
return (struct dst_entry *)skb->dst;
static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
{
return (struct dst_entry *)skb->dst;
@@
-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